diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 0000000000..0c53255148
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+patreon: RuneLitePlus
diff --git a/.gitignore b/.gitignore
index 51854a9d2e..28626d1e7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ git
 classes/artifacts/client_jar/run.bat
 classes/artifacts/client_jar/client.jar
 *.jar
+.live/
diff --git a/cache-client/pom.xml b/cache-client/pom.xml
index 59b213541f..3073c9f439 100644
--- a/cache-client/pom.xml
+++ b/cache-client/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.28-SNAPSHOT</version>
+		<version>1.5.29-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>cache-client</artifactId>
diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml
index 4eb3f28217..b57857a714 100644
--- a/cache-updater/pom.xml
+++ b/cache-updater/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.28-SNAPSHOT</version>
+		<version>1.5.29-SNAPSHOT</version>
 	</parent>
 	
 	<name>Cache Updater</name>
diff --git a/cache/pom.xml b/cache/pom.xml
index 9fd6153b3b..169f016084 100644
--- a/cache/pom.xml
+++ b/cache/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.28-SNAPSHOT</version>
+		<version>1.5.29-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>cache</artifactId>
diff --git a/cache/src/main/java/net/runelite/cache/script/Instructions.java b/cache/src/main/java/net/runelite/cache/script/Instructions.java
index 17dfabfcd1..a0c7b859a1 100644
--- a/cache/src/main/java/net/runelite/cache/script/Instructions.java
+++ b/cache/src/main/java/net/runelite/cache/script/Instructions.java
@@ -78,6 +78,7 @@ public class Instructions
 		add(CC_SETSIZE, "cc_setsize");
 		add(CC_SETHIDE, "cc_sethide");
 		add(CC_SETNOCLICKTHROUGH, "cc_setnoclickthrough");
+		add(CC_SETNOSCROLLTHROUGH, "cc_setnoscrollthrough");
 		add(CC_SETSCROLLPOS, "cc_setscrollpos");
 		add(CC_SETCOLOUR, "cc_setcolour");
 		add(CC_SETFILL, "cc_setfill");
@@ -287,11 +288,14 @@ public class Instructions
 		add(SETSHOWLOADINGMESSAGES, "setshowloadingmessages");
 		add(SETTAPTODROP, "settaptodrop");
 		add(GETTAPTODROP, "gettaptodrop");
+		add(SETOCULUSORBSPEED, "setoculusorbspeed");
 		add(GETCANVASSIZE, "getcanvassize");
 		add(SETHIDEUSERNAME, "sethideusername");
 		add(GETHIDEUSERNAME, "gethideusername");
 		add(SETREMEMBERUSERNAME, "setrememberusername");
 		add(GETREMEMBERUSERNAME, "getrememberusername");
+		add(SETTITLEMUSICENABLED, "settitlemusicenabled");
+		add(GETTITLEMUSICENABLED, "gettitlemusicenabled");
 		add(SOUND_SYNTH, "sound_synth");
 		add(SOUND_SONG, "sound_song");
 		add(SOUND_JINGLE, "sound_jingle");
@@ -411,6 +415,7 @@ public class Instructions
 		add(REMOVETAGS, "removetags");
 		add(STRING_INDEXOF_CHAR, "string_indexof_char");
 		add(STRING_INDEXOF_STRING, "string_indexof_string");
+		add(UPPERCASE, "uppercase");
 		add(OC_NAME, "oc_name");
 		add(OC_OP, "oc_op");
 		add(OC_IOP, "oc_iop");
@@ -461,6 +466,7 @@ public class Instructions
 		add(WORLDLIST_NEXT, "worldlist_next");
 		add(WORLDLIST_SPECIFIC, "worldlist_specific");
 		add(WORLDLIST_SORT, "worldlist_sort");
+		add(GETWORLDINFO, "getworldinfo");
 		add(SETFOLLOWEROPSLOWPRIORITY, "setfolloweropslowpriority");
 		add(NC_PARAM, "nc_param");
 		add(LC_PARAM, "lc_param");
diff --git a/cache/src/main/java/net/runelite/cache/script/Opcodes.java b/cache/src/main/java/net/runelite/cache/script/Opcodes.java
index e69a1ef5ef..5a4fe89061 100644
--- a/cache/src/main/java/net/runelite/cache/script/Opcodes.java
+++ b/cache/src/main/java/net/runelite/cache/script/Opcodes.java
@@ -69,6 +69,7 @@ public class Opcodes
 	public static final int CC_SETSIZE = 1001;
 	public static final int CC_SETHIDE = 1003;
 	public static final int CC_SETNOCLICKTHROUGH = 1005;
+	public static final int CC_SETNOSCROLLTHROUGH = 1006;
 	public static final int CC_SETSCROLLPOS = 1100;
 	public static final int CC_SETCOLOUR = 1101;
 	public static final int CC_SETFILL = 1102;
@@ -278,11 +279,14 @@ public class Opcodes
 	public static final int SETSHOWLOADINGMESSAGES = 3126;
 	public static final int SETTAPTODROP = 3127;
 	public static final int GETTAPTODROP = 3128;
+	public static final int SETOCULUSORBSPEED = 3129;
 	public static final int GETCANVASSIZE = 3132;
 	public static final int SETHIDEUSERNAME = 3141;
 	public static final int GETHIDEUSERNAME = 3142;
 	public static final int SETREMEMBERUSERNAME = 3143;
 	public static final int GETREMEMBERUSERNAME = 3144;
+	public static final int SETTITLEMUSICENABLED = 3146;
+	public static final int GETTITLEMUSICENABLED = 3147;
 	public static final int SOUND_SYNTH = 3200;
 	public static final int SOUND_SONG = 3201;
 	public static final int SOUND_JINGLE = 3202;
@@ -402,6 +406,7 @@ public class Opcodes
 	public static final int REMOVETAGS = 4119;
 	public static final int STRING_INDEXOF_CHAR = 4120;
 	public static final int STRING_INDEXOF_STRING = 4121;
+	public static final int UPPERCASE = 4122;
 	public static final int OC_NAME = 4200;
 	public static final int OC_OP = 4201;
 	public static final int OC_IOP = 4202;
@@ -452,6 +457,7 @@ public class Opcodes
 	public static final int WORLDLIST_NEXT = 6502;
 	public static final int WORLDLIST_SPECIFIC = 6506;
 	public static final int WORLDLIST_SORT = 6507;
+	public static final int GETWORLDINFO = 6511;
 	public static final int SETFOLLOWEROPSLOWPRIORITY = 6512;
 	public static final int NC_PARAM = 6513;
 	public static final int LC_PARAM = 6514;
diff --git a/cache/src/test/java/net/runelite/cache/FrameDumper.java b/cache/src/test/java/net/runelite/cache/FrameDumper.java
index 8e856cd2f8..f6cc20532d 100644
--- a/cache/src/test/java/net/runelite/cache/FrameDumper.java
+++ b/cache/src/test/java/net/runelite/cache/FrameDumper.java
@@ -88,7 +88,7 @@ public class FrameDumper
 
 					int framemapArchiveId = (contents[0] & 0xff) << 8 | contents[1] & 0xff;
 
-					Archive framemapArchive = framemapIndex.getArchives().get(framemapArchiveId);
+					Archive framemapArchive = framemapIndex.getArchive(framemapArchiveId);
 					archiveData = storage.loadArchive(framemapArchive);
 					byte[] framemapContents = framemapArchive.decompress(archiveData);
 
diff --git a/checkstyle.xml b/checkstyle.xml
index e8669a742c..c1935e18a2 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <!--
  Copyright (c) 2017, Adam <Adam@sigterm.info>
+ Copyright (c) 2019, ThatGamerBlue <thatgamerblue@gmail.com>
  All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
@@ -40,6 +41,11 @@
 			<property name="message" value="Indent must use tab characters"/>
 			<property name="ignoreComments" value="true"/>
 		</module>
+		<module name="RegexpSinglelineJava">
+			<property name="format" value="import (?!static|java\.awt).*\*"/>
+			<property name="message" value="Multiline imports are disallowed if they are not static"/>
+			<property name="ignoreComments" value="true"/>
+		</module>
 		<module name="WhitespaceAround"/>
 		<module name="WhitespaceAfter">
 			<property name="tokens" value="COMMA"/>
diff --git a/deobfuscator/pom.xml b/deobfuscator/pom.xml
index c711697622..32ffa4c8c8 100644
--- a/deobfuscator/pom.xml
+++ b/deobfuscator/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.28-SNAPSHOT</version>
+		<version>1.5.29-SNAPSHOT</version>
 	</parent>
 
     <artifactId>deobfuscator</artifactId>
@@ -65,6 +65,7 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
             <version>1.7.12</version>
+			<scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
diff --git a/deobfuscator/src/main/java/net/runelite/asm/Type.java b/deobfuscator/src/main/java/net/runelite/asm/Type.java
index 68ba6960d4..89eb3b3023 100644
--- a/deobfuscator/src/main/java/net/runelite/asm/Type.java
+++ b/deobfuscator/src/main/java/net/runelite/asm/Type.java
@@ -110,7 +110,7 @@ public class Type
 		{
 			s = s.substring(1);
 		}
-		if (s.startsWith("L"))
+		if (s.startsWith("L") && s.endsWith(";"))
 		{
 			return s.substring(1, s.length() - 1);
 		}
diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/RenameUnique.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/RenameUnique.java
index 7e341b1a55..eb75795d49 100644
--- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/RenameUnique.java
+++ b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/RenameUnique.java
@@ -31,6 +31,7 @@ import net.runelite.asm.Field;
 import net.runelite.asm.Method;
 import net.runelite.asm.signature.util.VirtualMethods;
 import net.runelite.deob.Deob;
+import net.runelite.deob.DeobAnnotations;
 import net.runelite.deob.Deobfuscator;
 import net.runelite.deob.util.NameMappings;
 
@@ -60,7 +61,7 @@ public class RenameUnique implements Deobfuscator
 		for (ClassFile cf : group.getClasses())
 			for (Field field : cf.getFields())
 			{
-				if (field.getName().length() > Deob.OBFUSCATED_NAME_MAX_LEN)
+				if (field.getName().length() > Deob.OBFUSCATED_NAME_MAX_LEN && !field.getName().startsWith("__") || field.getName().equals(DeobAnnotations.getExportedName(field.getAnnotations())))
 					continue;
 				
 				map.map(field.getPoolField(), "field" + i++);
@@ -74,7 +75,7 @@ public class RenameUnique implements Deobfuscator
 		for (ClassFile cf : group.getClasses())
 			for (Method method : cf.getMethods())
 			{
-				if (method.getName().length() > Deob.OBFUSCATED_NAME_MAX_LEN)
+				if (method.getName().length() > Deob.OBFUSCATED_NAME_MAX_LEN && !method.getName().startsWith("__") || method.getName().equals(DeobAnnotations.getExportedName(method.getAnnotations())))
 					continue;
 				
 				List<Method> virtualMethods = VirtualMethods.getVirtualMethods(method);
diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/Renamer.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/Renamer.java
index cbb38be382..418802ef5a 100644
--- a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/Renamer.java
+++ b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/Renamer.java
@@ -216,6 +216,8 @@ public class Renamer implements Deobfuscator
 					field.getAnnotations().addAnnotation(DeobAnnotations.OBFUSCATED_NAME, "value", field.getName());
 				}
 
+				assert DeobAnnotations.getExportedName(field.getAnnotations()) == null || DeobAnnotations.getExportedName(field.getAnnotations()).equals(newName) : "Tried changing field name to something other than the exported name!";
+
 				field.setName(newName);
 				++fields;
 			}
diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/ScriptOpcodesTransformer.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/ScriptOpcodesTransformer.java
new file mode 100644
index 0000000000..3c6bb67a7c
--- /dev/null
+++ b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/ScriptOpcodesTransformer.java
@@ -0,0 +1,152 @@
+package net.runelite.deob.deobfuscators.transformers;
+
+import java.util.ListIterator;
+import net.runelite.asm.ClassFile;
+import net.runelite.asm.ClassGroup;
+import net.runelite.asm.Field;
+import net.runelite.asm.Method;
+import net.runelite.asm.Type;
+import net.runelite.asm.attributes.Code;
+import net.runelite.asm.attributes.code.Instruction;
+import net.runelite.asm.attributes.code.Instructions;
+import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction;
+import net.runelite.asm.attributes.code.instructions.GetStatic;
+import net.runelite.asm.attributes.code.instructions.ILoad;
+import net.runelite.asm.attributes.code.instructions.IfICmpEq;
+import net.runelite.asm.attributes.code.instructions.IfICmpNe;
+import net.runelite.asm.attributes.code.instructions.LDC;
+import net.runelite.asm.attributes.code.instructions.PutStatic;
+import net.runelite.asm.attributes.code.instructions.VReturn;
+import net.runelite.asm.pool.Class;
+import net.runelite.asm.signature.Signature;
+import net.runelite.deob.Transformer;
+import net.runelite.deob.deobfuscators.transformers.scriptopcodes.ScriptOpcode;
+import org.objectweb.asm.Opcodes;
+import static org.objectweb.asm.Opcodes.ACC_FINAL;
+import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
+import static org.objectweb.asm.Opcodes.ACC_STATIC;
+
+public class ScriptOpcodesTransformer implements Transformer // robots in disguise
+{
+	private static final String SCRIPT_OPCODES = "net/runelite/rs/ScriptOpcodes";
+
+	@Override
+	public void transform(ClassGroup group)
+	{
+		initializeOpcodesClassFile(group);
+
+		for (ClassFile cf : group.getClasses())
+		{
+			if (cf.getName().startsWith("net/runelite/rs"))
+			{
+				continue;
+			}
+
+			for (Method m : cf.getMethods())
+			{
+				if (!m.isStatic())
+				{
+					continue;
+				}
+
+				if (!m.getDescriptor().getArguments().contains(new Type("LScript;")) && !m.getDescriptor().getArguments().contains(new Type("LScriptEvent;")))
+				{
+					continue;
+				}
+
+				boolean varIndexIsKnownAnd0 = m.getDescriptor().getArguments().contains(new Type("LScript;"));
+
+				Code code = m.getCode();
+				Instructions ins = code.getInstructions();
+				ListIterator<Instruction> it = ins.getInstructions().listIterator();
+
+				Instruction i;
+				while (it.hasNext())
+				{
+					i = it.next();
+
+					if (!(i instanceof ILoad) || (varIndexIsKnownAnd0 && ((ILoad) i).getVariableIndex() != 0))
+					{
+						continue;
+					}
+
+					i = it.next();
+
+					if (!(i instanceof PushConstantInstruction) ||
+						!(((PushConstantInstruction) i).getConstant() instanceof Number))
+					{
+						continue;
+					}
+
+					int val = ((Number) ((PushConstantInstruction) i).getConstant()).intValue();
+					String name = ScriptOpcode.nameFromID(val);
+
+					i = it.next();
+
+					if (name == null || !(i instanceof IfICmpNe || i instanceof IfICmpEq))
+					{
+						continue;
+					}
+
+					it.previous();
+					it.previous();
+
+					net.runelite.asm.pool.Field pool = new net.runelite.asm.pool.Field(
+						new Class(SCRIPT_OPCODES),
+						name,
+						Type.INT
+					);
+
+					GetStatic getStatic = new GetStatic(ins, pool);
+					it.set(getStatic);
+				}
+			}
+		}
+	}
+
+	private static void initializeOpcodesClassFile(ClassGroup group)
+	{
+		ClassFile scriptOpcodes = group.findClass(SCRIPT_OPCODES);
+		if (scriptOpcodes == null)
+		{
+			scriptOpcodes = new ClassFile(group);
+			scriptOpcodes.setName(SCRIPT_OPCODES);
+			scriptOpcodes.setSuperName(Type.OBJECT.getInternalName());
+			scriptOpcodes.setAccess(Opcodes.ACC_PUBLIC);
+			group.addClass(scriptOpcodes);
+		}
+		else
+		{
+			scriptOpcodes.getFields().clear();
+		}
+
+		Method clinit = scriptOpcodes.findMethod("<clinit>");
+		if (clinit == null)
+		{
+			clinit = new Method(scriptOpcodes, "<clinit>", new Signature("()V"));
+			clinit.setStatic(true);
+			Code code = new Code(clinit);
+			code.setMaxStack(1);
+			clinit.setCode(code);
+			scriptOpcodes.addMethod(clinit);
+		}
+
+		Code code = clinit.getCode();
+		Instructions ins = code.getInstructions();
+
+		for (ScriptOpcode opcode : ScriptOpcode.values())
+		{
+			Field field = new Field(scriptOpcodes, opcode.name(), Type.INT);
+			field.setAccessFlags(ACC_PUBLIC | ACC_STATIC | ACC_FINAL);
+			field.setValue(opcode.opcode);
+			scriptOpcodes.addField(field);
+
+			LDC ldc = new LDC(ins, opcode.opcode);
+			PutStatic put = new PutStatic(ins, field);
+			ins.addInstruction(0, ldc);
+			ins.addInstruction(1, put);
+		}
+
+		ins.addInstruction(new VReturn(ins));
+	}
+}
diff --git a/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/scriptopcodes/ScriptOpcode.java b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/scriptopcodes/ScriptOpcode.java
new file mode 100644
index 0000000000..1a8e4abbfd
--- /dev/null
+++ b/deobfuscator/src/main/java/net/runelite/deob/deobfuscators/transformers/scriptopcodes/ScriptOpcode.java
@@ -0,0 +1,517 @@
+package net.runelite.deob.deobfuscators.transformers.scriptopcodes;
+
+import com.google.common.collect.ImmutableMap;
+import java.util.Map;
+
+public enum ScriptOpcode
+{
+	// This class is pretty much the same as net.runelite.cache.script.Opcodes, and should be updated alongside that
+
+	ICONST(0),
+	GET_VARP(1),
+	SET_VARP(2),
+	SCONST(3),
+	JUMP(6),
+	IF_ICMPNE(7),
+	IF_ICMPEQ(8),
+	IF_ICMPLT(9),
+	IF_ICMPGT(10),
+	RETURN(21),
+	GET_VARBIT(25),
+	SET_VARBIT(27),
+	IF_ICMPLE(31),
+	IF_ICMPGE(32),
+	ILOAD(33),
+	ISTORE(34),
+	SLOAD(35),
+	SSTORE(36),
+	JOIN_STRING(37),
+	POP_INT(38),
+	POP_STRING(39),
+	INVOKE(40),
+	GET_VARC_INT(42),
+	SET_VARC_INT(43),
+	DEFINE_ARRAY(44),
+	GET_ARRAY_INT(45),
+	SET_ARRAY_INT(46),
+	GET_VARC_STRING_OLD(47),
+	SET_VARC_STRING_OLD(48),
+	GET_VARC_STRING(49),
+	SET_VARC_STRING(50),
+	SWITCH(60),
+	CC_CREATE(100),
+	CC_DELETE(101),
+	CC_DELETEALL(102),
+	CC_FIND(200),
+	IF_FIND(201),
+	CC_SETPOSITION(1000),
+	CC_SETSIZE(1001),
+	CC_SETHIDE(1003),
+	CC_SETNOCLICKTHROUGH(1005),
+	CC_SETNOSCROLLTHROUGH(1006),
+	CC_SETSCROLLPOS(1100),
+	CC_SETCOLOUR(1101),
+	CC_SETFILL(1102),
+	CC_SETTRANS(1103),
+	CC_SETLINEWID(1104),
+	CC_SETGRAPHIC(1105),
+	CC_SET2DANGLE(1106),
+	CC_SETTILING(1107),
+	CC_SETMODEL(1108),
+	CC_SETMODELANGLE(1109),
+	CC_SETMODELANIM(1110),
+	CC_SETMODELORTHOG(1111),
+	CC_SETTEXT(1112),
+	CC_SETTEXTFONT(1113),
+	CC_SETTEXTALIGN(1114),
+	CC_SETTEXTSHADOW(1115),
+	CC_SETOUTLINE(1116),
+	CC_SETGRAPHICSHADOW(1117),
+	CC_SETVFLIP(1118),
+	CC_SETHFLIP(1119),
+	CC_SETSCROLLSIZE(1120),
+	CC_RESUME_PAUSEBUTTON(1121),
+	CC_SETFILLCOLOUR(1123),
+	CC_SETLINEDIRECTION(1126),
+	CC_SETOBJECT(1200),
+	CC_SETNPCHEAD(1201),
+	CC_SETPLAYERHEAD_SELF(1202),
+	CC_SETOBJECT_NONUM(1205),
+	CC_SETOBJECT_ALWAYS_NUM(1212),
+	CC_SETOP(1300),
+	CC_SETDRAGGABLE(1301),
+	CC_SETDRAGGABLEBEHAVIOR(1302),
+	CC_SETDRAGDEADZONE(1303),
+	CC_SETDRAGDEADTIME(1304),
+	CC_SETOPBASE(1305),
+	CC_SETTARGETVERB(1306),
+	CC_CLEAROPS(1307),
+	CC_SETONCLICK(1400),
+	CC_SETONHOLD(1401),
+	CC_SETONRELEASE(1402),
+	CC_SETONMOUSEOVER(1403),
+	CC_SETONMOUSELEAVE(1404),
+	CC_SETONDRAG(1405),
+	CC_SETONTARGETLEAVE(1406),
+	CC_SETONVARTRANSMIT(1407),
+	CC_SETONTIMER(1408),
+	CC_SETONOP(1409),
+	CC_SETONDRAGCOMPLETE(1410),
+	CC_SETONCLICKREPEAT(1411),
+	CC_SETONMOUSEREPEAT(1412),
+	CC_SETONINVTRANSMIT(1414),
+	CC_SETONSTATTRANSMIT(1415),
+	CC_SETONTARGETENTER(1416),
+	CC_SETONSCROLLWHEEL(1417),
+	CC_SETONCHATTRANSMIT(1418),
+	CC_SETONKEY(1419),
+	CC_SETONFRIENDTRANSMIT(1420),
+	CC_SETONCLANTRANSMIT(1421),
+	CC_SETONMISCTRANSMIT(1422),
+	CC_SETONDIALOGABORT(1423),
+	CC_SETONSUBCHANGE(1424),
+	CC_SETONSTOCKTRANSMIT(1425),
+	CC_SETONRESIZE(1427),
+	CC_GETX(1500),
+	CC_GETY(1501),
+	CC_GETWIDTH(1502),
+	CC_GETHEIGHT(1503),
+	CC_GETHIDE(1504),
+	CC_GETLAYER(1505),
+	CC_GETSCROLLX(1600),
+	CC_GETSCROLLY(1601),
+	CC_GETTEXT(1602),
+	CC_GETSCROLLWIDTH(1603),
+	CC_GETSCROLLHEIGHT(1604),
+	CC_GETMODELZOOM(1605),
+	CC_GETMODELANGLE_X(1606),
+	CC_GETMODELANGLE_Z(1607),
+	CC_GETMODELANGLE_Y(1608),
+	CC_GETTRANS(1609),
+	CC_GETCOLOUR(1611),
+	CC_GETFILLCOLOUR(1612),
+	CC_GETINVOBJECT(1700),
+	CC_GETINVCOUNT(1701),
+	CC_GETID(1702),
+	CC_GETTARGETMASK(1800),
+	CC_GETOP(1801),
+	CC_GETOPBASE(1802),
+	CC_CALLONRESIZE(1927),
+	IF_SETPOSITION(2000),
+	IF_SETSIZE(2001),
+	IF_SETHIDE(2003),
+	IF_SETNOCLICKTHROUGH(2005),
+	IF_SETSCROLLPOS(2100),
+	IF_SETCOLOUR(2101),
+	IF_SETFILL(2102),
+	IF_SETTRANS(2103),
+	IF_SETLINEWID(2104),
+	IF_SETGRAPHIC(2105),
+	IF_SET2DANGLE(2106),
+	IF_SETTILING(2107),
+	IF_SETMODEL(2108),
+	IF_SETMODELANGLE(2109),
+	IF_SETMODELANIM(2110),
+	IF_SETMODELORTHOG(2111),
+	IF_SETTEXT(2112),
+	IF_SETTEXTFONT(2113),
+	IF_SETTEXTALIGN(2114),
+	IF_SETTEXTSHADOW(2115),
+	IF_SETOUTLINE(2116),
+	IF_SETGRAPHICSHADOW(2117),
+	IF_SETVFLIP(2118),
+	IF_SETHFLIP(2119),
+	IF_SETSCROLLSIZE(2120),
+	IF_RESUME_PAUSEBUTTON(2121),
+	IF_SETFILLCOLOUR(2123),
+	IF_SETLINEDIRECTION(2126),
+	IF_SETOBJECT(2200),
+	IF_SETNPCHEAD(2201),
+	IF_SETPLAYERHEAD_SELF(2202),
+	IF_SETOBJECT_NONUM(2205),
+	IF_SETOBJECT_ALWAYS_NUM(2212),
+	IF_SETOP(2300),
+	IF_SETDRAGGABLE(2301),
+	IF_SETDRAGGABLEBEHAVIOR(2302),
+	IF_SETDRAGDEADZONE(2303),
+	IF_SETDRAGDEADTIME(2304),
+	IF_SETOPBASE(2305),
+	IF_SETTARGETVERB(2306),
+	IF_CLEAROPS(2307),
+	IF_SETOPKEY(2350),
+	IF_SETOPTKEY(2351),
+	IF_SETOPKEYRATE(2352),
+	IF_SETOPTKEYRATE(2353),
+	IF_SETOPKEYIGNOREHELD(2354),
+	IF_SETOPTKEYIGNOREHELD(2355),
+	IF_SETONCLICK(2400),
+	IF_SETONHOLD(2401),
+	IF_SETONRELEASE(2402),
+	IF_SETONMOUSEOVER(2403),
+	IF_SETONMOUSELEAVE(2404),
+	IF_SETONDRAG(2405),
+	IF_SETONTARGETLEAVE(2406),
+	IF_SETONVARTRANSMIT(2407),
+	IF_SETONTIMER(2408),
+	IF_SETONOP(2409),
+	IF_SETONDRAGCOMPLETE(2410),
+	IF_SETONCLICKREPEAT(2411),
+	IF_SETONMOUSEREPEAT(2412),
+	IF_SETONINVTRANSMIT(2414),
+	IF_SETONSTATTRANSMIT(2415),
+	IF_SETONTARGETENTER(2416),
+	IF_SETONSCROLLWHEEL(2417),
+	IF_SETONCHATTRANSMIT(2418),
+	IF_SETONKEY(2419),
+	IF_SETONFRIENDTRANSMIT(2420),
+	IF_SETONCLANTRANSMIT(2421),
+	IF_SETONMISCTRANSMIT(2422),
+	IF_SETONDIALOGABORT(2423),
+	IF_SETONSUBCHANGE(2424),
+	IF_SETONSTOCKTRANSMIT(2425),
+	IF_SETONRESIZE(2427),
+	IF_GETX(2500),
+	IF_GETY(2501),
+	IF_GETWIDTH(2502),
+	IF_GETHEIGHT(2503),
+	IF_GETHIDE(2504),
+	IF_GETLAYER(2505),
+	IF_GETSCROLLX(2600),
+	IF_GETSCROLLY(2601),
+	IF_GETTEXT(2602),
+	IF_GETSCROLLWIDTH(2603),
+	IF_GETSCROLLHEIGHT(2604),
+	IF_GETMODELZOOM(2605),
+	IF_GETMODELANGLE_X(2606),
+	IF_GETMODELANGLE_Z(2607),
+	IF_GETMODELANGLE_Y(2608),
+	IF_GETTRANS(2609),
+	IF_GETCOLOUR(2611),
+	IF_GETFILLCOLOUR(2612),
+	IF_GETINVOBJECT(2700),
+	IF_GETINVCOUNT(2701),
+	IF_HASSUB(2702),
+	IF_GETTOP(2706),
+	IF_GETTARGETMASK(2800),
+	IF_GETOP(2801),
+	IF_GETOPBASE(2802),
+	IF_CALLONRESIZE(2927),
+	MES(3100),
+	ANIM(3101),
+	IF_CLOSE(3103),
+	RESUME_COUNTDIALOG(3104),
+	RESUME_NAMEDIALOG(3105),
+	RESUME_STRINGDIALOG(3106),
+	OPPLAYER(3107),
+	IF_DRAGPICKUP(3108),
+	CC_DRAGPICKUP(3109),
+	MOUSECAM(3110),
+	GETREMOVEROOFS(3111),
+	SETREMOVEROOFS(3112),
+	OPENURL(3113),
+	RESUME_OBJDIALOG(3115),
+	BUG_REPORT(3116),
+	SETSHIFTCLICKDROP(3117),
+	SETSHOWMOUSEOVERTEXT(3118),
+	RENDERSELF(3119),
+	SETSHOWMOUSECROSS(3125),
+	SETSHOWLOADINGMESSAGES(3126),
+	SETTAPTODROP(3127),
+	GETTAPTODROP(3128),
+	SETOCULUSORBSPEED(3129),
+	GETCANVASSIZE(3132),
+	SETHIDEUSERNAME(3141),
+	GETHIDEUSERNAME(3142),
+	SETREMEMBERUSERNAME(3143),
+	GETREMEMBERUSERNAME(3144),
+	SETTITLEMUSICENABLED(3146),
+	GETTITLEMUSICENABLED(3147),
+	SOUND_SYNTH(3200),
+	SOUND_SONG(3201),
+	SOUND_JINGLE(3202),
+	CLIENTCLOCK(3300),
+	INV_GETOBJ(3301),
+	INV_GETNUM(3302),
+	INV_TOTAL(3303),
+	INV_SIZE(3304),
+	STAT(3305),
+	STAT_BASE(3306),
+	STAT_XP(3307),
+	COORD(3308),
+	COORDX(3309),
+	COORDZ(3310),
+	COORDY(3311),
+	MAP_MEMBERS(3312),
+	INVOTHER_GETOBJ(3313),
+	INVOTHER_GETNUM(3314),
+	INVOTHER_TOTAL(3315),
+	STAFFMODLEVEL(3316),
+	REBOOTTIMER(3317),
+	MAP_WORLD(3318),
+	RUNENERGY_VISIBLE(3321),
+	RUNWEIGHT_VISIBLE(3322),
+	PLAYERMOD(3323),
+	WORLDFLAGS(3324),
+	MOVECOORD(3325),
+	ENUM_STRING(3400),
+	ENUM(3408),
+	ENUM_GETOUTPUTCOUNT(3411),
+	FRIEND_COUNT(3600),
+	FRIEND_GETNAME(3601),
+	FRIEND_GETWORLD(3602),
+	FRIEND_GETRANK(3603),
+	FRIEND_SETRANK(3604),
+	FRIEND_ADD(3605),
+	FRIEND_DEL(3606),
+	IGNORE_ADD(3607),
+	IGNORE_DEL(3608),
+	FRIEND_TEST(3609),
+	CLAN_GETCHATDISPLAYNAME(3611),
+	CLAN_GETCHATCOUNT(3612),
+	CLAN_GETCHATUSERNAME(3613),
+	CLAN_GETCHATUSERWORLD(3614),
+	CLAN_GETCHATUSERRANK(3615),
+	CLAN_GETCHATMINKICK(3616),
+	CLAN_KICKUSER(3617),
+	CLAN_GETCHATRANK(3618),
+	CLAN_JOINCHAT(3619),
+	CLAN_LEAVECHAT(3620),
+	IGNORE_COUNT(3621),
+	IGNORE_GETNAME(3622),
+	IGNORE_TEST(3623),
+	CLAN_ISSELF(3624),
+	CLAN_GETCHATOWNERNAME(3625),
+	CLAN_ISFRIEND(3626),
+	CLAN_ISIGNORE(3627),
+	STOCKMARKET_GETOFFERTYPE(3903),
+	STOCKMARKET_GETOFFERITEM(3904),
+	STOCKMARKET_GETOFFERPRICE(3905),
+	STOCKMARKET_GETOFFERCOUNT(3906),
+	STOCKMARKET_GETOFFERCOMPLETEDCOUNT(3907),
+	STOCKMARKET_GETOFFERCOMPLETEDGOLD(3908),
+	STOCKMARKET_ISOFFEREMPTY(3910),
+	STOCKMARKET_ISOFFERSTABLE(3911),
+	STOCKMARKET_ISOFFERFINISHED(3912),
+	STOCKMARKET_ISOFFERADDING(3913),
+	TRADINGPOST_SORTBY_NAME(3914),
+	TRADINGPOST_SORTBY_PRICE(3915),
+	TRADINGPOST_SORTFILTERBY_WORLD(3916),
+	TRADINGPOST_SORTBY_AGE(3917),
+	TRADINGPOST_SORTBY_COUNT(3918),
+	TRADINGPOST_GETTOTALOFFERS(3919),
+	TRADINGPOST_GETOFFERWORLD(3920),
+	TRADINGPOST_GETOFFERNAME(3921),
+	TRADINGPOST_GETOFFERPREVIOUSNAME(3922),
+	TRADINGPOST_GETOFFERAGE(3923),
+	TRADINGPOST_GETOFFERCOUNT(3924),
+	TRADINGPOST_GETOFFERPRICE(3925),
+	TRADINGPOST_GETOFFERITEM(3926),
+	ADD(4000),
+	SUB(4001),
+	MULTIPLY(4002),
+	DIV(4003),
+	RANDOM(4004),
+	RANDOMINC(4005),
+	INTERPOLATE(4006),
+	ADDPERCENT(4007),
+	SETBIT(4008),
+	CLEARBIT(4009),
+	TESTBIT(4010),
+	MOD(4011),
+	POW(4012),
+	INVPOW(4013),
+	AND(4014),
+	OR(4015),
+	SCALE(4018),
+	APPEND_NUM(4100),
+	APPEND(4101),
+	APPEND_SIGNNUM(4102),
+	LOWERCASE(4103),
+	FROMDATE(4104),
+	TEXT_GENDER(4105),
+	TOSTRING(4106),
+	COMPARE(4107),
+	PARAHEIGHT(4108),
+	PARAWIDTH(4109),
+	TEXT_SWITCH(4110),
+	ESCAPE(4111),
+	APPEND_CHAR(4112),
+	CHAR_ISPRINTABLE(4113),
+	CHAR_ISALPHANUMERIC(4114),
+	CHAR_ISALPHA(4115),
+	CHAR_ISNUMERIC(4116),
+	STRING_LENGTH(4117),
+	SUBSTRING(4118),
+	REMOVETAGS(4119),
+	STRING_INDEXOF_CHAR(4120),
+	STRING_INDEXOF_STRING(4121),
+	UPPERCASE(4122),
+	OC_NAME(4200),
+	OC_OP(4201),
+	OC_IOP(4202),
+	OC_COST(4203),
+	OC_STACKABLE(4204),
+	OC_CERT(4205),
+	OC_UNCERT(4206),
+	OC_MEMBERS(4207),
+	OC_PLACEHOLDER(4208),
+	OC_UNPLACEHOLDER(4209),
+	OC_FIND(4210),
+	OC_FINDNEXT(4211),
+	OC_FINDRESET(4212),
+	CHAT_GETFILTER_PUBLIC(5000),
+	CHAT_SETFILTER(5001),
+	CHAT_SENDABUSEREPORT(5002),
+	CHAT_GETHISTORY_BYTYPEANDLINE(5003),
+	CHAT_GETHISTORY_BYUID(5004),
+	CHAT_GETFILTER_PRIVATE(5005),
+	CHAT_SENDPUBLIC(5008),
+	CHAT_SENDPRIVATE(5009),
+	CHAT_PLAYERNAME(5015),
+	CHAT_GETFILTER_TRADE(5016),
+	CHAT_GETHISTORYLENGTH(5017),
+	CHAT_GETNEXTUID(5018),
+	CHAT_GETPREVUID(5019),
+	DOCHEAT(5020),
+	CHAT_SETMESSAGEFILTER(5021),
+	CHAT_GETMESSAGEFILTER(5022),
+	GETWINDOWMODE(5306),
+	SETWINDOWMODE(5307),
+	GETDEFAULTWINDOWMODE(5308),
+	SETDEFAULTWINDOWMODE(5309),
+	CAM_FORCEANGLE(5504),
+	CAM_GETANGLE_XA(5505),
+	CAM_GETANGLE_YA(5506),
+	CAM_SETFOLLOWHEIGHT(5530),
+	CAM_GETFOLLOWHEIGHT(5531),
+	LOGOUT(5630),
+	VIEWPORT_SETFOV(6200),
+	VIEWPORT_SETZOOM(6201),
+	VIEWPORT_CLAMPFOV(6202),
+	VIEWPORT_GETEFFECTIVESIZE(6203),
+	VIEWPORT_GETZOOM(6204),
+	VIEWPORT_GETFOV(6205),
+	WORLDLIST_FETCH(6500),
+	WORLDLIST_START(6501),
+	WORLDLIST_NEXT(6502),
+	WORLDLIST_SPECIFIC(6506),
+	WORLDLIST_SORT(6507),
+	GETWORLDINFO(6511),
+	SETFOLLOWEROPSLOWPRIORITY(6512),
+	NC_PARAM(6513),
+	LC_PARAM(6514),
+	OC_PARAM(6515),
+	STRUCT_PARAM(6516),
+	ON_MOBILE(6518),
+	CLIENTTYPE(6519),
+	BATTERYLEVEL(6524),
+	BATTERYCHARGING(6525),
+	WIFIAVAILABLE(6526),
+	WORLDMAP_GETMAPNAME(6601),
+	WORLDMAP_SETMAP(6602),
+	WORLDMAP_GETZOOM(6603),
+	WORLDMAP_SETZOOM(6604),
+	WORLDMAP_ISLOADED(6605),
+	WORLDMAP_JUMPTODISPLAYCOORD(6606),
+	WORLDMAP_JUMPTODISPLAYCOORD_INSTANT(6607),
+	WORLDMAP_JUMPTOSOURCECOORD(6608),
+	WORLDMAP_JUMPTOSOURCECOORD_INSTANT(6609),
+	WORLDMAP_GETDISPLAYPOSITION(6610),
+	WORLDMAP_GETCONFIGORIGIN(6611),
+	WORLDMAP_GETCONFIGSIZE(6612),
+	WORLDMAP_GETCONFIGBOUNDS(6613),
+	WORLDMAP_GETCONFIGZOOM(6614),
+	WORLDMAP_GETCURRENTMAP(6616),
+	WORLDMAP_GETDISPLAYCOORD(6617),
+	WORLDMAP_COORDINMAP(6621),
+	WORLDMAP_GETSIZE(6622),
+	WORLDMAP_PERPETUALFLASH(6628),
+	WORLDMAP_FLASHELEMENT(6629),
+	WORLDMAP_FLASHELEMENTCATEGORY(6630),
+	WORLDMAP_STOPCURRENTFLASHES(6631),
+	WORLDMAP_DISABLEELEMENTS(6632),
+	WORLDMAP_DISABLEELEMENT(6633),
+	WORLDMAP_DISABLEELEMENTCATEGORY(6634),
+	WORLDMAP_GETDISABLEELEMENTS(6635),
+	WORLDMAP_GETDISABLEELEMENT(6636),
+	WORLDMAP_GETDISABLEELEMENTCATEGORY(6637),
+	WORLDMAP_LISTELEMENT_START(6639),
+	WORLDMAP_LISTELEMENT_NEXT(6640),
+	MEC_TEXT(6693),
+	MEC_TEXTSIZE(6694),
+	MEC_CATEGORY(6695),
+	MEC_SPRITE(6696);
+
+	public final int opcode;
+
+	ScriptOpcode(int opcode)
+	{
+		this.opcode = opcode;
+	}
+
+	private static final Map<Integer, ScriptOpcode> map;
+
+	static
+	{
+		ImmutableMap.Builder<Integer, ScriptOpcode> builder = ImmutableMap.builder();
+
+		for (ScriptOpcode value : values())
+		{
+			builder.put(value.opcode, value);
+		}
+
+		map = builder.build();
+	}
+
+	public static String nameFromID(int opcode)
+	{
+		ScriptOpcode op = map.get(opcode);
+
+		if (op == null)
+		{
+			return null;
+		}
+
+		return op.name();
+	}
+}
diff --git a/deobfuscator/src/main/java/net/runelite/deob/updater/ParameterRenamer.java b/deobfuscator/src/main/java/net/runelite/deob/updater/ParameterRenamer.java
index 4b2dbc78d0..dee849b75b 100644
--- a/deobfuscator/src/main/java/net/runelite/deob/updater/ParameterRenamer.java
+++ b/deobfuscator/src/main/java/net/runelite/deob/updater/ParameterRenamer.java
@@ -24,9 +24,12 @@
  */
 package net.runelite.deob.updater;
 
+import java.util.List;
 import net.runelite.asm.ClassFile;
 import net.runelite.asm.ClassGroup;
 import net.runelite.asm.Method;
+import net.runelite.asm.attributes.code.LocalVariable;
+import net.runelite.asm.attributes.code.Parameter;
 import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping;
 
 public class ParameterRenamer
@@ -49,9 +52,39 @@ public class ParameterRenamer
 			for (Method sourceM : sourceCF.getMethods())
 			{
 				Method destM = (Method) mapping.get(sourceM);
-				if (destM != null)
+				if (sourceM.getParameters() != null && !sourceM.getParameters().isEmpty() && destM.getParameters().size() >= 1)
 				{
-					destM.setParameters(sourceM.getParameters());
+					List<Parameter> oldParams = destM.getParameters();
+					for (int i = 0; i < sourceM.getParameters().size(); i++)
+					{
+						String name = sourceM.getParameters().get(i).getName();
+						if (name.matches("arg[0-9]") || name.length() <= 2 && (name.charAt(0) != 'x' || name.charAt(0) != 'y'))
+						{
+							continue;
+						}
+
+						Parameter oldParam = oldParams.get(i);
+						LocalVariable oldVar = oldParam.getLocalVariable();
+
+						Parameter newParam = new Parameter(name, oldParam.getAccess());
+						oldParams.set(i, newParam);
+
+						if (oldVar == null)
+						{
+							continue;
+						}
+
+						LocalVariable newVar = new LocalVariable(
+							name,
+							oldVar.getDesc(),
+							oldVar.getSignature(),
+							oldVar.getStart(),
+							oldVar.getEnd(),
+							oldVar.getIndex()
+						);
+
+						newParam.setLocalVariable(newVar);
+					}
 				}
 			}
 		}
diff --git a/deobfuscator/src/main/java/net/runelite/deob/updater/UpdateMappings.java b/deobfuscator/src/main/java/net/runelite/deob/updater/UpdateMappings.java
index db6ed0ef1c..bceda1fe1b 100644
--- a/deobfuscator/src/main/java/net/runelite/deob/updater/UpdateMappings.java
+++ b/deobfuscator/src/main/java/net/runelite/deob/updater/UpdateMappings.java
@@ -26,24 +26,20 @@ package net.runelite.deob.updater;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Map;
 import net.runelite.asm.ClassGroup;
-import net.runelite.asm.Field;
-import net.runelite.asm.Method;
-import net.runelite.deob.deobfuscators.Renamer;
 import net.runelite.deob.deobfuscators.mapping.AnnotationIntegrityChecker;
 import net.runelite.deob.deobfuscators.mapping.AnnotationMapper;
 import net.runelite.deob.deobfuscators.mapping.Mapper;
 import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping;
+import net.runelite.deob.deobfuscators.transformers.ScriptOpcodesTransformer;
 import net.runelite.deob.util.JarUtil;
-import net.runelite.deob.util.NameMappings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class UpdateMappings
 {
 	private static final Logger logger = LoggerFactory.getLogger(UpdateMappings.class);
-	private static boolean renameRL = true;
+
 	private final ClassGroup group1, group2;
 
 	public UpdateMappings(ClassGroup group1, ClassGroup group2)
@@ -77,32 +73,8 @@ public class UpdateMappings
 
 		ParameterRenamer pr = new ParameterRenamer(group1, group2, mapping);
 		pr.run();
-	}
 
-	public void updateRL()
-	{
-		Mapper mapper = new Mapper(group1, group2);
-		mapper.run();
-		ParallelExecutorMapping mapping = mapper.getMapping();
-		NameMappings names = new NameMappings();
-
-		for (Map.Entry<Object, Object> e : mapping.getMap().entrySet())
-		{
-			Object k = e.getKey();
-			Object v = e.getValue();
-
-			if (k instanceof Field)
-			{
-				names.map(((Field) v).getPoolField(), ((Field) k).getName());
-			}
-			else if (k instanceof Method)
-			{
-				names.map(((Method) v).getPoolMethod(), ((Method) k).getName());
-			}
-		}
-
-		Renamer renamer = new Renamer(names);
-		renamer.run(group2);
+		new ScriptOpcodesTransformer().transform(group2);
 	}
 
 	public void save(File out) throws IOException
@@ -121,14 +93,7 @@ public class UpdateMappings
 			JarUtil.loadJar(new File(args[0])),
 			JarUtil.loadJar(new File(args[1]))
 		);
-		if (renameRL)
-		{
-			u.updateRL();
-		}
-		else
-		{
 			u.update();
-		}
 		u.save(new File(args[2]));
 	}
 }
diff --git a/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCleaner.java b/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCleaner.java
index fe137ec096..56d716cda2 100644
--- a/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCleaner.java
+++ b/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCleaner.java
@@ -1,5 +1,6 @@
 package net.runelite.deob.updater;
 
+import com.google.common.base.Strings;
 import java.io.File;
 import net.runelite.asm.ClassFile;
 import net.runelite.asm.ClassGroup;
@@ -39,6 +40,16 @@ public class AnnotationCleaner
 
 			log.debug("Checking {}", c.toString());
 
+			String implementingName = DeobAnnotations.getImplements(c);
+			if (!Strings.isNullOrEmpty(implementingName))
+			{
+				assertEquals(c + " implements " + implementingName + " but is called " + c.getClassName(), implementingName, c.getClassName());
+			}
+			else
+			{
+				assertTrue(c + " isn't obfuscated but doesn't have @Implements", Deob.isObfuscated(c.getClassName()));
+			}
+
 			for (Field f : c.getFields())
 			{
 				Annotations an = f.getAnnotations();
@@ -48,11 +59,11 @@ public class AnnotationCleaner
 
 				if (exportedName == null)
 				{
-					assertTrue("Field " + fieldName + " isn't obfuscated but doesn't have @Export.", Deob.isObfuscated(fieldName) || fieldName.contains("$"));
+					assertTrue("Field " + c.getClassName() + '.' + fieldName + " isn't obfuscated but doesn't have @Export.", Deob.isObfuscated(fieldName) || fieldName.equals(DeobAnnotations.getObfuscatedName(an)) || DeobAnnotations.getObfuscatedName(an) == null);
 					continue;
 				}
 
-				assertEquals("Field " + fieldName + " has " + exportedName + " in @Export", fieldName, exportedName);
+				assertEquals("Field " + c.getClassName() + '.' + fieldName + " has " + exportedName + " in @Export", fieldName, exportedName);
 			}
 
 			for (Method m : c.getMethods())
@@ -64,11 +75,11 @@ public class AnnotationCleaner
 
 				if (exportedName == null)
 				{
-					assertTrue("Method " + fieldName + " isn't obfuscated but doesn't have @Export.", Deob.isObfuscated(fieldName) || fieldName.endsWith("init>") || fieldName.equals("values") || fieldName.equals("valueOf") || fieldName.startsWith("compareTo") || fieldName.equals("equals") || fieldName.equals("hashCode") || fieldName.equals("compare"));
+					assertTrue("Method " + c.getClassName() + '.' + fieldName + " isn't obfuscated but doesn't have @Export.", Deob.isObfuscated(fieldName) || fieldName.equals(DeobAnnotations.getObfuscatedName(an)) || DeobAnnotations.getObfuscatedName(an) == null);
 					continue;
 				}
 
-				assertEquals("Method " + fieldName + " has " + exportedName + " in @Export", fieldName, exportedName);
+				assertEquals("Method " + c.getClassName() + '.' + fieldName + " has " + exportedName + " in @Export", fieldName, exportedName);
 			}
 		}
 	}
diff --git a/deobfuscator/src/test/java/net/runelite/deob/updater/UpdateMappingsTest.java b/deobfuscator/src/test/java/net/runelite/deob/updater/UpdateMappingsTest.java
index 332e2e31b0..bb34282e22 100644
--- a/deobfuscator/src/test/java/net/runelite/deob/updater/UpdateMappingsTest.java
+++ b/deobfuscator/src/test/java/net/runelite/deob/updater/UpdateMappingsTest.java
@@ -37,6 +37,7 @@ import net.runelite.deob.deobfuscators.mapping.AnnotationIntegrityChecker;
 import net.runelite.deob.deobfuscators.mapping.AnnotationMapper;
 import net.runelite.deob.deobfuscators.mapping.Mapper;
 import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping;
+import net.runelite.deob.deobfuscators.transformers.ScriptOpcodesTransformer;
 import net.runelite.deob.util.JarUtil;
 import org.junit.Assert;
 import org.junit.Ignore;
@@ -87,6 +88,19 @@ public class UpdateMappingsTest
 		check(group1, group2);
 	}
 
+	@Test
+	@Ignore
+	public void testScriptopcodes() throws Exception
+	{
+		File client = new File("C:\\Users\\Lucas\\IdeaProjects\\runelitexxx\\client.jar");
+
+		ClassGroup group = JarUtil.loadJar(client);
+
+		new ScriptOpcodesTransformer().transform(group);
+
+		JarUtil.saveJar(group, new File("C:/Users/Lucas/Desktop/Apapapapapap.jar"));
+	}
+
 	private void unannotate(ClassGroup group)
 	{
 		for (ClassFile cf : group.getClasses())
diff --git a/deobfuscator/src/test/java/net/runelite/runesuite/HookClass.java b/deobfuscator/src/test/java/net/runelite/runesuite/HookClass.java
index 5b7caf9d80..bec9caf813 100644
--- a/deobfuscator/src/test/java/net/runelite/runesuite/HookClass.java
+++ b/deobfuscator/src/test/java/net/runelite/runesuite/HookClass.java
@@ -8,7 +8,6 @@ public class HookClass
 	@SerializedName("class")
 	String clazz;
 	String name;
-	int access;
 	List<HookField> fields;
 	List<HookMethod> methods;
 }
diff --git a/deobfuscator/src/test/java/net/runelite/runesuite/HookField.java b/deobfuscator/src/test/java/net/runelite/runesuite/HookField.java
index c5219be785..d7db94eab6 100644
--- a/deobfuscator/src/test/java/net/runelite/runesuite/HookField.java
+++ b/deobfuscator/src/test/java/net/runelite/runesuite/HookField.java
@@ -5,7 +5,6 @@ public class HookField
 	String field;
 	String owner;
 	String name;
-	int access;
 
 	@Override
 	public String toString()
diff --git a/deobfuscator/src/test/java/net/runelite/runesuite/HookImporter.java b/deobfuscator/src/test/java/net/runelite/runesuite/HookImporter.java
index c4a7892a1f..5c78be64f1 100644
--- a/deobfuscator/src/test/java/net/runelite/runesuite/HookImporter.java
+++ b/deobfuscator/src/test/java/net/runelite/runesuite/HookImporter.java
@@ -39,6 +39,8 @@ import net.runelite.asm.Type;
 import net.runelite.asm.attributes.Annotations;
 import net.runelite.asm.attributes.annotation.Annotation;
 import net.runelite.asm.attributes.annotation.Element;
+import net.runelite.asm.attributes.code.LocalVariable;
+import net.runelite.asm.attributes.code.Parameter;
 import net.runelite.asm.signature.Signature;
 import net.runelite.asm.signature.util.VirtualMethods;
 import static net.runelite.deob.DeobAnnotations.EXPORT;
@@ -97,7 +99,7 @@ public class HookImporter
 	@Ignore
 	public void importHooks()
 	{
-		int classes = 0, fields = 0, methods = 0, access = 0;
+		int classes = 0, fields = 0, methods = 0, params = 0;
 		NameMappings mappings = new NameMappings();
 
 		for (HookClass hc : hooks)
@@ -107,12 +109,6 @@ public class HookImporter
 
 			assert cf != null;
 
-			if (cf.getAccess() != hc.access)
-			{
-				cf.setAccess(hc.access);
-				++access;
-			}
-
 			String implementsName = getAnnotation(cf.getAnnotations(), IMPLEMENTS);
 			if (implementsName.isEmpty())
 			{
@@ -122,23 +118,28 @@ public class HookImporter
 				++classes;
 			}
 
+			if (!implementsName.isEmpty() && !implementsName.equals(hc.clazz))
+			{
+				logger.info("Runestar calls class {} {}, while we call it {}", hc.name, hc.clazz, implementsName);
+			}
+
 			for (HookField fh : hc.fields)
 			{
+				if (fh.field.startsWith("__"))
+				{
+					continue;
+				}
+
 				ClassFile cf2 = findClassWithObfuscatedName(fh.owner);
 				assert cf2 != null;
 
 				Field f = findFieldWithObfuscatedName(cf2, fh.name);
 				if (f == null)
 				{
+					logger.warn("Missing field {}", fh); // inlined constant maybe?
 					continue;
 				}
 
-				if (f.getAccessFlags() != fh.access)
-				{
-					f.setAccessFlags(fh.access);
-					++access;
-				}
-
 				String exportedName = getAnnotation(f.getAnnotations(), EXPORT);
 				if (exportedName.isEmpty())
 				{
@@ -155,11 +156,20 @@ public class HookImporter
 					mappings.map(f.getPoolField(), deobfuscatedFieldName);
 					++fields;
 				}
+
+				if (!exportedName.isEmpty() && !exportedName.equals(fh.field))
+				{
+					logger.info("Runestar calls field {}.{} {}, while we call it {}", fh.owner, fh.name, fh.field, exportedName);
+				}
 			}
 
 			outer:
 			for (HookMethod hm : hc.methods)
 			{
+				if (hm.method.startsWith("__"))
+				{
+					continue;
+				}
 
 				ClassFile cf2 = findClassWithObfuscatedName(hm.owner);
 				assert cf2 != null;
@@ -171,10 +181,40 @@ public class HookImporter
 					continue;
 				}
 
-				if (m.getAccessFlags() != hm.access)
+				if (hm.parameters != null && !hm.parameters.isEmpty() && m.getParameters().size() >= 1)
 				{
-					m.setAccessFlags(hm.access);
-					++access;
+					List<Parameter> oldParams = m.getParameters();
+					for (int i = 0; i < hm.parameters.size(); i++)
+					{
+						String name = hm.parameters.get(i);
+						if (name.matches("arg[0-9]") || name.length() <= 2 && (name.charAt(0) != 'x' && name.charAt(0) != 'y'))
+						{
+							continue;
+						}
+
+						Parameter oldParam = oldParams.get(i);
+						LocalVariable oldVar = oldParam.getLocalVariable();
+
+						Parameter newParam = new Parameter(name, oldParam.getAccess());
+						oldParams.set(i, newParam);
+						params++;
+
+						if (oldVar == null)
+						{
+							continue;
+						}
+
+						LocalVariable newVar = new LocalVariable(
+							name,
+							oldVar.getDesc(),
+							oldVar.getSignature(),
+							oldVar.getStart(),
+							oldVar.getEnd(),
+							oldVar.getIndex()
+						);
+
+						newParam.setLocalVariable(newVar);
+					}
 				}
 
 				// maybe only the base class method is exported
@@ -184,6 +224,10 @@ public class HookImporter
 					String exportedName = getAnnotation(method.getAnnotations(), EXPORT);
 					if (!exportedName.isEmpty())
 					{
+						if (!exportedName.equals(hm.method))
+						{
+							logger.info("Runestar calls {}.{} {}, while we call it {}", hm.owner, hm.name, hm.method, exportedName);
+						}
 						continue outer;
 					}
 				}
@@ -198,7 +242,7 @@ public class HookImporter
 		Renamer renamer = new Renamer(mappings);
 		renamer.run(group);
 
-		logger.info("Imported {} classes, {} fields, {} methods, {} access levels", classes, fields, methods, access);
+		logger.info("Imported {} classes, {} fields, {} methods, {} params", classes, fields, methods, params);
 	}
 
 	private ClassFile findClassWithObfuscatedName(String name)
@@ -259,8 +303,7 @@ public class HookImporter
 		{
 			for (Element e : a.getElements())
 			{
-				String str = (String) e.getValue();
-				return str;
+				return (String) e.getValue();
 			}
 		}
 
@@ -270,13 +313,13 @@ public class HookImporter
 	private Signature getObfuscatedMethodSignature(Method method)
 	{
 		String sig = getAnnotation(method.getAnnotations(), OBFUSCATED_SIGNATURE);
-		if (sig.isEmpty() == false)
-		{
-			return new Signature(sig); // if it is annotated, use that
-		}
-		else
+		if (sig.isEmpty())
 		{
 			return method.getDescriptor();
 		}
+		else
+		{
+			return new Signature(sig); // if it is annotated, use that
+		}
 	}
 }
diff --git a/deobfuscator/src/test/java/net/runelite/runesuite/HookMethod.java b/deobfuscator/src/test/java/net/runelite/runesuite/HookMethod.java
index 849c0d01c7..172917a565 100644
--- a/deobfuscator/src/test/java/net/runelite/runesuite/HookMethod.java
+++ b/deobfuscator/src/test/java/net/runelite/runesuite/HookMethod.java
@@ -1,12 +1,13 @@
 package net.runelite.runesuite;
 
+import java.util.List;
+
 public class HookMethod
 {
 	String method;
 	String owner;
 	String name;
-	int access;
-	String[] parameters;
+	List<String> parameters;
 	String descriptor;
 
 	@Override
diff --git a/deobfuscator/src/test/java/net/runelite/runesuite/hooks.json b/deobfuscator/src/test/java/net/runelite/runesuite/hooks.json
index e36464b4e9..56b4ddb42b 100644
--- a/deobfuscator/src/test/java/net/runelite/runesuite/hooks.json
+++ b/deobfuscator/src/test/java/net/runelite/runesuite/hooks.json
@@ -1,339 +1,12 @@
 [ {
-  "class" : "UrlRequest",
-  "name" : "ey",
+  "class" : "Formatting",
+  "name" : "cy",
   "super" : "java.lang.Object",
   "access" : 33,
   "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "isDone0",
-    "owner" : "ey",
-    "name" : "f",
-    "access" : 64,
-    "descriptor" : "Z"
-  }, {
-    "field" : "response0",
-    "owner" : "ey",
-    "name" : "q",
-    "access" : 64,
-    "descriptor" : "[B"
-  }, {
-    "field" : "url",
-    "owner" : "ey",
-    "name" : "m",
-    "access" : 16,
-    "descriptor" : "Ljava/net/URL;"
-  } ],
-  "methods" : [ {
-    "method" : "getResponse",
-    "owner" : "ey",
-    "name" : "f",
-    "access" : 1,
-    "parameters" : [ ],
-    "descriptor" : "(B)[B"
-  }, {
-    "method" : "isDone",
-    "owner" : "ey",
-    "name" : "m",
-    "access" : 1,
-    "parameters" : [ ],
-    "descriptor" : "(I)Z"
-  } ],
-  "constructors" : [ {
-    "access" : 0,
-    "descriptor" : "(Ljava/net/URL;)V"
-  } ]
-}, {
-  "class" : "ClientParameter",
-  "name" : "ji",
-  "super" : "java.lang.Object",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "id",
-    "owner" : "ji",
-    "name" : "y",
-    "access" : 17,
-    "descriptor" : "Ljava/lang/String;"
-  } ],
-  "methods" : [ ],
-  "constructors" : [ {
-    "access" : 0,
-    "descriptor" : "(Ljava/lang/String;Ljava/lang/String;)V"
-  } ]
-}, {
-  "class" : "Usernamed",
-  "name" : "ky",
-  "super" : "java.lang.Object",
-  "access" : 1537,
-  "interfaces" : [ ],
   "fields" : [ ],
-  "methods" : [ {
-    "method" : "username",
-    "owner" : "ky",
-    "name" : "kr",
-    "access" : 1025,
-    "descriptor" : "(B)Lkp;"
-  } ],
+  "methods" : [ ],
   "constructors" : [ ]
-}, {
-  "class" : "WorldMapLabel",
-  "name" : "aj",
-  "super" : "java.lang.Object",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "height",
-    "owner" : "aj",
-    "name" : "q",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : -85027761
-  }, {
-    "field" : "size",
-    "owner" : "aj",
-    "name" : "w",
-    "access" : 0,
-    "descriptor" : "Ls;"
-  }, {
-    "field" : "text",
-    "owner" : "aj",
-    "name" : "m",
-    "access" : 0,
-    "descriptor" : "Ljava/lang/String;"
-  }, {
-    "field" : "width",
-    "owner" : "aj",
-    "name" : "f",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : -471061617
-  } ],
-  "methods" : [ ],
-  "constructors" : [ {
-    "access" : 0,
-    "descriptor" : "(Ljava/lang/String;IILs;)V"
-  } ]
-}, {
-  "class" : "Canvas",
-  "name" : "ao",
-  "super" : "java.awt.Canvas",
-  "access" : 49,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "component",
-    "owner" : "ao",
-    "name" : "m",
-    "access" : 0,
-    "descriptor" : "Ljava/awt/Component;"
-  } ],
-  "methods" : [ {
-    "method" : "paint",
-    "owner" : "ao",
-    "name" : "paint",
-    "access" : 17,
-    "parameters" : [ "g" ],
-    "descriptor" : "(Ljava/awt/Graphics;)V"
-  }, {
-    "method" : "update",
-    "owner" : "ao",
-    "name" : "update",
-    "access" : 17,
-    "parameters" : [ "g" ],
-    "descriptor" : "(Ljava/awt/Graphics;)V"
-  } ],
-  "constructors" : [ {
-    "access" : 0,
-    "descriptor" : "(Ljava/awt/Component;)V"
-  } ]
-}, {
-  "class" : "SoundEnvelope",
-  "name" : "de",
-  "super" : "java.lang.Object",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "amplitude",
-    "owner" : "de",
-    "name" : "d",
-    "access" : 0,
-    "descriptor" : "I"
-  }, {
-    "field" : "durations",
-    "owner" : "de",
-    "name" : "f",
-    "access" : 0,
-    "descriptor" : "[I"
-  }, {
-    "field" : "end",
-    "owner" : "de",
-    "name" : "o",
-    "access" : 0,
-    "descriptor" : "I"
-  }, {
-    "field" : "form",
-    "owner" : "de",
-    "name" : "u",
-    "access" : 0,
-    "descriptor" : "I"
-  }, {
-    "field" : "max",
-    "owner" : "de",
-    "name" : "k",
-    "access" : 0,
-    "descriptor" : "I"
-  }, {
-    "field" : "phaseIndex",
-    "owner" : "de",
-    "name" : "l",
-    "access" : 0,
-    "descriptor" : "I"
-  }, {
-    "field" : "phases",
-    "owner" : "de",
-    "name" : "q",
-    "access" : 0,
-    "descriptor" : "[I"
-  }, {
-    "field" : "segments",
-    "owner" : "de",
-    "name" : "m",
-    "access" : 0,
-    "descriptor" : "I"
-  }, {
-    "field" : "start",
-    "owner" : "de",
-    "name" : "w",
-    "access" : 0,
-    "descriptor" : "I"
-  }, {
-    "field" : "step",
-    "owner" : "de",
-    "name" : "e",
-    "access" : 0,
-    "descriptor" : "I"
-  }, {
-    "field" : "ticks",
-    "owner" : "de",
-    "name" : "g",
-    "access" : 0,
-    "descriptor" : "I"
-  } ],
-  "methods" : [ {
-    "method" : "decode",
-    "owner" : "de",
-    "name" : "m",
-    "access" : 16,
-    "parameters" : [ "buffer" ],
-    "descriptor" : "(Lgr;)V"
-  }, {
-    "method" : "decodeSegments",
-    "owner" : "de",
-    "name" : "f",
-    "access" : 16,
-    "parameters" : [ "buffer" ],
-    "descriptor" : "(Lgr;)V"
-  }, {
-    "method" : "doStep",
-    "owner" : "de",
-    "name" : "w",
-    "access" : 16,
-    "parameters" : [ "n" ],
-    "descriptor" : "(I)I"
-  }, {
-    "method" : "reset",
-    "owner" : "de",
-    "name" : "q",
-    "access" : 16,
-    "parameters" : [ ],
-    "descriptor" : "()V"
-  } ],
-  "constructors" : [ {
-    "access" : 0,
-    "descriptor" : "()V"
-  } ]
-}, {
-  "class" : "ServerPacket",
-  "name" : "ge",
-  "super" : "java.lang.Object",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "id",
-    "owner" : "ge",
-    "name" : "cu",
-    "access" : 17,
-    "descriptor" : "I",
-    "decoder" : 1117211673
-  }, {
-    "field" : "length",
-    "owner" : "ge",
-    "name" : "cb",
-    "access" : 17,
-    "descriptor" : "I",
-    "decoder" : 947096829
-  } ],
-  "methods" : [ ],
-  "constructors" : [ {
-    "access" : 0,
-    "descriptor" : "(II)V"
-  } ]
-}, {
-  "class" : "ModelData0",
-  "name" : "ed",
-  "super" : "java.lang.Object",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ ],
-  "methods" : [ ],
-  "constructors" : [ {
-    "access" : 0,
-    "descriptor" : "()V"
-  } ]
-}, {
-  "class" : "SecureRandomFuture",
-  "name" : "cn",
-  "super" : "java.lang.Object",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "executor",
-    "owner" : "cn",
-    "name" : "m",
-    "access" : 0,
-    "descriptor" : "Ljava/util/concurrent/ExecutorService;"
-  }, {
-    "field" : "future",
-    "owner" : "cn",
-    "name" : "f",
-    "access" : 0,
-    "descriptor" : "Ljava/util/concurrent/Future;"
-  } ],
-  "methods" : [ {
-    "method" : "get",
-    "owner" : "cn",
-    "name" : "q",
-    "access" : 0,
-    "parameters" : [ ],
-    "descriptor" : "(I)Ljava/security/SecureRandom;"
-  }, {
-    "method" : "isDone",
-    "owner" : "cn",
-    "name" : "f",
-    "access" : 0,
-    "parameters" : [ ],
-    "descriptor" : "(I)Z"
-  }, {
-    "method" : "shutdown",
-    "owner" : "cn",
-    "name" : "m",
-    "access" : 0,
-    "parameters" : [ ],
-    "descriptor" : "(I)V"
-  } ],
-  "constructors" : [ {
-    "access" : 0,
-    "descriptor" : "()V"
-  } ]
 }, {
   "class" : "Task",
   "name" : "fm",
@@ -383,6 +56,86 @@
     "access" : 0,
     "descriptor" : "()V"
   } ]
+}, {
+  "class" : "GzipDecompressor",
+  "name" : "go",
+  "super" : "java.lang.Object",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "inflater",
+    "owner" : "go",
+    "name" : "m",
+    "access" : 0,
+    "descriptor" : "Ljava/util/zip/Inflater;"
+  } ],
+  "methods" : [ {
+    "method" : "decompress",
+    "owner" : "go",
+    "name" : "m",
+    "access" : 1,
+    "descriptor" : "(Lgr;[BB)V"
+  } ],
+  "constructors" : [ {
+    "access" : 1,
+    "descriptor" : "()V"
+  }, {
+    "access" : 0,
+    "descriptor" : "(III)V"
+  } ]
+}, {
+  "class" : "AbstractRasterProvider",
+  "name" : "lp",
+  "super" : "java.lang.Object",
+  "access" : 1057,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "height",
+    "owner" : "lp",
+    "name" : "o",
+    "access" : 1,
+    "descriptor" : "I",
+    "decoder" : -239960145
+  }, {
+    "field" : "pixels",
+    "owner" : "lp",
+    "name" : "q",
+    "access" : 1,
+    "descriptor" : "[I"
+  }, {
+    "field" : "width",
+    "owner" : "lp",
+    "name" : "w",
+    "access" : 1,
+    "descriptor" : "I",
+    "decoder" : -560298363
+  } ],
+  "methods" : [ {
+    "method" : "apply",
+    "owner" : "lp",
+    "name" : "b",
+    "access" : 17,
+    "parameters" : [ ],
+    "descriptor" : "(I)V"
+  }, {
+    "method" : "draw",
+    "owner" : "lp",
+    "name" : "q",
+    "access" : 1025,
+    "parameters" : [ "x", "y", "width", "height" ],
+    "descriptor" : "(IIIIB)V"
+  }, {
+    "method" : "drawFull",
+    "owner" : "lp",
+    "name" : "f",
+    "access" : 1025,
+    "parameters" : [ "x", "y" ],
+    "descriptor" : "(III)V"
+  } ],
+  "constructors" : [ {
+    "access" : 4,
+    "descriptor" : "()V"
+  } ]
 }, {
   "class" : "Clock",
   "name" : "fa",
@@ -410,39 +163,361 @@
     "descriptor" : "()V"
   } ]
 }, {
-  "class" : "ServerBuild",
-  "name" : "iy",
-  "super" : "java.lang.Object",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "id",
-    "owner" : "iy",
-    "name" : "u",
-    "access" : 17,
-    "descriptor" : "I",
-    "decoder" : -947415971
-  }, {
-    "field" : "name",
-    "owner" : "iy",
-    "name" : "o",
-    "access" : 17,
-    "descriptor" : "Ljava/lang/String;"
-  } ],
-  "methods" : [ ],
-  "constructors" : [ {
-    "access" : 0,
-    "descriptor" : "(Ljava/lang/String;I)V"
-  } ]
-}, {
-  "class" : "Formatting",
-  "name" : "cy",
+  "class" : "ByteArrayPool",
+  "name" : "gi",
   "super" : "java.lang.Object",
   "access" : 33,
   "interfaces" : [ ],
   "fields" : [ ],
   "methods" : [ ],
   "constructors" : [ ]
+}, {
+  "class" : "DevicePcmPlayer",
+  "name" : "ax",
+  "super" : "co",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "byteSamples",
+    "owner" : "ax",
+    "name" : "w",
+    "access" : 0,
+    "descriptor" : "[B"
+  }, {
+    "field" : "capacity2",
+    "owner" : "ax",
+    "name" : "q",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : -106586673
+  }, {
+    "field" : "format",
+    "owner" : "ax",
+    "name" : "m",
+    "access" : 0,
+    "descriptor" : "Ljavax/sound/sampled/AudioFormat;"
+  }, {
+    "field" : "line",
+    "owner" : "ax",
+    "name" : "f",
+    "access" : 0,
+    "descriptor" : "Ljavax/sound/sampled/SourceDataLine;"
+  } ],
+  "methods" : [ {
+    "method" : "close",
+    "owner" : "ax",
+    "name" : "o",
+    "access" : 4,
+    "parameters" : [ ],
+    "descriptor" : "(I)V"
+  }, {
+    "method" : "discard",
+    "owner" : "ax",
+    "name" : "u",
+    "access" : 4,
+    "parameters" : [ ],
+    "descriptor" : "(I)V"
+  }, {
+    "method" : "init",
+    "owner" : "ax",
+    "name" : "m",
+    "access" : 4,
+    "parameters" : [ ],
+    "descriptor" : "(I)V"
+  }, {
+    "method" : "open",
+    "owner" : "ax",
+    "name" : "f",
+    "access" : 4,
+    "parameters" : [ "bufferSize" ],
+    "descriptor" : "(II)V"
+  }, {
+    "method" : "position",
+    "owner" : "ax",
+    "name" : "q",
+    "access" : 4,
+    "parameters" : [ ],
+    "descriptor" : "(B)I"
+  }, {
+    "method" : "write",
+    "owner" : "ax",
+    "name" : "w",
+    "access" : 4,
+    "parameters" : [ ],
+    "descriptor" : "()V"
+  } ],
+  "constructors" : [ {
+    "access" : 0,
+    "descriptor" : "()V"
+  } ]
+}, {
+  "class" : "Canvas",
+  "name" : "ao",
+  "super" : "java.awt.Canvas",
+  "access" : 49,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "component",
+    "owner" : "ao",
+    "name" : "m",
+    "access" : 0,
+    "descriptor" : "Ljava/awt/Component;"
+  } ],
+  "methods" : [ {
+    "method" : "paint",
+    "owner" : "ao",
+    "name" : "paint",
+    "access" : 17,
+    "parameters" : [ "g" ],
+    "descriptor" : "(Ljava/awt/Graphics;)V"
+  }, {
+    "method" : "update",
+    "owner" : "ao",
+    "name" : "update",
+    "access" : 17,
+    "parameters" : [ "g" ],
+    "descriptor" : "(Ljava/awt/Graphics;)V"
+  } ],
+  "constructors" : [ {
+    "access" : 0,
+    "descriptor" : "(Ljava/awt/Component;)V"
+  } ]
+}, {
+  "class" : "ClientParameter",
+  "name" : "ji",
+  "super" : "java.lang.Object",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "id",
+    "owner" : "ji",
+    "name" : "y",
+    "access" : 17,
+    "descriptor" : "Ljava/lang/String;"
+  } ],
+  "methods" : [ ],
+  "constructors" : [ {
+    "access" : 0,
+    "descriptor" : "(Ljava/lang/String;Ljava/lang/String;)V"
+  } ]
+}, {
+  "class" : "MenuAction",
+  "name" : "cs",
+  "super" : "java.lang.Object",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "action",
+    "owner" : "cs",
+    "name" : "o",
+    "access" : 0,
+    "descriptor" : "Ljava/lang/String;"
+  }, {
+    "field" : "argument0",
+    "owner" : "cs",
+    "name" : "w",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : -2057883817
+  }, {
+    "field" : "argument1",
+    "owner" : "cs",
+    "name" : "m",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : 305977315
+  }, {
+    "field" : "argument2",
+    "owner" : "cs",
+    "name" : "f",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : 1764645917
+  }, {
+    "field" : "opcode",
+    "owner" : "cs",
+    "name" : "q",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : -1483856253
+  } ],
+  "methods" : [ ],
+  "constructors" : [ {
+    "access" : 0,
+    "descriptor" : "()V"
+  } ]
+}, {
+  "class" : "ClientPacket",
+  "name" : "gs",
+  "super" : "java.lang.Object",
+  "access" : 33,
+  "interfaces" : [ "gb" ],
+  "fields" : [ {
+    "field" : "id",
+    "owner" : "gs",
+    "name" : "cd",
+    "access" : 16,
+    "descriptor" : "I",
+    "decoder" : -286923745
+  }, {
+    "field" : "length",
+    "owner" : "gs",
+    "name" : "cx",
+    "access" : 16,
+    "descriptor" : "I",
+    "decoder" : -1759434223
+  } ],
+  "methods" : [ ],
+  "constructors" : [ {
+    "access" : 0,
+    "descriptor" : "(II)V"
+  } ]
+}, {
+  "class" : "TilePaint",
+  "name" : "eb",
+  "super" : "java.lang.Object",
+  "access" : 49,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "isFlat",
+    "owner" : "eb",
+    "name" : "u",
+    "access" : 0,
+    "descriptor" : "Z"
+  }, {
+    "field" : "neColor",
+    "owner" : "eb",
+    "name" : "q",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : -1668262341
+  }, {
+    "field" : "nwColor",
+    "owner" : "eb",
+    "name" : "w",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : -1057776035
+  }, {
+    "field" : "rgb",
+    "owner" : "eb",
+    "name" : "g",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : 2097947337
+  }, {
+    "field" : "seColor",
+    "owner" : "eb",
+    "name" : "f",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : -1875844515
+  }, {
+    "field" : "swColor",
+    "owner" : "eb",
+    "name" : "m",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : 181759449
+  }, {
+    "field" : "texture",
+    "owner" : "eb",
+    "name" : "o",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : 463308567
+  } ],
+  "methods" : [ ],
+  "constructors" : [ {
+    "access" : 0,
+    "descriptor" : "(IIIIIIZ)V"
+  } ]
+}, {
+  "class" : "AbstractByteArrayCopier",
+  "name" : "gu",
+  "super" : "java.lang.Object",
+  "access" : 1057,
+  "interfaces" : [ ],
+  "fields" : [ ],
+  "methods" : [ {
+    "method" : "get",
+    "owner" : "gu",
+    "name" : "m",
+    "access" : 1024,
+    "parameters" : [ ],
+    "descriptor" : "(I)[B"
+  }, {
+    "method" : "set",
+    "owner" : "gu",
+    "name" : "f",
+    "access" : 1024,
+    "parameters" : [ "array" ],
+    "descriptor" : "([BI)V"
+  } ],
+  "constructors" : [ {
+    "access" : 0,
+    "descriptor" : "()V"
+  } ]
+}, {
+  "class" : "ModelData0",
+  "name" : "ed",
+  "super" : "java.lang.Object",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ ],
+  "methods" : [ ],
+  "constructors" : [ {
+    "access" : 0,
+    "descriptor" : "()V"
+  } ]
+}, {
+  "class" : "Varps",
+  "name" : "hv",
+  "super" : "java.lang.Object",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ ],
+  "methods" : [ ],
+  "constructors" : [ ]
+}, {
+  "class" : "Strings",
+  "name" : "id",
+  "super" : "java.lang.Object",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ ],
+  "methods" : [ ],
+  "constructors" : [ ]
+}, {
+  "class" : "WorldMapCacheName",
+  "name" : "aw",
+  "super" : "java.lang.Object",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "name",
+    "owner" : "aw",
+    "name" : "u",
+    "access" : 17,
+    "descriptor" : "Ljava/lang/String;"
+  } ],
+  "methods" : [ ],
+  "constructors" : [ {
+    "access" : 0,
+    "descriptor" : "(Ljava/lang/String;)V"
+  } ]
+}, {
+  "class" : "TriBool",
+  "name" : "kd",
+  "super" : "java.lang.Object",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ ],
+  "methods" : [ ],
+  "constructors" : [ {
+    "access" : 0,
+    "descriptor" : "()V"
+  } ]
 }, {
   "class" : "Decimator",
   "name" : "dp",
@@ -496,24 +571,30 @@
     "descriptor" : "(II)V"
   } ]
 }, {
-  "class" : "AbstractByteArrayCopier",
-  "name" : "gu",
-  "super" : "java.lang.Object",
-  "access" : 1057,
+  "class" : "DirectByteArrayCopier",
+  "name" : "gv",
+  "super" : "gu",
+  "access" : 33,
   "interfaces" : [ ],
-  "fields" : [ ],
+  "fields" : [ {
+    "field" : "directBuffer",
+    "owner" : "gv",
+    "name" : "m",
+    "access" : 0,
+    "descriptor" : "Ljava/nio/ByteBuffer;"
+  } ],
   "methods" : [ {
     "method" : "get",
-    "owner" : "gu",
+    "owner" : "gv",
     "name" : "m",
-    "access" : 1024,
+    "access" : 0,
     "parameters" : [ ],
     "descriptor" : "(I)[B"
   }, {
     "method" : "set",
-    "owner" : "gu",
+    "owner" : "gv",
     "name" : "f",
-    "access" : 1024,
+    "access" : 0,
     "parameters" : [ "array" ],
     "descriptor" : "([BI)V"
   } ],
@@ -646,110 +727,197 @@
     "descriptor" : "()V"
   } ]
 }, {
-  "class" : "DevicePcmPlayer",
-  "name" : "ax",
-  "super" : "co",
+  "class" : "Usernamed",
+  "name" : "ky",
+  "super" : "java.lang.Object",
+  "access" : 1537,
+  "interfaces" : [ ],
+  "fields" : [ ],
+  "methods" : [ {
+    "method" : "username",
+    "owner" : "ky",
+    "name" : "kr",
+    "access" : 1025,
+    "descriptor" : "(B)Lkp;"
+  } ],
+  "constructors" : [ ]
+}, {
+  "class" : "SecureRandomFuture",
+  "name" : "cn",
+  "super" : "java.lang.Object",
   "access" : 33,
   "interfaces" : [ ],
   "fields" : [ {
-    "field" : "byteSamples",
-    "owner" : "ax",
-    "name" : "w",
-    "access" : 0,
-    "descriptor" : "[B"
-  }, {
-    "field" : "capacity2",
-    "owner" : "ax",
-    "name" : "q",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : -106586673
-  }, {
-    "field" : "format",
-    "owner" : "ax",
+    "field" : "executor",
+    "owner" : "cn",
     "name" : "m",
     "access" : 0,
-    "descriptor" : "Ljavax/sound/sampled/AudioFormat;"
+    "descriptor" : "Ljava/util/concurrent/ExecutorService;"
   }, {
-    "field" : "line",
-    "owner" : "ax",
+    "field" : "future",
+    "owner" : "cn",
     "name" : "f",
     "access" : 0,
-    "descriptor" : "Ljavax/sound/sampled/SourceDataLine;"
+    "descriptor" : "Ljava/util/concurrent/Future;"
   } ],
   "methods" : [ {
-    "method" : "close",
-    "owner" : "ax",
-    "name" : "o",
-    "access" : 4,
-    "parameters" : [ ],
-    "descriptor" : "(I)V"
-  }, {
-    "method" : "discard",
-    "owner" : "ax",
-    "name" : "u",
-    "access" : 4,
-    "parameters" : [ ],
-    "descriptor" : "(I)V"
-  }, {
-    "method" : "init",
-    "owner" : "ax",
-    "name" : "m",
-    "access" : 4,
-    "parameters" : [ ],
-    "descriptor" : "(I)V"
-  }, {
-    "method" : "open",
-    "owner" : "ax",
-    "name" : "f",
-    "access" : 4,
-    "parameters" : [ "bufferSize" ],
-    "descriptor" : "(II)V"
-  }, {
-    "method" : "position",
-    "owner" : "ax",
+    "method" : "get",
+    "owner" : "cn",
     "name" : "q",
-    "access" : 4,
+    "access" : 0,
     "parameters" : [ ],
-    "descriptor" : "(B)I"
+    "descriptor" : "(I)Ljava/security/SecureRandom;"
   }, {
-    "method" : "write",
-    "owner" : "ax",
-    "name" : "w",
-    "access" : 4,
+    "method" : "isDone",
+    "owner" : "cn",
+    "name" : "f",
+    "access" : 0,
     "parameters" : [ ],
-    "descriptor" : "()V"
+    "descriptor" : "(I)Z"
+  }, {
+    "method" : "shutdown",
+    "owner" : "cn",
+    "name" : "m",
+    "access" : 0,
+    "parameters" : [ ],
+    "descriptor" : "(I)V"
   } ],
   "constructors" : [ {
     "access" : 0,
     "descriptor" : "()V"
   } ]
 }, {
-  "class" : "ClientPacket",
-  "name" : "gs",
+  "class" : "ServerPacket",
+  "name" : "ge",
   "super" : "java.lang.Object",
   "access" : 33,
-  "interfaces" : [ "gb" ],
+  "interfaces" : [ ],
   "fields" : [ {
     "field" : "id",
-    "owner" : "gs",
-    "name" : "cd",
-    "access" : 16,
+    "owner" : "ge",
+    "name" : "cu",
+    "access" : 17,
     "descriptor" : "I",
-    "decoder" : -286923745
+    "decoder" : 1117211673
   }, {
     "field" : "length",
-    "owner" : "gs",
-    "name" : "cx",
-    "access" : 16,
+    "owner" : "ge",
+    "name" : "cb",
+    "access" : 17,
     "descriptor" : "I",
-    "decoder" : -1759434223
+    "decoder" : 947096829
   } ],
   "methods" : [ ],
   "constructors" : [ {
     "access" : 0,
     "descriptor" : "(II)V"
   } ]
+}, {
+  "class" : "UrlRequest",
+  "name" : "ey",
+  "super" : "java.lang.Object",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "isDone0",
+    "owner" : "ey",
+    "name" : "f",
+    "access" : 64,
+    "descriptor" : "Z"
+  }, {
+    "field" : "response0",
+    "owner" : "ey",
+    "name" : "q",
+    "access" : 64,
+    "descriptor" : "[B"
+  }, {
+    "field" : "url",
+    "owner" : "ey",
+    "name" : "m",
+    "access" : 16,
+    "descriptor" : "Ljava/net/URL;"
+  } ],
+  "methods" : [ {
+    "method" : "getResponse",
+    "owner" : "ey",
+    "name" : "f",
+    "access" : 1,
+    "parameters" : [ ],
+    "descriptor" : "(B)[B"
+  }, {
+    "method" : "isDone",
+    "owner" : "ey",
+    "name" : "m",
+    "access" : 1,
+    "parameters" : [ ],
+    "descriptor" : "(I)Z"
+  } ],
+  "constructors" : [ {
+    "access" : 0,
+    "descriptor" : "(Ljava/net/URL;)V"
+  } ]
+}, {
+  "class" : "WorldMapLabel",
+  "name" : "aj",
+  "super" : "java.lang.Object",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "height",
+    "owner" : "aj",
+    "name" : "q",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : -85027761
+  }, {
+    "field" : "size",
+    "owner" : "aj",
+    "name" : "w",
+    "access" : 0,
+    "descriptor" : "Ls;"
+  }, {
+    "field" : "text",
+    "owner" : "aj",
+    "name" : "m",
+    "access" : 0,
+    "descriptor" : "Ljava/lang/String;"
+  }, {
+    "field" : "width",
+    "owner" : "aj",
+    "name" : "f",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : -471061617
+  } ],
+  "methods" : [ ],
+  "constructors" : [ {
+    "access" : 0,
+    "descriptor" : "(Ljava/lang/String;IILs;)V"
+  } ]
+}, {
+  "class" : "RunException",
+  "name" : "fx",
+  "super" : "java.lang.RuntimeException",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "string",
+    "owner" : "fx",
+    "name" : "o",
+    "access" : 0,
+    "descriptor" : "Ljava/lang/String;"
+  }, {
+    "field" : "throwable",
+    "owner" : "fx",
+    "name" : "u",
+    "access" : 0,
+    "descriptor" : "Ljava/lang/Throwable;"
+  } ],
+  "methods" : [ ],
+  "constructors" : [ {
+    "access" : 0,
+    "descriptor" : "(Ljava/lang/Throwable;Ljava/lang/String;)V"
+  } ]
 }, {
   "class" : "Node",
   "name" : "gw",
@@ -795,284 +963,161 @@
     "descriptor" : "()V"
   } ]
 }, {
-  "class" : "NodeHashTable",
-  "name" : "ld",
+  "class" : "DefaultsGroup",
+  "name" : "ka",
   "super" : "java.lang.Object",
-  "access" : 49,
+  "access" : 33,
   "interfaces" : [ ],
   "fields" : [ {
-    "field" : "buckets",
-    "owner" : "ld",
+    "field" : "group",
+    "owner" : "ka",
     "name" : "f",
-    "access" : 0,
-    "descriptor" : "[Lgw;"
-  }, {
-    "field" : "current",
-    "owner" : "ld",
-    "name" : "w",
-    "access" : 0,
-    "descriptor" : "Lgw;"
-  }, {
-    "field" : "currentGet",
-    "owner" : "ld",
-    "name" : "q",
-    "access" : 0,
-    "descriptor" : "Lgw;"
-  }, {
-    "field" : "index",
-    "owner" : "ld",
-    "name" : "o",
-    "access" : 0,
-    "descriptor" : "I"
-  }, {
-    "field" : "size",
-    "owner" : "ld",
-    "name" : "m",
-    "access" : 0,
-    "descriptor" : "I"
-  } ],
-  "methods" : [ {
-    "method" : "clear",
-    "owner" : "ld",
-    "name" : "q",
-    "access" : 1,
-    "parameters" : [ ],
-    "descriptor" : "()V"
-  }, {
-    "method" : "first",
-    "owner" : "ld",
-    "name" : "w",
-    "access" : 1,
-    "parameters" : [ ],
-    "descriptor" : "()Lgw;"
-  }, {
-    "method" : "get",
-    "owner" : "ld",
-    "name" : "m",
-    "access" : 1,
-    "parameters" : [ "key" ],
-    "descriptor" : "(J)Lgw;"
-  }, {
-    "method" : "next",
-    "owner" : "ld",
-    "name" : "o",
-    "access" : 1,
-    "parameters" : [ ],
-    "descriptor" : "()Lgw;"
-  }, {
-    "method" : "put",
-    "owner" : "ld",
-    "name" : "f",
-    "access" : 1,
-    "parameters" : [ "node", "key" ],
-    "descriptor" : "(Lgw;J)V"
+    "access" : 16,
+    "descriptor" : "I",
+    "decoder" : -800980069
   } ],
+  "methods" : [ ],
   "constructors" : [ {
-    "access" : 1,
+    "access" : 0,
     "descriptor" : "(I)V"
   } ]
 }, {
-  "class" : "TilePaint",
-  "name" : "eb",
+  "class" : "SoundEnvelope",
+  "name" : "de",
   "super" : "java.lang.Object",
-  "access" : 49,
+  "access" : 33,
   "interfaces" : [ ],
   "fields" : [ {
-    "field" : "isFlat",
-    "owner" : "eb",
+    "field" : "amplitude",
+    "owner" : "de",
+    "name" : "d",
+    "access" : 0,
+    "descriptor" : "I"
+  }, {
+    "field" : "durations",
+    "owner" : "de",
+    "name" : "f",
+    "access" : 0,
+    "descriptor" : "[I"
+  }, {
+    "field" : "end",
+    "owner" : "de",
+    "name" : "o",
+    "access" : 0,
+    "descriptor" : "I"
+  }, {
+    "field" : "form",
+    "owner" : "de",
     "name" : "u",
     "access" : 0,
-    "descriptor" : "Z"
+    "descriptor" : "I"
   }, {
-    "field" : "neColor",
-    "owner" : "eb",
+    "field" : "max",
+    "owner" : "de",
+    "name" : "k",
+    "access" : 0,
+    "descriptor" : "I"
+  }, {
+    "field" : "phaseIndex",
+    "owner" : "de",
+    "name" : "l",
+    "access" : 0,
+    "descriptor" : "I"
+  }, {
+    "field" : "phases",
+    "owner" : "de",
     "name" : "q",
     "access" : 0,
-    "descriptor" : "I",
-    "decoder" : -1668262341
+    "descriptor" : "[I"
   }, {
-    "field" : "nwColor",
-    "owner" : "eb",
+    "field" : "segments",
+    "owner" : "de",
+    "name" : "m",
+    "access" : 0,
+    "descriptor" : "I"
+  }, {
+    "field" : "start",
+    "owner" : "de",
     "name" : "w",
     "access" : 0,
-    "descriptor" : "I",
-    "decoder" : -1057776035
+    "descriptor" : "I"
   }, {
-    "field" : "rgb",
-    "owner" : "eb",
+    "field" : "step",
+    "owner" : "de",
+    "name" : "e",
+    "access" : 0,
+    "descriptor" : "I"
+  }, {
+    "field" : "ticks",
+    "owner" : "de",
     "name" : "g",
     "access" : 0,
-    "descriptor" : "I",
-    "decoder" : 2097947337
-  }, {
-    "field" : "seColor",
-    "owner" : "eb",
-    "name" : "f",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : -1875844515
-  }, {
-    "field" : "swColor",
-    "owner" : "eb",
-    "name" : "m",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : 181759449
-  }, {
-    "field" : "texture",
-    "owner" : "eb",
-    "name" : "o",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : 463308567
+    "descriptor" : "I"
   } ],
-  "methods" : [ ],
-  "constructors" : [ {
-    "access" : 0,
-    "descriptor" : "(IIIIIIZ)V"
-  } ]
-}, {
-  "class" : "MenuAction",
-  "name" : "cs",
-  "super" : "java.lang.Object",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "action",
-    "owner" : "cs",
-    "name" : "o",
-    "access" : 0,
-    "descriptor" : "Ljava/lang/String;"
+  "methods" : [ {
+    "method" : "decode",
+    "owner" : "de",
+    "name" : "m",
+    "access" : 16,
+    "parameters" : [ "buffer" ],
+    "descriptor" : "(Lgr;)V"
   }, {
-    "field" : "argument0",
-    "owner" : "cs",
+    "method" : "decodeSegments",
+    "owner" : "de",
+    "name" : "f",
+    "access" : 16,
+    "parameters" : [ "buffer" ],
+    "descriptor" : "(Lgr;)V"
+  }, {
+    "method" : "doStep",
+    "owner" : "de",
     "name" : "w",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : -2057883817
+    "access" : 16,
+    "parameters" : [ "n" ],
+    "descriptor" : "(I)I"
   }, {
-    "field" : "argument1",
-    "owner" : "cs",
-    "name" : "m",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : 305977315
-  }, {
-    "field" : "argument2",
-    "owner" : "cs",
-    "name" : "f",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : 1764645917
-  }, {
-    "field" : "opcode",
-    "owner" : "cs",
+    "method" : "reset",
+    "owner" : "de",
     "name" : "q",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : -1483856253
+    "access" : 16,
+    "parameters" : [ ],
+    "descriptor" : "()V"
   } ],
-  "methods" : [ ],
   "constructors" : [ {
     "access" : 0,
     "descriptor" : "()V"
   } ]
 }, {
-  "class" : "GzipDecompressor",
-  "name" : "go",
-  "super" : "java.lang.Object",
+  "class" : "FriendLoginUpdate",
+  "name" : "kn",
+  "super" : "gh",
   "access" : 33,
   "interfaces" : [ ],
   "fields" : [ {
-    "field" : "inflater",
-    "owner" : "go",
-    "name" : "m",
-    "access" : 0,
-    "descriptor" : "Ljava/util/zip/Inflater;"
-  } ],
-  "methods" : [ {
-    "method" : "decompress",
-    "owner" : "go",
-    "name" : "m",
-    "access" : 1,
-    "descriptor" : "(Lgr;[BB)V"
-  } ],
-  "constructors" : [ {
-    "access" : 1,
-    "descriptor" : "()V"
-  }, {
-    "access" : 0,
-    "descriptor" : "(III)V"
-  } ]
-}, {
-  "class" : "SoundCache",
-  "name" : "dt",
-  "super" : "java.lang.Object",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "musicSampleIndex",
-    "owner" : "dt",
-    "name" : "f",
-    "access" : 0,
-    "descriptor" : "Lir;"
-  }, {
-    "field" : "musicSamples",
-    "owner" : "dt",
-    "name" : "q",
-    "access" : 0,
-    "descriptor" : "Lld;"
-  }, {
-    "field" : "rawSounds",
-    "owner" : "dt",
-    "name" : "w",
-    "access" : 0,
-    "descriptor" : "Lld;"
-  }, {
-    "field" : "soundEffectIndex",
-    "owner" : "dt",
-    "name" : "m",
-    "access" : 0,
-    "descriptor" : "Lir;"
-  } ],
-  "methods" : [ {
-    "method" : "getMusicSample",
-    "owner" : "dt",
-    "name" : "w",
-    "access" : 1,
-    "descriptor" : "(I[II)Lcx;"
-  }, {
-    "method" : "getMusicSample0",
-    "owner" : "dt",
-    "name" : "f",
-    "access" : 0,
-    "descriptor" : "(II[II)Lcx;"
-  }, {
-    "method" : "getSoundEffect",
-    "owner" : "dt",
+    "field" : "time",
+    "owner" : "kn",
     "name" : "q",
     "access" : 1,
-    "descriptor" : "(I[IB)Lcx;"
+    "descriptor" : "I",
+    "decoder" : -1390885889
   }, {
-    "method" : "getSoundEffect0",
-    "owner" : "dt",
-    "name" : "m",
-    "access" : 0,
-    "descriptor" : "(II[IS)Lcx;"
-  } ],
-  "constructors" : [ {
+    "field" : "username",
+    "owner" : "kn",
+    "name" : "w",
     "access" : 1,
-    "descriptor" : "(Lir;Lir;)V"
-  } ]
-}, {
-  "class" : "Strings",
-  "name" : "id",
-  "super" : "java.lang.Object",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ ],
+    "descriptor" : "Lkp;"
+  }, {
+    "field" : "world",
+    "owner" : "kn",
+    "name" : "o",
+    "access" : 1,
+    "descriptor" : "S"
+  } ],
   "methods" : [ ],
-  "constructors" : [ ]
+  "constructors" : [ {
+    "access" : 0,
+    "descriptor" : "(Lkp;I)V"
+  } ]
 }, {
   "class" : "GrandExchangeEvents",
   "name" : "g",
@@ -1098,22 +1143,301 @@
     "descriptor" : "(Lgr;Z)V"
   } ]
 }, {
-  "class" : "ObjectNode",
-  "name" : "fk",
+  "class" : "ServerBuild",
+  "name" : "iy",
+  "super" : "java.lang.Object",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "id",
+    "owner" : "iy",
+    "name" : "u",
+    "access" : 17,
+    "descriptor" : "I",
+    "decoder" : -947415971
+  }, {
+    "field" : "name",
+    "owner" : "iy",
+    "name" : "o",
+    "access" : 17,
+    "descriptor" : "Ljava/lang/String;"
+  } ],
+  "methods" : [ ],
+  "constructors" : [ {
+    "access" : 0,
+    "descriptor" : "(Ljava/lang/String;I)V"
+  } ]
+}, {
+  "class" : "ItemContainer",
+  "name" : "bc",
   "super" : "gw",
   "access" : 33,
   "interfaces" : [ ],
   "fields" : [ {
-    "field" : "obj",
-    "owner" : "fk",
-    "name" : "m",
+    "field" : "ids",
+    "owner" : "bc",
+    "name" : "f",
+    "access" : 0,
+    "descriptor" : "[I"
+  }, {
+    "field" : "quantities",
+    "owner" : "bc",
+    "name" : "q",
+    "access" : 0,
+    "descriptor" : "[I"
+  } ],
+  "methods" : [ ],
+  "constructors" : [ {
+    "access" : 0,
+    "descriptor" : "()V"
+  } ]
+}, {
+  "class" : "StudioGame",
+  "name" : "is",
+  "super" : "java.lang.Object",
+  "access" : 33,
+  "interfaces" : [ "gc" ],
+  "fields" : [ {
+    "field" : "id",
+    "owner" : "is",
+    "name" : "l",
+    "access" : 16,
+    "descriptor" : "I",
+    "decoder" : -1688917715
+  }, {
+    "field" : "name",
+    "owner" : "is",
+    "name" : "g",
     "access" : 17,
-    "descriptor" : "Ljava/lang/Object;"
+    "descriptor" : "Ljava/lang/String;"
+  } ],
+  "methods" : [ {
+    "method" : "ordinal",
+    "owner" : "is",
+    "name" : "f",
+    "access" : 1,
+    "descriptor" : "(B)I"
+  } ],
+  "constructors" : [ {
+    "access" : 0,
+    "descriptor" : "(Ljava/lang/String;Ljava/lang/String;I)V"
+  } ]
+}, {
+  "class" : "ByteArrayNode",
+  "name" : "gp",
+  "super" : "gw",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "byteArray",
+    "owner" : "gp",
+    "name" : "m",
+    "access" : 1,
+    "descriptor" : "[B"
   } ],
   "methods" : [ ],
   "constructors" : [ {
     "access" : 1,
-    "descriptor" : "(Ljava/lang/Object;)V"
+    "descriptor" : "([B)V"
+  } ]
+}, {
+  "class" : "NanoClock",
+  "name" : "fp",
+  "super" : "fa",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "lastTimeNano",
+    "owner" : "fp",
+    "name" : "m",
+    "access" : 0,
+    "descriptor" : "J",
+    "decoder" : 7586221391557635221
+  } ],
+  "methods" : [ {
+    "method" : "mark",
+    "owner" : "fp",
+    "name" : "m",
+    "access" : 1,
+    "parameters" : [ ],
+    "descriptor" : "(B)V"
+  }, {
+    "method" : "wait",
+    "owner" : "fp",
+    "name" : "f",
+    "access" : 1,
+    "parameters" : [ "cycleMs", "minSleepMs" ],
+    "descriptor" : "(III)I"
+  } ],
+  "constructors" : [ {
+    "access" : 1,
+    "descriptor" : "()V"
+  } ]
+}, {
+  "class" : "RasterProvider",
+  "name" : "ai",
+  "super" : "lp",
+  "access" : 49,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "component0",
+    "owner" : "ai",
+    "name" : "m",
+    "access" : 0,
+    "descriptor" : "Ljava/awt/Component;"
+  }, {
+    "field" : "image",
+    "owner" : "ai",
+    "name" : "f",
+    "access" : 0,
+    "descriptor" : "Ljava/awt/Image;"
+  } ],
+  "methods" : [ {
+    "method" : "draw",
+    "owner" : "ai",
+    "name" : "q",
+    "access" : 17,
+    "parameters" : [ "x", "y", "width", "height" ],
+    "descriptor" : "(IIIIB)V"
+  }, {
+    "method" : "draw0",
+    "owner" : "ai",
+    "name" : "o",
+    "access" : 16,
+    "parameters" : [ "graphics", "x", "y", "width", "height" ],
+    "descriptor" : "(Ljava/awt/Graphics;IIIIB)V"
+  }, {
+    "method" : "drawFull",
+    "owner" : "ai",
+    "name" : "f",
+    "access" : 17,
+    "parameters" : [ "x", "y" ],
+    "descriptor" : "(III)V"
+  }, {
+    "method" : "drawFull0",
+    "owner" : "ai",
+    "name" : "w",
+    "access" : 16,
+    "parameters" : [ "graphics", "x", "y" ],
+    "descriptor" : "(Ljava/awt/Graphics;III)V"
+  }, {
+    "method" : "setComponent",
+    "owner" : "ai",
+    "name" : "m",
+    "access" : 16,
+    "descriptor" : "(Ljava/awt/Component;B)V"
+  } ],
+  "constructors" : [ {
+    "access" : 0,
+    "descriptor" : "(IILjava/awt/Component;)V"
+  } ]
+}, {
+  "class" : "MouseWheel",
+  "name" : "fv",
+  "super" : "java.lang.Object",
+  "access" : 1537,
+  "interfaces" : [ ],
+  "fields" : [ ],
+  "methods" : [ {
+    "method" : "useRotation",
+    "owner" : "fv",
+    "name" : "q",
+    "access" : 1025,
+    "parameters" : [ ],
+    "descriptor" : "(I)I"
+  } ],
+  "constructors" : [ ]
+}, {
+  "class" : "WorldMapArchiveLoader",
+  "name" : "ls",
+  "super" : "java.lang.Object",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "archive",
+    "owner" : "ls",
+    "name" : "u",
+    "access" : 0,
+    "descriptor" : "Lir;"
+  }, {
+    "field" : "cacheName",
+    "owner" : "ls",
+    "name" : "o",
+    "access" : 0,
+    "descriptor" : "Ljava/lang/String;"
+  }, {
+    "field" : "isLoaded0",
+    "owner" : "ls",
+    "name" : "l",
+    "access" : 0,
+    "descriptor" : "Z"
+  }, {
+    "field" : "percentLoaded0",
+    "owner" : "ls",
+    "name" : "g",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : 624113115
+  } ],
+  "methods" : [ {
+    "method" : "isLoaded",
+    "owner" : "ls",
+    "name" : "q",
+    "access" : 0,
+    "parameters" : [ ],
+    "descriptor" : "(S)Z"
+  }, {
+    "method" : "load",
+    "owner" : "ls",
+    "name" : "f",
+    "access" : 0,
+    "parameters" : [ ],
+    "descriptor" : "(I)I"
+  }, {
+    "method" : "percentLoaded",
+    "owner" : "ls",
+    "name" : "w",
+    "access" : 0,
+    "parameters" : [ ],
+    "descriptor" : "(I)I"
+  }, {
+    "method" : "reset",
+    "owner" : "ls",
+    "name" : "m",
+    "access" : 0,
+    "parameters" : [ "cacheName" ],
+    "descriptor" : "(Ljava/lang/String;I)V"
+  } ],
+  "constructors" : [ {
+    "access" : 0,
+    "descriptor" : "(Lir;)V"
+  } ]
+}, {
+  "class" : "ClientPacketMarker",
+  "name" : "gb",
+  "super" : "java.lang.Object",
+  "access" : 1537,
+  "interfaces" : [ ],
+  "fields" : [ ],
+  "methods" : [ ],
+  "constructors" : [ ]
+}, {
+  "class" : "AbstractSound",
+  "name" : "dd",
+  "super" : "gw",
+  "access" : 1057,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "position",
+    "owner" : "dd",
+    "name" : "u",
+    "access" : 0,
+    "descriptor" : "I"
+  } ],
+  "methods" : [ ],
+  "constructors" : [ {
+    "access" : 0,
+    "descriptor" : "()V"
   } ]
 }, {
   "class" : "NodeDeque",
@@ -1202,1369 +1526,6 @@
     "access" : 1,
     "descriptor" : "()V"
   } ]
-}, {
-  "class" : "Bzip2Decompressor",
-  "name" : "gk",
-  "super" : "java.lang.Object",
-  "access" : 49,
-  "interfaces" : [ ],
-  "fields" : [ ],
-  "methods" : [ ],
-  "constructors" : [ ]
-}, {
-  "class" : "IntegerNode",
-  "name" : "gn",
-  "super" : "gw",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "integer",
-    "owner" : "gn",
-    "name" : "m",
-    "access" : 1,
-    "descriptor" : "I"
-  } ],
-  "methods" : [ ],
-  "constructors" : [ {
-    "access" : 1,
-    "descriptor" : "(I)V"
-  } ]
-}, {
-  "class" : "HealthBarUpdate",
-  "name" : "bg",
-  "super" : "gw",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "cycle",
-    "owner" : "bg",
-    "name" : "m",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : 2103089795
-  }, {
-    "field" : "cycleOffset",
-    "owner" : "bg",
-    "name" : "w",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : -1876302639
-  }, {
-    "field" : "health",
-    "owner" : "bg",
-    "name" : "f",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : 1821995313
-  }, {
-    "field" : "health2",
-    "owner" : "bg",
-    "name" : "q",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : -820353645
-  } ],
-  "methods" : [ {
-    "method" : "set",
-    "owner" : "bg",
-    "name" : "m",
-    "access" : 0,
-    "descriptor" : "(IIIII)V"
-  } ],
-  "constructors" : [ {
-    "access" : 0,
-    "descriptor" : "(IIII)V"
-  } ]
-}, {
-  "class" : "ItemContainer",
-  "name" : "bc",
-  "super" : "gw",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "ids",
-    "owner" : "bc",
-    "name" : "f",
-    "access" : 0,
-    "descriptor" : "[I"
-  }, {
-    "field" : "quantities",
-    "owner" : "bc",
-    "name" : "q",
-    "access" : 0,
-    "descriptor" : "[I"
-  } ],
-  "methods" : [ ],
-  "constructors" : [ {
-    "access" : 0,
-    "descriptor" : "()V"
-  } ]
-}, {
-  "class" : "WorldMapCacheName",
-  "name" : "aw",
-  "super" : "java.lang.Object",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "name",
-    "owner" : "aw",
-    "name" : "u",
-    "access" : 17,
-    "descriptor" : "Ljava/lang/String;"
-  } ],
-  "methods" : [ ],
-  "constructors" : [ {
-    "access" : 0,
-    "descriptor" : "(Ljava/lang/String;)V"
-  } ]
-}, {
-  "class" : "AbstractSound",
-  "name" : "dd",
-  "super" : "gw",
-  "access" : 1057,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "position",
-    "owner" : "dd",
-    "name" : "u",
-    "access" : 0,
-    "descriptor" : "I"
-  } ],
-  "methods" : [ ],
-  "constructors" : [ {
-    "access" : 0,
-    "descriptor" : "()V"
-  } ]
-}, {
-  "class" : "ByteArrayPool",
-  "name" : "gi",
-  "super" : "java.lang.Object",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ ],
-  "methods" : [ ],
-  "constructors" : [ ]
-}, {
-  "class" : "AbstractSocket",
-  "name" : "fu",
-  "super" : "java.lang.Object",
-  "access" : 1057,
-  "interfaces" : [ ],
-  "fields" : [ ],
-  "methods" : [ {
-    "method" : "available",
-    "owner" : "fu",
-    "name" : "q",
-    "access" : 1025,
-    "parameters" : [ ],
-    "descriptor" : "(I)I"
-  }, {
-    "method" : "close",
-    "owner" : "fu",
-    "name" : "g",
-    "access" : 1025,
-    "parameters" : [ ],
-    "descriptor" : "(I)V"
-  }, {
-    "method" : "isAvailable",
-    "owner" : "fu",
-    "name" : "f",
-    "access" : 1025,
-    "parameters" : [ "length" ],
-    "descriptor" : "(II)Z"
-  }, {
-    "method" : "read",
-    "owner" : "fu",
-    "name" : "o",
-    "access" : 1025,
-    "parameters" : [ "dst", "dstIndex", "length" ],
-    "descriptor" : "([BIII)I"
-  }, {
-    "method" : "readUnsignedByte",
-    "owner" : "fu",
-    "name" : "w",
-    "access" : 1025,
-    "parameters" : [ ],
-    "descriptor" : "(I)I"
-  }, {
-    "method" : "write",
-    "owner" : "fu",
-    "name" : "u",
-    "access" : 1025,
-    "parameters" : [ "src", "srcIndex", "length" ],
-    "descriptor" : "([BIIB)V"
-  } ],
-  "constructors" : [ {
-    "access" : 0,
-    "descriptor" : "()V"
-  } ]
-}, {
-  "class" : "Skeleton",
-  "name" : "ek",
-  "super" : "gw",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "count",
-    "owner" : "ek",
-    "name" : "f",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : 1875841677
-  }, {
-    "field" : "id",
-    "owner" : "ek",
-    "name" : "m",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : -1634889691
-  }, {
-    "field" : "labels",
-    "owner" : "ek",
-    "name" : "w",
-    "access" : 0,
-    "descriptor" : "[[I"
-  }, {
-    "field" : "transformTypes",
-    "owner" : "ek",
-    "name" : "q",
-    "access" : 0,
-    "descriptor" : "[I"
-  } ],
-  "methods" : [ ],
-  "constructors" : [ {
-    "access" : 0,
-    "descriptor" : "(I[B)V"
-  } ]
-}, {
-  "class" : "TriBool",
-  "name" : "kd",
-  "super" : "java.lang.Object",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ ],
-  "methods" : [ ],
-  "constructors" : [ {
-    "access" : 0,
-    "descriptor" : "()V"
-  } ]
-}, {
-  "class" : "StudioGame",
-  "name" : "is",
-  "super" : "java.lang.Object",
-  "access" : 33,
-  "interfaces" : [ "gc" ],
-  "fields" : [ {
-    "field" : "id",
-    "owner" : "is",
-    "name" : "l",
-    "access" : 16,
-    "descriptor" : "I",
-    "decoder" : -1688917715
-  }, {
-    "field" : "name",
-    "owner" : "is",
-    "name" : "g",
-    "access" : 17,
-    "descriptor" : "Ljava/lang/String;"
-  } ],
-  "methods" : [ {
-    "method" : "ordinal",
-    "owner" : "is",
-    "name" : "f",
-    "access" : 1,
-    "descriptor" : "(B)I"
-  } ],
-  "constructors" : [ {
-    "access" : 0,
-    "descriptor" : "(Ljava/lang/String;Ljava/lang/String;I)V"
-  } ]
-}, {
-  "class" : "Varps",
-  "name" : "hv",
-  "super" : "java.lang.Object",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ ],
-  "methods" : [ ],
-  "constructors" : [ ]
-}, {
-  "class" : "WorldMapSection",
-  "name" : "ab",
-  "super" : "java.lang.Object",
-  "access" : 1537,
-  "interfaces" : [ ],
-  "fields" : [ ],
-  "methods" : [ {
-    "method" : "containsCoord",
-    "owner" : "ab",
-    "name" : "f",
-    "access" : 1025,
-    "parameters" : [ "plane", "x", "y" ],
-    "descriptor" : "(IIIB)Z"
-  }, {
-    "method" : "containsPosition",
-    "owner" : "ab",
-    "name" : "q",
-    "access" : 1025,
-    "parameters" : [ "x", "y" ],
-    "descriptor" : "(IIB)Z"
-  }, {
-    "method" : "coord",
-    "owner" : "ab",
-    "name" : "o",
-    "access" : 1025,
-    "parameters" : [ "x", "y" ],
-    "descriptor" : "(III)Lhu;"
-  }, {
-    "method" : "expandBounds",
-    "owner" : "ab",
-    "name" : "m",
-    "access" : 1025,
-    "parameters" : [ "area" ],
-    "descriptor" : "(Lag;I)V"
-  }, {
-    "method" : "position",
-    "owner" : "ab",
-    "name" : "w",
-    "access" : 1025,
-    "parameters" : [ "plane", "x", "y" ],
-    "descriptor" : "(IIII)[I"
-  }, {
-    "method" : "read",
-    "owner" : "ab",
-    "name" : "u",
-    "access" : 1025,
-    "parameters" : [ "buffer" ],
-    "descriptor" : "(Lgr;B)V"
-  } ],
-  "constructors" : [ ]
-}, {
-  "class" : "Buddy",
-  "name" : "ke",
-  "super" : "js",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "int2",
-    "owner" : "ke",
-    "name" : "u",
-    "access" : 1,
-    "descriptor" : "I",
-    "decoder" : 120689297
-  }, {
-    "field" : "rank",
-    "owner" : "ke",
-    "name" : "g",
-    "access" : 1,
-    "descriptor" : "I",
-    "decoder" : -304954565
-  }, {
-    "field" : "world0",
-    "owner" : "ke",
-    "name" : "o",
-    "access" : 1,
-    "descriptor" : "I",
-    "decoder" : 429472919
-  } ],
-  "methods" : [ {
-    "method" : "hasWorld",
-    "owner" : "ke",
-    "name" : "au",
-    "access" : 1,
-    "parameters" : [ ],
-    "descriptor" : "(I)Z"
-  }, {
-    "method" : "set",
-    "owner" : "ke",
-    "name" : "an",
-    "access" : 0,
-    "descriptor" : "(IIS)V"
-  }, {
-    "method" : "world",
-    "owner" : "ke",
-    "name" : "az",
-    "access" : 1,
-    "parameters" : [ ],
-    "descriptor" : "(B)I"
-  } ],
-  "constructors" : [ {
-    "access" : 0,
-    "descriptor" : "()V"
-  } ]
-}, {
-  "class" : "RunException",
-  "name" : "fx",
-  "super" : "java.lang.RuntimeException",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "string",
-    "owner" : "fx",
-    "name" : "o",
-    "access" : 0,
-    "descriptor" : "Ljava/lang/String;"
-  }, {
-    "field" : "throwable",
-    "owner" : "fx",
-    "name" : "u",
-    "access" : 0,
-    "descriptor" : "Ljava/lang/Throwable;"
-  } ],
-  "methods" : [ ],
-  "constructors" : [ {
-    "access" : 0,
-    "descriptor" : "(Ljava/lang/Throwable;Ljava/lang/String;)V"
-  } ]
-}, {
-  "class" : "AbstractRasterProvider",
-  "name" : "lp",
-  "super" : "java.lang.Object",
-  "access" : 1057,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "height",
-    "owner" : "lp",
-    "name" : "o",
-    "access" : 1,
-    "descriptor" : "I",
-    "decoder" : -239960145
-  }, {
-    "field" : "pixels",
-    "owner" : "lp",
-    "name" : "q",
-    "access" : 1,
-    "descriptor" : "[I"
-  }, {
-    "field" : "width",
-    "owner" : "lp",
-    "name" : "w",
-    "access" : 1,
-    "descriptor" : "I",
-    "decoder" : -560298363
-  } ],
-  "methods" : [ {
-    "method" : "apply",
-    "owner" : "lp",
-    "name" : "b",
-    "access" : 17,
-    "parameters" : [ ],
-    "descriptor" : "(I)V"
-  }, {
-    "method" : "draw",
-    "owner" : "lp",
-    "name" : "q",
-    "access" : 1025,
-    "parameters" : [ "x", "y", "width", "height" ],
-    "descriptor" : "(IIIIB)V"
-  }, {
-    "method" : "drawFull",
-    "owner" : "lp",
-    "name" : "f",
-    "access" : 1025,
-    "parameters" : [ "x", "y" ],
-    "descriptor" : "(III)V"
-  } ],
-  "constructors" : [ {
-    "access" : 4,
-    "descriptor" : "()V"
-  } ]
-}, {
-  "class" : "WorldMapEvent",
-  "name" : "ap",
-  "super" : "java.lang.Object",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "coord1",
-    "owner" : "ap",
-    "name" : "f",
-    "access" : 1,
-    "descriptor" : "Lhu;"
-  }, {
-    "field" : "coord2",
-    "owner" : "ap",
-    "name" : "q",
-    "access" : 1,
-    "descriptor" : "Lhu;"
-  }, {
-    "field" : "mapElement",
-    "owner" : "ap",
-    "name" : "m",
-    "access" : 1,
-    "descriptor" : "I",
-    "decoder" : 264384233
-  } ],
-  "methods" : [ ],
-  "constructors" : [ {
-    "access" : 1,
-    "descriptor" : "(ILhu;Lhu;)V"
-  } ]
-}, {
-  "class" : "DualNode",
-  "name" : "fn",
-  "super" : "gw",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "keyDual",
-    "owner" : "fn",
-    "name" : "cg",
-    "access" : 1,
-    "descriptor" : "J"
-  }, {
-    "field" : "nextDual",
-    "owner" : "fn",
-    "name" : "cp",
-    "access" : 1,
-    "descriptor" : "Lfn;"
-  }, {
-    "field" : "previousDual",
-    "owner" : "fn",
-    "name" : "cf",
-    "access" : 1,
-    "descriptor" : "Lfn;"
-  } ],
-  "methods" : [ {
-    "method" : "removeDual",
-    "owner" : "fn",
-    "name" : "cg",
-    "access" : 1,
-    "parameters" : [ ],
-    "descriptor" : "()V"
-  } ],
-  "constructors" : [ {
-    "access" : 1,
-    "descriptor" : "()V"
-  } ]
-}, {
-  "class" : "ClientPacketMarker",
-  "name" : "gb",
-  "super" : "java.lang.Object",
-  "access" : 1537,
-  "interfaces" : [ ],
-  "fields" : [ ],
-  "methods" : [ ],
-  "constructors" : [ ]
-}, {
-  "class" : "ByteArrayNode",
-  "name" : "gp",
-  "super" : "gw",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "byteArray",
-    "owner" : "gp",
-    "name" : "m",
-    "access" : 1,
-    "descriptor" : "[B"
-  } ],
-  "methods" : [ ],
-  "constructors" : [ {
-    "access" : 1,
-    "descriptor" : "([B)V"
-  } ]
-}, {
-  "class" : "ClanMate",
-  "name" : "jk",
-  "super" : "ke",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "isFriend0",
-    "owner" : "jk",
-    "name" : "m",
-    "access" : 0,
-    "descriptor" : "Lkd;"
-  }, {
-    "field" : "isIgnored0",
-    "owner" : "jk",
-    "name" : "f",
-    "access" : 0,
-    "descriptor" : "Lkd;"
-  } ],
-  "methods" : [ {
-    "method" : "clearIsFriend",
-    "owner" : "jk",
-    "name" : "m",
-    "access" : 0,
-    "parameters" : [ ],
-    "descriptor" : "(I)V"
-  }, {
-    "method" : "clearIsIgnored",
-    "owner" : "jk",
-    "name" : "w",
-    "access" : 0,
-    "parameters" : [ ],
-    "descriptor" : "(I)V"
-  }, {
-    "method" : "fillIsFriend",
-    "owner" : "jk",
-    "name" : "q",
-    "access" : 0,
-    "parameters" : [ ],
-    "descriptor" : "(I)V"
-  }, {
-    "method" : "fillIsIgnored",
-    "owner" : "jk",
-    "name" : "u",
-    "access" : 0,
-    "parameters" : [ ],
-    "descriptor" : "(I)V"
-  }, {
-    "method" : "isFriend",
-    "owner" : "jk",
-    "name" : "f",
-    "access" : 17,
-    "parameters" : [ ],
-    "descriptor" : "(I)Z"
-  }, {
-    "method" : "isIgnored",
-    "owner" : "jk",
-    "name" : "o",
-    "access" : 17,
-    "parameters" : [ ],
-    "descriptor" : "(I)Z"
-  } ],
-  "constructors" : [ {
-    "access" : 0,
-    "descriptor" : "()V"
-  } ]
-}, {
-  "class" : "Login",
-  "name" : "cu",
-  "super" : "java.lang.Object",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ ],
-  "methods" : [ ],
-  "constructors" : [ ]
-}, {
-  "class" : "HealthBar",
-  "name" : "cr",
-  "super" : "gw",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "definition",
-    "owner" : "cr",
-    "name" : "q",
-    "access" : 0,
-    "descriptor" : "Lii;"
-  }, {
-    "field" : "updates",
-    "owner" : "cr",
-    "name" : "w",
-    "access" : 0,
-    "descriptor" : "Lja;"
-  } ],
-  "methods" : [ {
-    "method" : "get",
-    "owner" : "cr",
-    "name" : "f",
-    "access" : 0,
-    "parameters" : [ "cycle" ],
-    "descriptor" : "(II)Lbg;"
-  }, {
-    "method" : "isEmpty",
-    "owner" : "cr",
-    "name" : "q",
-    "access" : 0,
-    "parameters" : [ ],
-    "descriptor" : "(I)Z"
-  }, {
-    "method" : "put",
-    "owner" : "cr",
-    "name" : "m",
-    "access" : 0,
-    "descriptor" : "(IIIIB)V"
-  } ],
-  "constructors" : [ {
-    "access" : 0,
-    "descriptor" : "(Lii;)V"
-  } ]
-}, {
-  "class" : "RasterProvider",
-  "name" : "ai",
-  "super" : "lp",
-  "access" : 49,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "component0",
-    "owner" : "ai",
-    "name" : "m",
-    "access" : 0,
-    "descriptor" : "Ljava/awt/Component;"
-  }, {
-    "field" : "image",
-    "owner" : "ai",
-    "name" : "f",
-    "access" : 0,
-    "descriptor" : "Ljava/awt/Image;"
-  } ],
-  "methods" : [ {
-    "method" : "draw",
-    "owner" : "ai",
-    "name" : "q",
-    "access" : 17,
-    "parameters" : [ "x", "y", "width", "height" ],
-    "descriptor" : "(IIIIB)V"
-  }, {
-    "method" : "draw0",
-    "owner" : "ai",
-    "name" : "o",
-    "access" : 16,
-    "parameters" : [ "graphics", "x", "y", "width", "height" ],
-    "descriptor" : "(Ljava/awt/Graphics;IIIIB)V"
-  }, {
-    "method" : "drawFull",
-    "owner" : "ai",
-    "name" : "f",
-    "access" : 17,
-    "parameters" : [ "x", "y" ],
-    "descriptor" : "(III)V"
-  }, {
-    "method" : "drawFull0",
-    "owner" : "ai",
-    "name" : "w",
-    "access" : 16,
-    "parameters" : [ "graphics", "x", "y" ],
-    "descriptor" : "(Ljava/awt/Graphics;III)V"
-  }, {
-    "method" : "setComponent",
-    "owner" : "ai",
-    "name" : "m",
-    "access" : 16,
-    "descriptor" : "(Ljava/awt/Component;B)V"
-  } ],
-  "constructors" : [ {
-    "access" : 0,
-    "descriptor" : "(IILjava/awt/Component;)V"
-  } ]
-}, {
-  "class" : "Enumerated",
-  "name" : "gc",
-  "super" : "java.lang.Object",
-  "access" : 1537,
-  "interfaces" : [ ],
-  "fields" : [ ],
-  "methods" : [ {
-    "method" : "ordinal",
-    "owner" : "gc",
-    "name" : "f",
-    "access" : 1025,
-    "parameters" : [ ],
-    "descriptor" : "(B)I"
-  } ],
-  "constructors" : [ ]
-}, {
-  "class" : "Message",
-  "name" : "bm",
-  "super" : "fn",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "count",
-    "owner" : "bm",
-    "name" : "m",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : 1597147817
-  }, {
-    "field" : "cycle",
-    "owner" : "bm",
-    "name" : "f",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : 1164592791
-  }, {
-    "field" : "isFromFriend0",
-    "owner" : "bm",
-    "name" : "u",
-    "access" : 0,
-    "descriptor" : "Lkd;"
-  }, {
-    "field" : "isFromIgnored0",
-    "owner" : "bm",
-    "name" : "g",
-    "access" : 0,
-    "descriptor" : "Lkd;"
-  }, {
-    "field" : "prefix",
-    "owner" : "bm",
-    "name" : "l",
-    "access" : 0,
-    "descriptor" : "Ljava/lang/String;"
-  }, {
-    "field" : "sender",
-    "owner" : "bm",
-    "name" : "w",
-    "access" : 0,
-    "descriptor" : "Ljava/lang/String;"
-  }, {
-    "field" : "senderUsername",
-    "owner" : "bm",
-    "name" : "o",
-    "access" : 0,
-    "descriptor" : "Lkp;"
-  }, {
-    "field" : "text",
-    "owner" : "bm",
-    "name" : "e",
-    "access" : 0,
-    "descriptor" : "Ljava/lang/String;"
-  }, {
-    "field" : "type",
-    "owner" : "bm",
-    "name" : "q",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : 1223792995
-  } ],
-  "methods" : [ {
-    "method" : "clearIsFromFriend",
-    "owner" : "bm",
-    "name" : "f",
-    "access" : 0,
-    "parameters" : [ ],
-    "descriptor" : "(I)V"
-  }, {
-    "method" : "clearIsFromIgnored",
-    "owner" : "bm",
-    "name" : "o",
-    "access" : 0,
-    "parameters" : [ ],
-    "descriptor" : "(I)V"
-  }, {
-    "method" : "fillIsFromFriend",
-    "owner" : "bm",
-    "name" : "w",
-    "access" : 0,
-    "parameters" : [ ],
-    "descriptor" : "(I)V"
-  }, {
-    "method" : "fillIsFromIgnored",
-    "owner" : "bm",
-    "name" : "g",
-    "access" : 0,
-    "parameters" : [ ],
-    "descriptor" : "(S)V"
-  }, {
-    "method" : "fillSenderUsername",
-    "owner" : "bm",
-    "name" : "l",
-    "access" : 16,
-    "parameters" : [ ],
-    "descriptor" : "(B)V"
-  }, {
-    "method" : "isFromFriend",
-    "owner" : "bm",
-    "name" : "q",
-    "access" : 16,
-    "parameters" : [ ],
-    "descriptor" : "(I)Z"
-  }, {
-    "method" : "isFromIgnored",
-    "owner" : "bm",
-    "name" : "u",
-    "access" : 16,
-    "parameters" : [ ],
-    "descriptor" : "(B)Z"
-  }, {
-    "method" : "set",
-    "owner" : "bm",
-    "name" : "m",
-    "access" : 0,
-    "parameters" : [ "type", "sender", "prefix", "text" ],
-    "descriptor" : "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)V"
-  } ],
-  "constructors" : [ {
-    "access" : 0,
-    "descriptor" : "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V"
-  } ]
-}, {
-  "class" : "Rasterizer2D",
-  "name" : "lf",
-  "super" : "fn",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ ],
-  "methods" : [ ],
-  "constructors" : [ {
-    "access" : 4,
-    "descriptor" : "()V"
-  } ]
-}, {
-  "class" : "NanoClock",
-  "name" : "fp",
-  "super" : "fa",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "lastTimeNano",
-    "owner" : "fp",
-    "name" : "m",
-    "access" : 0,
-    "descriptor" : "J",
-    "decoder" : 7586221391557635221
-  } ],
-  "methods" : [ {
-    "method" : "mark",
-    "owner" : "fp",
-    "name" : "m",
-    "access" : 1,
-    "parameters" : [ ],
-    "descriptor" : "(B)V"
-  }, {
-    "method" : "wait",
-    "owner" : "fp",
-    "name" : "f",
-    "access" : 1,
-    "parameters" : [ "cycleMs", "minSleepMs" ],
-    "descriptor" : "(III)I"
-  } ],
-  "constructors" : [ {
-    "access" : 1,
-    "descriptor" : "()V"
-  } ]
-}, {
-  "class" : "DirectByteArrayCopier",
-  "name" : "gv",
-  "super" : "gu",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "directBuffer",
-    "owner" : "gv",
-    "name" : "m",
-    "access" : 0,
-    "descriptor" : "Ljava/nio/ByteBuffer;"
-  } ],
-  "methods" : [ {
-    "method" : "get",
-    "owner" : "gv",
-    "name" : "m",
-    "access" : 0,
-    "parameters" : [ ],
-    "descriptor" : "(I)[B"
-  }, {
-    "method" : "set",
-    "owner" : "gv",
-    "name" : "f",
-    "access" : 0,
-    "parameters" : [ "array" ],
-    "descriptor" : "([BI)V"
-  } ],
-  "constructors" : [ {
-    "access" : 0,
-    "descriptor" : "()V"
-  } ]
-}, {
-  "class" : "MouseWheel",
-  "name" : "fv",
-  "super" : "java.lang.Object",
-  "access" : 1537,
-  "interfaces" : [ ],
-  "fields" : [ ],
-  "methods" : [ {
-    "method" : "useRotation",
-    "owner" : "fv",
-    "name" : "q",
-    "access" : 1025,
-    "parameters" : [ ],
-    "descriptor" : "(I)I"
-  } ],
-  "constructors" : [ ]
-}, {
-  "class" : "ReflectionCheck",
-  "name" : "lw",
-  "super" : "gw",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "arguments",
-    "owner" : "lw",
-    "name" : "m",
-    "access" : 0,
-    "descriptor" : "[[[B"
-  }, {
-    "field" : "creationErrors",
-    "owner" : "lw",
-    "name" : "u",
-    "access" : 0,
-    "descriptor" : "[I"
-  }, {
-    "field" : "fields",
-    "owner" : "lw",
-    "name" : "g",
-    "access" : 0,
-    "descriptor" : "[Ljava/lang/reflect/Field;"
-  }, {
-    "field" : "id",
-    "owner" : "lw",
-    "name" : "q",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : -1955146989
-  }, {
-    "field" : "intReplaceValues",
-    "owner" : "lw",
-    "name" : "f",
-    "access" : 0,
-    "descriptor" : "[I"
-  }, {
-    "field" : "methods",
-    "owner" : "lw",
-    "name" : "l",
-    "access" : 0,
-    "descriptor" : "[Ljava/lang/reflect/Method;"
-  }, {
-    "field" : "operations",
-    "owner" : "lw",
-    "name" : "o",
-    "access" : 0,
-    "descriptor" : "[I"
-  }, {
-    "field" : "size",
-    "owner" : "lw",
-    "name" : "w",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : -1091722075
-  } ],
-  "methods" : [ ],
-  "constructors" : [ {
-    "access" : 0,
-    "descriptor" : "()V"
-  } ]
-}, {
-  "class" : "FriendLoginUpdate",
-  "name" : "kn",
-  "super" : "gh",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "time",
-    "owner" : "kn",
-    "name" : "q",
-    "access" : 1,
-    "descriptor" : "I",
-    "decoder" : -1390885889
-  }, {
-    "field" : "username",
-    "owner" : "kn",
-    "name" : "w",
-    "access" : 1,
-    "descriptor" : "Lkp;"
-  }, {
-    "field" : "world",
-    "owner" : "kn",
-    "name" : "o",
-    "access" : 1,
-    "descriptor" : "S"
-  } ],
-  "methods" : [ ],
-  "constructors" : [ {
-    "access" : 0,
-    "descriptor" : "(Lkp;I)V"
-  } ]
-}, {
-  "class" : "WidgetGroupParent",
-  "name" : "bx",
-  "super" : "gw",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "group",
-    "owner" : "bx",
-    "name" : "m",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : -707461797
-  }, {
-    "field" : "keep",
-    "owner" : "bx",
-    "name" : "q",
-    "access" : 0,
-    "descriptor" : "Z"
-  }, {
-    "field" : "type",
-    "owner" : "bx",
-    "name" : "f",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : 1712037041
-  } ],
-  "methods" : [ ],
-  "constructors" : [ {
-    "access" : 0,
-    "descriptor" : "()V"
-  } ]
-}, {
-  "class" : "WorldMapIndexCacheLoader",
-  "name" : "ls",
-  "super" : "java.lang.Object",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "cacheName",
-    "owner" : "ls",
-    "name" : "o",
-    "access" : 0,
-    "descriptor" : "Ljava/lang/String;"
-  }, {
-    "field" : "indexCache",
-    "owner" : "ls",
-    "name" : "u",
-    "access" : 0,
-    "descriptor" : "Lir;"
-  }, {
-    "field" : "isLoaded0",
-    "owner" : "ls",
-    "name" : "l",
-    "access" : 0,
-    "descriptor" : "Z"
-  }, {
-    "field" : "percentLoaded0",
-    "owner" : "ls",
-    "name" : "g",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : 624113115
-  } ],
-  "methods" : [ {
-    "method" : "isLoaded",
-    "owner" : "ls",
-    "name" : "q",
-    "access" : 0,
-    "parameters" : [ ],
-    "descriptor" : "(S)Z"
-  }, {
-    "method" : "load",
-    "owner" : "ls",
-    "name" : "f",
-    "access" : 0,
-    "parameters" : [ ],
-    "descriptor" : "(I)I"
-  }, {
-    "method" : "percentLoaded",
-    "owner" : "ls",
-    "name" : "w",
-    "access" : 0,
-    "parameters" : [ ],
-    "descriptor" : "(I)I"
-  }, {
-    "method" : "reset",
-    "owner" : "ls",
-    "name" : "m",
-    "access" : 0,
-    "parameters" : [ "cacheName" ],
-    "descriptor" : "(Ljava/lang/String;I)V"
-  } ],
-  "constructors" : [ {
-    "access" : 0,
-    "descriptor" : "(Lir;)V"
-  } ]
-}, {
-  "class" : "NetCache",
-  "name" : "iq",
-  "super" : "java.lang.Object",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ ],
-  "methods" : [ ],
-  "constructors" : [ ]
-}, {
-  "class" : "EnumDefinition",
-  "name" : "jw",
-  "super" : "fn",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "defaultInt",
-    "owner" : "jw",
-    "name" : "u",
-    "access" : 1,
-    "descriptor" : "I",
-    "decoder" : 1948115527
-  }, {
-    "field" : "defaultString",
-    "owner" : "jw",
-    "name" : "o",
-    "access" : 1,
-    "descriptor" : "Ljava/lang/String;"
-  }, {
-    "field" : "intVals",
-    "owner" : "jw",
-    "name" : "e",
-    "access" : 1,
-    "descriptor" : "[I"
-  }, {
-    "field" : "keyType",
-    "owner" : "jw",
-    "name" : "q",
-    "access" : 1,
-    "descriptor" : "C"
-  }, {
-    "field" : "keys",
-    "owner" : "jw",
-    "name" : "l",
-    "access" : 1,
-    "descriptor" : "[I"
-  }, {
-    "field" : "size0",
-    "owner" : "jw",
-    "name" : "g",
-    "access" : 1,
-    "descriptor" : "I",
-    "decoder" : -12324053
-  }, {
-    "field" : "stringVals",
-    "owner" : "jw",
-    "name" : "x",
-    "access" : 1,
-    "descriptor" : "[Ljava/lang/String;"
-  }, {
-    "field" : "valType",
-    "owner" : "jw",
-    "name" : "w",
-    "access" : 1,
-    "descriptor" : "C"
-  } ],
-  "methods" : [ {
-    "method" : "read",
-    "owner" : "jw",
-    "name" : "f",
-    "access" : 0,
-    "descriptor" : "(Lgr;I)V"
-  }, {
-    "method" : "readNext",
-    "owner" : "jw",
-    "name" : "q",
-    "access" : 0,
-    "descriptor" : "(Lgr;II)V"
-  }, {
-    "method" : "size",
-    "owner" : "jw",
-    "name" : "w",
-    "access" : 1,
-    "parameters" : [ ],
-    "descriptor" : "(B)I"
-  } ],
-  "constructors" : [ {
-    "access" : 0,
-    "descriptor" : "()V"
-  } ]
-}, {
-  "class" : "DemotingHashTable",
-  "name" : "ec",
-  "super" : "java.lang.Object",
-  "access" : 49,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "capacity",
-    "owner" : "ec",
-    "name" : "m",
-    "access" : 0,
-    "descriptor" : "I"
-  }, {
-    "field" : "hashTable",
-    "owner" : "ec",
-    "name" : "q",
-    "access" : 0,
-    "descriptor" : "Llh;"
-  }, {
-    "field" : "queue",
-    "owner" : "ec",
-    "name" : "w",
-    "access" : 0,
-    "descriptor" : "Ljc;"
-  }, {
-    "field" : "remaining",
-    "owner" : "ec",
-    "name" : "f",
-    "access" : 0,
-    "descriptor" : "I"
-  } ],
-  "methods" : [ {
-    "method" : "clear",
-    "owner" : "ec",
-    "name" : "u",
-    "access" : 1,
-    "parameters" : [ ],
-    "descriptor" : "()V"
-  }, {
-    "method" : "demote",
-    "owner" : "ec",
-    "name" : "o",
-    "access" : 1,
-    "parameters" : [ "softeningLevel" ],
-    "descriptor" : "(I)V"
-  }, {
-    "method" : "get",
-    "owner" : "ec",
-    "name" : "m",
-    "access" : 1,
-    "parameters" : [ "key" ],
-    "descriptor" : "(J)Ljava/lang/Object;"
-  }, {
-    "method" : "put",
-    "owner" : "ec",
-    "name" : "w",
-    "access" : 1,
-    "parameters" : [ "value", "key", "size" ],
-    "descriptor" : "(Ljava/lang/Object;JI)V"
-  }, {
-    "method" : "remove",
-    "owner" : "ec",
-    "name" : "f",
-    "access" : 0,
-    "parameters" : [ "key" ],
-    "descriptor" : "(J)V"
-  }, {
-    "method" : "removeWrapper",
-    "owner" : "ec",
-    "name" : "q",
-    "access" : 0,
-    "parameters" : [ "wrapper" ],
-    "descriptor" : "(Leu;)V"
-  } ],
-  "constructors" : [ {
-    "access" : 1,
-    "descriptor" : "(II)V"
-  } ]
-}, {
-  "class" : "Wrapper",
-  "name" : "eu",
-  "super" : "fn",
-  "access" : 1057,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "size",
-    "owner" : "eu",
-    "name" : "f",
-    "access" : 16,
-    "descriptor" : "I"
-  } ],
-  "methods" : [ {
-    "method" : "get",
-    "owner" : "eu",
-    "name" : "m",
-    "access" : 1024,
-    "parameters" : [ ],
-    "descriptor" : "()Ljava/lang/Object;"
-  }, {
-    "method" : "isSoft",
-    "owner" : "eu",
-    "name" : "f",
-    "access" : 1024,
-    "parameters" : [ ],
-    "descriptor" : "()Z"
-  } ],
-  "constructors" : [ {
-    "access" : 0,
-    "descriptor" : "(I)V"
-  } ]
 }, {
   "class" : "UserList",
   "name" : "km",
@@ -2776,6 +1737,211 @@
     "access" : 0,
     "descriptor" : "(I)V"
   } ]
+}, {
+  "class" : "Skeleton",
+  "name" : "ek",
+  "super" : "gw",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "count",
+    "owner" : "ek",
+    "name" : "f",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : 1875841677
+  }, {
+    "field" : "id",
+    "owner" : "ek",
+    "name" : "m",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : -1634889691
+  }, {
+    "field" : "labels",
+    "owner" : "ek",
+    "name" : "w",
+    "access" : 0,
+    "descriptor" : "[[I"
+  }, {
+    "field" : "transformTypes",
+    "owner" : "ek",
+    "name" : "q",
+    "access" : 0,
+    "descriptor" : "[I"
+  } ],
+  "methods" : [ ],
+  "constructors" : [ {
+    "access" : 0,
+    "descriptor" : "(I[B)V"
+  } ]
+}, {
+  "class" : "IntegerNode",
+  "name" : "gn",
+  "super" : "gw",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "integer",
+    "owner" : "gn",
+    "name" : "m",
+    "access" : 1,
+    "descriptor" : "I"
+  } ],
+  "methods" : [ ],
+  "constructors" : [ {
+    "access" : 1,
+    "descriptor" : "(I)V"
+  } ]
+}, {
+  "class" : "ObjectNode",
+  "name" : "fk",
+  "super" : "gw",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "obj",
+    "owner" : "fk",
+    "name" : "m",
+    "access" : 17,
+    "descriptor" : "Ljava/lang/Object;"
+  } ],
+  "methods" : [ ],
+  "constructors" : [ {
+    "access" : 1,
+    "descriptor" : "(Ljava/lang/Object;)V"
+  } ]
+}, {
+  "class" : "DualNode",
+  "name" : "fn",
+  "super" : "gw",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "keyDual",
+    "owner" : "fn",
+    "name" : "cg",
+    "access" : 1,
+    "descriptor" : "J"
+  }, {
+    "field" : "nextDual",
+    "owner" : "fn",
+    "name" : "cp",
+    "access" : 1,
+    "descriptor" : "Lfn;"
+  }, {
+    "field" : "previousDual",
+    "owner" : "fn",
+    "name" : "cf",
+    "access" : 1,
+    "descriptor" : "Lfn;"
+  } ],
+  "methods" : [ {
+    "method" : "removeDual",
+    "owner" : "fn",
+    "name" : "cg",
+    "access" : 1,
+    "parameters" : [ ],
+    "descriptor" : "()V"
+  } ],
+  "constructors" : [ {
+    "access" : 1,
+    "descriptor" : "()V"
+  } ]
+}, {
+  "class" : "InterfaceParent",
+  "name" : "bx",
+  "super" : "gw",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "itf",
+    "owner" : "bx",
+    "name" : "m",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : -707461797
+  }, {
+    "field" : "keep",
+    "owner" : "bx",
+    "name" : "q",
+    "access" : 0,
+    "descriptor" : "Z"
+  }, {
+    "field" : "type",
+    "owner" : "bx",
+    "name" : "f",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : 1712037041
+  } ],
+  "methods" : [ ],
+  "constructors" : [ {
+    "access" : 0,
+    "descriptor" : "()V"
+  } ]
+}, {
+  "class" : "ParamDefinition",
+  "name" : "jb",
+  "super" : "fn",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "autodisable",
+    "owner" : "jb",
+    "name" : "u",
+    "access" : 0,
+    "descriptor" : "Z"
+  }, {
+    "field" : "defaultint",
+    "owner" : "jb",
+    "name" : "w",
+    "access" : 1,
+    "descriptor" : "I",
+    "decoder" : 1133042753
+  }, {
+    "field" : "defaultstr",
+    "owner" : "jb",
+    "name" : "o",
+    "access" : 1,
+    "descriptor" : "Ljava/lang/String;"
+  }, {
+    "field" : "type",
+    "owner" : "jb",
+    "name" : "q",
+    "access" : 0,
+    "descriptor" : "C"
+  } ],
+  "methods" : [ {
+    "method" : "decode",
+    "owner" : "jb",
+    "name" : "q",
+    "access" : 0,
+    "descriptor" : "(Lgr;I)V"
+  }, {
+    "method" : "decode0",
+    "owner" : "jb",
+    "name" : "w",
+    "access" : 0,
+    "descriptor" : "(Lgr;II)V"
+  }, {
+    "method" : "isString",
+    "owner" : "jb",
+    "name" : "o",
+    "access" : 1,
+    "descriptor" : "(I)Z"
+  }, {
+    "method" : "postDecode",
+    "owner" : "jb",
+    "name" : "f",
+    "access" : 0,
+    "parameters" : [ ],
+    "descriptor" : "(B)V"
+  } ],
+  "constructors" : [ {
+    "access" : 0,
+    "descriptor" : "()V"
+  } ]
 }, {
   "class" : "Animation",
   "name" : "dz",
@@ -2831,67 +1997,36 @@
     "descriptor" : "([BLek;)V"
   } ]
 }, {
-  "class" : "ParamKeyDefinition",
-  "name" : "jb",
-  "super" : "fn",
-  "access" : 33,
+  "class" : "PcmPlayerProvider",
+  "name" : "cz",
+  "super" : "java.lang.Object",
+  "access" : 1537,
   "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "isMembersOnly",
-    "owner" : "jb",
-    "name" : "u",
-    "access" : 0,
-    "descriptor" : "Z"
-  }, {
-    "field" : "keyInt",
-    "owner" : "jb",
-    "name" : "w",
-    "access" : 1,
-    "descriptor" : "I",
-    "decoder" : 1133042753
-  }, {
-    "field" : "keyString",
-    "owner" : "jb",
-    "name" : "o",
-    "access" : 1,
-    "descriptor" : "Ljava/lang/String;"
-  }, {
-    "field" : "type",
-    "owner" : "jb",
-    "name" : "q",
-    "access" : 0,
-    "descriptor" : "C"
-  } ],
+  "fields" : [ ],
   "methods" : [ {
-    "method" : "init",
-    "owner" : "jb",
-    "name" : "f",
-    "access" : 0,
-    "parameters" : [ ],
-    "descriptor" : "(B)V"
-  }, {
-    "method" : "isString",
-    "owner" : "jb",
-    "name" : "o",
-    "access" : 1,
-    "descriptor" : "(I)Z"
-  }, {
-    "method" : "read",
-    "owner" : "jb",
-    "name" : "q",
-    "access" : 0,
-    "descriptor" : "(Lgr;I)V"
-  }, {
-    "method" : "readNext",
-    "owner" : "jb",
-    "name" : "w",
-    "access" : 0,
-    "descriptor" : "(Lgr;II)V"
+    "method" : "player",
+    "owner" : "cz",
+    "name" : "m",
+    "access" : 1025,
+    "descriptor" : "(B)Lco;"
   } ],
-  "constructors" : [ {
-    "access" : 0,
-    "descriptor" : "()V"
-  } ]
+  "constructors" : [ ]
+}, {
+  "class" : "Enumerated",
+  "name" : "gc",
+  "super" : "java.lang.Object",
+  "access" : 1537,
+  "interfaces" : [ ],
+  "fields" : [ ],
+  "methods" : [ {
+    "method" : "ordinal",
+    "owner" : "gc",
+    "name" : "f",
+    "access" : 1025,
+    "parameters" : [ ],
+    "descriptor" : "(B)I"
+  } ],
+  "constructors" : [ ]
 }, {
   "class" : "NetFileRequest",
   "name" : "iz",
@@ -2899,18 +2034,18 @@
   "access" : 33,
   "interfaces" : [ ],
   "fields" : [ {
+    "field" : "archive",
+    "owner" : "iz",
+    "name" : "m",
+    "access" : 1,
+    "descriptor" : "Lit;"
+  }, {
     "field" : "crc",
     "owner" : "iz",
     "name" : "f",
     "access" : 1,
     "descriptor" : "I",
     "decoder" : 1487103265
-  }, {
-    "field" : "indexCache",
-    "owner" : "iz",
-    "name" : "m",
-    "access" : 1,
-    "descriptor" : "Lit;"
   }, {
     "field" : "padding",
     "owner" : "iz",
@@ -2923,6 +2058,278 @@
     "access" : 0,
     "descriptor" : "()V"
   } ]
+}, {
+  "class" : "Buddy",
+  "name" : "ke",
+  "super" : "js",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "int2",
+    "owner" : "ke",
+    "name" : "u",
+    "access" : 1,
+    "descriptor" : "I",
+    "decoder" : 120689297
+  }, {
+    "field" : "rank",
+    "owner" : "ke",
+    "name" : "g",
+    "access" : 1,
+    "descriptor" : "I",
+    "decoder" : -304954565
+  }, {
+    "field" : "world0",
+    "owner" : "ke",
+    "name" : "o",
+    "access" : 1,
+    "descriptor" : "I",
+    "decoder" : 429472919
+  } ],
+  "methods" : [ {
+    "method" : "hasWorld",
+    "owner" : "ke",
+    "name" : "au",
+    "access" : 1,
+    "parameters" : [ ],
+    "descriptor" : "(I)Z"
+  }, {
+    "method" : "set",
+    "owner" : "ke",
+    "name" : "an",
+    "access" : 0,
+    "descriptor" : "(IIS)V"
+  }, {
+    "method" : "world",
+    "owner" : "ke",
+    "name" : "az",
+    "access" : 1,
+    "parameters" : [ ],
+    "descriptor" : "(B)I"
+  } ],
+  "constructors" : [ {
+    "access" : 0,
+    "descriptor" : "()V"
+  } ]
+}, {
+  "class" : "HealthBarUpdate",
+  "name" : "bg",
+  "super" : "gw",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "cycle",
+    "owner" : "bg",
+    "name" : "m",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : 2103089795
+  }, {
+    "field" : "cycleOffset",
+    "owner" : "bg",
+    "name" : "w",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : -1876302639
+  }, {
+    "field" : "health",
+    "owner" : "bg",
+    "name" : "f",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : 1821995313
+  }, {
+    "field" : "health2",
+    "owner" : "bg",
+    "name" : "q",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : -820353645
+  } ],
+  "methods" : [ {
+    "method" : "set",
+    "owner" : "bg",
+    "name" : "m",
+    "access" : 0,
+    "descriptor" : "(IIIII)V"
+  } ],
+  "constructors" : [ {
+    "access" : 0,
+    "descriptor" : "(IIII)V"
+  } ]
+}, {
+  "class" : "HealthBar",
+  "name" : "cr",
+  "super" : "gw",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "definition",
+    "owner" : "cr",
+    "name" : "q",
+    "access" : 0,
+    "descriptor" : "Lii;"
+  }, {
+    "field" : "updates",
+    "owner" : "cr",
+    "name" : "w",
+    "access" : 0,
+    "descriptor" : "Lja;"
+  } ],
+  "methods" : [ {
+    "method" : "get",
+    "owner" : "cr",
+    "name" : "f",
+    "access" : 0,
+    "parameters" : [ "cycle" ],
+    "descriptor" : "(II)Lbg;"
+  }, {
+    "method" : "isEmpty",
+    "owner" : "cr",
+    "name" : "q",
+    "access" : 0,
+    "parameters" : [ ],
+    "descriptor" : "(I)Z"
+  }, {
+    "method" : "put",
+    "owner" : "cr",
+    "name" : "m",
+    "access" : 0,
+    "descriptor" : "(IIIIB)V"
+  } ],
+  "constructors" : [ {
+    "access" : 0,
+    "descriptor" : "(Lii;)V"
+  } ]
+}, {
+  "class" : "IntHashTable",
+  "name" : "lv",
+  "super" : "java.lang.Object",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "array",
+    "owner" : "lv",
+    "name" : "m",
+    "access" : 0,
+    "descriptor" : "[I"
+  } ],
+  "methods" : [ {
+    "method" : "get",
+    "owner" : "lv",
+    "name" : "m",
+    "access" : 1,
+    "descriptor" : "(II)I"
+  } ],
+  "constructors" : [ {
+    "access" : 1,
+    "descriptor" : "([I)V"
+  } ]
+}, {
+  "class" : "FloorUnderlayDefinition",
+  "name" : "ih",
+  "super" : "fn",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "hue",
+    "owner" : "ih",
+    "name" : "w",
+    "access" : 1,
+    "descriptor" : "I",
+    "decoder" : -1465372343
+  }, {
+    "field" : "hueMultiplier",
+    "owner" : "ih",
+    "name" : "g",
+    "access" : 1,
+    "descriptor" : "I",
+    "decoder" : 1484542081
+  }, {
+    "field" : "lightness",
+    "owner" : "ih",
+    "name" : "u",
+    "access" : 1,
+    "descriptor" : "I",
+    "decoder" : -1691813081
+  }, {
+    "field" : "rgb",
+    "owner" : "ih",
+    "name" : "q",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : -635678213
+  }, {
+    "field" : "saturation",
+    "owner" : "ih",
+    "name" : "o",
+    "access" : 1,
+    "descriptor" : "I",
+    "decoder" : 2031118785
+  } ],
+  "methods" : [ {
+    "method" : "decode",
+    "owner" : "ih",
+    "name" : "w",
+    "access" : 0,
+    "descriptor" : "(Lgr;II)V"
+  }, {
+    "method" : "decode0",
+    "owner" : "ih",
+    "name" : "o",
+    "access" : 0,
+    "descriptor" : "(Lgr;III)V"
+  }, {
+    "method" : "postDecode",
+    "owner" : "ih",
+    "name" : "q",
+    "access" : 0,
+    "parameters" : [ ],
+    "descriptor" : "(I)V"
+  }, {
+    "method" : "setHsl",
+    "owner" : "ih",
+    "name" : "u",
+    "access" : 0,
+    "parameters" : [ "rgb" ],
+    "descriptor" : "(IB)V"
+  } ],
+  "constructors" : [ {
+    "access" : 0,
+    "descriptor" : "()V"
+  } ]
+}, {
+  "class" : "Wrapper",
+  "name" : "eu",
+  "super" : "fn",
+  "access" : 1057,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "size",
+    "owner" : "eu",
+    "name" : "f",
+    "access" : 16,
+    "descriptor" : "I"
+  } ],
+  "methods" : [ {
+    "method" : "get",
+    "owner" : "eu",
+    "name" : "m",
+    "access" : 1024,
+    "parameters" : [ ],
+    "descriptor" : "()Ljava/lang/Object;"
+  }, {
+    "method" : "isSoft",
+    "owner" : "eu",
+    "name" : "f",
+    "access" : 1024,
+    "parameters" : [ ],
+    "descriptor" : "()Z"
+  } ],
+  "constructors" : [ {
+    "access" : 0,
+    "descriptor" : "(I)V"
+  } ]
 }, {
   "class" : "DualNodeDeque",
   "name" : "jp",
@@ -2971,6 +2378,275 @@
     "access" : 1,
     "descriptor" : "()V"
   } ]
+}, {
+  "class" : "NodeHashTable",
+  "name" : "ld",
+  "super" : "java.lang.Object",
+  "access" : 49,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "buckets",
+    "owner" : "ld",
+    "name" : "f",
+    "access" : 0,
+    "descriptor" : "[Lgw;"
+  }, {
+    "field" : "current",
+    "owner" : "ld",
+    "name" : "w",
+    "access" : 0,
+    "descriptor" : "Lgw;"
+  }, {
+    "field" : "currentGet",
+    "owner" : "ld",
+    "name" : "q",
+    "access" : 0,
+    "descriptor" : "Lgw;"
+  }, {
+    "field" : "index",
+    "owner" : "ld",
+    "name" : "o",
+    "access" : 0,
+    "descriptor" : "I"
+  }, {
+    "field" : "size",
+    "owner" : "ld",
+    "name" : "m",
+    "access" : 0,
+    "descriptor" : "I"
+  } ],
+  "methods" : [ {
+    "method" : "clear",
+    "owner" : "ld",
+    "name" : "q",
+    "access" : 1,
+    "parameters" : [ ],
+    "descriptor" : "()V"
+  }, {
+    "method" : "first",
+    "owner" : "ld",
+    "name" : "w",
+    "access" : 1,
+    "parameters" : [ ],
+    "descriptor" : "()Lgw;"
+  }, {
+    "method" : "get",
+    "owner" : "ld",
+    "name" : "m",
+    "access" : 1,
+    "parameters" : [ "key" ],
+    "descriptor" : "(J)Lgw;"
+  }, {
+    "method" : "next",
+    "owner" : "ld",
+    "name" : "o",
+    "access" : 1,
+    "parameters" : [ ],
+    "descriptor" : "()Lgw;"
+  }, {
+    "method" : "put",
+    "owner" : "ld",
+    "name" : "f",
+    "access" : 1,
+    "parameters" : [ "node", "key" ],
+    "descriptor" : "(Lgw;J)V"
+  } ],
+  "constructors" : [ {
+    "access" : 1,
+    "descriptor" : "(I)V"
+  } ]
+}, {
+  "class" : "ReflectionCheck",
+  "name" : "lw",
+  "super" : "gw",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "arguments",
+    "owner" : "lw",
+    "name" : "m",
+    "access" : 0,
+    "descriptor" : "[[[B"
+  }, {
+    "field" : "creationErrors",
+    "owner" : "lw",
+    "name" : "u",
+    "access" : 0,
+    "descriptor" : "[I"
+  }, {
+    "field" : "fields",
+    "owner" : "lw",
+    "name" : "g",
+    "access" : 0,
+    "descriptor" : "[Ljava/lang/reflect/Field;"
+  }, {
+    "field" : "id",
+    "owner" : "lw",
+    "name" : "q",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : -1955146989
+  }, {
+    "field" : "intReplaceValues",
+    "owner" : "lw",
+    "name" : "f",
+    "access" : 0,
+    "descriptor" : "[I"
+  }, {
+    "field" : "methods",
+    "owner" : "lw",
+    "name" : "l",
+    "access" : 0,
+    "descriptor" : "[Ljava/lang/reflect/Method;"
+  }, {
+    "field" : "operations",
+    "owner" : "lw",
+    "name" : "o",
+    "access" : 0,
+    "descriptor" : "[I"
+  }, {
+    "field" : "size",
+    "owner" : "lw",
+    "name" : "w",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : -1091722075
+  } ],
+  "methods" : [ ],
+  "constructors" : [ {
+    "access" : 0,
+    "descriptor" : "()V"
+  } ]
+}, {
+  "class" : "AbstractSocket",
+  "name" : "fu",
+  "super" : "java.lang.Object",
+  "access" : 1057,
+  "interfaces" : [ ],
+  "fields" : [ ],
+  "methods" : [ {
+    "method" : "available",
+    "owner" : "fu",
+    "name" : "q",
+    "access" : 1025,
+    "parameters" : [ ],
+    "descriptor" : "(I)I"
+  }, {
+    "method" : "close",
+    "owner" : "fu",
+    "name" : "g",
+    "access" : 1025,
+    "parameters" : [ ],
+    "descriptor" : "(I)V"
+  }, {
+    "method" : "isAvailable",
+    "owner" : "fu",
+    "name" : "f",
+    "access" : 1025,
+    "parameters" : [ "length" ],
+    "descriptor" : "(II)Z"
+  }, {
+    "method" : "read",
+    "owner" : "fu",
+    "name" : "o",
+    "access" : 1025,
+    "parameters" : [ "dst", "dstIndex", "length" ],
+    "descriptor" : "([BIII)I"
+  }, {
+    "method" : "readUnsignedByte",
+    "owner" : "fu",
+    "name" : "w",
+    "access" : 1025,
+    "parameters" : [ ],
+    "descriptor" : "(I)I"
+  }, {
+    "method" : "write",
+    "owner" : "fu",
+    "name" : "u",
+    "access" : 1025,
+    "parameters" : [ "src", "srcIndex", "length" ],
+    "descriptor" : "([BIIB)V"
+  } ],
+  "constructors" : [ {
+    "access" : 0,
+    "descriptor" : "()V"
+  } ]
+}, {
+  "class" : "VarbitDefinition",
+  "name" : "ia",
+  "super" : "fn",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "baseVar",
+    "owner" : "ia",
+    "name" : "q",
+    "access" : 1,
+    "descriptor" : "I",
+    "decoder" : 1552575189
+  }, {
+    "field" : "endBit",
+    "owner" : "ia",
+    "name" : "o",
+    "access" : 1,
+    "descriptor" : "I",
+    "decoder" : -1710935305
+  }, {
+    "field" : "startBit",
+    "owner" : "ia",
+    "name" : "w",
+    "access" : 1,
+    "descriptor" : "I",
+    "decoder" : -870948181
+  } ],
+  "methods" : [ {
+    "method" : "decode",
+    "owner" : "ia",
+    "name" : "q",
+    "access" : 0,
+    "descriptor" : "(Lgr;I)V"
+  }, {
+    "method" : "decode0",
+    "owner" : "ia",
+    "name" : "w",
+    "access" : 0,
+    "descriptor" : "(Lgr;IB)V"
+  } ],
+  "constructors" : [ {
+    "access" : 0,
+    "descriptor" : "()V"
+  } ]
+}, {
+  "class" : "InvDefinition",
+  "name" : "ib",
+  "super" : "fn",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "size",
+    "owner" : "ib",
+    "name" : "q",
+    "access" : 1,
+    "descriptor" : "I",
+    "decoder" : 1358868971
+  } ],
+  "methods" : [ {
+    "method" : "decode",
+    "owner" : "ib",
+    "name" : "f",
+    "access" : 0,
+    "descriptor" : "(Lgr;I)V"
+  }, {
+    "method" : "decode0",
+    "owner" : "ib",
+    "name" : "q",
+    "access" : 0,
+    "descriptor" : "(Lgr;II)V"
+  } ],
+  "constructors" : [ {
+    "access" : 0,
+    "descriptor" : "()V"
+  } ]
 }, {
   "class" : "LoginPacket",
   "name" : "gl",
@@ -2990,6 +2666,113 @@
     "access" : 0,
     "descriptor" : "(II)V"
   } ]
+}, {
+  "class" : "WorldMapEvent",
+  "name" : "ap",
+  "super" : "java.lang.Object",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "coord1",
+    "owner" : "ap",
+    "name" : "f",
+    "access" : 1,
+    "descriptor" : "Lhu;"
+  }, {
+    "field" : "coord2",
+    "owner" : "ap",
+    "name" : "q",
+    "access" : 1,
+    "descriptor" : "Lhu;"
+  }, {
+    "field" : "mapElement",
+    "owner" : "ap",
+    "name" : "m",
+    "access" : 1,
+    "descriptor" : "I",
+    "decoder" : 264384233
+  } ],
+  "methods" : [ ],
+  "constructors" : [ {
+    "access" : 1,
+    "descriptor" : "(ILhu;Lhu;)V"
+  } ]
+}, {
+  "class" : "WorldMapSection",
+  "name" : "ab",
+  "super" : "java.lang.Object",
+  "access" : 1537,
+  "interfaces" : [ ],
+  "fields" : [ ],
+  "methods" : [ {
+    "method" : "containsCoord",
+    "owner" : "ab",
+    "name" : "f",
+    "access" : 1025,
+    "parameters" : [ "plane", "x", "y" ],
+    "descriptor" : "(IIIB)Z"
+  }, {
+    "method" : "containsPosition",
+    "owner" : "ab",
+    "name" : "q",
+    "access" : 1025,
+    "parameters" : [ "x", "y" ],
+    "descriptor" : "(IIB)Z"
+  }, {
+    "method" : "coord",
+    "owner" : "ab",
+    "name" : "o",
+    "access" : 1025,
+    "parameters" : [ "x", "y" ],
+    "descriptor" : "(III)Lhu;"
+  }, {
+    "method" : "expandBounds",
+    "owner" : "ab",
+    "name" : "m",
+    "access" : 1025,
+    "parameters" : [ "area" ],
+    "descriptor" : "(Lag;I)V"
+  }, {
+    "method" : "position",
+    "owner" : "ab",
+    "name" : "w",
+    "access" : 1025,
+    "parameters" : [ "plane", "x", "y" ],
+    "descriptor" : "(IIII)[I"
+  }, {
+    "method" : "read",
+    "owner" : "ab",
+    "name" : "u",
+    "access" : 1025,
+    "parameters" : [ "buffer" ],
+    "descriptor" : "(Lgr;B)V"
+  } ],
+  "constructors" : [ ]
+}, {
+  "class" : "Frames",
+  "name" : "en",
+  "super" : "fn",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "frames",
+    "owner" : "en",
+    "name" : "m",
+    "access" : 0,
+    "descriptor" : "[Ldz;"
+  } ],
+  "methods" : [ {
+    "method" : "hasAlphaTransform",
+    "owner" : "en",
+    "name" : "m",
+    "access" : 1,
+    "parameters" : [ "frame" ],
+    "descriptor" : "(II)Z"
+  } ],
+  "constructors" : [ {
+    "access" : 1,
+    "descriptor" : "(Lir;Lir;IZ)V"
+  } ]
 }, {
   "class" : "Skills",
   "name" : "hc",
@@ -2999,6 +2782,592 @@
   "fields" : [ ],
   "methods" : [ ],
   "constructors" : [ ]
+}, {
+  "class" : "SoftWrapper",
+  "name" : "ef",
+  "super" : "eu",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "ref",
+    "owner" : "ef",
+    "name" : "m",
+    "access" : 0,
+    "descriptor" : "Ljava/lang/ref/SoftReference;"
+  } ],
+  "methods" : [ {
+    "method" : "get",
+    "owner" : "ef",
+    "name" : "m",
+    "access" : 0,
+    "parameters" : [ ],
+    "descriptor" : "()Ljava/lang/Object;"
+  }, {
+    "method" : "isSoft",
+    "owner" : "ef",
+    "name" : "f",
+    "access" : 0,
+    "parameters" : [ ],
+    "descriptor" : "()Z"
+  } ],
+  "constructors" : [ {
+    "access" : 0,
+    "descriptor" : "(Ljava/lang/Object;I)V"
+  } ]
+}, {
+  "class" : "DirectWrapper",
+  "name" : "ew",
+  "super" : "eu",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "obj",
+    "owner" : "ew",
+    "name" : "m",
+    "access" : 0,
+    "descriptor" : "Ljava/lang/Object;"
+  } ],
+  "methods" : [ {
+    "method" : "get",
+    "owner" : "ew",
+    "name" : "m",
+    "access" : 0,
+    "parameters" : [ ],
+    "descriptor" : "()Ljava/lang/Object;"
+  }, {
+    "method" : "isSoft",
+    "owner" : "ew",
+    "name" : "f",
+    "access" : 0,
+    "parameters" : [ ],
+    "descriptor" : "()Z"
+  } ],
+  "constructors" : [ {
+    "access" : 0,
+    "descriptor" : "(Ljava/lang/Object;I)V"
+  } ]
+}, {
+  "class" : "SoundCache",
+  "name" : "dt",
+  "super" : "java.lang.Object",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "musicSampleIndex",
+    "owner" : "dt",
+    "name" : "f",
+    "access" : 0,
+    "descriptor" : "Lir;"
+  }, {
+    "field" : "musicSamples",
+    "owner" : "dt",
+    "name" : "q",
+    "access" : 0,
+    "descriptor" : "Lld;"
+  }, {
+    "field" : "rawSounds",
+    "owner" : "dt",
+    "name" : "w",
+    "access" : 0,
+    "descriptor" : "Lld;"
+  }, {
+    "field" : "soundEffectIndex",
+    "owner" : "dt",
+    "name" : "m",
+    "access" : 0,
+    "descriptor" : "Lir;"
+  } ],
+  "methods" : [ {
+    "method" : "getMusicSample",
+    "owner" : "dt",
+    "name" : "w",
+    "access" : 1,
+    "descriptor" : "(I[II)Lcx;"
+  }, {
+    "method" : "getMusicSample0",
+    "owner" : "dt",
+    "name" : "f",
+    "access" : 0,
+    "descriptor" : "(II[II)Lcx;"
+  }, {
+    "method" : "getSoundEffect",
+    "owner" : "dt",
+    "name" : "q",
+    "access" : 1,
+    "descriptor" : "(I[IB)Lcx;"
+  }, {
+    "method" : "getSoundEffect0",
+    "owner" : "dt",
+    "name" : "m",
+    "access" : 0,
+    "descriptor" : "(II[IS)Lcx;"
+  } ],
+  "constructors" : [ {
+    "access" : 1,
+    "descriptor" : "(Lir;Lir;)V"
+  } ]
+}, {
+  "class" : "SpriteMask",
+  "name" : "hp",
+  "super" : "fn",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "height",
+    "owner" : "hp",
+    "name" : "f",
+    "access" : 17,
+    "descriptor" : "I",
+    "decoder" : -193097093
+  }, {
+    "field" : "width",
+    "owner" : "hp",
+    "name" : "m",
+    "access" : 17,
+    "descriptor" : "I",
+    "decoder" : 574541221
+  }, {
+    "field" : "xStarts",
+    "owner" : "hp",
+    "name" : "w",
+    "access" : 17,
+    "descriptor" : "[I"
+  }, {
+    "field" : "xWidths",
+    "owner" : "hp",
+    "name" : "q",
+    "access" : 17,
+    "descriptor" : "[I"
+  } ],
+  "methods" : [ {
+    "method" : "contains",
+    "owner" : "hp",
+    "name" : "m",
+    "access" : 1,
+    "parameters" : [ "x", "y" ],
+    "descriptor" : "(III)Z"
+  } ],
+  "constructors" : [ {
+    "access" : 0,
+    "descriptor" : "(II[I[II)V"
+  } ]
+}, {
+  "class" : "StructDefinition",
+  "name" : "jq",
+  "super" : "fn",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "params",
+    "owner" : "jq",
+    "name" : "q",
+    "access" : 0,
+    "descriptor" : "Llh;"
+  } ],
+  "methods" : [ {
+    "method" : "decode",
+    "owner" : "jq",
+    "name" : "q",
+    "access" : 0,
+    "descriptor" : "(Lgr;I)V"
+  }, {
+    "method" : "decode0",
+    "owner" : "jq",
+    "name" : "w",
+    "access" : 0,
+    "descriptor" : "(Lgr;II)V"
+  }, {
+    "method" : "getIntParam",
+    "owner" : "jq",
+    "name" : "o",
+    "access" : 1,
+    "descriptor" : "(IIB)I"
+  }, {
+    "method" : "getStringParam",
+    "owner" : "jq",
+    "name" : "u",
+    "access" : 1,
+    "descriptor" : "(ILjava/lang/String;I)Ljava/lang/String;"
+  }, {
+    "method" : "postDecode",
+    "owner" : "jq",
+    "name" : "f",
+    "access" : 0,
+    "parameters" : [ ],
+    "descriptor" : "(B)V"
+  } ],
+  "constructors" : [ {
+    "access" : 0,
+    "descriptor" : "()V"
+  } ]
+}, {
+  "class" : "Rasterizer2D",
+  "name" : "lf",
+  "super" : "fn",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ ],
+  "methods" : [ ],
+  "constructors" : [ {
+    "access" : 4,
+    "descriptor" : "()V"
+  } ]
+}, {
+  "class" : "Bzip2Decompressor",
+  "name" : "gk",
+  "super" : "java.lang.Object",
+  "access" : 49,
+  "interfaces" : [ ],
+  "fields" : [ ],
+  "methods" : [ ],
+  "constructors" : [ ]
+}, {
+  "class" : "Interpreter",
+  "name" : "bv",
+  "super" : "java.lang.Object",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ ],
+  "methods" : [ ],
+  "constructors" : [ ]
+}, {
+  "class" : "IgnoreList",
+  "name" : "kj",
+  "super" : "km",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "loginType",
+    "owner" : "kj",
+    "name" : "q",
+    "access" : 16,
+    "descriptor" : "Llx;"
+  } ],
+  "methods" : [ {
+    "method" : "newInstance",
+    "owner" : "kj",
+    "name" : "m",
+    "access" : 0,
+    "descriptor" : "(I)Ljs;"
+  }, {
+    "method" : "newTypedArray",
+    "owner" : "kj",
+    "name" : "f",
+    "access" : 0,
+    "descriptor" : "(II)[Ljs;"
+  }, {
+    "method" : "read",
+    "owner" : "kj",
+    "name" : "q",
+    "access" : 1,
+    "parameters" : [ "buffer", "n" ],
+    "descriptor" : "(Lgr;IB)V"
+  } ],
+  "constructors" : [ {
+    "access" : 1,
+    "descriptor" : "(Llx;)V"
+  } ]
+}, {
+  "class" : "Message",
+  "name" : "bm",
+  "super" : "fn",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "count",
+    "owner" : "bm",
+    "name" : "m",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : 1597147817
+  }, {
+    "field" : "cycle",
+    "owner" : "bm",
+    "name" : "f",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : 1164592791
+  }, {
+    "field" : "isFromFriend0",
+    "owner" : "bm",
+    "name" : "u",
+    "access" : 0,
+    "descriptor" : "Lkd;"
+  }, {
+    "field" : "isFromIgnored0",
+    "owner" : "bm",
+    "name" : "g",
+    "access" : 0,
+    "descriptor" : "Lkd;"
+  }, {
+    "field" : "prefix",
+    "owner" : "bm",
+    "name" : "l",
+    "access" : 0,
+    "descriptor" : "Ljava/lang/String;"
+  }, {
+    "field" : "sender",
+    "owner" : "bm",
+    "name" : "w",
+    "access" : 0,
+    "descriptor" : "Ljava/lang/String;"
+  }, {
+    "field" : "senderUsername",
+    "owner" : "bm",
+    "name" : "o",
+    "access" : 0,
+    "descriptor" : "Lkp;"
+  }, {
+    "field" : "text",
+    "owner" : "bm",
+    "name" : "e",
+    "access" : 0,
+    "descriptor" : "Ljava/lang/String;"
+  }, {
+    "field" : "type",
+    "owner" : "bm",
+    "name" : "q",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : 1223792995
+  } ],
+  "methods" : [ {
+    "method" : "clearIsFromFriend",
+    "owner" : "bm",
+    "name" : "f",
+    "access" : 0,
+    "parameters" : [ ],
+    "descriptor" : "(I)V"
+  }, {
+    "method" : "clearIsFromIgnored",
+    "owner" : "bm",
+    "name" : "o",
+    "access" : 0,
+    "parameters" : [ ],
+    "descriptor" : "(I)V"
+  }, {
+    "method" : "fillIsFromFriend",
+    "owner" : "bm",
+    "name" : "w",
+    "access" : 0,
+    "parameters" : [ ],
+    "descriptor" : "(I)V"
+  }, {
+    "method" : "fillIsFromIgnored",
+    "owner" : "bm",
+    "name" : "g",
+    "access" : 0,
+    "parameters" : [ ],
+    "descriptor" : "(S)V"
+  }, {
+    "method" : "fillSenderUsername",
+    "owner" : "bm",
+    "name" : "l",
+    "access" : 16,
+    "parameters" : [ ],
+    "descriptor" : "(B)V"
+  }, {
+    "method" : "isFromFriend",
+    "owner" : "bm",
+    "name" : "q",
+    "access" : 16,
+    "parameters" : [ ],
+    "descriptor" : "(I)Z"
+  }, {
+    "method" : "isFromIgnored",
+    "owner" : "bm",
+    "name" : "u",
+    "access" : 16,
+    "parameters" : [ ],
+    "descriptor" : "(B)Z"
+  }, {
+    "method" : "set",
+    "owner" : "bm",
+    "name" : "m",
+    "access" : 0,
+    "parameters" : [ "type", "sender", "prefix", "text" ],
+    "descriptor" : "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;B)V"
+  } ],
+  "constructors" : [ {
+    "access" : 0,
+    "descriptor" : "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V"
+  } ]
+}, {
+  "class" : "Entity",
+  "name" : "ex",
+  "super" : "fn",
+  "access" : 1057,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "height",
+    "owner" : "ex",
+    "name" : "cw",
+    "access" : 1,
+    "descriptor" : "I",
+    "decoder" : 849583845
+  } ],
+  "methods" : [ {
+    "method" : "draw",
+    "owner" : "ex",
+    "name" : "cy",
+    "access" : 0,
+    "parameters" : [ "yaw", "cameraPitchSine", "cameraPitchCosine", "cameraYawSine", "cameraYawCosine", "x", "y", "z", "tag" ],
+    "descriptor" : "(IIIIIIIIJ)V"
+  }, {
+    "method" : "getModel",
+    "owner" : "ex",
+    "name" : "e",
+    "access" : 4,
+    "parameters" : [ ],
+    "descriptor" : "(I)Ldu;"
+  } ],
+  "constructors" : [ {
+    "access" : 4,
+    "descriptor" : "()V"
+  } ]
+}, {
+  "class" : "NetCache",
+  "name" : "iq",
+  "super" : "java.lang.Object",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ ],
+  "methods" : [ ],
+  "constructors" : [ ]
+}, {
+  "class" : "EnumDefinition",
+  "name" : "jw",
+  "super" : "fn",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "defaultint",
+    "owner" : "jw",
+    "name" : "u",
+    "access" : 1,
+    "descriptor" : "I",
+    "decoder" : 1948115527
+  }, {
+    "field" : "defaultstr",
+    "owner" : "jw",
+    "name" : "o",
+    "access" : 1,
+    "descriptor" : "Ljava/lang/String;"
+  }, {
+    "field" : "inputtype",
+    "owner" : "jw",
+    "name" : "q",
+    "access" : 1,
+    "descriptor" : "C"
+  }, {
+    "field" : "intvals",
+    "owner" : "jw",
+    "name" : "e",
+    "access" : 1,
+    "descriptor" : "[I"
+  }, {
+    "field" : "keys",
+    "owner" : "jw",
+    "name" : "l",
+    "access" : 1,
+    "descriptor" : "[I"
+  }, {
+    "field" : "outputcount",
+    "owner" : "jw",
+    "name" : "g",
+    "access" : 1,
+    "descriptor" : "I",
+    "decoder" : -12324053
+  }, {
+    "field" : "outputtype",
+    "owner" : "jw",
+    "name" : "w",
+    "access" : 1,
+    "descriptor" : "C"
+  }, {
+    "field" : "strvals",
+    "owner" : "jw",
+    "name" : "x",
+    "access" : 1,
+    "descriptor" : "[Ljava/lang/String;"
+  } ],
+  "methods" : [ {
+    "method" : "decode",
+    "owner" : "jw",
+    "name" : "f",
+    "access" : 0,
+    "descriptor" : "(Lgr;I)V"
+  }, {
+    "method" : "decode0",
+    "owner" : "jw",
+    "name" : "q",
+    "access" : 0,
+    "descriptor" : "(Lgr;II)V"
+  }, {
+    "method" : "size",
+    "owner" : "jw",
+    "name" : "w",
+    "access" : 1,
+    "parameters" : [ ],
+    "descriptor" : "(B)I"
+  } ],
+  "constructors" : [ {
+    "access" : 0,
+    "descriptor" : "()V"
+  } ]
+}, {
+  "class" : "Login",
+  "name" : "cu",
+  "super" : "java.lang.Object",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ ],
+  "methods" : [ ],
+  "constructors" : [ ]
+}, {
+  "class" : "AttackOption",
+  "name" : "cj",
+  "super" : "java.lang.Object",
+  "access" : 33,
+  "interfaces" : [ "gc" ],
+  "fields" : [ {
+    "field" : "id",
+    "owner" : "cj",
+    "name" : "o",
+    "access" : 16,
+    "descriptor" : "I",
+    "decoder" : -1461217963
+  } ],
+  "methods" : [ {
+    "method" : "ordinal",
+    "owner" : "cj",
+    "name" : "f",
+    "access" : 1,
+    "parameters" : [ ],
+    "descriptor" : "(B)I"
+  } ],
+  "constructors" : [ {
+    "access" : 0,
+    "descriptor" : "(I)V"
+  } ]
+}, {
+  "class" : "Messages",
+  "name" : "cw",
+  "super" : "java.lang.Object",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ ],
+  "methods" : [ ],
+  "constructors" : [ ]
+}, {
+  "class" : "Rasterizer3D",
+  "name" : "et",
+  "super" : "lf",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ ],
+  "methods" : [ ],
+  "constructors" : [ ]
 }, {
   "class" : "AbstractFont",
   "name" : "kt",
@@ -3229,168 +3598,44 @@
     "descriptor" : "([B)V"
   } ]
 }, {
-  "class" : "UnderlayDefinition",
-  "name" : "ih",
-  "super" : "fn",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "hue",
-    "owner" : "ih",
-    "name" : "w",
-    "access" : 1,
-    "descriptor" : "I",
-    "decoder" : -1465372343
-  }, {
-    "field" : "hueMultiplier",
-    "owner" : "ih",
-    "name" : "g",
-    "access" : 1,
-    "descriptor" : "I",
-    "decoder" : 1484542081
-  }, {
-    "field" : "lightness",
-    "owner" : "ih",
-    "name" : "u",
-    "access" : 1,
-    "descriptor" : "I",
-    "decoder" : -1691813081
-  }, {
-    "field" : "rgb",
-    "owner" : "ih",
-    "name" : "q",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : -635678213
-  }, {
-    "field" : "saturation",
-    "owner" : "ih",
-    "name" : "o",
-    "access" : 1,
-    "descriptor" : "I",
-    "decoder" : 2031118785
-  } ],
-  "methods" : [ {
-    "method" : "init",
-    "owner" : "ih",
-    "name" : "q",
-    "access" : 0,
-    "parameters" : [ ],
-    "descriptor" : "(I)V"
-  }, {
-    "method" : "read",
-    "owner" : "ih",
-    "name" : "w",
-    "access" : 0,
-    "descriptor" : "(Lgr;II)V"
-  }, {
-    "method" : "readNext",
-    "owner" : "ih",
-    "name" : "o",
-    "access" : 0,
-    "descriptor" : "(Lgr;III)V"
-  }, {
-    "method" : "setHsl",
-    "owner" : "ih",
-    "name" : "u",
-    "access" : 0,
-    "parameters" : [ "rgb" ],
-    "descriptor" : "(IB)V"
-  } ],
-  "constructors" : [ {
-    "access" : 0,
-    "descriptor" : "()V"
-  } ]
-}, {
-  "class" : "IntHashTable",
-  "name" : "lv",
+  "class" : "DevicePcmPlayerProvider",
+  "name" : "az",
   "super" : "java.lang.Object",
   "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "array",
-    "owner" : "lv",
-    "name" : "m",
-    "access" : 0,
-    "descriptor" : "[I"
-  } ],
+  "interfaces" : [ "cz" ],
+  "fields" : [ ],
   "methods" : [ {
-    "method" : "get",
-    "owner" : "lv",
+    "method" : "player",
+    "owner" : "az",
     "name" : "m",
     "access" : 1,
-    "descriptor" : "(II)I"
-  } ],
-  "constructors" : [ {
-    "access" : 1,
-    "descriptor" : "([I)V"
-  } ]
-}, {
-  "class" : "VarbitDefinition",
-  "name" : "ia",
-  "super" : "fn",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "highBit",
-    "owner" : "ia",
-    "name" : "o",
-    "access" : 1,
-    "descriptor" : "I",
-    "decoder" : -1710935305
-  }, {
-    "field" : "lowBit",
-    "owner" : "ia",
-    "name" : "w",
-    "access" : 1,
-    "descriptor" : "I",
-    "decoder" : -870948181
-  }, {
-    "field" : "varp",
-    "owner" : "ia",
-    "name" : "q",
-    "access" : 1,
-    "descriptor" : "I",
-    "decoder" : 1552575189
-  } ],
-  "methods" : [ {
-    "method" : "read",
-    "owner" : "ia",
-    "name" : "q",
-    "access" : 0,
-    "descriptor" : "(Lgr;I)V"
-  }, {
-    "method" : "readNext",
-    "owner" : "ia",
-    "name" : "w",
-    "access" : 0,
-    "descriptor" : "(Lgr;IB)V"
+    "descriptor" : "(B)Lco;"
   } ],
   "constructors" : [ {
     "access" : 0,
     "descriptor" : "()V"
   } ]
 }, {
-  "class" : "IndexStore",
+  "class" : "ArchiveDisk",
   "name" : "ff",
   "super" : "java.lang.Object",
   "access" : 49,
   "interfaces" : [ ],
   "fields" : [ {
-    "field" : "dataFile",
-    "owner" : "ff",
-    "name" : "f",
-    "access" : 0,
-    "descriptor" : "Ldy;"
-  }, {
-    "field" : "index",
+    "field" : "archive",
     "owner" : "ff",
     "name" : "w",
     "access" : 0,
     "descriptor" : "I",
     "decoder" : -1982523283
   }, {
-    "field" : "indexFile",
+    "field" : "datFile",
+    "owner" : "ff",
+    "name" : "f",
+    "access" : 0,
+    "descriptor" : "Ldy;"
+  }, {
+    "field" : "idxFile",
     "owner" : "ff",
     "name" : "q",
     "access" : 0,
@@ -3428,117 +3673,383 @@
     "descriptor" : "(ILdy;Ldy;I)V"
   } ]
 }, {
-  "class" : "Entity",
-  "name" : "ex",
-  "super" : "fn",
-  "access" : 1057,
+  "class" : "GroundItem",
+  "name" : "ck",
+  "super" : "ex",
+  "access" : 49,
   "interfaces" : [ ],
   "fields" : [ {
-    "field" : "height",
-    "owner" : "ex",
-    "name" : "cw",
-    "access" : 1,
+    "field" : "id",
+    "owner" : "ck",
+    "name" : "m",
+    "access" : 0,
     "descriptor" : "I",
-    "decoder" : 849583845
+    "decoder" : 893970699
+  }, {
+    "field" : "quantity",
+    "owner" : "ck",
+    "name" : "f",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : 454094667
   } ],
   "methods" : [ {
-    "method" : "draw",
-    "owner" : "ex",
-    "name" : "cy",
-    "access" : 0,
-    "parameters" : [ "yaw", "cameraPitchSine", "cameraPitchCosine", "cameraYawSine", "cameraYawCosine", "x", "y", "z", "tag" ],
-    "descriptor" : "(IIIIIIIIJ)V"
-  }, {
     "method" : "getModel",
-    "owner" : "ex",
+    "owner" : "ck",
     "name" : "e",
-    "access" : 4,
+    "access" : 20,
     "parameters" : [ ],
     "descriptor" : "(I)Ldu;"
   } ],
   "constructors" : [ {
-    "access" : 4,
+    "access" : 0,
     "descriptor" : "()V"
   } ]
 }, {
-  "class" : "DirectWrapper",
-  "name" : "ew",
-  "super" : "eu",
+  "class" : "VarpDefinition",
+  "name" : "ix",
+  "super" : "fn",
   "access" : 33,
   "interfaces" : [ ],
   "fields" : [ {
-    "field" : "obj",
-    "owner" : "ew",
-    "name" : "m",
-    "access" : 0,
-    "descriptor" : "Ljava/lang/Object;"
+    "field" : "type",
+    "owner" : "ix",
+    "name" : "w",
+    "access" : 1,
+    "descriptor" : "I",
+    "decoder" : -1792568421
   } ],
   "methods" : [ {
-    "method" : "get",
-    "owner" : "ew",
-    "name" : "m",
-    "access" : 0,
-    "parameters" : [ ],
-    "descriptor" : "()Ljava/lang/Object;"
-  }, {
-    "method" : "isSoft",
-    "owner" : "ew",
+    "method" : "decode",
+    "owner" : "ix",
     "name" : "f",
     "access" : 0,
-    "parameters" : [ ],
-    "descriptor" : "()Z"
+    "descriptor" : "(Lgr;B)V"
+  }, {
+    "method" : "decode0",
+    "owner" : "ix",
+    "name" : "q",
+    "access" : 0,
+    "descriptor" : "(Lgr;II)V"
   } ],
   "constructors" : [ {
     "access" : 0,
-    "descriptor" : "(Ljava/lang/Object;I)V"
+    "descriptor" : "()V"
   } ]
 }, {
-  "class" : "FloorDecoration",
-  "name" : "do",
+  "class" : "Font",
+  "name" : "kk",
+  "super" : "kt",
+  "access" : 49,
+  "interfaces" : [ ],
+  "fields" : [ ],
+  "methods" : [ {
+    "method" : "drawGlyph",
+    "owner" : "kk",
+    "name" : "m",
+    "access" : 16,
+    "descriptor" : "([BIIIII)V"
+  }, {
+    "method" : "drawGlyphAlpha",
+    "owner" : "kk",
+    "name" : "f",
+    "access" : 16,
+    "descriptor" : "([BIIIIII)V"
+  } ],
+  "constructors" : [ {
+    "access" : 1,
+    "descriptor" : "([B[I[I[I[I[I[[B)V"
+  }, {
+    "access" : 1,
+    "descriptor" : "([B)V"
+  } ]
+}, {
+  "class" : "ChatChannel",
+  "name" : "cp",
+  "super" : "java.lang.Object",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "count",
+    "owner" : "cp",
+    "name" : "q",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : 612486877
+  }, {
+    "field" : "messages",
+    "owner" : "cp",
+    "name" : "f",
+    "access" : 0,
+    "descriptor" : "[Lbm;"
+  } ],
+  "methods" : [ {
+    "method" : "addMessage",
+    "owner" : "cp",
+    "name" : "m",
+    "access" : 0,
+    "parameters" : [ "type", "sender", "text", "prefix" ],
+    "descriptor" : "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lbm;"
+  }, {
+    "method" : "getMessage",
+    "owner" : "cp",
+    "name" : "f",
+    "access" : 0,
+    "parameters" : [ "index" ],
+    "descriptor" : "(II)Lbm;"
+  }, {
+    "method" : "size",
+    "owner" : "cp",
+    "name" : "q",
+    "access" : 0,
+    "parameters" : [ ],
+    "descriptor" : "(I)I"
+  } ],
+  "constructors" : [ {
+    "access" : 0,
+    "descriptor" : "()V"
+  } ]
+}, {
+  "class" : "PlatformInfoProvider",
+  "name" : "lm",
+  "super" : "java.lang.Object",
+  "access" : 1537,
+  "interfaces" : [ ],
+  "fields" : [ ],
+  "methods" : [ {
+    "method" : "get",
+    "owner" : "lm",
+    "name" : "m",
+    "access" : 1025,
+    "parameters" : [ ],
+    "descriptor" : "(I)Llb;"
+  } ],
+  "constructors" : [ ]
+}, {
+  "class" : "DynamicObject",
+  "name" : "cf",
+  "super" : "ex",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "cycleStart",
+    "owner" : "cf",
+    "name" : "e",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : -1596313489
+  }, {
+    "field" : "frame",
+    "owner" : "cf",
+    "name" : "l",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : -2017547185
+  }, {
+    "field" : "id",
+    "owner" : "cf",
+    "name" : "m",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : 1369707199
+  }, {
+    "field" : "orientation",
+    "owner" : "cf",
+    "name" : "q",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : 141031459
+  }, {
+    "field" : "plane",
+    "owner" : "cf",
+    "name" : "w",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : 844945979
+  }, {
+    "field" : "sequenceDefinition",
+    "owner" : "cf",
+    "name" : "g",
+    "access" : 0,
+    "descriptor" : "Ljh;"
+  }, {
+    "field" : "type",
+    "owner" : "cf",
+    "name" : "f",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : 1713856147
+  }, {
+    "field" : "x",
+    "owner" : "cf",
+    "name" : "o",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : -351084819
+  }, {
+    "field" : "y",
+    "owner" : "cf",
+    "name" : "u",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : -126308963
+  } ],
+  "methods" : [ {
+    "method" : "getModel",
+    "owner" : "cf",
+    "name" : "e",
+    "access" : 20,
+    "parameters" : [ ],
+    "descriptor" : "(I)Ldu;"
+  } ],
+  "constructors" : [ {
+    "access" : 0,
+    "descriptor" : "(IIIIIIIZLex;)V"
+  } ]
+}, {
+  "class" : "ClanMate",
+  "name" : "jk",
+  "super" : "ke",
+  "access" : 33,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "isFriend0",
+    "owner" : "jk",
+    "name" : "m",
+    "access" : 0,
+    "descriptor" : "Lkd;"
+  }, {
+    "field" : "isIgnored0",
+    "owner" : "jk",
+    "name" : "f",
+    "access" : 0,
+    "descriptor" : "Lkd;"
+  } ],
+  "methods" : [ {
+    "method" : "clearIsFriend",
+    "owner" : "jk",
+    "name" : "m",
+    "access" : 0,
+    "parameters" : [ ],
+    "descriptor" : "(I)V"
+  }, {
+    "method" : "clearIsIgnored",
+    "owner" : "jk",
+    "name" : "w",
+    "access" : 0,
+    "parameters" : [ ],
+    "descriptor" : "(I)V"
+  }, {
+    "method" : "fillIsFriend",
+    "owner" : "jk",
+    "name" : "q",
+    "access" : 0,
+    "parameters" : [ ],
+    "descriptor" : "(I)V"
+  }, {
+    "method" : "fillIsIgnored",
+    "owner" : "jk",
+    "name" : "u",
+    "access" : 0,
+    "parameters" : [ ],
+    "descriptor" : "(I)V"
+  }, {
+    "method" : "isFriend",
+    "owner" : "jk",
+    "name" : "f",
+    "access" : 17,
+    "parameters" : [ ],
+    "descriptor" : "(I)Z"
+  }, {
+    "method" : "isIgnored",
+    "owner" : "jk",
+    "name" : "o",
+    "access" : 17,
+    "parameters" : [ ],
+    "descriptor" : "(I)Z"
+  } ],
+  "constructors" : [ {
+    "access" : 0,
+    "descriptor" : "()V"
+  } ]
+}, {
+  "class" : "DesktopPlatformInfoProvider",
+  "name" : "lu",
+  "super" : "java.lang.Object",
+  "access" : 33,
+  "interfaces" : [ "lm" ],
+  "fields" : [ ],
+  "methods" : [ {
+    "method" : "get",
+    "owner" : "lu",
+    "name" : "m",
+    "access" : 1,
+    "parameters" : [ ],
+    "descriptor" : "(I)Llb;"
+  } ],
+  "constructors" : [ {
+    "access" : 1,
+    "descriptor" : "()V"
+  } ]
+}, {
+  "class" : "GroundItemPile",
+  "name" : "dr",
   "super" : "java.lang.Object",
   "access" : 49,
   "interfaces" : [ ],
   "fields" : [ {
-    "field" : "entity",
-    "owner" : "do",
+    "field" : "first",
+    "owner" : "dr",
     "name" : "o",
-    "access" : 1,
+    "access" : 0,
     "descriptor" : "Lex;"
   }, {
-    "field" : "flags",
-    "owner" : "do",
-    "name" : "u",
+    "field" : "height",
+    "owner" : "dr",
+    "name" : "l",
     "access" : 0,
     "descriptor" : "I",
-    "decoder" : -1241982749
+    "decoder" : -1659262853
+  }, {
+    "field" : "second",
+    "owner" : "dr",
+    "name" : "m",
+    "access" : 0,
+    "descriptor" : "Lex;"
   }, {
     "field" : "tag",
-    "owner" : "do",
-    "name" : "m",
-    "access" : 1,
+    "owner" : "dr",
+    "name" : "g",
+    "access" : 0,
     "descriptor" : "J",
-    "decoder" : -5063688075016130813
+    "decoder" : -3696674445500472687
+  }, {
+    "field" : "third",
+    "owner" : "dr",
+    "name" : "u",
+    "access" : 0,
+    "descriptor" : "Lex;"
   }, {
     "field" : "tileHeight",
-    "owner" : "do",
+    "owner" : "dr",
     "name" : "f",
     "access" : 0,
     "descriptor" : "I",
-    "decoder" : -1358154703
+    "decoder" : -325682933
   }, {
     "field" : "x",
-    "owner" : "do",
+    "owner" : "dr",
     "name" : "q",
     "access" : 0,
     "descriptor" : "I",
-    "decoder" : 1309467119
+    "decoder" : -1363136655
   }, {
     "field" : "y",
-    "owner" : "do",
+    "owner" : "dr",
     "name" : "w",
     "access" : 0,
     "descriptor" : "I",
-    "decoder" : 318503957
+    "decoder" : 968072997
   } ],
   "methods" : [ ],
   "constructors" : [ {
@@ -3546,32 +4057,116 @@
     "descriptor" : "()V"
   } ]
 }, {
-  "class" : "InvDefinition",
-  "name" : "ib",
-  "super" : "fn",
+  "class" : "DemotingHashTable",
+  "name" : "ec",
+  "super" : "java.lang.Object",
+  "access" : 49,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "capacity",
+    "owner" : "ec",
+    "name" : "m",
+    "access" : 0,
+    "descriptor" : "I"
+  }, {
+    "field" : "hashTable",
+    "owner" : "ec",
+    "name" : "q",
+    "access" : 0,
+    "descriptor" : "Llh;"
+  }, {
+    "field" : "queue",
+    "owner" : "ec",
+    "name" : "w",
+    "access" : 0,
+    "descriptor" : "Ljc;"
+  }, {
+    "field" : "remaining",
+    "owner" : "ec",
+    "name" : "f",
+    "access" : 0,
+    "descriptor" : "I"
+  } ],
+  "methods" : [ {
+    "method" : "clear",
+    "owner" : "ec",
+    "name" : "u",
+    "access" : 1,
+    "parameters" : [ ],
+    "descriptor" : "()V"
+  }, {
+    "method" : "demote",
+    "owner" : "ec",
+    "name" : "o",
+    "access" : 1,
+    "parameters" : [ "softeningLevel" ],
+    "descriptor" : "(I)V"
+  }, {
+    "method" : "get",
+    "owner" : "ec",
+    "name" : "m",
+    "access" : 1,
+    "parameters" : [ "key" ],
+    "descriptor" : "(J)Ljava/lang/Object;"
+  }, {
+    "method" : "put",
+    "owner" : "ec",
+    "name" : "w",
+    "access" : 1,
+    "parameters" : [ "value", "key", "size" ],
+    "descriptor" : "(Ljava/lang/Object;JI)V"
+  }, {
+    "method" : "remove",
+    "owner" : "ec",
+    "name" : "f",
+    "access" : 0,
+    "parameters" : [ "key" ],
+    "descriptor" : "(J)V"
+  }, {
+    "method" : "removeWrapper",
+    "owner" : "ec",
+    "name" : "q",
+    "access" : 0,
+    "parameters" : [ "wrapper" ],
+    "descriptor" : "(Leu;)V"
+  } ],
+  "constructors" : [ {
+    "access" : 1,
+    "descriptor" : "(II)V"
+  } ]
+}, {
+  "class" : "ScriptFrame",
+  "name" : "bn",
+  "super" : "java.lang.Object",
   "access" : 33,
   "interfaces" : [ ],
   "fields" : [ {
-    "field" : "size",
-    "owner" : "ib",
+    "field" : "intLocals",
+    "owner" : "bn",
     "name" : "q",
-    "access" : 1,
-    "descriptor" : "I",
-    "decoder" : 1358868971
-  } ],
-  "methods" : [ {
-    "method" : "read",
-    "owner" : "ib",
+    "access" : 0,
+    "descriptor" : "[I"
+  }, {
+    "field" : "pc",
+    "owner" : "bn",
     "name" : "f",
     "access" : 0,
-    "descriptor" : "(Lgr;I)V"
+    "descriptor" : "I",
+    "decoder" : -1715361849
   }, {
-    "method" : "readNext",
-    "owner" : "ib",
-    "name" : "q",
+    "field" : "script",
+    "owner" : "bn",
+    "name" : "m",
     "access" : 0,
-    "descriptor" : "(Lgr;II)V"
+    "descriptor" : "Lcg;"
+  }, {
+    "field" : "stringLocals",
+    "owner" : "bn",
+    "name" : "w",
+    "access" : 0,
+    "descriptor" : "[Ljava/lang/String;"
   } ],
+  "methods" : [ ],
   "constructors" : [ {
     "access" : 0,
     "descriptor" : "()V"
@@ -3649,183 +4244,6 @@
     "access" : 0,
     "descriptor" : "()V"
   } ]
-}, {
-  "class" : "Interpreter",
-  "name" : "bv",
-  "super" : "java.lang.Object",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ ],
-  "methods" : [ ],
-  "constructors" : [ ]
-}, {
-  "class" : "PcmPlayerProvider",
-  "name" : "cz",
-  "super" : "java.lang.Object",
-  "access" : 1537,
-  "interfaces" : [ ],
-  "fields" : [ ],
-  "methods" : [ {
-    "method" : "player",
-    "owner" : "cz",
-    "name" : "m",
-    "access" : 1025,
-    "descriptor" : "(B)Lco;"
-  } ],
-  "constructors" : [ ]
-}, {
-  "class" : "SpriteMask",
-  "name" : "hp",
-  "super" : "fn",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "height",
-    "owner" : "hp",
-    "name" : "f",
-    "access" : 17,
-    "descriptor" : "I",
-    "decoder" : -193097093
-  }, {
-    "field" : "width",
-    "owner" : "hp",
-    "name" : "m",
-    "access" : 17,
-    "descriptor" : "I",
-    "decoder" : 574541221
-  }, {
-    "field" : "xStarts",
-    "owner" : "hp",
-    "name" : "w",
-    "access" : 17,
-    "descriptor" : "[I"
-  }, {
-    "field" : "xWidths",
-    "owner" : "hp",
-    "name" : "q",
-    "access" : 17,
-    "descriptor" : "[I"
-  } ],
-  "methods" : [ {
-    "method" : "contains",
-    "owner" : "hp",
-    "name" : "m",
-    "access" : 1,
-    "parameters" : [ "x", "y" ],
-    "descriptor" : "(III)Z"
-  } ],
-  "constructors" : [ {
-    "access" : 0,
-    "descriptor" : "(II[I[II)V"
-  } ]
-}, {
-  "class" : "Tiles",
-  "name" : "bq",
-  "super" : "java.lang.Object",
-  "access" : 49,
-  "interfaces" : [ ],
-  "fields" : [ ],
-  "methods" : [ ],
-  "constructors" : [ ]
-}, {
-  "class" : "ChatChannel",
-  "name" : "cp",
-  "super" : "java.lang.Object",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "count",
-    "owner" : "cp",
-    "name" : "q",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : 612486877
-  }, {
-    "field" : "messages",
-    "owner" : "cp",
-    "name" : "f",
-    "access" : 0,
-    "descriptor" : "[Lbm;"
-  } ],
-  "methods" : [ {
-    "method" : "addMessage",
-    "owner" : "cp",
-    "name" : "m",
-    "access" : 0,
-    "parameters" : [ "type", "sender", "text", "prefix" ],
-    "descriptor" : "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Lbm;"
-  }, {
-    "method" : "getMessage",
-    "owner" : "cp",
-    "name" : "f",
-    "access" : 0,
-    "parameters" : [ "index" ],
-    "descriptor" : "(II)Lbm;"
-  }, {
-    "method" : "size",
-    "owner" : "cp",
-    "name" : "q",
-    "access" : 0,
-    "parameters" : [ ],
-    "descriptor" : "(I)I"
-  } ],
-  "constructors" : [ {
-    "access" : 0,
-    "descriptor" : "()V"
-  } ]
-}, {
-  "class" : "PlatformInfoProvider",
-  "name" : "lm",
-  "super" : "java.lang.Object",
-  "access" : 1537,
-  "interfaces" : [ ],
-  "fields" : [ ],
-  "methods" : [ {
-    "method" : "get",
-    "owner" : "lm",
-    "name" : "m",
-    "access" : 1025,
-    "parameters" : [ ],
-    "descriptor" : "(I)Llb;"
-  } ],
-  "constructors" : [ ]
-}, {
-  "class" : "IgnoreList",
-  "name" : "kj",
-  "super" : "km",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "loginType",
-    "owner" : "kj",
-    "name" : "q",
-    "access" : 16,
-    "descriptor" : "Llx;"
-  } ],
-  "methods" : [ {
-    "method" : "newInstance",
-    "owner" : "kj",
-    "name" : "m",
-    "access" : 0,
-    "descriptor" : "(I)Ljs;"
-  }, {
-    "method" : "newTypedArray",
-    "owner" : "kj",
-    "name" : "f",
-    "access" : 0,
-    "descriptor" : "(II)[Ljs;"
-  }, {
-    "method" : "read",
-    "owner" : "kj",
-    "name" : "q",
-    "access" : 1,
-    "parameters" : [ "buffer", "n" ],
-    "descriptor" : "(Lgr;IB)V"
-  } ],
-  "constructors" : [ {
-    "access" : 1,
-    "descriptor" : "(Llx;)V"
-  } ]
 }, {
   "class" : "WallDecoration",
   "name" : "eq",
@@ -3914,566 +4332,29 @@
     "descriptor" : "()V"
   } ]
 }, {
-  "class" : "DynamicObject",
-  "name" : "cf",
-  "super" : "ex",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "cycleStart",
-    "owner" : "cf",
-    "name" : "e",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : -1596313489
-  }, {
-    "field" : "frame",
-    "owner" : "cf",
-    "name" : "l",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : -2017547185
-  }, {
-    "field" : "id",
-    "owner" : "cf",
-    "name" : "m",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : 1369707199
-  }, {
-    "field" : "orientation",
-    "owner" : "cf",
-    "name" : "q",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : 141031459
-  }, {
-    "field" : "plane",
-    "owner" : "cf",
-    "name" : "w",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : 844945979
-  }, {
-    "field" : "sequenceDefinition",
-    "owner" : "cf",
-    "name" : "g",
-    "access" : 0,
-    "descriptor" : "Ljh;"
-  }, {
-    "field" : "type",
-    "owner" : "cf",
-    "name" : "f",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : 1713856147
-  }, {
-    "field" : "x",
-    "owner" : "cf",
-    "name" : "o",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : -351084819
-  }, {
-    "field" : "y",
-    "owner" : "cf",
-    "name" : "u",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : -126308963
-  } ],
-  "methods" : [ {
-    "method" : "getModel",
-    "owner" : "cf",
-    "name" : "e",
-    "access" : 20,
-    "parameters" : [ ],
-    "descriptor" : "(I)Ldu;"
-  } ],
-  "constructors" : [ {
-    "access" : 0,
-    "descriptor" : "(IIIIIIIZLex;)V"
-  } ]
-}, {
-  "class" : "StructDefinition",
-  "name" : "jq",
-  "super" : "fn",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "params",
-    "owner" : "jq",
-    "name" : "q",
-    "access" : 0,
-    "descriptor" : "Llh;"
-  } ],
-  "methods" : [ {
-    "method" : "getIntParam",
-    "owner" : "jq",
-    "name" : "o",
-    "access" : 1,
-    "descriptor" : "(IIB)I"
-  }, {
-    "method" : "getStringParam",
-    "owner" : "jq",
-    "name" : "u",
-    "access" : 1,
-    "descriptor" : "(ILjava/lang/String;I)Ljava/lang/String;"
-  }, {
-    "method" : "init",
-    "owner" : "jq",
-    "name" : "f",
-    "access" : 0,
-    "parameters" : [ ],
-    "descriptor" : "(B)V"
-  }, {
-    "method" : "read",
-    "owner" : "jq",
-    "name" : "q",
-    "access" : 0,
-    "descriptor" : "(Lgr;I)V"
-  }, {
-    "method" : "readNext",
-    "owner" : "jq",
-    "name" : "w",
-    "access" : 0,
-    "descriptor" : "(Lgr;II)V"
-  } ],
-  "constructors" : [ {
-    "access" : 0,
-    "descriptor" : "()V"
-  } ]
-}, {
-  "class" : "SoftWrapper",
-  "name" : "ef",
-  "super" : "eu",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "ref",
-    "owner" : "ef",
-    "name" : "m",
-    "access" : 0,
-    "descriptor" : "Ljava/lang/ref/SoftReference;"
-  } ],
-  "methods" : [ {
-    "method" : "get",
-    "owner" : "ef",
-    "name" : "m",
-    "access" : 0,
-    "parameters" : [ ],
-    "descriptor" : "()Ljava/lang/Object;"
-  }, {
-    "method" : "isSoft",
-    "owner" : "ef",
-    "name" : "f",
-    "access" : 0,
-    "parameters" : [ ],
-    "descriptor" : "()Z"
-  } ],
-  "constructors" : [ {
-    "access" : 0,
-    "descriptor" : "(Ljava/lang/Object;I)V"
-  } ]
-}, {
-  "class" : "DesktopPlatformInfoProvider",
-  "name" : "lu",
-  "super" : "java.lang.Object",
-  "access" : 33,
-  "interfaces" : [ "lm" ],
-  "fields" : [ ],
-  "methods" : [ {
-    "method" : "get",
-    "owner" : "lu",
-    "name" : "m",
-    "access" : 1,
-    "parameters" : [ ],
-    "descriptor" : "(I)Llb;"
-  } ],
-  "constructors" : [ {
-    "access" : 1,
-    "descriptor" : "()V"
-  } ]
-}, {
-  "class" : "GroundItem",
-  "name" : "ck",
-  "super" : "ex",
-  "access" : 49,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "id",
-    "owner" : "ck",
-    "name" : "m",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : 893970699
-  }, {
-    "field" : "quantity",
-    "owner" : "ck",
-    "name" : "f",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : 454094667
-  } ],
-  "methods" : [ {
-    "method" : "getModel",
-    "owner" : "ck",
-    "name" : "e",
-    "access" : 20,
-    "parameters" : [ ],
-    "descriptor" : "(I)Ldu;"
-  } ],
-  "constructors" : [ {
-    "access" : 0,
-    "descriptor" : "()V"
-  } ]
-}, {
-  "class" : "VarpDefinition",
-  "name" : "ix",
-  "super" : "fn",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "type",
-    "owner" : "ix",
-    "name" : "w",
-    "access" : 1,
-    "descriptor" : "I",
-    "decoder" : -1792568421
-  } ],
-  "methods" : [ {
-    "method" : "read",
-    "owner" : "ix",
-    "name" : "f",
-    "access" : 0,
-    "descriptor" : "(Lgr;B)V"
-  }, {
-    "method" : "readNext",
-    "owner" : "ix",
-    "name" : "q",
-    "access" : 0,
-    "descriptor" : "(Lgr;II)V"
-  } ],
-  "constructors" : [ {
-    "access" : 0,
-    "descriptor" : "()V"
-  } ]
-}, {
-  "class" : "Rasterizer3D",
-  "name" : "et",
-  "super" : "lf",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ ],
-  "methods" : [ ],
-  "constructors" : [ ]
-}, {
-  "class" : "AttackOption",
-  "name" : "cj",
-  "super" : "java.lang.Object",
-  "access" : 33,
-  "interfaces" : [ "gc" ],
-  "fields" : [ {
-    "field" : "id",
-    "owner" : "cj",
-    "name" : "o",
-    "access" : 16,
-    "descriptor" : "I",
-    "decoder" : -1461217963
-  } ],
-  "methods" : [ {
-    "method" : "ordinal",
-    "owner" : "cj",
-    "name" : "f",
-    "access" : 1,
-    "parameters" : [ ],
-    "descriptor" : "(B)I"
-  } ],
-  "constructors" : [ {
-    "access" : 0,
-    "descriptor" : "(I)V"
-  } ]
-}, {
-  "class" : "GroundItemPile",
-  "name" : "dr",
-  "super" : "java.lang.Object",
-  "access" : 49,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "first",
-    "owner" : "dr",
-    "name" : "o",
-    "access" : 0,
-    "descriptor" : "Lex;"
-  }, {
-    "field" : "height",
-    "owner" : "dr",
-    "name" : "l",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : -1659262853
-  }, {
-    "field" : "second",
-    "owner" : "dr",
-    "name" : "m",
-    "access" : 0,
-    "descriptor" : "Lex;"
-  }, {
-    "field" : "tag",
-    "owner" : "dr",
-    "name" : "g",
-    "access" : 0,
-    "descriptor" : "J",
-    "decoder" : -3696674445500472687
-  }, {
-    "field" : "third",
-    "owner" : "dr",
-    "name" : "u",
-    "access" : 0,
-    "descriptor" : "Lex;"
-  }, {
-    "field" : "tileHeight",
-    "owner" : "dr",
-    "name" : "f",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : -325682933
-  }, {
-    "field" : "x",
-    "owner" : "dr",
-    "name" : "q",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : -1363136655
-  }, {
-    "field" : "y",
-    "owner" : "dr",
-    "name" : "w",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : 968072997
-  } ],
-  "methods" : [ ],
-  "constructors" : [ {
-    "access" : 0,
-    "descriptor" : "()V"
-  } ]
-}, {
-  "class" : "Font",
-  "name" : "kk",
-  "super" : "kt",
-  "access" : 49,
-  "interfaces" : [ ],
-  "fields" : [ ],
-  "methods" : [ {
-    "method" : "drawGlyph",
-    "owner" : "kk",
-    "name" : "m",
-    "access" : 16,
-    "descriptor" : "([BIIIII)V"
-  }, {
-    "method" : "drawGlyphAlpha",
-    "owner" : "kk",
-    "name" : "f",
-    "access" : 16,
-    "descriptor" : "([BIIIIII)V"
-  } ],
-  "constructors" : [ {
-    "access" : 1,
-    "descriptor" : "([B[I[I[I[I[I[[B)V"
-  }, {
-    "access" : 1,
-    "descriptor" : "([B)V"
-  } ]
-}, {
-  "class" : "Messages",
-  "name" : "cw",
-  "super" : "java.lang.Object",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ ],
-  "methods" : [ ],
-  "constructors" : [ ]
-}, {
-  "class" : "Frames",
-  "name" : "en",
-  "super" : "fn",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "frames",
-    "owner" : "en",
-    "name" : "m",
-    "access" : 0,
-    "descriptor" : "[Ldz;"
-  } ],
-  "methods" : [ {
-    "method" : "hasAlphaTransform",
-    "owner" : "en",
-    "name" : "m",
-    "access" : 1,
-    "parameters" : [ "frame" ],
-    "descriptor" : "(II)Z"
-  } ],
-  "constructors" : [ {
-    "access" : 1,
-    "descriptor" : "(Lir;Lir;IZ)V"
-  } ]
-}, {
-  "class" : "ScriptFrame",
-  "name" : "bn",
-  "super" : "java.lang.Object",
-  "access" : 33,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "intLocals",
-    "owner" : "bn",
-    "name" : "q",
-    "access" : 0,
-    "descriptor" : "[I"
-  }, {
-    "field" : "pc",
-    "owner" : "bn",
-    "name" : "f",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : -1715361849
-  }, {
-    "field" : "script",
-    "owner" : "bn",
-    "name" : "m",
-    "access" : 0,
-    "descriptor" : "Lcg;"
-  }, {
-    "field" : "stringLocals",
-    "owner" : "bn",
-    "name" : "w",
-    "access" : 0,
-    "descriptor" : "[Ljava/lang/String;"
-  } ],
-  "methods" : [ ],
-  "constructors" : [ {
-    "access" : 0,
-    "descriptor" : "()V"
-  } ]
-}, {
-  "class" : "GraphicsObject",
-  "name" : "bw",
-  "super" : "ex",
-  "access" : 49,
-  "interfaces" : [ ],
-  "fields" : [ {
-    "field" : "cycleStart",
-    "owner" : "bw",
-    "name" : "f",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : -1245488067
-  }, {
-    "field" : "frame",
-    "owner" : "bw",
-    "name" : "l",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : 1541221595
-  }, {
-    "field" : "frameCycle",
-    "owner" : "bw",
-    "name" : "e",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : -1950327625
-  }, {
-    "field" : "height",
-    "owner" : "bw",
-    "name" : "u",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : 1156757009
-  }, {
-    "field" : "id",
-    "owner" : "bw",
-    "name" : "m",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : -289084031
-  }, {
-    "field" : "isFinished",
-    "owner" : "bw",
-    "name" : "x",
-    "access" : 0,
-    "descriptor" : "Z"
-  }, {
-    "field" : "plane",
-    "owner" : "bw",
-    "name" : "q",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : 432847573
-  }, {
-    "field" : "sequenceDefinition",
-    "owner" : "bw",
-    "name" : "g",
-    "access" : 0,
-    "descriptor" : "Ljh;"
-  }, {
-    "field" : "x",
-    "owner" : "bw",
-    "name" : "w",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : -1189549567
-  }, {
-    "field" : "y",
-    "owner" : "bw",
-    "name" : "o",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : 1416438985
-  } ],
-  "methods" : [ {
-    "method" : "advance",
-    "owner" : "bw",
-    "name" : "m",
-    "access" : 16,
-    "parameters" : [ "cycles" ],
-    "descriptor" : "(II)V"
-  }, {
-    "method" : "getModel",
-    "owner" : "bw",
-    "name" : "e",
-    "access" : 20,
-    "parameters" : [ ],
-    "descriptor" : "(I)Ldu;"
-  } ],
-  "constructors" : [ {
-    "access" : 0,
-    "descriptor" : "(IIIIIII)V"
-  } ]
-}, {
-  "class" : "IndexStoreAction",
+  "class" : "ArchiveDiskAction",
   "name" : "ik",
   "super" : "gw",
   "access" : 33,
   "interfaces" : [ ],
   "fields" : [ {
-    "field" : "data",
-    "owner" : "ik",
-    "name" : "f",
-    "access" : 0,
-    "descriptor" : "[B"
-  }, {
-    "field" : "indexCache",
+    "field" : "archive",
     "owner" : "ik",
     "name" : "w",
     "access" : 0,
     "descriptor" : "Lit;"
   }, {
-    "field" : "indexStore",
+    "field" : "archiveDisk",
     "owner" : "ik",
     "name" : "q",
     "access" : 0,
     "descriptor" : "Lff;"
+  }, {
+    "field" : "data",
+    "owner" : "ik",
+    "name" : "f",
+    "access" : 0,
+    "descriptor" : "[B"
   }, {
     "field" : "type",
     "owner" : "ik",
@@ -4686,23 +4567,152 @@
     "descriptor" : "(IIIIIIIIIII)V"
   } ]
 }, {
-  "class" : "DevicePcmPlayerProvider",
-  "name" : "az",
+  "class" : "FloorDecoration",
+  "name" : "do",
   "super" : "java.lang.Object",
-  "access" : 33,
-  "interfaces" : [ "cz" ],
-  "fields" : [ ],
-  "methods" : [ {
-    "method" : "player",
-    "owner" : "az",
+  "access" : 49,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "entity",
+    "owner" : "do",
+    "name" : "o",
+    "access" : 1,
+    "descriptor" : "Lex;"
+  }, {
+    "field" : "flags",
+    "owner" : "do",
+    "name" : "u",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : -1241982749
+  }, {
+    "field" : "tag",
+    "owner" : "do",
     "name" : "m",
     "access" : 1,
-    "descriptor" : "(B)Lco;"
+    "descriptor" : "J",
+    "decoder" : -5063688075016130813
+  }, {
+    "field" : "tileHeight",
+    "owner" : "do",
+    "name" : "f",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : -1358154703
+  }, {
+    "field" : "x",
+    "owner" : "do",
+    "name" : "q",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : 1309467119
+  }, {
+    "field" : "y",
+    "owner" : "do",
+    "name" : "w",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : 318503957
   } ],
+  "methods" : [ ],
   "constructors" : [ {
     "access" : 0,
     "descriptor" : "()V"
   } ]
+}, {
+  "class" : "GraphicsObject",
+  "name" : "bw",
+  "super" : "ex",
+  "access" : 49,
+  "interfaces" : [ ],
+  "fields" : [ {
+    "field" : "cycleStart",
+    "owner" : "bw",
+    "name" : "f",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : -1245488067
+  }, {
+    "field" : "frame",
+    "owner" : "bw",
+    "name" : "l",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : 1541221595
+  }, {
+    "field" : "frameCycle",
+    "owner" : "bw",
+    "name" : "e",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : -1950327625
+  }, {
+    "field" : "height",
+    "owner" : "bw",
+    "name" : "u",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : 1156757009
+  }, {
+    "field" : "id",
+    "owner" : "bw",
+    "name" : "m",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : -289084031
+  }, {
+    "field" : "isFinished",
+    "owner" : "bw",
+    "name" : "x",
+    "access" : 0,
+    "descriptor" : "Z"
+  }, {
+    "field" : "plane",
+    "owner" : "bw",
+    "name" : "q",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : 432847573
+  }, {
+    "field" : "sequenceDefinition",
+    "owner" : "bw",
+    "name" : "g",
+    "access" : 0,
+    "descriptor" : "Ljh;"
+  }, {
+    "field" : "x",
+    "owner" : "bw",
+    "name" : "w",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : -1189549567
+  }, {
+    "field" : "y",
+    "owner" : "bw",
+    "name" : "o",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : 1416438985
+  } ],
+  "methods" : [ {
+    "method" : "advance",
+    "owner" : "bw",
+    "name" : "m",
+    "access" : 16,
+    "parameters" : [ "cycles" ],
+    "descriptor" : "(II)V"
+  }, {
+    "method" : "getModel",
+    "owner" : "bw",
+    "name" : "e",
+    "access" : 20,
+    "parameters" : [ ],
+    "descriptor" : "(I)Ldu;"
+  } ],
+  "constructors" : [ {
+    "access" : 0,
+    "descriptor" : "(IIIIIII)V"
+  } ]
 }, {
   "class" : "ViewportMouse",
   "name" : "dm",
@@ -4712,6 +4722,15 @@
   "fields" : [ ],
   "methods" : [ ],
   "constructors" : [ ]
+}, {
+  "class" : "Tiles",
+  "name" : "bq",
+  "super" : "java.lang.Object",
+  "access" : 49,
+  "interfaces" : [ ],
+  "fields" : [ ],
+  "methods" : [ ],
+  "constructors" : [ ]
 }, {
   "class" : "Players",
   "name" : "cq",
@@ -7128,13 +7147,13 @@
     "descriptor" : "()V"
   } ]
 }, {
-  "class" : "IndexCacheLoader",
+  "class" : "ArchiveLoader",
   "name" : "bd",
   "super" : "java.lang.Object",
   "access" : 33,
   "interfaces" : [ ],
   "fields" : [ {
-    "field" : "indexCache",
+    "field" : "archive",
     "owner" : "bd",
     "name" : "f",
     "access" : 16,
@@ -7184,6 +7203,12 @@
     "name" : "f",
     "access" : 0,
     "descriptor" : "Z"
+  }, {
+    "field" : "component",
+    "owner" : "by",
+    "name" : "q",
+    "access" : 0,
+    "descriptor" : "Lho;"
   }, {
     "field" : "dragTarget",
     "owner" : "by",
@@ -7193,17 +7218,17 @@
   }, {
     "field" : "keyPressed",
     "owner" : "by",
-    "name" : "e",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : 327085889
-  }, {
-    "field" : "keyTyped",
-    "owner" : "by",
     "name" : "l",
     "access" : 0,
     "descriptor" : "I",
     "decoder" : -1330602393
+  }, {
+    "field" : "keyTyped",
+    "owner" : "by",
+    "name" : "e",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : 327085889
   }, {
     "field" : "mouseX",
     "owner" : "by",
@@ -7238,12 +7263,6 @@
     "access" : 0,
     "descriptor" : "I",
     "decoder" : -161292529
-  }, {
-    "field" : "widget",
-    "owner" : "by",
-    "name" : "q",
-    "access" : 0,
-    "descriptor" : "Lho;"
   }, {
     "field" : "__d",
     "owner" : "by",
@@ -7689,48 +7708,41 @@
     "descriptor" : "I",
     "decoder" : -779457309
   }, {
-    "field" : "hitSplatCount",
+    "field" : "hitmarkCount",
     "owner" : "bz",
     "name" : "af",
     "access" : 0,
     "descriptor" : "B"
   }, {
-    "field" : "hitSplatCycles",
+    "field" : "hitmarkCycles",
     "owner" : "bz",
     "name" : "bb",
     "access" : 0,
     "descriptor" : "[I"
   }, {
-    "field" : "hitSplatTypes",
+    "field" : "hitmarkTypes",
     "owner" : "bz",
     "name" : "ai",
     "access" : 0,
     "descriptor" : "[I"
   }, {
-    "field" : "hitSplatTypes2",
+    "field" : "hitmarkTypes2",
     "owner" : "bz",
     "name" : "bs",
     "access" : 0,
     "descriptor" : "[I"
   }, {
-    "field" : "hitSplatValues",
+    "field" : "hitmarkValues",
     "owner" : "bz",
     "name" : "ba",
     "access" : 0,
     "descriptor" : "[I"
   }, {
-    "field" : "hitSplatValues2",
+    "field" : "hitmarkValues2",
     "owner" : "bz",
     "name" : "bq",
     "access" : 0,
     "descriptor" : "[I"
-  }, {
-    "field" : "idleSequence",
-    "owner" : "bz",
-    "name" : "aw",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : -299122235
   }, {
     "field" : "isAutoChatting",
     "owner" : "bz",
@@ -7831,6 +7843,13 @@
     "access" : 0,
     "descriptor" : "I",
     "decoder" : 141226463
+  }, {
+    "field" : "readySequence",
+    "owner" : "bz",
+    "name" : "aw",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : -299122235
   }, {
     "field" : "runSequence",
     "owner" : "bz",
@@ -7916,33 +7935,33 @@
     "descriptor" : "I",
     "decoder" : 1788714977
   }, {
-    "field" : "walkSequence",
+    "field" : "walkBackSequence",
     "owner" : "bz",
-    "name" : "ae",
+    "name" : "at",
     "access" : 0,
     "descriptor" : "I",
-    "decoder" : -2075997699
+    "decoder" : -1598871111
   }, {
-    "field" : "walkTurnLeftSequence",
+    "field" : "walkLeftSequence",
     "owner" : "bz",
     "name" : "ad",
     "access" : 0,
     "descriptor" : "I",
     "decoder" : -568830521
   }, {
-    "field" : "walkTurnRightSequence",
+    "field" : "walkRightSequence",
     "owner" : "bz",
     "name" : "ap",
     "access" : 0,
     "descriptor" : "I",
     "decoder" : -257240117
   }, {
-    "field" : "walkTurnSequence",
+    "field" : "walkSequence",
     "owner" : "bz",
-    "name" : "at",
+    "name" : "ae",
     "access" : 0,
     "descriptor" : "I",
-    "decoder" : -1598871111
+    "decoder" : -2075997699
   }, {
     "field" : "x",
     "owner" : "bz",
@@ -8083,7 +8102,7 @@
     "parameters" : [ "healthBarDefinition", "cycle", "n0", "n1", "n2", "n3" ],
     "descriptor" : "(IIIIIIB)V"
   }, {
-    "method" : "addHitSplat",
+    "method" : "addHitmark",
     "owner" : "bz",
     "name" : "bs",
     "access" : 16,
@@ -10198,6 +10217,12 @@
   "access" : 33,
   "interfaces" : [ "ei" ],
   "fields" : [ {
+    "field" : "archive",
+    "owner" : "dl",
+    "name" : "g",
+    "access" : 0,
+    "descriptor" : "Lir;"
+  }, {
     "field" : "brightness0",
     "owner" : "dl",
     "name" : "o",
@@ -10216,12 +10241,6 @@
     "name" : "f",
     "access" : 0,
     "descriptor" : "Lje;"
-  }, {
-    "field" : "indexCache",
-    "owner" : "dl",
-    "name" : "g",
-    "access" : 0,
-    "descriptor" : "Lir;"
   }, {
     "field" : "remaining",
     "owner" : "dl",
@@ -10786,6 +10805,12 @@
     "name" : "k",
     "access" : 0,
     "descriptor" : "I"
+  }, {
+    "field" : "files",
+    "owner" : "dh",
+    "name" : "g",
+    "access" : 0,
+    "descriptor" : "[I"
   }, {
     "field" : "int1",
     "owner" : "dh",
@@ -10804,12 +10829,6 @@
     "name" : "n",
     "access" : 0,
     "descriptor" : "[I"
-  }, {
-    "field" : "records",
-    "owner" : "dh",
-    "name" : "g",
-    "access" : 0,
-    "descriptor" : "[I"
   }, {
     "field" : "__u",
     "owner" : "dh",
@@ -15302,19 +15321,12 @@
     "descriptor" : "(Lgr;)V"
   } ]
 }, {
-  "class" : "TileLocation",
+  "class" : "Coord",
   "name" : "hu",
   "super" : "java.lang.Object",
   "access" : 33,
   "interfaces" : [ ],
   "fields" : [ {
-    "field" : "plane",
-    "owner" : "hu",
-    "name" : "m",
-    "access" : 1,
-    "descriptor" : "I",
-    "decoder" : 503621925
-  }, {
     "field" : "x",
     "owner" : "hu",
     "name" : "f",
@@ -15324,6 +15336,13 @@
   }, {
     "field" : "y",
     "owner" : "hu",
+    "name" : "m",
+    "access" : 1,
+    "descriptor" : "I",
+    "decoder" : 503621925
+  }, {
+    "field" : "z",
+    "owner" : "hu",
     "name" : "q",
     "access" : 1,
     "descriptor" : "I",
@@ -15496,7 +15515,7 @@
     "descriptor" : "()V"
   } ]
 }, {
-  "class" : "Widget",
+  "class" : "Component",
   "name" : "ho",
   "super" : "gw",
   "access" : 33,
@@ -15540,6 +15559,13 @@
     "access" : 1,
     "descriptor" : "I",
     "decoder" : 1856618959
+  }, {
+    "field" : "clientCode",
+    "owner" : "ho",
+    "name" : "c",
+    "access" : 1,
+    "descriptor" : "I",
+    "decoder" : -581762425
   }, {
     "field" : "color",
     "owner" : "ho",
@@ -15554,13 +15580,6 @@
     "access" : 1,
     "descriptor" : "I",
     "decoder" : -365781561
-  }, {
-    "field" : "contentType",
-    "owner" : "ho",
-    "name" : "c",
-    "access" : 1,
-    "descriptor" : "I",
-    "decoder" : -581762425
   }, {
     "field" : "cs1ComparisonValues",
     "owner" : "ho",
@@ -15796,6 +15815,12 @@
     "name" : "be",
     "access" : 1,
     "descriptor" : "Z"
+  }, {
+    "field" : "modelTransparency",
+    "owner" : "ho",
+    "name" : "bv",
+    "access" : 1,
+    "descriptor" : "Z"
   }, {
     "field" : "modelType",
     "owner" : "ho",
@@ -15844,6 +15869,18 @@
     "name" : "fx",
     "access" : 1,
     "descriptor" : "Z"
+  }, {
+    "field" : "onChatTransmit",
+    "owner" : "ho",
+    "name" : "em",
+    "access" : 1,
+    "descriptor" : "[Ljava/lang/Object;"
+  }, {
+    "field" : "onClanTransmit",
+    "owner" : "ho",
+    "name" : "ej",
+    "access" : 1,
+    "descriptor" : "[Ljava/lang/Object;"
   }, {
     "field" : "onClick",
     "owner" : "ho",
@@ -15856,6 +15893,12 @@
     "name" : "dg",
     "access" : 1,
     "descriptor" : "[Ljava/lang/Object;"
+  }, {
+    "field" : "onDialogAbort",
+    "owner" : "ho",
+    "name" : "en",
+    "access" : 1,
+    "descriptor" : "[Ljava/lang/Object;"
   }, {
     "field" : "onDrag",
     "owner" : "ho",
@@ -15868,6 +15911,12 @@
     "name" : "dw",
     "access" : 1,
     "descriptor" : "[Ljava/lang/Object;"
+  }, {
+    "field" : "onFriendTransmit",
+    "owner" : "ho",
+    "name" : "ex",
+    "access" : 1,
+    "descriptor" : "[Ljava/lang/Object;"
   }, {
     "field" : "onHold",
     "owner" : "ho",
@@ -15880,12 +15929,24 @@
     "name" : "dj",
     "access" : 1,
     "descriptor" : "[Ljava/lang/Object;"
+  }, {
+    "field" : "onKey",
+    "owner" : "ho",
+    "name" : "ed",
+    "access" : 1,
+    "descriptor" : "[Ljava/lang/Object;"
   }, {
     "field" : "onLoad",
     "owner" : "ho",
     "name" : "di",
     "access" : 1,
     "descriptor" : "[Ljava/lang/Object;"
+  }, {
+    "field" : "onMiscTransmit",
+    "owner" : "ho",
+    "name" : "el",
+    "access" : 1,
+    "descriptor" : "[Ljava/lang/Object;"
   }, {
     "field" : "onMouseLeave",
     "owner" : "ho",
@@ -15917,7 +15978,7 @@
     "access" : 1,
     "descriptor" : "[Ljava/lang/Object;"
   }, {
-    "field" : "onScroll",
+    "field" : "onScrollWheel",
     "owner" : "ho",
     "name" : "ek",
     "access" : 1,
@@ -15928,6 +15989,18 @@
     "name" : "dm",
     "access" : 1,
     "descriptor" : "[Ljava/lang/Object;"
+  }, {
+    "field" : "onStockTransmit",
+    "owner" : "ho",
+    "name" : "eq",
+    "access" : 1,
+    "descriptor" : "[Ljava/lang/Object;"
+  }, {
+    "field" : "onSubChange",
+    "owner" : "ho",
+    "name" : "ei",
+    "access" : 1,
+    "descriptor" : "[Ljava/lang/Object;"
   }, {
     "field" : "onTargetEnter",
     "owner" : "ho",
@@ -16240,12 +16313,6 @@
     "name" : "ba",
     "access" : 1,
     "descriptor" : "Z"
-  }, {
-    "field" : "__bv",
-    "owner" : "ho",
-    "name" : "bv",
-    "access" : 1,
-    "descriptor" : "Z"
   }, {
     "field" : "__cg",
     "owner" : "ho",
@@ -16376,12 +16443,6 @@
     "name" : "fh",
     "access" : 1,
     "descriptor" : "[I"
-  }, {
-    "field" : "__ed",
-    "owner" : "ho",
-    "name" : "ed",
-    "access" : 1,
-    "descriptor" : "[Ljava/lang/Object;"
   }, {
     "field" : "__ee",
     "owner" : "ho",
@@ -16394,48 +16455,6 @@
     "name" : "eh",
     "access" : 1,
     "descriptor" : "[Ljava/lang/Object;"
-  }, {
-    "field" : "__ei",
-    "owner" : "ho",
-    "name" : "ei",
-    "access" : 1,
-    "descriptor" : "[Ljava/lang/Object;"
-  }, {
-    "field" : "__ej",
-    "owner" : "ho",
-    "name" : "ej",
-    "access" : 1,
-    "descriptor" : "[Ljava/lang/Object;"
-  }, {
-    "field" : "__el",
-    "owner" : "ho",
-    "name" : "el",
-    "access" : 1,
-    "descriptor" : "[Ljava/lang/Object;"
-  }, {
-    "field" : "__em",
-    "owner" : "ho",
-    "name" : "em",
-    "access" : 1,
-    "descriptor" : "[Ljava/lang/Object;"
-  }, {
-    "field" : "__en",
-    "owner" : "ho",
-    "name" : "en",
-    "access" : 1,
-    "descriptor" : "[Ljava/lang/Object;"
-  }, {
-    "field" : "__eq",
-    "owner" : "ho",
-    "name" : "eq",
-    "access" : 1,
-    "descriptor" : "[Ljava/lang/Object;"
-  }, {
-    "field" : "__ex",
-    "owner" : "ho",
-    "name" : "ex",
-    "access" : 1,
-    "descriptor" : "[Ljava/lang/Object;"
   } ],
   "methods" : [ {
     "method" : "decode",
@@ -16564,50 +16583,80 @@
     "descriptor" : "(IIZZZ)V"
   } ]
 }, {
-  "class" : "AbstractIndexCache",
+  "class" : "AbstractArchive",
   "name" : "ir",
   "super" : "java.lang.Object",
   "access" : 1057,
   "interfaces" : [ ],
   "fields" : [ {
-    "field" : "archiveCount",
+    "field" : "fileCounts",
+    "owner" : "ir",
+    "name" : "l",
+    "access" : 0,
+    "descriptor" : "[I"
+  }, {
+    "field" : "fileIds",
+    "owner" : "ir",
+    "name" : "e",
+    "access" : 0,
+    "descriptor" : "[[I"
+  }, {
+    "field" : "fileNameHashTables",
+    "owner" : "ir",
+    "name" : "d",
+    "access" : 0,
+    "descriptor" : "[Llv;"
+  }, {
+    "field" : "fileNameHashes",
+    "owner" : "ir",
+    "name" : "x",
+    "access" : 0,
+    "descriptor" : "[[I"
+  }, {
+    "field" : "files",
+    "owner" : "ir",
+    "name" : "n",
+    "access" : 0,
+    "descriptor" : "[[Ljava/lang/Object;"
+  }, {
+    "field" : "groupCount",
     "owner" : "ir",
     "name" : "f",
     "access" : 0,
     "descriptor" : "I",
     "decoder" : 1694798923
   }, {
-    "field" : "archiveCrcs",
+    "field" : "groupCrcs",
     "owner" : "ir",
     "name" : "u",
     "access" : 0,
     "descriptor" : "[I"
   }, {
-    "field" : "archiveIds",
+    "field" : "groupIds",
     "owner" : "ir",
     "name" : "q",
     "access" : 0,
     "descriptor" : "[I"
   }, {
-    "field" : "archiveNameHashTable",
+    "field" : "groupNameHashTable",
     "owner" : "ir",
     "name" : "o",
     "access" : 0,
     "descriptor" : "Llv;"
   }, {
-    "field" : "archiveNameHashes",
+    "field" : "groupNameHashes",
     "owner" : "ir",
     "name" : "w",
     "access" : 0,
     "descriptor" : "[I"
   }, {
-    "field" : "archiveVersions",
+    "field" : "groupVersions",
     "owner" : "ir",
     "name" : "g",
     "access" : 0,
     "descriptor" : "[I"
   }, {
-    "field" : "archives",
+    "field" : "groups",
     "owner" : "ir",
     "name" : "k",
     "access" : 0,
@@ -16620,164 +16669,134 @@
     "descriptor" : "I",
     "decoder" : -530370811
   }, {
-    "field" : "recordCounts",
-    "owner" : "ir",
-    "name" : "l",
-    "access" : 0,
-    "descriptor" : "[I"
-  }, {
-    "field" : "recordIds",
-    "owner" : "ir",
-    "name" : "e",
-    "access" : 0,
-    "descriptor" : "[[I"
-  }, {
-    "field" : "recordNameHashTables",
-    "owner" : "ir",
-    "name" : "d",
-    "access" : 0,
-    "descriptor" : "[Llv;"
-  }, {
-    "field" : "recordNameHashes",
-    "owner" : "ir",
-    "name" : "x",
-    "access" : 0,
-    "descriptor" : "[[I"
-  }, {
-    "field" : "records",
-    "owner" : "ir",
-    "name" : "n",
-    "access" : 0,
-    "descriptor" : "[[Ljava/lang/Object;"
-  }, {
-    "field" : "releaseArchives",
+    "field" : "releaseGroups",
     "owner" : "ir",
     "name" : "z",
     "access" : 0,
     "descriptor" : "Z"
   }, {
-    "field" : "shallowRecords",
+    "field" : "shallowFiles",
     "owner" : "ir",
     "name" : "j",
     "access" : 0,
     "descriptor" : "Z"
   } ],
   "methods" : [ {
-    "method" : "archiveLoadPercent",
-    "owner" : "ir",
-    "name" : "e",
-    "access" : 0,
-    "descriptor" : "(II)I"
-  }, {
-    "method" : "archiveLoadPercentByName",
-    "owner" : "ir",
-    "name" : "ac",
-    "access" : 1,
-    "parameters" : [ "archiveName" ],
-    "descriptor" : "(Ljava/lang/String;I)I"
-  }, {
-    "method" : "buildRecords",
+    "method" : "buildFiles",
     "owner" : "ir",
     "name" : "c",
     "access" : 0,
-    "parameters" : [ "archive", "xteaKey" ],
+    "parameters" : [ "group", "xteaKey" ],
     "descriptor" : "(I[II)Z"
   }, {
-    "method" : "getArchiveId",
-    "owner" : "ir",
-    "name" : "p",
-    "access" : 1,
-    "parameters" : [ "archiveName" ],
-    "descriptor" : "(Ljava/lang/String;I)I"
-  }, {
-    "method" : "getRecord",
-    "owner" : "ir",
-    "name" : "d",
-    "access" : 1,
-    "parameters" : [ "archive", "record" ],
-    "descriptor" : "(III)[B"
-  }, {
-    "method" : "getRecordFlat",
-    "owner" : "ir",
-    "name" : "a",
-    "access" : 1,
-    "parameters" : [ "archiveOrRecord" ],
-    "descriptor" : "(IB)[B"
-  }, {
-    "method" : "getRecordId",
-    "owner" : "ir",
-    "name" : "v",
-    "access" : 1,
-    "parameters" : [ "archiveId", "recordName" ],
-    "descriptor" : "(ILjava/lang/String;I)I"
-  }, {
-    "method" : "loadArchive",
-    "owner" : "ir",
-    "name" : "z",
-    "access" : 0,
-    "descriptor" : "(II)V"
-  }, {
-    "method" : "setIndexReference",
+    "method" : "decodeIndex",
     "owner" : "ir",
     "name" : "m",
     "access" : 0,
     "descriptor" : "([BB)V"
   }, {
-    "method" : "takeRecord",
+    "method" : "getFile",
+    "owner" : "ir",
+    "name" : "d",
+    "access" : 1,
+    "parameters" : [ "group", "file" ],
+    "descriptor" : "(III)[B"
+  }, {
+    "method" : "getFileFlat",
+    "owner" : "ir",
+    "name" : "a",
+    "access" : 1,
+    "parameters" : [ "groupOrFile" ],
+    "descriptor" : "(IB)[B"
+  }, {
+    "method" : "getFileId",
+    "owner" : "ir",
+    "name" : "v",
+    "access" : 1,
+    "parameters" : [ "group", "fileName" ],
+    "descriptor" : "(ILjava/lang/String;I)I"
+  }, {
+    "method" : "getGroupId",
+    "owner" : "ir",
+    "name" : "p",
+    "access" : 1,
+    "parameters" : [ "groupName" ],
+    "descriptor" : "(Ljava/lang/String;I)I"
+  }, {
+    "method" : "groupLoadPercent",
+    "owner" : "ir",
+    "name" : "e",
+    "access" : 0,
+    "descriptor" : "(II)I"
+  }, {
+    "method" : "groupLoadPercentByName",
+    "owner" : "ir",
+    "name" : "ac",
+    "access" : 1,
+    "parameters" : [ "groupName" ],
+    "descriptor" : "(Ljava/lang/String;I)I"
+  }, {
+    "method" : "loadGroup",
+    "owner" : "ir",
+    "name" : "z",
+    "access" : 0,
+    "descriptor" : "(II)V"
+  }, {
+    "method" : "takeFile",
     "owner" : "ir",
     "name" : "q",
     "access" : 1,
-    "parameters" : [ "archive", "record" ],
+    "parameters" : [ "group", "file" ],
     "descriptor" : "(III)[B"
   }, {
-    "method" : "takeRecordByNames",
+    "method" : "takeFileByNames",
     "owner" : "ir",
     "name" : "aq",
     "access" : 1,
-    "parameters" : [ "archiveName", "recordName" ],
+    "parameters" : [ "groupName", "fileName" ],
     "descriptor" : "(Ljava/lang/String;Ljava/lang/String;S)[B"
   }, {
-    "method" : "takeRecordEncrypted",
+    "method" : "takeFileEncrypted",
     "owner" : "ir",
     "name" : "w",
     "access" : 1,
-    "parameters" : [ "archive", "record", "xteaKey" ],
+    "parameters" : [ "group", "file", "xteaKey" ],
     "descriptor" : "(II[II)[B"
   }, {
-    "method" : "takeRecordFlat",
+    "method" : "takeFileFlat",
     "owner" : "ir",
     "name" : "x",
     "access" : 1,
-    "parameters" : [ "archiveOrRecord" ],
+    "parameters" : [ "groupOrFile" ],
     "descriptor" : "(IS)[B"
   }, {
-    "method" : "tryLoadArchive",
-    "owner" : "ir",
-    "name" : "g",
-    "access" : 1,
-    "parameters" : [ "archive" ],
-    "descriptor" : "(II)Z"
-  }, {
-    "method" : "tryLoadArchiveByName",
-    "owner" : "ir",
-    "name" : "av",
-    "access" : 1,
-    "parameters" : [ "archiveName" ],
-    "descriptor" : "(Ljava/lang/String;I)Z"
-  }, {
-    "method" : "tryLoadRecord",
+    "method" : "tryLoadFile",
     "owner" : "ir",
     "name" : "o",
     "access" : 1,
-    "parameters" : [ "archive", "record" ],
+    "parameters" : [ "group", "file" ],
     "descriptor" : "(III)Z"
   }, {
-    "method" : "tryLoadRecordByNames",
+    "method" : "tryLoadFileByNames",
     "owner" : "ir",
     "name" : "aj",
     "access" : 1,
-    "parameters" : [ "archiveName", "recordName" ],
+    "parameters" : [ "groupName", "fileName" ],
     "descriptor" : "(Ljava/lang/String;Ljava/lang/String;I)Z"
+  }, {
+    "method" : "tryLoadGroup",
+    "owner" : "ir",
+    "name" : "g",
+    "access" : 1,
+    "parameters" : [ "group" ],
+    "descriptor" : "(II)Z"
+  }, {
+    "method" : "tryLoadGroupByName",
+    "owner" : "ir",
+    "name" : "av",
+    "access" : 1,
+    "parameters" : [ "groupName" ],
+    "descriptor" : "(Ljava/lang/String;I)Z"
   }, {
     "method" : "__f_392",
     "owner" : "ir",
@@ -16861,7 +16880,7 @@
     "descriptor" : "(ZZ)V"
   } ]
 }, {
-  "class" : "IndexStoreActionHandler",
+  "class" : "ArchiveDiskActionHandler",
   "name" : "iv",
   "super" : "java.lang.Object",
   "access" : 33,
@@ -16880,12 +16899,18 @@
     "descriptor" : "()V"
   } ]
 }, {
-  "class" : "IndexCache",
+  "class" : "Archive",
   "name" : "it",
   "super" : "ir",
   "access" : 33,
   "interfaces" : [ ],
   "fields" : [ {
+    "field" : "archiveDisk",
+    "owner" : "it",
+    "name" : "c",
+    "access" : 0,
+    "descriptor" : "Lff;"
+  }, {
     "field" : "index",
     "owner" : "it",
     "name" : "p",
@@ -16893,33 +16918,27 @@
     "descriptor" : "I",
     "decoder" : -1579549759
   }, {
-    "field" : "indexReferenceCrc",
+    "field" : "indexCrc",
     "owner" : "it",
     "name" : "av",
     "access" : 0,
     "descriptor" : "I",
     "decoder" : 1472870917
   }, {
-    "field" : "indexReferenceVersion",
+    "field" : "indexVersion",
     "owner" : "it",
     "name" : "ar",
     "access" : 0,
     "descriptor" : "I",
     "decoder" : -785528219
   }, {
-    "field" : "indexStore",
-    "owner" : "it",
-    "name" : "c",
-    "access" : 0,
-    "descriptor" : "Lff;"
-  }, {
-    "field" : "referenceStore",
+    "field" : "masterDisk",
     "owner" : "it",
     "name" : "r",
     "access" : 0,
     "descriptor" : "Lff;"
   }, {
-    "field" : "validArchives",
+    "field" : "validGroups",
     "owner" : "it",
     "name" : "aq",
     "access" : 64,
@@ -16945,7 +16964,7 @@
     "descriptor" : "Z"
   } ],
   "methods" : [ {
-    "method" : "archiveLoadPercent",
+    "method" : "groupLoadPercent",
     "owner" : "it",
     "name" : "e",
     "access" : 0,
@@ -16964,13 +16983,13 @@
     "parameters" : [ ],
     "descriptor" : "(I)V"
   }, {
-    "method" : "loadArchive",
+    "method" : "loadGroup",
     "owner" : "it",
     "name" : "z",
     "access" : 0,
     "descriptor" : "(II)V"
   }, {
-    "method" : "loadIndexReference",
+    "method" : "loadIndex",
     "owner" : "it",
     "name" : "co",
     "access" : 1,
@@ -17141,6 +17160,20 @@
     "decoder" : -1579051565
   } ],
   "methods" : [ {
+    "method" : "decode",
+    "owner" : "ic",
+    "name" : "f",
+    "access" : 1,
+    "parameters" : [ "buffer" ],
+    "descriptor" : "(Lgr;B)V"
+  }, {
+    "method" : "decode0",
+    "owner" : "ic",
+    "name" : "q",
+    "access" : 0,
+    "parameters" : [ "buffer", "opcode" ],
+    "descriptor" : "(Lgr;II)V"
+  }, {
     "method" : "getSprite",
     "owner" : "ic",
     "name" : "o",
@@ -17154,20 +17187,6 @@
     "access" : 0,
     "parameters" : [ "id" ],
     "descriptor" : "(IB)Lln;"
-  }, {
-    "method" : "read",
-    "owner" : "ic",
-    "name" : "f",
-    "access" : 1,
-    "parameters" : [ "buffer" ],
-    "descriptor" : "(Lgr;B)V"
-  }, {
-    "method" : "readNext",
-    "owner" : "ic",
-    "name" : "q",
-    "access" : 0,
-    "parameters" : [ "buffer", "opcode" ],
-    "descriptor" : "(Lgr;II)V"
   }, {
     "method" : "__w_409",
     "owner" : "ic",
@@ -17226,26 +17245,19 @@
   "access" : 33,
   "interfaces" : [ ],
   "fields" : [ {
-    "field" : "archive",
-    "owner" : "io",
-    "name" : "u",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : -2065492247
-  }, {
-    "field" : "heightScale",
-    "owner" : "io",
-    "name" : "n",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : 1199960995
-  }, {
     "field" : "id",
     "owner" : "io",
     "name" : "o",
     "access" : 0,
     "descriptor" : "I",
     "decoder" : -713866165
+  }, {
+    "field" : "model",
+    "owner" : "io",
+    "name" : "u",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : -2065492247
   }, {
     "field" : "orientation",
     "owner" : "io",
@@ -17254,29 +17266,43 @@
     "descriptor" : "I",
     "decoder" : 1650590363
   }, {
-    "field" : "recolorFrom",
-    "owner" : "io",
-    "name" : "l",
-    "access" : 0,
-    "descriptor" : "[S"
-  }, {
-    "field" : "recolorTo",
+    "field" : "recol_d",
     "owner" : "io",
     "name" : "e",
     "access" : 0,
     "descriptor" : "[S"
   }, {
-    "field" : "retextureFrom",
+    "field" : "recol_s",
     "owner" : "io",
-    "name" : "x",
+    "name" : "l",
     "access" : 0,
     "descriptor" : "[S"
   }, {
-    "field" : "retextureTo",
+    "field" : "resizeh",
+    "owner" : "io",
+    "name" : "k",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : 680796997
+  }, {
+    "field" : "resizev",
+    "owner" : "io",
+    "name" : "n",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : 1199960995
+  }, {
+    "field" : "retex_d",
     "owner" : "io",
     "name" : "d",
     "access" : 0,
     "descriptor" : "[S"
+  }, {
+    "field" : "retex_s",
+    "owner" : "io",
+    "name" : "x",
+    "access" : 0,
+    "descriptor" : "[S"
   }, {
     "field" : "sequence",
     "owner" : "io",
@@ -17284,13 +17310,6 @@
     "access" : 1,
     "descriptor" : "I",
     "decoder" : 1580078789
-  }, {
-    "field" : "widthScale",
-    "owner" : "io",
-    "name" : "k",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : 680796997
   }, {
     "field" : "__a",
     "owner" : "io",
@@ -17307,25 +17326,25 @@
     "decoder" : 1866148625
   } ],
   "methods" : [ {
-    "method" : "getModel",
-    "owner" : "io",
-    "name" : "w",
-    "access" : 17,
-    "descriptor" : "(II)Ldu;"
-  }, {
-    "method" : "read",
+    "method" : "decode",
     "owner" : "io",
     "name" : "f",
     "access" : 0,
     "parameters" : [ "buffer" ],
     "descriptor" : "(Lgr;I)V"
   }, {
-    "method" : "readNext",
+    "method" : "decode0",
     "owner" : "io",
     "name" : "q",
     "access" : 0,
     "parameters" : [ "buffer", "n" ],
     "descriptor" : "(Lgr;II)V"
+  }, {
+    "method" : "getModel",
+    "owner" : "io",
+    "name" : "w",
+    "access" : 17,
+    "descriptor" : "(II)Ldu;"
   } ],
   "constructors" : [ {
     "access" : 0,
@@ -17338,63 +17357,63 @@
   "access" : 33,
   "interfaces" : [ ],
   "fields" : [ {
-    "field" : "archives",
+    "field" : "bodyPart",
+    "owner" : "im",
+    "name" : "o",
+    "access" : 1,
+    "descriptor" : "I",
+    "decoder" : 1619779051
+  }, {
+    "field" : "models",
     "owner" : "im",
     "name" : "d",
     "access" : 0,
     "descriptor" : "[I"
   }, {
-    "field" : "recolorFrom",
+    "field" : "models2",
     "owner" : "im",
-    "name" : "g",
+    "name" : "u",
     "access" : 0,
-    "descriptor" : "[S"
+    "descriptor" : "[I"
   }, {
-    "field" : "recolorTo",
+    "field" : "recol_d",
     "owner" : "im",
     "name" : "l",
     "access" : 0,
     "descriptor" : "[S"
   }, {
-    "field" : "retextureFrom",
+    "field" : "recol_s",
     "owner" : "im",
-    "name" : "e",
+    "name" : "g",
     "access" : 0,
     "descriptor" : "[S"
   }, {
-    "field" : "retextureTo",
+    "field" : "retex_d",
     "owner" : "im",
     "name" : "x",
     "access" : 0,
     "descriptor" : "[S"
   }, {
-    "field" : "__u",
+    "field" : "retex_s",
     "owner" : "im",
-    "name" : "u",
+    "name" : "e",
     "access" : 0,
-    "descriptor" : "[I"
+    "descriptor" : "[S"
   }, {
     "field" : "__k",
     "owner" : "im",
     "name" : "k",
     "access" : 1,
     "descriptor" : "Z"
-  }, {
-    "field" : "__o",
-    "owner" : "im",
-    "name" : "o",
-    "access" : 1,
-    "descriptor" : "I",
-    "decoder" : 1619779051
   } ],
   "methods" : [ {
-    "method" : "read",
+    "method" : "decode",
     "owner" : "im",
     "name" : "f",
     "access" : 0,
     "descriptor" : "(Lgr;S)V"
   }, {
-    "method" : "readNext",
+    "method" : "decode0",
     "owner" : "im",
     "name" : "q",
     "access" : 0,
@@ -17510,6 +17529,18 @@
     "decoder" : 1515955705
   } ],
   "methods" : [ {
+    "method" : "decode",
+    "owner" : "ii",
+    "name" : "m",
+    "access" : 1,
+    "descriptor" : "(Lgr;I)V"
+  }, {
+    "method" : "decode0",
+    "owner" : "ii",
+    "name" : "f",
+    "access" : 0,
+    "descriptor" : "(Lgr;IB)V"
+  }, {
     "method" : "getSprite1",
     "owner" : "ii",
     "name" : "q",
@@ -17523,25 +17554,13 @@
     "access" : 1,
     "parameters" : [ ],
     "descriptor" : "(B)Lln;"
-  }, {
-    "method" : "read",
-    "owner" : "ii",
-    "name" : "m",
-    "access" : 1,
-    "descriptor" : "(Lgr;I)V"
-  }, {
-    "method" : "readNext",
-    "owner" : "ii",
-    "name" : "f",
-    "access" : 0,
-    "descriptor" : "(Lgr;IB)V"
   } ],
   "constructors" : [ {
     "access" : 1,
     "descriptor" : "()V"
   } ]
 }, {
-  "class" : "HitSplatDefinition",
+  "class" : "HitmarkDefinition",
   "name" : "jm",
   "super" : "fn",
   "access" : 33,
@@ -17658,6 +17677,18 @@
     "decoder" : 1751286975
   } ],
   "methods" : [ {
+    "method" : "decode",
+    "owner" : "jm",
+    "name" : "q",
+    "access" : 0,
+    "descriptor" : "(Lgr;I)V"
+  }, {
+    "method" : "decode0",
+    "owner" : "jm",
+    "name" : "w",
+    "access" : 0,
+    "descriptor" : "(Lgr;II)V"
+  }, {
     "method" : "getFont",
     "owner" : "jm",
     "name" : "d",
@@ -17671,18 +17702,6 @@
     "access" : 1,
     "parameters" : [ "n" ],
     "descriptor" : "(IS)Ljava/lang/String;"
-  }, {
-    "method" : "read",
-    "owner" : "jm",
-    "name" : "q",
-    "access" : 0,
-    "descriptor" : "(Lgr;I)V"
-  }, {
-    "method" : "readNext",
-    "owner" : "jm",
-    "name" : "w",
-    "access" : 0,
-    "descriptor" : "(Lgr;II)V"
   }, {
     "method" : "transform",
     "owner" : "jm",
@@ -17730,12 +17749,6 @@
   "access" : 33,
   "interfaces" : [ ],
   "fields" : [ {
-    "field" : "actions",
-    "owner" : "jr",
-    "name" : "aj",
-    "access" : 1,
-    "descriptor" : "[Ljava/lang/String;"
-  }, {
     "field" : "ambient",
     "owner" : "jr",
     "name" : "ag",
@@ -17930,6 +17943,12 @@
     "access" : 0,
     "descriptor" : "I",
     "decoder" : 818611483
+  }, {
+    "field" : "op",
+    "owner" : "jr",
+    "name" : "aj",
+    "access" : 1,
+    "descriptor" : "[Ljava/lang/String;"
   }, {
     "field" : "params",
     "owner" : "jr",
@@ -17937,29 +17956,29 @@
     "access" : 0,
     "descriptor" : "Llh;"
   }, {
-    "field" : "recolorFrom",
-    "owner" : "jr",
-    "name" : "n",
-    "access" : 0,
-    "descriptor" : "[S"
-  }, {
-    "field" : "recolorTo",
+    "field" : "recol_d",
     "owner" : "jr",
     "name" : "i",
     "access" : 0,
     "descriptor" : "[S"
   }, {
-    "field" : "retextureFrom",
+    "field" : "recol_s",
     "owner" : "jr",
-    "name" : "a",
+    "name" : "n",
     "access" : 0,
     "descriptor" : "[S"
   }, {
-    "field" : "retextureTo",
+    "field" : "retex_d",
     "owner" : "jr",
     "name" : "z",
     "access" : 0,
     "descriptor" : "[S"
+  }, {
+    "field" : "retex_s",
+    "owner" : "jr",
+    "name" : "a",
+    "access" : 0,
+    "descriptor" : "[S"
   }, {
     "field" : "sizeX",
     "owner" : "jr",
@@ -17974,13 +17993,6 @@
     "access" : 1,
     "descriptor" : "I",
     "decoder" : -301273619
-  }, {
-    "field" : "transformConfigId",
-    "owner" : "jr",
-    "name" : "an",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : -2119965579
   }, {
     "field" : "transformVarbit",
     "owner" : "jr",
@@ -17988,6 +18000,13 @@
     "access" : 0,
     "descriptor" : "I",
     "decoder" : 1136644531
+  }, {
+    "field" : "transformVarp",
+    "owner" : "jr",
+    "name" : "an",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : -2119965579
   }, {
     "field" : "transforms",
     "owner" : "jr",
@@ -18014,6 +18033,18 @@
     "descriptor" : "[I"
   } ],
   "methods" : [ {
+    "method" : "decode",
+    "owner" : "jr",
+    "name" : "w",
+    "access" : 0,
+    "descriptor" : "(Lgr;I)V"
+  }, {
+    "method" : "decode0",
+    "owner" : "jr",
+    "name" : "o",
+    "access" : 0,
+    "descriptor" : "(Lgr;II)V"
+  }, {
     "method" : "getIntParam",
     "owner" : "jr",
     "name" : "z",
@@ -18045,24 +18076,12 @@
     "access" : 1,
     "descriptor" : "(ILjava/lang/String;I)Ljava/lang/String;"
   }, {
-    "method" : "init",
+    "method" : "postDecode",
     "owner" : "jr",
     "name" : "q",
     "access" : 0,
     "parameters" : [ ],
     "descriptor" : "(I)V"
-  }, {
-    "method" : "read",
-    "owner" : "jr",
-    "name" : "w",
-    "access" : 0,
-    "descriptor" : "(Lgr;I)V"
-  }, {
-    "method" : "readNext",
-    "owner" : "jr",
-    "name" : "o",
-    "access" : 0,
-    "descriptor" : "(Lgr;II)V"
   }, {
     "method" : "transform",
     "owner" : "jr",
@@ -18116,6 +18135,34 @@
     "access" : 1,
     "descriptor" : "I",
     "decoder" : 738319589
+  }, {
+    "field" : "boughtlink",
+    "owner" : "jv",
+    "name" : "bk",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : 700576005
+  }, {
+    "field" : "boughttemplate",
+    "owner" : "jv",
+    "name" : "bd",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : -1969719185
+  }, {
+    "field" : "certlink",
+    "owner" : "jv",
+    "name" : "ao",
+    "access" : 1,
+    "descriptor" : "I",
+    "decoder" : 619422509
+  }, {
+    "field" : "certtemplate",
+    "owner" : "jv",
+    "name" : "aa",
+    "access" : 1,
+    "descriptor" : "I",
+    "decoder" : -2121346423
   }, {
     "field" : "contrast",
     "owner" : "jv",
@@ -18124,53 +18171,24 @@
     "descriptor" : "I",
     "decoder" : -1984887305
   }, {
-    "field" : "femaleHeadModel",
+    "field" : "cost",
     "owner" : "jv",
-    "name" : "am",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : 1709659237
-  }, {
-    "field" : "femaleHeadModel2",
-    "owner" : "jv",
-    "name" : "an",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : 106668727
-  }, {
-    "field" : "femaleModel",
-    "owner" : "jv",
-    "name" : "al",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : 886682223
-  }, {
-    "field" : "femaleModel1",
-    "owner" : "jv",
-    "name" : "ab",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : 154223105
-  }, {
-    "field" : "femaleModel2",
-    "owner" : "jv",
-    "name" : "ad",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : -771136925
-  }, {
-    "field" : "femaleOffset",
-    "owner" : "jv",
-    "name" : "ae",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : -1619361485
-  }, {
-    "field" : "groundActions",
-    "owner" : "jv",
-    "name" : "av",
+    "name" : "aq",
     "access" : 1,
-    "descriptor" : "[Ljava/lang/String;"
+    "descriptor" : "I",
+    "decoder" : -343501105
+  }, {
+    "field" : "countco",
+    "owner" : "jv",
+    "name" : "au",
+    "access" : 0,
+    "descriptor" : "[I"
+  }, {
+    "field" : "countobj",
+    "owner" : "jv",
+    "name" : "az",
+    "access" : 0,
+    "descriptor" : "[I"
   }, {
     "field" : "id",
     "owner" : "jv",
@@ -18179,79 +18197,66 @@
     "descriptor" : "I",
     "decoder" : -590103687
   }, {
-    "field" : "int1",
-    "owner" : "jv",
-    "name" : "bs",
-    "access" : 1,
-    "descriptor" : "I",
-    "decoder" : -1057008657
-  }, {
-    "field" : "inventoryActions",
+    "field" : "iop",
     "owner" : "jv",
     "name" : "ar",
     "access" : 1,
     "descriptor" : "[Ljava/lang/String;"
   }, {
-    "field" : "isMembersOnly",
-    "owner" : "jv",
-    "name" : "aj",
-    "access" : 1,
-    "descriptor" : "Z"
-  }, {
-    "field" : "isStackable",
-    "owner" : "jv",
-    "name" : "ag",
-    "access" : 1,
-    "descriptor" : "I",
-    "decoder" : -237597001
-  }, {
-    "field" : "isTradable",
-    "owner" : "jv",
-    "name" : "bn",
-    "access" : 1,
-    "descriptor" : "Z"
-  }, {
-    "field" : "maleHeadModel",
+    "field" : "manhead",
     "owner" : "jv",
     "name" : "ap",
     "access" : 0,
     "descriptor" : "I",
     "decoder" : -650184697
   }, {
-    "field" : "maleHeadModel2",
+    "field" : "manhead2",
     "owner" : "jv",
     "name" : "as",
     "access" : 0,
     "descriptor" : "I",
     "decoder" : 548044049
   }, {
-    "field" : "maleModel",
+    "field" : "manwear",
     "owner" : "jv",
     "name" : "ah",
     "access" : 0,
     "descriptor" : "I",
     "decoder" : 939367983
   }, {
-    "field" : "maleModel1",
+    "field" : "manwear2",
     "owner" : "jv",
     "name" : "ak",
     "access" : 0,
     "descriptor" : "I",
     "decoder" : 140643039
   }, {
-    "field" : "maleModel2",
+    "field" : "manwear3",
     "owner" : "jv",
     "name" : "at",
     "access" : 0,
     "descriptor" : "I",
     "decoder" : -691559863
   }, {
-    "field" : "maleOffset",
+    "field" : "manwearyoff",
     "owner" : "jv",
     "name" : "aw",
     "access" : 0,
     "descriptor" : "I",
     "decoder" : -1378899027
+  }, {
+    "field" : "members",
+    "owner" : "jv",
+    "name" : "aj",
+    "access" : 1,
+    "descriptor" : "Z"
+  }, {
+    "field" : "model",
+    "owner" : "jv",
+    "name" : "a",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : 1070080857
   }, {
     "field" : "name",
     "owner" : "jv",
@@ -18259,40 +18264,11 @@
     "access" : 1,
     "descriptor" : "Ljava/lang/String;"
   }, {
-    "field" : "note",
+    "field" : "op",
     "owner" : "jv",
-    "name" : "ao",
+    "name" : "av",
     "access" : 1,
-    "descriptor" : "I",
-    "decoder" : 619422509
-  }, {
-    "field" : "noteTemplate",
-    "owner" : "jv",
-    "name" : "aa",
-    "access" : 1,
-    "descriptor" : "I",
-    "decoder" : -2121346423
-  }, {
-    "field" : "notedId",
-    "owner" : "jv",
-    "name" : "bd",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : -1969719185
-  }, {
-    "field" : "offsetX2d",
-    "owner" : "jv",
-    "name" : "p",
-    "access" : 1,
-    "descriptor" : "I",
-    "decoder" : -533708435
-  }, {
-    "field" : "offsetY2d",
-    "owner" : "jv",
-    "name" : "v",
-    "access" : 1,
-    "descriptor" : "I",
-    "decoder" : -2130350563
+    "descriptor" : "[Ljava/lang/String;"
   }, {
     "field" : "params",
     "owner" : "jv",
@@ -18300,85 +18276,133 @@
     "access" : 0,
     "descriptor" : "Llh;"
   }, {
-    "field" : "placeholder",
+    "field" : "placeholderlink",
     "owner" : "jv",
     "name" : "bc",
     "access" : 1,
     "descriptor" : "I",
     "decoder" : 807815565
   }, {
-    "field" : "placeholderTemplate",
+    "field" : "placeholdertemplate",
     "owner" : "jv",
     "name" : "bo",
     "access" : 1,
     "descriptor" : "I",
     "decoder" : -1854342455
   }, {
-    "field" : "price",
-    "owner" : "jv",
-    "name" : "aq",
-    "access" : 1,
-    "descriptor" : "I",
-    "decoder" : -343501105
-  }, {
-    "field" : "recolorFrom",
-    "owner" : "jv",
-    "name" : "j",
-    "access" : 0,
-    "descriptor" : "[S"
-  }, {
-    "field" : "recolorTo",
+    "field" : "recol_d",
     "owner" : "jv",
     "name" : "s",
     "access" : 0,
     "descriptor" : "[S"
   }, {
-    "field" : "resizeX",
+    "field" : "recol_s",
+    "owner" : "jv",
+    "name" : "j",
+    "access" : 0,
+    "descriptor" : "[S"
+  }, {
+    "field" : "resizex",
     "owner" : "jv",
     "name" : "ax",
     "access" : 0,
     "descriptor" : "I",
     "decoder" : 69034859
   }, {
-    "field" : "resizeY",
+    "field" : "resizey",
     "owner" : "jv",
     "name" : "af",
     "access" : 0,
     "descriptor" : "I",
     "decoder" : -17174497
   }, {
-    "field" : "resizeZ",
+    "field" : "resizez",
     "owner" : "jv",
     "name" : "ai",
     "access" : 0,
     "descriptor" : "I",
     "decoder" : 1395132907
   }, {
-    "field" : "retextureFrom",
-    "owner" : "jv",
-    "name" : "t",
-    "access" : 0,
-    "descriptor" : "[S"
-  }, {
-    "field" : "retextureTo",
+    "field" : "retex_d",
     "owner" : "jv",
     "name" : "y",
     "access" : 0,
     "descriptor" : "[S"
   }, {
-    "field" : "shiftClickIndex0",
+    "field" : "retex_s",
+    "owner" : "jv",
+    "name" : "t",
+    "access" : 0,
+    "descriptor" : "[S"
+  }, {
+    "field" : "shiftclickindex",
     "owner" : "jv",
     "name" : "ay",
     "access" : 0,
     "descriptor" : "I",
     "decoder" : 881309855
   }, {
-    "field" : "unnotedId",
+    "field" : "stackable",
     "owner" : "jv",
-    "name" : "bk",
+    "name" : "ag",
+    "access" : 1,
+    "descriptor" : "I",
+    "decoder" : -237597001
+  }, {
+    "field" : "stockmarket",
+    "owner" : "jv",
+    "name" : "bn",
+    "access" : 1,
+    "descriptor" : "Z"
+  }, {
+    "field" : "team",
+    "owner" : "jv",
+    "name" : "bs",
+    "access" : 1,
+    "descriptor" : "I",
+    "decoder" : -1057008657
+  }, {
+    "field" : "womanhead",
+    "owner" : "jv",
+    "name" : "am",
     "access" : 0,
     "descriptor" : "I",
-    "decoder" : 700576005
+    "decoder" : 1709659237
+  }, {
+    "field" : "womanhead2",
+    "owner" : "jv",
+    "name" : "an",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : 106668727
+  }, {
+    "field" : "womanwear",
+    "owner" : "jv",
+    "name" : "al",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : 886682223
+  }, {
+    "field" : "womanwear2",
+    "owner" : "jv",
+    "name" : "ab",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : 154223105
+  }, {
+    "field" : "womanwear3",
+    "owner" : "jv",
+    "name" : "ad",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : -771136925
+  }, {
+    "field" : "womanwearyoff",
+    "owner" : "jv",
+    "name" : "ae",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : -1619361485
   }, {
     "field" : "xan2d",
     "owner" : "jv",
@@ -18386,6 +18410,13 @@
     "access" : 1,
     "descriptor" : "I",
     "decoder" : 880150839
+  }, {
+    "field" : "xof2d",
+    "owner" : "jv",
+    "name" : "p",
+    "access" : 1,
+    "descriptor" : "I",
+    "decoder" : -533708435
   }, {
     "field" : "yan2d",
     "owner" : "jv",
@@ -18393,6 +18424,13 @@
     "access" : 1,
     "descriptor" : "I",
     "decoder" : 507808107
+  }, {
+    "field" : "yof2d",
+    "owner" : "jv",
+    "name" : "v",
+    "access" : 1,
+    "descriptor" : "I",
+    "decoder" : -2130350563
   }, {
     "field" : "zan2d",
     "owner" : "jv",
@@ -18407,27 +18445,48 @@
     "access" : 1,
     "descriptor" : "I",
     "decoder" : 278037959
-  }, {
-    "field" : "__a",
-    "owner" : "jv",
-    "name" : "a",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : 1070080857
-  }, {
-    "field" : "__au",
-    "owner" : "jv",
-    "name" : "au",
-    "access" : 0,
-    "descriptor" : "[I"
-  }, {
-    "field" : "__az",
-    "owner" : "jv",
-    "name" : "az",
-    "access" : 0,
-    "descriptor" : "[I"
   } ],
   "methods" : [ {
+    "method" : "decode",
+    "owner" : "jv",
+    "name" : "q",
+    "access" : 0,
+    "descriptor" : "(Lgr;I)V"
+  }, {
+    "method" : "decode0",
+    "owner" : "jv",
+    "name" : "w",
+    "access" : 0,
+    "descriptor" : "(Lgr;II)V"
+  }, {
+    "method" : "genBought",
+    "owner" : "jv",
+    "name" : "u",
+    "access" : 0,
+    "parameters" : [ "template", "link" ],
+    "descriptor" : "(Ljv;Ljv;I)V"
+  }, {
+    "method" : "genCert",
+    "owner" : "jv",
+    "name" : "o",
+    "access" : 0,
+    "parameters" : [ "template", "link" ],
+    "descriptor" : "(Ljv;Ljv;I)V"
+  }, {
+    "method" : "genPlaceholder",
+    "owner" : "jv",
+    "name" : "g",
+    "access" : 0,
+    "parameters" : [ "template", "link" ],
+    "descriptor" : "(Ljv;Ljv;I)V"
+  }, {
+    "method" : "getCountObj",
+    "owner" : "jv",
+    "name" : "x",
+    "access" : 1,
+    "parameters" : [ "quantity" ],
+    "descriptor" : "(IB)Ljv;"
+  }, {
     "method" : "getIntParam",
     "owner" : "jv",
     "name" : "y",
@@ -18453,18 +18512,6 @@
     "name" : "h",
     "access" : 1,
     "descriptor" : "(ILjava/lang/String;I)Ljava/lang/String;"
-  }, {
-    "method" : "read",
-    "owner" : "jv",
-    "name" : "q",
-    "access" : 0,
-    "descriptor" : "(Lgr;I)V"
-  }, {
-    "method" : "readNext",
-    "owner" : "jv",
-    "name" : "w",
-    "access" : 0,
-    "descriptor" : "(Lgr;II)V"
   }, {
     "method" : "__f_425",
     "owner" : "jv",
@@ -18473,63 +18520,35 @@
     "parameters" : [ ],
     "descriptor" : "(I)V"
   }, {
-    "method" : "__o_426",
-    "owner" : "jv",
-    "name" : "o",
-    "access" : 0,
-    "parameters" : [ "arg0", "arg1" ],
-    "descriptor" : "(Ljv;Ljv;I)V"
-  }, {
-    "method" : "__u_427",
-    "owner" : "jv",
-    "name" : "u",
-    "access" : 0,
-    "parameters" : [ "arg0", "arg1" ],
-    "descriptor" : "(Ljv;Ljv;I)V"
-  }, {
-    "method" : "__g_428",
-    "owner" : "jv",
-    "name" : "g",
-    "access" : 0,
-    "parameters" : [ "arg0", "arg1" ],
-    "descriptor" : "(Ljv;Ljv;I)V"
-  }, {
-    "method" : "__l_429",
+    "method" : "__l_426",
     "owner" : "jv",
     "name" : "l",
     "access" : 17,
     "parameters" : [ "arg0" ],
     "descriptor" : "(II)Ldw;"
   }, {
-    "method" : "__x_430",
-    "owner" : "jv",
-    "name" : "x",
-    "access" : 1,
-    "parameters" : [ "arg0" ],
-    "descriptor" : "(IB)Ljv;"
-  }, {
-    "method" : "__z_431",
+    "method" : "__z_427",
     "owner" : "jv",
     "name" : "z",
     "access" : 17,
     "parameters" : [ "arg0" ],
     "descriptor" : "(ZI)Z"
   }, {
-    "method" : "__j_432",
+    "method" : "__j_428",
     "owner" : "jv",
     "name" : "j",
     "access" : 17,
     "parameters" : [ "arg0" ],
     "descriptor" : "(ZB)Ldw;"
   }, {
-    "method" : "__s_433",
+    "method" : "__s_429",
     "owner" : "jv",
     "name" : "s",
     "access" : 17,
     "parameters" : [ "arg0" ],
     "descriptor" : "(ZI)Z"
   }, {
-    "method" : "__t_434",
+    "method" : "__t_430",
     "owner" : "jv",
     "name" : "t",
     "access" : 17,
@@ -18547,18 +18566,6 @@
   "access" : 33,
   "interfaces" : [ ],
   "fields" : [ {
-    "field" : "actions",
-    "owner" : "jz",
-    "name" : "h",
-    "access" : 1,
-    "descriptor" : "[Ljava/lang/String;"
-  }, {
-    "field" : "archives",
-    "owner" : "jz",
-    "name" : "l",
-    "access" : 0,
-    "descriptor" : "[I"
-  }, {
     "field" : "combatLevel",
     "owner" : "jz",
     "name" : "c",
@@ -18578,13 +18585,6 @@
     "access" : 1,
     "descriptor" : "I",
     "decoder" : 235824283
-  }, {
-    "field" : "heightScale",
-    "owner" : "jz",
-    "name" : "p",
-    "access" : 0,
-    "descriptor" : "I",
-    "decoder" : 1390683537
   }, {
     "field" : "id",
     "owner" : "jz",
@@ -18592,13 +18592,6 @@
     "access" : 1,
     "descriptor" : "I",
     "decoder" : -1937346627
-  }, {
-    "field" : "idleSequence",
-    "owner" : "jz",
-    "name" : "x",
-    "access" : 1,
-    "descriptor" : "I",
-    "decoder" : 275200787
   }, {
     "field" : "isFollower",
     "owner" : "jz",
@@ -18611,12 +18604,24 @@
     "name" : "ah",
     "access" : 1,
     "descriptor" : "Z"
+  }, {
+    "field" : "models",
+    "owner" : "jz",
+    "name" : "l",
+    "access" : 0,
+    "descriptor" : "[I"
   }, {
     "field" : "name",
     "owner" : "jz",
     "name" : "u",
     "access" : 1,
     "descriptor" : "Ljava/lang/String;"
+  }, {
+    "field" : "op",
+    "owner" : "jz",
+    "name" : "h",
+    "access" : 1,
+    "descriptor" : "[Ljava/lang/String;"
   }, {
     "field" : "params",
     "owner" : "jz",
@@ -18624,29 +18629,50 @@
     "access" : 0,
     "descriptor" : "Llh;"
   }, {
-    "field" : "recolorFrom",
+    "field" : "readyanim",
     "owner" : "jz",
-    "name" : "j",
-    "access" : 0,
-    "descriptor" : "[S"
+    "name" : "x",
+    "access" : 1,
+    "descriptor" : "I",
+    "decoder" : 275200787
   }, {
-    "field" : "recolorTo",
+    "field" : "recol_d",
     "owner" : "jz",
     "name" : "s",
     "access" : 0,
     "descriptor" : "[S"
   }, {
-    "field" : "retextureFrom",
+    "field" : "recol_s",
     "owner" : "jz",
-    "name" : "t",
+    "name" : "j",
     "access" : 0,
     "descriptor" : "[S"
   }, {
-    "field" : "retextureTo",
+    "field" : "resizeh",
+    "owner" : "jz",
+    "name" : "r",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : -1469219067
+  }, {
+    "field" : "resizev",
+    "owner" : "jz",
+    "name" : "p",
+    "access" : 0,
+    "descriptor" : "I",
+    "decoder" : 1390683537
+  }, {
+    "field" : "retex_d",
     "owner" : "jz",
     "name" : "y",
     "access" : 0,
     "descriptor" : "[S"
+  }, {
+    "field" : "retex_s",
+    "owner" : "jz",
+    "name" : "t",
+    "access" : 0,
+    "descriptor" : "[S"
   }, {
     "field" : "size",
     "owner" : "jz",
@@ -18675,54 +18701,47 @@
     "access" : 1,
     "descriptor" : "[I"
   }, {
-    "field" : "turnLeftSequence",
+    "field" : "turnleftanim",
     "owner" : "jz",
     "name" : "d",
     "access" : 1,
     "descriptor" : "I",
     "decoder" : 819690597
   }, {
-    "field" : "turnRightSequence",
+    "field" : "turnrightanim",
     "owner" : "jz",
     "name" : "k",
     "access" : 1,
     "descriptor" : "I",
     "decoder" : 1311553413
   }, {
-    "field" : "walkSequence",
+    "field" : "walkanim",
     "owner" : "jz",
     "name" : "n",
     "access" : 1,
     "descriptor" : "I",
     "decoder" : -284110917
   }, {
-    "field" : "walkTurnLeftSequence",
-    "owner" : "jz",
-    "name" : "a",
-    "access" : 1,
-    "descriptor" : "I",
-    "decoder" : -1213774321
-  }, {
-    "field" : "walkTurnRightSequence",
-    "owner" : "jz",
-    "name" : "z",
-    "access" : 1,
-    "descriptor" : "I",
-    "decoder" : -96930503
-  }, {
-    "field" : "walkTurnSequence",
+    "field" : "walkbackanim",
     "owner" : "jz",
     "name" : "i",
     "access" : 1,
     "descriptor" : "I",
     "decoder" : 1952230339
   }, {
-    "field" : "widthScale",
+    "field" : "walkleftanim",
     "owner" : "jz",
-    "name" : "r",
-    "access" : 0,
+    "name" : "a",
+    "access" : 1,
     "descriptor" : "I",
-    "decoder" : -1469219067
+    "decoder" : -1213774321
+  }, {
+    "field" : "walkrightanim",
+    "owner" : "jz",
+    "name" : "z",
+    "access" : 1,
+    "descriptor" : "I",
+    "decoder" : -96930503
   }, {
     "field" : "__ag",
     "owner" : "jz",
@@ -18764,6 +18783,18 @@
     "decoder" : -506638747
   } ],
   "methods" : [ {
+    "method" : "decode",
+    "owner" : "jz",
+    "name" : "w",
+    "access" : 0,
+    "descriptor" : "(Lgr;I)V"
+  }, {
+    "method" : "decode0",
+    "owner" : "jz",
+    "name" : "o",
+    "access" : 0,
+    "descriptor" : "(Lgr;IB)V"
+  }, {
     "method" : "getIntParam",
     "owner" : "jz",
     "name" : "x",
@@ -18790,24 +18821,12 @@
     "access" : 1,
     "descriptor" : "(ILjava/lang/String;I)Ljava/lang/String;"
   }, {
-    "method" : "init",
+    "method" : "postDecode",
     "owner" : "jz",
     "name" : "q",
     "access" : 0,
     "parameters" : [ ],
     "descriptor" : "(I)V"
-  }, {
-    "method" : "read",
-    "owner" : "jz",
-    "name" : "w",
-    "access" : 0,
-    "descriptor" : "(Lgr;I)V"
-  }, {
-    "method" : "readNext",
-    "owner" : "jz",
-    "name" : "o",
-    "access" : 0,
-    "descriptor" : "(Lgr;IB)V"
   }, {
     "method" : "transform",
     "owner" : "jz",
@@ -18816,7 +18835,7 @@
     "parameters" : [ ],
     "descriptor" : "(B)Ljz;"
   }, {
-    "method" : "__e_435",
+    "method" : "__e_431",
     "owner" : "jz",
     "name" : "e",
     "access" : 1,
@@ -18828,7 +18847,7 @@
     "descriptor" : "()V"
   } ]
 }, {
-  "class" : "OverlayDefinition",
+  "class" : "FloorOverlayDefinition",
   "name" : "jf",
   "super" : "fn",
   "access" : 33,
@@ -18904,24 +18923,24 @@
     "descriptor" : "Z"
   } ],
   "methods" : [ {
-    "method" : "init",
-    "owner" : "jf",
-    "name" : "f",
-    "access" : 1,
-    "parameters" : [ ],
-    "descriptor" : "(I)V"
-  }, {
-    "method" : "read",
+    "method" : "decode",
     "owner" : "jf",
     "name" : "q",
     "access" : 1,
     "descriptor" : "(Lgr;II)V"
   }, {
-    "method" : "readNext",
+    "method" : "decode0",
     "owner" : "jf",
     "name" : "w",
     "access" : 0,
     "descriptor" : "(Lgr;III)V"
+  }, {
+    "method" : "postDecode",
+    "owner" : "jf",
+    "name" : "f",
+    "access" : 1,
+    "parameters" : [ ],
+    "descriptor" : "(I)V"
   }, {
     "method" : "setHsl",
     "owner" : "jf",
@@ -19034,6 +19053,13 @@
     "descriptor" : "[I"
   } ],
   "methods" : [ {
+    "method" : "animateComponent",
+    "owner" : "jh",
+    "name" : "e",
+    "access" : 1,
+    "parameters" : [ "model", "frame" ],
+    "descriptor" : "(Ldu;II)Ldu;"
+  }, {
     "method" : "animateObject",
     "owner" : "jh",
     "name" : "u",
@@ -19062,31 +19088,24 @@
     "parameters" : [ "model", "frame" ],
     "descriptor" : "(Ldu;II)Ldu;"
   }, {
-    "method" : "animateWidget",
-    "owner" : "jh",
-    "name" : "e",
-    "access" : 1,
-    "parameters" : [ "model", "frame" ],
-    "descriptor" : "(Ldu;II)Ldu;"
-  }, {
-    "method" : "init",
-    "owner" : "jh",
-    "name" : "w",
-    "access" : 0,
-    "parameters" : [ ],
-    "descriptor" : "(B)V"
-  }, {
-    "method" : "read",
+    "method" : "decode",
     "owner" : "jh",
     "name" : "f",
     "access" : 0,
     "descriptor" : "(Lgr;S)V"
   }, {
-    "method" : "readNext",
+    "method" : "decode0",
     "owner" : "jh",
     "name" : "q",
     "access" : 0,
     "descriptor" : "(Lgr;II)V"
+  }, {
+    "method" : "postDecode",
+    "owner" : "jh",
+    "name" : "w",
+    "access" : 0,
+    "parameters" : [ ],
+    "descriptor" : "(B)V"
   } ],
   "constructors" : [ {
     "access" : 0,
@@ -19160,7 +19179,7 @@
     "parameters" : [ "node" ],
     "descriptor" : "(Lgw;)Lgw;"
   }, {
-    "method" : "__iterator_436",
+    "method" : "__iterator_432",
     "owner" : "ja",
     "name" : "iterator",
     "access" : 1,
@@ -19191,21 +19210,21 @@
     "descriptor" : "Lgh;"
   } ],
   "methods" : [ {
-    "method" : "__m_437",
+    "method" : "__m_433",
     "owner" : "jy",
     "name" : "m",
     "access" : 1,
     "parameters" : [ "arg0" ],
     "descriptor" : "(Lgh;)V"
   }, {
-    "method" : "__f_438",
+    "method" : "__f_434",
     "owner" : "jy",
     "name" : "f",
     "access" : 1,
     "parameters" : [ ],
     "descriptor" : "()Lgh;"
   }, {
-    "method" : "__q_439",
+    "method" : "__q_435",
     "owner" : "jy",
     "name" : "q",
     "access" : 1,
@@ -19242,21 +19261,21 @@
     "descriptor" : "Lfn;"
   } ],
   "methods" : [ {
-    "method" : "__next_440",
+    "method" : "__next_436",
     "owner" : "jl",
     "name" : "next",
     "access" : 1,
     "parameters" : [ ],
     "descriptor" : "()Ljava/lang/Object;"
   }, {
-    "method" : "__hasNext_441",
+    "method" : "__hasNext_437",
     "owner" : "jl",
     "name" : "hasNext",
     "access" : 1,
     "parameters" : [ ],
     "descriptor" : "()Z"
   }, {
-    "method" : "__remove_442",
+    "method" : "__remove_438",
     "owner" : "jl",
     "name" : "remove",
     "access" : 1,
@@ -19293,35 +19312,35 @@
     "descriptor" : "Lgw;"
   } ],
   "methods" : [ {
-    "method" : "__u_443",
+    "method" : "__u_439",
     "owner" : "jt",
     "name" : "u",
     "access" : 0,
     "parameters" : [ "arg0" ],
     "descriptor" : "(Lja;)V"
   }, {
-    "method" : "__g_444",
+    "method" : "__g_440",
     "owner" : "jt",
     "name" : "g",
     "access" : 0,
     "parameters" : [ ],
     "descriptor" : "()V"
   }, {
-    "method" : "__next_445",
+    "method" : "__next_441",
     "owner" : "jt",
     "name" : "next",
     "access" : 1,
     "parameters" : [ ],
     "descriptor" : "()Ljava/lang/Object;"
   }, {
-    "method" : "__hasNext_446",
+    "method" : "__hasNext_442",
     "owner" : "jt",
     "name" : "hasNext",
     "access" : 1,
     "parameters" : [ ],
     "descriptor" : "()Z"
   }, {
-    "method" : "__remove_447",
+    "method" : "__remove_443",
     "owner" : "jt",
     "name" : "remove",
     "access" : 1,
@@ -19365,35 +19384,35 @@
     "parameters" : [ ],
     "descriptor" : "()V"
   }, {
-    "method" : "__q_448",
+    "method" : "__q_444",
     "owner" : "jc",
     "name" : "q",
     "access" : 1,
     "parameters" : [ ],
     "descriptor" : "()Lfn;"
   }, {
-    "method" : "__w_449",
+    "method" : "__w_445",
     "owner" : "jc",
     "name" : "w",
     "access" : 1,
     "parameters" : [ ],
     "descriptor" : "()Lfn;"
   }, {
-    "method" : "__o_450",
+    "method" : "__o_446",
     "owner" : "jc",
     "name" : "o",
     "access" : 0,
     "parameters" : [ "arg0" ],
     "descriptor" : "(Lfn;)Lfn;"
   }, {
-    "method" : "__u_451",
+    "method" : "__u_447",
     "owner" : "jc",
     "name" : "u",
     "access" : 1,
     "parameters" : [ ],
     "descriptor" : "()Lfn;"
   }, {
-    "method" : "__iterator_452",
+    "method" : "__iterator_448",
     "owner" : "jc",
     "name" : "iterator",
     "access" : 1,
@@ -19488,42 +19507,42 @@
     "parameters" : [ "buffer" ],
     "descriptor" : "(Lgr;I)V"
   }, {
-    "method" : "__m_453",
+    "method" : "__m_449",
     "owner" : "jo",
     "name" : "m",
     "access" : 1,
     "parameters" : [ ],
     "descriptor" : "(I)V"
   }, {
-    "method" : "__f_454",
+    "method" : "__f_450",
     "owner" : "jo",
     "name" : "f",
     "access" : 1,
     "parameters" : [ ],
     "descriptor" : "(B)V"
   }, {
-    "method" : "__q_455",
+    "method" : "__q_451",
     "owner" : "jo",
     "name" : "q",
     "access" : 1,
     "parameters" : [ "arg0" ],
     "descriptor" : "(II)V"
   }, {
-    "method" : "__w_456",
+    "method" : "__w_452",
     "owner" : "jo",
     "name" : "w",
     "access" : 1,
     "parameters" : [ ],
     "descriptor" : "(I)V"
   }, {
-    "method" : "__o_457",
+    "method" : "__o_453",
     "owner" : "jo",
     "name" : "o",
     "access" : 1,
     "parameters" : [ ],
     "descriptor" : "(S)V"
   }, {
-    "method" : "__u_458",
+    "method" : "__u_454",
     "owner" : "jo",
     "name" : "u",
     "access" : 1,
@@ -19589,7 +19608,7 @@
     "parameters" : [ ],
     "descriptor" : "(I)Lkp;"
   }, {
-    "method" : "__compareTo_459",
+    "method" : "__compareTo_455",
     "owner" : "js",
     "name" : "compareTo",
     "access" : 1,
@@ -19614,21 +19633,21 @@
     "descriptor" : "Ljava/util/Comparator;"
   } ],
   "methods" : [ {
-    "method" : "__e_460",
+    "method" : "__e_456",
     "owner" : "kf",
     "name" : "e",
     "access" : 16,
     "parameters" : [ "arg0" ],
     "descriptor" : "(Ljava/util/Comparator;B)V"
   }, {
-    "method" : "__x_461",
+    "method" : "__x_457",
     "owner" : "kf",
     "name" : "x",
     "access" : 20,
     "parameters" : [ "arg0", "arg1" ],
     "descriptor" : "(Ljs;Ljs;I)I"
   }, {
-    "method" : "__equals_462",
+    "method" : "__equals_458",
     "owner" : "kf",
     "name" : "equals",
     "access" : 1,
@@ -19661,14 +19680,14 @@
     "parameters" : [ "other" ],
     "descriptor" : "(Lks;I)I"
   }, {
-    "method" : "__aj_463",
+    "method" : "__aj_459",
     "owner" : "ks",
     "name" : "aj",
     "access" : 1,
     "parameters" : [ "arg0" ],
     "descriptor" : "(Ljs;I)I"
   }, {
-    "method" : "__compareTo_464",
+    "method" : "__compareTo_460",
     "owner" : "ks",
     "name" : "compareTo",
     "access" : 1,
@@ -19725,7 +19744,7 @@
     "parameters" : [ "buffer", "n" ],
     "descriptor" : "(Lgr;IB)V"
   }, {
-    "method" : "__q_465",
+    "method" : "__q_461",
     "owner" : "kg",
     "name" : "q",
     "access" : 1,
@@ -19777,28 +19796,28 @@
     "parameters" : [ ],
     "descriptor" : "(I)Ljava/lang/String;"
   }, {
-    "method" : "__equals_466",
+    "method" : "__equals_462",
     "owner" : "kp",
     "name" : "equals",
     "access" : 1,
     "parameters" : [ "arg0" ],
     "descriptor" : "(Ljava/lang/Object;)Z"
   }, {
-    "method" : "__hashCode_467",
+    "method" : "__hashCode_463",
     "owner" : "kp",
     "name" : "hashCode",
     "access" : 1,
     "parameters" : [ ],
     "descriptor" : "()I"
   }, {
-    "method" : "__toString_468",
+    "method" : "__toString_464",
     "owner" : "kp",
     "name" : "toString",
     "access" : 1,
     "parameters" : [ ],
     "descriptor" : "()Ljava/lang/String;"
   }, {
-    "method" : "__compareTo_469",
+    "method" : "__compareTo_465",
     "owner" : "kp",
     "name" : "compareTo",
     "access" : 1,
@@ -19836,14 +19855,14 @@
     "parameters" : [ "other" ],
     "descriptor" : "(Lkq;I)I"
   }, {
-    "method" : "__aj_470",
+    "method" : "__aj_466",
     "owner" : "kq",
     "name" : "aj",
     "access" : 1,
     "parameters" : [ "arg0" ],
     "descriptor" : "(Ljs;I)I"
   }, {
-    "method" : "__compareTo_471",
+    "method" : "__compareTo_467",
     "owner" : "kq",
     "name" : "compareTo",
     "access" : 1,
@@ -19872,6 +19891,12 @@
     "name" : "f",
     "access" : 16,
     "descriptor" : "Llx;"
+  }, {
+    "field" : "minKick",
+    "owner" : "kv",
+    "name" : "k",
+    "access" : 1,
+    "descriptor" : "B"
   }, {
     "field" : "name",
     "owner" : "kv",
@@ -19898,12 +19923,6 @@
     "access" : 0,
     "descriptor" : "I",
     "decoder" : 386706253
-  }, {
-    "field" : "__k",
-    "owner" : "kv",
-    "name" : "k",
-    "access" : 1,
-    "descriptor" : "B"
   } ],
   "methods" : [ {
     "method" : "clearFriends",
@@ -19939,28 +19958,28 @@
     "parameters" : [ "buffer" ],
     "descriptor" : "(Lgr;I)V"
   }, {
-    "method" : "__q_472",
+    "method" : "__q_468",
     "owner" : "kv",
     "name" : "q",
     "access" : 16,
     "parameters" : [ "arg0" ],
     "descriptor" : "(Ljava/lang/String;I)V"
   }, {
-    "method" : "__x_473",
+    "method" : "__x_469",
     "owner" : "kv",
     "name" : "x",
     "access" : 16,
     "parameters" : [ "arg0" ],
     "descriptor" : "(Ljava/lang/String;B)V"
   }, {
-    "method" : "__a_474",
+    "method" : "__a_470",
     "owner" : "kv",
     "name" : "a",
     "access" : 17,
     "parameters" : [ "arg0" ],
     "descriptor" : "(Lgr;B)V"
   }, {
-    "method" : "__cp_475",
+    "method" : "__cp_471",
     "owner" : "kv",
     "name" : "cp",
     "access" : 16,
@@ -20026,7 +20045,7 @@
     "descriptor" : "(Lir;Lir;)V"
   } ]
 }, {
-  "class" : "SpriteIds",
+  "class" : "GraphicsDefaults",
   "name" : "lg",
   "super" : "java.lang.Object",
   "access" : 33,
@@ -20110,7 +20129,7 @@
     "decoder" : 1673796151
   } ],
   "methods" : [ {
-    "method" : "read",
+    "method" : "decode",
     "owner" : "lg",
     "name" : "m",
     "access" : 1,
@@ -20135,21 +20154,21 @@
     "descriptor" : "Z"
   } ],
   "methods" : [ {
-    "method" : "__m_476",
+    "method" : "__m_472",
     "owner" : "ly",
     "name" : "m",
     "access" : 0,
     "parameters" : [ "arg0", "arg1" ],
     "descriptor" : "(Ljs;Ljs;B)I"
   }, {
-    "method" : "__compare_477",
+    "method" : "__compare_473",
     "owner" : "ly",
     "name" : "compare",
     "access" : 1,
     "parameters" : [ "arg0", "arg1" ],
     "descriptor" : "(Ljava/lang/Object;Ljava/lang/Object;)I"
   }, {
-    "method" : "__equals_478",
+    "method" : "__equals_474",
     "owner" : "ly",
     "name" : "equals",
     "access" : 1,
@@ -20174,21 +20193,21 @@
     "descriptor" : "Z"
   } ],
   "methods" : [ {
-    "method" : "__m_479",
+    "method" : "__m_475",
     "owner" : "li",
     "name" : "m",
     "access" : 0,
     "parameters" : [ "arg0", "arg1" ],
     "descriptor" : "(Ljs;Ljs;I)I"
   }, {
-    "method" : "__compare_480",
+    "method" : "__compare_476",
     "owner" : "li",
     "name" : "compare",
     "access" : 1,
     "parameters" : [ "arg0", "arg1" ],
     "descriptor" : "(Ljava/lang/Object;Ljava/lang/Object;)I"
   }, {
-    "method" : "__equals_481",
+    "method" : "__equals_477",
     "owner" : "li",
     "name" : "equals",
     "access" : 1,
@@ -20268,7 +20287,7 @@
     "access" : 1,
     "descriptor" : "(Lgw;J)V"
   }, {
-    "method" : "__iterator_482",
+    "method" : "__iterator_478",
     "owner" : "lh",
     "name" : "iterator",
     "access" : 1,
@@ -20311,28 +20330,28 @@
     "descriptor" : "I"
   } ],
   "methods" : [ {
-    "method" : "__u_483",
+    "method" : "__u_479",
     "owner" : "lk",
     "name" : "u",
     "access" : 0,
     "parameters" : [ ],
     "descriptor" : "()V"
   }, {
-    "method" : "__next_484",
+    "method" : "__next_480",
     "owner" : "lk",
     "name" : "next",
     "access" : 1,
     "parameters" : [ ],
     "descriptor" : "()Ljava/lang/Object;"
   }, {
-    "method" : "__hasNext_485",
+    "method" : "__hasNext_481",
     "owner" : "lk",
     "name" : "hasNext",
     "access" : 1,
     "parameters" : [ ],
     "descriptor" : "()Z"
   }, {
-    "method" : "__remove_486",
+    "method" : "__remove_482",
     "owner" : "lk",
     "name" : "remove",
     "access" : 1,
@@ -20379,56 +20398,56 @@
     "decoder" : 1377856837
   } ],
   "methods" : [ {
-    "method" : "__m_487",
+    "method" : "__m_483",
     "owner" : "la",
     "name" : "m",
     "access" : 1,
     "parameters" : [ "arg0", "arg1" ],
     "descriptor" : "(IIB)V"
   }, {
-    "method" : "__f_488",
+    "method" : "__f_484",
     "owner" : "la",
     "name" : "f",
     "access" : 1,
     "parameters" : [ "arg0", "arg1" ],
     "descriptor" : "(III)V"
   }, {
-    "method" : "__toString_489",
+    "method" : "__toString_485",
     "owner" : "la",
     "name" : "toString",
     "access" : 1,
     "parameters" : [ ],
     "descriptor" : "()Ljava/lang/String;"
   }, {
-    "method" : "__q_490",
+    "method" : "__q_486",
     "owner" : "la",
     "name" : "q",
     "access" : 1,
     "parameters" : [ "arg0", "arg1" ],
     "descriptor" : "(Lla;Lla;I)V"
   }, {
-    "method" : "__w_491",
+    "method" : "__w_487",
     "owner" : "la",
     "name" : "w",
     "access" : 0,
     "parameters" : [ "arg0", "arg1" ],
     "descriptor" : "(Lla;Lla;I)V"
   }, {
-    "method" : "__o_492",
+    "method" : "__o_488",
     "owner" : "la",
     "name" : "o",
     "access" : 0,
     "parameters" : [ "arg0", "arg1" ],
     "descriptor" : "(Lla;Lla;S)V"
   }, {
-    "method" : "__u_493",
+    "method" : "__u_489",
     "owner" : "la",
     "name" : "u",
     "access" : 0,
     "parameters" : [ ],
     "descriptor" : "(I)I"
   }, {
-    "method" : "__g_494",
+    "method" : "__g_490",
     "owner" : "la",
     "name" : "g",
     "access" : 0,
@@ -20464,7 +20483,7 @@
     "decoder" : -1204297807
   } ],
   "methods" : [ {
-    "method" : "__f_495",
+    "method" : "__f_491",
     "owner" : "lj",
     "name" : "f",
     "access" : 1,
@@ -20545,14 +20564,14 @@
     "parameters" : [ "r", "g", "b" ],
     "descriptor" : "(III)V"
   }, {
-    "method" : "__q_496",
+    "method" : "__q_492",
     "owner" : "lq",
     "name" : "q",
     "access" : 1,
     "parameters" : [ "arg0", "arg1" ],
     "descriptor" : "(II)V"
   }, {
-    "method" : "__o_497",
+    "method" : "__o_493",
     "owner" : "lq",
     "name" : "o",
     "access" : 1,
@@ -20634,140 +20653,140 @@
     "parameters" : [ ],
     "descriptor" : "()V"
   }, {
-    "method" : "__q_498",
+    "method" : "__q_494",
     "owner" : "ln",
     "name" : "q",
     "access" : 1,
     "parameters" : [ ],
     "descriptor" : "()V"
   }, {
-    "method" : "__o_499",
+    "method" : "__o_495",
     "owner" : "ln",
     "name" : "o",
     "access" : 1,
     "parameters" : [ "arg0" ],
     "descriptor" : "(I)V"
   }, {
-    "method" : "__u_500",
+    "method" : "__u_496",
     "owner" : "ln",
     "name" : "u",
     "access" : 1,
     "parameters" : [ ],
     "descriptor" : "()V"
   }, {
-    "method" : "__g_501",
+    "method" : "__g_497",
     "owner" : "ln",
     "name" : "g",
     "access" : 1,
     "parameters" : [ ],
     "descriptor" : "()V"
   }, {
-    "method" : "__l_502",
+    "method" : "__l_498",
     "owner" : "ln",
     "name" : "l",
     "access" : 1,
     "parameters" : [ "arg0" ],
     "descriptor" : "(I)V"
   }, {
-    "method" : "__e_503",
+    "method" : "__e_499",
     "owner" : "ln",
     "name" : "e",
     "access" : 1,
     "parameters" : [ "arg0" ],
     "descriptor" : "(I)V"
   }, {
-    "method" : "__x_504",
+    "method" : "__x_500",
     "owner" : "ln",
     "name" : "x",
     "access" : 1,
     "parameters" : [ "arg0", "arg1" ],
     "descriptor" : "(II)V"
   }, {
-    "method" : "__a_505",
+    "method" : "__a_501",
     "owner" : "ln",
     "name" : "a",
     "access" : 1,
     "parameters" : [ "arg0", "arg1" ],
     "descriptor" : "(II)V"
   }, {
-    "method" : "__j_506",
+    "method" : "__j_502",
     "owner" : "ln",
     "name" : "j",
     "access" : 1,
     "parameters" : [ "arg0", "arg1", "arg2", "arg3" ],
     "descriptor" : "(IIII)V"
   }, {
-    "method" : "__t_507",
+    "method" : "__t_503",
     "owner" : "ln",
     "name" : "t",
     "access" : 1,
     "parameters" : [ "arg0", "arg1", "arg2", "arg3" ],
     "descriptor" : "(IIII)V"
   }, {
-    "method" : "__h_508",
+    "method" : "__h_504",
     "owner" : "ln",
     "name" : "h",
     "access" : 1,
     "parameters" : [ "arg0", "arg1", "arg2" ],
     "descriptor" : "(III)V"
   }, {
-    "method" : "__c_509",
+    "method" : "__c_505",
     "owner" : "ln",
     "name" : "c",
     "access" : 1,
     "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4" ],
     "descriptor" : "(IIIII)V"
   }, {
-    "method" : "__v_510",
+    "method" : "__v_506",
     "owner" : "ln",
     "name" : "v",
     "access" : 1,
     "parameters" : [ "arg0", "arg1", "arg2" ],
     "descriptor" : "(III)V"
   }, {
-    "method" : "__aj_511",
+    "method" : "__aj_507",
     "owner" : "ln",
     "name" : "aj",
     "access" : 1,
     "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4" ],
     "descriptor" : "(IIIII)V"
   }, {
-    "method" : "__ac_512",
+    "method" : "__ac_508",
     "owner" : "ln",
     "name" : "ac",
     "access" : 1,
     "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5", "arg6", "arg7" ],
     "descriptor" : "(IIIIII[I[I)V"
   }, {
-    "method" : "__ay_513",
+    "method" : "__ay_509",
     "owner" : "ln",
     "name" : "ay",
     "access" : 1,
     "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5", "arg6", "arg7", "arg8", "arg9" ],
     "descriptor" : "(IIIIIIII[I[I)V"
   }, {
-    "method" : "__ah_514",
+    "method" : "__ah_510",
     "owner" : "ln",
     "name" : "ah",
     "access" : 1,
     "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5", "arg6", "arg7" ],
     "descriptor" : "(IIIIIIDI)V"
   }, {
-    "method" : "__ak_515",
+    "method" : "__ak_511",
     "owner" : "ln",
     "name" : "ak",
     "access" : 1,
     "parameters" : [ "arg0", "arg1", "arg2", "arg3" ],
     "descriptor" : "(IIII)V"
   }, {
-    "method" : "__aw_516",
+    "method" : "__aw_512",
     "owner" : "ln",
     "name" : "aw",
     "access" : 0,
     "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5" ],
     "descriptor" : "(IIIIII)V"
   }, {
-    "method" : "__al_517",
+    "method" : "__al_513",
     "owner" : "ln",
     "name" : "al",
     "access" : 1,
@@ -21529,196 +21548,196 @@
     "access" : 1,
     "descriptor" : "(I)V"
   }, {
-    "method" : "__f_518",
+    "method" : "__f_514",
     "owner" : "lz",
     "name" : "f",
     "access" : 1,
     "parameters" : [ ],
     "descriptor" : "(I)V"
   }, {
-    "method" : "__w_519",
+    "method" : "__w_515",
     "owner" : "lz",
     "name" : "w",
     "access" : 1,
     "parameters" : [ "arg0", "arg1", "arg2", "arg3" ],
     "descriptor" : "(IIZZS)V"
   }, {
-    "method" : "__o_520",
+    "method" : "__o_516",
     "owner" : "lz",
     "name" : "o",
     "access" : 0,
     "parameters" : [ "arg0", "arg1", "arg2", "arg3" ],
     "descriptor" : "(IIZJ)V"
   }, {
-    "method" : "__g_521",
+    "method" : "__g_517",
     "owner" : "lz",
     "name" : "g",
     "access" : 0,
     "parameters" : [ ],
     "descriptor" : "(I)V"
   }, {
-    "method" : "__l_522",
+    "method" : "__l_518",
     "owner" : "lz",
     "name" : "l",
     "access" : 16,
     "parameters" : [ "arg0", "arg1", "arg2" ],
     "descriptor" : "(IIZI)V"
   }, {
-    "method" : "__e_523",
+    "method" : "__e_519",
     "owner" : "lz",
     "name" : "e",
     "access" : 16,
     "parameters" : [ ],
     "descriptor" : "(B)V"
   }, {
-    "method" : "__x_524",
+    "method" : "__x_520",
     "owner" : "lz",
     "name" : "x",
     "access" : 0,
     "parameters" : [ ],
     "descriptor" : "(I)Z"
   }, {
-    "method" : "__a_525",
+    "method" : "__a_521",
     "owner" : "lz",
     "name" : "a",
     "access" : 1,
     "parameters" : [ "arg0", "arg1", "arg2", "arg3" ],
     "descriptor" : "(IIIZI)V"
   }, {
-    "method" : "__h_526",
+    "method" : "__h_522",
     "owner" : "lz",
     "name" : "h",
     "access" : 1,
     "parameters" : [ "arg0", "arg1", "arg2", "arg3" ],
     "descriptor" : "(Lag;Lhu;Lhu;ZI)V"
   }, {
-    "method" : "__p_527",
+    "method" : "__p_523",
     "owner" : "lz",
     "name" : "p",
     "access" : 0,
     "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5" ],
     "descriptor" : "(IIIIIII)Z"
   }, {
-    "method" : "__v_528",
+    "method" : "__v_524",
     "owner" : "lz",
     "name" : "v",
     "access" : 0,
     "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5" ],
     "descriptor" : "(IIIIIII)V"
   }, {
-    "method" : "__av_529",
+    "method" : "__av_525",
     "owner" : "lz",
     "name" : "av",
     "access" : 0,
     "parameters" : [ "arg0" ],
     "descriptor" : "(IB)F"
   }, {
-    "method" : "__ak_530",
+    "method" : "__ak_526",
     "owner" : "lz",
     "name" : "ak",
     "access" : 1,
     "parameters" : [ "arg0", "arg1" ],
     "descriptor" : "(III)V"
   }, {
-    "method" : "__aw_531",
+    "method" : "__aw_527",
     "owner" : "lz",
     "name" : "aw",
     "access" : 1,
     "parameters" : [ "arg0", "arg1" ],
     "descriptor" : "(III)V"
   }, {
-    "method" : "__al_532",
+    "method" : "__al_528",
     "owner" : "lz",
     "name" : "al",
     "access" : 1,
     "parameters" : [ "arg0", "arg1", "arg2" ],
     "descriptor" : "(IIIB)V"
   }, {
-    "method" : "__ab_533",
+    "method" : "__ab_529",
     "owner" : "lz",
     "name" : "ab",
     "access" : 1,
     "parameters" : [ "arg0", "arg1", "arg2" ],
     "descriptor" : "(IIII)V"
   }, {
-    "method" : "__ae_534",
+    "method" : "__ae_530",
     "owner" : "lz",
     "name" : "ae",
     "access" : 1,
     "parameters" : [ ],
     "descriptor" : "(I)I"
   }, {
-    "method" : "__at_535",
+    "method" : "__at_531",
     "owner" : "lz",
     "name" : "at",
     "access" : 1,
     "parameters" : [ ],
     "descriptor" : "(I)I"
   }, {
-    "method" : "__ad_536",
+    "method" : "__ad_532",
     "owner" : "lz",
     "name" : "ad",
     "access" : 1,
     "parameters" : [ ],
     "descriptor" : "(I)Lhu;"
   }, {
-    "method" : "__ap_537",
+    "method" : "__ap_533",
     "owner" : "lz",
     "name" : "ap",
     "access" : 1,
     "parameters" : [ ],
     "descriptor" : "(I)I"
   }, {
-    "method" : "__as_538",
+    "method" : "__as_534",
     "owner" : "lz",
     "name" : "as",
     "access" : 1,
     "parameters" : [ ],
     "descriptor" : "(I)I"
   }, {
-    "method" : "__am_539",
+    "method" : "__am_535",
     "owner" : "lz",
     "name" : "am",
     "access" : 1,
     "parameters" : [ "arg0" ],
     "descriptor" : "(II)V"
   }, {
-    "method" : "__an_540",
+    "method" : "__an_536",
     "owner" : "lz",
     "name" : "an",
     "access" : 1,
     "parameters" : [ ],
     "descriptor" : "(I)V"
   }, {
-    "method" : "__az_541",
+    "method" : "__az_537",
     "owner" : "lz",
     "name" : "az",
     "access" : 1,
     "parameters" : [ "arg0" ],
     "descriptor" : "(II)V"
   }, {
-    "method" : "__au_542",
+    "method" : "__au_538",
     "owner" : "lz",
     "name" : "au",
     "access" : 1,
     "parameters" : [ ],
     "descriptor" : "(I)V"
   }, {
-    "method" : "__bk_543",
+    "method" : "__bk_539",
     "owner" : "lz",
     "name" : "bk",
     "access" : 0,
     "parameters" : [ ],
     "descriptor" : "(I)V"
   }, {
-    "method" : "__bd_544",
+    "method" : "__bd_540",
     "owner" : "lz",
     "name" : "bd",
     "access" : 1,
     "parameters" : [ "arg0", "arg1", "arg2", "arg3", "arg4", "arg5" ],
     "descriptor" : "(IIIIIIB)V"
   }, {
-    "method" : "__bc_545",
+    "method" : "__bc_541",
     "owner" : "lz",
     "name" : "bc",
     "access" : 1,
@@ -21750,7 +21769,7 @@
     "decoder" : -1916729379
   } ],
   "methods" : [ {
-    "method" : "__toString_546",
+    "method" : "__toString_542",
     "owner" : "lx",
     "name" : "toString",
     "access" : 1,
@@ -21842,6 +21861,42 @@
     "name" : "n",
     "access" : 8,
     "descriptor" : "I"
+  }, {
+    "field" : "ArchiveDiskActionHandler_lock",
+    "owner" : "iv",
+    "name" : "w",
+    "access" : 8,
+    "descriptor" : "Ljava/lang/Object;"
+  }, {
+    "field" : "ArchiveDiskActionHandler_requestQueue",
+    "owner" : "iv",
+    "name" : "m",
+    "access" : 8,
+    "descriptor" : "Lje;"
+  }, {
+    "field" : "ArchiveDiskActionHandler_responseQueue",
+    "owner" : "iv",
+    "name" : "f",
+    "access" : 8,
+    "descriptor" : "Lje;"
+  }, {
+    "field" : "ArchiveDiskActionHandler_thread",
+    "owner" : "en",
+    "name" : "o",
+    "access" : 8,
+    "descriptor" : "Ljava/lang/Thread;"
+  }, {
+    "field" : "ArchiveDisk_buffer",
+    "owner" : "ff",
+    "name" : "m",
+    "access" : 8,
+    "descriptor" : "[B"
+  }, {
+    "field" : "Archive_crc",
+    "owner" : "it",
+    "name" : "aj",
+    "access" : 8,
+    "descriptor" : "Ljava/util/zip/CRC32;"
   }, {
     "field" : "AttackOption_alwaysRightClick",
     "owner" : "cj",
@@ -21911,6 +21966,36 @@
     "name" : "l",
     "access" : 8,
     "descriptor" : "Lgt;"
+  }, {
+    "field" : "Component_archive",
+    "owner" : "ho",
+    "name" : "e",
+    "access" : 9,
+    "descriptor" : "Lir;"
+  }, {
+    "field" : "Component_cachedFonts",
+    "owner" : "ho",
+    "name" : "a",
+    "access" : 8,
+    "descriptor" : "Ler;"
+  }, {
+    "field" : "Component_cachedModels",
+    "owner" : "ho",
+    "name" : "i",
+    "access" : 8,
+    "descriptor" : "Ler;"
+  }, {
+    "field" : "DefaultsGroup_graphics",
+    "owner" : "ka",
+    "name" : "m",
+    "access" : 24,
+    "descriptor" : "Lka;"
+  }, {
+    "field" : "EnumDefinition_archive",
+    "owner" : "jw",
+    "name" : "m",
+    "access" : 9,
+    "descriptor" : "Lir;"
   }, {
     "field" : "EnumDefinition_cached",
     "owner" : "jw",
@@ -21918,11 +22003,17 @@
     "access" : 8,
     "descriptor" : "Ler;"
   }, {
-    "field" : "EnumDefinition_indexCache",
-    "owner" : "jw",
+    "field" : "FloorUnderlayDefinition_archive",
+    "owner" : "ih",
     "name" : "m",
-    "access" : 9,
+    "access" : 8,
     "descriptor" : "Lir;"
+  }, {
+    "field" : "FloorUnderlayDefinition_cached",
+    "owner" : "ih",
+    "name" : "f",
+    "access" : 8,
+    "descriptor" : "Ler;"
   }, {
     "field" : "FontName_bold12",
     "owner" : "kx",
@@ -22020,53 +22111,17 @@
     "access" : 8,
     "descriptor" : "Ler;"
   }, {
-    "field" : "HitSplatDefinition_cached",
+    "field" : "HitmarkDefinition_cached",
     "owner" : "jm",
     "name" : "w",
     "access" : 8,
     "descriptor" : "Ler;"
   }, {
-    "field" : "HitSplatDefinition_cachedFonts",
+    "field" : "HitmarkDefinition_cachedFonts",
     "owner" : "jm",
     "name" : "u",
     "access" : 8,
     "descriptor" : "Ler;"
-  }, {
-    "field" : "IndexCache_crc",
-    "owner" : "it",
-    "name" : "aj",
-    "access" : 8,
-    "descriptor" : "Ljava/util/zip/CRC32;"
-  }, {
-    "field" : "IndexStoreActionHandler_lock",
-    "owner" : "iv",
-    "name" : "w",
-    "access" : 8,
-    "descriptor" : "Ljava/lang/Object;"
-  }, {
-    "field" : "IndexStoreActionHandler_requestQueue",
-    "owner" : "iv",
-    "name" : "m",
-    "access" : 8,
-    "descriptor" : "Lje;"
-  }, {
-    "field" : "IndexStoreActionHandler_responseQueue",
-    "owner" : "iv",
-    "name" : "f",
-    "access" : 8,
-    "descriptor" : "Lje;"
-  }, {
-    "field" : "IndexStoreActionHandler_thread",
-    "owner" : "en",
-    "name" : "o",
-    "access" : 8,
-    "descriptor" : "Ljava/lang/Thread;"
-  }, {
-    "field" : "IndexStore_buffer",
-    "owner" : "ff",
-    "name" : "m",
-    "access" : 8,
-    "descriptor" : "[B"
   }, {
     "field" : "Instrument_delays",
     "owner" : "db",
@@ -22184,6 +22239,12 @@
     "access" : 8,
     "descriptor" : "I",
     "decoder" : -114766123
+  }, {
+    "field" : "ItemDefinition_archive",
+    "owner" : "jv",
+    "name" : "u",
+    "access" : 9,
+    "descriptor" : "Lir;"
   }, {
     "field" : "ItemDefinition_cached",
     "owner" : "jv",
@@ -22197,13 +22258,7 @@
     "access" : 8,
     "descriptor" : "Ler;"
   }, {
-    "field" : "ItemDefinition_indexCache",
-    "owner" : "jv",
-    "name" : "u",
-    "access" : 9,
-    "descriptor" : "Lir;"
-  }, {
-    "field" : "ItemDefinition_modelIndexCache",
+    "field" : "ItemDefinition_modelArchive",
     "owner" : "jv",
     "name" : "g",
     "access" : 9,
@@ -22233,18 +22288,18 @@
     "name" : "cb",
     "access" : 9,
     "descriptor" : "[Z"
+  }, {
+    "field" : "KitDefinition_archive",
+    "owner" : "im",
+    "name" : "m",
+    "access" : 9,
+    "descriptor" : "Lir;"
   }, {
     "field" : "KitDefinition_cached",
     "owner" : "im",
     "name" : "w",
     "access" : 8,
     "descriptor" : "Ler;"
-  }, {
-    "field" : "KitDefinition_indexCache",
-    "owner" : "im",
-    "name" : "m",
-    "access" : 9,
-    "descriptor" : "Lir;"
   }, {
     "field" : "Login_isUsernameRemembered",
     "owner" : "client",
@@ -22516,6 +22571,12 @@
     "access" : 73,
     "descriptor" : "I",
     "decoder" : 2000222973
+  }, {
+    "field" : "NetCache_archives",
+    "owner" : "iq",
+    "name" : "h",
+    "access" : 9,
+    "descriptor" : "[Lit;"
   }, {
     "field" : "NetCache_crc",
     "owner" : "iq",
@@ -22535,12 +22596,6 @@
     "name" : "i",
     "access" : 9,
     "descriptor" : "Liz;"
-  }, {
-    "field" : "NetCache_indexCaches",
-    "owner" : "iq",
-    "name" : "h",
-    "access" : 9,
-    "descriptor" : "[Lit;"
   }, {
     "field" : "NetCache_ioExceptions",
     "owner" : "iq",
@@ -22630,6 +22685,12 @@
     "name" : "m",
     "access" : 9,
     "descriptor" : "Lfu;"
+  }, {
+    "field" : "NpcDefinition_archive",
+    "owner" : "jz",
+    "name" : "m",
+    "access" : 8,
+    "descriptor" : "Lir;"
   }, {
     "field" : "NpcDefinition_cached",
     "owner" : "jz",
@@ -22643,14 +22704,14 @@
     "access" : 8,
     "descriptor" : "Ler;"
   }, {
-    "field" : "NpcDefinition_indexCache",
+    "field" : "NpcDefinition_modelArchive",
     "owner" : "jz",
-    "name" : "m",
+    "name" : "f",
     "access" : 8,
     "descriptor" : "Lir;"
   }, {
-    "field" : "NpcDefinition_modelIndexCache",
-    "owner" : "jz",
+    "field" : "ObjectDefinition_archive",
+    "owner" : "jr",
     "name" : "f",
     "access" : 8,
     "descriptor" : "Lir;"
@@ -22666,12 +22727,6 @@
     "name" : "g",
     "access" : 8,
     "descriptor" : "Ler;"
-  }, {
-    "field" : "ObjectDefinition_indexCache",
-    "owner" : "jr",
-    "name" : "f",
-    "access" : 8,
-    "descriptor" : "Lir;"
   }, {
     "field" : "ObjectDefinition_isLowDetail",
     "owner" : "jr",
@@ -22685,7 +22740,7 @@
     "access" : 24,
     "descriptor" : "[I"
   }, {
-    "field" : "ParamKeyDefinition_cached",
+    "field" : "ParamDefinition_cached",
     "owner" : "jb",
     "name" : "f",
     "access" : 8,
@@ -23106,18 +23161,18 @@
     "name" : "m",
     "access" : 8,
     "descriptor" : "Ler;"
+  }, {
+    "field" : "SequenceDefinition_archive",
+    "owner" : "jh",
+    "name" : "m",
+    "access" : 9,
+    "descriptor" : "Lir;"
   }, {
     "field" : "SequenceDefinition_cached",
     "owner" : "jh",
     "name" : "w",
     "access" : 9,
     "descriptor" : "Ler;"
-  }, {
-    "field" : "SequenceDefinition_indexCache",
-    "owner" : "jh",
-    "name" : "m",
-    "access" : 9,
-    "descriptor" : "Lir;"
   }, {
     "field" : "Skills_enabled",
     "owner" : "hc",
@@ -23130,6 +23185,12 @@
     "name" : "q",
     "access" : 9,
     "descriptor" : "[I"
+  }, {
+    "field" : "SpotAnimationDefinition_archive",
+    "owner" : "io",
+    "name" : "m",
+    "access" : 9,
+    "descriptor" : "Lir;"
   }, {
     "field" : "SpotAnimationDefinition_cached",
     "owner" : "io",
@@ -23143,13 +23204,7 @@
     "access" : 8,
     "descriptor" : "Ler;"
   }, {
-    "field" : "SpotAnimationDefinition_indexCache",
-    "owner" : "io",
-    "name" : "m",
-    "access" : 9,
-    "descriptor" : "Lir;"
-  }, {
-    "field" : "SpotAnimationDefinition_modelIndexCache",
+    "field" : "SpotAnimationDefinition_modelArchive",
     "owner" : "io",
     "name" : "f",
     "access" : 9,
@@ -23672,14 +23727,8 @@
     "access" : 25,
     "descriptor" : "Lkd;"
   }, {
-    "field" : "UnderlayDefinition_cached",
-    "owner" : "ih",
-    "name" : "f",
-    "access" : 8,
-    "descriptor" : "Ler;"
-  }, {
-    "field" : "UnderlayDefinition_indexCache",
-    "owner" : "ih",
+    "field" : "VarbitDefinition_archive",
+    "owner" : "ia",
     "name" : "m",
     "access" : 8,
     "descriptor" : "Lir;"
@@ -23689,12 +23738,6 @@
     "name" : "f",
     "access" : 9,
     "descriptor" : "Ler;"
-  }, {
-    "field" : "VarbitDefinition_indexCache",
-    "owner" : "ia",
-    "name" : "m",
-    "access" : 8,
-    "descriptor" : "Lir;"
   }, {
     "field" : "VarpDefinition_cached",
     "owner" : "ix",
@@ -23758,24 +23801,6 @@
     "access" : 9,
     "descriptor" : "I",
     "decoder" : 1535565231
-  }, {
-    "field" : "Widget_cachedFonts",
-    "owner" : "ho",
-    "name" : "a",
-    "access" : 8,
-    "descriptor" : "Ler;"
-  }, {
-    "field" : "Widget_cachedModels",
-    "owner" : "ho",
-    "name" : "i",
-    "access" : 8,
-    "descriptor" : "Ler;"
-  }, {
-    "field" : "Widget_indexCache",
-    "owner" : "ho",
-    "name" : "e",
-    "access" : 9,
-    "descriptor" : "Lir;"
   }, {
     "field" : "WorldMapCacheName_area",
     "owner" : "aw",
@@ -23849,6 +23874,121 @@
     "name" : "m",
     "access" : 9,
     "descriptor" : "Ljava/applet/Applet;"
+  }, {
+    "field" : "archive0",
+    "owner" : "ir",
+    "name" : "di",
+    "access" : 8,
+    "descriptor" : "Lit;"
+  }, {
+    "field" : "archive1",
+    "owner" : "ek",
+    "name" : "dc",
+    "access" : 8,
+    "descriptor" : "Lit;"
+  }, {
+    "field" : "archive10",
+    "owner" : "j",
+    "name" : "dv",
+    "access" : 8,
+    "descriptor" : "Lit;"
+  }, {
+    "field" : "archive11",
+    "owner" : "cu",
+    "name" : "do",
+    "access" : 8,
+    "descriptor" : "Lit;"
+  }, {
+    "field" : "archive12",
+    "owner" : "cy",
+    "name" : "dh",
+    "access" : 8,
+    "descriptor" : "Lit;"
+  }, {
+    "field" : "archive13",
+    "owner" : "gi",
+    "name" : "dz",
+    "access" : 8,
+    "descriptor" : "Lit;"
+  }, {
+    "field" : "archive14",
+    "owner" : "q",
+    "name" : "dj",
+    "access" : 8,
+    "descriptor" : "Lit;"
+  }, {
+    "field" : "archive15",
+    "owner" : "as",
+    "name" : "du",
+    "access" : 8,
+    "descriptor" : "Lit;"
+  }, {
+    "field" : "archive16",
+    "owner" : "c",
+    "name" : "eb",
+    "access" : 8,
+    "descriptor" : "Lit;"
+  }, {
+    "field" : "archive2",
+    "owner" : "be",
+    "name" : "dg",
+    "access" : 8,
+    "descriptor" : "Lit;"
+  }, {
+    "field" : "archive3",
+    "owner" : "t",
+    "name" : "db",
+    "access" : 8,
+    "descriptor" : "Lit;"
+  }, {
+    "field" : "archive4",
+    "owner" : "v",
+    "name" : "dd",
+    "access" : 8,
+    "descriptor" : "Lit;"
+  }, {
+    "field" : "archive5",
+    "owner" : "cn",
+    "name" : "dy",
+    "access" : 8,
+    "descriptor" : "Lit;"
+  }, {
+    "field" : "archive6",
+    "owner" : "fq",
+    "name" : "dk",
+    "access" : 8,
+    "descriptor" : "Lit;"
+  }, {
+    "field" : "archive7",
+    "owner" : "ad",
+    "name" : "dl",
+    "access" : 8,
+    "descriptor" : "Lit;"
+  }, {
+    "field" : "archive8",
+    "owner" : "p",
+    "name" : "dr",
+    "access" : 8,
+    "descriptor" : "Lit;"
+  }, {
+    "field" : "archive9",
+    "owner" : "il",
+    "name" : "dw",
+    "access" : 8,
+    "descriptor" : "Lit;"
+  }, {
+    "field" : "archiveLoaderArchive",
+    "owner" : "client",
+    "name" : "sq",
+    "access" : 8,
+    "descriptor" : "I",
+    "decoder" : -1546210597
+  }, {
+    "field" : "archiveLoaders",
+    "owner" : "client",
+    "name" : "sy",
+    "access" : 8,
+    "descriptor" : "Ljava/util/ArrayList;"
   }, {
     "field" : "base37Table",
     "owner" : "ku",
@@ -23875,6 +24015,27 @@
     "name" : "j",
     "access" : 9,
     "descriptor" : "[Ljava/lang/String;"
+  }, {
+    "field" : "camAngleX",
+    "owner" : "client",
+    "name" : "hw",
+    "access" : 8,
+    "descriptor" : "I",
+    "decoder" : 410614005
+  }, {
+    "field" : "camAngleY",
+    "owner" : "client",
+    "name" : "hp",
+    "access" : 8,
+    "descriptor" : "I",
+    "decoder" : -1163038981
+  }, {
+    "field" : "camFollowHeight",
+    "owner" : "client",
+    "name" : "ho",
+    "access" : 8,
+    "descriptor" : "I",
+    "decoder" : 1005832199
   }, {
     "field" : "cameraPitch",
     "owner" : "t",
@@ -23944,13 +24105,13 @@
     "access" : 8,
     "descriptor" : "Lkv;"
   }, {
-    "field" : "clickedWidget",
+    "field" : "clickedComponent",
     "owner" : "client",
     "name" : "mc",
     "access" : 8,
     "descriptor" : "Lho;"
   }, {
-    "field" : "clickedWidgetParent",
+    "field" : "clickedComponentParent",
     "owner" : "client",
     "name" : "mr",
     "access" : 8,
@@ -23993,6 +24154,33 @@
     "access" : 8,
     "descriptor" : "I",
     "decoder" : -1309758309
+  }, {
+    "field" : "componentClickMasks",
+    "owner" : "client",
+    "name" : "on",
+    "access" : 8,
+    "descriptor" : "Lld;"
+  }, {
+    "field" : "componentClickX",
+    "owner" : "client",
+    "name" : "mt",
+    "access" : 8,
+    "descriptor" : "I",
+    "decoder" : -1972775883
+  }, {
+    "field" : "componentClickY",
+    "owner" : "client",
+    "name" : "me",
+    "access" : 8,
+    "descriptor" : "I",
+    "decoder" : 1052276727
+  }, {
+    "field" : "componentDragDuration",
+    "owner" : "bu",
+    "name" : "no",
+    "access" : 8,
+    "descriptor" : "I",
+    "decoder" : 2059180753
   }, {
     "field" : "cp1252AsciiExtension",
     "owner" : "kr",
@@ -24071,7 +24259,7 @@
     "access" : 8,
     "descriptor" : "Z"
   }, {
-    "field" : "dragInventoryWidget",
+    "field" : "dragInventoryComponent",
     "owner" : "az",
     "name" : "jf",
     "access" : 8,
@@ -24358,133 +24546,24 @@
     "name" : "a",
     "access" : 9,
     "descriptor" : "[Ldy;"
-  }, {
-    "field" : "indexCache0",
-    "owner" : "ir",
-    "name" : "di",
-    "access" : 8,
-    "descriptor" : "Lit;"
-  }, {
-    "field" : "indexCache1",
-    "owner" : "ek",
-    "name" : "dc",
-    "access" : 8,
-    "descriptor" : "Lit;"
-  }, {
-    "field" : "indexCache10",
-    "owner" : "j",
-    "name" : "dv",
-    "access" : 8,
-    "descriptor" : "Lit;"
-  }, {
-    "field" : "indexCache11",
-    "owner" : "cu",
-    "name" : "do",
-    "access" : 8,
-    "descriptor" : "Lit;"
-  }, {
-    "field" : "indexCache12",
-    "owner" : "cy",
-    "name" : "dh",
-    "access" : 8,
-    "descriptor" : "Lit;"
-  }, {
-    "field" : "indexCache13",
-    "owner" : "gi",
-    "name" : "dz",
-    "access" : 8,
-    "descriptor" : "Lit;"
-  }, {
-    "field" : "indexCache14",
-    "owner" : "q",
-    "name" : "dj",
-    "access" : 8,
-    "descriptor" : "Lit;"
-  }, {
-    "field" : "indexCache15",
-    "owner" : "as",
-    "name" : "du",
-    "access" : 8,
-    "descriptor" : "Lit;"
-  }, {
-    "field" : "indexCache16",
-    "owner" : "c",
-    "name" : "eb",
-    "access" : 8,
-    "descriptor" : "Lit;"
-  }, {
-    "field" : "indexCache2",
-    "owner" : "be",
-    "name" : "dg",
-    "access" : 8,
-    "descriptor" : "Lit;"
-  }, {
-    "field" : "indexCache3",
-    "owner" : "t",
-    "name" : "db",
-    "access" : 8,
-    "descriptor" : "Lit;"
-  }, {
-    "field" : "indexCache4",
-    "owner" : "v",
-    "name" : "dd",
-    "access" : 8,
-    "descriptor" : "Lit;"
-  }, {
-    "field" : "indexCache5",
-    "owner" : "cn",
-    "name" : "dy",
-    "access" : 8,
-    "descriptor" : "Lit;"
-  }, {
-    "field" : "indexCache6",
-    "owner" : "fq",
-    "name" : "dk",
-    "access" : 8,
-    "descriptor" : "Lit;"
-  }, {
-    "field" : "indexCache7",
-    "owner" : "ad",
-    "name" : "dl",
-    "access" : 8,
-    "descriptor" : "Lit;"
-  }, {
-    "field" : "indexCache8",
-    "owner" : "p",
-    "name" : "dr",
-    "access" : 8,
-    "descriptor" : "Lit;"
-  }, {
-    "field" : "indexCache9",
-    "owner" : "il",
-    "name" : "dw",
-    "access" : 8,
-    "descriptor" : "Lit;"
-  }, {
-    "field" : "indexCacheLoaderIndex",
-    "owner" : "client",
-    "name" : "sq",
-    "access" : 8,
-    "descriptor" : "I",
-    "decoder" : -1546210597
-  }, {
-    "field" : "indexCacheLoaders",
-    "owner" : "client",
-    "name" : "sy",
-    "access" : 8,
-    "descriptor" : "Ljava/util/ArrayList;"
-  }, {
-    "field" : "indexStore255",
-    "owner" : "kz",
-    "name" : "sc",
-    "access" : 8,
-    "descriptor" : "Lff;"
   }, {
     "field" : "instanceChunkTemplates",
     "owner" : "client",
     "name" : "gq",
     "access" : 8,
     "descriptor" : "[[[I"
+  }, {
+    "field" : "interfaceComponents",
+    "owner" : "ho",
+    "name" : "g",
+    "access" : 9,
+    "descriptor" : "[[Lho;"
+  }, {
+    "field" : "interfaceParents",
+    "owner" : "client",
+    "name" : "mj",
+    "access" : 8,
+    "descriptor" : "Lld;"
   }, {
     "field" : "isCameraLocked",
     "owner" : "client",
@@ -24492,7 +24571,7 @@
     "access" : 8,
     "descriptor" : "Z"
   }, {
-    "field" : "isDraggingWidget",
+    "field" : "isDraggingComponent",
     "owner" : "client",
     "name" : "ny",
     "access" : 8,
@@ -24630,7 +24709,7 @@
     "access" : 8,
     "descriptor" : "[I"
   }, {
-    "field" : "loadedWidgetGroups",
+    "field" : "loadedInterfaces",
     "owner" : "ho",
     "name" : "l",
     "access" : 9,
@@ -24710,6 +24789,12 @@
     "name" : "gv",
     "access" : 8,
     "descriptor" : "[Llq;"
+  }, {
+    "field" : "masterDisk",
+    "owner" : "kz",
+    "name" : "sc",
+    "access" : 8,
+    "descriptor" : "Lff;"
   }, {
     "field" : "menuActions",
     "owner" : "client",
@@ -24793,13 +24878,6 @@
     "name" : "w",
     "access" : 9,
     "descriptor" : "Lhm;"
-  }, {
-    "field" : "minimapOrientation",
-    "owner" : "client",
-    "name" : "hp",
-    "access" : 8,
-    "descriptor" : "I",
-    "decoder" : -1163038981
   }, {
     "field" : "minimapState",
     "owner" : "client",
@@ -24880,7 +24958,7 @@
     "descriptor" : "I",
     "decoder" : -1628183831
   }, {
-    "field" : "mousedOverWidgetIf1",
+    "field" : "mousedOverComponentIf1",
     "owner" : "fa",
     "name" : "lu",
     "access" : 8,
@@ -24891,13 +24969,6 @@
     "name" : "k",
     "access" : 9,
     "descriptor" : "Lhe;"
-  }, {
-    "field" : "musicTrackArchiveId",
-    "owner" : "ar",
-    "name" : "g",
-    "access" : 9,
-    "descriptor" : "I",
-    "decoder" : -18917723
   }, {
     "field" : "musicTrackBoolean",
     "owner" : "lj",
@@ -24911,6 +24982,13 @@
     "access" : 9,
     "descriptor" : "I",
     "decoder" : -812708185
+  }, {
+    "field" : "musicTrackGroupId",
+    "owner" : "ar",
+    "name" : "g",
+    "access" : 9,
+    "descriptor" : "I",
+    "decoder" : -18917723
   }, {
     "field" : "npcAttackOption",
     "owner" : "client",
@@ -25096,6 +25174,12 @@
     "name" : "kp",
     "access" : 24,
     "descriptor" : "[I"
+  }, {
+    "field" : "playerMod",
+    "owner" : "client",
+    "name" : "mn",
+    "access" : 8,
+    "descriptor" : "Z"
   }, {
     "field" : "players",
     "owner" : "client",
@@ -25205,50 +25289,43 @@
     "descriptor" : "I",
     "decoder" : -787495321
   }, {
-    "field" : "rights",
-    "owner" : "client",
-    "name" : "mw",
-    "access" : 8,
-    "descriptor" : "I",
-    "decoder" : 821563709
-  }, {
-    "field" : "rootWidgetCount",
+    "field" : "rootComponentCount",
     "owner" : "client",
     "name" : "os",
     "access" : 8,
     "descriptor" : "I",
     "decoder" : -546798303
   }, {
-    "field" : "rootWidgetGroup",
-    "owner" : "client",
-    "name" : "mm",
-    "access" : 8,
-    "descriptor" : "I",
-    "decoder" : -783816509
-  }, {
-    "field" : "rootWidgetHeights",
+    "field" : "rootComponentHeights",
     "owner" : "client",
     "name" : "ox",
     "access" : 8,
     "descriptor" : "[I"
   }, {
-    "field" : "rootWidgetWidths",
+    "field" : "rootComponentWidths",
     "owner" : "client",
     "name" : "oj",
     "access" : 8,
     "descriptor" : "[I"
   }, {
-    "field" : "rootWidgetXs",
+    "field" : "rootComponentXs",
     "owner" : "client",
     "name" : "oy",
     "access" : 8,
     "descriptor" : "[I"
   }, {
-    "field" : "rootWidgetYs",
+    "field" : "rootComponentYs",
     "owner" : "client",
     "name" : "oi",
     "access" : 8,
     "descriptor" : "[I"
+  }, {
+    "field" : "rootInterface",
+    "owner" : "client",
+    "name" : "mm",
+    "access" : 8,
+    "descriptor" : "I",
+    "decoder" : -783816509
   }, {
     "field" : "runEnergy",
     "owner" : "client",
@@ -25292,6 +25369,13 @@
     "name" : "eu",
     "access" : 8,
     "descriptor" : "Lcn;"
+  }, {
+    "field" : "selectedItemComponent",
+    "owner" : "ge",
+    "name" : "ix",
+    "access" : 8,
+    "descriptor" : "I",
+    "decoder" : -1645409107
   }, {
     "field" : "selectedItemId",
     "owner" : "cs",
@@ -25312,13 +25396,6 @@
     "access" : 8,
     "descriptor" : "I",
     "decoder" : 1912123225
-  }, {
-    "field" : "selectedItemWidget",
-    "owner" : "ge",
-    "name" : "ix",
-    "access" : 8,
-    "descriptor" : "I",
-    "decoder" : -1645409107
   }, {
     "field" : "selectedSpellActionName",
     "owner" : "client",
@@ -25417,6 +25494,13 @@
     "name" : "em",
     "access" : 8,
     "descriptor" : "Llg;"
+  }, {
+    "field" : "staffModLevel",
+    "owner" : "client",
+    "name" : "mw",
+    "access" : 8,
+    "descriptor" : "I",
+    "decoder" : 821563709
   }, {
     "field" : "studioGame",
     "owner" : "c",
@@ -25490,6 +25574,12 @@
     "name" : "of",
     "access" : 8,
     "descriptor" : "Lch;"
+  }, {
+    "field" : "viewportComponent",
+    "owner" : "client",
+    "name" : "mx",
+    "access" : 8,
+    "descriptor" : "Lho;"
   }, {
     "field" : "viewportDrawCount",
     "owner" : "client",
@@ -25532,12 +25622,6 @@
     "access" : 8,
     "descriptor" : "I",
     "decoder" : -81902865
-  }, {
-    "field" : "viewportWidget",
-    "owner" : "client",
-    "name" : "mx",
-    "access" : 8,
-    "descriptor" : "Lho;"
   }, {
     "field" : "viewportWidth",
     "owner" : "client",
@@ -25571,45 +25655,6 @@
     "access" : 8,
     "descriptor" : "I",
     "decoder" : 36001423
-  }, {
-    "field" : "widgetClickMasks",
-    "owner" : "client",
-    "name" : "on",
-    "access" : 8,
-    "descriptor" : "Lld;"
-  }, {
-    "field" : "widgetClickX",
-    "owner" : "client",
-    "name" : "mt",
-    "access" : 8,
-    "descriptor" : "I",
-    "decoder" : -1972775883
-  }, {
-    "field" : "widgetClickY",
-    "owner" : "client",
-    "name" : "me",
-    "access" : 8,
-    "descriptor" : "I",
-    "decoder" : 1052276727
-  }, {
-    "field" : "widgetDragDuration",
-    "owner" : "bu",
-    "name" : "no",
-    "access" : 8,
-    "descriptor" : "I",
-    "decoder" : 2059180753
-  }, {
-    "field" : "widgetGroupParents",
-    "owner" : "client",
-    "name" : "mj",
-    "access" : 8,
-    "descriptor" : "Lld;"
-  }, {
-    "field" : "widgets",
-    "owner" : "ho",
-    "name" : "g",
-    "access" : 9,
-    "descriptor" : "[[Lho;"
   }, {
     "field" : "worldHost",
     "owner" : "af",
@@ -26291,12 +26336,6 @@
     "name" : "jl",
     "access" : 8,
     "descriptor" : "Z"
-  }, {
-    "field" : "__client_mn",
-    "owner" : "client",
-    "name" : "mn",
-    "access" : 8,
-    "descriptor" : "Z"
   }, {
     "field" : "__client_nn",
     "owner" : "client",
@@ -26523,13 +26562,6 @@
     "access" : 8,
     "descriptor" : "I",
     "decoder" : -516933613
-  }, {
-    "field" : "__client_ho",
-    "owner" : "client",
-    "name" : "ho",
-    "access" : 8,
-    "descriptor" : "I",
-    "decoder" : 1005832199
   }, {
     "field" : "__client_hr",
     "owner" : "client",
@@ -26558,13 +26590,6 @@
     "access" : 8,
     "descriptor" : "I",
     "decoder" : 218086227
-  }, {
-    "field" : "__client_hw",
-    "owner" : "client",
-    "name" : "hw",
-    "access" : 8,
-    "descriptor" : "I",
-    "decoder" : 410614005
   }, {
     "field" : "__client_hx",
     "owner" : "client",
@@ -31733,25 +31758,25 @@
     "parameters" : [ "player", "b" ],
     "descriptor" : "(Lbr;ZI)V"
   }, {
-    "method" : "alignWidget",
+    "method" : "alignComponent",
     "owner" : "client",
     "name" : "ip",
     "access" : 0,
-    "parameters" : [ "widget" ],
+    "parameters" : [ "component" ],
     "descriptor" : "(Lho;B)V"
   }, {
-    "method" : "alignWidgetPosition",
+    "method" : "alignComponentPosition",
     "owner" : "jf",
     "name" : "iw",
     "access" : 8,
-    "parameters" : [ "widget", "parentWidth", "parentHeight" ],
+    "parameters" : [ "component", "parentWidth", "parentHeight" ],
     "descriptor" : "(Lho;IIB)V"
   }, {
-    "method" : "alignWidgetSize",
+    "method" : "alignComponentSize",
     "owner" : "p",
     "name" : "ic",
     "access" : 8,
-    "parameters" : [ "widget", "parentWidth", "parentHeight", "b" ],
+    "parameters" : [ "component", "parentWidth", "parentHeight", "b" ],
     "descriptor" : "(Lho;IIZB)V"
   }, {
     "method" : "byteArrayFromObject",
@@ -31781,14 +31806,14 @@
     "access" : 9,
     "descriptor" : "([III)V"
   }, {
-    "method" : "clickWidget",
+    "method" : "clickComponent",
     "owner" : "cq",
     "name" : "jf",
     "access" : 24,
-    "parameters" : [ "widget", "x", "y" ],
+    "parameters" : [ "component", "x", "y" ],
     "descriptor" : "(Lho;III)V"
   }, {
-    "method" : "closeWidgetGroup",
+    "method" : "closeInterface",
     "owner" : "cs",
     "name" : "jd",
     "access" : 24,
@@ -31876,6 +31901,12 @@
     "access" : 24,
     "parameters" : [ "actor", "a", "b", "c", "d", "e" ],
     "descriptor" : "(Lbz;IIIIIB)V"
+  }, {
+    "method" : "drawInterface",
+    "owner" : "az",
+    "name" : "ir",
+    "access" : 24,
+    "descriptor" : "([Lho;IIIIIIIII)V"
   }, {
     "method" : "drawLoadingMessage",
     "owner" : "bi",
@@ -31895,12 +31926,6 @@
     "name" : "x",
     "access" : 8,
     "descriptor" : "(Lkk;Lkk;Lkk;I)V"
-  }, {
-    "method" : "drawWidgetGroup",
-    "owner" : "az",
-    "name" : "ir",
-    "access" : 24,
-    "descriptor" : "([Lho;IIIIIIIII)V"
   }, {
     "method" : "encodeStringCp1252",
     "owner" : "dt",
@@ -31922,6 +31947,19 @@
     "access" : 9,
     "parameters" : [ "values", "ordinal" ],
     "descriptor" : "([Lgc;II)Lgc;"
+  }, {
+    "method" : "getComponentChild",
+    "owner" : "gx",
+    "name" : "f",
+    "access" : 9,
+    "descriptor" : "(III)Lho;"
+  }, {
+    "method" : "getComponentClickMask",
+    "owner" : "f",
+    "name" : "kp",
+    "access" : 8,
+    "parameters" : [ "component" ],
+    "descriptor" : "(Lho;I)I"
   }, {
     "method" : "getFrames",
     "owner" : "bc",
@@ -31930,12 +31968,19 @@
     "parameters" : [ "id" ],
     "descriptor" : "(II)Len;"
   }, {
-    "method" : "getHitSplatDefinition",
+    "method" : "getHitmarkDefinition",
     "owner" : "bp",
     "name" : "f",
     "access" : 9,
     "parameters" : [ "id" ],
     "descriptor" : "(II)Ljm;"
+  }, {
+    "method" : "getInterfaceComponent",
+    "owner" : "gd",
+    "name" : "m",
+    "access" : 9,
+    "parameters" : [ "id" ],
+    "descriptor" : "(IB)Lho;"
   }, {
     "method" : "getItemDefinition",
     "owner" : "hc",
@@ -31971,7 +32016,7 @@
     "parameters" : [ "id" ],
     "descriptor" : "(II)Ljr;"
   }, {
-    "method" : "getParamKeyDefinition",
+    "method" : "getParamDefinition",
     "owner" : "hz",
     "name" : "m",
     "access" : 9,
@@ -32008,26 +32053,6 @@
     "access" : 9,
     "parameters" : [ "id" ],
     "descriptor" : "(II)I"
-  }, {
-    "method" : "getWidget",
-    "owner" : "gd",
-    "name" : "m",
-    "access" : 9,
-    "parameters" : [ "id" ],
-    "descriptor" : "(IB)Lho;"
-  }, {
-    "method" : "getWidgetChild",
-    "owner" : "gx",
-    "name" : "f",
-    "access" : 9,
-    "descriptor" : "(III)Lho;"
-  }, {
-    "method" : "getWidgetClickMask",
-    "owner" : "f",
-    "name" : "kp",
-    "access" : 8,
-    "parameters" : [ "widget" ],
-    "descriptor" : "(Lho;I)I"
   }, {
     "method" : "getWorldMapElement",
     "owner" : "dm",
@@ -32084,6 +32109,13 @@
     "access" : 8,
     "parameters" : [ "descriptor" ],
     "descriptor" : "(Ljava/lang/String;I)Ljava/lang/Class;"
+  }, {
+    "method" : "loadInterface",
+    "owner" : "dr",
+    "name" : "q",
+    "access" : 9,
+    "parameters" : [ "itf" ],
+    "descriptor" : "(IB)Z"
   }, {
     "method" : "loadRegions",
     "owner" : "af",
@@ -32098,13 +32130,6 @@
     "access" : 24,
     "parameters" : [ "buffer", "plane", "x", "y", "x0", "y0", "n" ],
     "descriptor" : "(Lgr;IIIIIIB)V"
-  }, {
-    "method" : "loadWidgetGroup",
-    "owner" : "dr",
-    "name" : "q",
-    "access" : 9,
-    "parameters" : [ "widgetGroup" ],
-    "descriptor" : "(IB)Z"
   }, {
     "method" : "loadWorlds",
     "owner" : "ji",
@@ -32120,7 +32145,7 @@
     "parameters" : [ "argument1", "argument2", "opcode", "argument0", "action", "targetName", "mouseX", "mouseY" ],
     "descriptor" : "(IIIILjava/lang/String;Ljava/lang/String;III)V"
   }, {
-    "method" : "newIndexCache",
+    "method" : "newArchive",
     "owner" : "c",
     "name" : "fw",
     "access" : 8,
@@ -32168,7 +32193,7 @@
     "owner" : "le",
     "name" : "m",
     "access" : 9,
-    "parameters" : [ "indexCache", "index", "record" ],
+    "parameters" : [ "archive", "group", "file" ],
     "descriptor" : "(Lir;III)Lln;"
   }, {
     "method" : "readStringIntParameters",
@@ -32194,7 +32219,7 @@
     "owner" : "il",
     "name" : "im",
     "access" : 24,
-    "parameters" : [ "widget" ],
+    "parameters" : [ "component" ],
     "descriptor" : "(Lho;I)Z"
   }, {
     "method" : "runScript",
@@ -32210,12 +32235,6 @@
     "access" : 8,
     "parameters" : [ "scriptEvent", "n" ],
     "descriptor" : "(Lby;II)V"
-  }, {
-    "method" : "sendStackTrace",
-    "owner" : "jz",
-    "name" : "m",
-    "access" : 9,
-    "descriptor" : "(Ljava/lang/String;Ljava/lang/Throwable;I)V"
   }, {
     "method" : "setUp",
     "owner" : "client",
@@ -32243,19 +32262,19 @@
     "access" : 8,
     "parameters" : [ "gameState" ],
     "descriptor" : "(IB)V"
+  }, {
+    "method" : "updateInterface",
+    "owner" : "il",
+    "name" : "jr",
+    "access" : 24,
+    "parameters" : [ "components", "parentId", "a", "b", "c", "d", "x", "y" ],
+    "descriptor" : "([Lho;IIIIIIII)V"
   }, {
     "method" : "updatePlayer",
     "owner" : "k",
     "name" : "m",
     "access" : 24,
     "descriptor" : "(Lhx;B)V"
-  }, {
-    "method" : "updateWidgetGroup",
-    "owner" : "il",
-    "name" : "jr",
-    "access" : 24,
-    "parameters" : [ "widgets", "parentId", "a", "b", "c", "d", "x", "y" ],
-    "descriptor" : "([Lho;IIIIIIII)V"
   }, {
     "method" : "username",
     "owner" : "client",
diff --git a/http-api/pom.xml b/http-api/pom.xml
index ccd886a376..b797107a20 100644
--- a/http-api/pom.xml
+++ b/http-api/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.28-SNAPSHOT</version>
+		<version>1.5.29-SNAPSHOT</version>
 	</parent>
 
 	<name>Web API</name>
diff --git a/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java b/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java
index de2b1d469c..1bca0032cb 100644
--- a/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java
+++ b/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java
@@ -103,8 +103,8 @@ public class RuneLiteAPI
 
 		CLIENT = new OkHttpClient.Builder()
 			.pingInterval(30, TimeUnit.SECONDS)
-			.connectTimeout(5655, TimeUnit.MILLISECONDS)
-			.writeTimeout(5655, TimeUnit.MILLISECONDS)
+			.connectTimeout(8655, TimeUnit.MILLISECONDS)
+			.writeTimeout(8655, TimeUnit.MILLISECONDS)
 			.addNetworkInterceptor(new Interceptor()
 			{
 				@Override
diff --git a/http-service/pom.xml b/http-service/pom.xml
index 3a532c422f..7435193988 100644
--- a/http-service/pom.xml
+++ b/http-service/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.28-SNAPSHOT</version>
+		<version>1.5.29-SNAPSHOT</version>
 	</parent>
 
 	<name>Web Service</name>
diff --git a/injected-client/pom.xml b/injected-client/pom.xml
index 474adda69b..02899fa99b 100644
--- a/injected-client/pom.xml
+++ b/injected-client/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.28-SNAPSHOT</version>
+		<version>1.5.29-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>injected-client</artifactId>
diff --git a/injector-plugin/pom.xml b/injector-plugin/pom.xml
index a80ce1afb3..46c1477263 100644
--- a/injector-plugin/pom.xml
+++ b/injector-plugin/pom.xml
@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.28-SNAPSHOT</version>
+		<version>1.5.29-SNAPSHOT</version>
 	</parent>
 
 	<groupId>net.runelite.rs</groupId>
diff --git a/injector-plugin/src/main/java/net/runelite/injector/InjectHookMethod.java b/injector-plugin/src/main/java/net/runelite/injector/InjectHookMethod.java
index be654e127d..3c304807be 100644
--- a/injector-plugin/src/main/java/net/runelite/injector/InjectHookMethod.java
+++ b/injector-plugin/src/main/java/net/runelite/injector/InjectHookMethod.java
@@ -33,6 +33,7 @@ import net.runelite.asm.ClassGroup;
 import net.runelite.asm.Method;
 import net.runelite.asm.Type;
 import net.runelite.asm.attributes.Annotations;
+import net.runelite.asm.attributes.Code;
 import net.runelite.asm.attributes.annotation.Annotation;
 import net.runelite.asm.attributes.code.Instruction;
 import net.runelite.asm.attributes.code.InstructionType;
@@ -89,9 +90,9 @@ public class InjectHookMethod
 			obfuscatedClassName = DeobAnnotations.getObfuscatedName(cf.getAnnotations());
 
 		// might be a constructor
-		if (obfuscatedMethodName == null && method.getName().equals("<init>"))
+		if (obfuscatedMethodName == null)
 		{
-			obfuscatedMethodName = "<init>";
+			obfuscatedMethodName = method.getName();
 		}
 
 		assert obfuscatedClassName != null : "hook on method in class with no obfuscated name";
@@ -110,7 +111,12 @@ public class InjectHookMethod
 
 	private void injectHookMethod(Method hookMethod, String hookName, boolean end, Method deobMethod, Method vanillaMethod, boolean useHooks) throws InjectionException
 	{
-		Instructions instructions = vanillaMethod.getCode().getInstructions();
+		Code code = vanillaMethod.getCode();
+		if (code == null)
+		{
+			logger.warn(vanillaMethod + " code is null");
+		}
+		Instructions instructions = code.getInstructions();
 
 		Signature.Builder builder = new Signature.Builder()
 			.setReturnType(Type.VOID); // Hooks always return void
diff --git a/injector-plugin/src/main/java/net/runelite/injector/InjectUtil.java b/injector-plugin/src/main/java/net/runelite/injector/InjectUtil.java
index e00b76428a..1f0275110c 100644
--- a/injector-plugin/src/main/java/net/runelite/injector/InjectUtil.java
+++ b/injector-plugin/src/main/java/net/runelite/injector/InjectUtil.java
@@ -27,6 +27,33 @@ public class InjectUtil
 
 	public static Method findMethod(Inject inject, String name) throws InjectionException
 	{
+		return findMethod(inject, name, null);
+	}
+
+	public static Method findMethod(Inject inject, String name, String hint) throws InjectionException
+	{
+		if (hint != null)
+		{
+			ClassFile c = inject.getDeobfuscated().findClass(hint);
+
+			if (c == null)
+			{
+				throw new InjectionException("Class " + hint + " doesn't exist. (check capitalization)");
+			}
+
+			Method deob = c.findMethod(name);
+
+			if (deob != null)
+			{
+				String obfuscatedName = DeobAnnotations.getObfuscatedName(deob.getAnnotations());
+				Signature obfuscatedSignature = DeobAnnotations.getObfuscatedSignature(deob);
+
+				ClassFile ob = inject.toObClass(c);
+
+				return ob.findMethod(obfuscatedName, (obfuscatedSignature != null) ? obfuscatedSignature : deob.getDescriptor());
+			}
+		}
+
 		for (ClassFile c : inject.getDeobfuscated().getClasses())
 		{
 			for (Method m : c.getMethods())
diff --git a/injector-plugin/src/main/java/net/runelite/injector/raw/DrawAfterWidgets.java b/injector-plugin/src/main/java/net/runelite/injector/raw/DrawAfterWidgets.java
index e2250b894e..5b6f6fbd50 100644
--- a/injector-plugin/src/main/java/net/runelite/injector/raw/DrawAfterWidgets.java
+++ b/injector-plugin/src/main/java/net/runelite/injector/raw/DrawAfterWidgets.java
@@ -76,8 +76,8 @@ public class DrawAfterWidgets
 
 		   @Export("drawLoggedIn")
 		   final void drawLoggedIn() {
-		      if(rootWidgetGroup != -1) {
-		         ClientPreferences.method1809(rootWidgetGroup);
+		      if(rootInterface != -1) {
+		         ClientPreferences.method1809(rootInterface);
 		      }
 
 		      int var1;
@@ -94,9 +94,9 @@ public class DrawAfterWidgets
 		      __client_lq = -1;
 		      __client_ln = -1;
 		      UserComparator6.__fg_jh = null;
-		      if(rootWidgetGroup != -1) {
+		      if(rootInterface != -1) {
 		         rootWidgetCount = 0;
-		         Interpreter.method1977(rootWidgetGroup, 0, 0, SoundCache.canvasWidth, Huffman.canvasHeight, 0, 0, -1);
+		         Interpreter.method1977(rootInterface, 0, 0, SoundCache.canvasWidth, Huffman.canvasHeight, 0, 0, -1);
 		      }
 
 				< --  here appearantly
diff --git a/injector-plugin/src/main/java/net/runelite/injector/raw/HidePlayerAttacks.java b/injector-plugin/src/main/java/net/runelite/injector/raw/HidePlayerAttacks.java
index 249d1e4774..e4160e7519 100644
--- a/injector-plugin/src/main/java/net/runelite/injector/raw/HidePlayerAttacks.java
+++ b/injector-plugin/src/main/java/net/runelite/injector/raw/HidePlayerAttacks.java
@@ -2,6 +2,7 @@ package net.runelite.injector.raw;
 
 import com.google.common.base.Stopwatch;
 import java.util.Iterator;
+import java.util.ListIterator;
 import net.runelite.asm.Method;
 import net.runelite.asm.attributes.code.Instruction;
 import net.runelite.asm.attributes.code.Instructions;
@@ -9,9 +10,12 @@ import net.runelite.asm.attributes.code.Label;
 import net.runelite.asm.attributes.code.instruction.types.ComparisonInstruction;
 import net.runelite.asm.attributes.code.instruction.types.JumpingInstruction;
 import net.runelite.asm.attributes.code.instructions.ALoad;
+import net.runelite.asm.attributes.code.instructions.BiPush;
 import net.runelite.asm.attributes.code.instructions.GetStatic;
+import net.runelite.asm.attributes.code.instructions.IAnd;
 import net.runelite.asm.attributes.code.instructions.IfACmpEq;
 import net.runelite.asm.attributes.code.instructions.IfACmpNe;
+import net.runelite.asm.attributes.code.instructions.IfICmpNe;
 import net.runelite.asm.attributes.code.instructions.IfNe;
 import net.runelite.asm.attributes.code.instructions.InvokeStatic;
 import net.runelite.asm.pool.Field;
@@ -31,14 +35,28 @@ public class HidePlayerAttacks
 		this.inject = inject;
 	}
 
+	private Method addPlayerOptions;
+	private net.runelite.asm.pool.Method shouldHideAttackOptionFor;
+
 	public void inject() throws InjectionException
 	{
 		Stopwatch stopwatch = Stopwatch.createStarted();
 
-		final Method addPlayerOptions = InjectUtil.findStaticMethod(inject, "addPlayerToMenu");
+		addPlayerOptions = InjectUtil.findStaticMethod(inject, "addPlayerToMenu");
+		shouldHideAttackOptionFor = inject.getVanilla().findClass("client").findMethod("shouldHideAttackOptionFor").getPoolMethod();
+
+		injectHideAttack();
+		injectHideCast();
+
+		stopwatch.stop();
+
+		log.info("HidePlayerAttacks took {}", stopwatch.toString());
+	}
+
+	private void injectHideAttack() throws InjectionException
+	{
 		final Field AttackOption_hidden = InjectUtil.findDeobField(inject, "AttackOption_hidden", "AttackOption").getPoolField();
 		final Field attackOption = InjectUtil.findDeobField(inject, "playerAttackOption", "Client").getPoolField();
-		final net.runelite.asm.pool.Method shouldHideAttackOptionFor = inject.getVanilla().findClass("client").findMethod("shouldHideAttackOptionFor").getPoolMethod();
 
 		// GETSTATIC					GETSTATIC
 		// GETSTATIC					GETSTATIC
@@ -123,9 +141,65 @@ public class HidePlayerAttacks
 		IfNe i3 = new IfNe(ins, label);
 
 		ins.addInstruction(injectIdx, i3);
+	}
 
-		stopwatch.stop();
+	private void injectHideCast() throws InjectionException
+	{
+		// LABEL before
+		// BIPUSH 8
+		// LDC (garbage)
+		// GETSTATIC selectedSpellFlags
+		// IMUL
+		// BIPUSH 8
+		// IAND
+		// IF_ICMPNE -> skip adding option
+		//
+		// <--- Inject call here
+		// <--- Inject comparison here (duh)
+		//
+		// add option n such
 
-		log.info("HidePlayerAttacks took {}", stopwatch.toString());
+		Instructions ins = addPlayerOptions.getCode().getInstructions();
+		ListIterator<Instruction> iterator = ins.getInstructions().listIterator();
+		while (iterator.hasNext())
+		{
+			Instruction i = iterator.next();
+			if (!(i instanceof BiPush) || (byte) ((BiPush) i).getConstant() != 8)
+			{
+				continue;
+			}
+
+			i = iterator.next();
+			while (!(i instanceof BiPush) || (byte) ((BiPush) i).getConstant() != 8)
+			{
+				i = iterator.next();
+			}
+
+			i = iterator.next();
+			if (!(i instanceof IAnd))
+			{
+				throw new InjectionException("Yikes I didn't expect this");
+			}
+
+			i = iterator.next();
+			if (!(i instanceof IfICmpNe))
+			{
+				throw new InjectionException("Yikes I didn't expect this");
+			}
+
+			Label target = ((IfICmpNe) i).getJumps().get(0);
+
+			// Load the player
+			ALoad i1 = new ALoad(ins, 0);
+			// Get the boolean
+			InvokeStatic i2 = new InvokeStatic(ins, shouldHideAttackOptionFor);
+			// Compare n such
+			IfNe i3 = new IfNe(ins, target);
+
+			iterator.add(i1);
+			iterator.add(i2);
+			iterator.add(i3);
+			return;
+		}
 	}
 }
diff --git a/injector-plugin/src/main/java/net/runelite/injector/raw/RenderDraw.java b/injector-plugin/src/main/java/net/runelite/injector/raw/RenderDraw.java
index 25cccfc653..6bebd6ccb1 100644
--- a/injector-plugin/src/main/java/net/runelite/injector/raw/RenderDraw.java
+++ b/injector-plugin/src/main/java/net/runelite/injector/raw/RenderDraw.java
@@ -36,7 +36,7 @@ public class RenderDraw
 		Stopwatch stopwatch = Stopwatch.createStarted();
 
 		net.runelite.asm.Method obmethod = findMethod(inject, "drawTile");
-		Method renderDraw = findMethod(inject, "renderDraw").getPoolMethod();
+		Method renderDraw = findMethod(inject, "draw", "Entity").getPoolMethod();
 
 		Instructions ins = obmethod.getCode().getInstructions();
 		replace(ins, renderDraw);
@@ -69,7 +69,7 @@ public class RenderDraw
 		}
 		else if (count != 21)
 		{
-			log.warn("Found {} renderDraws while 21 were expected. Rev update?", count);
+			log.warn("Found {} draws while 21 were expected. Rev update?", count);
 		}
 		else
 		{
diff --git a/bootstrap.json b/live/bootstrap.json
similarity index 90%
rename from bootstrap.json
rename to live/bootstrap.json
index 2052530dbe..1745408e52 100644
--- a/bootstrap.json
+++ b/live/bootstrap.json
@@ -1,5 +1,5 @@
 {
-  "buildCommit": "2d0c2b8eb66a8088b41b29d42ec2a58ead460581",
+  "buildCommit": "b82c8903c64695d44b255d45b449440e4eaa17ef",
   "artifacts": [
     {
       "hash": "b12331da8683e5f107d294adeebb83ecf9124abc1db533554d2a8d3c62832d75",
@@ -20,10 +20,10 @@
       "size": "3168921"
     },
     {
-      "hash": "4c388a85fb538bbb8cb6e0fd93e0ba0666605123d77b976764818be6f090bbe5",
-      "name": "client-1.5.28-SNAPSHOT.jar",
-      "path": "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/client-1.5.28-SNAPSHOT.jar",
-      "size": "5871886"
+      "hash": "bc9ad97e68f88e53d6e5844a5b02e8b874cb7f0bbdd08a99c4529caf9148e99f",
+      "name": "client-1.5.29-SNAPSHOT.jar",
+      "path": "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/client-1.5.29-SNAPSHOT.jar",
+      "size": "6018354"
     },
     {
       "hash": "18c4a0095d5c1da6b817592e767bb23d29dd2f560ad74df75ff3961dbde25b79",
@@ -212,22 +212,22 @@
       "size": "2327547"
     },
     {
-      "hash": "440c629bec3905eb21dc5965fa38464f160a4cb8f87ca76806cdecc18b2c5992",
-      "name": "runelite-api-1.5.28-SNAPSHOT.jar",
-      "path": "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/runelite-api-1.5.28-SNAPSHOT.jar",
-      "size": "1019717"
+      "hash": "aa603ad557917ad4c14f0683195c481e84760e2c12cf7564f4ad9a22f66fe9d6",
+      "name": "runelite-api-1.5.29-SNAPSHOT.jar",
+      "path": "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/runelite-api-1.5.29-SNAPSHOT.jar",
+      "size": "1027726"
     },
     {
-      "hash": "45e3bcec9e7bae4ca2facd0fbee1f3da5e0700584e8419deed784a95255552c1",
-      "name": "runescape-api-1.5.28-SNAPSHOT.jar",
-      "path": "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/runescape-api-1.5.28-SNAPSHOT.jar",
-      "size": "56079"
+      "hash": "051f8c8fb6dfbcdf35c6b266bf4dddbfb1eca44ea3e5319b622dda57a83b0eea",
+      "name": "runescape-api-1.5.29-SNAPSHOT.jar",
+      "path": "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/runescape-api-1.5.29-SNAPSHOT.jar",
+      "size": "58029"
     },
     {
-      "hash": "811aadce9ce35ac638712da86123d4cb99570a9550614931471295cb26f91c36",
-      "name": "http-api-1.5.28-SNAPSHOT.jar",
-      "path": "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/http-api-1.5.28-SNAPSHOT.jar",
-      "size": "101785"
+      "hash": "9084498c38d640206ec099578ec21f0e52ff1afab5d77580e12e27f59b9987c8",
+      "name": "http-api-1.5.29-SNAPSHOT.jar",
+      "path": "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/http-api-1.5.29-SNAPSHOT.jar",
+      "size": "115763"
     },
     {
       "hash": "f55abda036da75e1af45bd43b9dfa79b2a3d90905be9cb38687c6621597a8165",
@@ -254,10 +254,10 @@
       "size": "617294"
     },
     {
-      "hash": "a3cab9293960d1d61968ce1591c87859ddcaa6cb2faca554cc938961c8fb3d3a",
-      "name": "injected-client-1.5.28-SNAPSHOT.jar",
-      "path": "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/injected-client-1.5.28-SNAPSHOT.jar",
-      "size": "2193046"
+      "hash": "48bfa99ac87f3c3b8d555efd2ac3a84f636e8f9fd282284f87df77cd9feacfa6",
+      "name": "injected-client-1.5.29-SNAPSHOT.jar",
+      "path": "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/injected-client-1.5.29-SNAPSHOT.jar",
+      "size": "2196574"
     }
   ],
   "client": {
diff --git a/pom.xml b/pom.xml
index 6a3fe52405..d9a35dbab6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 
 	<groupId>net.runelite</groupId>
 	<artifactId>runelite-parent</artifactId>
-	<version>1.5.28-SNAPSHOT</version>
+	<version>1.5.29-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>RuneLite</name>
@@ -37,6 +37,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<maven.compiler.useIncrementalCompilation>false</maven.compiler.useIncrementalCompilation>
 		<java.version>1.8</java.version>
 		<lombok.version>1.18.4</lombok.version>
 		<checkstyle.version>8.3</checkstyle.version>
@@ -53,7 +54,7 @@
 		<zlika.reproducible.build.maven.plugin.version>0.7</zlika.reproducible.build.maven.plugin.version>
 
 		<maven.jar.plugin.version>3.0.2</maven.jar.plugin.version>
-		<maven.compiler.plugin.version>3.6.1</maven.compiler.plugin.version>
+		<maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
 		<maven.checkstyle.plugin.version>2.17</maven.checkstyle.plugin.version>
 		<maven.javadoc.plugin.version>3.0.0-M1</maven.javadoc.plugin.version>
 		<maven.release.plugin.version>2.5.3</maven.release.plugin.version>
diff --git a/protocol-api/pom.xml b/protocol-api/pom.xml
index cb85d612f9..ea06134acf 100644
--- a/protocol-api/pom.xml
+++ b/protocol-api/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.28-SNAPSHOT</version>
+		<version>1.5.29-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>protocol-api</artifactId>
diff --git a/protocol/pom.xml b/protocol/pom.xml
index 1e03da9e36..8e504698b7 100644
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.28-SNAPSHOT</version>
+		<version>1.5.29-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>protocol</artifactId>
diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml
index bfcbf4c4a7..36f337646e 100644
--- a/runelite-api/pom.xml
+++ b/runelite-api/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.28-SNAPSHOT</version>
+		<version>1.5.29-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>runelite-api</artifactId>
diff --git a/runelite-api/src/main/java/net/runelite/api/AnimationID.java b/runelite-api/src/main/java/net/runelite/api/AnimationID.java
index 45ce683b6e..07a2f68ce6 100644
--- a/runelite-api/src/main/java/net/runelite/api/AnimationID.java
+++ b/runelite-api/src/main/java/net/runelite/api/AnimationID.java
@@ -164,6 +164,7 @@ public final class AnimationID
 	public static final int BLOCK_SHIELD = 1156;
 	public static final int BLOCK_SWORD = 388;
 	public static final int BLOCK_UNARMED = 424; // Same Animation as failed pickpocked
+	public static final int DRAGONFIRE_SHIELD_SPECIAL = 6696;
 
 	// NPC animations
 	public static final int TZTOK_JAD_RANGE_ATTACK = 2652;
@@ -312,4 +313,11 @@ public final class AnimationID
 	public static final int DAG_REX = 2853;
 	public static final int DAG_PRIME = 2854;
 	public static final int DAG_SUPREME = 2855;
+
+	// Lizardman shaman
+	public static final int LIZARDMAN_SHAMAN_SPAWN = 2855;
+
+	// Combat counter
+	public static final int BARRAGE_ANIMATION = 1979;
+	public static final int CHIN_ANIMATION = 7618;
 }
\ No newline at end of file
diff --git a/runelite-api/src/main/java/net/runelite/api/Client.java b/runelite-api/src/main/java/net/runelite/api/Client.java
index 3be392090f..ab4ee7f15b 100644
--- a/runelite-api/src/main/java/net/runelite/api/Client.java
+++ b/runelite-api/src/main/java/net/runelite/api/Client.java
@@ -29,6 +29,7 @@ import java.awt.Dimension;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import javax.annotation.Nullable;
 import net.runelite.api.coords.LocalPoint;
 import net.runelite.api.coords.WorldPoint;
@@ -1661,12 +1662,22 @@ public interface Client extends GameShell
 	
 	String getSelectedSpellName();
 	
-	boolean getIsSpellSelected();
+	boolean isSpellSelected();
 
 	/**
 	 * Set whether or not player attack options will be hidden for clanmembers/friends
 	 */
 	void setHideFriendAttackOptions(boolean yes);
+
+	/**
+	 * Set whether or not player cast options will be hidden for clanmembers/friends
+	 */
+	void setHideFriendCastOptions(boolean yes);
+
+	/**
+	 * Set spells excluded from above hiding
+	 */
+	void setUnhiddenCasts(Set<String> casts);
 	
 	/**
 	 * Sorts the current menu entries in the same way the client does this.
@@ -1674,4 +1685,13 @@ public interface Client extends GameShell
 	 */
 	void sortMenuEntries();
 
+	/**
+	 * Add player to friendlist
+	 */
+	void addFriend(String name);
+
+	/**
+	 * Remove player from friendlist
+	 */
+	void removeFriend(String name);
 }
diff --git a/runelite-api/src/main/java/net/runelite/api/GameState.java b/runelite-api/src/main/java/net/runelite/api/GameState.java
index 5f9083f9ca..6a61fcfe59 100644
--- a/runelite-api/src/main/java/net/runelite/api/GameState.java
+++ b/runelite-api/src/main/java/net/runelite/api/GameState.java
@@ -24,6 +24,11 @@
  */
 package net.runelite.api;
 
+import java.util.Arrays;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
 /**
  * An enumeration of game states the client is in.
  */
@@ -66,6 +71,10 @@ public enum GameState
 	 */
 	HOPPING(45);
 
+	private static final Map<Integer, GameState> stateValueMap =
+		Arrays.stream(GameState.values())
+			.collect(Collectors.toMap(gs -> gs.state, Function.identity()));
+
 	/**
 	 * The raw state value.
 	 */
@@ -85,13 +94,6 @@ public enum GameState
 	 */
 	public static GameState of(int state)
 	{
-		for (GameState gs : GameState.values())
-		{
-			if (gs.state == state)
-			{
-				return gs;
-			}
-		}
-		return UNKNOWN;
+		return stateValueMap.getOrDefault(state, UNKNOWN);
 	}
 }
diff --git a/runelite-api/src/main/java/net/runelite/api/ItemID.java b/runelite-api/src/main/java/net/runelite/api/ItemID.java
index ab3252792a..3624f65804 100644
--- a/runelite-api/src/main/java/net/runelite/api/ItemID.java
+++ b/runelite-api/src/main/java/net/runelite/api/ItemID.java
@@ -10821,5 +10821,21 @@ public final class ItemID
 	public static final int HEALER_ICON_23486 = 23486;
 	public static final int WINE_OF_ZAMORAK_23489 = 23489;
 	public static final int LARRANS_KEY = 23490;
+	public static final int SRARACHA = 23495;
+	public static final int TEMPLE_COIN = 23497;
+	public static final int GRUBBY_KEY = 23499;
+	public static final int TEMPLE_KEY = 23502;
+	public static final int TOME_OF_THE_MOON = 23504;
+	public static final int TOME_OF_THE_SUN = 23506;
+	public static final int TOME_OF_THE_TEMPLE = 23508;
+	public static final int TATTERED_MOON_PAGE = 23510;
+	public static final int TATTERED_SUN_PAGE = 23512;
+	public static final int TATTERED_TEMPLE_PAGE = 23514;
+	public static final int LAMP_OF_KNOWLEDGE = 23516;
+	public static final int GIANT_EGG_SACFULL = 23517;
+	public static final int GIANT_EGG_SAC = 23520;
+	public static final int MASK_OF_RANUL = 23522;
+	public static final int JAR_OF_EYES = 23525;
+	public static final int SARACHNIS_CUDGEL = 23528;
 	/* This file is automatically generated. Do not edit. */
 }
diff --git a/runelite-api/src/main/java/net/runelite/api/NpcID.java b/runelite-api/src/main/java/net/runelite/api/NpcID.java
index 1288a33ba7..e23906bb98 100644
--- a/runelite-api/src/main/java/net/runelite/api/NpcID.java
+++ b/runelite-api/src/main/java/net/runelite/api/NpcID.java
@@ -1992,9 +1992,9 @@ public final class NpcID
 	public static final int CYCLOPS_2140 = 2140;
 	public static final int CYCLOPS_2141 = 2141;
 	public static final int CYCLOPS_2142 = 2142;
-	public static final int GIANT_FROG_2143 = 2143;
-	public static final int BIG_FROG_2144 = 2144;
-	public static final int FROG_2145 = 2145;
+	public static final int SRARACHA = 2143;
+	public static final int SRARACHA_2144 = 2144;
+	public static final int UNDEAD_DRUID = 2145;
 	public static final int FISHING_SPOT_2146 = 2146;
 	public static final int VEOS = 2147;
 	public static final int GRAND_EXCHANGE_CLERK = 2148;
@@ -7866,5 +7866,21 @@ public final class NpcID
 	public static final int LEKE_QUO_KERAN = 8697;
 	public static final int MONK_OF_ZAMORAK_8698 = 8698;
 	public static final int LARRAN = 8699;
+	public static final int GIANT_FROG_8700 = 8700;
+	public static final int BIG_FROG_8701 = 8701;
+	public static final int FROG_8702 = 8702;
+	public static final int TEMPLE_SPIDER = 8703;
+	public static final int BROTHER_AIMERI = 8704;
+	public static final int BROTHER_AIMERI_8705 = 8705;
+	public static final int OLBERTUS = 8706;
+	public static final int OLBERTUS_8707 = 8707;
+	public static final int OLBERTUS_8708 = 8708;
+	public static final int SHAEDED_BEAST = 8709;
+	public static final int SHAEDED_BEAST_8710 = 8710;
+	public static final int EODAN = 8711;
+	public static final int KNIGHT_OF_VARLAMORE_8712 = 8712;
+	public static final int SARACHNIS = 8713;
+	public static final int SPAWN_OF_SARACHNIS = 8714;
+	public static final int SPAWN_OF_SARACHNIS_8715 = 8715;
 	/* This file is automatically generated. Do not edit. */
 }
diff --git a/runelite-api/src/main/java/net/runelite/api/NullItemID.java b/runelite-api/src/main/java/net/runelite/api/NullItemID.java
index f31d40f26e..d2d9315362 100644
--- a/runelite-api/src/main/java/net/runelite/api/NullItemID.java
+++ b/runelite-api/src/main/java/net/runelite/api/NullItemID.java
@@ -12463,5 +12463,25 @@ public final class NullItemID
 	public static final int NULL_23492 = 23492;
 	public static final int NULL_23493 = 23493;
 	public static final int NULL_23494 = 23494;
+	public static final int NULL_23496 = 23496;
+	public static final int NULL_23498 = 23498;
+	public static final int NULL_23500 = 23500;
+	public static final int NULL_23501 = 23501;
+	public static final int NULL_23503 = 23503;
+	public static final int NULL_23505 = 23505;
+	public static final int NULL_23507 = 23507;
+	public static final int NULL_23509 = 23509;
+	public static final int NULL_23511 = 23511;
+	public static final int NULL_23513 = 23513;
+	public static final int NULL_23515 = 23515;
+	public static final int NULL_23518 = 23518;
+	public static final int NULL_23519 = 23519;
+	public static final int NULL_23521 = 23521;
+	public static final int NULL_23523 = 23523;
+	public static final int NULL_23524 = 23524;
+	public static final int NULL_23526 = 23526;
+	public static final int NULL_23527 = 23527;
+	public static final int NULL_23529 = 23529;
+	public static final int NULL_23530 = 23530;
 	/* This file is automatically generated. Do not edit. */
 }
diff --git a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java
index 103bf0143c..1cd637ed47 100644
--- a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java
+++ b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java
@@ -16211,5 +16211,33 @@ public final class NullObjectID
 	public static final int NULL_34825 = 34825;
 	public static final int NULL_34831 = 34831;
 	public static final int NULL_34832 = 34832;
+	public static final int NULL_34841 = 34841;
+	public static final int NULL_34869 = 34869;
+	public static final int NULL_34875 = 34875;
+	public static final int NULL_34876 = 34876;
+	public static final int NULL_34877 = 34877;
+	public static final int NULL_34878 = 34878;
+	public static final int NULL_34879 = 34879;
+	public static final int NULL_34880 = 34880;
+	public static final int NULL_34881 = 34881;
+	public static final int NULL_34882 = 34882;
+	public static final int NULL_34883 = 34883;
+	public static final int NULL_34884 = 34884;
+	public static final int NULL_34885 = 34885;
+	public static final int NULL_34886 = 34886;
+	public static final int NULL_34887 = 34887;
+	public static final int NULL_34888 = 34888;
+	public static final int NULL_34889 = 34889;
+	public static final int NULL_34890 = 34890;
+	public static final int NULL_34891 = 34891;
+	public static final int NULL_34892 = 34892;
+	public static final int NULL_34893 = 34893;
+	public static final int NULL_34894 = 34894;
+	public static final int NULL_34895 = 34895;
+	public static final int NULL_34900 = 34900;
+	public static final int NULL_34901 = 34901;
+	public static final int NULL_34902 = 34902;
+	public static final int NULL_34903 = 34903;
+	public static final int NULL_34904 = 34904;
 	/* This file is automatically generated. Do not edit. */
 }
diff --git a/runelite-api/src/main/java/net/runelite/api/ObjectID.java b/runelite-api/src/main/java/net/runelite/api/ObjectID.java
index 9d5ee32bfb..248591ae09 100644
--- a/runelite-api/src/main/java/net/runelite/api/ObjectID.java
+++ b/runelite-api/src/main/java/net/runelite/api/ObjectID.java
@@ -15241,11 +15241,11 @@ public final class ObjectID
 	public static final int ROCKS_28890 = 28890;
 	public static final int CRACK_28892 = 28892;
 	public static final int STONE_28893 = 28893;
-	public static final int ROPE_LADDER_28894 = 28894;
-	public static final int ROPE_28895 = 28895;
-	public static final int ROPE_28896 = 28896;
-	public static final int ROPE_28897 = 28897;
-	public static final int ROPE_28898 = 28898;
+	public static final int VINE_LADDER = 28894;
+	public static final int VINE_28895 = 28895;
+	public static final int VINE_28896 = 28896;
+	public static final int VINE_28897 = 28897;
+	public static final int VINE_28898 = 28898;
 	public static final int ALTAR_28900 = 28900;
 	public static final int BOULDER_28901 = 28901;
 	public static final int BOULDER_28904 = 28904;
@@ -16846,7 +16846,7 @@ public final class ObjectID
 	public static final int ROCK_31787 = 31787;
 	public static final int ROCK_31788 = 31788;
 	public static final int ROCK_31789 = 31789;
-	public static final int VINE_LADDER = 31790;
+	public static final int VINE_LADDER_31790 = 31790;
 	public static final int HOLE_31791 = 31791;
 	public static final int ROOTS_31792 = 31792;
 	public static final int ROOT_31796 = 31796;
@@ -18610,5 +18610,49 @@ public final class ObjectID
 	public static final int LARRANS_SMALL_CHEST_34828 = 34828;
 	public static final int LARRANS_BIG_CHEST = 34829;
 	public static final int LARRANS_BIG_CHEST_34830 = 34830;
+	public static final int SARACHNIS_DISPLAY = 34833;
+	public static final int STRANGE_FLOOR_34834 = 34834;
+	public static final int ANCIENT_FIRE = 34835;
+	public static final int CURSED_ALTAR = 34836;
+	public static final int ALTAR_34837 = 34837;
+	public static final int GRUBBY_CHEST = 34838;
+	public static final int GRUBBY_CHEST_34839 = 34839;
+	public static final int GRUBBY_DOOR = 34840;
+	public static final int TEMPLE_DOOR_34842 = 34842;
+	public static final int TEMPLE_DOOR_34843 = 34843;
+	public static final int DOOR_34844 = 34844;
+	public static final int LEVER_34845 = 34845;
+	public static final int LEVER_34846 = 34846;
+	public static final int MUSTY_BOOKSHELF = 34847;
+	public static final int MUSTY_BOOKSHELF_34848 = 34848;
+	public static final int MUSTY_BOOKSHELF_34849 = 34849;
+	public static final int MUSTY_BOOKSHELF_34850 = 34850;
+	public static final int STONE_RELIEF = 34851;
+	public static final int STONE_RELIEF_34852 = 34852;
+	public static final int PASSAGE_34853 = 34853;
+	public static final int WALL_34854 = 34854;
+	public static final int SACRED_BONE_BURNER = 34855;
+	public static final int TORCH_34856 = 34856;
+	public static final int DRAGON_EGG_34857 = 34857;
+	public static final int THICK_WEB = 34858;
+	public static final int THICK_WEB_34859 = 34859;
+	public static final int STRANGE_PASSAGE = 34860;
+	public static final int STRANGE_WALL_34861 = 34861;
+	public static final int LADDER_34862 = 34862;
+	public static final int LADDER_34863 = 34863;
+	public static final int STAIRCASE_34864 = 34864;
+	public static final int STAIRCASE_34865 = 34865;
+	public static final int CAULDRON_34866 = 34866;
+	public static final int EGG_SAC = 34867;
+	public static final int EMPTY_SAC = 34868;
+	public static final int STONE_PILE_34870 = 34870;
+	public static final int STONE_PILE_34871 = 34871;
+	public static final int BROKEN_SUN_ALTAR = 34872;
+	public static final int EMPTY_SARCOPHAGUS = 34873;
+	public static final int FLOOR_TILE = 34874;
+	public static final int BLOOD_34896 = 34896;
+	public static final int WEB_34897 = 34897;
+	public static final int WEB_34898 = 34898;
+	public static final int SLASHED_WEB_34899 = 34899;
 	/* This file is automatically generated. Do not edit. */
 }
diff --git a/runelite-api/src/main/java/net/runelite/api/Perspective.java b/runelite-api/src/main/java/net/runelite/api/Perspective.java
index 4d3f312386..4c08e65bf1 100644
--- a/runelite-api/src/main/java/net/runelite/api/Perspective.java
+++ b/runelite-api/src/main/java/net/runelite/api/Perspective.java
@@ -24,6 +24,7 @@
  */
 package net.runelite.api;
 
+import java.awt.geom.Path2D;
 import static net.runelite.api.Constants.TILE_FLAG_BRIDGE;
 import java.awt.FontMetrics;
 import java.awt.Graphics2D;
@@ -316,12 +317,6 @@ public class Perspective
 		final int neX = localLocation.getX() + (size * LOCAL_TILE_SIZE / 2);
 		final int neY = localLocation.getY() + (size * LOCAL_TILE_SIZE / 2);
 
-		final int seX = swX;
-		final int seY = neY;
-
-		final int nwX = neX;
-		final int nwY = swY;
-
 		final byte[][][] tileSettings = client.getTileSettings();
 
 		final int sceneX = localLocation.getSceneX();
@@ -339,14 +334,14 @@ public class Perspective
 		}
 
 		final int swHeight = getHeight(client, swX, swY, tilePlane);
-		final int nwHeight = getHeight(client, nwX, nwY, tilePlane);
+		final int nwHeight = getHeight(client, neX, swY, tilePlane);
 		final int neHeight = getHeight(client, neX, neY, tilePlane);
-		final int seHeight = getHeight(client, seX, seY, tilePlane);
+		final int seHeight = getHeight(client, swX, neY, tilePlane);
 
 		Point p1 = localToCanvas(client, swX, swY, swHeight);
-		Point p2 = localToCanvas(client, nwX, nwY, nwHeight);
+		Point p2 = localToCanvas(client, neX, swY, nwHeight);
 		Point p3 = localToCanvas(client, neX, neY, neHeight);
-		Point p4 = localToCanvas(client, seX, seY, seHeight);
+		Point p4 = localToCanvas(client, swX, neY, seHeight);
 
 		if (p1 == null || p2 == null || p3 == null || p4 == null)
 		{
@@ -549,7 +544,7 @@ public class Perspective
 	)
 	{
 		int radius = 5;
-		Area geometry = new Area();
+		Path2D.Double geometry = new Path2D.Double();
 
 		final int tileHeight = getTileHeight(client, point, client.getPlane());
 
@@ -607,10 +602,10 @@ public class Perspective
 				continue;
 			}
 
-			geometry.add(new Area(clickableRect));
+			geometry.append(clickableRect, false);
 		}
 
-		return geometry;
+		return new Area(geometry);
 	}
 
 	private static Area getAABB(
diff --git a/runelite-api/src/main/java/net/runelite/api/Point.java b/runelite-api/src/main/java/net/runelite/api/Point.java
index 1c97a43666..a4aa342983 100644
--- a/runelite-api/src/main/java/net/runelite/api/Point.java
+++ b/runelite-api/src/main/java/net/runelite/api/Point.java
@@ -104,10 +104,6 @@ public class Point
 		{
 			return false;
 		}
-		if (this.y != other.y)
-		{
-			return false;
-		}
-		return true;
+		return this.y == other.y;
 	}
 }
diff --git a/runelite-api/src/main/java/net/runelite/api/ScriptID.java b/runelite-api/src/main/java/net/runelite/api/ScriptID.java
index 62acbe1454..70076e3a6d 100644
--- a/runelite-api/src/main/java/net/runelite/api/ScriptID.java
+++ b/runelite-api/src/main/java/net/runelite/api/ScriptID.java
@@ -94,11 +94,6 @@ public final class ScriptID
 	 * Builds the chatbox input widget
 	 */
 	public static final int CHAT_PROMPT_INIT = 223;
-	
-	/**
-	 * Joins the corresponding minigame chat
-	 */
-	public static final int FORCE_JOIN_CC = 437;
 
 	/**
 	 * Displays the game messages when clicking on an item inside the Items Kept on Death interface
@@ -200,4 +195,14 @@ public final class ScriptID
 	 * Join a clan, duh
 	 */
 	public static final int CUSTOM_JOIN_CLAN = 10690;
+
+	/**
+	 * Send a public message
+	 */
+	public static final int PUBLICMSG = 13337;
+
+	/**
+	 * Clicking bank pin buttons runs this
+	 */
+	public static final int BANK_PIN_OP = 685;
 }
\ No newline at end of file
diff --git a/runelite-api/src/main/java/net/runelite/api/Varbits.java b/runelite-api/src/main/java/net/runelite/api/Varbits.java
index 1d6709bc0a..5afca13486 100644
--- a/runelite-api/src/main/java/net/runelite/api/Varbits.java
+++ b/runelite-api/src/main/java/net/runelite/api/Varbits.java
@@ -651,7 +651,9 @@ public enum Varbits
 	/**
 	 * POH Building mode (1 = yes, 0 = no)
 	 */
-	BUILDING_MODE(2176);
+	BUILDING_MODE(2176),
+
+	WINTERTODT_TIMER(7980);
 
 	/**
 	 * The raw varbit ID.
diff --git a/runelite-api/src/main/java/net/runelite/api/coords/WorldArea.java b/runelite-api/src/main/java/net/runelite/api/coords/WorldArea.java
index 7156045eb8..7a12a730fd 100644
--- a/runelite-api/src/main/java/net/runelite/api/coords/WorldArea.java
+++ b/runelite-api/src/main/java/net/runelite/api/coords/WorldArea.java
@@ -271,8 +271,16 @@ public class WorldArea
 
 		LocalPoint lp = LocalPoint.fromWorld(client, x, y);
 
-		int startX = lp.getSceneX() + dx;
-		int startY = lp.getSceneY() + dy;
+		int startX = 0;
+		if (lp != null)
+		{
+			startX = lp.getSceneX() + dx;
+		}
+		int startY = 0;
+		if (lp != null)
+		{
+			startY = lp.getSceneY() + dy;
+		}
 		int checkX = startX + (dx > 0 ? width - 1 : 0);
 		int checkY = startY + (dy > 0 ? height - 1 : 0);
 		int endX = startX + width - 1;
@@ -427,11 +435,8 @@ public class WorldArea
 			}
 			if (height == 1)
 			{
-				if ((collisionDataFlags[checkX - dx][checkY] & yFlags) != 0 &&
-					extraCondition.test(WorldPoint.fromScene(client, startX, checkY, client.getPlane())))
-				{
-					return false;
-				}
+				return (collisionDataFlags[checkX - dx][checkY] & yFlags) == 0 ||
+					!extraCondition.test(WorldPoint.fromScene(client, startX, checkY, client.getPlane()));
 			}
 		}
 
diff --git a/runelite-api/src/main/java/net/runelite/api/coords/WorldPoint.java b/runelite-api/src/main/java/net/runelite/api/coords/WorldPoint.java
index fb1291273a..2882367c36 100644
--- a/runelite-api/src/main/java/net/runelite/api/coords/WorldPoint.java
+++ b/runelite-api/src/main/java/net/runelite/api/coords/WorldPoint.java
@@ -370,16 +370,12 @@ public class WorldPoint
 	 */
 	public static boolean isInZone(WorldPoint lowerBound, WorldPoint upperBound, WorldPoint userLocation)
 	{
-		if (userLocation.getX() < lowerBound.getX()
-				|| userLocation.getX() > upperBound.getX()
-				|| userLocation.getY() < lowerBound.getY()
-				|| userLocation.getY() > upperBound.getY()
-				|| userLocation.getPlane() < lowerBound.getPlane()
-				|| userLocation.getPlane() > upperBound.getPlane())
-		{
-			return false;
-		}
-		return true;
+		return userLocation.getX() >= lowerBound.getX()
+			&& userLocation.getX() <= upperBound.getX()
+			&& userLocation.getY() >= lowerBound.getY()
+			&& userLocation.getY() <= upperBound.getY()
+			&& userLocation.getPlane() >= lowerBound.getPlane()
+			&& userLocation.getPlane() <= upperBound.getPlane();
 	}
 
 	/**
diff --git a/runelite-api/src/main/java/net/runelite/api/events/BeforeRender.java b/runelite-api/src/main/java/net/runelite/api/events/BeforeRender.java
index 741041e1e0..73c004d4b3 100644
--- a/runelite-api/src/main/java/net/runelite/api/events/BeforeRender.java
+++ b/runelite-api/src/main/java/net/runelite/api/events/BeforeRender.java
@@ -29,4 +29,10 @@ package net.runelite.api.events;
  */
 public class BeforeRender
 {
+	public static final BeforeRender INSTANCE = new BeforeRender();
+
+	private BeforeRender()
+	{
+		// noop
+	}
 }
diff --git a/runelite-api/src/main/java/net/runelite/api/events/CannonballFired.java b/runelite-api/src/main/java/net/runelite/api/events/CannonballFired.java
index 077a88096d..c44789965a 100644
--- a/runelite-api/src/main/java/net/runelite/api/events/CannonballFired.java
+++ b/runelite-api/src/main/java/net/runelite/api/events/CannonballFired.java
@@ -29,4 +29,10 @@ package net.runelite.api.events;
  */
 public class CannonballFired
 {
+	public static final CannonballFired INSTANCE = new CannonballFired();
+
+	private CannonballFired()
+	{
+		// noop
+	}
 }
diff --git a/runelite-api/src/main/java/net/runelite/api/events/CanvasSizeChanged.java b/runelite-api/src/main/java/net/runelite/api/events/CanvasSizeChanged.java
index e76e82dd6d..0efef18d0d 100644
--- a/runelite-api/src/main/java/net/runelite/api/events/CanvasSizeChanged.java
+++ b/runelite-api/src/main/java/net/runelite/api/events/CanvasSizeChanged.java
@@ -29,4 +29,10 @@ package net.runelite.api.events;
  */
 public class CanvasSizeChanged
 {
+	public static final CanvasSizeChanged INSTANCE = new CanvasSizeChanged();
+
+	private CanvasSizeChanged()
+	{
+		// noop
+	}
 }
diff --git a/runelite-api/src/main/java/net/runelite/api/events/ClientTick.java b/runelite-api/src/main/java/net/runelite/api/events/ClientTick.java
index 369ff7982a..6874f4145c 100644
--- a/runelite-api/src/main/java/net/runelite/api/events/ClientTick.java
+++ b/runelite-api/src/main/java/net/runelite/api/events/ClientTick.java
@@ -29,4 +29,10 @@ package net.runelite.api.events;
  */
 public class ClientTick
 {
+	public static final ClientTick INSTANCE = new ClientTick();
+
+	private ClientTick()
+	{
+		// noop
+	}
 }
diff --git a/runelite-api/src/main/java/net/runelite/api/events/DynamicObjectAnimationChanged.java b/runelite-api/src/main/java/net/runelite/api/events/DynamicObjectAnimationChanged.java
new file mode 100644
index 0000000000..1e4571e4fe
--- /dev/null
+++ b/runelite-api/src/main/java/net/runelite/api/events/DynamicObjectAnimationChanged.java
@@ -0,0 +1,16 @@
+package net.runelite.api.events;
+
+import lombok.Data;
+
+@Data
+public class DynamicObjectAnimationChanged
+{
+	/**
+	 * The object that has entered a new animation.
+	 */
+	private int object;
+	/**
+	 * The id of the animation animation.
+	 */
+	private int animation;
+}
diff --git a/runelite-api/src/main/java/net/runelite/api/events/FriendAdded.java b/runelite-api/src/main/java/net/runelite/api/events/FriendAdded.java
new file mode 100644
index 0000000000..76b60e3681
--- /dev/null
+++ b/runelite-api/src/main/java/net/runelite/api/events/FriendAdded.java
@@ -0,0 +1,15 @@
+package net.runelite.api.events;
+
+import lombok.Value;
+
+/**
+ * An event where a request to add a friend is sent to the server.
+ */
+@Value
+public class FriendAdded
+{
+	/**
+	 * The name of the added friend.
+	 */
+	private final String name;
+}
diff --git a/runelite-api/src/main/java/net/runelite/api/events/RemovedFriend.java b/runelite-api/src/main/java/net/runelite/api/events/FriendRemoved.java
similarity index 98%
rename from runelite-api/src/main/java/net/runelite/api/events/RemovedFriend.java
rename to runelite-api/src/main/java/net/runelite/api/events/FriendRemoved.java
index c60cd13c33..2b9c641b3c 100644
--- a/runelite-api/src/main/java/net/runelite/api/events/RemovedFriend.java
+++ b/runelite-api/src/main/java/net/runelite/api/events/FriendRemoved.java
@@ -30,7 +30,7 @@ import lombok.Value;
  * An event where a request to remove a friend is sent to the server.
  */
 @Value
-public class RemovedFriend
+public class FriendRemoved
 {
 	/**
 	 * The name of the removed friend.
diff --git a/runelite-api/src/main/java/net/runelite/api/events/GameTick.java b/runelite-api/src/main/java/net/runelite/api/events/GameTick.java
index aefa7fc3e4..2bf035633d 100644
--- a/runelite-api/src/main/java/net/runelite/api/events/GameTick.java
+++ b/runelite-api/src/main/java/net/runelite/api/events/GameTick.java
@@ -24,8 +24,6 @@
  */
 package net.runelite.api.events;
 
-import lombok.Data;
-
 // The NPC update event seem to run every server tick,
 // but having the game tick event after all packets
 // have been processed is typically more useful.
@@ -43,7 +41,12 @@ import lombok.Data;
  * Note that occurrences that take place purely on the client, such as right
  * click menus, are independent of the game tick.
  */
-@Data
 public class GameTick
 {
+	public static final GameTick INSTANCE = new GameTick();
+
+	private GameTick()
+	{
+		// noop
+	}
 }
diff --git a/runelite-api/src/main/java/net/runelite/api/events/LocalPlayerDeath.java b/runelite-api/src/main/java/net/runelite/api/events/LocalPlayerDeath.java
index e46b815f49..0cf8f33c76 100644
--- a/runelite-api/src/main/java/net/runelite/api/events/LocalPlayerDeath.java
+++ b/runelite-api/src/main/java/net/runelite/api/events/LocalPlayerDeath.java
@@ -29,4 +29,10 @@ package net.runelite.api.events;
  */
 public class LocalPlayerDeath
 {
+	public static final LocalPlayerDeath INSTANCE = new LocalPlayerDeath();
+
+	private LocalPlayerDeath()
+	{
+		// noop
+	}
 }
diff --git a/runelite-api/src/main/java/net/runelite/api/events/MenuOptionClicked.java b/runelite-api/src/main/java/net/runelite/api/events/MenuOptionClicked.java
index 2180458228..848beb4b84 100644
--- a/runelite-api/src/main/java/net/runelite/api/events/MenuOptionClicked.java
+++ b/runelite-api/src/main/java/net/runelite/api/events/MenuOptionClicked.java
@@ -24,7 +24,9 @@
  */
 package net.runelite.api.events;
 
+import lombok.AccessLevel;
 import lombok.Data;
+import lombok.Setter;
 import net.runelite.api.MenuAction;
 import net.runelite.api.MenuEntry;
 
@@ -45,6 +47,13 @@ public class MenuOptionClicked
 	public MenuOptionClicked(MenuEntry entry)
 	{
 		menuEntry = entry;
+		authentic = true;
+	}
+
+	public MenuOptionClicked(MenuEntry entry, boolean authentic)
+	{
+		menuEntry = entry;
+		this.authentic = authentic;
 	}
 
 	/**
@@ -129,4 +138,10 @@ public class MenuOptionClicked
 	{
 		this.consumed = true;
 	}
+
+	/**
+	 * Whether or not the event is authentic.
+	 */
+	@Setter(AccessLevel.PRIVATE)
+	private boolean authentic;
 }
diff --git a/runelite-api/src/main/java/net/runelite/api/events/UsernameChanged.java b/runelite-api/src/main/java/net/runelite/api/events/UsernameChanged.java
index 91bed8a304..3dea001150 100644
--- a/runelite-api/src/main/java/net/runelite/api/events/UsernameChanged.java
+++ b/runelite-api/src/main/java/net/runelite/api/events/UsernameChanged.java
@@ -32,4 +32,10 @@ package net.runelite.api.events;
  */
 public class UsernameChanged
 {
+	public static final UsernameChanged INSTANCE = new UsernameChanged();
+
+	private UsernameChanged()
+	{
+		// noop
+	}
 }
diff --git a/runelite-api/src/main/java/net/runelite/api/events/WidgetPositioned.java b/runelite-api/src/main/java/net/runelite/api/events/WidgetPositioned.java
index d5479e3485..6f58e9fe07 100644
--- a/runelite-api/src/main/java/net/runelite/api/events/WidgetPositioned.java
+++ b/runelite-api/src/main/java/net/runelite/api/events/WidgetPositioned.java
@@ -24,13 +24,16 @@
  */
 package net.runelite.api.events;
 
-import lombok.Value;
-
 /**
  * An event where the position of a {@link net.runelite.api.widgets.Widget}
  * relative to its parent has changed.
  */
-@Value
 public class WidgetPositioned
 {
+	public static final WidgetPositioned INSTANCE = new WidgetPositioned();
+
+	private WidgetPositioned()
+	{
+		// noop
+	}
 }
diff --git a/runelite-api/src/main/java/net/runelite/api/events/WidgetPressed.java b/runelite-api/src/main/java/net/runelite/api/events/WidgetPressed.java
new file mode 100644
index 0000000000..12ee089c80
--- /dev/null
+++ b/runelite-api/src/main/java/net/runelite/api/events/WidgetPressed.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2019, 7ate9 <https://github.com/se7enAte9>
+ * Copyright (c) 2019, https://runelitepl.us
+ * 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.api.events;
+
+import lombok.Data;
+
+/**
+ * An event where a draggable widget has been pressed.
+ */
+@Data
+public class WidgetPressed
+{
+	public static final WidgetPressed INSTANCE = new WidgetPressed();
+
+	private WidgetPressed()
+	{
+		// noop
+	}
+}
diff --git a/runelite-api/src/main/java/net/runelite/api/model/Jarvis.java b/runelite-api/src/main/java/net/runelite/api/model/Jarvis.java
index d71fe38b51..5435470c37 100644
--- a/runelite-api/src/main/java/net/runelite/api/model/Jarvis.java
+++ b/runelite-api/src/main/java/net/runelite/api/model/Jarvis.java
@@ -125,8 +125,7 @@ public class Jarvis
 
 	private static long crossProduct(Point p, Point q, Point r)
 	{
-		long val = (long)(q.getY() - p.getY()) * (r.getX() - q.getX())
+		return (long)(q.getY() - p.getY()) * (r.getX() - q.getX())
 			- (long)(q.getX() - p.getX()) * (r.getY() - q.getY());
-		return val;
 	}
 }
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 931004b869..510c19532d 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
@@ -151,6 +151,7 @@ public class WidgetID
 	public static final int BEGINNER_CLUE_MAP_WIZARDS_TOWER = 356;
 	public static final int SEED_BOX_GROUP_ID = 128;
 	public static final int ITEMS_KEPT_ON_DEATH_GROUP_ID = 4;
+	public static final int TRADING_SCREEN = 335;
 
 	static class WorldMap
 	{
@@ -253,6 +254,7 @@ public class WidgetID
 		static final int INVENTORY_ITEM_CONTAINER = 3;
 		static final int BANK_TITLE_BAR = 4;
 		static final int CONTENT_CONTAINER = 10;
+		static final int TAB_CONTAINER = 11;
 		static final int ITEM_CONTAINER = 13;
 		static final int SEARCH_BUTTON_BACKGROUND = 40;
 		static final int DEPOSIT_INVENTORY = 42;
@@ -665,6 +667,7 @@ public class WidgetID
 
 	static class TheatreOfBlood
 	{
+		static final int RAIDING_PARTY = 9;
 		static final int ORB_BOX = 10;
 		static final int BOSS_HEALTH_BAR = 35;
 	}
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 99fa691985..755b710d57 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
@@ -140,6 +140,7 @@ public enum WidgetInfo
 	BANK_CONTENT_CONTAINER(WidgetID.BANK_GROUP_ID, WidgetID.Bank.CONTENT_CONTAINER),
 	BANK_DEPOSIT_EQUIPMENT(WidgetID.BANK_GROUP_ID, WidgetID.Bank.DEPOSIT_EQUIPMENT),
 	BANK_DEPOSIT_INVENTORY(WidgetID.BANK_GROUP_ID, WidgetID.Bank.DEPOSIT_INVENTORY),
+	BANK_TAB_CONTAINER(WidgetID.BANK_GROUP_ID, WidgetID.Bank.TAB_CONTAINER),
 
 	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),
@@ -444,6 +445,7 @@ public enum WidgetInfo
 
 	THEATRE_OF_BLOOD_HEALTH_ORBS(WidgetID.THEATRE_OF_BLOOD_GROUP_ID, WidgetID.TheatreOfBlood.ORB_BOX),
 	THEATRE_OF_BLOOD_BOSS_HEALTH(WidgetID.THEATRE_OF_BLOOD_GROUP_ID, WidgetID.TheatreOfBlood.BOSS_HEALTH_BAR),
+	THEATRE_OF_BLOOD_RAIDING_PARTY(WidgetID.THEATRE_OF_BLOOD_GROUP_ID, WidgetID.TheatreOfBlood.RAIDING_PARTY),
 
 	BLAST_FURNACE_COFFER(WidgetID.BLAST_FURNACE_GROUP_ID, 2),
 
@@ -513,7 +515,7 @@ public enum WidgetInfo
 	PVP_KILLDEATH_COUNTER(WidgetID.PVP_GROUP_ID, WidgetID.Pvp.KILLDEATH_RATIO),
 
 	SPELLBOOK_FILTERED_BOUNDS(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.FILTERED_SPELLS_BOUNDS),
-	
+
 /* STANDARD SPELL BOOK WIDGETS*/
 	SPELL_LUMBRIDGE_HOME_TELEPORT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.LUMBRIDGE_HOME_TELEPORT),
 	SPELL_WIND_STRIKE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.WIND_STRIKE),
@@ -529,7 +531,7 @@ public enum WidgetInfo
 	SPELL_CURSE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.CURSE),
 	SPELL_BIND(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.BIND),
 	SPELL_LOW_LEVEL_ALCHEMY(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.LOW_LEVEL_ALCHEMY),
-	SPELL_WATER_BOLT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.WATER_BOLT),	
+	SPELL_WATER_BOLT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.WATER_BOLT),
 	SPELL_VARROCK_TELEPORT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.VARROCK_TELEPORT),
 	SPELL_LVL_2_ENCHANT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.LVL_2_ENCHANT),
 	SPELL_EARTH_BOLT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.EARTH_BOLT),
@@ -544,7 +546,7 @@ public enum WidgetInfo
 	SPELL_CAMELOT_TELEPORT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.CAMELOT_TELEPORT),
 	SPELL_WATER_BLAST(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.WATER_BLAST),
 	SPELL_LVL_3_ENCHANT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.LVL_3_ENCHANT),
-	SPELL_IBAN_BLAST(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.IBAN_BLAST),	
+	SPELL_IBAN_BLAST(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.IBAN_BLAST),
 	SPELL_SNARE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.SNARE),
 	SPELL_MAGIC_DART(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.MAGIC_DART),
 	SPELL_ARDOUGNE_TELEPORT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.ARDOUGNE_TELEPORT),
@@ -561,7 +563,7 @@ public enum WidgetInfo
 	SPELL_FLAMES_OF_ZAMORAK(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.FLAMES_OF_ZAMORAK),
 	SPELL_TROLLHEIM_TELEPORT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.TROLLHEIM_TELEPORT),
 	SPELL_WIND_WAVE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.WIND_WAVE),
-	SPELL_CHARGE_FIRE_ORB(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.CHARGE_FIRE_ORB),	
+	SPELL_CHARGE_FIRE_ORB(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.CHARGE_FIRE_ORB),
 	SPELL_TELEPORT_TO_APE_ATOLL(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.TELEPORT_TO_APE_ATOLL),
 	SPELL_WATER_WAVE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.WATER_WAVE),
 	SPELL_CHARGE_AIR_ORB(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.CHARGE_AIR_ORB),
@@ -579,14 +581,14 @@ public enum WidgetInfo
 	SPELL_TELEOTHER_FALADOR(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.TELEOTHER_FALADOR),
 	SPELL_WATER_SURGE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.WATER_SURGE),
 	SPELL_TELE_BLOCK(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.TELE_BLOCK),
-	SPELL_LVL_6_ENCHANT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.LVL_6_ENCHANT),	
+	SPELL_LVL_6_ENCHANT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.LVL_6_ENCHANT),
 	SPELL_TELEOTHER_CAMELOT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.TELEOTHER_CAMELOT),
 	SPELL_EARTH_SURGE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.EARTH_SURGE),
 	SPELL_LVL_7_ENCHANT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.LVL_7_ENCHANT),
 	SPELL_FIRE_SURGE(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.FIRE_SURGE),
 	SPELL_BOUNTY_TARGET_TELEPORT2(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.BOUNTY_TARGET_TELEPORT),
 /* END OF STANDARD SPELL BOOK WIDGETS*/
-	
+
 	/* ANCIENT SPELL BOOK WIDGETS*/
 	SPELL_ICE_RUSH(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.ICE_RUSH),
 	SPELL_ICE_BLITZ(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.SpellBook.ICE_BLITZ),
@@ -687,7 +689,7 @@ public enum WidgetInfo
 	QUESTLIST_FREE_CONTAINER(WidgetID.QUESTLIST_GROUP_ID, WidgetID.QuestList.FREE_CONTAINER),
 	QUESTLIST_MEMBERS_CONTAINER(WidgetID.QUESTLIST_GROUP_ID, WidgetID.QuestList.MEMBERS_CONTAINER),
 	QUESTLIST_MINIQUEST_CONTAINER(WidgetID.QUESTLIST_GROUP_ID, WidgetID.QuestList.MINIQUEST_CONTAINER),
-	
+
 	MUSICTAB_INTERFACE(WidgetID.MUSICTAB_GROUP_ID, 1),
 	MUSICTAB_SONG_BOX(WidgetID.MUSICTAB_GROUP_ID, 2),
 	MUSICTAB_ALL_SONGS(WidgetID.MUSICTAB_GROUP_ID, 3),
diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetType.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetType.java
index 9d140c3cd0..cec850036f 100644
--- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetType.java
+++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetType.java
@@ -35,4 +35,10 @@ public final class WidgetType
 	public static final int TEXT_INVENTORY = 7;
 	public static final int IF1_TOOLTIP = 8;
 	public static final int LINE = 9;
+	public static final int FPS = 1336;
+	public static final int VIEWPORT = 1337;
+	public static final int MINIMAP = 1338;
+	public static final int COMPASS = 1339;
+	public static final int WORLD_MAP = 1400;
+	public static final int WORLD_MAP_OVERVIEW = 1401;
 }
diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml
index 98b1c9529c..bf9d9ef83d 100644
--- a/runelite-client/pom.xml
+++ b/runelite-client/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.28-SNAPSHOT</version>
+		<version>1.5.29-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>client</artifactId>
@@ -284,11 +284,12 @@
 			<artifactId>asm-all</artifactId>
 			<version>6.0_BETA</version>
 		</dependency>
-		<dependency>
-			<groupId>org.json</groupId>
-			<artifactId>json</artifactId>
-			<version>20180813</version>
-		</dependency>
+        <dependency>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-utils</artifactId>
+            <version>3.0.21</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 	<build>
diff --git a/runelite-client/src/main/java/net/runelite/client/RuneLite.java b/runelite-client/src/main/java/net/runelite/client/RuneLite.java
index f4626b10a0..7acdecb815 100644
--- a/runelite-client/src/main/java/net/runelite/client/RuneLite.java
+++ b/runelite-client/src/main/java/net/runelite/client/RuneLite.java
@@ -83,13 +83,13 @@ import org.slf4j.LoggerFactory;
 @Slf4j
 public class RuneLite
 {
-	public static final String RUNELIT_VERSION = "2.0.1-1";
+	public static final String RUNELIT_VERSION = "2.0.2";
 	public static final File RUNELITE_DIR = new File(System.getProperty("user.home"), ".runelite");
 	public static final File PROFILES_DIR = new File(RUNELITE_DIR, "profiles");
 	public static final File PLUGIN_DIR = new File(RUNELITE_DIR, "plugins");
 	public static final File SCREENSHOT_DIR = new File(RUNELITE_DIR, "screenshots");
-	static final RuneLiteSplashScreen splashScreen = new RuneLiteSplashScreen();
-
+	public static final File LOGS_DIR = new File(RUNELITE_DIR, "logs");
+	private static final RuneLiteSplashScreen splashScreen = new RuneLiteSplashScreen();
 
 	@Getter
 	private static Injector injector;
diff --git a/runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java b/runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java
index af5e7e2631..ee8486811b 100644
--- a/runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java
+++ b/runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java
@@ -41,6 +41,7 @@ import net.runelite.client.chat.ChatMessageManager;
 import net.runelite.client.config.ChatColorConfig;
 import net.runelite.client.config.ConfigManager;
 import net.runelite.client.config.RuneLiteConfig;
+import net.runelite.client.config.RuneLitePlusConfig;
 import net.runelite.client.eventbus.EventBus;
 import net.runelite.client.game.ItemManager;
 import net.runelite.client.menus.MenuManager;
@@ -117,6 +118,13 @@ public class RuneLiteModule extends AbstractModule
 		return configManager.getConfig(RuneLiteConfig.class);
 	}
 
+	@Provides
+	@Singleton
+	RuneLitePlusConfig providePlusConfig(ConfigManager configManager)
+	{
+		return configManager.getConfig(RuneLitePlusConfig.class);
+	}
+
 	@Provides
 	@Singleton
 	ChatColorConfig provideChatColorConfig(ConfigManager configManager)
diff --git a/runelite-client/src/main/java/net/runelite/client/RuneLiteProperties.java b/runelite-client/src/main/java/net/runelite/client/RuneLiteProperties.java
index f5b5c56da0..1fd40987ad 100644
--- a/runelite-client/src/main/java/net/runelite/client/RuneLiteProperties.java
+++ b/runelite-client/src/main/java/net/runelite/client/RuneLiteProperties.java
@@ -31,17 +31,18 @@ import javax.annotation.Nullable;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
-import net.runelite.client.plugins.runeliteplus.RuneLitePlusPlugin;
+import net.runelite.client.config.RuneLitePlusConfig;
 
 @Singleton
 @Slf4j
 public class RuneLiteProperties
 {
-	public static String discordAppID = "409416265891971072";
 	private static final String RUNELITE_TITLE = "runelite.title";
 	private static final String RUNELITE_VERSION = "runelite.version";
+	private static final String RUNELIT_VERSION = "runelit.version";
 	private static final String RUNESCAPE_VERSION = "runescape.version";
 	private static final String DISCORD_APP_ID = "runelite.discord.appid";
+	private static final String DISCORD_APP_ID_PLUS = "runelite.plus.discord.appid";
 	private static final String DISCORD_INVITE = "runelite.discord.invite";
 	private static final String GITHUB_LINK = "runelite.github.link";
 	private static final String WIKI_LINK = "runelite.wiki.link";
@@ -50,9 +51,26 @@ public class RuneLiteProperties
 
 	private final Properties properties = new Properties();
 
+	private final RuneLitePlusConfig runeLitePlusConfig;
+
 	@Inject
+	public RuneLiteProperties(final RuneLitePlusConfig runeLiteConfig)
+	{
+		this.runeLitePlusConfig = runeLiteConfig;
+
+		try (InputStream in = getClass().getResourceAsStream("runelite.properties"))
+		{
+			properties.load(in);
+		}
+		catch (IOException ex)
+		{
+			log.warn("unable to load propertries", ex);
+		}
+	}
+
 	public RuneLiteProperties()
 	{
+		runeLitePlusConfig = null;
 		try (InputStream in = getClass().getResourceAsStream("runelite.properties"))
 		{
 			properties.load(in);
@@ -79,6 +97,11 @@ public class RuneLiteProperties
 		return properties.getProperty(RUNELITE_VERSION);
 	}
 
+	public String getRunelitVersion()
+	{
+		return properties.getProperty(RUNELIT_VERSION);
+	}
+
 	public String getRunescapeVersion()
 	{
 		return properties.getProperty(RUNESCAPE_VERSION);
@@ -86,9 +109,14 @@ public class RuneLiteProperties
 
 	public String getDiscordAppId()
 	{
-		if (RuneLitePlusPlugin.customPresenceEnabled)
+		if (this.runeLitePlusConfig == null)
 		{
-			return properties.getProperty(RuneLitePlusPlugin.rlPlusDiscordApp);
+			return properties.getProperty(DISCORD_APP_ID);
+		}
+
+		if (this.runeLitePlusConfig.customPresence())
+		{
+			return properties.getProperty(DISCORD_APP_ID_PLUS);
 		}
 		else
 		{
diff --git a/runelite-client/src/main/java/net/runelite/client/callback/ClientThread.java b/runelite-client/src/main/java/net/runelite/client/callback/ClientThread.java
index a1e3880a39..bbe3ae3f0d 100644
--- a/runelite-client/src/main/java/net/runelite/client/callback/ClientThread.java
+++ b/runelite-client/src/main/java/net/runelite/client/callback/ClientThread.java
@@ -36,7 +36,7 @@ import net.runelite.api.Client;
 @Slf4j
 public class ClientThread
 {
-	private ConcurrentLinkedQueue<BooleanSupplier> invokes = new ConcurrentLinkedQueue<>();
+	private final ConcurrentLinkedQueue<BooleanSupplier> invokes = new ConcurrentLinkedQueue<>();
 
 	@Inject
 	private Client client;
diff --git a/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java b/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java
index ca25fa84a8..5c53677308 100644
--- a/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java
+++ b/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java
@@ -87,9 +87,6 @@ public class Hooks implements Callbacks
 	private static final OverlayRenderer renderer = injector.getInstance(OverlayRenderer.class);
 	private static final OverlayManager overlayManager = injector.getInstance(OverlayManager.class);
 
-	private static final GameTick GAME_TICK = new GameTick();
-	private static final BeforeRender BEFORE_RENDER = new BeforeRender();
-
 	@Inject
 	private EventBus eventBus;
 
@@ -151,13 +148,13 @@ public class Hooks implements Callbacks
 
 			deferredEventBus.replay();
 
-			eventBus.post(GAME_TICK);
+			eventBus.post(GameTick.INSTANCE);
 
 			int tick = client.getTickCount();
 			client.setTickCount(tick + 1);
 		}
 
-		eventBus.post(BEFORE_RENDER);
+		eventBus.post(BeforeRender.INSTANCE);
 
 		clientThread.invoke();
 
diff --git a/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java b/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java
index da4c222fd6..c571282a00 100644
--- a/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java
+++ b/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java
@@ -115,7 +115,7 @@ public class ChatMessageManager
 
 		boolean isChatboxTransparent = client.isResized() && client.getVar(Varbits.TRANSPARENT_CHATBOX) == 1;
 		Color usernameColor = null;
-		Color senderColor = null;
+		Color senderColor;
 
 		switch (chatMessageType)
 		{
diff --git a/runelite-client/src/main/java/net/runelite/client/config/ConfigDescriptor.java b/runelite-client/src/main/java/net/runelite/client/config/ConfigDescriptor.java
index 20013adc67..4ceb696339 100644
--- a/runelite-client/src/main/java/net/runelite/client/config/ConfigDescriptor.java
+++ b/runelite-client/src/main/java/net/runelite/client/config/ConfigDescriptor.java
@@ -53,10 +53,7 @@ public class ConfigDescriptor
 		Collection<ConfigItemDescriptor> allItems = new ArrayList<>();
 		for (ConfigItemsGroup g : itemGroups)
 		{
-			for (ConfigItemDescriptor item : g.getItems())
-			{
-				allItems.add(item);
-			}
+			allItems.addAll(g.getItems());
 		}
 		return allItems;
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java b/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java
index a9adb43b62..b22c8e67a7 100644
--- a/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java
+++ b/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java
@@ -81,7 +81,6 @@ public class ConfigManager
 	@Inject
 	EventBus eventBus;
 
-	private final ScheduledExecutorService executor;
 	private final ConfigInvocationHandler handler = new ConfigInvocationHandler(this);
 	private final Properties properties = new Properties();
 	private final Map<String, Object> configObjectCache = new HashMap<>();
@@ -90,9 +89,8 @@ public class ConfigManager
 	@Inject
 	public ConfigManager(ScheduledExecutorService scheduledExecutorService)
 	{
-		this.executor = scheduledExecutorService;
 
-		executor.scheduleWithFixedDelay(this::sendConfig, 30, 30, TimeUnit.SECONDS);
+		scheduledExecutorService.scheduleWithFixedDelay(this::sendConfig, 30, 30, TimeUnit.SECONDS);
 	}
 
 	public final void switchSession()
@@ -245,12 +243,10 @@ public class ConfigManager
 			throw new RuntimeException("Non-public configuration classes can't have default methods invoked");
 		}
 
-		T t = (T) Proxy.newProxyInstance(clazz.getClassLoader(), new Class<?>[]
+		return (T) Proxy.newProxyInstance(clazz.getClassLoader(), new Class<?>[]
 			{
 				clazz
 			}, handler);
-
-		return t;
 	}
 
 	public List<String> getConfigurationKeys(String prefix)
diff --git a/runelite-client/src/main/java/net/runelite/client/config/Keybind.java b/runelite-client/src/main/java/net/runelite/client/config/Keybind.java
index b0fb4dffcf..8dac88a232 100644
--- a/runelite-client/src/main/java/net/runelite/client/config/Keybind.java
+++ b/runelite-client/src/main/java/net/runelite/client/config/Keybind.java
@@ -60,7 +60,7 @@ public class Keybind
 	private final int keyCode;
 	private final int modifiers;
 
-	protected Keybind(int keyCode, int modifiers, boolean ignoreModifiers)
+	Keybind(int keyCode, int modifiers, boolean ignoreModifiers)
 	{
 		modifiers &= KEYBOARD_MODIFIER_MASK;
 
@@ -108,7 +108,7 @@ public class Keybind
 		return matches(e, false);
 	}
 
-	protected boolean matches(KeyEvent e, boolean ignoreModifiers)
+	boolean matches(KeyEvent e, boolean ignoreModifiers)
 	{
 		if (NOT_SET.equals(this))
 		{
@@ -177,7 +177,7 @@ public class Keybind
 		return mod;
 	}
 
-	public static String getModifiersExText(int modifiers)
+	private static String getModifiersExText(int modifiers)
 	{
 		StringBuilder buf = new StringBuilder();
 		if ((modifiers & InputEvent.META_DOWN_MASK) != 0)
diff --git a/runelite-client/src/main/java/net/runelite/client/config/RuneLiteConfig.java b/runelite-client/src/main/java/net/runelite/client/config/RuneLiteConfig.java
index f57df0c6f0..069483865a 100644
--- a/runelite-client/src/main/java/net/runelite/client/config/RuneLiteConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/config/RuneLiteConfig.java
@@ -33,10 +33,10 @@ import net.runelite.client.ui.FontManager;
 public interface RuneLiteConfig extends Config
 {
 	@ConfigItem(
-			keyName = "gameSize",
-			name = "Game size",
-			description = "The game will resize to this resolution upon starting the client",
-			position = 10
+		keyName = "gameSize",
+		name = "Game size",
+		description = "The game will resize to this resolution upon starting the client",
+		position = 10
 	)
 	default Dimension gameSize()
 	{
@@ -44,10 +44,10 @@ public interface RuneLiteConfig extends Config
 	}
 
 	@ConfigItem(
-			keyName = "automaticResizeType",
-			name = "Resize type",
-			description = "Choose how the window should resize when opening and closing panels",
-			position = 11
+		keyName = "automaticResizeType",
+		name = "Resize type",
+		description = "Choose how the window should resize when opening and closing panels",
+		position = 11
 	)
 	default ExpandResizeType automaticResizeType()
 	{
@@ -55,10 +55,10 @@ public interface RuneLiteConfig extends Config
 	}
 
 	@ConfigItem(
-			keyName = "lockWindowSize",
-			name = "Lock window size",
-			description = "Determines if the window resizing is allowed or not",
-			position = 12
+		keyName = "lockWindowSize",
+		name = "Lock window size",
+		description = "Determines if the window resizing is allowed or not",
+		position = 12
 	)
 	default boolean lockWindowSize()
 	{
@@ -66,21 +66,10 @@ public interface RuneLiteConfig extends Config
 	}
 
 	@ConfigItem(
-			keyName = "enablePlugins",
-			name = "Enable loading of external plugins",
-			description = "Enable loading of external plugins",
-			position = 10
-	)
-	default boolean enablePlugins()
-	{
-		return true;
-	}
-
-	@ConfigItem(
-			keyName = "containInScreen",
-			name = "Contain in screen",
-			description = "Makes the client stay contained in the screen when attempted to move out of it.<br>Note: Only works if custom chrome is enabled.",
-			position = 13
+		keyName = "containInScreen",
+		name = "Contain in screen",
+		description = "Makes the client stay contained in the screen when attempted to move out of it.<br>Note: Only works if custom chrome is enabled.",
+		position = 13
 	)
 	default boolean containInScreen()
 	{
@@ -88,10 +77,10 @@ public interface RuneLiteConfig extends Config
 	}
 
 	@ConfigItem(
-			keyName = "rememberScreenBounds",
-			name = "Remember client position",
-			description = "Save the position and size of the client after exiting",
-			position = 14
+		keyName = "rememberScreenBounds",
+		name = "Remember client position",
+		description = "Save the position and size of the client after exiting",
+		position = 14
 	)
 	default boolean rememberScreenBounds()
 	{
@@ -99,11 +88,11 @@ public interface RuneLiteConfig extends Config
 	}
 
 	@ConfigItem(
-			keyName = "uiEnableCustomChrome",
-			name = "Enable custom window chrome",
-			description = "Use Runelite's custom window title and borders.",
-			warning = "Please restart your client after changing this setting",
-			position = 15
+		keyName = "uiEnableCustomChrome",
+		name = "Enable custom window chrome",
+		description = "Use Runelite's custom window title and borders.",
+		warning = "Please restart your client after changing this setting",
+		position = 15
 	)
 	default boolean enableCustomChrome()
 	{
@@ -111,10 +100,10 @@ public interface RuneLiteConfig extends Config
 	}
 
 	@ConfigItem(
-			keyName = "gameAlwaysOnTop",
-			name = "Enable client always on top",
-			description = "The game will always be on the top of the screen",
-			position = 16
+		keyName = "gameAlwaysOnTop",
+		name = "Enable client always on top",
+		description = "The game will always be on the top of the screen",
+		position = 16
 	)
 	default boolean gameAlwaysOnTop()
 	{
@@ -122,10 +111,10 @@ public interface RuneLiteConfig extends Config
 	}
 
 	@ConfigItem(
-			keyName = "warningOnExit",
-			name = "Display warning on exit",
-			description = "Toggles a warning popup when trying to exit the client",
-			position = 17
+		keyName = "warningOnExit",
+		name = "Display warning on exit",
+		description = "Toggles a warning popup when trying to exit the client",
+		position = 17
 	)
 	default WarningOnExit warningOnExit()
 	{
@@ -133,10 +122,10 @@ public interface RuneLiteConfig extends Config
 	}
 
 	@ConfigItem(
-			keyName = "usernameInTitle",
-			name = "Show display name in title",
-			description = "Toggles displaying of local player's display name in client title",
-			position = 18
+		keyName = "usernameInTitle",
+		name = "Show display name in title",
+		description = "Toggles displaying of local player's display name in client title",
+		position = 18
 	)
 	default boolean usernameInTitle()
 	{
@@ -144,10 +133,10 @@ public interface RuneLiteConfig extends Config
 	}
 
 	@ConfigItem(
-			keyName = "notificationTray",
-			name = "Enable tray notifications",
-			description = "Enables tray notifications",
-			position = 20
+		keyName = "notificationTray",
+		name = "Enable tray notifications",
+		description = "Enables tray notifications",
+		position = 20
 	)
 	default boolean enableTrayNotifications()
 	{
@@ -155,10 +144,10 @@ public interface RuneLiteConfig extends Config
 	}
 
 	@ConfigItem(
-			keyName = "notificationRequestFocus",
-			name = "Request focus on notification",
-			description = "Toggles window focus request",
-			position = 21
+		keyName = "notificationRequestFocus",
+		name = "Request focus on notification",
+		description = "Toggles window focus request",
+		position = 21
 	)
 	default boolean requestFocusOnNotification()
 	{
@@ -166,10 +155,10 @@ public interface RuneLiteConfig extends Config
 	}
 
 	@ConfigItem(
-			keyName = "notificationSound",
-			name = "Enable sound on notifications",
-			description = "Enables the playing of a beep sound when notifications are displayed",
-			position = 22
+		keyName = "notificationSound",
+		name = "Enable sound on notifications",
+		description = "Enables the playing of a beep sound when notifications are displayed",
+		position = 22
 	)
 	default boolean enableNotificationSound()
 	{
@@ -177,10 +166,10 @@ public interface RuneLiteConfig extends Config
 	}
 
 	@ConfigItem(
-			keyName = "notificationGameMessage",
-			name = "Enable game message notifications",
-			description = "Puts a notification message in the chatbox",
-			position = 23
+		keyName = "notificationGameMessage",
+		name = "Enable game message notifications",
+		description = "Puts a notification message in the chatbox",
+		position = 23
 	)
 	default boolean enableGameMessageNotification()
 	{
@@ -188,10 +177,10 @@ public interface RuneLiteConfig extends Config
 	}
 
 	@ConfigItem(
-			keyName = "notificationFlash",
-			name = "Enable flash notification",
-			description = "Flashes the game frame as a notification",
-			position = 24
+		keyName = "notificationFlash",
+		name = "Enable flash notification",
+		description = "Flashes the game frame as a notification",
+		position = 24
 	)
 	default FlashNotification flashNotification()
 	{
@@ -199,10 +188,10 @@ public interface RuneLiteConfig extends Config
 	}
 
 	@ConfigItem(
-			keyName = "notificationFocused",
-			name = "Send notifications when focused",
-			description = "Toggles all notifications for when the client is focused",
-			position = 25
+		keyName = "notificationFocused",
+		name = "Send notifications when focused",
+		description = "Toggles all notifications for when the client is focused",
+		position = 25
 	)
 	default boolean sendNotificationsWhenFocused()
 	{
@@ -221,10 +210,10 @@ public interface RuneLiteConfig extends Config
 	}
 
 	@ConfigItem(
-			keyName = "fontType",
-			name = "Dynamic Overlay Font",
-			description = "Configures what font type is used for in-game overlays such as player name, ground items, etc.",
-			position = 30
+		keyName = "fontType",
+		name = "Dynamic Overlay Font",
+		description = "Configures what font type is used for in-game overlays such as player name, ground items, etc.",
+		position = 30
 	)
 	default FontType fontType()
 	{
@@ -232,10 +221,10 @@ public interface RuneLiteConfig extends Config
 	}
 
 	@ConfigItem(
-			keyName = "tooltipFontType",
-			name = "Tooltip Font",
-			description = "Configures what font type is used for in-game tooltips such as food stats, NPC names, etc.",
-			position = 31
+		keyName = "tooltipFontType",
+		name = "Tooltip Font",
+		description = "Configures what font type is used for in-game tooltips such as food stats, NPC names, etc.",
+		position = 31
 	)
 	default FontType tooltipFontType()
 	{
@@ -243,10 +232,10 @@ public interface RuneLiteConfig extends Config
 	}
 
 	@ConfigItem(
-			keyName = "interfaceFontType",
-			name = "Interface Overlay Font",
-			description = "Configures what font type is used for in-game interface overlays such as panels, opponent info, clue scrolls etc.",
-			position = 32
+		keyName = "interfaceFontType",
+		name = "Interface Overlay Font",
+		description = "Configures what font type is used for in-game interface overlays such as panels, opponent info, clue scrolls etc.",
+		position = 32
 	)
 	default FontType interfaceFontType()
 	{
@@ -254,10 +243,10 @@ public interface RuneLiteConfig extends Config
 	}
 
 	@ConfigItem(
-			keyName = "menuEntryShift",
-			name = "Require Shift for overlay menu",
-			description = "Overlay right-click menu will require shift to be added",
-			position = 33
+		keyName = "menuEntryShift",
+		name = "Require Shift for overlay menu",
+		description = "Overlay right-click menu will require shift to be added",
+		position = 33
 	)
 	default boolean menuEntryShift()
 	{
@@ -265,10 +254,10 @@ public interface RuneLiteConfig extends Config
 	}
 
 	@ConfigItem(
-			keyName = "infoBoxVertical",
-			name = "Display infoboxes vertically",
-			description = "Toggles the infoboxes to display vertically",
-			position = 40
+		keyName = "infoBoxVertical",
+		name = "Display infoboxes vertically",
+		description = "Toggles the infoboxes to display vertically",
+		position = 40
 	)
 	default boolean infoBoxVertical()
 	{
@@ -276,10 +265,10 @@ public interface RuneLiteConfig extends Config
 	}
 
 	@ConfigItem(
-			keyName = "infoBoxWrap",
-			name = "Infobox wrap count",
-			description = "Configures the amount of infoboxes shown before wrapping",
-			position = 41
+		keyName = "infoBoxWrap",
+		name = "Infobox wrap count",
+		description = "Configures the amount of infoboxes shown before wrapping",
+		position = 41
 	)
 	default int infoBoxWrap()
 	{
@@ -287,22 +276,22 @@ public interface RuneLiteConfig extends Config
 	}
 
 	@ConfigItem(
-			keyName = "infoBoxSize",
-			name = "Infobox size (px)",
-			description = "Configures the size of each infobox in pixels",
-			position = 42
+		keyName = "infoBoxSize",
+		name = "Infobox size (px)",
+		description = "Configures the size of each infobox in pixels",
+		position = 42
 	)
 	default int infoBoxSize()
 	{
 		return 35;
 	}
 
-	@Range( max = 100, min = 0 )
+	@Range(max = 100, min = 0)
 	@ConfigItem(
-			keyName = "volume",
-			name = "Runelite Volume",
-			description = "Sets the volume of custom Runelite sounds (not the client sounds)",
-			position = 43
+		keyName = "volume",
+		name = "Runelite Volume",
+		description = "Sets the volume of custom Runelite sounds (not the client sounds)",
+		position = 43
 	)
 	default int volume()
 	{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusConfig.java b/runelite-client/src/main/java/net/runelite/client/config/RuneLitePlusConfig.java
similarity index 91%
rename from runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusConfig.java
rename to runelite-client/src/main/java/net/runelite/client/config/RuneLitePlusConfig.java
index 8db739148c..b70537e3de 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/config/RuneLitePlusConfig.java
@@ -24,7 +24,7 @@
  *   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
-package net.runelite.client.plugins.runeliteplus;
+package net.runelite.client.config;
 
 import net.runelite.client.config.Config;
 import net.runelite.client.config.ConfigGroup;
@@ -81,4 +81,15 @@ public interface RuneLitePlusConfig extends Config
 	{
 		return false;
 	}
+
+	@ConfigItem(
+		keyName = "enablePlugins",
+		name = "Enable loading of external plugins",
+		description = "Enable loading of external plugins",
+		position = 10
+	)
+	default boolean enablePlugins()
+	{
+		return false;
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/discord/DiscordService.java b/runelite-client/src/main/java/net/runelite/client/discord/DiscordService.java
index dbf3c36ba2..091c479ac6 100644
--- a/runelite-client/src/main/java/net/runelite/client/discord/DiscordService.java
+++ b/runelite-client/src/main/java/net/runelite/client/discord/DiscordService.java
@@ -49,7 +49,7 @@ import net.runelite.discord.DiscordUser;
 public class DiscordService implements AutoCloseable
 {
 	private final EventBus eventBus;
-	public final RuneLiteProperties runeLiteProperties;
+	private final RuneLiteProperties runeLiteProperties;
 	private final ScheduledExecutorService executorService;
 	private final DiscordRPC discordRPC;
 
@@ -106,7 +106,7 @@ public class DiscordService implements AutoCloseable
 		discordEventHandlers.joinGame = this::joinGame;
 		discordEventHandlers.spectateGame = this::spectateGame;
 		discordEventHandlers.joinRequest = this::joinRequest;
-		discordRPC.Discord_Initialize(RuneLiteProperties.discordAppID, discordEventHandlers, true, null);
+		discordRPC.Discord_Initialize(runeLiteProperties.getDiscordAppId(), discordEventHandlers, true, null);
 		executorService.scheduleAtFixedRate(discordRPC::Discord_RunCallbacks, 0, 2, TimeUnit.SECONDS);
 	}
 
diff --git a/runelite-client/src/main/java/net/runelite/client/game/HiscoreLoader.java b/runelite-client/src/main/java/net/runelite/client/game/HiscoreLoader.java
index 36b6024e35..dbe603dc8d 100644
--- a/runelite-client/src/main/java/net/runelite/client/game/HiscoreLoader.java
+++ b/runelite-client/src/main/java/net/runelite/client/game/HiscoreLoader.java
@@ -36,6 +36,7 @@ import static net.runelite.client.game.HiscoreManager.NONE;
 import net.runelite.http.api.hiscore.HiscoreClient;
 import net.runelite.http.api.hiscore.HiscoreEndpoint;
 import net.runelite.http.api.hiscore.HiscoreResult;
+import org.jetbrains.annotations.NotNull;
 
 @Slf4j
 class HiscoreLoader extends CacheLoader<HiscoreManager.HiscoreKey, HiscoreResult>
@@ -50,7 +51,7 @@ class HiscoreLoader extends CacheLoader<HiscoreManager.HiscoreKey, HiscoreResult
 	}
 
 	@Override
-	public HiscoreResult load(HiscoreManager.HiscoreKey hiscoreKey) throws Exception
+	public HiscoreResult load(@NotNull HiscoreManager.HiscoreKey hiscoreKey) throws Exception
 	{
 		return EMPTY;
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java b/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java
index 02f5a8785d..4a77eff91b 100644
--- a/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java
+++ b/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java
@@ -168,6 +168,7 @@ import net.runelite.client.eventbus.Subscribe;
 import net.runelite.http.api.item.ItemClient;
 import net.runelite.http.api.item.ItemPrice;
 import net.runelite.http.api.item.ItemStats;
+import org.jetbrains.annotations.NotNull;
 
 @Singleton
 @Slf4j
@@ -279,7 +280,7 @@ public class ItemManager
 			.build(new CacheLoader<ImageKey, AsyncBufferedImage>()
 			{
 				@Override
-				public AsyncBufferedImage load(ImageKey key) throws Exception
+				public AsyncBufferedImage load(@NotNull ImageKey key) throws Exception
 				{
 					return loadImage(key.itemId, key.itemQuantity, key.stackable);
 				}
@@ -291,7 +292,7 @@ public class ItemManager
 			.build(new CacheLoader<Integer, ItemDefinition>()
 			{
 				@Override
-				public ItemDefinition load(Integer key) throws Exception
+				public ItemDefinition load(@NotNull Integer key) throws Exception
 				{
 					return client.getItemDefinition(key);
 				}
@@ -303,7 +304,7 @@ public class ItemManager
 			.build(new CacheLoader<OutlineKey, BufferedImage>()
 			{
 				@Override
-				public BufferedImage load(OutlineKey key) throws Exception
+				public BufferedImage load(@NotNull OutlineKey key) throws Exception
 				{
 					return loadItemOutline(key.itemId, key.itemQuantity, key.outlineColor);
 				}
diff --git a/runelite-client/src/main/java/net/runelite/client/game/SkillIconManager.java b/runelite-client/src/main/java/net/runelite/client/game/SkillIconManager.java
index 03c78617b1..fd17ad0f7f 100644
--- a/runelite-client/src/main/java/net/runelite/client/game/SkillIconManager.java
+++ b/runelite-client/src/main/java/net/runelite/client/game/SkillIconManager.java
@@ -40,7 +40,7 @@ public class SkillIconManager
 	public BufferedImage getSkillImage(Skill skill, boolean small)
 	{
 		int skillIdx = skill.ordinal() + (small ? Skill.values().length : 0);
-		BufferedImage skillImage = null;
+		BufferedImage skillImage;
 
 		if (imgCache[skillIdx] != null)
 		{
diff --git a/runelite-client/src/main/java/net/runelite/client/game/Sound.java b/runelite-client/src/main/java/net/runelite/client/game/Sound.java
index aeeddd8b34..e9cb20dfaf 100644
--- a/runelite-client/src/main/java/net/runelite/client/game/Sound.java
+++ b/runelite-client/src/main/java/net/runelite/client/game/Sound.java
@@ -20,10 +20,10 @@ public enum Sound
 	RESTORED_SPECIAL_ATTACK(16, "net/runelite/client/game/sounds/restorespec.wav"),
 	IDLE(17, "net/runelite/client/game/sounds/idle.wav");
 
-	private String filePath;
-	private int id;
+	private final String filePath;
+	private final int id;
 
-	private Sound(int id, String filePath)
+	Sound(int id, String filePath)
 	{
 		this.id = id;
 		this.filePath = filePath;
diff --git a/runelite-client/src/main/java/net/runelite/client/game/SpriteManager.java b/runelite-client/src/main/java/net/runelite/client/game/SpriteManager.java
index 3a4cc667e7..df81112d27 100644
--- a/runelite-client/src/main/java/net/runelite/client/game/SpriteManager.java
+++ b/runelite-client/src/main/java/net/runelite/client/game/SpriteManager.java
@@ -54,7 +54,7 @@ public class SpriteManager
 	@Inject
 	private ClientThread clientThread;
 
-	public Cache<Long, BufferedImage> cache = CacheBuilder.newBuilder()
+	private final Cache<Long, BufferedImage> cache = CacheBuilder.newBuilder()
 		.maximumSize(128L)
 		.expireAfterAccess(1, TimeUnit.HOURS)
 		.build();
@@ -110,12 +110,8 @@ public class SpriteManager
 	public void addSpriteTo(JButton c, int archive, int file)
 	{
 		getSpriteAsync(archive, file, img ->
-		{
 			SwingUtilities.invokeLater(() ->
-			{
-				c.setIcon(new ImageIcon(img));
-			});
-		});
+				c.setIcon(new ImageIcon(img))));
 	}
 
 	/**
@@ -124,12 +120,8 @@ public class SpriteManager
 	public void addSpriteTo(JLabel c, int archive, int file)
 	{
 		getSpriteAsync(archive, file, img ->
-		{
 			SwingUtilities.invokeLater(() ->
-			{
-				c.setIcon(new ImageIcon(img));
-			});
-		});
+				c.setIcon(new ImageIcon(img))));
 	}
 
 	public void addSpriteOverrides(SpriteOverride[] add)
diff --git a/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxInput.java b/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxInput.java
index bdd7c10dda..f29b01dbc5 100644
--- a/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxInput.java
+++ b/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxInput.java
@@ -27,13 +27,13 @@ package net.runelite.client.game.chatbox;
 /**
  * A modal input that lives in the chatbox panel.
  */
-public abstract class ChatboxInput
+abstract class ChatboxInput
 {
-	protected void open()
+	void open()
 	{
 	}
 
-	protected void close()
+	void close()
 	{
 	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxTextInput.java b/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxTextInput.java
index 79ca18a124..82973cecb1 100644
--- a/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxTextInput.java
+++ b/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxTextInput.java
@@ -156,12 +156,12 @@ public class ChatboxTextInput extends ChatboxInput implements KeyListener, Mouse
 		return this;
 	}
 
-	public ChatboxTextInput cursorAt(int index)
+	private ChatboxTextInput cursorAt(int index)
 	{
 		return cursorAt(index, index);
 	}
 
-	public ChatboxTextInput cursorAt(int indexA, int indexB)
+	private ChatboxTextInput cursorAt(int indexA, int indexB)
 	{
 		if (indexA < 0)
 		{
@@ -722,9 +722,6 @@ public class ChatboxTextInput extends ChatboxInput implements KeyListener, Mouse
 				newPos++;
 				break;
 			case KeyEvent.VK_UP:
-				ev.consume();
-				newPos = getLineOffset.applyAsInt(code);
-				break;
 			case KeyEvent.VK_DOWN:
 				ev.consume();
 				newPos = getLineOffset.applyAsInt(code);
diff --git a/runelite-client/src/main/java/net/runelite/client/menus/ComparableEntry.java b/runelite-client/src/main/java/net/runelite/client/menus/ComparableEntry.java
index a5f0f57355..171d299e72 100644
--- a/runelite-client/src/main/java/net/runelite/client/menus/ComparableEntry.java
+++ b/runelite-client/src/main/java/net/runelite/client/menus/ComparableEntry.java
@@ -27,6 +27,7 @@ package net.runelite.client.menus;
 import joptsimple.internal.Strings;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
+import lombok.Setter;
 import net.runelite.api.MenuEntry;
 import static net.runelite.client.menus.MenuManager.LEVEL_PATTERN;
 import net.runelite.client.util.Text;
@@ -52,6 +53,16 @@ public class ComparableEntry
 	@Getter
 	private boolean strictTarget;
 
+	/**
+	 * If two entries are both suppose to be left click,
+	 * the entry with the higher priority will be selected.
+	 * This only effects left click priority entries.
+	 */
+	@Getter
+	@Setter
+	@EqualsAndHashCode.Exclude
+	private int priority;
+
 	public ComparableEntry(String option, String target)
 	{
 		this(option, target, -1, -1, true, true);
@@ -70,6 +81,7 @@ public class ComparableEntry
 		this.type = type;
 		this.strictOption = strictOption;
 		this.strictTarget = strictTarget;
+		this.priority = 0;
 	}
 
 	// This is only used for type checking, which is why it has everything but target
@@ -80,6 +92,7 @@ public class ComparableEntry
 		this.id = e.getIdentifier();
 		this.type = e.getType();
 		this.strictOption = true;
+		this.priority = 0;
 	}
 
 	boolean matches(MenuEntry entry)
diff --git a/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java b/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java
index 4e4f9fb847..70ab8ebadf 100644
--- a/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java
+++ b/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java
@@ -31,17 +31,20 @@ import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
@@ -60,6 +63,7 @@ import net.runelite.api.events.NpcActionChanged;
 import net.runelite.api.events.PlayerMenuOptionClicked;
 import net.runelite.api.events.PlayerMenuOptionsChanged;
 import net.runelite.api.events.WidgetMenuOptionClicked;
+import net.runelite.api.events.WidgetPressed;
 import net.runelite.api.widgets.WidgetInfo;
 import net.runelite.client.eventbus.EventBus;
 import net.runelite.client.eventbus.Subscribe;
@@ -78,7 +82,6 @@ public class MenuManager
 
 	private final Client client;
 	private final EventBus eventBus;
-	private final Prioritizer prioritizer;
 
 	//Maps the indexes that are being used to the menu option.
 	private final Map<Integer, String> playerMenuIndexMap = new HashMap<>();
@@ -86,24 +89,23 @@ public class MenuManager
 	private final Multimap<Integer, WidgetMenuOption> managedMenuOptions = HashMultimap.create();
 	private final Set<String> npcMenuOptions = new HashSet<>();
 
-	private final Set<ComparableEntry> priorityEntries = new HashSet<>();
-	private final Set<MenuEntry> currentPriorityEntries = new HashSet<>();
-	private final Set<ComparableEntry> hiddenEntries = new HashSet<>();
-	private final Set<MenuEntry> currentHiddenEntries = new HashSet<>();
-	private final Map<ComparableEntry, ComparableEntry> swaps = new HashMap<>();
-	private final Map<ComparableEntry, MenuEntry> currentSwaps = new HashMap<>();
+	private final HashSet<ComparableEntry> priorityEntries = new HashSet<>();
+	private HashMap<MenuEntry, ComparableEntry> currentPriorityEntries = new HashMap<>();
+	private final ConcurrentHashMap<MenuEntry, ComparableEntry> safeCurrentPriorityEntries = new ConcurrentHashMap<>();
+	private final HashSet<ComparableEntry> hiddenEntries = new HashSet<>();
+	private HashSet<MenuEntry> currentHiddenEntries = new HashSet<>();
+	private final HashMap<ComparableEntry, ComparableEntry> swaps = new HashMap<>();
 
 	private final LinkedHashSet<MenuEntry> entries = Sets.newLinkedHashSet();
 
 	private MenuEntry leftClickEntry = null;
-	private int leftClickType = -1;
+	private MenuEntry firstEntry = null;
 
 	@Inject
 	private MenuManager(Client client, EventBus eventBus)
 	{
 		this.client = client;
 		this.eventBus = eventBus;
-		this.prioritizer = new Prioritizer();
 	}
 
 	/**
@@ -147,22 +149,11 @@ public class MenuManager
 	public void onMenuOpened(MenuOpened event)
 	{
 		currentPriorityEntries.clear();
-		currentHiddenEntries.clear();
 
 		// Need to reorder the list to normal, then rebuild with swaps
 		MenuEntry[] oldEntries = event.getMenuEntries();
 
-		for (MenuEntry entry : oldEntries)
-		{
-			if (entry == leftClickEntry)
-			{
-				entry.setType(leftClickType);
-				break;
-			}
-		}
-
-		leftClickEntry = null;
-		leftClickType = -1;
+		firstEntry = null;
 
 		client.sortMenuEntries();
 
@@ -192,7 +183,7 @@ public class MenuManager
 					{
 						shouldDeprioritize = true;
 					}
-					currentPriorityEntries.add(entry);
+					currentPriorityEntries.put(entry, p);
 					newEntries.remove(entry);
 					continue prioritizer;
 				}
@@ -221,8 +212,8 @@ public class MenuManager
 						}
 					}
 
-					// Do not need to swap with itself
-					if (swapFrom != null && swapFrom != entry)
+					// Do not need to swap with itself or if the swapFrom is already the first entry
+					if (swapFrom != null && swapFrom != entry && swapFrom != Iterables.getLast(newEntries))
 					{
 						// Deprioritize entries if the swaps are not in similar type groups
 						if ((swapFrom.getType() >= 1000 && entry.getType() < 1000) || (entry.getType() >= 1000 && swapFrom.getType() < 1000) && !shouldDeprioritize)
@@ -250,12 +241,19 @@ public class MenuManager
 			}
 		}
 
-		if (!priorityEntries.isEmpty())
+		if (!currentPriorityEntries.isEmpty())
 		{
-			newEntries.addAll(currentPriorityEntries);
+			newEntries.addAll(currentPriorityEntries.entrySet().stream()
+				.sorted(Comparator.comparingInt(e -> e.getValue().getPriority()))
+				.map(Map.Entry::getKey)
+				.collect(Collectors.toList()));
 		}
 
-		event.setMenuEntries(newEntries.toArray(new MenuEntry[0]));
+		MenuEntry[] arrayEntries = newEntries.toArray(new MenuEntry[0]);
+
+		// Need to set the event entries to prevent conflicts
+		event.setMenuEntries(arrayEntries);
+		client.setMenuEntries(arrayEntries);
 	}
 
 	@Subscribe
@@ -282,77 +280,63 @@ public class MenuManager
 		}
 	}
 
-
-
 	@Subscribe
 	public void onBeforeRender(BeforeRender event)
 	{
-		leftClickEntry = null;
-		leftClickType = -1;
+		rebuildLeftClickMenu();
+	}
 
+	private MenuEntry rebuildLeftClickMenu()
+	{
 		if (client.isMenuOpen())
 		{
-			return;
+			return null;
 		}
 
+		firstEntry = null;
 		entries.clear();
-
 		entries.addAll(Arrays.asList(client.getMenuEntries()));
 
 		if (entries.size() < 2)
 		{
-			return;
+			return null;
 		}
 
-		currentPriorityEntries.clear();
-		currentHiddenEntries.clear();
-		currentSwaps.clear();
-
-		prioritizer.prioritize();
-
-		while (prioritizer.isRunning())
+		if (!hiddenEntries.isEmpty())
 		{
-			// wait
-		}
+			currentHiddenEntries.clear();
+			indexHiddenEntries(entries);
 
-		entries.removeAll(currentHiddenEntries);
-
-
-		for (MenuEntry entry : currentPriorityEntries)
-		{
-			if (entries.contains(entry))
+			if (!currentHiddenEntries.isEmpty())
 			{
-				leftClickEntry = entry;
-				leftClickType = entry.getType();
-				entries.remove(leftClickEntry);
-				leftClickEntry.setType(MenuAction.WIDGET_DEFAULT.getId());
-				entries.add(leftClickEntry);
-				break;
+				entries.removeAll(currentHiddenEntries);
 			}
 		}
 
-
-		if (leftClickEntry == null)
+		if (!priorityEntries.isEmpty())
 		{
-			MenuEntry first = Iterables.getLast(entries);
+			indexPriorityEntries(entries);
+		}
 
-			for (ComparableEntry swap : currentSwaps.keySet())
-			{
-				if (swap.matches(first))
-				{
-					leftClickEntry = currentSwaps.get(swap);
-					leftClickType = leftClickEntry.getType();
-					entries.remove(leftClickEntry);
-					leftClickEntry.setType(MenuAction.WIDGET_DEFAULT.getId());
-					entries.add(leftClickEntry);
-					break;
-				}
-			}
+		if (firstEntry == null && !swaps.isEmpty())
+		{
+			indexSwapEntries(entries);
+		}
+
+		if (firstEntry != null)
+		{
+			entries.remove(firstEntry);
+			entries.add(firstEntry);
+		}
+		else if (!currentHiddenEntries.isEmpty())
+		{
+			firstEntry = Iterables.getLast(entries, null);
 		}
 
 		client.setMenuEntries(entries.toArray(new MenuEntry[0]));
-	}
 
+		return firstEntry;
+	}
 
 	public void addPlayerMenuItem(String menuText)
 	{
@@ -455,14 +439,29 @@ public class MenuManager
 		}
 	}
 
+	@Subscribe
+	public void onWidgetPressed(WidgetPressed event)
+	{
+		leftClickEntry = rebuildLeftClickMenu();
+	}
+
 	@Subscribe
 	public void onMenuOptionClicked(MenuOptionClicked event)
 	{
-		if (leftClickEntry != null && leftClickType != -1)
+		if (!client.isMenuOpen() && event.isAuthentic())
 		{
-			leftClickEntry.setType(leftClickType);
-			event.setMenuEntry(leftClickEntry);
-			leftClickEntry = null;
+			// The mouse button will not be 0 if a non draggable widget was clicked,
+			// otherwise the left click entry will have been set in onWidgetPressed
+			if (client.getMouseCurrentButton() != 0)
+			{
+				leftClickEntry = rebuildLeftClickMenu();
+			}
+
+			if (leftClickEntry != null)
+			{
+				event.setMenuEntry(leftClickEntry);
+				leftClickEntry = null;
+			}
 		}
 
 		if (event.getMenuAction() != MenuAction.RUNELITE)
@@ -534,7 +533,7 @@ public class MenuManager
 	/**
 	 * Adds to the set of menu entries which when present, will remove all entries except for this one
 	 */
-	public void addPriorityEntry(String option, String target)
+	public ComparableEntry addPriorityEntry(String option, String target)
 	{
 		option = Text.standardize(option);
 		target = Text.standardize(target);
@@ -542,6 +541,8 @@ public class MenuManager
 		ComparableEntry entry = new ComparableEntry(option, target);
 
 		priorityEntries.add(entry);
+
+		return entry;
 	}
 
 	public void removePriorityEntry(String option, String target)
@@ -559,13 +560,15 @@ public class MenuManager
 	 * Adds to the set of menu entries which when present, will remove all entries except for this one
 	 * This method will add one with strict option, but not-strict target (contains for target, equals for option)
 	 */
-	public void addPriorityEntry(String option)
+	public ComparableEntry addPriorityEntry(String option)
 	{
 		option = Text.standardize(option);
 
 		ComparableEntry entry = new ComparableEntry(option, "", false);
 
 		priorityEntries.add(entry);
+
+		return entry;
 	}
 
 	public void removePriorityEntry(String option)
@@ -789,115 +792,67 @@ public class MenuManager
 		hiddenEntries.remove(entry);
 	}
 
-	private class Prioritizer
+	private void indexHiddenEntries(Set<MenuEntry> entries)
 	{
-		private MenuEntry[] entries;
-		private AtomicInteger state = new AtomicInteger(0);
-
-		boolean isRunning()
+		currentHiddenEntries = entries.parallelStream().filter(entry ->
 		{
-			return state.get() != 0;
-		}
-
-		void prioritize()
-		{
-			if (state.get() != 0)
+			for (ComparableEntry p : hiddenEntries)
 			{
-				return;
-			}
-
-			entries = client.getMenuEntries();
-
-			state.set(3);
-
-			if (!hiddenEntries.isEmpty())
-			{
-				hiddenFinder.run();
-			}
-			else
-			{
-				state.decrementAndGet();
-			}
-
-			if (!priorityEntries.isEmpty())
-			{
-				priorityFinder.run();
-			}
-			else
-			{
-				state.decrementAndGet();
-			}
-
-			if (!swaps.isEmpty())
-			{
-				swapFinder.run();
-			}
-			else
-			{
-				state.decrementAndGet();
-			}
-		}
-
-		private Thread hiddenFinder = new Thread()
-		{
-			@Override
-			public void run()
-			{
-				Arrays.stream(entries).parallel().forEach(entry ->
+				if (p.matches(entry))
 				{
-					for (ComparableEntry p : hiddenEntries)
-					{
-						if (p.matches(entry))
-						{
-							currentHiddenEntries.add(entry);
-							return;
-						}
-					}
-				});
-				state.decrementAndGet();
+					return true;
+				}
 			}
-		};
-
-		private Thread priorityFinder = new Thread()
-		{
-			@Override
-			public void run()
-			{
-				Arrays.stream(entries).parallel().forEach(entry ->
-				{
-					for (ComparableEntry p : priorityEntries)
-					{
-						if (p.matches(entry))
-						{
-							currentPriorityEntries.add(entry);
-							return;
-						}
-					}
-				});
-
-				state.decrementAndGet();
-			}
-		};
-
-		private Thread swapFinder = new Thread()
-		{
-			@Override
-			public void run()
-			{
-				Arrays.stream(entries).parallel().forEach(entry ->
-				{
-					for (Map.Entry<ComparableEntry, ComparableEntry> p : swaps.entrySet())
-					{
-						if (p.getValue().matches(entry))
-						{
-							currentSwaps.put(p.getKey(), entry);
-							return;
-						}
-					}
-				});
-
-				state.decrementAndGet();
-			}
-		};
+			return false;
+		}).collect(Collectors.toCollection(HashSet::new));
 	}
-}
+
+	// This could use some optimization
+	private void indexPriorityEntries(Set<MenuEntry> entries)
+	{
+		safeCurrentPriorityEntries.clear();
+		entries.parallelStream().forEach(entry ->
+		{
+			for (ComparableEntry p : priorityEntries)
+			{
+				if (p.matches(entry))
+				{
+					safeCurrentPriorityEntries.put(entry, p);
+					break;
+				}
+			}
+		});
+
+		firstEntry = Iterables.getLast(safeCurrentPriorityEntries.entrySet().stream()
+			.sorted(Comparator.comparingInt(e -> e.getValue().getPriority()))
+			.map(Map.Entry::getKey)
+			.collect(Collectors.toList()), null);
+	}
+
+	private void indexSwapEntries(Set<MenuEntry> entries)
+	{
+		MenuEntry first = Iterables.getLast(entries);
+
+		List<ComparableEntry> values = new ArrayList<>();
+
+		for (Map.Entry<ComparableEntry, ComparableEntry> pair : swaps.entrySet())
+		{
+			if (pair.getKey().matches(first))
+			{
+				values.add(pair.getValue());
+			}
+		}
+
+		firstEntry = entries.parallelStream().filter(entry ->
+		{
+			for (ComparableEntry value : values)
+			{
+				if (value.matches(entry))
+				{
+					return true;
+				}
+			}
+			return false;
+		}).findFirst().orElse(null);
+	}
+}
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java b/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java
index 805b99005e..52488fb4e3 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java
@@ -43,11 +43,16 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Iterator;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.stream.Collectors;
 import javax.inject.Inject;
@@ -228,7 +233,6 @@ public class PluginManager
 			.directed()
 			.build();
 
-		List<Plugin> scannedPlugins = new ArrayList<>();
 		ClassPath classPath = ClassPath.from(classLoader);
 
 		ImmutableSet<ClassInfo> classes = packageName == null ? classPath.getAllClasses()
@@ -285,24 +289,47 @@ public class PluginManager
 			throw new RuntimeException("Plugin dependency graph contains a cycle!");
 		}
 
-		List<Class<? extends Plugin>> sortedPlugins = topologicalSort(graph);
+		List<List<Class<? extends Plugin>>> sortedPlugins = topologicalGroupSort(graph);
 		sortedPlugins = Lists.reverse(sortedPlugins);
 
-		for (Class<? extends Plugin> pluginClazz : sortedPlugins)
-		{
-			Plugin plugin;
-			try
-			{
-				plugin = instantiate(scannedPlugins, (Class<Plugin>) pluginClazz);
-			}
-			catch (PluginInstantiationException ex)
-			{
-				log.warn("Error instantiating plugin!", ex);
-				continue;
-			}
+		final long start = System.currentTimeMillis();
 
-			scannedPlugins.add(plugin);
-		}
+		// some plugins get stuck on IO, so add some extra threads
+		ExecutorService exec = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors() * 2);
+
+		List<Plugin> scannedPlugins = new CopyOnWriteArrayList<>();
+		sortedPlugins.forEach(group ->
+		{
+			List<Future<?>> curGroup = new ArrayList<>();
+			group.forEach(pluginClazz ->
+				curGroup.add(exec.submit(() ->
+				{
+					Plugin plugin;
+					try
+					{
+						plugin = instantiate(scannedPlugins, (Class<Plugin>) pluginClazz);
+					}
+					catch (PluginInstantiationException e)
+					{
+						log.warn("Error instantiating plugin!", e);
+						return;
+					}
+					scannedPlugins.add(plugin);
+				})));
+			curGroup.forEach(future ->
+			{
+				try
+				{
+					future.get();
+				}
+				catch (InterruptedException | ExecutionException e)
+				{
+					e.printStackTrace();
+				}
+			});
+		});
+
+		log.info("Plugin instantiation took {}ms", System.currentTimeMillis() - start);
 
 		return scannedPlugins;
 	}
@@ -515,40 +542,54 @@ public class PluginManager
 	}
 
 	/**
-	 * Topologically sort a graph. Uses Kahn's algorithm.
-	 *
+	 * Topologically sort a graph into separate groups.
+	 * Each group represents the dependency level of the plugins.
+	 * Plugins in group (index) 0 has no dependents.
+	 * Plugins in group 1 has dependents in group 0.
+	 * Plugins in group 2 has dependents in group 1, etc.
+	 * This allows for loading dependent groups serially, starting from the last group,
+	 * while loading plugins within each group in parallel.
 	 * @param graph
 	 * @param <T>
 	 * @return
 	 */
-	private <T> List<T> topologicalSort(Graph<T> graph)
+	private <T> List<List<T>> topologicalGroupSort(Graph<T> graph)
 	{
-		MutableGraph<T> graphCopy = Graphs.copyOf(graph);
-		List<T> l = new ArrayList<>();
-		Set<T> s = graphCopy.nodes().stream()
-			.filter(node -> graphCopy.inDegree(node) == 0)
+		final Set<T> root = graph.nodes().stream()
+			.filter(node -> graph.inDegree(node) == 0)
 			.collect(Collectors.toSet());
-		while (!s.isEmpty())
-		{
-			Iterator<T> it = s.iterator();
-			T n = it.next();
-			it.remove();
+		final Map<T, Integer> dependencyCount = new HashMap<>();
 
-			l.add(n);
+		root.forEach(n -> dependencyCount.put(n, 0));
+		root.forEach(n -> graph.successors(n)
+			.forEach(m -> incrementChildren(graph, dependencyCount, m, dependencyCount.get(n) + 1)));
 
-			for (T m : graphCopy.successors(n))
+		// create list<list> dependency grouping
+		final List<List<T>> dependencyGroups = new ArrayList<>();
+		final int[] curGroup = {-1};
+
+		dependencyCount.entrySet().stream()
+			.sorted(Map.Entry.comparingByValue())
+			.forEach(entry ->
 			{
-				graphCopy.removeEdge(n, m);
-				if (graphCopy.inDegree(m) == 0)
+				if (entry.getValue() != curGroup[0])
 				{
-					s.add(m);
+					curGroup[0] = entry.getValue();
+					dependencyGroups.add(new ArrayList<>());
 				}
-			}
-		}
-		if (!graphCopy.edges().isEmpty())
+				dependencyGroups.get(dependencyGroups.size() - 1).add(entry.getKey());
+			});
+
+		return dependencyGroups;
+	}
+
+	private <T> void incrementChildren(Graph<T> graph, Map<T, Integer> dependencyCount, T n, int val)
+	{
+		if (!dependencyCount.containsKey(n) || dependencyCount.get(n) < val)
 		{
-			throw new RuntimeException("Graph has at least one cycle");
+			dependencyCount.put(n, val);
+			graph.successors(n).forEach(m ->
+				incrementChildren(graph, dependencyCount, m, val + 1));
 		}
-		return l;
 	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/PluginWatcher.java b/runelite-client/src/main/java/net/runelite/client/plugins/PluginWatcher.java
index a5af91fee5..870ccaaaf7 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/PluginWatcher.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/PluginWatcher.java
@@ -45,7 +45,7 @@ import lombok.extern.slf4j.Slf4j;
 import net.runelite.client.RuneLite;
 import net.runelite.client.config.Config;
 import net.runelite.client.config.ConfigManager;
-import net.runelite.client.config.RuneLiteConfig;
+import net.runelite.client.config.RuneLitePlusConfig;
 
 @Singleton
 @Slf4j
@@ -53,7 +53,7 @@ public class PluginWatcher extends Thread
 {
 	private static final File BASE = RuneLite.PLUGIN_DIR;
 
-	private final RuneLiteConfig runeliteConfig;
+	private final RuneLitePlusConfig runelitePlusConfig;
 	private final PluginManager pluginManager;
 	private final WatchService watchService;
 	private final WatchKey watchKey;
@@ -62,9 +62,9 @@ public class PluginWatcher extends Thread
 	private ConfigManager configManager;
 
 	@Inject
-	public PluginWatcher(RuneLiteConfig runeliteConfig, PluginManager pluginManager) throws IOException
+	public PluginWatcher(RuneLitePlusConfig runelitePlusConfig, PluginManager pluginManager) throws IOException
 	{
-		this.runeliteConfig = runeliteConfig;
+		this.runelitePlusConfig = runelitePlusConfig;
 		this.pluginManager = pluginManager;
 
 		setName("Plugin Watcher");
@@ -84,7 +84,7 @@ public class PluginWatcher extends Thread
 	@Override
 	public void run()
 	{
-		if (runeliteConfig.enablePlugins())
+		if (runelitePlusConfig.enablePlugins())
 		{
 			scan();
 		}
@@ -96,7 +96,7 @@ public class PluginWatcher extends Thread
 				WatchKey key = watchService.take();
 				Thread.sleep(50);
 
-				if (!runeliteConfig.enablePlugins())
+				if (!runelitePlusConfig.enablePlugins())
 				{
 					key.reset();
 					continue;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/account/AccountPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/account/AccountPlugin.java
index 55ab81fbe3..07bd977a81 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/account/AccountPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/account/AccountPlugin.java
@@ -27,6 +27,7 @@ package net.runelite.client.plugins.account;
 import java.awt.image.BufferedImage;
 import java.util.concurrent.ScheduledExecutorService;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import javax.swing.JOptionPane;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.client.account.AccountSession;
@@ -47,6 +48,7 @@ import net.runelite.client.util.ImageUtil;
 	loadWhenOutdated = true
 )
 @Slf4j
+@Singleton
 public class AccountPlugin extends Plugin
 {
 	@Inject
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/DiaryRequirementsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/DiaryRequirementsPlugin.java
index ee77f19ecc..341e17a7aa 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/DiaryRequirementsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/DiaryRequirementsPlugin.java
@@ -32,6 +32,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
 import net.runelite.api.FontTypeFace;
@@ -66,6 +67,7 @@ import net.runelite.client.util.Text;
 	description = "Display level requirements in Achievement Diary interface",
 	tags = {"achievements", "tasks"}
 )
+@Singleton
 public class DiaryRequirementsPlugin extends Plugin
 {
 	private static final String AND_JOINER = ", ";
@@ -122,10 +124,6 @@ public class DiaryRequirementsPlugin extends Plugin
 		}
 
 		Map<String, String> skillRequirements = buildRequirements(requirements.getRequirements());
-		if (skillRequirements == null)
-		{
-			return;
-		}
 
 		int offset = 0;
 		String taskBuffer = "";
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityOverlay.java
index aa88396038..31a987bf14 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityOverlay.java
@@ -32,6 +32,7 @@ import java.awt.Polygon;
 import java.awt.geom.Area;
 import java.util.List;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.Point;
 import net.runelite.api.Tile;
@@ -42,23 +43,23 @@ import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayUtil;
 
+@Singleton
 class AgilityOverlay extends Overlay
 {
+	private static final int MAX_DISTANCE = 2350;
 	private static final Color SHORTCUT_HIGH_LEVEL_COLOR = Color.ORANGE;
 
 	private final Client client;
 	private final AgilityPlugin plugin;
-	private final AgilityConfig config;
 
 	@Inject
-	private AgilityOverlay(Client client, AgilityPlugin plugin, AgilityConfig config)
+	private AgilityOverlay(final Client client, final AgilityPlugin plugin)
 	{
 		super(plugin);
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_SCENE);
 		this.client = client;
 		this.plugin = plugin;
-		this.config = config;
 	}
 
 	@Override
@@ -69,14 +70,15 @@ class AgilityOverlay extends Overlay
 		final List<Tile> marksOfGrace = plugin.getMarksOfGrace();
 		plugin.getObstacles().forEach((object, obstacle) ->
 		{
-			if (Obstacles.SHORTCUT_OBSTACLE_IDS.containsKey(object.getId()) && !config.highlightShortcuts() ||
-				Obstacles.TRAP_OBSTACLE_IDS.contains(object.getId()) && !config.showTrapOverlay())
+			if (Obstacles.SHORTCUT_OBSTACLE_IDS.containsKey(object.getId()) && !plugin.isHighlightShortcuts() ||
+				Obstacles.TRAP_OBSTACLE_IDS.contains(object.getId()) && !plugin.isShowTrapOverlay())
 			{
 				return;
 			}
 
 			Tile tile = obstacle.getTile();
-			if (tile.getPlane() == client.getPlane())
+			if (tile.getPlane() == client.getPlane()
+				&& object.getLocalLocation().distanceTo(playerLocation) < MAX_DISTANCE)
 			{
 				// This assumes that the obstacle is not clickable.
 				if (Obstacles.TRAP_OBSTACLE_IDS.contains(object.getId()))
@@ -84,7 +86,7 @@ class AgilityOverlay extends Overlay
 					Polygon polygon = object.getCanvasTilePoly();
 					if (polygon != null)
 					{
-						OverlayUtil.renderPolygon(graphics, polygon, config.getTrapColor());
+						OverlayUtil.renderPolygon(graphics, polygon, plugin.getTrapColor());
 					}
 					return;
 				}
@@ -92,10 +94,10 @@ class AgilityOverlay extends Overlay
 				if (objectClickbox != null)
 				{
 					AgilityShortcut agilityShortcut = obstacle.getShortcut();
-					Color configColor = agilityShortcut == null || agilityShortcut.getLevel() <= plugin.getAgilityLevel() ? config.getOverlayColor() : SHORTCUT_HIGH_LEVEL_COLOR;
-					if (config.highlightMarks() && !marksOfGrace.isEmpty())
+					Color configColor = agilityShortcut == null || agilityShortcut.getLevel() <= plugin.getAgilityLevel() ? plugin.getOverlayColor() : SHORTCUT_HIGH_LEVEL_COLOR;
+					if (plugin.isHighlightMarks() && !marksOfGrace.isEmpty())
 					{
-						configColor = config.getMarkColor();
+						configColor = plugin.getMarkColor();
 					}
 
 					if (objectClickbox.contains(mousePosition.getX(), mousePosition.getY()))
@@ -115,11 +117,12 @@ class AgilityOverlay extends Overlay
 
 		});
 
-		if (config.highlightMarks() && !marksOfGrace.isEmpty())
+		if (plugin.isHighlightMarks() && !marksOfGrace.isEmpty())
 		{
 			for (Tile markOfGraceTile : marksOfGrace)
 			{
-				if (markOfGraceTile.getPlane() == client.getPlane() && markOfGraceTile.getItemLayer() != null)
+				if (markOfGraceTile.getPlane() == client.getPlane() && markOfGraceTile.getItemLayer() != null
+					&& markOfGraceTile.getLocalLocation().distanceTo(playerLocation) < MAX_DISTANCE)
 				{
 					final Polygon poly = markOfGraceTile.getItemLayer().getCanvasTilePoly();
 
@@ -128,7 +131,7 @@ class AgilityOverlay extends Overlay
 						continue;
 					}
 
-					OverlayUtil.renderPolygon(graphics, poly, config.getMarkColor());
+					OverlayUtil.renderPolygon(graphics, poly, plugin.getMarkColor());
 				}
 			}
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java
index abe18393d8..043cc4e23a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java
@@ -32,6 +32,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
@@ -83,14 +85,15 @@ import net.runelite.client.util.ColorUtil;
 	tags = {"grace", "marks", "overlay", "shortcuts", "skilling", "traps"}
 )
 @Slf4j
+@Singleton
 public class AgilityPlugin extends Plugin
 {
 	private static final int AGILITY_ARENA_REGION_ID = 11157;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final Map<TileObject, Obstacle> obstacles = new HashMap<>();
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final List<Tile> marksOfGrace = new ArrayList<>();
 
 	@Inject
@@ -117,13 +120,13 @@ public class AgilityPlugin extends Plugin
 	@Inject
 	private ItemManager itemManager;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private AgilitySession session;
 
 	private int lastAgilityXp;
 	private WorldPoint lastArenaTicketPosition;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private int agilityLevel;
 
 	@Provides
@@ -132,9 +135,36 @@ public class AgilityPlugin extends Plugin
 		return configManager.getConfig(AgilityConfig.class);
 	}
 
+	// Config values
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showLapCount;
+	@Getter(AccessLevel.PACKAGE)
+	private int lapTimeout;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean lapsToLevel;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean lapsToGoal;
+	@Getter(AccessLevel.PACKAGE)
+	private Color overlayColor;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean highlightMarks;
+	@Getter(AccessLevel.PACKAGE)
+	private Color markColor;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean highlightShortcuts;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showTrapOverlay;
+	@Getter(AccessLevel.PACKAGE)
+	private Color trapColor;
+	private boolean notifyAgilityArena;
+	private boolean showAgilityArenaTimer;
+	private boolean showShortcutLevel;
+
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
+
 		overlayManager.add(agilityOverlay);
 		overlayManager.add(lapCounterOverlay);
 		agilityLevel = client.getBoostedSkillLevel(Skill.AGILITY);
@@ -179,16 +209,40 @@ public class AgilityPlugin extends Plugin
 	@Subscribe
 	public void onConfigChanged(ConfigChanged event)
 	{
-		if (!config.showAgilityArenaTimer())
+		if (!event.getGroup().equals("agility"))
+		{
+			return;
+		}
+
+		updateConfig();
+
+		if (!this.showAgilityArenaTimer)
 		{
 			removeAgilityArenaTimer();
 		}
 	}
 
+	public void updateConfig()
+	{
+		this.showLapCount = config.showLapCount();
+		this.lapTimeout = config.lapTimeout();
+		this.lapsToLevel = config.lapsToLevel();
+		this.lapsToGoal = config.lapsToGoal();
+		this.overlayColor = config.getOverlayColor();
+		this.highlightMarks = config.highlightMarks();
+		this.markColor = config.getMarkColor();
+		this.highlightShortcuts = config.highlightShortcuts();
+		this.showTrapOverlay = config.showTrapOverlay();
+		this.trapColor = config.getTrapColor();
+		this.notifyAgilityArena = config.notifyAgilityArena();
+		this.showAgilityArenaTimer = config.showAgilityArenaTimer();
+		this.showShortcutLevel = config.showShortcutLevel();
+	}
+
 	@Subscribe
 	public void onExperienceChanged(ExperienceChanged event)
 	{
-		if (event.getSkill() != AGILITY || !config.showLapCount())
+		if (event.getSkill() != AGILITY || !this.showLapCount)
 		{
 			return;
 		}
@@ -272,12 +326,12 @@ public class AgilityPlugin extends Plugin
 			{
 				log.debug("Ticked position moved from {} to {}", oldTickPosition, newTicketPosition);
 
-				if (config.notifyAgilityArena())
+				if (this.notifyAgilityArena)
 				{
 					notifier.notify("Ticket location changed");
 				}
 
-				if (config.showAgilityArenaTimer())
+				if (this.showAgilityArenaTimer)
 				{
 					showNewAgilityArenaTimer();
 				}
@@ -430,7 +484,7 @@ public class AgilityPlugin extends Plugin
 	@Subscribe
 	public void onMenuEntryAdded(MenuEntryAdded event)
 	{
-		if (!config.showShortcutLevel())
+		if (!this.showShortcutLevel)
 		{
 			return;
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilitySession.java b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilitySession.java
index 72e9a0dd07..1c6e413a46 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilitySession.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilitySession.java
@@ -42,7 +42,7 @@ class AgilitySession
 	private int lapsTillLevel;
 	private int lapsTillGoal;
 
-	AgilitySession(Courses course)
+	AgilitySession(final Courses course)
 	{
 		this.course = course;
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agility/Courses.java b/runelite-client/src/main/java/net/runelite/client/plugins/agility/Courses.java
index cc732561c0..91812e30f8 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/agility/Courses.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/agility/Courses.java
@@ -26,6 +26,7 @@ package net.runelite.client.plugins.agility;
 
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.coords.WorldPoint;
 
@@ -50,16 +51,16 @@ enum Courses
 
 	private final static Map<Integer, Courses> coursesByRegion;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final double totalXp;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final int lastObstacleXp;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final int regionId;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final WorldPoint[] courseEndWorldPoints;
 
 	static
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agility/LapCounterOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/agility/LapCounterOverlay.java
index 04c60d4430..e8d0a2771c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/agility/LapCounterOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/agility/LapCounterOverlay.java
@@ -29,6 +29,7 @@ import java.awt.Graphics2D;
 import java.time.Duration;
 import java.time.Instant;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.client.ui.overlay.Overlay;
 import static net.runelite.client.ui.overlay.OverlayManager.OPTION_CONFIGURE;
@@ -39,21 +40,20 @@ import net.runelite.client.ui.overlay.components.PanelComponent;
 import net.runelite.client.ui.overlay.components.table.TableAlignment;
 import net.runelite.client.ui.overlay.components.table.TableComponent;
 
+@Singleton
 class LapCounterOverlay extends Overlay
 {
 	private final AgilityPlugin plugin;
-	private final AgilityConfig config;
 
 	private final PanelComponent panelComponent = new PanelComponent();
 
 	@Inject
-	private LapCounterOverlay(AgilityPlugin plugin, AgilityConfig config)
+	private LapCounterOverlay(final AgilityPlugin plugin)
 	{
 		super(plugin);
 		setPosition(OverlayPosition.TOP_LEFT);
 		setPriority(OverlayPriority.LOW);
 		this.plugin = plugin;
-		this.config = config;
 		getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY_CONFIG, OPTION_CONFIGURE, "Agility overlay"));
 	}
 
@@ -62,7 +62,7 @@ class LapCounterOverlay extends Overlay
 	{
 		AgilitySession session = plugin.getSession();
 
-		if (!config.showLapCount() ||
+		if (!plugin.isShowLapCount() ||
 			session == null ||
 			session.getLastLapCompleted() == null ||
 			session.getCourse() == null)
@@ -70,7 +70,7 @@ class LapCounterOverlay extends Overlay
 			return null;
 		}
 
-		Duration lapTimeout = Duration.ofMinutes(config.lapTimeout());
+		Duration lapTimeout = Duration.ofMinutes(plugin.getLapTimeout());
 		Duration sinceLap = Duration.between(session.getLastLapCompleted(), Instant.now());
 
 		if (sinceLap.compareTo(lapTimeout) >= 0)
@@ -85,12 +85,12 @@ class LapCounterOverlay extends Overlay
 		tableComponent.setColumnAlignments(TableAlignment.LEFT, TableAlignment.RIGHT);
 		tableComponent.addRow("Total Laps:", Integer.toString(session.getTotalLaps()));
 
-		if (config.lapsToLevel() && session.getLapsTillLevel() > 0)
+		if (plugin.isLapsToLevel() && session.getLapsTillLevel() > 0)
 		{
 			tableComponent.addRow("Laps until level:", Integer.toString(session.getLapsTillLevel()));
 		}
 
-		if (config.lapsToGoal() && session.getLapsTillGoal() > 0)
+		if (plugin.isLapsToGoal() && session.getLapsTillGoal() > 0)
 		{
 			tableComponent.addRow("Laps until goal:", Integer.toString(session.getLapsTillGoal()));
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/alchemicalhydra/HydraOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/alchemicalhydra/HydraOverlay.java
index e5860abcd0..a84ec94887 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/alchemicalhydra/HydraOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/alchemicalhydra/HydraOverlay.java
@@ -54,7 +54,7 @@ class HydraOverlay extends Overlay
 	private final PanelComponent panelComponent = new PanelComponent();
 
 	@Inject
-	HydraOverlay(HydraPlugin plugin, Client client, SpriteManager spriteManager)
+	HydraOverlay(final HydraPlugin plugin, final Client client, final SpriteManager spriteManager)
 	{
 		this.plugin = plugin;
 		this.client = client;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/alchemicalhydra/HydraPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/alchemicalhydra/HydraPlugin.java
index b92b6f3875..fe94944427 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/alchemicalhydra/HydraPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/alchemicalhydra/HydraPlugin.java
@@ -30,6 +30,7 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
@@ -59,6 +60,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	enabledByDefault = false
 )
 @Slf4j
+@Singleton
 public class HydraPlugin extends Plugin
 {
 	@Getter(AccessLevel.PACKAGE)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/alchemicalhydra/HydraSceneOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/alchemicalhydra/HydraSceneOverlay.java
index 52e02fadca..a38fa4ecfc 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/alchemicalhydra/HydraSceneOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/alchemicalhydra/HydraSceneOverlay.java
@@ -55,7 +55,7 @@ class HydraSceneOverlay extends Overlay
 	private final Client client;
 
 	@Inject
-	public HydraSceneOverlay(Client client, HydraPlugin plugin)
+	public HydraSceneOverlay(final Client client, final HydraPlugin plugin)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.UNDER_WIDGETS);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoCounter.java
index a9a25512a4..fe9729246c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoCounter.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoCounter.java
@@ -29,6 +29,7 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.Duration;
 import java.time.Instant;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.ui.overlay.infobox.Counter;
@@ -36,11 +37,11 @@ import net.runelite.client.util.StackFormatter;
 
 class AmmoCounter extends Counter
 {
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private int itemID;
-	private String name;
-	private int total;
-	private Instant time;
+	private final String name;
+	private final int total;
+	private final Instant time;
 	private BigDecimal ammoPerHour;
 
 	AmmoCounter(Plugin plugin, int itemID, int count, String name, BufferedImage image)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoPlugin.java
index 5336fccd66..ee2b31666b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoPlugin.java
@@ -26,6 +26,7 @@ package net.runelite.client.plugins.ammo;
 
 import java.awt.image.BufferedImage;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.EquipmentInventorySlot;
 import net.runelite.api.InventoryID;
@@ -45,6 +46,7 @@ import net.runelite.client.ui.overlay.infobox.InfoBoxManager;
 	description = "Shows the current ammo the player has equipped",
 	tags = {"bolts", "darts", "chinchompa", "equipment"}
 )
+@Singleton
 public class AmmoPlugin extends Plugin
 {
 	@Inject
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/animsmoothing/AnimationSmoothingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/animsmoothing/AnimationSmoothingPlugin.java
index 40cc9fc1b9..6a23856217 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/animsmoothing/AnimationSmoothingPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/animsmoothing/AnimationSmoothingPlugin.java
@@ -26,6 +26,7 @@ package net.runelite.client.plugins.animsmoothing;
 
 import com.google.inject.Provides;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.events.ConfigChanged;
 import net.runelite.client.config.ConfigManager;
@@ -39,6 +40,7 @@ import net.runelite.client.plugins.PluginDescriptor;
 	tags = {"npcs", "objects", "players"},
 	enabledByDefault = false
 )
+@Singleton
 public class AnimationSmoothingPlugin extends Plugin
 {
 	static final String CONFIG_GROUP = "animationSmoothing";
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragConfig.java
index 69a54cc971..bd3de31419 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragConfig.java
@@ -37,7 +37,6 @@ import net.runelite.client.config.ModifierlessKeybind;
 @ConfigGroup("antiDrag")
 public interface AntiDragConfig extends Config
 {
-
 	@ConfigItem(
 		position = 0,
 		keyName = "alwaysOn",
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragOverlay.java
index c35d9ac0b9..e1550efe33 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragOverlay.java
@@ -42,13 +42,13 @@ public class AntiDragOverlay extends Overlay
 {
 	private static final int RADIUS = 20;
 
-	private Client client;
-	private AntiDragConfig config;
+	private final Client client;
+	private final AntiDragPlugin plugin;
 
 	@Inject
-	private AntiDragOverlay(Client client, AntiDragConfig config)
+	private AntiDragOverlay(final Client client, final AntiDragPlugin plugin)
 	{
-		this.config = config;
+		this.plugin = plugin;
 		this.client = client;
 		setPosition(OverlayPosition.TOOLTIP);
 		setPriority(OverlayPriority.HIGHEST);
@@ -58,7 +58,7 @@ public class AntiDragOverlay extends Overlay
 	@Override
 	public Dimension render(Graphics2D g)
 	{
-		final Color color = config.color();
+		final Color color = plugin.getColor();
 		g.setColor(color);
 
 		final net.runelite.api.Point mouseCanvasPosition = client.getMouseCanvasPosition();
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java
index 687ee9bc20..ed6d07b6af 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java
@@ -26,11 +26,16 @@
 package net.runelite.client.plugins.antidrag;
 
 import com.google.inject.Provides;
+import java.awt.Color;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
+import lombok.Getter;
 import net.runelite.api.Client;
 import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.FocusChanged;
 import net.runelite.client.config.ConfigManager;
+import net.runelite.client.config.Keybind;
 import net.runelite.client.eventbus.Subscribe;
 import net.runelite.client.input.KeyManager;
 import net.runelite.client.plugins.Plugin;
@@ -48,11 +53,11 @@ import net.runelite.client.util.HotkeyListener;
 	type = PluginType.UTILITY,
 	enabledByDefault = false
 )
-
+@Singleton
 public class AntiDragPlugin extends Plugin
 {
 	private static final int DEFAULT_DELAY = 5;
-	
+
 	private boolean toggleDrag;
 
 	@Inject
@@ -82,14 +87,27 @@ public class AntiDragPlugin extends Plugin
 		return configManager.getConfig(AntiDragConfig.class);
 	}
 
+	private boolean alwaysOn;
+	private boolean keybind;
+	private Keybind key;
+	private int dragDelay;
+	private boolean reqfocus;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean configOverlay;
+	@Getter(AccessLevel.PACKAGE)
+	private Color color;
+	private boolean changeCursor;
+	private CustomCursor selectedCursor;
+
 	@Override
 	protected void startUp() throws Exception
 	{
-		if (config.keybind())
+		updateConfig();
+		if (this.keybind)
 		{
 			keyManager.registerKeyListener(hotkeyListener);
 		}
-		client.setInventoryDragDelay(config.alwaysOn() ? config.dragDelay() : DEFAULT_DELAY);
+		client.setInventoryDragDelay(this.alwaysOn ? this.dragDelay : DEFAULT_DELAY);
 	}
 
 	@Override
@@ -106,9 +124,11 @@ public class AntiDragPlugin extends Plugin
 	{
 		if (event.getGroup().equals("antiDrag"))
 		{
+			updateConfig();
+
 			if (event.getKey().equals("keybind"))
 			{
-				if (config.keybind())
+				if (this.keybind)
 				{
 					keyManager.registerKeyListener(hotkeyListener);
 				}
@@ -119,51 +139,60 @@ public class AntiDragPlugin extends Plugin
 			}
 			if (event.getKey().equals("alwaysOn"))
 			{
-				client.setInventoryDragDelay(config.alwaysOn() ? config.dragDelay() : DEFAULT_DELAY);
+				client.setInventoryDragDelay(this.alwaysOn ? this.dragDelay : DEFAULT_DELAY);
 			}
 		}
 	}
 
+	private void updateConfig()
+	{
+		this.alwaysOn = config.alwaysOn();
+		this.keybind = config.keybind();
+		this.key = config.key();
+		this.dragDelay = config.dragDelay();
+		this.reqfocus = config.reqfocus();
+		this.configOverlay = config.overlay();
+		this.color = config.color();
+		this.changeCursor = config.changeCursor();
+		this.selectedCursor = config.selectedCursor();
+	}
+
 	@Subscribe
 	public void onFocusChanged(FocusChanged focusChanged)
 	{
-		if (!config.alwaysOn())
+		if (!this.alwaysOn && !focusChanged.isFocused() && this.reqfocus)
 		{
-			if (!focusChanged.isFocused() && config.reqfocus())
-			{
-				client.setInventoryDragDelay(DEFAULT_DELAY);
-				overlayManager.remove(overlay);
-			}
+			client.setInventoryDragDelay(DEFAULT_DELAY);
+			overlayManager.remove(overlay);
 		}
 	}
 
-	private final HotkeyListener hotkeyListener = new HotkeyListener(() -> config.key())
+	private final HotkeyListener hotkeyListener = new HotkeyListener(() -> this.key)
 	{
 		@Override
 		public void hotkeyPressed()
 		{
-			if (!config.alwaysOn())
+			if (!alwaysOn)
 			{
 				toggleDrag = !toggleDrag;
 				if (toggleDrag)
 				{
-					if (config.overlay())
+					if (configOverlay)
 					{
 						overlayManager.add(overlay);
 					}
-					if (config.changeCursor())
+					if (changeCursor)
 					{
-						CustomCursor selectedCursor = config.selectedCursor();
 						clientUI.setCursor(selectedCursor.getCursorImage(), selectedCursor.toString());
 					}
 
-					client.setInventoryDragDelay(config.dragDelay());
+					client.setInventoryDragDelay(dragDelay);
 				}
 				else
 				{
 					overlayManager.remove(overlay);
 					client.setInventoryDragDelay(DEFAULT_DELAY);
-					if (config.changeCursor())
+					if (changeCursor)
 					{
 						net.runelite.client.plugins.customcursor.CustomCursor selectedCursor = configManager.getConfig(CustomCursorConfig.class).selectedCursor();
 						clientUI.setCursor(selectedCursor.getCursorImage(), selectedCursor.toString());
@@ -172,4 +201,4 @@ public class AntiDragPlugin extends Plugin
 			}
 		}
 	};
-}
+}
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/CustomCursor.java b/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/CustomCursor.java
index 27b3706c78..e6e3b5da8e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/CustomCursor.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/CustomCursor.java
@@ -25,6 +25,7 @@
 package net.runelite.client.plugins.antidrag;
 
 import java.awt.image.BufferedImage;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.client.plugins.customcursor.CustomCursorPlugin;
 import net.runelite.client.util.ImageUtil;
@@ -43,7 +44,8 @@ public enum CustomCursor
 	ZAMORAK_GODSWORD("Zamorak Godsword", "cursor-zamorak-godsword.png");
 
 	private final String name;
-	@Getter
+
+	@Getter(AccessLevel.PACKAGE)
 	private final BufferedImage cursorImage;
 
 	CustomCursor(String name, String icon)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeProjectile.java b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeProjectile.java
index a00d79e403..f875cae629 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeProjectile.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeProjectile.java
@@ -28,11 +28,12 @@
 package net.runelite.client.plugins.aoewarnings;
 
 import java.time.Instant;
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import net.runelite.api.coords.LocalPoint;
 
-@Getter
+@Getter(AccessLevel.PACKAGE)
 @AllArgsConstructor
 class AoeProjectile
 {
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningOverlay.java
index 48491da688..0b82eafdb4 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningOverlay.java
@@ -37,6 +37,7 @@ import java.time.Instant;
 import java.util.Iterator;
 import java.util.Map;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.Perspective;
 import net.runelite.api.Point;
@@ -48,6 +49,7 @@ import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayUtil;
 import static net.runelite.client.util.ColorUtil.setAlphaComponent;
 
+@Singleton
 public class AoeWarningOverlay extends Overlay
 {
 	private static final int FILL_START_ALPHA = 25;
@@ -55,16 +57,14 @@ public class AoeWarningOverlay extends Overlay
 
 	private final Client client;
 	private final AoeWarningPlugin plugin;
-	private final AoeWarningConfig config;
 
 	@Inject
-	public AoeWarningOverlay(Client client, AoeWarningPlugin plugin, AoeWarningConfig config)
+	public AoeWarningOverlay(final Client client, final AoeWarningPlugin plugin)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.UNDER_WIDGETS);
 		this.client = client;
 		this.plugin = plugin;
-		this.config = config;
 	}
 
 	@Override
@@ -115,7 +115,7 @@ public class AoeWarningOverlay extends Overlay
 			int tickProgress = aoeProjectile.getFinalTick() - client.getTickCount();
 
 			int fillAlpha, outlineAlpha;
-			if (config.isFadeEnabled())
+			if (plugin.isConfigFadeEnabled())
 			{
 				fillAlpha = (int) ((1 - progress) * FILL_START_ALPHA);//alpha drop off over lifetime
 				outlineAlpha = (int) ((1 - progress) * OUTLINE_START_ALPHA);
@@ -152,20 +152,18 @@ public class AoeWarningOverlay extends Overlay
 				outlineAlpha = 255;
 			}
 
-			if (config.isOutlineEnabled())
+			if (plugin.isConfigOutlineEnabled())
 			{
-				graphics.setColor(new Color(setAlphaComponent(config.overlayColor().getRGB(), outlineAlpha), true));
+				graphics.setColor(new Color(setAlphaComponent(plugin.getOverlayColor().getRGB(), outlineAlpha), true));
 				graphics.drawPolygon(tilePoly);
 			}
-			if (config.tickTimers())
+			if (plugin.isTickTimers() && tickProgress >= 0)
 			{
-				if (tickProgress >= 0)
-				{
-					OverlayUtil.renderTextLocation(graphics, Integer.toString(tickProgress), plugin.getTextSize(),
-						plugin.getFontStyle(), color, centerPoint(tilePoly.getBounds()), plugin.isShadows(), 0);
-				}
+				OverlayUtil.renderTextLocation(graphics, Integer.toString(tickProgress), plugin.getTextSize(),
+					plugin.getFontStyle(), color, centerPoint(tilePoly.getBounds()), plugin.isShadows(), 0);
 			}
-			graphics.setColor(new Color(setAlphaComponent(config.overlayColor().getRGB(), fillAlpha), true));
+
+			graphics.setColor(new Color(setAlphaComponent(plugin.getOverlayColor().getRGB(), fillAlpha), true));
 			graphics.fillPolygon(tilePoly);
 		}
 		return null;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningPlugin.java
index 00ed024a44..95ea50287e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningPlugin.java
@@ -28,6 +28,7 @@ package net.runelite.client.plugins.aoewarnings;
 
 
 import com.google.inject.Provides;
+import java.awt.Color;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -35,6 +36,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
@@ -70,12 +72,13 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	type = PluginType.PVM,
 	enabledByDefault = false
 )
-
+@Singleton
 @Slf4j
 public class AoeWarningPlugin extends Plugin
 {
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final Map<WorldPoint, CrystalBomb> bombs = new HashMap<>();
+	@Getter(AccessLevel.PACKAGE)
 	private final Map<Projectile, AoeProjectile> projectiles = new HashMap<>();
 	@Inject
 	public AoeWarningConfig config;
@@ -97,12 +100,6 @@ public class AoeWarningPlugin extends Plugin
 	private List<WorldPoint> CrystalSpike = new ArrayList<>();
 	@Getter(AccessLevel.PACKAGE)
 	private List<WorldPoint> WintertodtSnowFall = new ArrayList<>();
-	@Getter(AccessLevel.PACKAGE)
-	private boolean shadows;
-	@Getter(AccessLevel.PACKAGE)
-	private int textSize;
-	@Getter(AccessLevel.PACKAGE)
-	private int fontStyle;
 
 	@Provides
 	AoeWarningConfig getConfig(ConfigManager configManager)
@@ -110,17 +107,73 @@ public class AoeWarningPlugin extends Plugin
 		return configManager.getConfig(AoeWarningConfig.class);
 	}
 
-	Map<Projectile, AoeProjectile> getProjectiles()
-	{
-		return projectiles;
-	}
+	// Config values
+	private boolean aoeNotifyAll;
+	@Getter(AccessLevel.PACKAGE)
+	private Color overlayColor;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean configOutlineEnabled;
+	private int delay;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean configFadeEnabled;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean tickTimers;
+	@Getter(AccessLevel.PACKAGE)
+	private int fontStyle;
+	@Getter(AccessLevel.PACKAGE)
+	private int textSize;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean shadows;
+	private boolean configShamansEnabled;
+	private boolean configShamansNotifyEnabled;
+	private boolean configArchaeologistEnabled;
+	private boolean configArchaeologistNotifyEnabled;
+	private boolean configIceDemonEnabled;
+	private boolean configIceDemonNotifyEnabled;
+	private boolean configVasaEnabled;
+	private boolean configVasaNotifyEnabled;
+	private boolean configTektonEnabled;
+	private boolean configTektonNotifyEnabled;
+	private boolean configVorkathEnabled;
+	private boolean configVorkathNotifyEnabled;
+	private boolean configGalvekEnabled;
+	private boolean configGalvekNotifyEnabled;
+	private boolean configGargBossEnabled;
+	private boolean configGargBossNotifyEnabled;
+	private boolean configVetionEnabled;
+	private boolean configVetionNotifyEnabled;
+	private boolean configChaosFanaticEnabled;
+	private boolean configChaosFanaticNotifyEnabled;
+	private boolean configOlmEnabled;
+	private boolean configOlmNotifyEnabled;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean configbombDisplay;
+	private boolean configbombDisplayNotifyEnabled;
+	private boolean configLightningTrail;
+	private boolean configLightningTrailNotifyEnabled;
+	private boolean configCorpEnabled;
+	private boolean configCorpNotifyEnabled;
+	private boolean configWintertodtEnabled;
+	private boolean configWintertodtNotifyEnabled;
+	private boolean configXarpusEnabled;
+	private boolean configXarpusNotifyEnabled;
+	private boolean configaddyDrags;
+	private boolean configaddyDragsNotifyEnabled;
+	private boolean configDrakeEnabled;
+	private boolean configDrakeNotifyEnabled;
+	private boolean configCerbFireEnabled;
+	private boolean configCerbFireNotifyEnabled;
+	private boolean configDemonicGorillaEnabled;
+	private boolean configDemonicGorillaNotifyEnabled;
 
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
+
 		overlayManager.add(coreOverlay);
 		overlayManager.add(bombOverlay);
-		reset(true);
+		reset();
 	}
 
 	@Override
@@ -128,7 +181,7 @@ public class AoeWarningPlugin extends Plugin
 	{
 		overlayManager.remove(coreOverlay);
 		overlayManager.remove(bombOverlay);
-		reset(false);
+		reset();
 	}
 
 	@Subscribe
@@ -139,18 +192,7 @@ public class AoeWarningPlugin extends Plugin
 			return;
 		}
 
-		switch (event.getKey())
-		{
-			case "fontStyle":
-				fontStyle = config.fontStyle().getFont();
-				break;
-			case "textSize":
-				textSize = config.textSize();
-				break;
-			case "shadows":
-				shadows = config.shadows();
-				break;
-		}
+		updateConfig();
 	}
 
 	@Subscribe
@@ -159,7 +201,7 @@ public class AoeWarningPlugin extends Plugin
 		Projectile projectile = event.getProjectile();
 
 		int projectileId = projectile.getId();
-		int projectileLifetime = config.delay() + (projectile.getRemainingCycles() * 20);
+		int projectileLifetime = this.delay + (projectile.getRemainingCycles() * 20);
 		int ticksRemaining = projectile.getRemainingCycles() / 30;
 		if (!isTickTimersEnabledForProjectileID(projectileId))
 		{
@@ -174,7 +216,7 @@ public class AoeWarningPlugin extends Plugin
 			AoeProjectile aoeProjectile = new AoeProjectile(Instant.now(), targetPoint, aoeProjectileInfo, projectileLifetime, tickCycle);
 			projectiles.put(projectile, aoeProjectile);
 
-			if (config.aoeNotifyAll() || isConfigEnabledForProjectileId(projectileId, true))
+			if (this.aoeNotifyAll || isConfigEnabledForProjectileId(projectileId, true))
 			{
 				notifier.notify("AoE attack detected!");
 			}
@@ -192,7 +234,7 @@ public class AoeWarningPlugin extends Plugin
 			case ObjectID.CRYSTAL_BOMB:
 				bombs.put(wp, new CrystalBomb(gameObject, client.getTickCount()));
 
-				if (config.aoeNotifyAll() || config.bombDisplayNotifyEnabled())
+				if (this.aoeNotifyAll || this.configbombDisplayNotifyEnabled)
 				{
 					notifier.notify("Bomb!");
 				}
@@ -205,11 +247,11 @@ public class AoeWarningPlugin extends Plugin
 				break;
 			case NullObjectID.NULL_26690:
 				//Wintertodt Snowfall
-				if (config.isWintertodtEnabled())
+				if (this.configWintertodtEnabled)
 				{
 					WintertodtSnowFall.add(wp);
 
-					if (config.aoeNotifyAll() || config.isWintertodtNotifyEnabled())
+					if (this.aoeNotifyAll || this.configWintertodtNotifyEnabled)
 					{
 						notifier.notify("Snow Fall!");
 					}
@@ -236,7 +278,7 @@ public class AoeWarningPlugin extends Plugin
 				break;
 			case NullObjectID.NULL_26690:
 				//Wintertodt Snowfall
-				if (config.isWintertodtEnabled())
+				if (this.configWintertodtEnabled)
 				{
 					WintertodtSnowFall.remove(wp);
 				}
@@ -256,7 +298,7 @@ public class AoeWarningPlugin extends Plugin
 	@Subscribe
 	public void onGameTick(GameTick event)
 	{
-		if (config.LightningTrail())
+		if (this.configLightningTrail)
 		{
 			LightningTrail.clear();
 			for (GraphicsObject o : client.getGraphicsObjects())
@@ -265,7 +307,7 @@ public class AoeWarningPlugin extends Plugin
 				{
 					LightningTrail.add(WorldPoint.fromLocal(client, o.getLocation()));
 
-					if (config.aoeNotifyAll() || config.LightningTrailNotifyEnabled())
+					if (this.aoeNotifyAll || this.configLightningTrailNotifyEnabled)
 					{
 						notifier.notify("Lightning!");
 					}
@@ -350,7 +392,7 @@ public class AoeWarningPlugin extends Plugin
 			return false;
 		}
 
-		if (notify && config.aoeNotifyAll())
+		if (notify && this.aoeNotifyAll)
 		{
 			return true;
 		}
@@ -358,57 +400,110 @@ public class AoeWarningPlugin extends Plugin
 		switch (projectileInfo)
 		{
 			case LIZARDMAN_SHAMAN_AOE:
-				return notify ? config.isShamansNotifyEnabled() : config.isShamansEnabled();
+				return notify ? this.configShamansNotifyEnabled : this.configShamansEnabled;
 			case CRAZY_ARCHAEOLOGIST_AOE:
-				return notify ? config.isArchaeologistNotifyEnabled() : config.isArchaeologistEnabled();
+				return notify ? this.configArchaeologistNotifyEnabled : this.configArchaeologistEnabled;
 			case ICE_DEMON_RANGED_AOE:
 			case ICE_DEMON_ICE_BARRAGE_AOE:
-				return notify ? config.isIceDemonNotifyEnabled() : config.isIceDemonEnabled();
+				return notify ? this.configIceDemonNotifyEnabled : this.configIceDemonEnabled;
 			case VASA_AWAKEN_AOE:
 			case VASA_RANGED_AOE:
-				return notify ? config.isVasaNotifyEnabled() : config.isVasaEnabled();
+				return notify ? this.configVasaNotifyEnabled : this.configVasaEnabled;
 			case TEKTON_METEOR_AOE:
-				return notify ? config.isTektonNotifyEnabled() : config.isTektonEnabled();
+				return notify ? this.configTektonNotifyEnabled : this.configTektonEnabled;
 			case VORKATH_BOMB:
 			case VORKATH_POISON_POOL:
 			case VORKATH_SPAWN:
 			case VORKATH_TICK_FIRE:
-				return notify ? config.isVorkathNotifyEnabled() : config.isVorkathEnabled();
+				return notify ? this.configVorkathNotifyEnabled : this.configVorkathEnabled;
 			case VETION_LIGHTNING:
-				return notify ? config.isVetionNotifyEnabled() : config.isVetionEnabled();
+				return notify ? this.configVetionNotifyEnabled : this.configVetionEnabled;
 			case CHAOS_FANATIC:
-				return notify ? config.isChaosFanaticNotifyEnabled() : config.isChaosFanaticEnabled();
+				return notify ? this.configChaosFanaticNotifyEnabled : this.configChaosFanaticEnabled;
 			case GALVEK_BOMB:
 			case GALVEK_MINE:
-				return notify ? config.isGalvekNotifyEnabled() : config.isGalvekEnabled();
+				return notify ? this.configGalvekNotifyEnabled : this.configGalvekEnabled;
 			case DAWN_FREEZE:
 			case DUSK_CEILING:
-				return notify ? config.isGargBossNotifyEnabled() : config.isGargBossEnabled();
+				return notify ? this.configGargBossNotifyEnabled : this.configGargBossEnabled;
 			case OLM_FALLING_CRYSTAL:
 			case OLM_BURNING:
 			case OLM_FALLING_CRYSTAL_TRAIL:
 			case OLM_ACID_TRAIL:
 			case OLM_FIRE_LINE:
-				return notify ? config.isOlmNotifyEnabled() : config.isOlmEnabled();
+				return notify ? this.configOlmNotifyEnabled : this.configOlmEnabled;
 			case CORPOREAL_BEAST:
 			case CORPOREAL_BEAST_DARK_CORE:
-				return notify ? config.isCorpNotifyEnabled() : config.isCorpEnabled();
+				return notify ? this.configCorpNotifyEnabled : this.configCorpEnabled;
 			case XARPUS_POISON_AOE:
-				return notify ? config.isXarpusNotifyEnabled() : config.isXarpusEnabled();
+				return notify ? this.configXarpusNotifyEnabled : this.configXarpusEnabled;
 			case ADDY_DRAG_POISON:
-				return notify ? config.addyDragsNotifyEnabled() : config.addyDrags();
+				return notify ? this.configaddyDragsNotifyEnabled : this.configaddyDrags;
 			case DRAKE_BREATH:
-				return notify ? config.isDrakeNotifyEnabled() : config.isDrakeEnabled();
+				return notify ? this.configDrakeNotifyEnabled : this.configDrakeEnabled;
 			case CERB_FIRE:
-				return notify ? config.isCerbFireNotifyEnabled() : config.isCerbFireEnabled();
+				return notify ? this.configCerbFireNotifyEnabled : this.configCerbFireEnabled;
 			case DEMONIC_GORILLA_BOULDER:
-				return notify ? config.isDemonicGorillaNotifyEnabled() : config.isDemonicGorillaEnabled();
+				return notify ? this.configDemonicGorillaNotifyEnabled : this.configDemonicGorillaEnabled;
 		}
 
 		return false;
 	}
 
-	private void reset(boolean setConfig)
+	private void updateConfig()
+	{
+		this.aoeNotifyAll = config.aoeNotifyAll();
+		this.overlayColor = config.overlayColor();
+		this.configOutlineEnabled = config.isOutlineEnabled();
+		this.delay = config.delay();
+		this.configFadeEnabled = config.isFadeEnabled();
+		this.tickTimers = config.tickTimers();
+		this.fontStyle = config.fontStyle().getFont();
+		this.textSize = config.textSize();
+		this.shadows = config.shadows();
+		this.configShamansEnabled = config.isShamansEnabled();
+		this.configShamansNotifyEnabled = config.isShamansNotifyEnabled();
+		this.configArchaeologistEnabled = config.isArchaeologistEnabled();
+		this.configArchaeologistNotifyEnabled = config.isArchaeologistNotifyEnabled();
+		this.configIceDemonEnabled = config.isIceDemonEnabled();
+		this.configIceDemonNotifyEnabled = config.isIceDemonNotifyEnabled();
+		this.configVasaEnabled = config.isVasaEnabled();
+		this.configVasaNotifyEnabled = config.isVasaNotifyEnabled();
+		this.configTektonEnabled = config.isTektonEnabled();
+		this.configTektonNotifyEnabled = config.isTektonNotifyEnabled();
+		this.configVorkathEnabled = config.isVorkathEnabled();
+		this.configVorkathNotifyEnabled = config.isVorkathNotifyEnabled();
+		this.configGalvekEnabled = config.isGalvekEnabled();
+		this.configGalvekNotifyEnabled = config.isGalvekNotifyEnabled();
+		this.configGargBossEnabled = config.isGargBossEnabled();
+		this.configGargBossNotifyEnabled = config.isGargBossNotifyEnabled();
+		this.configVetionEnabled = config.isVetionEnabled();
+		this.configVetionNotifyEnabled = config.isVetionNotifyEnabled();
+		this.configChaosFanaticEnabled = config.isChaosFanaticEnabled();
+		this.configChaosFanaticNotifyEnabled = config.isChaosFanaticNotifyEnabled();
+		this.configOlmEnabled = config.isOlmEnabled();
+		this.configOlmNotifyEnabled = config.isOlmNotifyEnabled();
+		this.configbombDisplay = config.bombDisplay();
+		this.configbombDisplayNotifyEnabled = config.bombDisplayNotifyEnabled();
+		this.configLightningTrail = config.LightningTrail();
+		this.configLightningTrailNotifyEnabled = config.LightningTrailNotifyEnabled();
+		this.configCorpEnabled = config.isCorpEnabled();
+		this.configCorpNotifyEnabled = config.isCorpNotifyEnabled();
+		this.configWintertodtEnabled = config.isWintertodtEnabled();
+		this.configWintertodtNotifyEnabled = config.isWintertodtNotifyEnabled();
+		this.configXarpusEnabled = config.isXarpusEnabled();
+		this.configXarpusNotifyEnabled = config.isXarpusNotifyEnabled();
+		this.configaddyDrags = config.addyDrags();
+		this.configaddyDragsNotifyEnabled = config.addyDragsNotifyEnabled();
+		this.configDrakeEnabled = config.isDrakeEnabled();
+		this.configDrakeNotifyEnabled = config.isDrakeNotifyEnabled();
+		this.configCerbFireEnabled = config.isCerbFireEnabled();
+		this.configCerbFireNotifyEnabled = config.isCerbFireNotifyEnabled();
+		this.configDemonicGorillaEnabled = config.isDemonicGorillaEnabled();
+		this.configDemonicGorillaNotifyEnabled = config.isDemonicGorillaNotifyEnabled();
+	}
+
+	private void reset()
 	{
 		LightningTrail.clear();
 		AcidTrail.clear();
@@ -416,11 +511,5 @@ public class AoeWarningPlugin extends Plugin
 		WintertodtSnowFall.clear();
 		bombs.clear();
 		projectiles.clear();
-		if (setConfig)
-		{
-			fontStyle = config.fontStyle().getFont();
-			textSize = config.textSize();
-			shadows = config.shadows();
-		}
 	}
-}
\ No newline at end of file
+}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/BombOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/BombOverlay.java
index 317f5ad04b..d51b52aee3 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/BombOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/BombOverlay.java
@@ -32,10 +32,10 @@ import java.awt.Polygon;
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
 import java.time.Instant;
-import java.util.Iterator;
 import java.util.Locale;
 import java.util.Map;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
 import net.runelite.api.Perspective;
@@ -50,6 +50,7 @@ import net.runelite.client.ui.overlay.OverlayPriority;
 import net.runelite.client.ui.overlay.OverlayUtil;
 
 @Slf4j
+@Singleton
 public class BombOverlay extends Overlay
 {
 
@@ -81,15 +82,13 @@ public class BombOverlay extends Overlay
 	}
 
 	private final Client client;
-	private final AoeWarningConfig config;
 	private final AoeWarningPlugin plugin;
 
 	@Inject
-	public BombOverlay(Client client, AoeWarningPlugin plugin, AoeWarningConfig config)
+	public BombOverlay(final Client client, final AoeWarningPlugin plugin)
 	{
 		this.client = client;
 		this.plugin = plugin;
-		this.config = config;
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_SCENE);
 		setPriority(OverlayPriority.MED);
@@ -98,7 +97,7 @@ public class BombOverlay extends Overlay
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (config.bombDisplay())
+		if (plugin.isConfigbombDisplay())
 		{
 			drawBombs(graphics);
 		}
@@ -108,10 +107,8 @@ public class BombOverlay extends Overlay
 	private void drawBombs(Graphics2D graphics)
 	//I can condense drawDangerZone into this. Ambivalent though.
 	{
-		Iterator<Map.Entry<WorldPoint, CrystalBomb>> it = plugin.getBombs().entrySet().iterator();
-		while (it.hasNext())
+		for (Map.Entry<WorldPoint, CrystalBomb> entry : plugin.getBombs().entrySet())
 		{
-			Map.Entry<WorldPoint, CrystalBomb> entry = it.next();
 			CrystalBomb bomb = entry.getValue();
 			drawDangerZone(graphics, bomb);
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/CrystalBomb.java b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/CrystalBomb.java
index 5e871dca12..0a63fa4b97 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/CrystalBomb.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/CrystalBomb.java
@@ -25,6 +25,7 @@
 package net.runelite.client.plugins.aoewarnings;
 
 import java.time.Instant;
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.GameObject;
@@ -33,20 +34,20 @@ import net.runelite.api.coords.WorldPoint;
 @Slf4j
 class CrystalBomb
 {
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private Instant plantedOn;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private Instant lastClockUpdate;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private int objectId;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private int tickStarted;
 	//
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private WorldPoint worldLocation;
 
 	CrystalBomb(GameObject gameObject, int startTick)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesOverlay.java
index 0660c1e659..b2112f1420 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesOverlay.java
@@ -28,6 +28,7 @@ import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.client.ui.overlay.Overlay;
 import static net.runelite.client.ui.overlay.OverlayManager.OPTION_CONFIGURE;
@@ -36,19 +37,18 @@ import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.components.PanelComponent;
 import net.runelite.client.ui.overlay.components.TitleComponent;
 
+@Singleton
 class AttackStylesOverlay extends Overlay
 {
 	private final AttackStylesPlugin plugin;
-	private final AttackStylesConfig config;
 	private final PanelComponent panelComponent = new PanelComponent();
 
 	@Inject
-	private AttackStylesOverlay(AttackStylesPlugin plugin, AttackStylesConfig config)
+	private AttackStylesOverlay(final AttackStylesPlugin plugin)
 	{
 		super(plugin);
 		setPosition(OverlayPosition.ABOVE_CHATBOX_RIGHT);
 		this.plugin = plugin;
-		this.config = config;
 		getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY_CONFIG, OPTION_CONFIGURE, "Attack style overlay"));
 	}
 
@@ -58,7 +58,7 @@ class AttackStylesOverlay extends Overlay
 		panelComponent.getChildren().clear();
 		boolean warnedSkillSelected = plugin.isWarnedSkillSelected();
 
-		if (warnedSkillSelected || config.alwaysShowStyle())
+		if (warnedSkillSelected || plugin.isAlwaysShowStyle())
 		{
 			final String attackStyleString = plugin.getAttackStyle().getName();
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java
index db7a9ed751..1a99f715af 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java
@@ -31,6 +31,9 @@ import com.google.inject.Provides;
 import java.util.HashSet;
 import java.util.Set;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
+import lombok.Getter;
 import net.runelite.api.Client;
 import net.runelite.api.GameState;
 import net.runelite.api.Skill;
@@ -60,6 +63,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	description = "Show your current attack style as an overlay",
 	tags = {"combat", "defence", "magic", "overlay", "ranged", "strength", "warn", "pure"}
 )
+@Singleton
 public class AttackStylesPlugin extends Plugin
 {
 	private int attackStyleVarbit = -1;
@@ -91,9 +95,22 @@ public class AttackStylesPlugin extends Plugin
 		return configManager.getConfig(AttackStylesConfig.class);
 	}
 
+	// config values
+	@Getter(AccessLevel.PACKAGE)
+	private boolean alwaysShowStyle;
+	private boolean warnForDefence;
+	private boolean warnForAttack;
+	private boolean warnForStrength;
+	private boolean warnForRanged;
+	private boolean warnForMagic;
+	private boolean hideAutoRetaliate;
+	private boolean removeWarnedStyles;
+
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
+
 		overlayManager.add(overlay);
 
 		if (client.getGameState() == GameState.LOGGED_IN)
@@ -104,11 +121,11 @@ public class AttackStylesPlugin extends Plugin
 
 	private void start()
 	{
-		updateWarnedSkills(config.warnForAttack(), Skill.ATTACK);
-		updateWarnedSkills(config.warnForStrength(), Skill.STRENGTH);
-		updateWarnedSkills(config.warnForDefence(), Skill.DEFENCE);
-		updateWarnedSkills(config.warnForRanged(), Skill.RANGED);
-		updateWarnedSkills(config.warnForMagic(), Skill.MAGIC);
+		updateWarnedSkills(warnForAttack, Skill.ATTACK);
+		updateWarnedSkills(warnForStrength, Skill.STRENGTH);
+		updateWarnedSkills(warnForDefence, Skill.DEFENCE);
+		updateWarnedSkills(warnForRanged, Skill.RANGED);
+		updateWarnedSkills(warnForMagic, Skill.MAGIC);
 		attackStyleVarbit = client.getVar(VarPlayer.ATTACK_STYLE);
 		equippedWeaponTypeVarbit = client.getVar(Varbits.EQUIPPED_WEAPON_TYPE);
 		castingModeVarbit = client.getVar(Varbits.DEFENSIVE_CASTING_MODE);
@@ -134,7 +151,7 @@ public class AttackStylesPlugin extends Plugin
 		return attackStyle;
 	}
 
-	public boolean isWarnedSkillSelected()
+	boolean isWarnedSkillSelected()
 	{
 		return warnedSkillSelected;
 	}
@@ -175,7 +192,7 @@ public class AttackStylesPlugin extends Plugin
 				hideWidget(client.getWidget(widgetKey), widgetsToHide.get(equippedWeaponType, widgetKey));
 			}
 		}
-		hideWidget(client.getWidget(WidgetInfo.COMBAT_AUTO_RETALIATE), config.hideAutoRetaliate());
+		hideWidget(client.getWidget(WidgetInfo.COMBAT_AUTO_RETALIATE), this.hideAutoRetaliate);
 	}
 
 	@Subscribe
@@ -183,11 +200,11 @@ public class AttackStylesPlugin extends Plugin
 	{
 		if (event.getGameState() == GameState.LOGGED_IN)
 		{
-			updateWarnedSkills(config.warnForAttack(), Skill.ATTACK);
-			updateWarnedSkills(config.warnForStrength(), Skill.STRENGTH);
-			updateWarnedSkills(config.warnForDefence(), Skill.DEFENCE);
-			updateWarnedSkills(config.warnForRanged(), Skill.RANGED);
-			updateWarnedSkills(config.warnForMagic(), Skill.MAGIC);
+			updateWarnedSkills(this.warnForAttack, Skill.ATTACK);
+			updateWarnedSkills(this.warnForStrength, Skill.STRENGTH);
+			updateWarnedSkills(this.warnForDefence, Skill.DEFENCE);
+			updateWarnedSkills(this.warnForRanged, Skill.RANGED);
+			updateWarnedSkills(this.warnForMagic, Skill.MAGIC);
 		}
 	}
 
@@ -224,6 +241,8 @@ public class AttackStylesPlugin extends Plugin
 	{
 		if (event.getGroup().equals("attackIndicator"))
 		{
+			updateConfig();
+
 			boolean enabled = event.getNewValue().equals("true");
 			switch (event.getKey())
 			{
@@ -250,6 +269,18 @@ public class AttackStylesPlugin extends Plugin
 		}
 	}
 
+	private void updateConfig()
+	{
+		this.alwaysShowStyle = config.alwaysShowStyle();
+		this.warnForDefence = config.warnForDefence();
+		this.warnForAttack = config.warnForAttack();
+		this.warnForStrength = config.warnForStrength();
+		this.warnForRanged = config.warnForRanged();
+		this.warnForMagic = config.warnForMagic();
+		this.hideAutoRetaliate = config.hideAutoRetaliate();
+		this.removeWarnedStyles = config.removeWarnedStyles();
+	}
+
 	private void updateAttackStyle(int equippedWeaponType, int attackStyleIndex, int castingMode)
 	{
 		AttackStyle[] attackStyles = WeaponType.getWeaponType(equippedWeaponType).getAttackStyles();
@@ -289,16 +320,16 @@ public class AttackStylesPlugin extends Plugin
 			{
 				if (warnedSkills.contains(skill))
 				{
-					if (weaponSwitch)
-					{
-						// TODO : chat message to warn players that their weapon switch also caused an unwanted attack style change
-					}
+//					if (weaponSwitch)
+//					{
+//						// TODO : chat message to warn players that their weapon switch also caused an unwanted attack style change
+//					}
 					warnedSkillSelected = true;
 					break;
 				}
 			}
 		}
-		hideWarnedStyles(config.removeWarnedStyles());
+		hideWarnedStyles(this.removeWarnedStyles);
 	}
 
 	private void hideWarnedStyles(boolean enabled)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankCalculation.java b/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankCalculation.java
index 13398e22f7..5a9fd695fd 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankCalculation.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankCalculation.java
@@ -58,7 +58,7 @@ class BankCalculation
 		Varbits.BANK_TAB_NINE_COUNT
 	);
 
-	private final BankConfig config;
+	private final BankPlugin plugin;
 	private final ItemManager itemManager;
 	private final Client client;
 
@@ -72,10 +72,10 @@ class BankCalculation
 	private long haPrice;
 
 	@Inject
-	BankCalculation(ItemManager itemManager, BankConfig config, Client client)
+	BankCalculation(ItemManager itemManager, BankPlugin plugin, Client client)
 	{
 		this.itemManager = itemManager;
-		this.config = config;
+		this.plugin = plugin;
 		this.client = client;
 	}
 
@@ -142,12 +142,12 @@ class BankCalculation
 				continue;
 			}
 
-			if (config.showGE())
+			if (plugin.isShowGE())
 			{
 				itemIds.add(item.getId());
 			}
 
-			if (config.showHA())
+			if (plugin.isShowHA())
 			{
 				long alchValue = itemManager.getAlchValue(item.getId());
 
@@ -159,7 +159,7 @@ class BankCalculation
 		}
 
 		// Now do the calculations
-		if (config.showGE() && !itemIds.isEmpty())
+		if (plugin.isShowGE() && !itemIds.isEmpty())
 		{
 			for (Item item : items)
 			{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java
index f30ba0115f..d5cebbd51d 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java
@@ -28,8 +28,12 @@ package net.runelite.client.plugins.bank;
 
 import com.google.inject.Provides;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
+import lombok.Getter;
 import net.runelite.api.Client;
 import net.runelite.api.MenuEntry;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.MenuEntryAdded;
 import net.runelite.api.events.MenuShouldLeftClick;
 import net.runelite.api.events.ScriptCallbackEvent;
@@ -46,6 +50,7 @@ import net.runelite.client.util.StackFormatter;
 	description = "Modifications to the banking interface",
 	tags = {"grand", "exchange", "high", "alchemy", "prices", "deposit"}
 )
+@Singleton
 public class BankPlugin extends Plugin
 {
 	private static final String DEPOSIT_WORN = "Deposit worn items";
@@ -75,6 +80,21 @@ public class BankPlugin extends Plugin
 		return configManager.getConfig(BankConfig.class);
 	}
 
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showGE;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showHA;
+	private boolean showExact;
+	private boolean rightClickBankInventory;
+	private boolean rightClickBankEquip;
+	private boolean rightClickBankLoot;
+
+	@Override
+	protected void startUp() throws Exception
+	{
+		updateConfig();
+	}
+
 	@Override
 	protected void shutDown()
 	{
@@ -94,9 +114,9 @@ public class BankPlugin extends Plugin
 		MenuEntry[] menuEntries = client.getMenuEntries();
 		for (MenuEntry entry : menuEntries)
 		{
-			if ((entry.getOption().equals(DEPOSIT_WORN) && config.rightClickBankEquip())
-				|| (entry.getOption().equals(DEPOSIT_INVENTORY) && config.rightClickBankInventory())
-				|| (entry.getOption().equals(DEPOSIT_LOOT) && config.rightClickBankLoot()))
+			if ((entry.getOption().equals(DEPOSIT_WORN) && this.rightClickBankEquip)
+				|| (entry.getOption().equals(DEPOSIT_INVENTORY) && this.rightClickBankInventory)
+				|| (entry.getOption().equals(DEPOSIT_LOOT) && this.rightClickBankLoot))
 			{
 				event.setForceRightClick(true);
 				return;
@@ -107,9 +127,9 @@ public class BankPlugin extends Plugin
 	@Subscribe
 	public void onMenuEntryAdded(MenuEntryAdded event)
 	{
-		if ((event.getOption().equals(DEPOSIT_WORN) && config.rightClickBankEquip())
-			|| (event.getOption().equals(DEPOSIT_INVENTORY) && config.rightClickBankInventory())
-			|| (event.getOption().equals(DEPOSIT_LOOT) && config.rightClickBankLoot()))
+		if ((event.getOption().equals(DEPOSIT_WORN) && this.rightClickBankEquip)
+			|| (event.getOption().equals(DEPOSIT_INVENTORY) && this.rightClickBankInventory)
+			|| (event.getOption().equals(DEPOSIT_LOOT) && this.rightClickBankLoot))
 		{
 			forceRightClickFlag = true;
 		}
@@ -128,16 +148,16 @@ public class BankPlugin extends Plugin
 		long gePrice = bankCalculation.getGePrice();
 		long haPrice = bankCalculation.getHaPrice();
 
-		if (config.showGE() && gePrice != 0)
+		if (this.showGE && gePrice != 0)
 		{
 			strCurrentTab += " (";
 
-			if (config.showHA())
+			if (this.showHA)
 			{
 				strCurrentTab += "EX: ";
 			}
 
-			if (config.showExact())
+			if (this.showExact)
 			{
 				strCurrentTab += StackFormatter.formatNumber(gePrice) + ")";
 			}
@@ -147,16 +167,16 @@ public class BankPlugin extends Plugin
 			}
 		}
 
-		if (config.showHA() && haPrice != 0)
+		if (this.showHA && haPrice != 0)
 		{
 			strCurrentTab += " (";
 
-			if (config.showGE())
+			if (this.showGE)
 			{
 				strCurrentTab += "HA: ";
 			}
 
-			if (config.showExact())
+			if (this.showExact)
 			{
 				strCurrentTab += StackFormatter.formatNumber(haPrice) + ")";
 			}
@@ -171,4 +191,25 @@ public class BankPlugin extends Plugin
 
 		stringStack[stringStackSize - 1] += strCurrentTab;
 	}
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (!event.getGroup().equals("bank"))
+		{
+			return;
+		}
+
+		updateConfig();
+	}
+
+	private void updateConfig()
+	{
+		this.showGE = config.showGE();
+		this.showHA = config.showHA();
+		this.showExact = config.showExact();
+		this.rightClickBankInventory = config.rightClickBankInventory();
+		this.rightClickBankEquip = config.rightClickBankEquip();
+		this.rightClickBankLoot = config.rightClickBankLoot();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsPlugin.java
index d593b9f0aa..11c64fd0e3 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsPlugin.java
@@ -36,6 +36,7 @@ import java.util.Collection;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.InventoryID;
 import net.runelite.api.Item;
@@ -82,6 +83,7 @@ import net.runelite.client.util.Text;
 	tags = {"searching", "tagging"}
 )
 @PluginDependency(ClueScrollPlugin.class)
+@Singleton
 public class BankTagsPlugin extends Plugin implements MouseWheelListener, KeyListener
 {
 	public static final String CONFIG_GROUP = "banktags";
@@ -244,10 +246,8 @@ public class BankTagsPlugin extends Plugin implements MouseWheelListener, KeyLis
 				intStack[intStackSize - 1] = 0;
 				break;
 			case "hideLine":
-				// hide the widget for the line separator
-				intStack[intStackSize - 1] = 1;
-				break;
 			case "hideTabText":
+				// hide the widget for the line separator
 				// hide the widget for the "Tab x" text
 				intStack[intStackSize - 1] = 1;
 				break;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/TagManager.java b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/TagManager.java
index c1d5ff8c11..d2ab9ead96 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/TagManager.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/TagManager.java
@@ -66,7 +66,7 @@ public class TagManager
 		this.clueScrollService = clueScrollService;
 	}
 
-	String getTagString(int itemId, boolean variation)
+	private String getTagString(int itemId, boolean variation)
 	{
 		itemId = getItemId(itemId, variation);
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java
index d2f7a4af52..1e26d51f87 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java
@@ -53,8 +53,8 @@ import net.runelite.api.Client;
 import net.runelite.api.Constants;
 import net.runelite.api.InventoryID;
 import net.runelite.api.Item;
-import net.runelite.api.ItemDefinition;
 import net.runelite.api.ItemContainer;
+import net.runelite.api.ItemDefinition;
 import net.runelite.api.MenuAction;
 import net.runelite.api.MenuEntry;
 import net.runelite.api.Point;
@@ -579,11 +579,14 @@ public class TabInterface
 			if (event.getOption().startsWith(CHANGE_ICON + " ("))
 			{
 				ItemDefinition item = getItem(event.getActionParam0());
-				int itemId = itemManager.canonicalize(item.getId());
-				iconToSet.setIconItemId(itemId);
-				iconToSet.getIcon().setItemId(itemId);
-				tabManager.setIcon(iconToSet.getTag(), itemId + "");
-				event.consume();
+				if (item != null)
+				{
+					int itemId = itemManager.canonicalize(item.getId());
+					iconToSet.setIconItemId(itemId);
+					iconToSet.getIcon().setItemId(itemId);
+					tabManager.setIcon(iconToSet.getTag(), itemId + "");
+					event.consume();
+				}
 			}
 
 			// Reset icon selection even when we do not clicked item with icon
@@ -613,9 +616,13 @@ public class TabInterface
 			// Add "remove" menu entry to all items in bank while tab is selected
 			event.consume();
 			final ItemDefinition item = getItem(event.getActionParam0());
-			final int itemId = item.getId();
-			tagManager.removeTag(itemId, activeTab.getTag());
-			bankSearch.search(InputType.SEARCH, TAG_SEARCH + activeTab.getTag(), true);
+			final int itemId;
+			if (item != null)
+			{
+				itemId = item.getId();
+				tagManager.removeTag(itemId, activeTab.getTag());
+				bankSearch.search(InputType.SEARCH, TAG_SEARCH + activeTab.getTag(), true);
+			}
 		}
 		else if (event.getMenuAction() == MenuAction.RUNELITE
 			&& ((event.getActionParam1() == WidgetInfo.BANK_DEPOSIT_INVENTORY.getId() && event.getOption().equals(TAG_INVENTORY))
@@ -669,15 +676,11 @@ public class TabInterface
 					updateTabIfActive(Lists.newArrayList(Text.standardize(draggedOn.getName())));
 				}
 			}
-			else if (parent.getId() == draggedOn.getId() && parent.getId() == draggedWidget.getId())
+			else if (parent.getId() == draggedOn.getId() && parent.getId() == draggedWidget.getId() && !Strings.isNullOrEmpty(draggedOn.getName()))
 			{
-				// Reorder tag tabs
-				if (!Strings.isNullOrEmpty(draggedOn.getName()))
-				{
-					tabManager.move(draggedWidget.getName(), draggedOn.getName());
-					tabManager.save();
-					updateTabs();
-				}
+				tabManager.move(draggedWidget.getName(), draggedOn.getName());
+				tabManager.save();
+				updateTabs();
 			}
 		}
 		else if (draggedWidget.getItemId() > 0)
@@ -1010,8 +1013,17 @@ public class TabInterface
 	private ItemDefinition getItem(int idx)
 	{
 		ItemContainer bankContainer = client.getItemContainer(InventoryID.BANK);
-		Item item = bankContainer.getItems()[idx];
-		return itemManager.getItemDefinition(item.getId());
+		Item item = null;
+		if (bankContainer != null)
+		{
+			item = bankContainer.getItems()[idx];
+		}
+		if (item != null)
+		{
+			return itemManager.getItemDefinition(item.getId());
+		}
+
+		return null;
 	}
 
 	private void openTag(final String tag)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListConfig.java
index 75c9668cf7..9e40544ba5 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListConfig.java
@@ -8,13 +8,11 @@ import net.runelite.client.config.ConfigItem;
 
 public interface BanListConfig extends Config
 {
-
 	@ConfigItem(
-			keyName = "bannedPlayers",
-			name = "Manual Scammer List",
-			description = "Players you add to this list will be shown when you join a clan.",
-			position = 0
-
+		keyName = "bannedPlayers",
+		name = "Manual Scammer List",
+		description = "Manually add players seperated by commas that you wish to be warned about while in a clan/cox/tob party",
+		position = 0
 	)
 	default String getBannedPlayers()
 	{
@@ -22,28 +20,39 @@ public interface BanListConfig extends Config
 	}
 
 	@ConfigItem(
-			keyName = "bannedPlayers",
-			name = "",
-			description = ""
+		keyName = "bannedPlayers",
+		name = "",
+		description = ""
 	)
 	void setBannedPlayers(String key);
 
 	@ConfigItem(
-			position = 1,
-			keyName = "enableWDR",
-			name = "Enable WDR Scammer List",
-			description = "Incorporate WDR Scammer list"
+		position = 1,
+		keyName = "enableWDRScam",
+		name = "Enable WDR Scammer List",
+		description = "Incorporate WDR Scammer list"
 	)
-	default boolean enableWDR()
+	default boolean enableWDRScam()
 	{
 		return true;
 	}
 
 	@ConfigItem(
-			position = 2,
-			keyName = "enableRuneWatch",
-			name = "Enable RuneWatch Scammer List",
-			description = "Incorporate RuneWatch Scammer list"
+		position = 2,
+		keyName = "enableWDRToxic",
+		name = "Enable WDR Toxic List",
+		description = "Incorporate WDR Toxic list"
+	)
+	default boolean enableWDRToxic()
+	{
+		return true;
+	}
+
+	@ConfigItem(
+		position = 3,
+		keyName = "enableRuneWatch",
+		name = "Enable RuneWatch List",
+		description = "Incorporate RuneWatch potential scammer list"
 	)
 	default boolean enableRuneWatch()
 	{
@@ -51,10 +60,10 @@ public interface BanListConfig extends Config
 	}
 
 	@ConfigItem(
-			position = 3,
-			keyName = "highlightInClan",
-			name = "Highlight red in Clan Chat",
-			description = "Highlights Scammer\'s name in your current clan chat."
+		position = 4,
+		keyName = "highlightInClan",
+		name = "Highlight red in Clan Chat",
+		description = "Highlights Scammer\'s name in your current clan chat."
 	)
 	default boolean highlightInClan()
 	{
@@ -62,14 +71,13 @@ public interface BanListConfig extends Config
 	}
 
 	@ConfigItem(
-			position = 4,
-			keyName = "highlightInTrade",
-			name = "Highlight red in trade screen",
-			description = "Highlights Scammer\'s name in your trade window"
+		position = 5,
+		keyName = "highlightInTrade",
+		name = "Highlight red in trade screen",
+		description = "Highlights Scammer\'s name in your trade window"
 	)
 	default boolean highlightInTrade()
 	{
 		return true;
 	}
-
-}
+}
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java
index 92371331cc..a34b7e756c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java
@@ -26,21 +26,29 @@
  */
 package net.runelite.client.plugins.banlist;
 
+import com.google.common.base.Splitter;
 import com.google.inject.Provides;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.ChatMessageType;
 import net.runelite.api.ClanMember;
 import net.runelite.api.Client;
 import net.runelite.api.GameState;
+import net.runelite.api.Varbits;
 import net.runelite.api.events.ClanMemberJoined;
 import net.runelite.api.events.ConfigChanged;
+import net.runelite.api.events.GameTick;
 import net.runelite.api.events.WidgetHiddenChanged;
 import net.runelite.api.events.WidgetLoaded;
 import net.runelite.api.widgets.Widget;
+import static net.runelite.api.widgets.WidgetID.TRADING_SCREEN;
 import net.runelite.api.widgets.WidgetInfo;
 import net.runelite.client.callback.ClientThread;
 import net.runelite.client.chat.ChatColorType;
@@ -67,26 +75,28 @@ import okhttp3.Response;
 	type = PluginType.UTILITY,
 	enabledByDefault = false
 )
-
+@Singleton
 @Slf4j
 public class BanListPlugin extends Plugin
 {
+	private final Set<String> wdrScamSet = new HashSet<>();
+	private final Set<String> wdrToxicSet = new HashSet<>();
+	private final Set<String> runeWatchSet = new HashSet<>();
+	private final Set<String> manualBans = new HashSet<>();
 	@Inject
 	private Client client;
-
 	@Inject
 	private ClientThread clientThread;
-
 	@Inject
 	private BanListConfig config;
-
 	@Inject
 	private ChatMessageManager chatMessageManager;
-
-	private ArrayList<String> wdrScamArrayList = new ArrayList<>();
-	private ArrayList<String> wdrToxicArrayList = new ArrayList<>();
-	private ArrayList<String> runeWatchArrayList = new ArrayList<>();
-	private ArrayList<String> manualBans = new ArrayList<>();
+	private String tobNames = "";
+	private boolean enableWDRScam;
+	private boolean enableWDRToxic;
+	private boolean enableRuneWatch;
+	private boolean highlightInClan;
+	private boolean highlightInTrade;
 
 	@Provides
 	BanListConfig getConfig(ConfigManager configManager)
@@ -97,37 +107,55 @@ public class BanListPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
-		manualBans.addAll(Text.fromCSV(config.getBannedPlayers()));
+		updateConfig();
+		List<String> bannedPlayers = Splitter
+			.on(",")
+			.trimResults()
+			.omitEmptyStrings()
+			.splitToList(config.getBannedPlayers());
+		manualBans.addAll(bannedPlayers);
 		fetchFromWebsites();
 	}
 
 	@Override
 	protected void shutDown() throws Exception
 	{
-		wdrScamArrayList.clear();
-		wdrToxicArrayList.clear();
-		runeWatchArrayList.clear();
+		wdrScamSet.clear();
+		wdrToxicSet.clear();
+		runeWatchSet.clear();
 		manualBans.clear();
 	}
 
 	@Subscribe
 	public void onConfigChanged(ConfigChanged event)
 	{
-		if (event.getGroup().equals("banlist"))
+		if (event.getGroup().equals("banlist") && event.getKey().equals("bannedPlayers"))
 		{
-			if (event.getKey().equals("bannedPlayers"))
+			List<String> bannedPlayers = Splitter
+				.on(",")
+				.trimResults()
+				.omitEmptyStrings()
+				.splitToList(config.getBannedPlayers());
+
+			for (String bannedPlayer : bannedPlayers)
 			{
-				for (String manual : Text.fromCSV(config.getBannedPlayers()))
+				if (!manualBans.contains(bannedPlayer))
 				{
-					if (!manualBans.contains(manual))
-					{
-						manualBans.add(Text.standardize(manual));
-					}
+					manualBans.add(Text.standardize(bannedPlayer));
 				}
 			}
 		}
 	}
 
+	private void updateConfig()
+	{
+		this.enableWDRScam = config.enableWDRScam();
+		this.enableWDRToxic = config.enableWDRToxic();
+		this.enableRuneWatch = config.enableRuneWatch();
+		this.highlightInClan = config.highlightInClan();
+		this.highlightInTrade = config.highlightInTrade();
+	}
+
 	/**
 	 * Event to keep making sure player names are highlighted red in clan chat, since the red name goes away frequently
 	 */
@@ -138,7 +166,7 @@ public class BanListPlugin extends Plugin
 			|| client.getWidget(WidgetInfo.LOGIN_CLICK_TO_PLAY_SCREEN) != null
 			|| client.getViewportWidget() == null
 			|| client.getWidget(WidgetInfo.CLAN_CHAT) == null
-			|| !config.highlightInClan())
+			|| !this.highlightInClan)
 		{
 			return;
 		}
@@ -157,13 +185,15 @@ public class BanListPlugin extends Plugin
 	public void onClanMemberJoined(ClanMemberJoined event)
 	{
 		ClanMember member = event.getMember();
-		ListType scamList = checkScamList(Text.standardize(member.getUsername()));
-		ListType toxicList = checkToxicList(Text.standardize(member.getUsername()));
+		String memberUsername = Text.standardize(member.getUsername().toLowerCase());
+
+		ListType scamList = checkScamList(memberUsername);
+		ListType toxicList = checkToxicList(memberUsername);
 
 		if (scamList != null)
 		{
-			sendWarning(Text.standardize(member.getUsername()), scamList);
-			if (config.highlightInClan())
+			sendWarning(memberUsername, scamList);
+			if (this.highlightInClan)
 			{
 				highlightRedInCC();
 			}
@@ -171,8 +201,8 @@ public class BanListPlugin extends Plugin
 
 		if (toxicList != null)
 		{
-			sendWarning(Text.standardize(member.getUsername()), toxicList);
-			if (config.highlightInClan())
+			sendWarning(memberUsername, toxicList);
+			if (this.highlightInClan)
 			{
 				highlightRedInCC();
 			}
@@ -185,54 +215,93 @@ public class BanListPlugin extends Plugin
 	@Subscribe
 	public void onWidgetLoaded(WidgetLoaded widgetLoaded)
 	{
-		if (config.highlightInTrade())
-		{
-			if (widgetLoaded.getGroupId() == 335)
-			{ //if trading window was loaded
-				clientThread.invokeLater(() ->
+		if (this.highlightInTrade && widgetLoaded.getGroupId() == TRADING_SCREEN)
+		{ //if trading window was loaded
+			clientThread.invokeLater(() ->
+			{
+				Widget tradingWith = client.getWidget(335, 31);
+				String name = tradingWith.getText().replaceAll("Trading With: ", "").toLowerCase();
+				if (checkScamList(name) != null)
 				{
-					Widget tradingWith = client.getWidget(335, 31);
-					String name = tradingWith.getText().replaceAll("Trading With: ", "");
-					if (checkScamList(name) != null)
-					{
-						tradingWith.setText(tradingWith.getText().replaceAll(name, "<col=ff0000>" + name + " (Scammer)" + "</col>"));
-					}
-					if (checkToxicList(name) != null)
-					{
-						tradingWith.setText(tradingWith.getText().replaceAll(name, "<col=ff6400>" + name + " (Toxic)" + "</col>"));
-					}
-				});
+					tradingWith.setText(tradingWith.getText().replaceAll(name, "<col=ff0000>" + name + " (Scammer)" + "</col>"));
+				}
+				if (checkToxicList(name) != null)
+				{
+					tradingWith.setText(tradingWith.getText().replaceAll(name, "<col=ff6400>" + name + " (Toxic)" + "</col>"));
+				}
+			});
+		}
+	}
+
+
+	@Subscribe
+	public void onGameTick(GameTick event)
+	{
+
+		if (client.getWidget(WidgetInfo.THEATRE_OF_BLOOD_RAIDING_PARTY) == null)
+		{
+			return;
+		}
+
+		Widget raidingParty = client.getWidget(WidgetInfo.THEATRE_OF_BLOOD_RAIDING_PARTY);
+		String allNames = raidingParty.getText();
+
+		if (allNames.equalsIgnoreCase(tobNames))
+		{
+			return;
+		}
+
+		tobNames = allNames;
+
+		String[] split = allNames.split("<br>");
+
+		for (int i = 0; i < 5; i++)
+		{
+			String name = split[i];
+			if (!name.equalsIgnoreCase("-"))
+			{
+				ListType scamList = checkScamList(Text.standardize(name));
+
+				if (scamList != null)
+				{
+					sendWarning(name, scamList);
+				}
+
+				ListType toxicList = checkToxicList(Text.standardize(name));
+
+				if (toxicList != null)
+				{
+					sendWarning(name, toxicList);
+				}
 			}
 		}
 	}
 
+
+	boolean inTobParty()
+	{
+		return client.getVar(Varbits.THEATRE_OF_BLOOD) == 1;
+	}
+
+
 	/**
 	 * Compares player name to everything in the ban lists
 	 */
 	private ListType checkScamList(String nameToBeChecked)
 	{
-		if (wdrScamArrayList.size() > 0 && config.enableWDR())
+		if (wdrScamSet.size() > 0 && this.enableWDRScam && wdrScamSet.contains(nameToBeChecked))
 		{
-			if (wdrScamArrayList.stream().anyMatch(nameToBeChecked::equalsIgnoreCase))
-			{
-				return ListType.WEDORAIDSSCAM_LIST;
-			}
+			return ListType.WEDORAIDSSCAM_LIST;
 		}
 
-		if (runeWatchArrayList.size() > 0 && config.enableRuneWatch())
+		if (runeWatchSet.size() > 0 && this.enableRuneWatch && runeWatchSet.contains(nameToBeChecked))
 		{
-			if (runeWatchArrayList.stream().anyMatch(nameToBeChecked::equalsIgnoreCase))
-			{
-				return ListType.RUNEWATCH_LIST;
-			}
+			return ListType.RUNEWATCH_LIST;
 		}
 
-		if (manualBans.size() > 0)
+		if (manualBans.size() > 0 && manualBans.contains(nameToBeChecked))
 		{
-			if (manualBans.stream().anyMatch(nameToBeChecked::equalsIgnoreCase))
-			{
-				return ListType.MANUAL_LIST;
-			}
+			return ListType.MANUAL_LIST;
 		}
 
 		return null;
@@ -241,12 +310,9 @@ public class BanListPlugin extends Plugin
 	private ListType checkToxicList(String nameToBeChecked)
 	{
 
-		if (wdrToxicArrayList.size() > 0 && config.enableWDR())
+		if (wdrToxicSet.size() > 0 && this.enableWDRToxic && wdrToxicSet.contains(nameToBeChecked))
 		{
-			if (wdrToxicArrayList.stream().anyMatch(nameToBeChecked::equalsIgnoreCase))
-			{
-				return ListType.WEDORAIDSTOXIC_LIST;
-			}
+			return ListType.WEDORAIDSTOXIC_LIST;
 		}
 
 		return null;
@@ -288,7 +354,7 @@ public class BanListPlugin extends Plugin
 			case RUNEWATCH_LIST:
 				final String rw_message = new ChatMessageBuilder()
 					.append(ChatColorType.HIGHLIGHT)
-					.append("Warning! " + playerName + " is on the Runewatch\'s scammer list!")
+					.append("Warning! " + playerName + " is on the Runewatch\'s potential scammer list!")
 					.build();
 
 				chatMessageManager.queue(
@@ -338,9 +404,9 @@ public class BanListPlugin extends Plugin
 
 				ArrayList<String> wdrList = new ArrayList<>(Arrays.asList(text.split(",")));
 				ArrayList<String> wdrList2 = new ArrayList<>();
-				wdrList.forEach((name) -> wdrList2.add(Text.standardize(name)));
+				wdrList.forEach((name) -> wdrList2.add(Text.standardize(name).toLowerCase()));
 
-				wdrScamArrayList.addAll(wdrList2);
+				wdrScamSet.addAll(wdrList2);
 			}
 		});
 
@@ -366,9 +432,9 @@ public class BanListPlugin extends Plugin
 				{
 					if (x.contains("title"))
 					{
-						x = x.substring(x.indexOf("title"), x.indexOf(">"));
-						x = x.substring(x.indexOf("=") + 2, x.length() - 1);
-						runeWatchArrayList.add(Text.standardize(x));
+						x = x.substring(x.indexOf("title"), x.indexOf('>'));
+						x = x.substring(x.indexOf('=') + 2, x.length() - 1);
+						runeWatchSet.add(Text.standardize(x).toLowerCase());
 					}
 				}
 			}
@@ -395,9 +461,9 @@ public class BanListPlugin extends Plugin
 
 				ArrayList<String> wdrToxicList = new ArrayList<>(Arrays.asList(text.split(",")));
 				ArrayList<String> wdrToxicList2 = new ArrayList<>();
-				wdrToxicList.forEach((name) -> wdrToxicList2.add(Text.standardize(name)));
+				wdrToxicList.forEach((name) -> wdrToxicList2.add(Text.standardize(name).toLowerCase()));
 
-				wdrToxicArrayList.addAll(wdrToxicList2);
+				wdrToxicSet.addAll(wdrToxicList2);
 			}
 		});
 	}
@@ -412,8 +478,8 @@ public class BanListPlugin extends Plugin
 			Widget widget = client.getWidget(WidgetInfo.CLAN_CHAT_LIST);
 			for (Widget widgetChild : widget.getDynamicChildren())
 			{
-				ListType scamList = checkScamList(widgetChild.getText());
-				ListType toxicList = checkToxicList(widgetChild.getText());
+				ListType scamList = checkScamList(widgetChild.getText().toLowerCase());
+				ListType toxicList = checkToxicList(widgetChild.getText().toLowerCase());
 
 				if (scamList != null)
 				{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveSceneOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveSceneOverlay.java
index ecfb8251ce..96aafeef5e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveSceneOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveSceneOverlay.java
@@ -27,6 +27,7 @@
 package net.runelite.client.plugins.barbarianassault;
 
 import com.google.common.collect.ImmutableMap;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.Perspective;
 import net.runelite.api.Point;
@@ -46,7 +47,7 @@ import java.awt.Stroke;
 import java.awt.BasicStroke;
 import java.util.Map;
 
-
+@Singleton
 class AboveSceneOverlay extends Overlay
 {
 	private static final int HEALTH_BAR_HEIGHT = 20;
@@ -62,18 +63,16 @@ class AboveSceneOverlay extends Overlay
 
 	private final Client client;
 	private final BarbarianAssaultPlugin game;
-	private final BarbarianAssaultConfig config;
 
 
 	@Inject
-	private AboveSceneOverlay(Client client, BarbarianAssaultPlugin game, BarbarianAssaultConfig config)
+	private AboveSceneOverlay(final Client client, final BarbarianAssaultPlugin game)
 	{
 		super(game);
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_SCENE);
 		this.client = client;
 		this.game = game;
-		this.config = config;
 	}
 
 	@Override
@@ -88,11 +87,11 @@ class AboveSceneOverlay extends Overlay
 		{
 
 			case HEALER:
-				if (config.showTeammateHealthbars())
+				if (game.isShowTeammateHealthbars())
 				{
 					renderHealthBars(graphics);
 				}
-				if (config.healerCodes())
+				if (game.isHealerCodes())
 				{
 					renderHealerCodes(graphics);
 				}
@@ -100,7 +99,7 @@ class AboveSceneOverlay extends Overlay
 
 
 			case COLLECTOR:
-				if (config.highlightCollectorEggs())
+				if (game.isHighlightCollectorEggs())
 				{
 					renderEggs(graphics);
 				}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveWidgetsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveWidgetsOverlay.java
index 6c140ef4b3..b89bc86148 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveWidgetsOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/AboveWidgetsOverlay.java
@@ -32,6 +32,7 @@ import java.awt.Rectangle;
 import java.awt.image.BufferedImage;
 import javax.inject.Inject;
 
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.Point;
 import net.runelite.api.widgets.Widget;
@@ -43,7 +44,7 @@ import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayUtil;
 import net.runelite.client.util.ImageUtil;
 
-
+@Singleton
 class AboveWidgetsOverlay extends Overlay
 {
 	private static final int OFFSET_X_TEXT_QUANTITY = 0;
@@ -51,18 +52,15 @@ class AboveWidgetsOverlay extends Overlay
 
 	private final Client client;
 	private final BarbarianAssaultPlugin game;
-	private final BarbarianAssaultConfig config;
-
 
 	@Inject
-	private AboveWidgetsOverlay(Client client, BarbarianAssaultPlugin game, BarbarianAssaultConfig config)
+	private AboveWidgetsOverlay(final Client client, final BarbarianAssaultPlugin game)
 	{
 		super(game);
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_WIDGETS);
 		this.client = client;
 		this.game = game;
-		this.config = config;
 	}
 
 	@Override
@@ -75,7 +73,7 @@ class AboveWidgetsOverlay extends Overlay
 
 		Role role = game.getRole();
 
-		if (config.showTimer())
+		if (game.isShowTimer())
 		{
 			renderTimer(graphics, role);
 		}
@@ -83,23 +81,23 @@ class AboveWidgetsOverlay extends Overlay
 		switch (role)
 		{
 			case ATTACKER:
-				if (config.highlightArrows())
+				if (game.isHighlightArrows())
 				{
-					renderInventoryHighlights(graphics, game.getRole().getListenItem(game.getLastListenText()), config.highlightArrowColor());
+					renderInventoryHighlights(graphics, game.getRole().getListenItem(game.getLastListenText()), game.getHighlightArrowColor());
 				}
 				break;
 
 			case DEFENDER:
-				if (config.highlightBait())
+				if (game.isHighlightBait())
 				{
-					renderInventoryHighlights(graphics, game.getRole().getListenItem(game.getLastListenText()), config.highlightBaitColor());
+					renderInventoryHighlights(graphics, game.getRole().getListenItem(game.getLastListenText()), game.getHighlightBaitColor());
 				}
 				break;
 
 			case HEALER:
-				if (config.highlightPoison())
+				if (game.isHighlightPoison())
 				{
-					renderInventoryHighlights(graphics, game.getRole().getListenItem(game.getLastListenText()), config.highlightPoisonColor());
+					renderInventoryHighlights(graphics, game.getRole().getListenItem(game.getLastListenText()), game.getHighlightPoisonColor());
 				}
 		}
 		return null;
@@ -115,11 +113,11 @@ class AboveWidgetsOverlay extends Overlay
 			return;
 		}
 
-		if (role == Role.COLLECTOR && config.showEggCountOverlay() && game.getWave() != null)
+		if (role == Role.COLLECTOR && game.isShowEggCountOverlay() && game.getWave() != null)
 		{
 			roleText.setText("(" + game.getWave().getCollectedEggCount() + ") " + formatClock());
 		}
-		else if (role == Role.HEALER && config.showHpCountOverlay() && game.getWave() != null)
+		else if (role == Role.HEALER && game.isShowHpCountOverlay() && game.getWave() != null)
 		{
 			roleText.setText("(" + game.getWave().getHpHealed() + ") " + formatClock());
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultMenu.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultMenu.java
index 0f8f843fd8..733f89c249 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultMenu.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultMenu.java
@@ -26,6 +26,8 @@
 package net.runelite.client.plugins.barbarianassault;
 
 import com.google.common.collect.Sets;
+import java.util.List;
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
 import net.runelite.client.menus.ComparableEntry;
@@ -40,24 +42,24 @@ class BarbarianAssaultMenu
 {
 	private final MenuManager menuManager;
 	private final BarbarianAssaultPlugin game;
-	private final BarbarianAssaultConfig config;
-	private final ArrayList<ComparableEntry> tracker = new ArrayList<>();
-	@Getter @Setter
+	private final List<ComparableEntry> tracker = new ArrayList<>();
+	@Getter(AccessLevel.PACKAGE)
+	@Setter(AccessLevel.PACKAGE)
 	private boolean hornUpdated = false;
-	@Getter @Setter
+	@Getter(AccessLevel.PACKAGE)
+	@Setter(AccessLevel.PACKAGE)
 	private boolean rebuildForced = false;
 
 	@Inject
-	BarbarianAssaultMenu(MenuManager menuManager, BarbarianAssaultPlugin game, BarbarianAssaultConfig config)
+	BarbarianAssaultMenu(final MenuManager menuManager, final BarbarianAssaultPlugin game)
 	{
 		this.menuManager = menuManager;
 		this.game = game;
-		this.config = config;
 	}
 
 	private boolean isHornOptionHidden(String option)
 	{
-		if (game.isInGame() && game.getRole() != null && game.getRole().getTell(game.getLastCallText()).toLowerCase().equals(option))
+		if (game.isInGame() && game.getRole() != null && game.getRole().getTell(game.getLastCallText()).equalsIgnoreCase(option))
 		{
 			// This will force the menu to be rebuilt after the correct tell is found
 			// medic will be added to the menu if it wasn't there before
@@ -100,24 +102,24 @@ class BarbarianAssaultMenu
 				case TELL_BLUE_ATTACKER_HORN:
 				case TELL_GREEN_ATTACKER_HORN:
 				case TELL_RED_ATTACKER_HORN:
-					return ((role == Role.ATTACKER && isHornOptionHidden(entry.getOption())) || role == null) && config.removeIncorrectCalls();
+					return ((role == Role.ATTACKER && isHornOptionHidden(entry.getOption())) || role == null) && game.isRemoveIncorrectCalls();
 
 				case ATTACK_PENANCE_FIGHTER:
 				case ATTACK_PENANCE_RANGER:
 				case GET_SPIKES_PETRIFIED_MUSHROOM:
 				case TAKE_ATTACKER_ITEM_MACHINE:
-					return (role != Role.ATTACKER && role != null) && config.removeUnusedMenus();
+					return (role != Role.ATTACKER && role != null) && game.isRemoveUnusedMenus();
 
 
 				// Defender role Options
 				case TELL_MEAT_DEFENDER_HORN:
 				case TELL_TOFU_DEFENDER_HORN:
 				case TELL_WORMS_DEFENDER_HORN:
-					return ((role == Role.DEFENDER && isHornOptionHidden(entry.getOption())) || role == null) && config.removeIncorrectCalls();
+					return ((role == Role.DEFENDER && isHornOptionHidden(entry.getOption())) || role == null) && game.isRemoveIncorrectCalls();
 
 				case BLOCK_PENANCE_CAVE:
-					return ((role != Role.DEFENDER && role != null) && config.removeUnusedMenus())
-							|| (role == Role.DEFENDER && config.removePenanceCave());
+					return ((role != Role.DEFENDER && role != null) && game.isRemoveUnusedMenus())
+							|| (role == Role.DEFENDER && game.isRemovePenanceCave());
 
 				case DUNK_LAVA_CRATER:
 				case FIX:
@@ -125,7 +127,7 @@ class BarbarianAssaultMenu
 				case TAKE_DEFENDER_ITEM_MACHINE:
 				case TAKE_HAMMER:
 				case TAKE_LOGS:
-					return (role != Role.DEFENDER && role != null) && config.removeUnusedMenus();
+					return (role != Role.DEFENDER && role != null) && game.isRemoveUnusedMenus();
 
 
 				// Collector role options
@@ -133,7 +135,7 @@ class BarbarianAssaultMenu
 				case TELL_AGGRESSIVE_COLLECTOR_HORN:
 				case TELL_CONTROLLED_COLLECTOR_HORN:
 				case TELL_DEFENSIVE_COLLECTOR_HORN:
-					return ((role == Role.COLLECTOR && isHornOptionHidden(entry.getOption())) || role == null) && config.removeIncorrectCalls();
+					return ((role == Role.COLLECTOR && isHornOptionHidden(entry.getOption())) || role == null) && game.isRemoveIncorrectCalls();
 
 				case CONVERT_COLLECTOR_CONVERTER:
 				case LOAD_EGG_HOPPER:
@@ -141,40 +143,40 @@ class BarbarianAssaultMenu
 				case TAKE_GREEN_EGG:
 				case TAKE_RED_EGG:
 				case TAKE_YELLOW_EGG:
-					return (role != Role.COLLECTOR && role != null) && config.removeUnusedMenus();
+					return (role != Role.COLLECTOR && role != null) && game.isRemoveUnusedMenus();
 
 
 				// Healer role options
 				case TELL_CRACKERS_HEALER_HORN:
 				case TELL_TOFU_HEALER_HORN:
 				case TELL_WORMS_HEALER_HORN:
-					return ((role == Role.HEALER && isHornOptionHidden(entry.getOption())) || role == null) && config.removeIncorrectCalls();
+					return ((role == Role.HEALER && isHornOptionHidden(entry.getOption())) || role == null) && game.isRemoveIncorrectCalls();
 
 				case DUNK_POISON_CRATER:
 				case STOCK_UP_HEALER_ITEM_MACHINE:
 				case TAKE_HEALER_ITEM_MACHINE:
 				case TAKE_FROM_HEALER_SPRING:
 				case DRINK_FROM_HEALER_SPRING:
-					return (role != Role.HEALER && role != null) && config.removeUnusedMenus();
+					return (role != Role.HEALER && role != null) && game.isRemoveUnusedMenus();
 
 				case USE_VIAL_GROUND:
 				case USE_VIAL_ITEM:
 				case USE_VIAL_NPC:
 				case USE_VIAL_WIDGET:
-					return role == Role.HEALER && config.removeUnusedMenus();
+					return role == Role.HEALER && game.isRemoveUnusedMenus();
 
 
 				// Any role options
 				case DROP_HORN:
 				case EXAMINE_HORN:
 				case USE_HORN:
-					return config.removeIncorrectCalls();
+					return game.isRemoveIncorrectCalls();
 
 				case MEDIC_HORN:
-					return config.removeIncorrectCalls() && !hornUpdated;
+					return game.isRemoveIncorrectCalls() && !hornUpdated;
 
 				default:
-					return role != null && config.removeUnusedMenus();
+					return role != null && game.isRemoveUnusedMenus();
 			}
 		});
 
@@ -189,15 +191,15 @@ class BarbarianAssaultMenu
 
 	void enableSwaps()
 	{
-		if (config.swapLadder())
+		if (game.isSwapLadder())
 		{
 			menuManager.addSwap("climb-down", "ladder", "quick-start", "ladder");
 		}
-		if (config.swapCollectorBag())
+		if (game.isSwapCollectorBag())
 		{
 			menuManager.addSwap("look-in", "collection bag", "empty", "collection bag");
 		}
-		if (config.swapDestroyEggs())
+		if (game.isSwapDestroyEggs())
 		{
 			menuManager.addSwap("use", "blue egg", "destroy", "blue egg");
 			menuManager.addSwap("use", "green egg", "destroy", "green egg");
@@ -207,17 +209,17 @@ class BarbarianAssaultMenu
 
 	void disableSwaps(boolean force)
 	{
-		if (!config.swapLadder() || force)
+		if (!game.isSwapLadder() || force)
 		{
 			menuManager.removeSwap("climb-down", "ladder", "quick-start", "ladder");
 		}
 
-		if (!config.swapCollectorBag() || force)
+		if (!game.isSwapCollectorBag() || force)
 		{
 			menuManager.removeSwap("look-in", "collection bag", "empty", "collection bag");
 		}
 
-		if (!config.swapDestroyEggs() || force)
+		if (!game.isSwapDestroyEggs() || force)
 		{
 			menuManager.removeSwap("use", "blue egg", "destroy", "blue egg");
 			menuManager.removeSwap("use", "green egg", "destroy", "green egg");
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java
index be97a5755c..0c39075df7 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java
@@ -29,7 +29,7 @@ package net.runelite.client.plugins.barbarianassault;
 
 import com.google.common.collect.ImmutableList;
 import com.google.inject.Provides;
-
+import java.awt.Color;
 import java.awt.Font;
 import java.awt.event.KeyEvent;
 import java.awt.image.BufferedImage;
@@ -41,10 +41,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import javax.inject.Inject;
-
+import javax.inject.Singleton;
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
-
 import net.runelite.api.Actor;
 import net.runelite.api.ChatMessageType;
 import net.runelite.api.Client;
@@ -108,6 +108,7 @@ import org.apache.commons.lang3.StringUtils;
 	tags = {"minigame", "overlay", "timer"},
 	type = PluginType.PVM // don't remove this, added this because our barbarian assault plugin is big time modified
 )
+@Singleton
 public class BarbarianAssaultPlugin extends Plugin implements KeyListener
 {
 	private static final String ENDGAME_REWARD_NEEDLE_TEXT = "<br>5";
@@ -182,16 +183,16 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
 	private Font font = null;
 
 	@Getter
-	private final HashMap<WorldPoint, Integer> redEggs = new HashMap<>();
+	private final Map<WorldPoint, Integer> redEggs = new HashMap<>();
 
 	@Getter
-	private final HashMap<WorldPoint, Integer> greenEggs = new HashMap<>();
+	private final Map<WorldPoint, Integer> greenEggs = new HashMap<>();
 
 	@Getter
-	private final HashMap<WorldPoint, Integer> blueEggs = new HashMap<>();
+	private final Map<WorldPoint, Integer> blueEggs = new HashMap<>();
 
 	@Getter
-	private final HashMap<WorldPoint, Integer> yellowEggs = new HashMap<>();
+	private final Map<WorldPoint, Integer> yellowEggs = new HashMap<>();
 
 	@Getter
 	private final Map<Integer, Healer> healers = new HashMap<>();
@@ -202,7 +203,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
 	@Getter
 	private String lastListenText = null;
 
-	private String lastClickedTell = null;
+	// private String lastClickedTell = null;
 
 	private int lastCallColor = -1;
 
@@ -212,7 +213,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
 
 	private int tickNum = 0;
 
-	private int gameTick = -1;
+	// private int gameTick = -1;
 
 	private int inGameBit = 0;
 
@@ -233,24 +234,79 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
 
 	private BufferedImage torsoImage, fighterImage, healerImage, rangerImage, runnerImage;
 
-	private ArrayList<TimerBox> deathTimes = new ArrayList<>();
+	private final List<TimerBox> deathTimes = new ArrayList<>();
 
-	private HashMap<Integer, Projectile> projectiles = new HashMap<>();
+	private final Map<Integer, Projectile> projectiles = new HashMap<>();
 
 	private TimerBox tickCounter;
 
 	private String poisonUsed = null;
 
-
 	@Provides
 	BarbarianAssaultConfig provideConfig(ConfigManager configManager)
 	{
 		return configManager.getConfig(BarbarianAssaultConfig.class);
 	}
 
+	// save config values
+	@Getter(AccessLevel.PACKAGE)
+	private boolean swapLadder;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showTimer;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean removeIncorrectCalls;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean removeUnusedMenus;
+	private boolean prayerMetronome;
+	private int prayerMetronomeVolume;
+	private boolean showDeathTimes;
+	private DeathTimesMode showDeathTimesMode;
+	private boolean waveTimes;
+	private boolean showTotalRewards;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean highlightArrows;
+	@Getter(AccessLevel.PACKAGE)
+	private Color highlightArrowColor;
+	private boolean removeIncorrectAttackStyles;
+	private boolean tagging;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean highlightBait;
+	@Getter(AccessLevel.PACKAGE)
+	private Color highlightBaitColor;
+	private boolean showDefTimer;
+	private boolean deprioritizeBait;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean removePenanceCave;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean highlightPoison;
+	@Getter(AccessLevel.PACKAGE)
+	private Color highlightPoisonColor;
+	private boolean highlightNotification;
+	private Color highlightNotificationColor;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showHpCountOverlay;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showTeammateHealthbars;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean healerCodes;
+	private boolean healerMenuOption;
+	private boolean shiftOverstock;
+	private boolean controlHealer;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean swapCollectorBag;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean swapDestroyEggs;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean highlightCollectorEggs;
+	private boolean deprioritizeIncorrectEggs;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showEggCountOverlay;
+
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
+
 		font = FontManager.getRunescapeFont().deriveFont(Font.BOLD, 24);
 		torsoImage = itemManager.getImage(ItemID.FIGHTER_TORSO);
 		clockImage = ImageUtil.getResourceStreamFromClass(getClass(), "clock.png");
@@ -282,7 +338,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
 		controlDown = false;
 		resetWave();
 		wave = null;
-		gameTick = client.getTickCount();
+		// gameTick = client.getTickCount();
 		menu.disableSwaps(true);
 		menu.clearHiddenMenus();
 	}
@@ -329,10 +385,12 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
 			return;
 		}
 
+		updateConfig();
+
 		switch (configChanged.getKey())
 		{
 			case "showTimer":
-				if (!config.showTimer())
+				if (!this.showTimer)
 				{
 					showRoleSprite();
 				}
@@ -352,7 +410,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
 				break;
 
 			case "showDefTimer":
-				if (config.showDefTimer() && getRole() == Role.DEFENDER)
+				if (this.showDefTimer && getRole() == Role.DEFENDER)
 				{
 					addTickTimer();
 				}
@@ -364,9 +422,9 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
 
 			case "showDeathTimes":
 			case "showDeathTimesMode":
-				if (config.showDeathTimes()
-					&& (config.showDeathTimesMode() == DeathTimesMode.INFO_BOX
-					|| config.showDeathTimesMode() == DeathTimesMode.BOTH))
+				if (this.showDeathTimes
+					&& (this.showDeathTimesMode == DeathTimesMode.INFO_BOX
+					|| this.showDeathTimesMode == DeathTimesMode.BOTH))
 				{
 					addAllDeathTimes();
 				}
@@ -383,7 +441,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
 				break;
 
 			case "removeIncorrectAttackStyles":
-				if (!config.removeIncorrectAttackStyles())
+				if (!this.removeIncorrectAttackStyles)
 				{
 					clientThread.invoke(this::showAllStyles);
 				}
@@ -391,6 +449,44 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
 		}
 	}
 
+	private void updateConfig()
+	{
+		this.swapLadder = config.swapLadder();
+		this.showTimer = config.showTimer();
+		this.removeIncorrectCalls = config.removeIncorrectCalls();
+		this.removeUnusedMenus = config.removeUnusedMenus();
+		this.prayerMetronome = config.prayerMetronome();
+		this.prayerMetronomeVolume = config.prayerMetronomeVolume();
+		this.showDeathTimes = config.showDeathTimes();
+		this.showDeathTimesMode = config.showDeathTimesMode();
+		this.waveTimes = config.waveTimes();
+		this.showTotalRewards = config.showTotalRewards();
+		this.highlightArrows = config.highlightArrows();
+		this.highlightArrowColor = config.highlightArrowColor();
+		this.removeIncorrectAttackStyles = config.removeIncorrectAttackStyles();
+		this.tagging = config.tagging();
+		this.highlightBait = config.highlightBait();
+		this.highlightBaitColor = config.highlightBaitColor();
+		this.showDefTimer = config.showDefTimer();
+		this.deprioritizeBait = config.deprioritizeBait();
+		this.removePenanceCave = config.removePenanceCave();
+		this.highlightPoison = config.highlightPoison();
+		this.highlightPoisonColor = config.highlightPoisonColor();
+		this.highlightNotification = config.highlightNotification();
+		this.highlightNotificationColor = config.highlightNotificationColor();
+		this.showHpCountOverlay = config.showHpCountOverlay();
+		this.showTeammateHealthbars = config.showTeammateHealthbars();
+		this.healerCodes = config.healerCodes();
+		this.healerMenuOption = config.healerMenuOption();
+		this.shiftOverstock = config.shiftOverstock();
+		this.controlHealer = config.controlHealer();
+		this.swapCollectorBag = config.swapCollectorBag();
+		this.swapDestroyEggs = config.swapDestroyEggs();
+		this.highlightCollectorEggs = config.highlightCollectorEggs();
+		this.deprioritizeIncorrectEggs = config.deprioritizeIncorrectEggs();
+		this.showEggCountOverlay = config.showEggCountOverlay();
+	}
+
 	@Subscribe
 	public void onWidgetLoaded(WidgetLoaded event)
 	{
@@ -408,7 +504,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
 				Widget pointsWidget = client.getWidget(WidgetInfo.BA_REWARD_TEXT);
 				if (!rewardWidget.getText().contains(ENDGAME_REWARD_NEEDLE_TEXT))
 				{
-					if (config.showTotalRewards() && pointsWidget != null)
+					if (this.showTotalRewards && pointsWidget != null)
 					{
 						// The wave will be null if the plugin is disabled mid game, but
 						// the wave points will still be accurate if it is re-enabled
@@ -433,7 +529,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
 				{
 					announceGameTime();
 
-					if (config.showTotalRewards() && scorecard != null && scorecard.getNumberOfWaves() == 9)
+					if (this.showTotalRewards && scorecard != null && scorecard.getNumberOfWaves() == 9)
 					{
 						announce(scorecard.getGameSummary());
 					}
@@ -496,11 +592,11 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
 					wave.setHpHealed(wave.getHpHealed() + health);
 				}
 			}
-			else if (message.contains("the wrong type of poisoned food to use") && config.highlightNotification())
+			else if (message.contains("the wrong type of poisoned food to use") && this.highlightNotification)
 			{
 				final MessageNode messageNode = chatMessage.getMessageNode();
 				final String nodeValue = Text.removeTags(messageNode.getValue());
-				messageNode.setValue(ColorUtil.wrapWithColorTag(nodeValue, config.highlightNotificationColor()));
+				messageNode.setValue(ColorUtil.wrapWithColorTag(nodeValue, this.highlightNotificationColor));
 				chatMessageManager.update(messageNode);
 			}
 			else if (message.startsWith("All of the Penance"))
@@ -528,9 +624,9 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
 						break;
 				}
 
-				if (config.showDeathTimes() && wave != null
-					&& (config.showDeathTimesMode() == DeathTimesMode.CHAT_BOX
-					|| config.showDeathTimesMode() == DeathTimesMode.BOTH))
+				if (this.showDeathTimes && wave != null
+					&& (this.showDeathTimesMode == DeathTimesMode.CHAT_BOX
+					|| this.showDeathTimesMode == DeathTimesMode.BOTH))
 				{
 					final MessageNode node = chatMessage.getMessageNode();
 					final String nodeValue = Text.removeTags(node.getValue());
@@ -549,7 +645,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
 			return;
 		}
 
-		HashMap<WorldPoint, Integer> eggMap = getEggMap(itemSpawned.getItem().getId());
+		Map<WorldPoint, Integer> eggMap = getEggMap(itemSpawned.getItem().getId());
 		if (eggMap != null)
 		{
 			WorldPoint worldPoint = itemSpawned.getTile().getWorldLocation();
@@ -578,7 +674,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
 
 		// If an egg despawns due to time and the collector is standing over it,
 		// a point will added as if the player picked it up
-		HashMap<WorldPoint, Integer> eggMap = getEggMap(itemId);
+		Map<WorldPoint, Integer> eggMap = getEggMap(itemId);
 		if (eggMap != null)
 		{
 			WorldPoint worldPoint = itemDespawned.getTile().getWorldLocation();
@@ -635,9 +731,9 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
 			tickCounter.setCount(tickNum);
 		}
 
-		if (config.prayerMetronome() && isAnyPrayerActive())
+		if (this.prayerMetronome && isAnyPrayerActive())
 		{
-			for (int i = 0; i < config.prayerMetronomeVolume(); i++)
+			for (int i = 0; i < this.prayerMetronomeVolume; i++)
 			{
 				client.playSoundEffect(SoundEffectID.GE_INCREMENT_PLOP);
 			}
@@ -661,12 +757,9 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
 
 		String name = event.getNpc().getName();
 
-		if (name.equals("Penance Healer"))
+		if (name.equals("Penance Healer") && !healers.containsKey(npc.getIndex()))
 		{
-			if (!healers.containsKey(npc.getIndex()))
-			{
-				healers.put(npc.getIndex(), new Healer(npc, healers.size(), stage));
-			}
+			healers.put(npc.getIndex(), new Healer(npc, healers.size(), stage));
 		}
 	}
 
@@ -821,7 +914,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
 		// This doesn't have to be done in BeforeRender. And although it is
 		// inefficient, it's only being done while in the instance. Will
 		// likely be changed in the future
-		if (getRole() == Role.ATTACKER && config.removeIncorrectAttackStyles())
+		if (getRole() == Role.ATTACKER && this.removeIncorrectAttackStyles)
 		{
 			Widget weapon = client.getWidget(WidgetInfo.COMBAT_WEAPON);
 
@@ -891,7 +984,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
 				switch (getRole())
 				{
 					case ATTACKER:
-						if (config.tagging() && option.equals("attack") && (target.startsWith("penance fighter") || target.startsWith("penance ranger")))
+						if (this.tagging && option.equals("attack") && (target.startsWith("penance fighter") || target.startsWith("penance ranger")))
 						{
 							String tag = StringUtils.substringBefore(entry.getTarget(), ")");
 
@@ -932,7 +1025,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
 							priority.add(entry);
 							continue;
 						}
-						else if (config.deprioritizeIncorrectEggs()
+						else if (this.deprioritizeIncorrectEggs
 							&& option.equals("take")
 							&& (target.equals("blue egg") || target.equals("green egg") || target.equals("red egg")))
 						{
@@ -954,7 +1047,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
 							priority.add(entry);
 							continue;
 						}
-						else if (config.deprioritizeBait()
+						else if (this.deprioritizeBait
 							&& option.equals("take")
 							&& (target.equals("tofu") || target.equals("crackers") || target.equals("worms")))
 						{
@@ -963,7 +1056,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
 						break;
 
 					case HEALER:
-						if (config.healerMenuOption() && target.contains("penance healer") && healers.containsKey(identifier))
+						if (this.healerMenuOption && target.contains("penance healer") && healers.containsKey(identifier))
 						{
 							String tag = StringUtils.substringBefore(entry.getTarget(), " (");
 							int time = healers.get(identifier).timeToPoison();
@@ -978,17 +1071,17 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
 						if ((target.startsWith("poisoned meat ->") || target.startsWith("poisoned tofu ->") || target.startsWith("poisoned worms ->")))
 						{
 							// Poison should only be used on healers
-							if (config.removeUnusedMenus() && !target.contains("penance healer"))
+							if (this.removeUnusedMenus && !target.contains("penance healer"))
 							{
 								continue;
 							}
-							else if (config.controlHealer() && controlDown && identifier == lastHealerPoisoned && target.contains("penance healer"))
+							else if (this.controlHealer && controlDown && identifier == lastHealerPoisoned && target.contains("penance healer"))
 							{
 								selected.add(entry);
 								continue;
 							}
 						}
-						else if (config.shiftOverstock() && target.equals("healer item machine") && shiftDown)
+						else if (this.shiftOverstock && target.equals("healer item machine") && shiftDown)
 						{
 							if (option.contains(listen))
 							{
@@ -996,7 +1089,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
 								continue;
 							}
 						}
-						else if (config.removeUnusedMenus())
+						else if (this.removeUnusedMenus)
 						{
 							// Vials that are empty should only be used on spring
 							if (target.startsWith("healing vial ->") && !target.endsWith("healer spring"))
@@ -1061,16 +1154,12 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
 
 		String target = Text.removeTags(event.getTarget()).toLowerCase();
 
-		if (getRole() == Role.HEALER)
+		if (getRole() == Role.HEALER && (target.startsWith("poisoned meat -> penance healer")
+			|| target.startsWith("poisoned tofu -> penance healer")
+			|| target.startsWith("poisoned worms -> penance healer")))
 		{
-			if (target.startsWith("poisoned meat -> penance healer")
-				|| target.startsWith("poisoned tofu -> penance healer")
-				|| target.startsWith("poisoned worms -> penance healer"))
-			{
-				lastHealerPoisoned = event.getIdentifier();
-				poisonUsed = StringUtils.substringBefore(target.replace("oned", "."), " ->");
-				return;
-			}
+			lastHealerPoisoned = event.getIdentifier();
+			poisonUsed = StringUtils.substringBefore(target.replace("oned", "."), " ->");
 		}
 
 		// INW
@@ -1107,14 +1196,11 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
 
 		if (opponent == null)
 		{
-			if (lastInteracted != -1)
+			if (lastInteracted != -1 && StringUtils.equalsIgnoreCase(poisonUsed, getRole().getListen(client)) && healers.containsKey(lastInteracted))
 			{
-				if (StringUtils.equalsIgnoreCase(poisonUsed, getRole().getListen(client)) && healers.containsKey(lastInteracted))
-				{
-					Healer healer = healers.get(lastInteracted);
-					healer.setFoodRemaining(healer.getFoodRemaining() - 1);
-					healer.setTimeLastPoisoned(Instant.now());
-				}
+				Healer healer = healers.get(lastInteracted);
+				healer.setFoodRemaining(healer.getFoodRemaining() - 1);
+				healer.setTimeLastPoisoned(Instant.now());
 			}
 
 			lastInteracted = -1;
@@ -1164,7 +1250,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
 				lastListenText = null;
 				lastCallText = null;
 				lastCallColor = -1;
-				lastClickedTell = null;
+				// lastClickedTell = null;
 			}
 			else
 			{
@@ -1286,12 +1372,12 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
 			if (newCallColor == COLOR_CALL_CALLED)
 			{
 				lastCallColor = COLOR_CALL_CALLED;
-				lastClickedTell = lastCallText;
+				// lastClickedTell = lastCallText;
 			}
 			else if (callTimer == null)
 			{
 				lastCallColor = COLOR_CALL_UPDATED;
-				lastClickedTell = null;
+				// lastClickedTell = null;
 			}
 
 			if (callWidget != null)
@@ -1312,12 +1398,12 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
 
 	private void validateWidgets()
 	{
-		if (!config.showTimer())
+		if (!this.showTimer)
 		{
 			showRoleSprite();
 		}
 
-		if (config.showDefTimer() && getRole() == Role.DEFENDER)
+		if (this.showDefTimer && getRole() == Role.DEFENDER)
 		{
 			addTickTimer();
 		}
@@ -1326,9 +1412,9 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
 			removeTickTimer();
 		}
 
-		if (config.showDeathTimes()
-			&& (config.showDeathTimesMode() == DeathTimesMode.INFO_BOX
-			|| config.showDeathTimesMode() == DeathTimesMode.BOTH))
+		if (this.showDeathTimes
+			&& (this.showDeathTimesMode == DeathTimesMode.INFO_BOX
+			|| this.showDeathTimesMode == DeathTimesMode.BOTH))
 		{
 			addAllDeathTimes();
 		}
@@ -1388,7 +1474,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
 
 		deathTimes.add(box);
 
-		if (config.showDeathTimes() && (config.showDeathTimesMode() == DeathTimesMode.INFO_BOX || config.showDeathTimesMode() == DeathTimesMode.BOTH))
+		if (this.showDeathTimes && (this.showDeathTimesMode == DeathTimesMode.INFO_BOX || this.showDeathTimesMode == DeathTimesMode.BOTH))
 		{
 			infoBoxManager.addInfoBox(box);
 		}
@@ -1454,7 +1540,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
 
 	private void announceWaveTime()
 	{
-		if (config.waveTimes() && wave != null)
+		if (this.waveTimes && wave != null)
 		{
 			announceTime("Wave " + getStage() + " duration: ", wave.getWaveTimer().getElapsedTimeFormatted());
 		}
@@ -1462,7 +1548,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
 
 	private void announceGameTime()
 	{
-		if (config.waveTimes() && gameTimer != null)
+		if (this.waveTimes && gameTimer != null)
 		{
 			announceTime("Game finished, duration: ", gameTimer.getElapsedTimeFormatted());
 		}
@@ -1504,7 +1590,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener
 		yellowEggs.clear();
 	}
 
-	private HashMap<WorldPoint, Integer> getEggMap(int itemID)
+	private Map<WorldPoint, Integer> getEggMap(int itemID)
 	{
 		switch (itemID)
 		{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Scorecard.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Scorecard.java
index e33c798a83..df5b7423b4 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Scorecard.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Scorecard.java
@@ -28,6 +28,7 @@ package net.runelite.client.plugins.barbarianassault;
 import java.awt.Color;
 import java.util.ArrayList;
 
+import java.util.List;
 import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.events.ChatMessage;
@@ -35,13 +36,13 @@ import net.runelite.client.chat.ChatMessageBuilder;
 import net.runelite.client.eventbus.Subscribe;
 
 
-@Getter
+@Getter(AccessLevel.PACKAGE)
 public class Scorecard
 {
 	private BarbarianAssaultPlugin game;
 
 	@Getter(AccessLevel.NONE)
-	private ArrayList<Wave> waves = new ArrayList<>();
+	private List<Wave> waves = new ArrayList<>();
 	private String[] totalDescriptions = {
 		"A: ",
 		"; D: ",
@@ -67,13 +68,10 @@ public class Scorecard
 	@Subscribe
 	public void onChatMessage(ChatMessage chatMessage)
 	{
-		if (chatMessage.getMessage().startsWith("---- Points:"))
+		if (chatMessage.getMessage().startsWith("---- Points:") && game.getStage() == 1)
 		{
-			if (game.getStage() == 1)
-			{
-				totalPoints = new int[6];
-				totalAmounts = new int[6];
-			}
+			totalPoints = new int[6];
+			totalAmounts = new int[6];
 		}
 	}
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Timer.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Timer.java
index 69347915a6..18e9077e38 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Timer.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Timer.java
@@ -24,6 +24,7 @@
  */
 package net.runelite.client.plugins.barbarianassault;
 
+import lombok.AccessLevel;
 import lombok.Getter;
 
 import java.time.Duration;
@@ -33,7 +34,7 @@ import java.time.format.DateTimeFormatter;
 
 class Timer
 {
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final Instant startTime;
 
 	Timer()
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/TimerBox.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/TimerBox.java
index 8efa4fe917..b3261d53c3 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/TimerBox.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/TimerBox.java
@@ -26,12 +26,14 @@
 package net.runelite.client.plugins.barbarianassault;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.ui.overlay.infobox.InfoBox;
 
 import java.awt.Color;
 import java.awt.image.BufferedImage;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class TimerBox extends InfoBox
 {
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Wave.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Wave.java
index a392312b75..feee859d9a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Wave.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/Wave.java
@@ -37,7 +37,6 @@ import net.runelite.client.chat.ChatMessageBuilder;
 
 import java.awt.Color;
 
-
 @Data
 public class Wave
 {
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsBrotherSlainOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsBrotherSlainOverlay.java
index a72d2dfccf..f732d6bd07 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsBrotherSlainOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsBrotherSlainOverlay.java
@@ -28,6 +28,7 @@ import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.api.Varbits;
@@ -43,13 +44,14 @@ import net.runelite.client.ui.overlay.components.table.TableAlignment;
 import net.runelite.client.ui.overlay.components.table.TableComponent;
 import net.runelite.client.util.ColorUtil;
 
+@Singleton
 public class BarrowsBrotherSlainOverlay extends Overlay
 {
 	private final Client client;
 	private final PanelComponent panelComponent = new PanelComponent();
 
 	@Inject
-	private BarrowsBrotherSlainOverlay(BarrowsPlugin plugin, Client client)
+	private BarrowsBrotherSlainOverlay(final BarrowsPlugin plugin, final Client client)
 	{
 		super(plugin);
 		setPosition(OverlayPosition.TOP_LEFT);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsBrothers.java b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsBrothers.java
index 6b2f3edab4..c2053439e1 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsBrothers.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsBrothers.java
@@ -24,6 +24,7 @@
  */
 package net.runelite.client.plugins.barrows;
 
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import net.runelite.api.Varbits;
@@ -39,10 +40,10 @@ public enum BarrowsBrothers
 	TORAG("Torag", new WorldPoint(3553, 3283, 0), Varbits.BARROWS_KILLED_TORAG),
 	VERAC("Verac", new WorldPoint(3557, 3298, 0), Varbits.BARROWS_KILLED_VERAC);
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final String name;
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final WorldPoint location;
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final Varbits killedVarbit;
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java
index 8e668d1697..12b3494af7 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsOverlay.java
@@ -30,6 +30,7 @@ import java.awt.Graphics2D;
 import java.awt.Rectangle;
 import java.util.List;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.GameObject;
 import net.runelite.api.NPC;
@@ -44,22 +45,21 @@ import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 
+@Singleton
 class BarrowsOverlay extends Overlay
 {
 	private static final int MAX_DISTANCE = 2350;
 
 	private final Client client;
 	private final BarrowsPlugin plugin;
-	private final BarrowsConfig config;
 
 	@Inject
-	private BarrowsOverlay(Client client, BarrowsPlugin plugin, BarrowsConfig config)
+	private BarrowsOverlay(final Client client, final BarrowsPlugin plugin)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_WIDGETS);
 		this.client = client;
 		this.plugin = plugin;
-		this.config = config;
 	}
 
 	@Override
@@ -71,7 +71,7 @@ class BarrowsOverlay extends Overlay
 		Widget puzzleAnswer = plugin.getPuzzleAnswer();
 
 		// tunnels are only on z=0
-		if (!plugin.getWalls().isEmpty() && client.getPlane() == 0 && config.showMinimap())
+		if (!plugin.getWalls().isEmpty() && client.getPlane() == 0 && plugin.isShowMinimap())
 		{
 			// NPC dots
 			graphics.setColor(npcColor);
@@ -117,12 +117,12 @@ class BarrowsOverlay extends Overlay
 			graphics.setColor(playerColor);
 			graphics.fillRect(local.getMinimapLocation().getX(), local.getMinimapLocation().getY(), 3, 3);
 		}
-		else if (config.showBrotherLoc())
+		else if (plugin.isShowBrotherLoc())
 		{
 			renderBarrowsBrothers(graphics);
 		}
 
-		if (puzzleAnswer != null && config.showPuzzleAnswer() && !puzzleAnswer.isHidden())
+		if (puzzleAnswer != null && plugin.isShowPuzzleAnswer() && !puzzleAnswer.isHidden())
 		{
 			Rectangle answerRect = puzzleAnswer.getBounds();
 			graphics.setColor(Color.GREEN);
@@ -230,11 +230,11 @@ class BarrowsOverlay extends Overlay
 
 				if (client.getVar(brother.getKilledVarbit()) > 0)
 				{
-					graphics.setColor(config.deadBrotherLocColor());
+					graphics.setColor(plugin.getDeadBrotherLocColor());
 				}
 				else
 				{
-					graphics.setColor(config.brotherLocColor());
+					graphics.setColor(plugin.getBrotherLocColor());
 				}
 
 				graphics.drawString(brotherLetter, minimapText.getX(), minimapText.getY());
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsPlugin.java
index 2b5c044f82..beeb0ba8cf 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsPlugin.java
@@ -27,10 +27,12 @@ package net.runelite.client.plugins.barrows;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Sets;
 import com.google.inject.Provides;
+import java.awt.Color;
 import java.time.temporal.ChronoUnit;
 import java.util.HashSet;
 import java.util.Set;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.ChatMessageType;
@@ -77,6 +79,7 @@ import net.runelite.client.util.StackFormatter;
 	description = "Show helpful information for the Barrows minigame",
 	tags = {"combat", "minigame", "minimap", "bosses", "pve", "pvm"}
 )
+@Singleton
 public class BarrowsPlugin extends Plugin
 {
 	@Getter(AccessLevel.PACKAGE)
@@ -144,9 +147,23 @@ public class BarrowsPlugin extends Plugin
 		return configManager.getConfig(BarrowsConfig.class);
 	}
 
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showMinimap;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showBrotherLoc;
+	private boolean showChestValue;
+	@Getter(AccessLevel.PACKAGE)
+	private Color brotherLocColor;
+	@Getter(AccessLevel.PACKAGE)
+	private Color deadBrotherLocColor;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showPuzzleAnswer;
+	private boolean showPrayerDrainTimer;
+
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
 		overlayManager.add(barrowsOverlay);
 		overlayManager.add(brotherOverlay);
 	}
@@ -179,12 +196,28 @@ public class BarrowsPlugin extends Plugin
 	@Subscribe
 	public void onConfigChanged(ConfigChanged event)
 	{
-		if (event.getGroup().equals("barrows") && !config.showPrayerDrainTimer())
+		if (event.getGroup().equals("barrows"))
 		{
-			stopPrayerDrainTimer();
+			updateConfig();
+
+			if (!this.showPrayerDrainTimer)
+			{
+				stopPrayerDrainTimer();
+			}
 		}
 	}
 
+	private void updateConfig()
+	{
+		this.showMinimap = config.showMinimap();
+		this.showBrotherLoc = config.showBrotherLoc();
+		this.showChestValue = config.showChestValue();
+		this.brotherLocColor = config.brotherLocColor();
+		this.deadBrotherLocColor = config.deadBrotherLocColor();
+		this.showPuzzleAnswer = config.showPuzzleAnswer();
+		this.showPrayerDrainTimer = config.showPrayerDrainTimer();
+	}
+
 	@Subscribe
 	public void onWallObjectSpawned(WallObjectSpawned event)
 	{
@@ -256,19 +289,16 @@ public class BarrowsPlugin extends Plugin
 			ladders.clear();
 			puzzleAnswer = null;
 		}
-		else if (event.getGameState() == GameState.LOGGED_IN)
+		else if (event.getGameState() == GameState.LOGGED_IN && client.getLocalPlayer() != null)
 		{
-			if (client.getLocalPlayer() != null)
+			boolean isInCrypt = isInCrypt();
+			if (wasInCrypt && !isInCrypt)
 			{
-				boolean isInCrypt = isInCrypt();
-				if (wasInCrypt && !isInCrypt)
-				{
-					stopPrayerDrainTimer();
-				}
-				else if (!wasInCrypt && isInCrypt)
-				{
-					startPrayerDrainTimer();
-				}
+				stopPrayerDrainTimer();
+			}
+			else if (!wasInCrypt && isInCrypt)
+			{
+				startPrayerDrainTimer();
 			}
 		}
 	}
@@ -276,10 +306,14 @@ public class BarrowsPlugin extends Plugin
 	@Subscribe
 	public void onWidgetLoaded(WidgetLoaded event)
 	{
-		if (event.getGroupId() == WidgetID.BARROWS_REWARD_GROUP_ID && config.showChestValue())
+		if (event.getGroupId() == WidgetID.BARROWS_REWARD_GROUP_ID && this.showChestValue)
 		{
 			ItemContainer barrowsRewardContainer = client.getItemContainer(InventoryID.BARROWS_REWARD);
-			Item[] items = barrowsRewardContainer.getItems();
+			Item[] items = new Item[0];
+			if (barrowsRewardContainer != null)
+			{
+				items = barrowsRewardContainer.getItems();
+			}
 			long chestPrice = 0;
 
 			for (Item item : items)
@@ -320,7 +354,7 @@ public class BarrowsPlugin extends Plugin
 
 	private void startPrayerDrainTimer()
 	{
-		if (config.showPrayerDrainTimer())
+		if (this.showPrayerDrainTimer)
 		{
 			final LoopTimer loopTimer = new LoopTimer(
 				PRAYER_DRAIN_INTERVAL_MS,
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blackjack/BlackjackPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/blackjack/BlackjackPlugin.java
index b5d6c2f635..f31100e59e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/blackjack/BlackjackPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/blackjack/BlackjackPlugin.java
@@ -35,10 +35,10 @@ import net.runelite.api.Client;
 import net.runelite.api.GameState;
 import net.runelite.api.Varbits;
 import net.runelite.api.events.ChatMessage;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.MenuEntryAdded;
 import net.runelite.client.config.ConfigManager;
 import net.runelite.client.eventbus.Subscribe;
-import net.runelite.client.menus.MenuManager;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginDescriptor;
 import net.runelite.client.plugins.PluginType;
@@ -56,7 +56,6 @@ import org.apache.commons.lang3.RandomUtils;
 		type = PluginType.SKILLING,
 		enabledByDefault = false
 )
-
 @Singleton
 @Slf4j
 public class BlackjackPlugin extends Plugin
@@ -68,10 +67,9 @@ public class BlackjackPlugin extends Plugin
 	@Inject
 	private Client client;
 	@Inject
-	private MenuManager menuManager;
-	@Inject
 	private BlackjackConfig config;
 
+	private boolean pickpocketOnAggro;
 
 	@Provides
 	BlackjackConfig getConfig(ConfigManager configManager)
@@ -79,6 +77,20 @@ public class BlackjackPlugin extends Plugin
 		return configManager.getConfig(BlackjackConfig.class);
 	}
 
+	@Override
+	protected void startUp() throws Exception
+	{
+		this.pickpocketOnAggro = config.pickpocketOnAggro();
+	}
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (event.getGroup().equals("blackjack"))
+		{
+			this.pickpocketOnAggro = config.pickpocketOnAggro();
+		}
+	}
 
 	@Subscribe
 	public void onMenuEntryAdded(MenuEntryAdded event)
@@ -105,12 +117,9 @@ public class BlackjackPlugin extends Plugin
 	@Subscribe
 	public void onChatMessage(ChatMessage event)
 	{
-		if (event.getType() == ChatMessageType.SPAM)
+		if (event.getType() == ChatMessageType.SPAM && event.getMessage().equals(SUCCESS_BLACKJACK) ^ (event.getMessage().equals(FAILED_BLACKJACK) && this.pickpocketOnAggro))
 		{
-			if (event.getMessage().equals(SUCCESS_BLACKJACK) ^ (event.getMessage().equals(FAILED_BLACKJACK) && config.pickpocketOnAggro()))
-			{
-				nextKnockOutTick = client.getTickCount() + RandomUtils.nextInt(3, 4);
-			}
+			nextKnockOutTick = client.getTickCount() + RandomUtils.nextInt(3, 4);
 		}
 	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceClickBoxOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceClickBoxOverlay.java
index 9dba17df30..4e7b818f90 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceClickBoxOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceClickBoxOverlay.java
@@ -29,6 +29,7 @@ import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.awt.geom.Area;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.EquipmentInventorySlot;
 import net.runelite.api.GameObject;
@@ -42,21 +43,20 @@ import net.runelite.api.coords.LocalPoint;
 import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayPosition;
 
+@Singleton
 class BlastFurnaceClickBoxOverlay extends Overlay
 {
 	private static final int MAX_DISTANCE = 2350;
 
 	private final Client client;
 	private final BlastFurnacePlugin plugin;
-	private final BlastFurnaceConfig config;
 
 	@Inject
-	private BlastFurnaceClickBoxOverlay(Client client, BlastFurnacePlugin plugin, BlastFurnaceConfig config)
+	private BlastFurnaceClickBoxOverlay(final Client client, final BlastFurnacePlugin plugin)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		this.client = client;
 		this.plugin = plugin;
-		this.config = config;
 	}
 
 	@Override
@@ -64,13 +64,13 @@ class BlastFurnaceClickBoxOverlay extends Overlay
 	{
 		int dispenserState = client.getVar(Varbits.BAR_DISPENSER);
 
-		if (config.showConveyorBelt() && plugin.getConveyorBelt() != null)
+		if (plugin.isShowConveyorBelt() && plugin.getConveyorBelt() != null)
 		{
 			Color color = dispenserState == 1 ? Color.RED : Color.GREEN;
 			renderObject(plugin.getConveyorBelt(), graphics, color);
 		}
 
-		if (config.showBarDispenser() && plugin.getBarDispenser() != null)
+		if (plugin.isShowBarDispenser() && plugin.getBarDispenser() != null)
 		{
 			boolean hasIceGloves = hasIceGloves();
 			Color color = dispenserState == 2 && hasIceGloves ? Color.GREEN : (dispenserState == 3 ? Color.GREEN : Color.RED);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceCofferOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceCofferOverlay.java
index 49242d63a8..12c1353973 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceCofferOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceCofferOverlay.java
@@ -27,6 +27,7 @@ package net.runelite.client.plugins.blastfurnace;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
 import static net.runelite.api.Varbits.BLAST_FURNACE_COFFER;
@@ -41,6 +42,7 @@ import net.runelite.client.ui.overlay.components.table.TableComponent;
 import net.runelite.client.ui.overlay.components.table.TableAlignment;
 import net.runelite.client.util.StackFormatter;
 
+@Singleton
 class BlastFurnaceCofferOverlay extends Overlay
 {
 	private final Client client;
@@ -48,7 +50,7 @@ class BlastFurnaceCofferOverlay extends Overlay
 	private final PanelComponent panelComponent = new PanelComponent();
 
 	@Inject
-	private BlastFurnaceCofferOverlay(Client client, BlastFurnacePlugin plugin)
+	private BlastFurnaceCofferOverlay(final Client client, final BlastFurnacePlugin plugin)
 	{
 		super(plugin);
 		setPosition(OverlayPosition.TOP_LEFT);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceOverlay.java
index 0d17c94bb7..2a83c6965d 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnaceOverlay.java
@@ -28,6 +28,7 @@ import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.client.game.ItemManager;
@@ -39,6 +40,7 @@ import net.runelite.client.ui.overlay.components.ComponentOrientation;
 import net.runelite.client.ui.overlay.components.ImageComponent;
 import net.runelite.client.ui.overlay.components.PanelComponent;
 
+@Singleton
 class BlastFurnaceOverlay extends Overlay
 {
 	private final Client client;
@@ -49,7 +51,7 @@ class BlastFurnaceOverlay extends Overlay
 	private ItemManager itemManager;
 
 	@Inject
-	BlastFurnaceOverlay(Client client, BlastFurnacePlugin plugin)
+	BlastFurnaceOverlay(final Client client, final BlastFurnacePlugin plugin)
 	{
 		super(plugin);
 		this.plugin = plugin;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnacePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnacePlugin.java
index 15d602a324..c1afdb3bee 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnacePlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnacePlugin.java
@@ -29,6 +29,7 @@ import com.google.inject.Provides;
 import java.time.Duration;
 import java.time.Instant;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.Client;
@@ -37,6 +38,7 @@ import net.runelite.api.GameState;
 import static net.runelite.api.NullObjectID.NULL_9092;
 import static net.runelite.api.ObjectID.CONVEYOR_BELT;
 import net.runelite.api.Skill;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.GameObjectDespawned;
 import net.runelite.api.events.GameObjectSpawned;
 import net.runelite.api.events.GameStateChanged;
@@ -57,6 +59,7 @@ import net.runelite.client.util.Text;
 	description = "Show helpful information for the Blast Furnace minigame",
 	tags = {"minigame", "overlay", "skilling", "smithing"}
 )
+@Singleton
 public class BlastFurnacePlugin extends Plugin
 {
 	private static final int BAR_DISPENSER = NULL_9092;
@@ -91,9 +94,19 @@ public class BlastFurnacePlugin extends Plugin
 	@Inject
 	private InfoBoxManager infoBoxManager;
 
+	@Inject
+	private BlastFurnaceConfig config;
+
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showConveyorBelt;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showBarDispenser;
+
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
+
 		overlayManager.add(overlay);
 		overlayManager.add(cofferOverlay);
 		overlayManager.add(clickBoxOverlay);
@@ -117,6 +130,15 @@ public class BlastFurnacePlugin extends Plugin
 		return configManager.getConfig(BlastFurnaceConfig.class);
 	}
 
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (event.getGroup().equals("blastfurnace"))
+		{
+			updateConfig();
+		}
+	}
+
 	@Subscribe
 	public void onGameObjectSpawned(GameObjectSpawned event)
 	{
@@ -187,4 +209,10 @@ public class BlastFurnacePlugin extends Plugin
 			}
 		}
 	}
+
+	private void updateConfig()
+	{
+		this.showBarDispenser = config.showBarDispenser();
+		this.showConveyorBelt = config.showConveyorBelt();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineOreCountOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineOreCountOverlay.java
index 8cff73bd55..0c4e15120d 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineOreCountOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineOreCountOverlay.java
@@ -28,6 +28,7 @@ import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.ItemID;
 import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
@@ -43,20 +44,21 @@ import net.runelite.client.ui.overlay.components.ComponentOrientation;
 import net.runelite.client.ui.overlay.components.ImageComponent;
 import net.runelite.client.ui.overlay.components.PanelComponent;
 
+@Singleton
 class BlastMineOreCountOverlay extends Overlay
 {
 	private final Client client;
-	private final BlastMinePluginConfig config;
+	private final BlastMinePlugin plugin;
 	private final ItemManager itemManager;
 	private final PanelComponent panelComponent = new PanelComponent();
 
 	@Inject
-	private BlastMineOreCountOverlay(BlastMinePlugin plugin, Client client, BlastMinePluginConfig config, ItemManager itemManager)
+	private BlastMineOreCountOverlay(final BlastMinePlugin plugin, final Client client, final ItemManager itemManager)
 	{
 		super(plugin);
 		setPosition(OverlayPosition.TOP_LEFT);
 		this.client = client;
-		this.config = config;
+		this.plugin = plugin;
 		this.itemManager = itemManager;
 		panelComponent.setOrientation(ComponentOrientation.HORIZONTAL);
 		getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY_CONFIG, OPTION_CONFIGURE, "Blast mine overlay"));
@@ -74,7 +76,7 @@ class BlastMineOreCountOverlay extends Overlay
 
 		panelComponent.getChildren().clear();
 
-		if (config.showOreOverlay())
+		if (plugin.isShowOreOverlay())
 		{
 			blastMineWidget.setHidden(true);
 			panelComponent.getChildren().add(new ImageComponent(getImage(ItemID.COAL, client.getVar(Varbits.BLAST_MINE_COAL))));
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMinePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMinePlugin.java
index 7ddc7e8a80..88d98cebbf 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMinePlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMinePlugin.java
@@ -25,9 +25,12 @@
 package net.runelite.client.plugins.blastmine;
 
 import com.google.inject.Provides;
+import java.awt.Color;
 import java.util.HashMap;
 import java.util.Map;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.Client;
 import net.runelite.api.GameObject;
@@ -49,9 +52,10 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	description = "Show helpful information for the Blast Mine minigame",
 	tags = {"explode", "explosive", "mining", "minigame", "skilling"}
 )
+@Singleton
 public class BlastMinePlugin extends Plugin
 {
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final Map<WorldPoint, BlastMineRock> rocks = new HashMap<>();
 
 	@Inject
@@ -66,15 +70,33 @@ public class BlastMinePlugin extends Plugin
 	@Inject
 	private BlastMineOreCountOverlay blastMineOreCountOverlay;
 
+	@Inject
+	private BlastMinePluginConfig config;
+
 	@Provides
 	BlastMinePluginConfig getConfig(ConfigManager configManager)
 	{
 		return configManager.getConfig(BlastMinePluginConfig.class);
 	}
 
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showOreOverlay;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showRockIconOverlay;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showTimerOverlay;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showWarningOverlay;
+	@Getter(AccessLevel.PACKAGE)
+	private Color timerColor;
+	@Getter(AccessLevel.PACKAGE)
+	private Color warningColor;
+
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
+
 		overlayManager.add(blastMineRockOverlay);
 		overlayManager.add(blastMineOreCountOverlay);
 	}
@@ -132,4 +154,14 @@ public class BlastMinePlugin extends Plugin
 			(rock.getRemainingTimeRelative() == 1 && rock.getType() != BlastMineRockType.NORMAL) ||
 				(rock.getRemainingFuseTimeRelative() == 1 && rock.getType() == BlastMineRockType.LIT));
 	}
+
+	private void updateConfig()
+	{
+		this.showOreOverlay = config.showOreOverlay();
+		this.showRockIconOverlay = config.showRockIconOverlay();
+		this.showTimerOverlay = config.showTimerOverlay();
+		this.showWarningOverlay = config.showWarningOverlay();
+		this.timerColor = config.getTimerColor();
+		this.warningColor = config.getWarningColor();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineRock.java b/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineRock.java
index 1f1cec4fb5..441d836f3b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineRock.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineRock.java
@@ -26,6 +26,7 @@ package net.runelite.client.plugins.blastmine;
 
 import java.time.Duration;
 import java.time.Instant;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.GameObject;
 
@@ -34,10 +35,10 @@ class BlastMineRock
 	private static final Duration PLANT_TIME = Duration.ofSeconds(30);
 	private static final Duration FUSE_TIME = Duration.ofMillis(4200);
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final GameObject gameObject;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final BlastMineRockType type;
 
 	private final Instant creationTime = Instant.now();
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineRockOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineRockOverlay.java
index 92fbdfe221..5199a9bd4f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineRockOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineRockOverlay.java
@@ -32,6 +32,7 @@ import java.awt.Polygon;
 import java.awt.image.BufferedImage;
 import java.util.Map;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.GameObject;
 import net.runelite.api.ItemID;
@@ -49,6 +50,7 @@ import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.components.ProgressPieComponent;
 
+@Singleton
 public class BlastMineRockOverlay extends Overlay
 {
 	private static final int MAX_DISTANCE = 16;
@@ -62,20 +64,18 @@ public class BlastMineRockOverlay extends Overlay
 
 	private final Client client;
 	private final BlastMinePlugin plugin;
-	private final BlastMinePluginConfig config;
 
 	private final BufferedImage chiselIcon;
 	private final BufferedImage dynamiteIcon;
 	private final BufferedImage tinderboxIcon;
 
 	@Inject
-	private BlastMineRockOverlay(Client client, BlastMinePlugin plugin, BlastMinePluginConfig config, ItemManager itemManager)
+	private BlastMineRockOverlay(final Client client, final BlastMinePlugin plugin, final ItemManager itemManager)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_SCENE);
 		this.client = client;
 		this.plugin = plugin;
-		this.config = config;
 		chiselIcon = itemManager.getImage(ItemID.CHISEL);
 		dynamiteIcon = itemManager.getImage(ItemID.DYNAMITE);
 		tinderboxIcon = itemManager.getImage(ItemID.TINDERBOX);
@@ -114,8 +114,8 @@ public class BlastMineRockOverlay extends Overlay
 					drawIconOnRock(graphics, rock, tinderboxIcon);
 					break;
 				case LIT:
-					drawTimerOnRock(graphics, rock, config.getTimerColor());
-					drawAreaWarning(graphics, rock, config.getWarningColor(), tiles);
+					drawTimerOnRock(graphics, rock, plugin.getTimerColor());
+					drawAreaWarning(graphics, rock, plugin.getWarningColor(), tiles);
 					break;
 			}
 		}
@@ -125,7 +125,7 @@ public class BlastMineRockOverlay extends Overlay
 
 	private void drawIconOnRock(Graphics2D graphics, BlastMineRock rock, BufferedImage icon)
 	{
-		if (!config.showRockIconOverlay())
+		if (!plugin.isShowRockIconOverlay())
 		{
 			return;
 		}
@@ -140,7 +140,7 @@ public class BlastMineRockOverlay extends Overlay
 
 	private void drawTimerOnRock(Graphics2D graphics, BlastMineRock rock, Color color)
 	{
-		if (!config.showTimerOverlay())
+		if (!plugin.isShowTimerOverlay())
 		{
 			return;
 		}
@@ -161,7 +161,7 @@ public class BlastMineRockOverlay extends Overlay
 
 	private void drawAreaWarning(Graphics2D graphics, BlastMineRock rock, Color color, Tile[][][] tiles)
 	{
-		if (!config.showWarningOverlay())
+		if (!plugin.isShowWarningOverlay())
 		{
 			return;
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineRockType.java b/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineRockType.java
index 20e1d37f58..0960fcfb5d 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineRockType.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMineRockType.java
@@ -26,6 +26,7 @@ package net.runelite.client.plugins.blastmine;
 
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.ObjectID;
 
@@ -54,7 +55,7 @@ public enum BlastMineRockType
 		rockTypes = builder.build();
 	}
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final int[] objectIds;
 
 	BlastMineRockType(int... objectIds)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostIndicator.java b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostIndicator.java
index 00a0a97561..50a1db0b8a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostIndicator.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostIndicator.java
@@ -26,6 +26,7 @@ package net.runelite.client.plugins.boosts;
 
 import java.awt.Color;
 import java.awt.image.BufferedImage;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.Client;
 import net.runelite.api.Skill;
@@ -35,17 +36,15 @@ import net.runelite.client.ui.overlay.infobox.InfoBoxPriority;
 public class BoostIndicator extends InfoBox
 {
 	private final BoostsPlugin plugin;
-	private final BoostsConfig config;
 	private final Client client;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final Skill skill;
 
-	BoostIndicator(Skill skill, BufferedImage image, BoostsPlugin plugin, Client client, BoostsConfig config)
+	BoostIndicator(final Skill skill, final BufferedImage image, final BoostsPlugin plugin, final Client client)
 	{
 		super(image, plugin);
 		this.plugin = plugin;
-		this.config = config;
 		this.client = client;
 		this.skill = skill;
 		setTooltip(skill.getName() + " boost");
@@ -55,7 +54,7 @@ public class BoostIndicator extends InfoBox
 	@Override
 	public String getText()
 	{
-		if (!config.useRelativeBoost())
+		if (!plugin.isUseRelativeBoost())
 		{
 			return String.valueOf(client.getBoostedSkillLevel(skill));
 		}
@@ -81,13 +80,13 @@ public class BoostIndicator extends InfoBox
 			return new Color(238, 51, 51);
 		}
 
-		return boosted - base <= config.boostThreshold() ? Color.YELLOW : Color.GREEN;
+		return boosted - base <= plugin.getBoostThreshold() ? Color.YELLOW : Color.GREEN;
 	}
 
 	@Override
 	public boolean render()
 	{
-		if (config.displayInfoboxes() && plugin.canShowBoosts() && plugin.getShownSkills().contains(getSkill()))
+		if (plugin.isDisplayInfoboxes() && plugin.canShowBoosts() && plugin.getShownSkills().contains(getSkill()))
 		{
 			return client.getBoostedSkillLevel(skill) != client.getRealSkillLevel(skill);
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsOverlay.java
index 54a4f62b8f..977fe0b5a0 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsOverlay.java
@@ -28,6 +28,7 @@ import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.api.Skill;
@@ -41,20 +42,19 @@ import net.runelite.client.ui.overlay.components.table.TableAlignment;
 import net.runelite.client.ui.overlay.components.table.TableComponent;
 import net.runelite.client.util.ColorUtil;
 
+@Singleton
 class BoostsOverlay extends Overlay
 {
 	private final Client client;
-	private final BoostsConfig config;
 	private final PanelComponent panelComponent = new PanelComponent();
 	private final BoostsPlugin plugin;
 
 	@Inject
-	private BoostsOverlay(Client client, BoostsConfig config, BoostsPlugin plugin)
+	private BoostsOverlay(final Client client, final BoostsPlugin plugin)
 	{
 		super(plugin);
 		this.plugin = plugin;
 		this.client = client;
-		this.config = config;
 		setPosition(OverlayPosition.TOP_LEFT);
 		setPriority(OverlayPriority.MED);
 		getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY_CONFIG, OPTION_CONFIGURE, "Boosts overlay"));
@@ -63,7 +63,7 @@ class BoostsOverlay extends Overlay
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (config.displayInfoboxes() || config.displayIcons())
+		if (plugin.isDisplayInfoboxes() || plugin.isDisplayIcons())
 		{
 			return null;
 		}
@@ -103,7 +103,7 @@ class BoostsOverlay extends Overlay
 				final Color strColor = getTextColor(boost);
 				String str;
 
-				if (config.useRelativeBoost())
+				if (plugin.isUseRelativeBoost())
 				{
 					str = String.valueOf(boost);
 					if (boost > 0)
@@ -133,7 +133,7 @@ class BoostsOverlay extends Overlay
 			return new Color(238, 51, 51);
 		}
 
-		return boost <= config.boostThreshold() ? Color.YELLOW : Color.GREEN;
+		return boost <= plugin.getBoostThreshold() ? Color.YELLOW : Color.GREEN;
 
 	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java
index 5dabff0736..4140df8426 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java
@@ -33,6 +33,7 @@ import java.util.List;
 import java.util.Set;
 import javax.inject.Inject;
 import javax.inject.Singleton;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.Client;
 import net.runelite.api.Constants;
@@ -105,7 +106,22 @@ public class BoostsPlugin extends Plugin
 	private int lastChangeUp = -1;
 	private boolean preserveBeenActive = false;
 	private long lastTickMillis;
-	private List<String> boostedSkillsChanged = new ArrayList<>();
+	private final List<String> boostedSkillsChanged = new ArrayList<>();
+
+	private boolean enableSkill;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean useRelativeBoost;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean displayInfoboxes;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean displayIcons;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean boldIconFont;
+	private BoostsConfig.DisplayChangeMode displayNextBuffChange;
+	private BoostsConfig.DisplayChangeMode displayNextDebuffChange;
+	@Getter(AccessLevel.PACKAGE)
+	private int boostThreshold;
+	private boolean groupNotifications;
 
 	@Provides
 	BoostsConfig provideConfig(ConfigManager configManager)
@@ -116,6 +132,8 @@ public class BoostsPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
+
 		overlayManager.add(boostsOverlay);
 		overlayManager.add(combatIconsOverlay);
 		updateShownSkills();
@@ -130,7 +148,7 @@ public class BoostsPlugin extends Plugin
 		{
 			if (skill != Skill.OVERALL)
 			{
-				infoBoxManager.addInfoBox(new BoostIndicator(skill, skillIconManager.getSkillImage(skill), this, client, config));
+				infoBoxManager.addInfoBox(new BoostIndicator(skill, skillIconManager.getSkillImage(skill), this, client));
 			}
 		}
 	}
@@ -169,14 +187,15 @@ public class BoostsPlugin extends Plugin
 			return;
 		}
 
+		updateConfig();
 		updateShownSkills();
 
-		if (config.displayNextBuffChange() == BoostsConfig.DisplayChangeMode.NEVER)
+		if (this.displayNextBuffChange == BoostsConfig.DisplayChangeMode.NEVER)
 		{
 			lastChangeDown = -1;
 		}
 
-		if (config.displayNextDebuffChange() == BoostsConfig.DisplayChangeMode.NEVER)
+		if (this.displayNextDebuffChange == BoostsConfig.DisplayChangeMode.NEVER)
 		{
 			lastChangeUp = -1;
 		}
@@ -211,7 +230,7 @@ public class BoostsPlugin extends Plugin
 		lastSkillLevels[skillIdx] = cur;
 		updateBoostedStats();
 
-		int boostThreshold = config.boostThreshold();
+		int boostThreshold = this.boostThreshold;
 
 		if (boostThreshold != 0)
 		{
@@ -220,7 +239,7 @@ public class BoostsPlugin extends Plugin
 			int boost = cur - real;
 			if (boost <= boostThreshold && boostThreshold < lastBoost)
 			{
-				if (config.groupNotifications())
+				if (this.groupNotifications)
 				{
 					boostedSkillsChanged.add(skill.getName());
 				}
@@ -237,7 +256,7 @@ public class BoostsPlugin extends Plugin
 	{
 		lastTickMillis = System.currentTimeMillis();
 
-		if (config.groupNotifications() && !boostedSkillsChanged.isEmpty())
+		if (this.groupNotifications && !boostedSkillsChanged.isEmpty())
 		{
 			if (boostedSkillsChanged.size() == 1)
 			{
@@ -268,7 +287,7 @@ public class BoostsPlugin extends Plugin
 
 		if (getChangeUpTicks() <= 0)
 		{
-			switch (config.displayNextDebuffChange())
+			switch (this.displayNextDebuffChange)
 			{
 				case ALWAYS:
 					if (lastChangeUp != -1)
@@ -286,7 +305,7 @@ public class BoostsPlugin extends Plugin
 
 		if (getChangeDownTicks() <= 0)
 		{
-			switch (config.displayNextBuffChange())
+			switch (this.displayNextBuffChange)
 			{
 				case ALWAYS:
 					if (lastChangeDown != -1)
@@ -305,7 +324,7 @@ public class BoostsPlugin extends Plugin
 
 	private void updateShownSkills()
 	{
-		if (config.enableSkill())
+		if (this.enableSkill)
 		{
 			shownSkills.addAll(BOOSTABLE_NON_COMBAT_SKILLS);
 		}
@@ -368,8 +387,8 @@ public class BoostsPlugin extends Plugin
 	int getChangeDownTicks()
 	{
 		if (lastChangeDown == -1 ||
-			config.displayNextBuffChange() == BoostsConfig.DisplayChangeMode.NEVER ||
-			(config.displayNextBuffChange() == BoostsConfig.DisplayChangeMode.BOOSTED && !isChangedUp))
+			this.displayNextBuffChange == BoostsConfig.DisplayChangeMode.NEVER ||
+			(this.displayNextBuffChange == BoostsConfig.DisplayChangeMode.BOOSTED && !isChangedUp))
 		{
 			return -1;
 		}
@@ -396,8 +415,8 @@ public class BoostsPlugin extends Plugin
 	int getChangeUpTicks()
 	{
 		if (lastChangeUp == -1 ||
-			config.displayNextDebuffChange() == BoostsConfig.DisplayChangeMode.NEVER ||
-			(config.displayNextDebuffChange() == BoostsConfig.DisplayChangeMode.BOOSTED && !isChangedDown))
+			this.displayNextDebuffChange == BoostsConfig.DisplayChangeMode.NEVER ||
+			(this.displayNextDebuffChange == BoostsConfig.DisplayChangeMode.BOOSTED && !isChangedDown))
 		{
 			return -1;
 		}
@@ -418,4 +437,17 @@ public class BoostsPlugin extends Plugin
 		final long diff = System.currentTimeMillis() - lastTickMillis;
 		return time != -1 ? (int) ((time * Constants.GAME_TICK_LENGTH - diff) / 1000d) : time;
 	}
+
+	private void updateConfig()
+	{
+		this.enableSkill = config.enableSkill();
+		this.useRelativeBoost = config.useRelativeBoost();
+		this.displayInfoboxes = config.displayInfoboxes();
+		this.displayIcons = config.displayIcons();
+		this.boldIconFont = config.boldIconFont();
+		this.displayNextBuffChange = config.displayNextBuffChange();
+		this.displayNextDebuffChange = config.displayNextDebuffChange();
+		this.boostThreshold = config.boostThreshold();
+		this.groupNotifications = config.groupNotifications();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/CombatIconsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/CombatIconsOverlay.java
index 2e4c9c5ab9..c3c69d9561 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/CombatIconsOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/CombatIconsOverlay.java
@@ -6,6 +6,7 @@ import java.awt.Graphics2D;
 import java.awt.Rectangle;
 import java.awt.image.BufferedImage;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.api.Skill;
@@ -23,21 +24,20 @@ import net.runelite.client.ui.FontManager;
 import net.runelite.client.util.ColorUtil;
 import net.runelite.client.util.ImageUtil;
 
+@Singleton
 class CombatIconsOverlay extends Overlay
 {
 	private final Client client;
-	private final BoostsConfig config;
 	private final PanelComponent panelComponent = new PanelComponent();
 	private final SkillIconManager iconManager;
 	private final BoostsPlugin plugin;
 
 	@Inject
-	private CombatIconsOverlay(Client client, BoostsConfig config, BoostsPlugin plugin, SkillIconManager iconManager)
+	private CombatIconsOverlay(final Client client, final BoostsPlugin plugin, final SkillIconManager iconManager)
 	{
 		super(plugin);
 		this.plugin = plugin;
 		this.client = client;
-		this.config = config;
 		this.iconManager = iconManager;
 		setPosition(OverlayPosition.TOP_LEFT);
 		setPriority(OverlayPriority.MED);
@@ -47,12 +47,12 @@ class CombatIconsOverlay extends Overlay
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (config.displayInfoboxes() || !config.displayIcons())
+		if (plugin.isDisplayInfoboxes() || !plugin.isDisplayIcons())
 		{
 			return null;
 		}
 		
-		if (config.boldIconFont())
+		if (plugin.isBoldIconFont())
 		{
 			graphics.setFont(FontManager.getRunescapeBoldFont());
 		}
@@ -79,7 +79,7 @@ class CombatIconsOverlay extends Overlay
 				final Color strColor = getTextColor(boost);
 				String str;
 
-				if (config.useRelativeBoost())
+				if (plugin.isUseRelativeBoost())
 				{
 					str = String.valueOf(boost);
 					if (boost > 0)
@@ -137,7 +137,7 @@ class CombatIconsOverlay extends Overlay
 			return new Color(238, 51, 51);
 		}
 
-		return boost <= config.boostThreshold() ? Color.YELLOW : Color.GREEN;
+		return boost <= plugin.getBoostThreshold() ? Color.YELLOW : Color.GREEN;
 
 	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/StatChangeIndicator.java b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/StatChangeIndicator.java
index 5c9ef73762..946d6a6517 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/StatChangeIndicator.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/StatChangeIndicator.java
@@ -29,7 +29,7 @@ import java.awt.image.BufferedImage;
 import net.runelite.client.ui.overlay.infobox.InfoBox;
 import net.runelite.client.ui.overlay.infobox.InfoBoxPriority;
 
-public class StatChangeIndicator extends InfoBox
+class StatChangeIndicator extends InfoBox
 {
 	private final boolean up;
 	private final BoostsPlugin plugin;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/bosstimer/BossTimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/bosstimer/BossTimersPlugin.java
index 0e6b98c907..d5faf547dc 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/bosstimer/BossTimersPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/bosstimer/BossTimersPlugin.java
@@ -26,6 +26,7 @@
 package net.runelite.client.plugins.bosstimer;
 
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.NPC;
 import net.runelite.api.events.NpcDespawned;
@@ -40,6 +41,7 @@ import net.runelite.client.ui.overlay.infobox.InfoBoxManager;
 	description = "Show boss spawn timer overlays",
 	tags = {"combat", "pve", "overlay", "spawn"}
 )
+@Singleton
 @Slf4j
 public class BossTimersPlugin extends Plugin
 {
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/bosstimer/RespawnTimer.java b/runelite-client/src/main/java/net/runelite/client/plugins/bosstimer/RespawnTimer.java
index 1d9d077f25..6d3a03a85a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/bosstimer/RespawnTimer.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/bosstimer/RespawnTimer.java
@@ -33,7 +33,7 @@ class RespawnTimer extends Timer
 {
 	private final Boss boss;
 
-	public RespawnTimer(Boss boss, BufferedImage bossImage, Plugin plugin)
+	RespawnTimer(Boss boss, BufferedImage bossImage, Plugin plugin)
 	{
 		super(boss.getSpawnTime().toMillis(), ChronoUnit.MILLIS, bossImage, plugin);
 		this.boss = boss;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonCounter.java
index bd13e194be..a4b8028e47 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonCounter.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonCounter.java
@@ -28,7 +28,7 @@ import java.awt.Color;
 import java.awt.image.BufferedImage;
 import net.runelite.client.ui.overlay.infobox.InfoBox;
 
-public class CannonCounter extends InfoBox
+class CannonCounter extends InfoBox
 {
 	private final CannonPlugin plugin;
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonOverlay.java
index 06d0500155..84b7423ab3 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonOverlay.java
@@ -29,6 +29,7 @@ import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.awt.Polygon;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.Perspective;
 import static net.runelite.api.Perspective.LOCAL_TILE_SIZE;
@@ -40,22 +41,21 @@ import net.runelite.client.ui.overlay.OverlayPriority;
 import net.runelite.client.ui.overlay.OverlayUtil;
 import net.runelite.client.ui.overlay.components.TextComponent;
 
+@Singleton
 class CannonOverlay extends Overlay
 {
 	private static final int MAX_DISTANCE = 2500;
 
 	private final Client client;
-	private final CannonConfig config;
 	private final CannonPlugin plugin;
 	private final TextComponent textComponent = new TextComponent();
 
 	@Inject
-	CannonOverlay(Client client, CannonConfig config, CannonPlugin plugin)
+	CannonOverlay(final Client client, final CannonPlugin plugin)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		setPriority(OverlayPriority.MED);
 		this.client = client;
-		this.config = config;
 		this.plugin = plugin;
 	}
 
@@ -91,9 +91,9 @@ class CannonOverlay extends Overlay
 				textComponent.render(graphics);
 			}
 
-			if (config.showDoubleHitSpot())
+			if (plugin.isShowDoubleHitSpot())
 			{
-				Color color = config.highlightDoubleHitColor();
+				Color color = plugin.getHighlightDoubleHitColor();
 				drawDoubleHitSpots(graphics, cannonPoint, color);
 			}
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java
index 6b82e45aca..2c6c68ecb3 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java
@@ -33,6 +33,7 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.inject.Inject;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.AnimationID;
 import net.runelite.api.ChatMessageType;
@@ -80,19 +81,19 @@ public class CannonPlugin extends Plugin
 	private CannonCounter counter;
 	private boolean skipProjectileCheckThisTick;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private int cballsLeft;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private boolean cannonPlaced;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private WorldPoint cannonPosition;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private GameObject cannon;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private List<WorldPoint> spotPoints = new ArrayList<>();
 
 	@Inject
@@ -124,6 +125,17 @@ public class CannonPlugin extends Plugin
 
 	private boolean lock;
 
+	private boolean showEmptyCannonNotification;
+	private boolean showInfobox;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showDoubleHitSpot;
+	@Getter(AccessLevel.PACKAGE)
+	private Color highlightDoubleHitColor;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showCannonSpots;
+	private int ammoAmount;
+	private boolean notifyAmmoLeft;
+
 	@Provides
 	CannonConfig provideConfig(ConfigManager configManager)
 	{
@@ -133,6 +145,8 @@ public class CannonPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
+
 		overlayManager.add(cannonOverlay);
 		overlayManager.add(cannonSpotOverlay);
 		lock = false;
@@ -169,7 +183,9 @@ public class CannonPlugin extends Plugin
 	{
 		if (event.getGroup().equals("cannon"))
 		{
-			if (!config.showInfobox())
+			updateConfig();
+
+			if (!this.showInfobox)
 			{
 				removeCounter();
 			}
@@ -190,7 +206,7 @@ public class CannonPlugin extends Plugin
 	)
 	public void checkSpots()
 	{
-		if (!config.showCannonSpots())
+		if (!this.showCannonSpots)
 		{
 			return;
 		}
@@ -213,14 +229,12 @@ public class CannonPlugin extends Plugin
 		GameObject gameObject = event.getGameObject();
 
 		Player localPlayer = client.getLocalPlayer();
-		if (gameObject.getId() == CANNON_BASE && !cannonPlaced)
+		if (gameObject.getId() == CANNON_BASE && !cannonPlaced &&
+			localPlayer.getWorldLocation().distanceTo(gameObject.getWorldLocation()) <= 2 &&
+			localPlayer.getAnimation() == AnimationID.BURYING_BONES)
 		{
-			if (localPlayer.getWorldLocation().distanceTo(gameObject.getWorldLocation()) <= 2
-				&& localPlayer.getAnimation() == AnimationID.BURYING_BONES)
-			{
-				cannonPosition = gameObject.getWorldLocation();
-				cannon = gameObject;
-			}
+			cannonPosition = gameObject.getWorldLocation();
+			cannon = gameObject;
 		}
 	}
 
@@ -234,17 +248,15 @@ public class CannonPlugin extends Plugin
 			WorldPoint projectileLoc = WorldPoint.fromLocal(client, projectile.getX1(), projectile.getY1(), client.getPlane());
 
 			//Check to see if projectile x,y is 0 else it will continuously decrease while ball is flying.
-			if (projectileLoc.equals(cannonPosition) && projectile.getX() == 0 && projectile.getY() == 0)
-			{
+			if (projectileLoc.equals(cannonPosition) && projectile.getX() == 0 && projectile.getY() == 0 &&
 				// When there's a chat message about cannon reloaded/unloaded/out of ammo,
 				// the message event runs before the projectile event. However they run
 				// in the opposite order on the server. So if both fires in the same tick,
 				// we don't want to update the cannonball counter if it was set to a specific
 				// amount.
-				if (!skipProjectileCheckThisTick)
-				{
-					cballsLeft--;
-				}
+				!skipProjectileCheckThisTick)
+			{
+				cballsLeft--;
 			}
 		}
 	}
@@ -318,7 +330,7 @@ public class CannonPlugin extends Plugin
 			// extra check is a good idea.
 			cballsLeft = 0;
 
-			if (config.showEmptyCannonNotification())
+			if (this.showEmptyCannonNotification)
 			{
 				notifier.notify("Your cannon is out of ammo!");
 			}
@@ -350,13 +362,10 @@ public class CannonPlugin extends Plugin
 		{
 			return Color.orange;
 		}
-		else if (cballsLeft <= config.ammoAmount())
+		else if (cballsLeft <= this.ammoAmount && this.notifyAmmoLeft && !lock)
 		{
-			if (config.notifyAmmoLeft() && !lock)
-			{
-				notifier.notify("Your cannon has " + config.ammoAmount() + " balls left!");
-				lock = true;
-			}
+			notifier.notify("Your cannon has " + this.ammoAmount + " balls left!");
+			lock = true;
 		}
 
 		return Color.red;
@@ -364,7 +373,7 @@ public class CannonPlugin extends Plugin
 
 	private void addCounter()
 	{
-		if (!config.showInfobox() || counter != null)
+		if (!this.showInfobox || counter != null)
 		{
 			return;
 		}
@@ -385,4 +394,15 @@ public class CannonPlugin extends Plugin
 		infoBoxManager.removeInfoBox(counter);
 		counter = null;
 	}
+
+	private void updateConfig()
+	{
+		this.showEmptyCannonNotification = config.showEmptyCannonNotification();
+		this.showInfobox = config.showInfobox();
+		this.showDoubleHitSpot = config.showDoubleHitSpot();
+		this.highlightDoubleHitColor = config.highlightDoubleHitColor();
+		this.showCannonSpots = config.showCannonSpots();
+		this.ammoAmount = config.ammoAmount();
+		this.notifyAmmoLeft = config.notifyAmmoLeft();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonSpotOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonSpotOverlay.java
index 01c3eff871..3bf377f2b0 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonSpotOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonSpotOverlay.java
@@ -30,6 +30,7 @@ import java.awt.Graphics2D;
 import java.awt.Polygon;
 import java.awt.image.BufferedImage;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Setter;
 import net.runelite.api.Client;
@@ -43,13 +44,13 @@ import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayUtil;
 
+@Singleton
 public class CannonSpotOverlay extends Overlay
 {
 	private static final int MAX_DISTANCE = 2350;
 
 	private final Client client;
 	private final CannonPlugin plugin;
-	private final CannonConfig config;
 
 	@Inject
 	private ItemManager itemManager;
@@ -58,18 +59,17 @@ public class CannonSpotOverlay extends Overlay
 	private boolean hidden;
 
 	@Inject
-	CannonSpotOverlay(Client client, CannonPlugin plugin, CannonConfig config)
+	CannonSpotOverlay(final Client client, final CannonPlugin plugin)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		this.client = client;
 		this.plugin = plugin;
-		this.config = config;
 	}
 
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (hidden || !config.showCannonSpots() || plugin.isCannonPlaced())
+		if (hidden || !plugin.isShowCannonSpots() || plugin.isCannonPlaced())
 		{
 			return null;
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cerberus/CerberusGhost.java b/runelite-client/src/main/java/net/runelite/client/plugins/cerberus/CerberusGhost.java
index 354dd0edf4..28adddc615 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cerberus/CerberusGhost.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cerberus/CerberusGhost.java
@@ -27,13 +27,14 @@ package net.runelite.client.plugins.cerberus;
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;
 import java.util.Optional;
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import net.runelite.api.NPC;
 import net.runelite.api.NpcID;
 import net.runelite.api.Skill;
 
-@Getter
+@Getter(AccessLevel.PACKAGE)
 @RequiredArgsConstructor
 public enum CerberusGhost
 {
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
index 4cc810847f..3f51018632 100644
--- 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
@@ -25,6 +25,7 @@
 package net.runelite.client.plugins.chatboxperformance;
 
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.events.WidgetPositioned;
 import net.runelite.api.widgets.Widget;
@@ -40,6 +41,7 @@ import net.runelite.client.plugins.PluginDescriptor;
 	name = "Chatbox performance",
 	hidden = true
 )
+@Singleton
 public class ChatboxPerformancePlugin extends Plugin
 {
 	@Inject
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java
index 079f1cdba6..951547e777 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java
@@ -25,6 +25,7 @@
  */
 package net.runelite.client.plugins.chatcommands;
 
+import javax.inject.Singleton;
 import net.runelite.api.vars.AccountType;
 import com.google.inject.Provides;
 import java.io.IOException;
@@ -81,6 +82,7 @@ import org.apache.commons.text.WordUtils;
 	description = "Enable chat commands",
 	tags = {"grand", "exchange", "level", "prices"}
 )
+@Singleton
 @Slf4j
 public class ChatCommandsPlugin extends Plugin
 {
@@ -816,7 +818,7 @@ public class ChatCommandsPlugin extends Plugin
 			}
 			catch (IOException e)
 			{
-				e.printStackTrace();
+				log.error("Error looking up prices", e);
 			}
 
 			int itemId = item.getId();
@@ -1164,7 +1166,7 @@ public class ChatCommandsPlugin extends Plugin
 		ItemPrice shortest = null;
 		for (ItemPrice item : items)
 		{
-			if (item.getName().toLowerCase().equals(originalInput.toLowerCase()))
+			if (item.getName().equalsIgnoreCase(originalInput.toLowerCase()))
 			{
 				return item;
 			}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatKeyboardListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatKeyboardListener.java
index dc9c1fffe1..d32dab3fc1 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatKeyboardListener.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatKeyboardListener.java
@@ -34,7 +34,7 @@ import net.runelite.client.callback.ClientThread;
 import net.runelite.client.input.KeyListener;
 
 @Singleton
-public class ChatKeyboardListener implements KeyListener
+class ChatKeyboardListener implements KeyListener
 {
 	@Inject
 	private ChatCommandsConfig chatCommandsConfig;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java
index 8413b0e67a..d9e97c441a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java
@@ -34,6 +34,9 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
+import lombok.Setter;
 import net.runelite.api.ChatMessageType;
 import net.runelite.api.Client;
 import net.runelite.api.MessageNode;
@@ -53,6 +56,7 @@ import org.apache.commons.lang3.StringUtils;
 	description = "Censor user configurable words or patterns from chat",
 	enabledByDefault = false
 )
+@Singleton
 public class ChatFilterPlugin extends Plugin
 {
 	private static final Splitter NEWLINE_SPLITTER = Splitter
@@ -71,6 +75,17 @@ public class ChatFilterPlugin extends Plugin
 	@Inject
 	private ChatFilterConfig config;
 
+	@Setter(AccessLevel.PACKAGE)
+	private ChatFilterType filterType;
+	@Setter(AccessLevel.PACKAGE)
+	private String filteredWords;
+	@Setter(AccessLevel.PACKAGE)
+	private String filteredRegex;
+	@Setter(AccessLevel.PACKAGE)
+	private boolean filterFriends;
+	@Setter(AccessLevel.PACKAGE)
+	private boolean filterClan;
+
 	@Provides
 	ChatFilterConfig provideConfig(ConfigManager configManager)
 	{
@@ -80,13 +95,16 @@ public class ChatFilterPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
 		updateFilteredPatterns();
+		client.refreshChat();
 	}
 
 	@Override
 	protected void shutDown() throws Exception
 	{
 		filteredPatterns.clear();
+		client.refreshChat();
 	}
 
 	@Subscribe
@@ -122,8 +140,8 @@ public class ChatFilterPlugin extends Plugin
 		MessageNode messageNode = (MessageNode) client.getMessages().get(messageId);
 
 		if (client.getLocalPlayer().getName().equals(messageNode.getName()) ||
-			!config.filterFriends() && messageNode.isFromFriend() ||
-			!config.filterClan() && messageNode.isFromClanMate())
+			!this.filterFriends && messageNode.isFromFriend() ||
+			!this.filterClan && messageNode.isFromClanMate())
 		{
 			return;
 		}
@@ -168,8 +186,8 @@ public class ChatFilterPlugin extends Plugin
 	{
 		boolean isMessageFromSelf = playerName.equals(client.getLocalPlayer().getName());
 		return !isMessageFromSelf &&
-			(config.filterFriends() || !client.isFriended(playerName, false)) &&
-			(config.filterClan() || !client.isClanMember(playerName));
+			(this.filterFriends || !client.isFriended(playerName, false)) &&
+			(this.filterClan || !client.isClanMember(playerName));
 	}
 
 	String censorMessage(final String message)
@@ -185,7 +203,7 @@ public class ChatFilterPlugin extends Plugin
 
 			while (m.find())
 			{
-				switch (config.filterType())
+				switch (this.filterType)
 				{
 					case CENSOR_WORDS:
 						m.appendReplacement(sb, StringUtils.repeat("*", m.group(0).length()));
@@ -209,11 +227,11 @@ public class ChatFilterPlugin extends Plugin
 	{
 		filteredPatterns.clear();
 
-		Text.fromCSV(config.filteredWords()).stream()
+		Text.fromCSV(this.filteredWords).stream()
 			.map(s -> Pattern.compile(Pattern.quote(s), Pattern.CASE_INSENSITIVE))
 			.forEach(filteredPatterns::add);
 
-		NEWLINE_SPLITTER.splitToList(config.filteredRegex()).stream()
+		NEWLINE_SPLITTER.splitToList(this.filteredRegex).stream()
 			.map(s ->
 			{
 				try
@@ -237,6 +255,19 @@ public class ChatFilterPlugin extends Plugin
 			return;
 		}
 
+		updateConfig();
 		updateFilteredPatterns();
+
+		//Refresh chat after config change to reflect current rules
+		client.refreshChat();
+	}
+
+	private void updateConfig()
+	{
+		this.filterType = config.filterType();
+		this.filteredWords = config.filteredWords();
+		this.filteredRegex = config.filteredRegex();
+		this.filterFriends = config.filterFriends();
+		this.filterClan = config.filterClan();
 	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java
index d6ed9d888d..6b63e2c1d2 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java
@@ -32,12 +32,14 @@ import java.util.Deque;
 import java.util.Iterator;
 import java.util.Queue;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.ChatMessageType;
 import net.runelite.api.Client;
 import net.runelite.api.ScriptID;
 import net.runelite.api.VarClientInt;
 import net.runelite.api.VarClientStr;
 import net.runelite.api.events.ChatMessage;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.MenuOptionClicked;
 import net.runelite.api.vars.InputType;
 import net.runelite.client.callback.ClientThread;
@@ -56,6 +58,7 @@ import net.runelite.client.util.Text;
 	description = "Retain your chat history when logging in/out or world hopping",
 	tags = {"chat", "history", "retain", "cycle", "pm"}
 )
+@Singleton
 public class ChatHistoryPlugin extends Plugin implements KeyListener
 {
 	private static final String WELCOME_MESSAGE = "Welcome to Old School RuneScape.";
@@ -82,6 +85,9 @@ public class ChatHistoryPlugin extends Plugin implements KeyListener
 	@Inject
 	private ChatMessageManager chatMessageManager;
 
+	private boolean retainChatHistory;
+	private boolean pmTargetCycling;
+
 	@Provides
 	ChatHistoryConfig getConfig(ConfigManager configManager)
 	{
@@ -91,6 +97,8 @@ public class ChatHistoryPlugin extends Plugin implements KeyListener
 	@Override
 	protected void startUp()
 	{
+		updateConfig();
+
 		messageQueue = EvictingQueue.create(100);
 		friends = new ArrayDeque<>(FRIENDS_MAX_SIZE + 1);
 		keyManager.registerKeyListener(this);
@@ -113,7 +121,7 @@ public class ChatHistoryPlugin extends Plugin implements KeyListener
 		// of information that chat history was reset
 		if (chatMessage.getMessage().equals(WELCOME_MESSAGE))
 		{
-			if (!config.retainChatHistory())
+			if (!this.retainChatHistory)
 			{
 				return;
 			}
@@ -135,13 +143,11 @@ public class ChatHistoryPlugin extends Plugin implements KeyListener
 			case MODPRIVATECHAT:
 				final String name = Text.removeTags(chatMessage.getName());
 				// Remove to ensure uniqueness & its place in history
-				if (!friends.remove(name))
-				{
+				if (!friends.remove(name) &&
 					// If the friend didn't previously exist ensure deque capacity doesn't increase by adding them
-					if (friends.size() >= FRIENDS_MAX_SIZE)
-					{
-						friends.remove();
-					}
+					friends.size() >= FRIENDS_MAX_SIZE)
+				{
+					friends.remove();
 				}
 				friends.add(name);
 				// intentional fall-through
@@ -204,7 +210,7 @@ public class ChatHistoryPlugin extends Plugin implements KeyListener
 	@Override
 	public void keyPressed(KeyEvent e)
 	{
-		if (e.getKeyCode() != CYCLE_HOTKEY || !config.pmTargetCycling())
+		if (e.getKeyCode() != CYCLE_HOTKEY || !this.pmTargetCycling)
 		{
 			return;
 		}
@@ -260,4 +266,21 @@ public class ChatHistoryPlugin extends Plugin implements KeyListener
 
 		return friends.getLast();
 	}
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (!"chathistory".equals(event.getGroup()))
+		{
+			return;
+		}
+
+		updateConfig();
+	}
+
+	private void updateConfig()
+	{
+		this.retainChatHistory = config.retainChatHistory();
+		this.pmTargetCycling = config.pmTargetCycling();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java
index 0f9f000b28..00b7cc80d4 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java
@@ -36,6 +36,7 @@ import java.util.regex.Pattern;
 import static java.util.regex.Pattern.quote;
 import java.util.stream.Collectors;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.MessageNode;
 import net.runelite.api.events.ChatMessage;
@@ -57,6 +58,7 @@ import net.runelite.client.util.Text;
 	tags = {"duel", "messages", "notifications", "trade", "username"},
 	enabledByDefault = false
 )
+@Singleton
 public class ChatNotificationsPlugin extends Plugin
 {
 	@Inject
@@ -80,7 +82,15 @@ public class ChatNotificationsPlugin extends Plugin
 	private Pattern highlightMatcher = null;
 
 	// Private message cache used to avoid duplicate notifications from ChatHistory.
-	private Set<Integer> privateMessageHashes = new HashSet<>();
+	private final Set<Integer> privateMessageHashes = new HashSet<>();
+
+	private boolean highlightOwnName;
+	private String highlightWordsString;
+	private boolean notifyOnOwnName;
+	private boolean notifyOnHighlight;
+	private boolean notifyOnTrade;
+	private boolean notifyOnDuel;
+	private boolean notifyOnPm;
 
 	@Provides
 	ChatNotificationsConfig provideConfig(ConfigManager configManager)
@@ -91,6 +101,7 @@ public class ChatNotificationsPlugin extends Plugin
 	@Override
 	public void startUp()
 	{
+		updateConfig();
 		updateHighlights();
 	}
 
@@ -117,6 +128,7 @@ public class ChatNotificationsPlugin extends Plugin
 	{
 		if (event.getGroup().equals("chatnotification"))
 		{
+			updateConfig();
 			updateHighlights();
 		}
 	}
@@ -125,9 +137,9 @@ public class ChatNotificationsPlugin extends Plugin
 	{
 		highlightMatcher = null;
 
-		if (!config.highlightWordsString().trim().equals(""))
+		if (!this.highlightWordsString.trim().equals(""))
 		{
-			List<String> items = Text.fromCSV(config.highlightWordsString());
+			List<String> items = Text.fromCSV(this.highlightWordsString);
 			String joined = items.stream()
 				.map(Text::escapeJagex) // we compare these strings to the raw Jagex ones
 				.map(Pattern::quote)
@@ -147,13 +159,13 @@ public class ChatNotificationsPlugin extends Plugin
 		switch (chatMessage.getType())
 		{
 			case TRADEREQ:
-				if (chatMessage.getMessage().contains("wishes to trade with you.") && config.notifyOnTrade())
+				if (chatMessage.getMessage().contains("wishes to trade with you.") && this.notifyOnTrade)
 				{
 					notifier.notify(chatMessage.getMessage());
 				}
 				break;
 			case CHALREQ_TRADE:
-				if (chatMessage.getMessage().contains("wishes to duel with you.") && config.notifyOnDuel())
+				if (chatMessage.getMessage().contains("wishes to duel with you.") && this.notifyOnDuel)
 				{
 					notifier.notify(chatMessage.getMessage());
 				}
@@ -167,7 +179,7 @@ public class ChatNotificationsPlugin extends Plugin
 				break;
 			case PRIVATECHAT:
 			case MODPRIVATECHAT:
-				if (config.notifyOnPm())
+				if (this.notifyOnPm)
 				{
 					int messageHash = this.buildMessageHash(chatMessage);
 					if (this.privateMessageHashes.contains(messageHash))
@@ -187,7 +199,7 @@ public class ChatNotificationsPlugin extends Plugin
 			usernameReplacer = "<col" + ChatColorType.HIGHLIGHT.name() + "><u>" + username + "</u><col" + ChatColorType.NORMAL.name() + ">";
 		}
 
-		if (config.highlightOwnName() && usernameMatcher != null)
+		if (this.highlightOwnName && usernameMatcher != null)
 		{
 			Matcher matcher = usernameMatcher.matcher(messageNode.getValue());
 			if (matcher.find())
@@ -195,7 +207,7 @@ public class ChatNotificationsPlugin extends Plugin
 				messageNode.setValue(matcher.replaceAll(usernameReplacer));
 				update = true;
 
-				if (config.notifyOnOwnName())
+				if (this.notifyOnOwnName)
 				{
 					sendNotification(chatMessage);
 				}
@@ -222,7 +234,7 @@ public class ChatNotificationsPlugin extends Plugin
 				matcher.appendTail(stringBuffer);
 				messageNode.setValue(stringBuffer.toString());
 
-				if (config.notifyOnHighlight())
+				if (this.notifyOnHighlight)
 				{
 					sendNotification(chatMessage);
 				}
@@ -261,4 +273,15 @@ public class ChatNotificationsPlugin extends Plugin
 		String notification = stringBuilder.toString();
 		notifier.notify(notification);
 	}
+
+	private void updateConfig()
+	{
+		this.highlightOwnName = config.highlightOwnName();
+		this.highlightWordsString = config.highlightWordsString();
+		this.notifyOnOwnName = config.notifyOnOwnName();
+		this.notifyOnHighlight = config.notifyOnHighlight();
+		this.notifyOnTrade = config.notifyOnTrade();
+		this.notifyOnDuel = config.notifyOnDuel();
+		this.notifyOnPm = config.notifyOnPm();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java
index 034dfa2647..7cc488dbd7 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java
@@ -3,7 +3,20 @@ package net.runelite.client.plugins.chattranslation;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ObjectArrays;
 import com.google.inject.Provides;
-import net.runelite.api.*;
+import java.awt.event.KeyEvent;
+import java.util.HashSet;
+import java.util.Set;
+import javax.inject.Inject;
+import javax.inject.Provider;
+import javax.inject.Singleton;
+import lombok.extern.slf4j.Slf4j;
+import net.runelite.api.Client;
+import net.runelite.api.GameState;
+import net.runelite.api.MenuAction;
+import net.runelite.api.MenuEntry;
+import net.runelite.api.MessageNode;
+import static net.runelite.api.ScriptID.CHATBOX_INPUT;
+import net.runelite.api.VarClientStr;
 import net.runelite.api.events.ChatMessage;
 import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.MenuEntryAdded;
@@ -23,17 +36,14 @@ import net.runelite.client.plugins.PluginType;
 import net.runelite.client.util.Text;
 import org.apache.commons.lang3.ArrayUtils;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import java.awt.event.KeyEvent;
-import java.util.ArrayList;
-
 @PluginDescriptor(
 	name = "Chat Translator",
 	description = "Translates messages from one Language to another.",
 	tags = {"translate", "language", "english", "spanish", "dutch", "french"},
 	type = PluginType.UTILITY
 )
+@Singleton
+@Slf4j
 public class ChatTranslationPlugin extends Plugin implements KeyListener
 {
 
@@ -41,7 +51,7 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener
 
 	private static final ImmutableList<String> AFTER_OPTIONS = ImmutableList.of("Message", "Add ignore", "Remove friend", "Kick");
 
-	private ArrayList<String> playerNames = new ArrayList<>();
+	private final Set<String> playerNames = new HashSet<>();
 
 	@Inject
 	private Client client;
@@ -64,6 +74,13 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener
 	@Inject
 	private ChatTranslationConfig config;
 
+	private boolean translateOptionVisable;
+	private boolean publicChat;
+	private String getPlayerNames;
+	private Languages publicTargetLanguage;
+	private boolean playerChat;
+	private Languages playerTargetLanguage;
+
 	@Provides
 	ChatTranslationConfig provideConfig(ConfigManager configManager)
 	{
@@ -73,12 +90,11 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener
 	@Override
 	protected void startUp() throws Exception
 	{
-		if (client != null)
+		updateConfig();
+
+		if (client != null && this.translateOptionVisable)
 		{
-			if (config.translateOptionVisable())
-			{
-				menuManager.get().addPlayerMenuItem(TRANSLATE);
-			}
+			menuManager.get().addPlayerMenuItem(TRANSLATE);
 		}
 		keyManager.registerKeyListener(this);
 
@@ -88,12 +104,9 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener
 	@Override
 	protected void shutDown() throws Exception
 	{
-		if (client != null)
+		if (client != null && this.translateOptionVisable)
 		{
-			if (config.translateOptionVisable())
-			{
-				menuManager.get().removePlayerMenuItem(TRANSLATE);
-			}
+			menuManager.get().removePlayerMenuItem(TRANSLATE);
 		}
 		keyManager.unregisterKeyListener(this);
 
@@ -105,9 +118,10 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener
 	{
 		if (event.getGroup().equals("chattranslation"))
 		{
+			updateConfig();
 			if (event.getKey().equals("playerNames"))
 			{
-				for (String names : Text.fromCSV(config.getPlayerNames()))
+				for (String names : Text.fromCSV(this.getPlayerNames))
 				{
 					if (!playerNames.contains(Text.toJagexName(names)))
 					{
@@ -121,7 +135,7 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener
 	@Subscribe
 	public void onMenuEntryAdded(MenuEntryAdded event)
 	{
-		if (!config.translateOptionVisable())
+		if (!this.translateOptionVisable)
 		{
 			return;
 		}
@@ -131,8 +145,6 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener
 
 		if (groupId == WidgetInfo.CHATBOX.getGroupId())
 		{
-			boolean after;
-
 			if (!AFTER_OPTIONS.contains(option))
 			{
 				return;
@@ -181,7 +193,7 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener
 			case PUBLICCHAT:
 			case MODCHAT:
 			case FRIENDSCHAT:
-				if (!config.publicChat())
+				if (!this.publicChat)
 				{
 					return;
 				}
@@ -201,7 +213,7 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener
 				try
 				{
 					//Automatically check language of message and translate to selected language.
-					String translation = translator.translate("auto", config.publicTargetLanguage().toString(), message);
+					String translation = translator.translate("auto", this.publicTargetLanguage.toString(), message);
 					if (translation != null)
 					{
 						final MessageNode messageNode = chatMessage.getMessageNode();
@@ -211,7 +223,7 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener
 				}
 				catch (Exception e)
 				{
-					e.printStackTrace();
+					log.warn(e.toString());
 				}
 
 				client.refreshChat();
@@ -227,54 +239,49 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener
 			return;
 		}
 
-		if (!config.playerChat())
+		if (!this.playerChat)
 		{
 			return;
 		}
 
 		Widget chatboxParent = client.getWidget(WidgetInfo.CHATBOX_PARENT);
 
-		if (chatboxParent != null && chatboxParent.getOnKeyListener() != null)
+		if (chatboxParent != null && chatboxParent.getOnKeyListener() != null && event.getKeyCode() == 0xA)
 		{
-			if (event.getKeyCode() == 0xA)
+			Translator translator = new Translator();
+			String message = client.getVar(VarClientStr.CHATBOX_TYPED_TEXT);
+
+			if (message.startsWith("/"))
 			{
-				Translator translator = new Translator();
-				String message = client.getVar(VarClientStr.CHATBOX_TYPED_TEXT);
-
-				if (message.startsWith("/"))
-				{
-					try
-					{
-						client.setVar(VarClientStr.CHATBOX_TYPED_TEXT, translator.translate("auto", config.playerTargetLanguage().toString(), message));
-					}
-					catch (Exception e)
-					{
-						e.printStackTrace();
-					}
-					return;
-				}
-
-				event.consume();
-
 				try
 				{
-					//Automatically check language of message and translate to selected language.
-					String translation = translator.translate("auto", config.playerTargetLanguage().toString(), message);
-					if (translation != null)
-					{
-						client.setVar(VarClientStr.CHATBOX_TYPED_TEXT, translation);
-
-						clientThread.invoke(() ->
-						{
-							client.runScript(96, 0, translation);
-						});
-					}
-					client.setVar(VarClientStr.CHATBOX_TYPED_TEXT, "");
+					client.setVar(VarClientStr.CHATBOX_TYPED_TEXT, translator.translate("auto", config.playerTargetLanguage().toString(), message));
 				}
 				catch (Exception e)
 				{
-					e.printStackTrace();
+					log.warn("Translation error", e);
 				}
+				return;
+			}
+
+			event.consume();
+
+			try
+			{
+				//Automatically check language of message and translate to selected language.
+				String translation = translator.translate("auto", this.playerTargetLanguage.toString(), message);
+				if (translation != null)
+				{
+					client.setVar(VarClientStr.CHATBOX_TYPED_TEXT, translation);
+
+					clientThread.invoke(() ->
+						client.runScript(CHATBOX_INPUT, 0, translation));
+				}
+				client.setVar(VarClientStr.CHATBOX_TYPED_TEXT, "");
+			}
+			catch (Exception e)
+			{
+				log.warn(e.toString());
 			}
 		}
 	}
@@ -291,4 +298,13 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener
 		// Nothing.
 	}
 
+	private void updateConfig()
+	{
+		this.publicChat = config.publicChat();
+		this.getPlayerNames = config.getPlayerNames();
+		this.translateOptionVisable = config.translateOptionVisable();
+		this.publicTargetLanguage = config.publicTargetLanguage();
+		this.playerChat = config.playerChat();
+		this.playerTargetLanguage = config.playerTargetLanguage();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/Translator.java b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/Translator.java
index df8f26ea29..8ab04b3281 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/Translator.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/Translator.java
@@ -1,6 +1,7 @@
 package net.runelite.client.plugins.chattranslation;
 
-import org.json.JSONArray;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonParser;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
@@ -8,7 +9,7 @@ import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLEncoder;
 
-public class Translator
+class Translator
 {
 
 	public String translate(String source, String target, String message) throws Exception
@@ -22,7 +23,7 @@ public class Translator
 
 		BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream()));
 		String inputLine;
-		StringBuffer response = new StringBuffer();
+		StringBuilder response = new StringBuilder();
 
 		while ((inputLine = in.readLine()) != null)
 		{
@@ -33,14 +34,15 @@ public class Translator
 		return parseResult(response.toString());
 	}
 
-	private String parseResult(String inputJson) throws Exception
+	private String parseResult(String inputJson)
 	{
-		//TODO: find a way to do this using google.gson
-		JSONArray jsonArray = new JSONArray(inputJson);
-		JSONArray jsonArray2 = (JSONArray) jsonArray.get(0);
-		JSONArray jsonArray3 = (JSONArray) jsonArray2.get(0);
+		String result;
+		JsonArray jsonArray = new JsonParser().parse(inputJson).getAsJsonArray();
+		JsonArray jsonArray2 = jsonArray.get(0).getAsJsonArray();
+		JsonArray jsonArray3 = jsonArray2.get(0).getAsJsonArray();
+		result = jsonArray3.get(0).toString();
 
-		return jsonArray3.get(0).toString();
+		return result.substring(1, result.length() - 1);
 	}
 
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatIndicator.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatIndicator.java
index e8f7542d7d..38c86929dd 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatIndicator.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatIndicator.java
@@ -26,13 +26,15 @@ package net.runelite.client.plugins.clanchat;
 
 import java.awt.Color;
 import java.awt.image.BufferedImage;
+import javax.inject.Singleton;
 import net.runelite.client.ui.overlay.infobox.Counter;
 
+@Singleton
 class ClanChatIndicator extends Counter
 {
 	private final ClanChatPlugin plugin;
 
-	ClanChatIndicator(BufferedImage image, ClanChatPlugin plugin)
+	ClanChatIndicator(final BufferedImage image, final ClanChatPlugin plugin)
 	{
 		super(image, plugin, plugin.getClanAmount());
 		this.plugin = plugin;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java
index 8e053922dd..ecbb2e1d63 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java
@@ -40,6 +40,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.ChatLineBuffer;
 import net.runelite.api.ChatMessageType;
 import net.runelite.api.ClanMember;
@@ -68,7 +69,6 @@ import net.runelite.api.widgets.WidgetInfo;
 import net.runelite.api.widgets.WidgetType;
 import net.runelite.client.callback.ClientThread;
 import net.runelite.client.chat.ChatMessageBuilder;
-import net.runelite.client.chat.ChatMessageManager;
 import net.runelite.client.config.ConfigManager;
 import net.runelite.client.eventbus.Subscribe;
 import net.runelite.client.game.ClanManager;
@@ -87,6 +87,7 @@ import net.runelite.client.util.Text;
 	description = "Add rank icons to users talking in clan chat",
 	tags = {"icons", "rank", "recent"}
 )
+@Singleton
 public class ClanChatPlugin extends Plugin
 {
 	private static final int MAX_CHATS = 20;
@@ -112,9 +113,6 @@ public class ClanChatPlugin extends Plugin
 
 	@Inject
 	private ClientThread clientThread;
-	
-	@Inject
-	private ChatMessageManager chatMessageManager;
 
 	private List<String> chats = new ArrayList<>();
 
@@ -123,15 +121,26 @@ public class ClanChatPlugin extends Plugin
 		return (CopyOnWriteArrayList<Player>) clanMembers.clone();
 	}
 
-	private static CopyOnWriteArrayList<Player> clanMembers = new CopyOnWriteArrayList<>();
+	private static final CopyOnWriteArrayList<Player> clanMembers = new CopyOnWriteArrayList<>();
 	private ClanChatIndicator clanMemberCounter;
 	/**
 	 * queue of temporary messages added to the client
 	 */
 	private final Deque<ClanJoinMessage> clanJoinMessages = new ArrayDeque<>();
-	private Map<String, ClanMemberActivity> activityBuffer = new HashMap<>();
+	private final Map<String, ClanMemberActivity> activityBuffer = new HashMap<>();
 	private int clanJoinedTick;
 
+	private boolean clanChatIcons;
+	private boolean recentChats;
+	private boolean showClanCounter;
+	private String chatsData;
+	private boolean showJoinLeave;
+	private ClanMemberRank joinLeaveRank;
+	private boolean privateMessageIcons;
+	private boolean publicChatIcons;
+	private boolean clanTabChat;
+	private String clanname;
+
 	@Provides
 	ClanChatConfig getConfig(ConfigManager configManager)
 	{
@@ -141,7 +150,8 @@ public class ClanChatPlugin extends Plugin
 	@Override
 	public void startUp()
 	{
-		chats = new ArrayList<>(Text.fromCSV(config.chatsData()));
+		updateConfig();
+		chats = new ArrayList<>(Text.fromCSV(this.chatsData));
 	}
 
 	@Override
@@ -157,12 +167,14 @@ public class ClanChatPlugin extends Plugin
 	{
 		if (configChanged.getGroup().equals("clanchat"))
 		{
-			if (!config.recentChats())
+			updateConfig();
+
+			if (!this.recentChats)
 			{
 				resetClanChats();
 			}
 
-			if (config.showClanCounter())
+			if (this.showClanCounter)
 			{
 				clientThread.invoke(this::addClanCounter);
 			}
@@ -200,8 +212,8 @@ public class ClanChatPlugin extends Plugin
 			return;
 		}
 
-		if (!config.showJoinLeave() ||
-			member.getRank().getValue() < config.joinLeaveRank().getValue())
+		if (!this.showJoinLeave ||
+			member.getRank().getValue() < this.joinLeaveRank.getValue())
 		{
 			return;
 		}
@@ -245,8 +257,8 @@ public class ClanChatPlugin extends Plugin
 			}
 		}
 
-		if (!config.showJoinLeave() ||
-			member.getRank().getValue() < config.joinLeaveRank().getValue())
+		if (!this.showJoinLeave ||
+			member.getRank().getValue() < this.joinLeaveRank.getValue())
 		{
 			return;
 		}
@@ -271,7 +283,7 @@ public class ClanChatPlugin extends Plugin
 			return;
 		}
 
-		client.setVar(VarClientStr.RECENT_CLAN_CHAT, config.clanname());
+		client.setVar(VarClientStr.RECENT_CLAN_CHAT, this.clanname);
 
 		Widget clanChatTitleWidget = client.getWidget(WidgetInfo.CLAN_CHAT_TITLE);
 		if (clanChatTitleWidget != null)
@@ -282,7 +294,7 @@ public class ClanChatPlugin extends Plugin
 			{
 				clanChatTitleWidget.setText(CLAN_CHAT_TITLE + " (" + client.getClanChatCount() + "/100)");
 			}
-			else if (config.recentChats() && clanChatList.getChildren() == null && !Strings.isNullOrEmpty(owner.getText()))
+			else if (this.recentChats && clanChatList.getChildren() == null && !Strings.isNullOrEmpty(owner.getText()))
 			{
 				clanChatTitleWidget.setText(RECENT_TITLE);
 
@@ -290,7 +302,7 @@ public class ClanChatPlugin extends Plugin
 			}
 		}
 
-		if (!config.showJoinLeave())
+		if (!this.showJoinLeave)
 		{
 			return;
 		}
@@ -373,7 +385,7 @@ public class ClanChatPlugin extends Plugin
 			channelColor = CHAT_CLAN_NAME_TRANSPARENT_BACKGROUND;
 		}
 
-		if (config.clanChatIcons() && rank != null && rank != ClanMemberRank.UNRANKED)
+		if (this.clanChatIcons && rank != null && rank != ClanMemberRank.UNRANKED)
 		{
 			rankIcon = clanManager.getIconNumber(rank);
 		}
@@ -405,7 +417,7 @@ public class ClanChatPlugin extends Plugin
 	@Subscribe
 	public void onVarClientStrChanged(VarClientStrChanged strChanged)
 	{
-		if (strChanged.getIndex() == VarClientStr.RECENT_CLAN_CHAT.getIndex() && config.recentChats())
+		if (strChanged.getIndex() == VarClientStr.RECENT_CLAN_CHAT.getIndex() && this.recentChats)
 		{
 			updateRecentChat(client.getVar(VarClientStr.RECENT_CLAN_CHAT));
 		}
@@ -428,20 +440,20 @@ public class ClanChatPlugin extends Plugin
 		{
 			case PRIVATECHAT:
 			case MODPRIVATECHAT:
-				if (!config.privateMessageIcons())
+				if (!this.privateMessageIcons)
 				{
 					return;
 				}
 				break;
 			case PUBLICCHAT:
 			case MODCHAT:
-				if (!config.publicChatIcons())
+				if (!this.publicChatIcons)
 				{
 					return;
 				}
 				break;
 			case FRIENDSCHAT:
-				if (!config.clanChatIcons())
+				if (!this.clanChatIcons)
 				{
 					return;
 				}
@@ -473,7 +485,7 @@ public class ClanChatPlugin extends Plugin
 		final Player local = client.getLocalPlayer();
 		final Player player = event.getPlayer();
 
-		if (player != local && player.isClanMember())
+		if (player != null && !player.equals(local) && player.isClanMember())
 		{
 			clanMembers.add(player);
 			addClanCounter();
@@ -515,7 +527,7 @@ public class ClanChatPlugin extends Plugin
 
 		final int[] intStack = client.getIntStack();
 		final int size = client.getIntStackSize();
-		intStack[size - 1] = config.clanTabChat() ? 1 : 0;
+		intStack[size - 1] = this.clanTabChat ? 1 : 0;
 	}
 
 	int getClanAmount()
@@ -617,7 +629,10 @@ public class ClanChatPlugin extends Plugin
 			chats.remove(0);
 		}
 
-		config.chatsData(Text.toCSV(chats));
+		String csvText = Text.toCSV(chats);
+
+		config.chatsData(csvText);
+		this.chatsData = csvText;
 	}
 
 	private void removeClanCounter()
@@ -628,7 +643,7 @@ public class ClanChatPlugin extends Plugin
 
 	private void addClanCounter()
 	{
-		if (!config.showClanCounter() || clanMemberCounter != null || clanMembers.isEmpty())
+		if (!this.showClanCounter || clanMemberCounter != null || clanMembers.isEmpty())
 		{
 			return;
 		}
@@ -637,4 +652,18 @@ public class ClanChatPlugin extends Plugin
 		clanMemberCounter = new ClanChatIndicator(image, this);
 		infoBoxManager.addInfoBox(clanMemberCounter);
 	}
+
+	private void updateConfig()
+	{
+		this.clanChatIcons = config.clanChatIcons();
+		this.recentChats = config.recentChats();
+		this.showClanCounter = config.showClanCounter();
+		this.chatsData = config.chatsData();
+		this.showJoinLeave = config.showJoinLeave();
+		this.joinLeaveRank = config.joinLeaveRank();
+		this.privateMessageIcons = config.privateMessageIcons();
+		this.publicChatIcons = config.publicChatIcons();
+		this.clanTabChat = config.clanTabChat();
+		this.clanname = config.clanname();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeConfig.java
index 5c39cc30d3..dc71d8108c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeConfig.java
@@ -151,17 +151,6 @@ public interface ClanManModeConfig extends Config
 		return false;
 	}
 
-	@ConfigItem(
-		position = 13,
-		keyName = "hideatkopt",
-		name = "Hide attack option for clan members",
-		description = "Disables attack option for clan members"
-	)
-	default boolean hideAtkOpt()
-	{
-		return false;
-	}
-
 	@ConfigItem(
 		position = 14,
 		keyName = "showclanmembers",
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeMinimapOverlay.java
index be94ee06f3..8f4a61c2b8 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeMinimapOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeMinimapOverlay.java
@@ -16,12 +16,12 @@ import net.runelite.client.ui.overlay.OverlayUtil;
 public class ClanManModeMinimapOverlay extends Overlay
 {
 	private final ClanManModeService ClanManModeService;
-	private final ClanManModeConfig config;
+	private final ClanManModePlugin plugin;
 
 	@Inject
-	private ClanManModeMinimapOverlay(ClanManModeConfig config, ClanManModeService ClanManModeService)
+	private ClanManModeMinimapOverlay(final ClanManModePlugin plugin, final ClanManModeService ClanManModeService)
 	{
-		this.config = config;
+		this.plugin = plugin;
 		this.ClanManModeService = ClanManModeService;
 		setLayer(OverlayLayer.ABOVE_WIDGETS);
 		setPosition(OverlayPosition.DYNAMIC);
@@ -39,7 +39,7 @@ public class ClanManModeMinimapOverlay extends Overlay
 	{
 		final String name = actor.getName().replace('\u00A0', ' ');
 
-		if (config.drawMinimapNames())
+		if (plugin.isDrawMinimapNames())
 		{
 			final net.runelite.api.Point minimapLocation = actor.getMinimapLocation();
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeOverlay.java
index 4cfc1cd6ad..cd98f5fd46 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeOverlay.java
@@ -17,12 +17,12 @@ import net.runelite.client.ui.overlay.OverlayUtil;
 public class ClanManModeOverlay extends Overlay
 {
 	private final ClanManModeService ClanManModeService;
-	private final ClanManModeConfig config;
+	private final ClanManModePlugin plugin;
 
 	@Inject
-	private ClanManModeOverlay(ClanManModeConfig config, ClanManModeService ClanManModeService)
+	private ClanManModeOverlay(final ClanManModePlugin plugin, final ClanManModeService ClanManModeService)
 	{
-		this.config = config;
+		this.plugin = plugin;
 		this.ClanManModeService = ClanManModeService;
 		setPosition(OverlayPosition.DYNAMIC);
 		setPriority(OverlayPriority.MED);
@@ -37,7 +37,7 @@ public class ClanManModeOverlay extends Overlay
 
 	private void renderPlayerOverlay(Graphics2D graphics, Player actor, Color color)
 	{
-		if (!config.drawOverheadPlayerNames())
+		if (!plugin.isDrawOverheadPlayerNames())
 		{
 			return;
 		}
@@ -48,7 +48,7 @@ public class ClanManModeOverlay extends Overlay
 
 		if (textLocation != null)
 		{
-			if (config.getClanAttackableColor().equals(color) && config.ShowBold())
+			if (plugin.getGetClanAttackableColor().equals(color) && plugin.isShowBold())
 			{
 				graphics.setFont(FontManager.getRunescapeBoldFont());
 			}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModePlugin.java
index 65f6bbe8a2..5313fec5f8 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModePlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModePlugin.java
@@ -1,10 +1,14 @@
 package net.runelite.client.plugins.clanmanmode;
 
 import com.google.inject.Provides;
+import java.awt.Color;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
+import lombok.Getter;
 import net.runelite.api.Client;
 import net.runelite.api.GameState;
 import net.runelite.api.Player;
@@ -27,7 +31,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	type = PluginType.PVP,
 	enabledByDefault = false
 )
-
+@Singleton
 public class ClanManModePlugin extends Plugin
 {
 	@Inject
@@ -48,6 +52,37 @@ public class ClanManModePlugin extends Plugin
 	@Inject
 	private Client client;
 
+	@Getter(AccessLevel.PACKAGE)
+	private boolean highlightAttackable;
+	@Getter(AccessLevel.PACKAGE)
+	private Color getAttackableColor;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean highlightAttacked;
+	@Getter(AccessLevel.PACKAGE)
+	private Color getClanAttackableColor;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean drawTiles;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean drawOverheadPlayerNames;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean drawMinimapNames;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showAttackers;
+	@Getter(AccessLevel.PACKAGE)
+	private Color getAttackerColor;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean ShowBold;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean hideAttackable;
+	@Getter(AccessLevel.PACKAGE)
+	private int hideTime;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean CalcSelfCB;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean PersistentClan;
+	@Getter(AccessLevel.PACKAGE)
+	private Color getClanMemberColor;
+
 	@Provides
 	ClanManModeConfig provideConfig(ConfigManager configManager)
 	{
@@ -59,15 +94,16 @@ public class ClanManModePlugin extends Plugin
 	int clanmax;
 	int inwildy;
 	int ticks;
-	Map<String, Integer> clan = new HashMap<>();
+	final Map<String, Integer> clan = new HashMap<>();
 
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
+		
 		overlayManager.add(ClanManModeOverlay);
 		overlayManager.add(ClanManModeTileOverlay);
 		overlayManager.add(ClanManModeMinimapOverlay);
-		client.setHideFriendAttackOptions(config.hideAtkOpt());
 	}
 
 	@Override
@@ -76,7 +112,6 @@ public class ClanManModePlugin extends Plugin
 		overlayManager.remove(ClanManModeOverlay);
 		overlayManager.remove(ClanManModeTileOverlay);
 		overlayManager.remove(ClanManModeMinimapOverlay);
-		client.setHideFriendAttackOptions(false);
 		clan.clear();
 		ticks = 0;
 		wildernessLevel = 0;
@@ -92,8 +127,8 @@ public class ClanManModePlugin extends Plugin
 		{
 			return;
 		}
-
-		client.setHideFriendAttackOptions(config.hideAtkOpt());
+		
+		updateConfig();
 	}
 
 	@Subscribe
@@ -125,4 +160,23 @@ public class ClanManModePlugin extends Plugin
 			clanmax = Collections.max(clan.values());
 		}
 	}
+	
+	private void updateConfig()
+	{
+		this.highlightAttackable = config.highlightAttackable();
+		this.getAttackableColor = config.getAttackableColor();
+		this.highlightAttacked = config.highlightAttacked();
+		this.getClanAttackableColor = config.getClanAttackableColor();
+		this.drawTiles = config.drawTiles();
+		this.drawOverheadPlayerNames = config.drawOverheadPlayerNames();
+		this.drawMinimapNames = config.drawMinimapNames();
+		this.showAttackers = config.showAttackers();
+		this.getAttackerColor = config.getAttackerColor();
+		this.ShowBold = config.ShowBold();
+		this.hideAttackable = config.hideAttackable();
+		this.hideTime = config.hideTime();
+		this.CalcSelfCB = config.CalcSelfCB();
+		this.PersistentClan = config.PersistentClan();
+		this.getClanMemberColor = config.getClanMemberColor();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeService.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeService.java
index c84072e94e..02ccf87b7c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeService.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeService.java
@@ -16,18 +16,16 @@ import net.runelite.api.coords.WorldPoint;
 public class ClanManModeService
 {
 	private final Client client;
-	private final ClanManModeConfig config;
 	private final ClanManModePlugin plugin;
 
 	@Inject
-	private ClanManModeService(Client client, ClanManModeConfig config, ClanManModePlugin plugin)
+	private ClanManModeService(final Client client, final ClanManModePlugin plugin)
 	{
-		this.config = config;
 		this.client = client;
 		this.plugin = plugin;
 	}
 
-	private Map<String, String> interactors = new HashMap<>();
+	private final Map<String, String> interactors = new HashMap<>();
 
 	public void forEachPlayer(final BiConsumer<Player, Color> consumer)
 	{
@@ -39,12 +37,7 @@ public class ClanManModeService
 		int selfmax = localPlayer.getCombatLevel() + plugin.wildernessLevel;
 		for (Player player : client.getPlayers())
 		{
-			if (player == null || player.getName() == null)
-			{
-				continue;
-			}
-
-			if (player == localPlayer)
+			if (player == null || player.getName() == null || player.equals(localPlayer))
 			{
 				continue;
 			}
@@ -57,15 +50,9 @@ public class ClanManModeService
 				interactor = ((Player) interacting);
 			}
 
-			if (config.showAttackers())
+			if (plugin.isShowAttackers() && interactor != null && interactor.getName().equals(localName))
 			{
-				if (interactor != null)
-				{
-					if (interactor.getName().equals(localName))
-					{
-						consumer.accept(player, config.getAttackerColor());
-					}
-				}
+				consumer.accept(player, plugin.getGetAttackerColor());
 			}
 
 			if (plugin.inwildy == 1)
@@ -76,94 +63,82 @@ public class ClanManModeService
 					{
 						plugin.clan.put(player.getName(), player.getCombatLevel());
 					}
-					if (config.highlightAttacked())
+					if (plugin.isHighlightAttacked() && interactor != null && !interactors.containsKey(interactor.getName()))
 					{
-						if (interactor != null)
+						WorldPoint a = interactor.getWorldLocation();
+						int underLevel = ((a.getY() - 9920) / 8) + 1;
+						int upperLevel = ((a.getY() - 3520) / 8) + 1;
+						int wildernessLevel = a.getY() > 6400 ? underLevel : upperLevel;
+						int wildydiff = plugin.wildernessLevel - wildernessLevel;
+						if (wildydiff < 0)
 						{
-							if (!interactors.containsKey(interactor.getName()))
+							wildydiff = 0;
+						}
+						if (plugin.isCalcSelfCB())
+						{
+							if (interacting.getCombatLevel() <= selfmax && interacting.getCombatLevel() - wildydiff >= selfmin && !interactor.isClanMember())
 							{
-								WorldPoint a = interactor.getWorldLocation();
-								int underLevel = ((a.getY() - 9920) / 8) + 1;
-								int upperLevel = ((a.getY() - 3520) / 8) + 1;
-								int wildernessLevel = a.getY() > 6400 ? underLevel : upperLevel;
-								int wildydiff = plugin.wildernessLevel - wildernessLevel;
-								if (wildydiff < 0)
-								{
-									wildydiff = 0;
-								}
-								if (config.CalcSelfCB())
-								{
-									if (interacting.getCombatLevel() <= selfmax && interacting.getCombatLevel() - wildydiff >= selfmin && !interactor.isClanMember())
-									{
-										interactors.put(interactor.getName(), player.getName());
-										consumer.accept(interactor, config.getClanAttackableColor());
-									}
-								}
-								else
-								{
-									if (interacting.getCombatLevel() <= maxatk && interacting.getCombatLevel() - wildydiff >= minatk && !interactor.isClanMember())
-									{
-										interactors.put(interactor.getName(), player.getName());
-										consumer.accept(interactor, config.getClanAttackableColor());
-									}
-								}
+								interactors.put(interactor.getName(), player.getName());
+								consumer.accept(interactor, plugin.getGetClanAttackableColor());
+							}
+						}
+						else
+						{
+							if (interacting.getCombatLevel() <= maxatk && interacting.getCombatLevel() - wildydiff >= minatk && !interactor.isClanMember())
+							{
+								interactors.put(interactor.getName(), player.getName());
+								consumer.accept(interactor, plugin.getGetClanAttackableColor());
 							}
 						}
 					}
 				}
 				else
 				{
-					if (config.PersistentClan())
+					if (plugin.isPersistentClan() && plugin.clan.containsKey(player.getName()))
 					{
-						if (plugin.clan.containsKey(player.getName()))
-						{
-							consumer.accept(player, config.getClanMemberColor());
-						}
+						consumer.accept(player, plugin.getGetClanMemberColor());
 					}
-					if (config.highlightAttacked())
-					{
-						if (interactors.containsKey(player.getName()))
+					if (plugin.isHighlightAttacked() && interactors.containsKey(player.getName()))
 						{
-							String attackername = interactors.get(player.getName());
-							boolean found = false;
-							for (Player attacker : client.getPlayers())
+						String attackername = interactors.get(player.getName());
+						boolean found = false;
+						for (Player attacker : client.getPlayers())
+						{
+							if (attacker == null || attacker.getName() == null)
 							{
-								if (attacker == null || attacker.getName() == null)
+								continue;
+							}
+							if (attacker.getName().equals(attackername))
+							{
+								found = true;
+								Actor ainteract = attacker.getInteracting();
+								if (ainteract != null)
 								{
-									continue;
-								}
-								if (attacker.getName().equals(attackername))
-								{
-									found = true;
-									Actor ainteract = attacker.getInteracting();
-									if (ainteract != null)
+									if (ainteract.getName().equals(player.getName()))
 									{
-										if (ainteract.getName().equals(player.getName()))
-										{
-											consumer.accept(player, config.getClanAttackableColor());
-										}
-										else
-										{
-											interactors.remove(player.getName());
-										}
+										consumer.accept(player, plugin.getGetClanAttackableColor());
 									}
 									else
 									{
 										interactors.remove(player.getName());
 									}
-									break;
 								}
+								else
+								{
+									interactors.remove(player.getName());
+								}
+								break;
 							}
-							if (!found)
-							{
-								interactors.remove(player.getName());
-							}
-							continue;
 						}
+						if (!found)
+						{
+							interactors.remove(player.getName());
+						}
+						continue;
 					}
-					if (config.highlightAttackable())
+					if (plugin.isHighlightAttackable())
 					{
-						if ((config.hideAttackable() && plugin.ticks >= config.hideTime()) || plugin.clan.containsKey(player.getName()))
+						if ((plugin.isHideAttackable() && plugin.ticks >= plugin.getHideTime()) || plugin.clan.containsKey(player.getName()))
 						{
 							continue;
 						}
@@ -176,18 +151,18 @@ public class ClanManModeService
 						{
 							wildydiff = 0;
 						}
-						if (config.CalcSelfCB())
+						if (plugin.isCalcSelfCB())
 						{
 							if (player.getCombatLevel() <= selfmax && player.getCombatLevel() - wildydiff >= selfmin)
 							{
-								consumer.accept(player, config.getAttackableColor());
+								consumer.accept(player, plugin.getGetAttackableColor());
 							}
 						}
 						else
 						{
 							if (player.getCombatLevel() <= maxatk && player.getCombatLevel() - wildydiff >= minatk)
 							{
-								consumer.accept(player, config.getAttackableColor());
+								consumer.accept(player, plugin.getGetAttackableColor());
 							}
 						}
 					}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeTileOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeTileOverlay.java
index 5aea2e108f..8a70eef7c6 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeTileOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModeTileOverlay.java
@@ -4,19 +4,21 @@ import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.awt.Polygon;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayPriority;
 import net.runelite.client.ui.overlay.OverlayUtil;
 
+@Singleton
 public class ClanManModeTileOverlay extends Overlay
 {
 	private final ClanManModeService ClanManModeService;
 	private final ClanManModeConfig config;
 
 	@Inject
-	private ClanManModeTileOverlay(ClanManModeConfig config, ClanManModeService ClanManModeService)
+	private ClanManModeTileOverlay(final ClanManModeConfig config, final ClanManModeService ClanManModeService)
 	{
 		this.config = config;
 		this.ClanManModeService = ClanManModeService;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollEmoteOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollEmoteOverlay.java
index ecaa85b8ba..bf6c3d85d5 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollEmoteOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollEmoteOverlay.java
@@ -27,6 +27,7 @@ package net.runelite.client.plugins.cluescrolls;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.widgets.Widget;
 import net.runelite.api.widgets.WidgetInfo;
@@ -36,6 +37,7 @@ import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 
+@Singleton
 class ClueScrollEmoteOverlay extends Overlay
 {
 	private final ClueScrollPlugin plugin;
@@ -44,7 +46,7 @@ class ClueScrollEmoteOverlay extends Overlay
 	private boolean hasScrolled;
 
 	@Inject
-	private ClueScrollEmoteOverlay(ClueScrollPlugin plugin, Client client)
+	private ClueScrollEmoteOverlay(final ClueScrollPlugin plugin, final Client client)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_WIDGETS);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollMusicOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollMusicOverlay.java
index 2b44290fb5..19e0b5b01e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollMusicOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollMusicOverlay.java
@@ -28,6 +28,7 @@ import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.awt.Rectangle;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.widgets.Widget;
 import net.runelite.api.widgets.WidgetInfo;
@@ -37,6 +38,7 @@ import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 
+@Singleton
 class ClueScrollMusicOverlay extends Overlay
 {
 	private static final Rectangle PADDING = new Rectangle(2, 1, 0, 1);
@@ -47,7 +49,7 @@ class ClueScrollMusicOverlay extends Overlay
 	private boolean hasScrolled;
 
 	@Inject
-	private ClueScrollMusicOverlay(ClueScrollPlugin plugin, Client client)
+	private ClueScrollMusicOverlay(final ClueScrollPlugin plugin, final Client client)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_WIDGETS);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollOverlay.java
index 0f95a3c940..4482996a64 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollOverlay.java
@@ -30,6 +30,7 @@ import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import static net.runelite.api.ItemID.SPADE;
 import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.client.plugins.cluescrolls.clues.ClueScroll;
@@ -43,6 +44,7 @@ import net.runelite.client.ui.overlay.components.ComponentConstants;
 import net.runelite.client.ui.overlay.components.LineComponent;
 import net.runelite.client.ui.overlay.components.PanelComponent;
 
+@Singleton
 public class ClueScrollOverlay extends Overlay
 {
 	private static final ItemRequirement HAS_SPADE = new SingleItemRequirement(SPADE);
@@ -53,7 +55,7 @@ public class ClueScrollOverlay extends Overlay
 	private final PanelComponent panelComponent = new PanelComponent();
 
 	@Inject
-	private ClueScrollOverlay(ClueScrollPlugin plugin)
+	private ClueScrollOverlay(final ClueScrollPlugin plugin)
 	{
 		super(plugin);
 		this.plugin = plugin;
@@ -76,13 +78,10 @@ public class ClueScrollOverlay extends Overlay
 
 		clue.makeOverlayHint(panelComponent, plugin);
 
-		if (clue.isRequiresSpade() && plugin.getInventoryItems() != null)
+		if (clue.isRequiresSpade() && plugin.getInventoryItems() != null && !HAS_SPADE.fulfilledBy(plugin.getInventoryItems()))
 		{
-			if (!HAS_SPADE.fulfilledBy(plugin.getInventoryItems()))
-			{
-				panelComponent.getChildren().add(LineComponent.builder().left("").build());
-				panelComponent.getChildren().add(LineComponent.builder().left("Requires Spade!").leftColor(Color.RED).build());
-			}
+			panelComponent.getChildren().add(LineComponent.builder().left("").build());
+			panelComponent.getChildren().add(LineComponent.builder().left("Requires Spade!").leftColor(Color.RED).build());
 		}
 
 		return panelComponent.render(graphics);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java
index 742decdd0d..bc0c3d6526 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java
@@ -36,11 +36,10 @@ import java.awt.Rectangle;
 import java.awt.geom.Area;
 import java.awt.image.BufferedImage;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
-import java.util.stream.Stream;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.ChatMessageType;
@@ -100,6 +99,7 @@ import net.runelite.client.ui.overlay.OverlayUtil;
 import net.runelite.client.ui.overlay.components.TextComponent;
 import net.runelite.client.ui.overlay.worldmap.WorldMapPointManager;
 import net.runelite.client.util.ImageUtil;
+import net.runelite.client.util.ItemUtil;
 import net.runelite.client.util.Text;
 
 @PluginDescriptor(
@@ -108,6 +108,7 @@ import net.runelite.client.util.Text;
 	tags = {"arrow", "hints", "world", "map", "coordinates", "emotes"}
 )
 @Slf4j
+@Singleton
 public class ClueScrollPlugin extends Plugin
 {
 	private static final Color HIGHLIGHT_BORDER_COLOR = Color.ORANGE;
@@ -164,6 +165,8 @@ public class ClueScrollPlugin extends Plugin
 
 	private final TextComponent textComponent = new TextComponent();
 
+	private boolean displayHintArrows;
+
 	@Provides
 	ClueScrollConfig getConfig(ConfigManager configManager)
 	{
@@ -179,6 +182,7 @@ public class ClueScrollPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		this.displayHintArrows = config.displayHintArrows();
 		overlayManager.add(clueScrollOverlay);
 		overlayManager.add(clueScrollEmoteOverlay);
 		overlayManager.add(clueScrollWorldOverlay);
@@ -206,12 +210,9 @@ public class ClueScrollPlugin extends Plugin
 			return;
 		}
 
-		if (clue instanceof HotColdClue)
+		if (clue instanceof HotColdClue && ((HotColdClue) clue).update(event.getMessage(), this))
 		{
-			if (((HotColdClue) clue).update(event.getMessage(), this))
-			{
-				worldMapPointsSet = false;
-			}
+			worldMapPointsSet = false;
 		}
 
 		if (!event.getMessage().equals("The strange device cools as you find your treasure.")
@@ -226,9 +227,9 @@ public class ClueScrollPlugin extends Plugin
 	@Subscribe
 	public void onMenuOptionClicked(final MenuOptionClicked event)
 	{
-		if (event.getMenuAction() != null && event.getMenuAction().equals("Read"))
+		if ("read".equalsIgnoreCase(event.getOption()))
 		{
-			final ItemDefinition itemComposition = itemManager.getItemDefinition(event.hashCode());
+			final ItemDefinition itemComposition = itemManager.getItemDefinition(event.getIdentifier());
 
 			if (itemComposition != null && itemComposition.getName().startsWith("Clue scroll"))
 			{
@@ -257,30 +258,25 @@ public class ClueScrollPlugin extends Plugin
 		// Check if item was removed from inventory
 		if (clue != null && clueItemId != null)
 		{
-			final Stream<Item> items = Arrays.stream(event.getItemContainer().getItems());
-
 			// Check if clue was removed from inventory
-			if (items.noneMatch(item -> itemManager.getItemDefinition(item.getId()).getId() == clueItemId))
+			if (!ItemUtil.containsItemId(event.getItemContainer().getItems(), clueItemId))
 			{
 				resetClue(true);
 			}
 		}
 
 		// if three step clue check for clue scroll pieces
-		if (clue instanceof ThreeStepCrypticClue)
+		if (clue instanceof ThreeStepCrypticClue && ((ThreeStepCrypticClue) clue).update(client, event, itemManager))
 		{
-			if (((ThreeStepCrypticClue) clue).update(client, event, itemManager))
+			worldMapPointsSet = false;
+			npcsToMark.clear();
+
+			if (this.displayHintArrows)
 			{
-				worldMapPointsSet = false;
-				npcsToMark.clear();
-
-				if (config.displayHintArrows())
-				{
-					client.clearHintArrow();
-				}
-
-				checkClueNPCs(clue, client.getCachedNPCs());
+				client.clearHintArrow();
 			}
+
+			checkClueNPCs(clue, client.getCachedNPCs());
 		}
 	}
 
@@ -313,9 +309,13 @@ public class ClueScrollPlugin extends Plugin
 	@Subscribe
 	public void onConfigChanged(ConfigChanged event)
 	{
-		if (event.getGroup().equals("cluescroll") && !config.displayHintArrows())
+		if (event.getGroup().equals("cluescroll"))
 		{
-			client.clearHintArrow();
+			this.displayHintArrows = config.displayHintArrows();
+			if (!this.displayHintArrows)
+			{
+				client.clearHintArrow();
+			}
 		}
 	}
 
@@ -366,7 +366,7 @@ public class ClueScrollPlugin extends Plugin
 			if (location != null)
 			{
 				// Only set the location hint arrow if we do not already have more accurate location
-				if (config.displayHintArrows()
+				if (this.displayHintArrows
 					&& (client.getHintArrowNpc() == null
 					|| !npcsToMark.contains(client.getHintArrowNpc())))
 				{
@@ -455,7 +455,7 @@ public class ClueScrollPlugin extends Plugin
 		worldMapPointsSet = false;
 		npcsToMark.clear();
 
-		if (config.displayHintArrows())
+		if (this.displayHintArrows)
 		{
 			client.clearHintArrow();
 		}
@@ -474,12 +474,9 @@ public class ClueScrollPlugin extends Plugin
 		final String text = Text.sanitizeMultilineText(clueScrollText.getText()).toLowerCase();
 
 		// Early return if this is same clue as already existing one
-		if (clue instanceof TextClueScroll)
+		if (clue instanceof TextClueScroll && ((TextClueScroll) clue).getText().equalsIgnoreCase(text))
 		{
-			if (((TextClueScroll) clue).getText().equalsIgnoreCase(text))
-			{
-				return clue;
-			}
+			return clue;
 		}
 
 		// (This|The) anagram reveals who to speak to next:
@@ -698,7 +695,7 @@ public class ClueScrollPlugin extends Plugin
 			}
 		}
 
-		if (!npcsToMark.isEmpty() && config.displayHintArrows())
+		if (!npcsToMark.isEmpty() && this.displayHintArrows)
 		{
 			// Always set hint arrow to first seen NPC
 			client.setHintArrow(npcsToMark.get(0));
@@ -764,7 +761,7 @@ public class ClueScrollPlugin extends Plugin
 		textComponent.render(graphics);
 	}
 
-	void scrollToWidget(WidgetInfo list, WidgetInfo scrollbar, Widget ... toHighlight)
+	void scrollToWidget(WidgetInfo list, WidgetInfo scrollbar, Widget... toHighlight)
 	{
 		final Widget parent = client.getWidget(list);
 		int averageCentralY = 0;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollServiceImpl.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollServiceImpl.java
index 3dd2d55a33..53887d80c6 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollServiceImpl.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollServiceImpl.java
@@ -35,7 +35,7 @@ class ClueScrollServiceImpl implements ClueScrollService
 	private final ClueScrollPlugin plugin;
 
 	@Inject
-	private ClueScrollServiceImpl(ClueScrollPlugin plugin)
+	private ClueScrollServiceImpl(final ClueScrollPlugin plugin)
 	{
 		this.plugin = plugin;
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollWorldMapPoint.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollWorldMapPoint.java
index 45fa1f874c..0ee530285c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollWorldMapPoint.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollWorldMapPoint.java
@@ -36,7 +36,7 @@ class ClueScrollWorldMapPoint extends WorldMapPoint
 	private final BufferedImage clueScrollWorldImage;
 	private final Point clueScrollWorldImagePoint;
 
-	ClueScrollWorldMapPoint(final WorldPoint worldPoint, ClueScrollPlugin plugin)
+	ClueScrollWorldMapPoint(final WorldPoint worldPoint, final ClueScrollPlugin plugin)
 	{
 		super(worldPoint, null);
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollWorldOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollWorldOverlay.java
index d68f06a691..0c4598043b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollWorldOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollWorldOverlay.java
@@ -28,11 +28,13 @@ import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.client.plugins.cluescrolls.clues.ClueScroll;
 import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 
+@Singleton
 public class ClueScrollWorldOverlay extends Overlay
 {
 	public static final int IMAGE_Z_OFFSET = 30;
@@ -44,7 +46,7 @@ public class ClueScrollWorldOverlay extends Overlay
 	private final ClueScrollPlugin plugin;
 
 	@Inject
-	private ClueScrollWorldOverlay(ClueScrollPlugin plugin)
+	private ClueScrollWorldOverlay(final ClueScrollPlugin plugin)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_SCENE);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java
index 18124aae0d..dbd1bc413a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java
@@ -138,7 +138,7 @@ public class CrypticClue extends ClueScroll implements TextClueScroll, NpcClueSc
 		new CrypticClue("46 is my number. My body is the colour of burnt orange and crawls among those with eight. Three mouths I have, yet I cannot eat. My blinking blue eye hides my grave.", new WorldPoint(3170, 3885, 0), "Sapphire respawn in the Spider's Nest, lvl 46 Wilderness. Dig under the sapphire spawn."),
 		new CrypticClue("Green is the colour of my death as the winter-guise, I swoop towards the ground.", new WorldPoint(2780, 3783, 0), "Players need to slide down to where Trollweiss grows on Trollweiss Mountain."),
 		new CrypticClue("Talk to a party-goer in Falador.", "Lucy", new WorldPoint(3046, 3382, 0), "Lucy is the bartender on the first floor of the party room."),
-		new CrypticClue("He knows just how easy it is to lose track of time.", "Brother Kojo", new WorldPoint(2570, 3250, 0), "Speak to brother Kojo in the Clock Tower. Answer: 22"),
+		new CrypticClue("He knows just how easy it is to lose track of time.", "Brother Kojo", new WorldPoint(2570, 3250, 0), "Speak to Brother Kojo in the Clock Tower. Answer: 22"),
 		new CrypticClue("A great view - watch the rapidly drying hides get splashed. Check the box you are sitting on.", BOXES, new WorldPoint(2523, 3493, 1), "Almera's House north of Baxtorian Falls, search boxes on the first floor."),
 		new CrypticClue("Search the Coffin in Edgeville.", COFFIN, new WorldPoint(3091, 3477, 0), "Search the coffin located by the Wilderness teleport lever."),
 		new CrypticClue("When no weapons are at hand, then is the time to reflect. In Saradomin's name, redemption draws closer...", DRAWERS_350, new WorldPoint(2818, 3351, 0), "On Entrana, search the southern drawer in the house with the cooking range."),
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/HotColdClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/HotColdClue.java
index 5fad4e4207..ae18259fb4 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/HotColdClue.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/HotColdClue.java
@@ -171,11 +171,11 @@ public class HotColdClue extends ClueScroll implements LocationClueScroll, Locat
 
 			if (digLocations.size() > 10)
 			{
-				for (HotColdArea area : locationCounts.keySet())
+				for (Map.Entry<HotColdArea, Integer> locationCount : locationCounts.entrySet())
 				{
 					panelComponent.getChildren().add(LineComponent.builder()
-						.left(area.getName())
-						.right(Integer.toString(locationCounts.get(area)))
+						.left(locationCount.getKey().getName())
+						.right(Integer.toString(locationCount.getValue()))
 						.build());
 				}
 			}
@@ -296,17 +296,18 @@ public class HotColdClue extends ClueScroll implements LocationClueScroll, Locat
 		else
 		{
 			location = null;
-
-			final HotColdTemperatureChange temperatureChange = HotColdTemperatureChange.of(message);
-			hotColdSolver.signal(localWorld, temperature, temperatureChange);
 		}
 
+		final HotColdTemperatureChange temperatureChange = HotColdTemperatureChange.of(message);
+		hotColdSolver.signal(localWorld, temperature, temperatureChange);
+
 		return true;
 	}
 
 	@Override
 	public void reset()
 	{
+		location = null;
 		initializeSolver();
 	}
 
@@ -339,7 +340,6 @@ public class HotColdClue extends ClueScroll implements LocationClueScroll, Locat
 	private void markFinalSpot(WorldPoint wp)
 	{
 		this.location = wp;
-		reset();
 	}
 
 	public String[] getNpcs()
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/AllRequirementsCollection.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/AllRequirementsCollection.java
index 2efe470b84..aa8fde3a15 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/AllRequirementsCollection.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/AllRequirementsCollection.java
@@ -29,7 +29,7 @@ import net.runelite.api.Item;
 
 public class AllRequirementsCollection implements ItemRequirement
 {
-	private ItemRequirement[] requirements;
+	private final ItemRequirement[] requirements;
 
 	public AllRequirementsCollection(ItemRequirement... requirements)
 	{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/AnyRequirementCollection.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/AnyRequirementCollection.java
index 02a713f7b0..45f1086267 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/AnyRequirementCollection.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/AnyRequirementCollection.java
@@ -29,8 +29,8 @@ import net.runelite.api.Item;
 
 public class AnyRequirementCollection implements ItemRequirement
 {
-	private String name;
-	private ItemRequirement[] requirements;
+	private final String name;
+	private final ItemRequirement[] requirements;
 
 	public AnyRequirementCollection(String name, ItemRequirement... requirements)
 	{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/RangeItemRequirement.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/RangeItemRequirement.java
index 92d1f14de8..ae716a54b8 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/RangeItemRequirement.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/RangeItemRequirement.java
@@ -29,9 +29,9 @@ import net.runelite.api.Item;
 
 public class RangeItemRequirement implements ItemRequirement
 {
-	private String name;
-	private int startItemId;
-	private int endItemId;
+	private final String name;
+	private final int startItemId;
+	private final int endItemId;
 
 	public RangeItemRequirement(String name, int startItemId, int endItemId)
 	{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/SingleItemRequirement.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/SingleItemRequirement.java
index 834fbe7739..333da4c47b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/SingleItemRequirement.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/SingleItemRequirement.java
@@ -30,7 +30,7 @@ import net.runelite.api.ItemDefinition;
 
 public class SingleItemRequirement implements ItemRequirement
 {
-	private int itemId;
+	private final int itemId;
 
 	public SingleItemRequirement(int itemId)
 	{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/SlotLimitationRequirement.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/SlotLimitationRequirement.java
index 1fae03dde5..697f6a59e5 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/SlotLimitationRequirement.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/emote/SlotLimitationRequirement.java
@@ -30,8 +30,8 @@ import net.runelite.api.Item;
 
 public class SlotLimitationRequirement implements ItemRequirement
 {
-	private String description;
-	private EquipmentInventorySlot[] slots;
+	private final String description;
+	private final EquipmentInventorySlot[] slots;
 
 	public SlotLimitationRequirement(String description, EquipmentInventorySlot... slots)
 	{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdTemperature.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdTemperature.java
index 2dc5909000..21171eec8d 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdTemperature.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdTemperature.java
@@ -32,6 +32,7 @@ import java.util.Set;
 import javax.annotation.Nullable;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import net.runelite.client.util.Text;
 
 @AllArgsConstructor
 @Getter
@@ -93,11 +94,12 @@ public enum HotColdTemperature
 			return null;
 		}
 
+		final String messageStart = Text.fromCSV(message).get(0);
 		final List<HotColdTemperature> possibleTemperatures = new ArrayList<>();
 
 		for (final HotColdTemperature temperature : temperatureSet)
 		{
-			if (message.contains(temperature.getText()))
+			if (messageStart.contains(temperature.getText()))
 			{
 				possibleTemperatures.add(temperature);
 			}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java
index 24b14895c9..1e0079ebd6 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java
@@ -24,10 +24,26 @@
  */
 package net.runelite.client.plugins.combatcounter;
 
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
 import com.google.inject.Provides;
+import java.awt.Color;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Actor;
+import static net.runelite.api.AnimationID.BARRAGE_ANIMATION;
+import static net.runelite.api.AnimationID.BLOWPIPE_ATTACK;
+import static net.runelite.api.AnimationID.CHIN_ANIMATION;
 import net.runelite.api.Client;
 import net.runelite.api.Hitsplat;
 import net.runelite.api.NPC;
@@ -35,6 +51,7 @@ import net.runelite.api.NPCDefinition;
 import net.runelite.api.Player;
 import net.runelite.api.coords.WorldPoint;
 import net.runelite.api.events.AnimationChanged;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.GameTick;
 import net.runelite.api.events.HitsplatApplied;
 import net.runelite.api.kit.KitType;
@@ -45,13 +62,6 @@ import net.runelite.client.plugins.PluginDescriptor;
 import net.runelite.client.plugins.PluginType;
 import net.runelite.client.ui.overlay.OverlayManager;
 
-import javax.inject.Inject;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
 @PluginDescriptor(
 		name = "Tick Counter",
 		description = "Count the amount of perfect combat ticks performed by each player.",
@@ -59,7 +69,8 @@ import java.util.Map;
 		type = PluginType.UTILITY,
 		enabledByDefault = false
 )
-
+@Singleton
+@Slf4j
 public class CombatCounter extends Plugin 
 {
 
@@ -79,16 +90,30 @@ public class CombatCounter extends Plugin
 	private CombatCounterConfig config;
 
 	private boolean instanced = false;
-	private boolean prevInstance = false;
-	@Setter
-	@Getter
-	private Map<String, Long> counter = new HashMap<String, Long>();
-	private long BLOWPIPE_ID = 5061;
+	@Setter(AccessLevel.PACKAGE)
+	@Getter(AccessLevel.PACKAGE)
+	private Map<String, Long> counter = new HashMap<>();
 
-	private Map<String, Long> blowpipe = new HashMap<>();
+	private final Map<String, Long> blowpipe = new HashMap<>();
 
-	public Map<NPC, NPCDamageCounter> npcDamageMap = new HashMap<NPC, NPCDamageCounter>();
-	public Map<String, Double> playerDamage = new HashMap<String, Double>();
+	private final Map<NPC, NPCDamageCounter> npcDamageMap = new HashMap<>();
+	Map<String, Double> playerDamage = new HashMap<>();
+
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showTickCounter;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showDamageCounter;
+	private boolean resetOnNewInstance;
+	@Getter(AccessLevel.PACKAGE)
+	private Color selfColor;
+	@Getter(AccessLevel.PACKAGE)
+	private Color totalColor;
+	@Getter(AccessLevel.PACKAGE)
+	private Color otherColor;
+	@Getter(AccessLevel.PACKAGE)
+	private Color bgColor;
+	@Getter(AccessLevel.PACKAGE)
+	private Color titleColor;
 
 	@Provides
 	CombatCounterConfig provideConfig(ConfigManager configManager)
@@ -96,136 +121,122 @@ public class CombatCounter extends Plugin
 		return configManager.getConfig(CombatCounterConfig.class);
 	}
 
+	private static final Map<Integer, Integer> VARIABLES = ImmutableMap.<Integer, Integer>builder()
+		.put(422, 4) // Unarmed Punch, Block
+		.put(423, 4) // Unarmed Kick
+
+		.put(8145, 4) // Rapier Stab, Lunge, Block
+		.put(390, 4) // Rapier Slash
+
+		.put(7552, 5) // Armadyl Crossbow Accurate, Rapid, Longrange, Special
+
+		.put(1167, 4) // Trident Accurate, Accurate, Longrange
+
+		.put(401, 6) // Dragon Warhammer Pound, Pummel, Block
+		.put(1378, 6) // Dragon Warhammer Special
+
+		.put(393, 4) // Dragon Claws Chop, Slash, Block
+		.put(1067, 4) // Dragon Claws Lunge
+		.put(7514, 4) // Dragon Claws Special
+
+		.put(8288, 4) // Dragon Hunter Lance Lunge, Block
+		.put(8289, 4) // Dragon Hunter Lance Swipe
+		.put(8290, 4) // Dragon Hunter Lance Pound
+
+		.put(7516, 6) // Elder maul Pound, Pummel, Block
+
+		.put(8056, 5) // Scythe of Vitur Reap, Chop, Jab, Block
+
+		.put(7045, 6) // Bandos Godsword Chop, Slash
+		.put(7054, 6) // Bandos Godsword Smash
+		.put(7055, 6) // Bandos Godsword Block
+		.put(7642, 6) // Bandos Godsword Special
+		.put(7643, 6) // Bandos Godsword Special (Ornamate)
+
+		.put(426, 5) // Twisted Bow Accurate, Rapid, Longrange
+
+		.put(414, 5) // Kodai Bash, Pound, Focus
+
+		// .put(428, 4) // Staff of Light Jab
+		.put(440, 4) // Staff of Light Swipe
+		//.put(419, 4) // Staff of Light Fend
+		.put(7967, 4) // Staff of Light Special
+
+		.put(428, 7) // Crystal Halberd Jab, Fend
+		.put(419, 7) // Crystal Halberd Swipe
+		.put(1203, 7) // Crystal Halberd Special
+
+		.put(5061, 2) // Toxic Blowpipe Accurate, Rapid, Longrange, Special
+
+		.put(1979, 5) // Ancient Magicks Barrage
+		.put(1978, 5) // Ancient Magicks Blitz
+
+		.put(7618, 3) // Chinchompa Short, Medium, Long Fuse
+		.put(1658, 4) // Whip Flick, Lash, Deflect
+
+		.put(7555, 6) // Ballista Accurate, Rapid, Longrange
+		.build();
 
 
-	private Map<Integer, Integer> variables = new HashMap<Integer, Integer>()
-	{
-		{
-		this.put(422, 4); // Unarmed Punch, Block
-		this.put(423, 4); // Unarmed Kick
+	private static final Set<Integer> MELEE_ANIMATIONS = ImmutableSet.<Integer>builder()
+		.add(422) // Unarmed Punch, Block
+		.add(423) // Unarmed Kick
 
-		this.put(8145, 4); // Rapier Stab, Lunge, Block
-		this.put(390, 4); // Rapier Slash
+		.add(8145) // Rapier Stab, Lunge, Block
+		.add(390) // Rapier Slash
 
-		this.put(7552, 5); // Armadyl Crossbow Accurate, Rapid, Longrange, Special
+		.add(401) // Dragon Warhammer Pound, Pummel, Block
+		.add(1378) // Dragon Warhammer Special
 
-		this.put(1167, 4); // Trident Accurate, Accurate, Longrange
+		.add(393) // Dragon Claws Chop, Slash, Block
+		.add(1067) // Dragon Claws Lunge
+		.add(7514) // Dragon Claws Special
 
-		this.put(401, 6); // Dragon Warhammer Pound, Pummel, Block
-		this.put(1378, 6); // Dragon Warhammer Special
+		.add(8288) // Dragon Hunter Lance Lunge, Block
+		.add(8289) // Dragon Hunter Lance Swipe
+		.add(8290) // Dragon Hunter Lance Pound
 
-		this.put(393, 4); // Dragon Claws Chop, Slash, Block
-		this.put(1067, 4); // Dragon Claws Lunge
-		this.put(7514, 4); // Dragon Claws Special
+		.add(7516) // Elder maul Pound, Pummel, Block
 
-		this.put(8288, 4); // Dragon Hunter Lance Lunge, Block
-		this.put(8289, 4); // Dragon Hunter Lance Swipe
-		this.put(8290, 4); // Dragon Hunter Lance Pound
+		.add(8056) // Scythe of Vitur Reap, Chop, Jab, Block
 
-		this.put(7516, 6); // Elder maul Pound, Pummel, Block
+		.add(7045) // Bandos Godsword Chop, Slash
+		.add(7054) // Bandos Godsword Smash
+		.add(7055) // Bandos Godsword Block
+		.add(7642) // Bandos Godsword Special
+		.add(7643) // Bandos Godsword Special (Ornamate)
 
-		this.put(8056, 5); // Scythe of Vitur Reap, Chop, Jab, Block
+		.add(414) // Kodai Bash, Pound, Focus
 
-		this.put(7045, 6); // Bandos Godsword Chop, Slash
-		this.put(7054, 6); // Bandos Godsword Smash
-		this.put(7055, 6); // Bandos Godsword Block
-		this.put(7642, 6); // Bandos Godsword Special
-		this.put(7643, 6); // Bandos Godsword Special (Ornamate)
+		.add(428) // Staff of Light Jab
+		.add(440) // Staff of Light Swipe
+		.add(419) // Staff of Light Fend
 
-		this.put(426, 5); // Twisted Bow Accurate, Rapid, Longrange
+		.add(428) // Crystal Halberd Jab, Fend
+		.add(419) // Crystal Halberd Swipe
+		.add(1203) // Crystal Halberd Special
 
-		this.put(414, 5); // Kodai Bash, Pound, Focus
+		.add(1658) // Whip Flick, Lash, Deflect
+		.build();
 
-		this.put(428, 4); // Staff of Light Jab
-		this.put(440, 4); // Staff of Light Swipe
-		this.put(419, 4); // Staff of Light Fend
-		this.put(7967, 4); // Staff of Light Special
+	private static final Set<Integer> RANGE_ANIMATIONS = ImmutableSet.of(
+		7552, // Armadyl Crossbow Accurate, Rapid, Longrange, Special
+		426, // Twisted Bow Accurate, Rapid, Longrange
+		7618, // Chinchompa Short, Medium, Long Fuse
+		7555 // Ballista Accurate, Rapid, Longrange
+	);
 
-		this.put(428, 7); // Crystal Halberd Jab, Fend
-		this.put(419, 7); // Crystal Halberd Swipe
-		this.put(1203, 7); // Crystal Halberd Special
-
-		this.put(5061, 2); // Toxic Blowpipe Accurate, Rapid, Longrange, Special
-
-		this.put(1979, 5); // Ancient Magicks Barrage
-		this.put(1978, 5); // Ancient Magicks Blitz
-
-		this.put(7618, 3); // Chinchompa Short, Medium, Long Fuse
-		this.put(1658, 4); // Whip Flick, Lash, Deflect
-
-		this.put(7555, 6); // Ballista Accurate, Rapid, Longrange
-		}
-	};
-
-	public List<Integer> MELEE_ANIMATIONS = new ArrayList<Integer>()
-	{
-		{
-		this.add(422); // Unarmed Punch, Block
-		this.add(423); // Unarmed Kick
-
-		this.add(8145); // Rapier Stab, Lunge, Block
-		this.add(390); // Rapier Slash
-
-		this.add(401); // Dragon Warhammer Pound, Pummel, Block
-		this.add(1378); // Dragon Warhammer Special
-
-		this.add(393); // Dragon Claws Chop, Slash, Block
-		this.add(1067); // Dragon Claws Lunge
-		this.add(7514); // Dragon Claws Special
-
-		this.add(8288); // Dragon Hunter Lance Lunge, Block
-		this.add(8289); // Dragon Hunter Lance Swipe
-		this.add(8290); // Dragon Hunter Lance Pound
-
-		this.add(7516); // Elder maul Pound, Pummel, Block
-
-		this.add(8056); // Scythe of Vitur Reap, Chop, Jab, Block
-
-		this.add(7045); // Bandos Godsword Chop, Slash
-		this.add(7054); // Bandos Godsword Smash
-		this.add(7055); // Bandos Godsword Block
-		this.add(7642); // Bandos Godsword Special
-		this.add(7643); // Bandos Godsword Special (Ornamate)
-
-		this.add(414); // Kodai Bash, Pound, Focus
-
-		this.add(428); // Staff of Light Jab
-		this.add(440); // Staff of Light Swipe
-		this.add(419); // Staff of Light Fend
-
-		this.add(428); // Crystal Halberd Jab, Fend
-		this.add(419); // Crystal Halberd Swipe
-		this.add(1203); // Crystal Halberd Special
-
-		this.add(1658); // Whip Flick, Lash, Deflect
-		}
-	};
-
-	public List<Integer> RANGE_ANIMATIONS = new ArrayList<Integer>()
-	{
-		{
-		this.add(7552); // Armadyl Crossbow Accurate, Rapid, Longrange, Special
-
-		this.add(426); // Twisted Bow Accurate, Rapid, Longrange
-
-		this.add(7618); // Chinchompa Short, Medium, Long Fuse
-
-		this.add(7555); // Ballista Accurate, Rapid, Longrange
-		}
-	};
-
-	public List<Integer> MAGE_ANIMATIONS = new ArrayList<Integer>() 
-	{
-		{
-		this.add(1167); // Trident Accurate, Accurate, Longrange
-		this.add(1978); // Ancient Magicks Blitz
-		this.add(1979); // Ancient Magicks Barrage
-		}
-	};
+	private static final Set<Integer> MAGE_ANIMATIONS = ImmutableSet.of(
+		1167, // Trident Accurate, Accurate, Longrange
+		1978, // Ancient Magicks Blitz
+		1979 // Ancient Magicks Barrage
+	);
 
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
+
 		overlayManager.add(tickOverlay);
 		overlayManager.add(damageOverlay);
 
@@ -252,7 +263,7 @@ public class CombatCounter extends Plugin
 	{
 		Actor actor = event.getActor();
 
-		if (actor != null && actor instanceof Player)
+		if (actor instanceof Player)
 		{
 			Player p = (Player) actor;
 			String name = actor.getName();
@@ -261,22 +272,24 @@ public class CombatCounter extends Plugin
 				int animation = p.getAnimation();
 				if (animation != -1)
 				{
-					if (variables.containsKey(animation))
+					if (VARIABLES.containsKey(animation))
 					{
 						/*
 						 * This part handles the Tick Counter.
 						 */
-						long ticks = variables.get(animation);
+						long ticks = VARIABLES.get(animation);
 						if (((Player) actor).getPlayerAppearance().getEquipmentId(KitType.WEAPON) == 23360)
 						{
 							ticks = 3;
 						}
 						if (counter.containsKey(name))
+						{
 							ticks += counter.get(name);
+						}
 						counter.put(name, ticks);
 						counter = sortByValue(counter);
 
-						if (animation == BLOWPIPE_ID)
+						if (animation == BLOWPIPE_ATTACK)
 						{
 							this.blowpipe.put(name, -4L);
 						}
@@ -285,14 +298,14 @@ public class CombatCounter extends Plugin
 						 * This part handles the Damage Counter.
 						 */
 						Actor interacting = actor.getInteracting();
-						if (interacting != null && interacting instanceof NPC)
+						if (interacting instanceof NPC)
 						{
 							NPC npc = (NPC) interacting;
 
-							List<NPC> actives = new ArrayList<NPC>();
+							List<NPC> actives = new ArrayList<>();
 							actives.add(npc);
 
-							if (animation == 1979 || animation == 7618)
+							if (BARRAGE_ANIMATION == 1979 || CHIN_ANIMATION == 7618)
 							{ // Barrage or chin.
 								for (NPC nearby : this.client.getNpcs())
 								{
@@ -335,12 +348,12 @@ public class CombatCounter extends Plugin
 							}
 							else
 							{
-								System.out.println("Unclassified Animation: " + animation);
+								log.debug("Unclassified Animation: {}", animation);
 							}
 
 							if (delay != -1)
 							{
-								List<Integer> ticksToAdd = new ArrayList<Integer>();
+								List<Integer> ticksToAdd = new ArrayList<>();
 								ticksToAdd.add(delay);
 
 								if (canFarcast && delay > 2)
@@ -348,7 +361,7 @@ public class CombatCounter extends Plugin
 									ticksToAdd.add(delay - 1);
 								}
 
-								/**
+								/*
 								 * Dragon Claw Specials are 2 ticks long.
 								 */
 								if (animation == 7514)
@@ -360,13 +373,17 @@ public class CombatCounter extends Plugin
 								{
 									NPCDamageCounter dc = new NPCDamageCounter();
 									if (this.npcDamageMap.containsKey(target))
+									{
 										dc = this.npcDamageMap.get(target);
+									}
 
 									for (Integer tick : ticksToAdd)
 									{
-										List<String> attackers = new ArrayList<String>();
+										List<String> attackers = new ArrayList<>();
 										if (dc.attackers.containsKey(tick))
+										{
 											attackers = dc.attackers.get(tick);
+										}
 
 										attackers.add(name);
 										dc.attackers.put(tick, attackers);
@@ -389,9 +406,9 @@ public class CombatCounter extends Plugin
 	@Subscribe
 	public void onGameTick(GameTick event)
 	{
-		if (config.resetOnNewInstance())
+		if (this.resetOnNewInstance)
 		{
-			prevInstance = instanced;
+			boolean prevInstance = instanced;
 			instanced = client.isInInstancedRegion();
 			if (!prevInstance && instanced) 
 			{
@@ -402,19 +419,21 @@ public class CombatCounter extends Plugin
 			}
 		}
 
-		Map<String, Player> visible = new HashMap<String, Player>();
+		Map<String, Player> visible = new HashMap<>();
 		for (Player p : this.client.getPlayers())
 		{
 			if (p.getName() != null)
+			{
 				visible.put(p.getName(), p);
+			}
 		}
 
-		for (NPC npc : new ArrayList<NPC>(this.npcDamageMap.keySet()))
+		for (NPC npc : new ArrayList<>(this.npcDamageMap.keySet()))
 		{
 			NPCDamageCounter counter = this.npcDamageMap.get(npc);
 
 			Map<Integer, List<String>> attackers = counter.attackers;
-			for (Integer i : new ArrayList<Integer>(attackers.keySet()))
+			for (Integer i : new ArrayList<>(attackers.keySet()))
 			{
 				List<String> p = attackers.get(i);
 				attackers.put(i - 1, p);
@@ -423,7 +442,9 @@ public class CombatCounter extends Plugin
 
 			double totalDamage = 0d;
 			for (Integer damage : counter.damage)
+			{
 				totalDamage += damage;
+			}
 
 			if (attackers.containsKey(-1))
 			{
@@ -435,7 +456,9 @@ public class CombatCounter extends Plugin
 				{
 					double count = 0d;
 					if (this.playerDamage.containsKey(name))
+					{
 						count = this.playerDamage.get(name);
+					}
 
 					count += damagePerPlayer;
 					this.playerDamage.put(name, count);
@@ -455,17 +478,23 @@ public class CombatCounter extends Plugin
 //				this.playerDamage.put(name, count);
 //			}
 
-			for (Integer i : new ArrayList<Integer>(attackers.keySet()))
+			for (Integer i : new ArrayList<>(attackers.keySet()))
+			{
 				if (i <= -1)
+				{
 					attackers.remove(i);
+				}
+			}
 
 			if (attackers.isEmpty())
+			{
 				this.npcDamageMap.remove(npc);
+			}
 		}
 
 		this.playerDamage = sortByValue(this.playerDamage);
 
-		for (String user : new ArrayList<String>(blowpipe.keySet()))
+		for (String user : new ArrayList<>(blowpipe.keySet()))
 		{
 			if (visible.containsKey(user))
 			{
@@ -481,7 +510,7 @@ public class CombatCounter extends Plugin
 
 					Player p = visible.get(user);
 					Actor interacting = p.getInteracting();
-					if (interacting != null && interacting instanceof NPC)
+					if (interacting instanceof NPC)
 					{
 						NPC npc = (NPC) interacting;
 
@@ -489,20 +518,26 @@ public class CombatCounter extends Plugin
 
 						NPCDamageCounter dc = new NPCDamageCounter();
 						if (this.npcDamageMap.containsKey(npc))
+						{
 							dc = this.npcDamageMap.get(npc);
+						}
 
 						int delay = this.calculateBPDelay(distance);
 
-						List<Integer> counts = new ArrayList<Integer>();
+						List<Integer> counts = new ArrayList<>();
 						counts.add(delay);
 						if (delay > 2)
+						{
 							counts.add(delay - 1);
+						}
 
 						for (int tick : counts)
 						{
-							List<String> attackers = new ArrayList<String>();
+							List<String> attackers = new ArrayList<>();
 							if (dc.attackers.containsKey(tick))
+							{
 								attackers = dc.attackers.get(tick);
+							}
 
 							attackers.add(user);
 							dc.attackers.put(tick, attackers);
@@ -526,12 +561,16 @@ public class CombatCounter extends Plugin
 		Actor actor = event.getActor();
 
 		if (!(actor instanceof NPC))
+		{
 			return;
+		}
 
 		NPC npc = (NPC) actor;
 
 		if (!this.npcDamageMap.containsKey(npc))
+		{
 			return;
+		}
 
 		Hitsplat splat = event.getHitsplat();
 		NPCDamageCounter dc = this.npcDamageMap.get(npc);
@@ -553,7 +592,7 @@ public class CombatCounter extends Plugin
 		return result;
 	}
 
-	public int calculateDistance(Player p, NPC npc)
+	private int calculateDistance(Player p, NPC npc)
 	{
 		int size = 1;
 		NPCDefinition comp = npc.getTransformedDefinition();
@@ -567,6 +606,7 @@ public class CombatCounter extends Plugin
 		int distance = wpNPC.distanceTo(wpPlayer);
 
 		if (size > 1)
+		{
 			for (int x = 0; x < size; x++)
 			{
 				for (int y = 0; y < size; y++)
@@ -579,26 +619,49 @@ public class CombatCounter extends Plugin
 					}
 				}
 			}
+		}
+
 		return distance;
 	}
 
-	public int calculateBPDelay(double distance)
+	private int calculateBPDelay(double distance)
 	{
 		return 2 + (int) Math.floor(distance / 6d);
 	}
 
-	public int calculateChinDelay(double distance)
+	private int calculateChinDelay(double distance)
 	{
 		return 2 + (int) Math.floor(distance / 6d);
 	}
 
-	public int calculateMageDelay(double distance)
+	private int calculateMageDelay(double distance)
 	{
 		return 2 + (int) Math.floor((1d + distance) / 3d);
 	}
 
-	public int calculateRangedDelay(double distance)
+	private int calculateRangedDelay(double distance)
 	{
 		return 2 + (int) Math.floor((3d + distance) / 6d);
 	}
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (event.getGroup().equals("combatcounter"))
+		{
+			updateConfig();
+		}
+	}
+
+	private void updateConfig()
+	{
+		this.showTickCounter = config.showTickCounter();
+		this.showDamageCounter = config.showDamageCounter();
+		this.resetOnNewInstance = config.resetOnNewInstance();
+		this.selfColor = config.selfColor();
+		this.totalColor = config.totalColor();
+		this.otherColor = config.otherColor();
+		this.bgColor = config.bgColor();
+		this.titleColor = config.titleColor();
+	}
 }
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatOverlay.java
index 7f97d6ab42..de414bc3b2 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatOverlay.java
@@ -26,9 +26,9 @@ package net.runelite.client.plugins.combatcounter;
 
 import java.awt.Dimension;
 import java.awt.Graphics2D;
-import java.util.HashMap;
 import java.util.Map;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.api.Player;
@@ -42,17 +42,16 @@ import net.runelite.client.ui.overlay.components.table.TableAlignment;
 import net.runelite.client.ui.overlay.components.table.TableComponent;
 import net.runelite.client.util.ColorUtil;
 
+@Singleton
 class CombatOverlay extends Overlay
 {
 
 	private final Client client;
 	private final CombatCounter plugin;
 	private final PanelComponent panelComponent = new PanelComponent();
-	private final CombatCounterConfig config;
-	private HashMap<String, Long> ticks = new HashMap<>();
 
 	@Inject
-	public CombatOverlay(Client client, CombatCounter plugin, CombatCounterConfig config)
+	public CombatOverlay(final Client client, final CombatCounter plugin)
 	{
 		super(plugin);
 
@@ -60,7 +59,6 @@ class CombatOverlay extends Overlay
 		setPosition(OverlayPosition.DETACHED);
 		setPosition(OverlayPosition.BOTTOM_RIGHT);
 
-		this.config = config;
 		this.client = client;
 		this.plugin = plugin;
 
@@ -70,7 +68,7 @@ class CombatOverlay extends Overlay
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (config.showTickCounter())
+		if (plugin.isShowTickCounter())
 		{
 			panelComponent.getChildren().clear();
 
@@ -79,8 +77,8 @@ class CombatOverlay extends Overlay
 			{
 				return null;
 			}
-			panelComponent.setBackgroundColor(config.bgColor());
-			panelComponent.getChildren().add(TitleComponent.builder().text("Tick Counter").color(config.titleColor()).build());
+			panelComponent.setBackgroundColor(plugin.getBgColor());
+			panelComponent.getChildren().add(TitleComponent.builder().text("Tick Counter").color(plugin.getTitleColor()).build());
 			int total = 0;
 
 			TableComponent tableComponent = new TableComponent();
@@ -98,26 +96,27 @@ class CombatOverlay extends Overlay
 					return null;
 				}
 
-				for (String name : map.keySet())
+				for (Map.Entry<String, Long> counter : map.entrySet())
 				{
+					String name = counter.getKey();
 					if (client.getLocalPlayer().getName().contains(name))
 					{
-						tableComponent.addRow(ColorUtil.prependColorTag(name, config.selfColor()), ColorUtil.prependColorTag(Long.toString(map.get(name)), config.selfColor()));
+						tableComponent.addRow(ColorUtil.prependColorTag(name, plugin.getSelfColor()), ColorUtil.prependColorTag(Long.toString(counter.getValue()), plugin.getSelfColor()));
 					}
 					else
 					{
-						tableComponent.addRow(ColorUtil.prependColorTag(name, config.otherColor()), ColorUtil.prependColorTag(Long.toString(map.get(name)), config.otherColor()));
+						tableComponent.addRow(ColorUtil.prependColorTag(name, plugin.getOtherColor()), ColorUtil.prependColorTag(Long.toString(counter.getValue()), plugin.getOtherColor()));
 					}
-					total += map.get(name);
+					total += counter.getValue();
 				}
 
 				if (!map.containsKey(local.getName()))
 				{
-					tableComponent.addRow(ColorUtil.prependColorTag(local.getName(), config.selfColor()), ColorUtil.prependColorTag("0", config.selfColor()));
+					tableComponent.addRow(ColorUtil.prependColorTag(local.getName(), plugin.getSelfColor()), ColorUtil.prependColorTag("0", plugin.getSelfColor()));
 				}
 			}
 
-			tableComponent.addRow(ColorUtil.prependColorTag("Total:", config.totalColor()), ColorUtil.prependColorTag(String.valueOf(total), config.totalColor()));
+			tableComponent.addRow(ColorUtil.prependColorTag("Total:", plugin.getTotalColor()), ColorUtil.prependColorTag(String.valueOf(total), plugin.getTotalColor()));
 
 			if (!tableComponent.isEmpty())
 			{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/DamageOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/DamageOverlay.java
index 998246ccf2..8a27e6f96b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/DamageOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/DamageOverlay.java
@@ -28,6 +28,7 @@ import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.util.Map;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.api.Player;
@@ -41,6 +42,7 @@ import net.runelite.client.ui.overlay.components.table.TableAlignment;
 import net.runelite.client.ui.overlay.components.table.TableComponent;
 import net.runelite.client.util.ColorUtil;
 
+@Singleton
 class DamageOverlay extends Overlay
 {
 
@@ -48,12 +50,10 @@ class DamageOverlay extends Overlay
 
 	private final CombatCounter plugin;
 
-	private final CombatCounterConfig config;
-
 	private final PanelComponent panelComponent = new PanelComponent();
 
 	@Inject
-	public DamageOverlay(Client client, CombatCounter plugin, CombatCounterConfig config)
+	public DamageOverlay(final Client client, final CombatCounter plugin)
 	{
 		super(plugin);
 
@@ -61,7 +61,6 @@ class DamageOverlay extends Overlay
 		setPosition(OverlayPosition.DETACHED);
 		setPosition(OverlayPosition.BOTTOM_RIGHT);
 
-		this.config = config;
 		this.client = client;
 		this.plugin = plugin;
 
@@ -71,7 +70,7 @@ class DamageOverlay extends Overlay
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (config.showDamageCounter())
+		if (plugin.isShowDamageCounter())
 		{
 			panelComponent.getChildren().clear();
 
@@ -80,8 +79,8 @@ class DamageOverlay extends Overlay
 			{
 				return null;
 			}
-			panelComponent.setBackgroundColor(config.bgColor());
-			panelComponent.getChildren().add(TitleComponent.builder().text("Damage Counter").color(config.titleColor()).build());
+			panelComponent.setBackgroundColor(plugin.getBgColor());
+			panelComponent.getChildren().add(TitleComponent.builder().text("Damage Counter").color(plugin.getTitleColor()).build());
 
 			TableComponent tableComponent = new TableComponent();
 			tableComponent.setColumnAlignments(TableAlignment.LEFT, TableAlignment.RIGHT);
@@ -98,22 +97,22 @@ class DamageOverlay extends Overlay
 					return null;
 				}
 
-				for (String name : map.keySet())
+				for (Map.Entry<String, Double> damage : map.entrySet())
 				{
-					String val = String.format("%.1f", map.get(name));
-					if (client.getLocalPlayer().getName().contains(name))
+					String val = String.format("%.1f", damage.getValue());
+					if (client.getLocalPlayer().getName().contains(damage.getKey()))
 					{
-						tableComponent.addRow(ColorUtil.prependColorTag(name, config.selfColor()), ColorUtil.prependColorTag(val, config.selfColor()));
+						tableComponent.addRow(ColorUtil.prependColorTag(damage.getKey(), plugin.getSelfColor()), ColorUtil.prependColorTag(val, plugin.getSelfColor()));
 					}
 					else
 					{
-						tableComponent.addRow(ColorUtil.prependColorTag(name, config.otherColor()), ColorUtil.prependColorTag(val, config.otherColor()));
+						tableComponent.addRow(ColorUtil.prependColorTag(damage.getKey(), plugin.getOtherColor()), ColorUtil.prependColorTag(val, plugin.getOtherColor()));
 					}
 				}
 
 				if (!map.containsKey(local.getName()))
 				{
-					tableComponent.addRow(ColorUtil.prependColorTag(local.getName(), config.selfColor()), ColorUtil.prependColorTag("0", config.selfColor()));
+					tableComponent.addRow(ColorUtil.prependColorTag(local.getName(), plugin.getSelfColor()), ColorUtil.prependColorTag("0", plugin.getSelfColor()));
 				}
 			}
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/NPCDamageCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/NPCDamageCounter.java
index ef55777b59..8e9d96e24e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/NPCDamageCounter.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/NPCDamageCounter.java
@@ -4,17 +4,19 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
+import javax.inject.Singleton;
 
-public class NPCDamageCounter 
+@Singleton
+class NPCDamageCounter
 {
 
-	public Map<Integer, List<String>> attackers;
+	final Map<Integer, List<String>> attackers;
 
-	public List<Integer> damage;
+	final List<Integer> damage;
 
-	public NPCDamageCounter()
+	NPCDamageCounter()
 	{
-		this.attackers = new TreeMap<Integer, List<String>>();
-		this.damage = new ArrayList<Integer>();
+		this.attackers = new TreeMap<>();
+		this.damage = new ArrayList<>();
 	}
 }
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelOverlay.java
index 3083e02cac..92c567aab9 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelOverlay.java
@@ -29,6 +29,7 @@ import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.awt.Rectangle;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.Experience;
 import net.runelite.api.Skill;
@@ -39,19 +40,20 @@ import net.runelite.client.ui.overlay.tooltip.Tooltip;
 import net.runelite.client.ui.overlay.tooltip.TooltipManager;
 import net.runelite.client.util.ColorUtil;
 
+@Singleton
 class CombatLevelOverlay extends Overlay
 {
 	private static final Color COMBAT_LEVEL_COLOUR = new Color(0xff981f);
 
 	private final Client client;
-	private final CombatLevelConfig config;
+	private final CombatLevelPlugin plugin;
 	private final TooltipManager tooltipManager;
 
 	@Inject
-	private CombatLevelOverlay(Client client, CombatLevelConfig config, TooltipManager tooltipManager)
+	private CombatLevelOverlay(final Client client, final CombatLevelPlugin plugin, final TooltipManager tooltipManager)
 	{
 		this.client = client;
-		this.config = config;
+		this.plugin = plugin;
 		this.tooltipManager = tooltipManager;
 	}
 
@@ -59,7 +61,7 @@ class CombatLevelOverlay extends Overlay
 	public Dimension render(Graphics2D graphics)
 	{
 		Widget combatLevelWidget = client.getWidget(WidgetInfo.COMBAT_LEVEL);
-		if (!config.showLevelsUntil()
+		if (!plugin.isShowLevelsUntil()
 			|| client.getLocalPlayer().getCombatLevel() == Experience.MAX_COMBAT_LEVEL
 			|| combatLevelWidget == null || combatLevelWidget.isHidden())
 		{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelPlugin.java
index e466e939f4..575f59af6f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelPlugin.java
@@ -30,6 +30,9 @@ import java.text.DecimalFormat;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
+import lombok.Getter;
 import net.runelite.api.Client;
 import net.runelite.api.Experience;
 import net.runelite.api.GameState;
@@ -52,6 +55,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	description = "Show a more accurate combat level in Combat Options panel and other combat level functions",
 	tags = {"wilderness", "attack", "range"}
 )
+@Singleton
 public class CombatLevelPlugin extends Plugin
 {
 	private static final DecimalFormat DECIMAL_FORMAT = new DecimalFormat("#.###");
@@ -80,6 +84,10 @@ public class CombatLevelPlugin extends Plugin
 	@Inject
 	private OverlayManager overlayManager;
 
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showLevelsUntil;
+	private boolean wildernessAttackLevelRange;
+
 	@Provides
 	CombatLevelConfig provideConfig(ConfigManager configManager)
 	{
@@ -89,9 +97,11 @@ public class CombatLevelPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
+
 		overlayManager.add(overlay);
 
-		if (config.wildernessAttackLevelRange())
+		if (this.wildernessAttackLevelRange)
 		{
 			appendAttackLevelRangeText();
 		}
@@ -109,7 +119,7 @@ public class CombatLevelPlugin extends Plugin
 
 			if (widgetText.contains("."))
 			{
-				combatLevelWidget.setText(widgetText.substring(0, widgetText.indexOf(".")));
+				combatLevelWidget.setText(widgetText.substring(0, widgetText.indexOf('.')));
 			}
 		}
 
@@ -151,7 +161,9 @@ public class CombatLevelPlugin extends Plugin
 			return;
 		}
 
-		if (config.wildernessAttackLevelRange())
+		updateConfig();
+
+		if (this.wildernessAttackLevelRange)
 		{
 			appendAttackLevelRangeText();
 		}
@@ -164,7 +176,7 @@ public class CombatLevelPlugin extends Plugin
 	@Subscribe
 	public void onScriptCallbackEvent(ScriptCallbackEvent event)
 	{
-		if (config.wildernessAttackLevelRange()
+		if (this.wildernessAttackLevelRange
 			&& "wildernessWidgetTextSet".equals(event.getEventName()))
 		{
 			appendAttackLevelRangeText();
@@ -241,4 +253,10 @@ public class CombatLevelPlugin extends Plugin
 	{
 		return Math.max(MIN_COMBAT_LEVEL, combatLevel - wildernessLevel) + "-" + Math.min(Experience.MAX_COMBAT_LEVEL, combatLevel + wildernessLevel);
 	}
+
+	private void updateConfig()
+	{
+		this.showLevelsUntil = config.showLevelsUntil();
+		this.wildernessAttackLevelRange = config.showLevelsUntil();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java
index b80d912bc4..8a8692b947 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java
@@ -48,8 +48,10 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.stream.Collectors;
+import javax.inject.Singleton;
 import javax.swing.BorderFactory;
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
@@ -92,6 +94,7 @@ import net.runelite.client.config.Keybind;
 import net.runelite.client.config.ModifierlessKeybind;
 import net.runelite.client.config.Range;
 import net.runelite.client.config.RuneLiteConfig;
+import net.runelite.client.config.RuneLitePlusConfig;
 import net.runelite.client.config.Stub;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginDescriptor;
@@ -113,6 +116,7 @@ import net.runelite.client.util.Text;
 import org.apache.commons.lang3.StringUtils;
 
 @Slf4j
+@Singleton
 public class ConfigPanel extends PluginPanel
 {
 	private static final int SPINNER_FIELD_WIDTH = 6;
@@ -124,11 +128,13 @@ public class ConfigPanel extends PluginPanel
 	private static final String RUNELITE_GROUP_NAME = RuneLiteConfig.class.getAnnotation(ConfigGroup.class).value();
 	private static final String PINNED_PLUGINS_CONFIG_KEY = "pinnedPlugins";
 	private static final String RUNELITE_PLUGIN = "RuneLite";
+	private static final String RUNELITEPLUS_PLUGIN = "RuneLitePlus";
 	private static final String CHAT_COLOR_PLUGIN = "Chat Color";
 	private final PluginManager pluginManager;
 	private final ConfigManager configManager;
 	private final ScheduledExecutorService executorService;
 	private final RuneLiteConfig runeLiteConfig;
+	private final RuneLitePlusConfig runeLitePlusConfig;
 	private final ChatColorConfig chatColorConfig;
 	public static List<PluginListItem> pluginList = new ArrayList<>();
 
@@ -148,13 +154,14 @@ public class ConfigPanel extends PluginPanel
 	}
 
 	ConfigPanel(PluginManager pluginManager, ConfigManager configManager, ScheduledExecutorService executorService,
-				RuneLiteConfig runeLiteConfig, ChatColorConfig chatColorConfig)
+				RuneLiteConfig runeLiteConfig, RuneLitePlusConfig runeLitePlusConfig, ChatColorConfig chatColorConfig)
 	{
 		super(false);
 		this.pluginManager = pluginManager;
 		this.configManager = configManager;
 		this.executorService = executorService;
 		this.runeLiteConfig = runeLiteConfig;
+		this.runeLitePlusConfig = runeLitePlusConfig;
 		this.chatColorConfig = chatColorConfig;
 
 		searchBar.setIcon(IconTextField.Icon.SEARCH);
@@ -259,6 +266,14 @@ public class ConfigPanel extends PluginPanel
 		runeLite.nameLabel.setForeground(Color.WHITE);
 		pluginList.add(runeLite);
 
+		// set RuneLitePlus config on top, as it should always have been
+		final PluginListItem runeLitePlus = new PluginListItem(this, configManager, runeLitePlusConfig,
+			configManager.getConfigDescriptor(runeLitePlusConfig),
+			RUNELITEPLUS_PLUGIN, "RuneLitePlus client settings", "client");
+		runeLitePlus.setPinned(pinnedPlugins.contains(RUNELITEPLUS_PLUGIN));
+		runeLitePlus.nameLabel.setForeground(Color.WHITE);
+		pluginList.add(runeLitePlus);
+
 		List<PluginListItem> externalPlugins = new ArrayList<>();
 		// populate pluginList with all external Plugins
 		pluginManager.getPlugins().stream()
@@ -399,15 +414,18 @@ public class ConfigPanel extends PluginPanel
 
 	void refreshPluginList()
 	{
-		// update enabled / disabled status of all items
-		pluginList.forEach(listItem ->
+		if (pluginManager != null)
 		{
-			final Plugin plugin = listItem.getPlugin();
-			if (plugin != null)
+			// update enabled / disabled status of all items
+			pluginList.forEach(listItem ->
 			{
-				listItem.setPluginEnabled(pluginManager.isPluginEnabled(plugin));
-			}
-		});
+				final Plugin plugin = listItem.getPlugin();
+				if (plugin != null)
+				{
+					listItem.setPluginEnabled(pluginManager.isPluginEnabled(plugin));
+				}
+			});
+		}
 
 		if (showingPluginList)
 		{
@@ -975,7 +993,7 @@ public class ConfigPanel extends PluginPanel
 						if (e.getStateChange() == ItemEvent.SELECTED)
 						{
 							changeConfiguration(listItem, config, box, cd, cid);
-							box.setToolTipText(box.getSelectedItem().toString());
+							box.setToolTipText(Objects.requireNonNull(box.getSelectedItem()).toString());
 						}
 					});
 					item.add(box, BorderLayout.EAST);
@@ -1158,7 +1176,7 @@ public class ConfigPanel extends PluginPanel
 		else if (component instanceof JComboBox)
 		{
 			JComboBox jComboBox = (JComboBox) component;
-			configManager.setConfiguration(cd.getGroup().value(), cid.getItem().keyName(), ((Enum) jComboBox.getSelectedItem()).name());
+			configManager.setConfiguration(cd.getGroup().value(), cid.getItem().keyName(), ((Enum) Objects.requireNonNull(jComboBox.getSelectedItem())).name());
 
 			for (ConfigItemDescriptor cid2 : cd.getItems())
 			{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java
index 2004675a05..0996eed283 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java
@@ -27,11 +27,13 @@ package net.runelite.client.plugins.config;
 import java.awt.image.BufferedImage;
 import java.util.concurrent.ScheduledExecutorService;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import javax.swing.SwingUtilities;
 import net.runelite.api.MenuAction;
 import net.runelite.client.config.ChatColorConfig;
 import net.runelite.client.config.ConfigManager;
 import net.runelite.client.config.RuneLiteConfig;
+import net.runelite.client.config.RuneLitePlusConfig;
 import net.runelite.client.eventbus.Subscribe;
 import net.runelite.client.events.OverlayMenuClicked;
 import net.runelite.client.events.PluginChanged;
@@ -39,7 +41,6 @@ import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginDescriptor;
 import net.runelite.client.plugins.PluginManager;
 import net.runelite.client.ui.ClientToolbar;
-import net.runelite.client.ui.ClientUI;
 import net.runelite.client.ui.NavigationButton;
 import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayMenuEntry;
@@ -50,10 +51,9 @@ import net.runelite.client.util.ImageUtil;
 	loadWhenOutdated = true,
 	hidden = true // prevent users from disabling
 )
+@Singleton
 public class ConfigPlugin extends Plugin
 {
-	@Inject
-	private ClientUI clientUI;
 
 	@Inject
 	private ClientToolbar clientToolbar;
@@ -70,6 +70,9 @@ public class ConfigPlugin extends Plugin
 	@Inject
 	private RuneLiteConfig runeLiteConfig;
 
+	@Inject
+	private RuneLitePlusConfig runeLitePlusConfig;
+
 	@Inject
 	private ChatColorConfig chatColorConfig;
 
@@ -79,7 +82,7 @@ public class ConfigPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
-		configPanel = new ConfigPanel(pluginManager, configManager, executorService, runeLiteConfig, chatColorConfig);
+		configPanel = new ConfigPanel(pluginManager, configManager, executorService, runeLiteConfig, runeLitePlusConfig, chatColorConfig);
 
 		final BufferedImage icon = ImageUtil.getResourceStreamFromClass(getClass(), "config_icon.png");
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/DeferredDocumentChangedListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/DeferredDocumentChangedListener.java
index c8ce0b37dc..7dbd7d73b4 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/config/DeferredDocumentChangedListener.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/DeferredDocumentChangedListener.java
@@ -10,8 +10,8 @@ import javax.swing.event.DocumentListener;
 
 class DeferredDocumentChangedListener implements DocumentListener
 {
-	private Timer timer;
-	private List<ChangeListener> listeners;
+	private final Timer timer;
+	private final List<ChangeListener> listeners;
 
 	DeferredDocumentChangedListener()
 	{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/HotkeyButton.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/HotkeyButton.java
index 585ade5ea6..2146c9f9fa 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/config/HotkeyButton.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/HotkeyButton.java
@@ -26,23 +26,24 @@ package net.runelite.client.plugins.config;
 
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
+import javax.inject.Singleton;
 import javax.swing.JButton;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.client.config.Keybind;
 import net.runelite.client.config.ModifierlessKeybind;
 
-public class HotkeyButton extends JButton
+@Singleton
+class HotkeyButton extends JButton
 {
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private Keybind value;
 
-	public HotkeyButton(Keybind value, boolean modifierless)
+	HotkeyButton(Keybind value, boolean modifierless)
 	{
 		setValue(value);
 		addActionListener(e ->
-		{
-			setValue(Keybind.NOT_SET);
-		});
+			setValue(Keybind.NOT_SET));
 		addKeyListener(new KeyAdapter()
 		{
 			@Override
@@ -60,7 +61,7 @@ public class HotkeyButton extends JButton
 		});
 	}
 
-	public void setValue(Keybind value)
+	private void setValue(Keybind value)
 	{
 		if (value == null)
 		{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java
index 3cd10af230..0a226cb72b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java
@@ -32,6 +32,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import javax.annotation.Nullable;
+import javax.inject.Singleton;
 import javax.swing.ImageIcon;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -47,6 +48,7 @@ import net.runelite.client.ui.components.IconButton;
 import net.runelite.client.util.ImageUtil;
 import org.apache.commons.text.similarity.JaroWinklerDistance;
 
+@Singleton
 public class PluginListItem extends JPanel
 {
 	private static final JaroWinklerDistance DISTANCE = new JaroWinklerDistance();
@@ -60,7 +62,6 @@ public class PluginListItem extends JPanel
 	private static final ImageIcon OFF_STAR;
 
 	private final ConfigPanel configPanel;
-	public final ConfigManager configManager;
 
 	@Getter
 	@Nullable
@@ -74,10 +75,10 @@ public class PluginListItem extends JPanel
 	@Getter(AccessLevel.PACKAGE)
 	public final ConfigDescriptor configDescriptor;
 
-	@Getter
+	@Getter(AccessLevel.PUBLIC)
 	private final String name;
 
-	@Getter
+	@Getter(AccessLevel.PUBLIC)
 	private final String description;
 
 	private final List<String> keywords = new ArrayList<>();
@@ -142,7 +143,6 @@ public class PluginListItem extends JPanel
 						@Nullable ConfigDescriptor configDescriptor, String name, String description, String... tags)
 	{
 		this.configPanel = configPanel;
-		this.configManager = configManager;
 		this.plugin = plugin;
 		this.config = config;
 		this.configDescriptor = configDescriptor;
@@ -184,7 +184,7 @@ public class PluginListItem extends JPanel
 		buttonPanel.add(configButton);
 
 		// add a listener to configButton only if there are config items to show
-		if (config != null && !configDescriptor.getItems().stream().allMatch(item -> item.getItem().hidden()))
+		if (configDescriptor != null && config != null && !configDescriptor.getItems().stream().allMatch(item -> item.getItem().hidden()))
 		{
 			configButton.addActionListener(e ->
 			{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingOverlay.java
index a7bad8d813..7b71bfad11 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingOverlay.java
@@ -32,6 +32,7 @@ import java.text.DecimalFormat;
 import java.time.Instant;
 import java.time.Duration;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import static net.runelite.api.AnimationID.COOKING_FIRE;
 import static net.runelite.api.AnimationID.COOKING_RANGE;
 import net.runelite.api.Client;
@@ -47,6 +48,7 @@ import net.runelite.client.ui.overlay.components.TitleComponent;
 import net.runelite.client.ui.overlay.components.table.TableAlignment;
 import net.runelite.client.ui.overlay.components.table.TableComponent;
 
+@Singleton
 class CookingOverlay extends Overlay
 {
 	private static final int COOK_TIMEOUT = 3;
@@ -58,7 +60,7 @@ class CookingOverlay extends Overlay
 	private final PanelComponent panelComponent = new PanelComponent();
 
 	@Inject
-	private CookingOverlay(Client client, CookingPlugin plugin, XpTrackerService xpTrackerService)
+	private CookingOverlay(final Client client, final CookingPlugin plugin, final XpTrackerService xpTrackerService)
 	{
 		super(plugin);
 		setPosition(OverlayPosition.TOP_LEFT);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingPlugin.java
index 976d81c4a0..96be647e3f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingPlugin.java
@@ -30,14 +30,17 @@ import java.time.Duration;
 import java.time.Instant;
 import java.util.Optional;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Getter;
+import lombok.Setter;
 import net.runelite.api.ChatMessageType;
 import net.runelite.api.Client;
 import net.runelite.api.GraphicID;
 import net.runelite.api.ItemID;
 import net.runelite.api.Player;
 import net.runelite.api.events.ChatMessage;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.GameTick;
 import net.runelite.api.events.SpotAnimationChanged;
 import net.runelite.client.config.ConfigManager;
@@ -55,6 +58,7 @@ import net.runelite.client.ui.overlay.infobox.InfoBoxManager;
 	description = "Show cooking statistics",
 	tags = {"overlay", "skilling", "cook"}
 )
+@Singleton
 @PluginDependency(XpTrackerPlugin.class)
 public class CookingPlugin extends Plugin
 {
@@ -79,6 +83,10 @@ public class CookingPlugin extends Plugin
 	@Getter(AccessLevel.PACKAGE)
 	private CookingSession session;
 
+	private int statTimeout;
+	@Setter(AccessLevel.PACKAGE)
+	private boolean fermentTimer;
+
 	@Provides
 	CookingConfig getConfig(ConfigManager configManager)
 	{
@@ -88,6 +96,7 @@ public class CookingPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
 		session = null;
 		overlayManager.add(overlay);
 	}
@@ -103,12 +112,12 @@ public class CookingPlugin extends Plugin
 	@Subscribe
 	public void onGameTick(GameTick gameTick)
 	{
-		if (session == null || config.statTimeout() == 0)
+		if (session == null || this.statTimeout == 0)
 		{
 			return;
 		}
 
-		Duration statTimeout = Duration.ofMinutes(config.statTimeout());
+		Duration statTimeout = Duration.ofMinutes(this.statTimeout);
 		Duration sinceCut = Duration.between(session.getLastCookingAction(), Instant.now());
 
 		if (sinceCut.compareTo(statTimeout) >= 0)
@@ -127,7 +136,7 @@ public class CookingPlugin extends Plugin
 			return;
 		}
 
-		if (player.getSpotAnimation() == GraphicID.WINE_MAKE && config.fermentTimer())
+		if (player.getSpotAnimation() == GraphicID.WINE_MAKE && this.fermentTimer)
 		{
 			Optional<FermentTimer> fermentTimerOpt = infoBoxManager.getInfoBoxes().stream()
 				.filter(FermentTimer.class::isInstance)
@@ -184,4 +193,19 @@ public class CookingPlugin extends Plugin
 			session.increaseBurnAmount();
 		}
 	}
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged configChanged)
+	{
+		if (configChanged.getGroup().equals("cooking"))
+		{
+			updateConfig();
+		}
+	}
+
+	private void updateConfig()
+	{
+		this.statTimeout = config.statTimeout();
+		this.fermentTimer = config.fermentTimer();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingSession.java b/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingSession.java
index 292e4a3584..14ad6a2722 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingSession.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingSession.java
@@ -26,9 +26,11 @@
 package net.runelite.client.plugins.cooking;
 
 import java.time.Instant;
+import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Getter;
 
+@Singleton
 class CookingSession
 {
 	@Getter(AccessLevel.PACKAGE)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cooking/FermentTimer.java b/runelite-client/src/main/java/net/runelite/client/plugins/cooking/FermentTimer.java
index 5312414ad1..36ef995fa8 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/cooking/FermentTimer.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/cooking/FermentTimer.java
@@ -28,9 +28,11 @@ import java.awt.Color;
 import java.awt.Image;
 import java.time.Duration;
 import java.time.Instant;
+import javax.inject.Singleton;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.ui.overlay.infobox.InfoBox;
 
+@Singleton
 final class FermentTimer extends InfoBox
 {
 	private static final Duration FERMENT_TIME = Duration.ofMillis(13_800);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/corp/CoreOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/corp/CoreOverlay.java
index 29c7dff16a..51eb6a8d88 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/corp/CoreOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/corp/CoreOverlay.java
@@ -29,24 +29,23 @@ import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.awt.Polygon;
 import javax.inject.Inject;
-import net.runelite.api.Client;
+import javax.inject.Singleton;
 import net.runelite.api.NPC;
 import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayUtil;
 
+@Singleton
 class CoreOverlay extends Overlay
 {
-	private final Client client;
 	private final CorpPlugin corpPlugin;
 
 	@Inject
-	private CoreOverlay(Client client, CorpPlugin corpPlugin)
+	private CoreOverlay(final CorpPlugin corpPlugin)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_SCENE);
-		this.client = client;
 		this.corpPlugin = corpPlugin;
 	}
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpDamageOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpDamageOverlay.java
index f76feec525..132075580a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpDamageOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpDamageOverlay.java
@@ -29,6 +29,7 @@ import java.awt.Dimension;
 import java.awt.FontMetrics;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.api.NPC;
@@ -48,16 +49,16 @@ import net.runelite.client.ui.overlay.components.table.TableAlignment;
 import net.runelite.client.ui.overlay.components.table.TableComponent;
 import net.runelite.client.util.ColorUtil;
 
+@Singleton
 class CorpDamageOverlay extends Overlay
 {
 	private final Client client;
 	private final CorpPlugin corpPlugin;
-	private final CorpConfig config;
 
 	private final PanelComponent panelComponent = new PanelComponent();
 
 	@Inject
-	private CorpDamageOverlay(Client client, CorpPlugin corpPlugin, CorpConfig config)
+	private CorpDamageOverlay(final Client client, final CorpPlugin corpPlugin)
 	{
 		super(corpPlugin);
 		setPosition(OverlayPosition.TOP_LEFT);
@@ -65,7 +66,6 @@ class CorpDamageOverlay extends Overlay
 		setPriority(OverlayPriority.LOW);
 		this.client = client;
 		this.corpPlugin = corpPlugin;
-		this.config = config;
 		getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY_CONFIG, OPTION_CONFIGURE, "Corp overlay"));
 	}
 
@@ -122,7 +122,7 @@ class CorpDamageOverlay extends Overlay
 			}
 		}
 
-		if (config.showDamage())
+		if (corpPlugin.isShowDamage())
 		{
 			tableComponent.addRow("Your damage", ColorUtil.prependColorTag(Integer.toString(myDamage), damageForKill > 0 && myDamage >= damageForKill ? Color.GREEN : Color.RED));
 			tableComponent.addRow("Total damage:", Integer.toString(totalDamage));
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpPlugin.java
index 627c9091e8..06bbe2701c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpPlugin.java
@@ -41,6 +41,7 @@ import net.runelite.api.MenuEntry;
 import net.runelite.api.NPC;
 import net.runelite.api.NpcID;
 import net.runelite.api.Varbits;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.GameStateChanged;
 import net.runelite.api.events.HitsplatApplied;
 import net.runelite.api.events.InteractingChanged;
@@ -101,6 +102,10 @@ public class CorpPlugin extends Plugin
 	@Inject
 	private CorpConfig config;
 
+	private boolean leftClickCore;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showDamage;
+
 	@Provides
 	CorpConfig getConfig(ConfigManager configManager)
 	{
@@ -110,6 +115,8 @@ public class CorpPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
+
 		overlayManager.add(corpOverlay);
 		overlayManager.add(coreOverlay);
 	}
@@ -217,7 +224,7 @@ public class CorpPlugin extends Plugin
 		Actor source = interactingChanged.getSource();
 		Actor target = interactingChanged.getTarget();
 
-		if (corp == null || target != corp)
+		if (target != corp)
 		{
 			return;
 		}
@@ -229,7 +236,7 @@ public class CorpPlugin extends Plugin
 	public void onMenuEntryAdded(MenuEntryAdded menuEntryAdded)
 	{
 		if (menuEntryAdded.getType() != NPC_SECTION_ACTION
-			|| !config.leftClickCore() || !menuEntryAdded.getOption().equals(ATTACK))
+			|| !this.leftClickCore || !menuEntryAdded.getOption().equals(ATTACK))
 		{
 			return;
 		}
@@ -248,4 +255,19 @@ public class CorpPlugin extends Plugin
 		menuEntry.setType(NPC_SECTION_ACTION + MENU_ACTION_DEPRIORITIZE_OFFSET);
 		client.setMenuEntries(menuEntries);
 	}
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged configChanged)
+	{
+		if (configChanged.getGroup().equals("corp"))
+		{
+			updateConfig();
+		}
+	}
+
+	private void updateConfig()
+	{
+		this.leftClickCore = config.leftClickCore();
+		this.showDamage = config.showDamage();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxInfoBox.java b/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxInfoBox.java
index 55edc43f39..e69be13521 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxInfoBox.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxInfoBox.java
@@ -32,6 +32,7 @@ import java.awt.Image;
 import java.awt.Rectangle;
 import java.awt.image.BufferedImage;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.NpcID;
 import net.runelite.api.SpriteID;
@@ -47,21 +48,20 @@ import net.runelite.client.ui.overlay.components.table.TableAlignment;
 import net.runelite.client.ui.overlay.components.table.TableComponent;
 import net.runelite.client.util.ColorUtil;
 
+@Singleton
 public class CoxInfoBox extends Overlay
 {
 	private static final Color NOT_ACTIVATED_BACKGROUND_COLOR = new Color(150, 0, 0, 150);
 	private final CoxPlugin plugin;
-	private final CoxConfig config;
 	private final Client client;
 	private final SpriteManager spriteManager;
 	private final PanelComponent prayAgainstPanel = new PanelComponent();
 	private final PanelComponent panelComponent = new PanelComponent();
 
 	@Inject
-	CoxInfoBox(CoxPlugin plugin, CoxConfig config, Client client, SpriteManager spriteManager)
+	CoxInfoBox(CoxPlugin plugin, Client client, SpriteManager spriteManager)
 	{
 		this.plugin = plugin;
-		this.config = config;
 		this.client = client;
 		this.spriteManager = spriteManager;
 		setPosition(OverlayPosition.BOTTOM_RIGHT);
@@ -79,7 +79,7 @@ public class CoxInfoBox extends Overlay
 
 			final PrayAgainst prayAgainst = plugin.getPrayAgainstOlm();
 
-			if (plugin.getPrayAgainstOlm() == null && !config.prayAgainstOlm())
+			if (plugin.getPrayAgainstOlm() == null && !plugin.isConfigPrayAgainstOlm())
 			{
 				return null;
 			}
@@ -105,7 +105,7 @@ public class CoxInfoBox extends Overlay
 				plugin.setPrayAgainstOlm(null);
 			}
 
-			if (config.vangHealth() && plugin.getVanguards() > 0)
+			if (plugin.isVangHealth() && plugin.getVanguards() > 0)
 			{
 				panelComponent.getChildren().add(TitleComponent.builder()
 					.text("Vanguards")
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxOverlay.java
index 4218f092c6..00d60e94ee 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxOverlay.java
@@ -31,9 +31,9 @@ import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.Graphics2D;
 import java.awt.Polygon;
-import java.util.Iterator;
 import java.util.List;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Actor;
 import net.runelite.api.Client;
 import net.runelite.api.NPC;
@@ -50,18 +50,17 @@ import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayPriority;
 import net.runelite.client.ui.overlay.OverlayUtil;
 
+@Singleton
 public class CoxOverlay extends Overlay
 {
 	private final Client client;
 	private final CoxPlugin plugin;
-	private final CoxConfig config;
 
 	@Inject
-	private CoxOverlay(Client client, CoxPlugin plugin, CoxConfig config)
+	private CoxOverlay(final Client client, final CoxPlugin plugin)
 	{
 		this.client = client;
 		this.plugin = plugin;
-		this.config = config;
 		setPosition(OverlayPosition.DYNAMIC);
 		setPriority(OverlayPriority.HIGH);
 		setLayer(OverlayLayer.ABOVE_SCENE);
@@ -72,13 +71,13 @@ public class CoxOverlay extends Overlay
 	{
 		for (WorldPoint point : plugin.getOlm_Heal())
 		{
-			drawTile(graphics, point, config.tpColor(), 2, 150, 50);
+			drawTile(graphics, point, plugin.getTpColor(), 2, 150, 50);
 		}
 
 		for (WorldPoint point : plugin.getOlm_TP())
 		{
 			client.setHintArrow(point);
-			drawTile(graphics, point, config.tpColor(), 2, 150, 50);
+			drawTile(graphics, point, plugin.getTpColor(), 2, 150, 50);
 		}
 
 		if (plugin.inRaid())
@@ -96,14 +95,14 @@ public class CoxOverlay extends Overlay
 					case NpcID.TEKTON_7545:
 					case NpcID.TEKTON_ENRAGED:
 					case NpcID.TEKTON_ENRAGED_7544:
-						if (config.tekton())
+						if (plugin.isTekton())
 						{
 							hitSquares = getHitSquares(npcs.getNpc().getWorldLocation(), npcs.getNpcSize(), 1, false);
 							for (WorldPoint p : hitSquares)
 							{
-								drawTile(graphics, p, config.tektonColor(), 0, 0, 50);
+								drawTile(graphics, p, plugin.getTektonColor(), 0, 0, 50);
 							}
-							if (config.tektonTickCounter())
+							if (plugin.isTektonTickCounter())
 							{
 								ticksLeft = npcs.getTicksUntilAttack();
 								int attackTicksleft = plugin.getTektonAttackTicks();
@@ -119,10 +118,10 @@ public class CoxOverlay extends Overlay
 									}
 									final String ticksLeftStr = String.valueOf(ticksLeft);
 									Point canvasPoint = npcs.getNpc().getCanvasTextLocation(graphics, ticksLeftStr, 0);
-									renderTextLocation(graphics, ticksLeftStr, config.textSize(), config.fontStyle().getFont(), color, canvasPoint);
+									renderTextLocation(graphics, ticksLeftStr, plugin.getTextSize(), plugin.getFontStyle().getFont(), color, canvasPoint);
 								}
 							}
-							if (config.tektonTickCounter())
+							if (plugin.isTektonTickCounter())
 							{
 								final int attackTicksleft = plugin.getTektonAttackTicks();
 								String attacksLeftStr;
@@ -143,7 +142,7 @@ public class CoxOverlay extends Overlay
 									if (npcs.getNpc() != null)
 									{
 										Point canvasPoint = npcs.getNpc().getCanvasTextLocation(graphics, attacksLeftStr, 0);
-										renderTextLocationAbove(graphics, attacksLeftStr, config.textSize(), config.fontStyle().getFont(), attackcolor, canvasPoint);
+										renderTextLocationAbove(graphics, attacksLeftStr, plugin.getTextSize(), plugin.getFontStyle().getFont(), attackcolor, canvasPoint);
 									}
 								}
 							}
@@ -152,12 +151,12 @@ public class CoxOverlay extends Overlay
 					case NpcID.MUTTADILE:
 					case NpcID.MUTTADILE_7562:
 					case NpcID.MUTTADILE_7563:
-						if (config.muttadile())
+						if (plugin.isMuttadile())
 						{
 							hitSquares = getHitSquares(npcs.getNpc().getWorldLocation(), npcs.getNpcSize(), 1, false);
 							for (WorldPoint p : hitSquares)
 							{
-								drawTile(graphics, p, config.muttaColor(), 0, 0, 50);
+								drawTile(graphics, p, plugin.getMuttaColor(), 0, 0, 50);
 							}
 						}
 						break;
@@ -165,15 +164,15 @@ public class CoxOverlay extends Overlay
 					case NpcID.GUARDIAN_7570:
 					case NpcID.GUARDIAN_7571:
 					case NpcID.GUARDIAN_7572:
-						if (config.guardians())
+						if (plugin.isGuardians())
 						{
 							hitSquares = getHitSquares(npcs.getNpc().getWorldLocation(), npcs.getNpcSize(), 2, true);
 							for (WorldPoint p : hitSquares)
 							{
-								drawTile(graphics, p, config.guardColor(), 0, 0, 50);
+								drawTile(graphics, p, plugin.getGuardColor(), 0, 0, 50);
 							}
 						}
-						if (config.guardinTickCounter())
+						if (plugin.isGuardinTickCounter())
 						{
 							ticksLeft = npcs.getTicksUntilAttack();
 							if (ticksLeft > 0)
@@ -188,7 +187,7 @@ public class CoxOverlay extends Overlay
 								}
 								final String ticksLeftStr = String.valueOf(ticksLeft);
 								Point canvasPoint = npcs.getNpc().getCanvasTextLocation(graphics, ticksLeftStr, 0);
-								renderTextLocation(graphics, ticksLeftStr, config.textSize(), config.fontStyle().getFont(), color, canvasPoint);
+								renderTextLocation(graphics, ticksLeftStr, plugin.getTextSize(), plugin.getFontStyle().getFont(), color, canvasPoint);
 							}
 						}
 						break;
@@ -196,7 +195,7 @@ public class CoxOverlay extends Overlay
 					case NpcID.VANGUARD_7527:
 					case NpcID.VANGUARD_7528:
 					case NpcID.VANGUARD_7529:
-						if (config.vangHighlight())
+						if (plugin.isVangHighlight())
 						{
 							OverlayUtil.renderPolygon(graphics, npcs.getNpc().getConvexHull(), npcs.getAttackStyle().getColor());
 						}
@@ -210,10 +209,10 @@ public class CoxOverlay extends Overlay
 				NPC olmHand = plugin.getHand();
 				final String tickStr = String.valueOf(tick);
 				Point canvasPoint = olmHand.getCanvasTextLocation(graphics, tickStr, 50);
-				renderTextLocation(graphics, tickStr, config.textSize(), config.fontStyle().getFont(), Color.GRAY, canvasPoint);
+				renderTextLocation(graphics, tickStr, plugin.getTextSize(), plugin.getFontStyle().getFont(), Color.GRAY, canvasPoint);
 			}
 
-			if (config.timers())
+			if (plugin.isTimers())
 			{
 				if (plugin.getBurnTarget().size() > 0)
 				{
@@ -221,7 +220,7 @@ public class CoxOverlay extends Overlay
 					{
 						final int ticksLeft = plugin.getBurnTicks();
 						String ticksLeftStr = String.valueOf(ticksLeft);
-						Color tickcolor = new Color(255, 255, 255, 255);
+						Color tickcolor;
 						if (ticksLeft >= 0)
 						{
 							if (ticksLeft == 34 ||
@@ -243,7 +242,7 @@ public class CoxOverlay extends Overlay
 								tickcolor = new Color(255, 255, 255, 255);
 							}
 							Point canvasPoint = actor.getCanvasTextLocation(graphics, ticksLeftStr, 0);
-							renderTextLocation(graphics, ticksLeftStr, config.textSize(), config.fontStyle().getFont(), tickcolor, canvasPoint);
+							renderTextLocation(graphics, ticksLeftStr, plugin.getTextSize(), plugin.getFontStyle().getFont(), tickcolor, canvasPoint);
 						}
 					}
 				}
@@ -251,9 +250,9 @@ public class CoxOverlay extends Overlay
 				if (plugin.getAcidTarget() != null)
 				{
 					Actor actor = plugin.getAcidTarget();
-					renderActorOverlay(graphics, actor, config.acidColor(), 2, 100, 10);
+					renderActorOverlay(graphics, actor, plugin.getAcidColor(), 2, 100, 10);
 					final int ticksLeft = plugin.getAcidTicks();
-					Color tickcolor = new Color(255, 255, 255, 255);
+					Color tickcolor;
 					if (ticksLeft > 0)
 					{
 						if (ticksLeft > 1)
@@ -266,12 +265,12 @@ public class CoxOverlay extends Overlay
 						}
 						final String ticksLeftStr = String.valueOf(ticksLeft);
 						Point canvasPoint = actor.getCanvasTextLocation(graphics, ticksLeftStr, 0);
-						renderTextLocation(graphics, ticksLeftStr, config.textSize(), config.fontStyle().getFont(), tickcolor, canvasPoint);
+						renderTextLocation(graphics, ticksLeftStr, plugin.getTextSize(), plugin.getFontStyle().getFont(), tickcolor, canvasPoint);
 					}
 				}
 			}
 
-			if (config.tpOverlay())
+			if (plugin.isTpOverlay())
 			{
 				if (plugin.getTeleportTarget() != null)
 				{
@@ -283,7 +282,7 @@ public class CoxOverlay extends Overlay
 			{
 				NPC boss = plugin.getOlm_NPC();
 
-				if (config.olmTick())
+				if (plugin.isOlmTick())
 				{
 					if (boss != null)
 					{
@@ -329,7 +328,7 @@ public class CoxOverlay extends Overlay
 						}
 						final String combinedStr = cycleStr + ":" + tickStr;
 						Point canvasPoint = boss.getCanvasTextLocation(graphics, combinedStr, 130);
-						renderTextLocation(graphics, combinedStr, config.textSize(), config.fontStyle().getFont(), Color.WHITE, canvasPoint);
+						renderTextLocation(graphics, combinedStr, plugin.getTextSize(), plugin.getFontStyle().getFont(), Color.WHITE, canvasPoint);
 					}
 				}
 			}
@@ -412,7 +411,7 @@ public class CoxOverlay extends Overlay
 			final Point canvasCenterPoint_shadow = new Point(
 				canvasPoint.getX() + 1,
 				canvasPoint.getY() + 1);
-			if (config.shadows())
+			if (plugin.isShadows())
 			{
 				OverlayUtil.renderTextLocation(graphics, canvasCenterPoint_shadow, txtString, Color.BLACK);
 			}
@@ -431,7 +430,7 @@ public class CoxOverlay extends Overlay
 			final Point canvasCenterPoint_shadow = new Point(
 				canvasPoint.getX() + 1,
 				canvasPoint.getY() + 21);
-			if (config.shadows())
+			if (plugin.isShadows())
 			{
 				OverlayUtil.renderTextLocation(graphics, canvasCenterPoint_shadow, txtString, Color.BLACK);
 			}
@@ -445,14 +444,7 @@ public class CoxOverlay extends Overlay
 		List<WorldPoint> big = new WorldArea(npcLoc.getX() - thickness, npcLoc.getY() - thickness, npcSize + (thickness * 2), npcSize + (thickness * 2), npcLoc.getPlane()).toWorldPointList();
 		if (!includeUnder)
 		{
-			for (Iterator<WorldPoint> it = big.iterator(); it.hasNext(); )
-			{
-				WorldPoint p = it.next();
-				if (little.contains(p))
-				{
-					it.remove();
-				}
-			}
+			big.removeIf(little::contains);
 		}
 		return big;
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxPlugin.java
index f5f08b1199..9dc12d080f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxPlugin.java
@@ -28,6 +28,7 @@
 package net.runelite.client.plugins.coxhelper;
 
 import com.google.inject.Provides;
+import java.awt.Color;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -54,6 +55,7 @@ import net.runelite.api.ProjectileID;
 import net.runelite.api.Varbits;
 import net.runelite.api.coords.WorldPoint;
 import net.runelite.api.events.ChatMessage;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.GameTick;
 import net.runelite.api.events.NpcDespawned;
 import net.runelite.api.events.NpcSpawned;
@@ -154,6 +156,47 @@ public class CoxPlugin extends Plugin
 	@Getter(AccessLevel.PACKAGE)
 	private Map<NPC, NPCContainer> npcContainer = new HashMap<>();
 
+	@Getter(AccessLevel.PACKAGE)
+	private boolean muttadile;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean tekton;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean tektonTickCounter;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean guardians;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean guardinTickCounter;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean vangHighlight;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean vangHealth;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean configPrayAgainstOlm;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean timers;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean tpOverlay;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean olmTick;
+	@Getter(AccessLevel.PACKAGE)
+	private Color muttaColor;
+	@Getter(AccessLevel.PACKAGE)
+	private Color guardColor;
+	@Getter(AccessLevel.PACKAGE)
+	private Color tektonColor;
+	@Getter(AccessLevel.PACKAGE)
+	private Color burnColor;
+	@Getter(AccessLevel.PACKAGE)
+	private Color acidColor;
+	@Getter(AccessLevel.PACKAGE)
+	private Color tpColor;
+	@Getter(AccessLevel.PACKAGE)
+	private CoxConfig.FontStyle fontStyle;
+	@Getter(AccessLevel.PACKAGE)
+	private int textSize;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean shadows;
+
 	@Provides
 	CoxConfig getConfig(ConfigManager configManager)
 	{
@@ -163,6 +206,8 @@ public class CoxPlugin extends Plugin
 	@Override
 	protected void startUp()
 	{
+		updateConfig();
+
 		overlayManager.add(coxOverlay);
 		overlayManager.add(coxInfoBox);
 		HandCripple = false;
@@ -650,4 +695,37 @@ public class CoxPlugin extends Plugin
 	{
 		return client.getVar(Varbits.IN_RAID) == 1;
 	}
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged configChanged)
+	{
+		if (configChanged.getGroup().equals("Cox"))
+		{
+			updateConfig();
+		}
+	}
+
+	private void updateConfig()
+	{
+		this.muttadile = config.muttadile();
+		this.tekton = config.tekton();
+		this.tektonTickCounter = config.tektonTickCounter();
+		this.guardians = config.guardians();
+		this.guardinTickCounter = config.guardinTickCounter();
+		this.vangHighlight = config.vangHighlight();
+		this.vangHealth = config.vangHealth();
+		this.configPrayAgainstOlm = config.prayAgainstOlm();
+		this.timers = config.timers();
+		this.tpOverlay = config.tpOverlay();
+		this.olmTick = config.olmTick();
+		this.muttaColor = config.muttaColor();
+		this.guardColor = config.guardColor();
+		this.tektonColor = config.tektonColor();
+		this.burnColor = config.burnColor();
+		this.acidColor = config.acidColor();
+		this.tpColor = config.tpColor();
+		this.fontStyle = config.fontStyle();
+		this.textSize = config.textSize();
+		this.shadows = config.shadows();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/NPCContainer.java b/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/NPCContainer.java
index de33254a5d..6265025058 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/NPCContainer.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/NPCContainer.java
@@ -26,6 +26,7 @@
 package net.runelite.client.plugins.coxhelper;
 
 import java.awt.Color;
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
@@ -36,40 +37,40 @@ import net.runelite.api.NPCDefinition;
 class NPCContainer
 {
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private NPC npc;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private int npcIndex;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private String npcName;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private int npcSize;
 
-	@Setter
-	@Getter
+	@Setter(AccessLevel.PACKAGE)
+	@Getter(AccessLevel.PACKAGE)
 	private int ticksUntilAttack;
 
-	@Setter
-	@Getter
+	@Setter(AccessLevel.PACKAGE)
+	@Getter(AccessLevel.PACKAGE)
 	private int intermissionPeriod;
 
-	@Setter
-	@Getter
+	@Setter(AccessLevel.PACKAGE)
+	@Getter(AccessLevel.PACKAGE)
 	private int npcSpeed;
 
-	@Setter
-	@Getter
+	@Setter(AccessLevel.PACKAGE)
+	@Getter(AccessLevel.PACKAGE)
 	private Actor npcInteracting;
 
-	@Setter
-	@Getter
+	@Setter(AccessLevel.PACKAGE)
+	@Getter(AccessLevel.PACKAGE)
 	private Specials specials;
 
-	@Setter
-	@Getter
+	@Setter(AccessLevel.PACKAGE)
+	@Getter(AccessLevel.PACKAGE)
 	private Attackstyle attackStyle;
 
 
@@ -93,7 +94,7 @@ class NPCContainer
 	}
 
 	@AllArgsConstructor
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	public enum Specials
 	{
 		PORTALS("Portals"),
@@ -106,7 +107,7 @@ class NPCContainer
 	}
 
 	@AllArgsConstructor
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	public enum Attackstyle
 	{
 		MAGE("Mage", Color.CYAN),
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/PrayAgainst.java b/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/PrayAgainst.java
index 2b61b5010e..30942bb461 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/PrayAgainst.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/PrayAgainst.java
@@ -24,12 +24,13 @@
  */
 package net.runelite.client.plugins.coxhelper;
 
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import net.runelite.api.Prayer;
 
 @AllArgsConstructor
-@Getter
+@Getter(AccessLevel.PACKAGE)
 public enum PrayAgainst
 {
 	MELEE(Prayer.PROTECT_FROM_MELEE),
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/crystalmathlabs/CrystalMathLabs.java b/runelite-client/src/main/java/net/runelite/client/plugins/crystalmathlabs/CrystalMathLabs.java
index 155b3bfcc6..77a9ec68b2 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/crystalmathlabs/CrystalMathLabs.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/crystalmathlabs/CrystalMathLabs.java
@@ -27,6 +27,7 @@ package net.runelite.client.plugins.crystalmathlabs;
 import java.io.IOException;
 import java.util.Objects;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
 import net.runelite.api.GameState;
@@ -52,6 +53,7 @@ import okhttp3.Response;
 	enabledByDefault = false
 )
 @Slf4j
+@Singleton
 public class CrystalMathLabs extends Plugin
 {
 	/**
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursor.java b/runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursor.java
index 11a65bccaf..78e34ab41f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursor.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursor.java
@@ -25,6 +25,7 @@
 package net.runelite.client.plugins.customcursor;
 
 import java.awt.image.BufferedImage;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.client.util.ImageUtil;
 
@@ -33,6 +34,7 @@ public enum CustomCursor
 	RS3_GOLD("RS3 Gold", "cursor-rs3-gold.png"),
 	RS3_SILVER("RS3 Silver", "cursor-rs3-silver.png"),
 	DRAGON_DAGGER("Dragon Dagger", "cursor-dragon-dagger.png"),
+	DRAGON_DAGGER_POISON("Dragon Dagger (p)", "cursor-dragon-dagger-p.png"),
 	TROUT("Trout", "cursor-trout.png"),
 	DRAGON_SCIMITAR("Dragon Scimitar", "cursor-dragon-scimitar.png"),
 	ARMADYL_GODSWORD("Armadyl Godsword", "cursor-armadyl-godsword.png"),
@@ -42,10 +44,10 @@ public enum CustomCursor
 	ZAMORAK_GODSWORD("Zamorak Godsword", "cursor-zamorak-godsword.png");
 
 	private final String name;
-	@Getter
+	@Getter(AccessLevel.PUBLIC)
 	private final BufferedImage cursorImage;
 
-	CustomCursor(String name, String icon)
+	CustomCursor(final String name, final String icon)
 	{
 		this.name = name;
 		this.cursorImage = ImageUtil.getResourceStreamFromClass(CustomCursorPlugin.class, icon);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursorPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursorPlugin.java
index 7e0fc4c18e..feb8729740 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursorPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursorPlugin.java
@@ -26,6 +26,7 @@ package net.runelite.client.plugins.customcursor;
 
 import com.google.inject.Provides;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.events.ConfigChanged;
 import net.runelite.client.config.ConfigManager;
 import net.runelite.client.eventbus.Subscribe;
@@ -38,6 +39,7 @@ import net.runelite.client.ui.ClientUI;
 	description = "Replaces your mouse cursor image",
 	enabledByDefault = false
 )
+@Singleton
 public class CustomCursorPlugin extends Plugin
 {
 	@Inject
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/dailytaskindicators/DailyTasksPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/dailytaskindicators/DailyTasksPlugin.java
index 4e9c86df1d..764b93a308 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/dailytaskindicators/DailyTasksPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/dailytaskindicators/DailyTasksPlugin.java
@@ -26,6 +26,8 @@
 
 package net.runelite.client.plugins.dailytaskindicators;
 
+import javax.inject.Singleton;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.vars.AccountType;
 import com.google.inject.Provides;
 import javax.inject.Inject;
@@ -50,6 +52,7 @@ import net.runelite.client.plugins.PluginDescriptor;
 	name = "Daily Task Indicator",
 	description = "Show chat notifications for daily tasks upon login"
 )
+@Singleton
 public class DailyTasksPlugin extends Plugin
 {
 	private static final int ONE_DAY = 86400000;
@@ -80,6 +83,16 @@ public class DailyTasksPlugin extends Plugin
 	private long lastReset;
 	private boolean loggingIn;
 
+	private boolean showHerbBoxes;
+	private boolean showStaves;
+	private boolean showEssence;
+	private boolean showRunes;
+	private boolean showSand;
+	private boolean showFlax;
+	private boolean showBonemeal;
+	private boolean showArrows;
+	private boolean showDynamite;
+
 	@Provides
 	DailyTasksConfig provideConfig(ConfigManager configManager)
 	{
@@ -89,6 +102,8 @@ public class DailyTasksPlugin extends Plugin
 	@Override
 	public void startUp()
 	{
+		updateConfig();
+
 		loggingIn = true;
 	}
 
@@ -120,47 +135,47 @@ public class DailyTasksPlugin extends Plugin
 			lastReset = (long) Math.floor(currentTime / ONE_DAY) * ONE_DAY;
 			loggingIn = false;
 
-			if (config.showHerbBoxes())
+			if (this.showHerbBoxes)
 			{
 				checkHerbBoxes(dailyReset);
 			}
 
-			if (config.showStaves())
+			if (this.showStaves)
 			{
 				checkStaves(dailyReset);
 			}
 
-			if (config.showEssence())
+			if (this.showEssence)
 			{
 				checkEssence(dailyReset);
 			}
 
-			if (config.showRunes())
+			if (this.showRunes)
 			{
 				checkRunes(dailyReset);
 			}
 
-			if (config.showSand())
+			if (this.showSand)
 			{
 				checkSand(dailyReset);
 			}
 
-			if (config.showFlax())
+			if (this.showFlax)
 			{
 				checkFlax(dailyReset);
 			}
 
-			if (config.showBonemeal())
+			if (this.showBonemeal)
 			{
 				checkBonemeal(dailyReset);
 			}
 
-			if (config.showArrows())
+			if (this.showArrows)
 			{
 				checkArrows(dailyReset);
 			}
 
-			if (config.showDynamite())
+			if (this.showDynamite)
 			{
 				checkDynamite(dailyReset);
 			}
@@ -281,4 +296,26 @@ public class DailyTasksPlugin extends Plugin
 				.runeLiteFormattedMessage(message)
 				.build());
 	}
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged configChanged)
+	{
+		if (configChanged.getGroup().equals("dailytaskindicators"))
+		{
+			updateConfig();
+		}
+	}
+
+	private void updateConfig()
+	{
+		this.showHerbBoxes = config.showHerbBoxes();
+		this.showStaves = config.showStaves();
+		this.showEssence = config.showEssence();
+		this.showRunes = config.showRunes();
+		this.showSand = config.showSand();
+		this.showFlax = config.showFlax();
+		this.showBonemeal = config.showBonemeal();
+		this.showArrows = config.showArrows();
+		this.showDynamite = config.showDynamite();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/DeathIndicatorPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/DeathIndicatorPlugin.java
index 34bb399c2f..16d755049b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/DeathIndicatorPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/DeathIndicatorPlugin.java
@@ -32,6 +32,7 @@ import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 import java.util.Set;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
 import net.runelite.api.GameState;
@@ -56,6 +57,7 @@ import net.runelite.client.util.ImageUtil;
 	description = "Show where you last died, and on what world",
 	tags = {"arrow", "hints", "world", "map", "overlay"}
 )
+@Singleton
 @Slf4j
 public class DeathIndicatorPlugin extends Plugin
 {
@@ -110,12 +112,9 @@ public class DeathIndicatorPlugin extends Plugin
 			return;
 		}
 
-		if (config.showDeathHintArrow())
+		if (config.showDeathHintArrow() && !client.hasHintArrow())
 		{
-			if (!client.hasHintArrow())
-			{
-				client.setHintArrow(new WorldPoint(config.deathLocationX(), config.deathLocationY(), config.deathLocationPlane()));
-			}
+			client.setHintArrow(new WorldPoint(config.deathLocationX(), config.deathLocationY(), config.deathLocationPlane()));
 		}
 
 		if (config.showDeathOnWorldMap())
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/defaultworld/DefaultWorldPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/defaultworld/DefaultWorldPlugin.java
index 96d5dfa246..f8a56ffbc6 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/defaultworld/DefaultWorldPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/defaultworld/DefaultWorldPlugin.java
@@ -27,6 +27,7 @@ package net.runelite.client.plugins.defaultworld;
 import com.google.inject.Provides;
 import java.io.IOException;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
 import net.runelite.api.GameState;
@@ -47,6 +48,7 @@ import net.runelite.http.api.worlds.WorldResult;
 	tags = {"home"}
 )
 @Slf4j
+@Singleton
 public class DefaultWorldPlugin extends Plugin
 {
 	@Inject
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaOverlay.java
index bf1154fecc..53b64457eb 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaOverlay.java
@@ -33,6 +33,7 @@ import java.awt.image.BufferedImage;
 import java.util.ArrayList;
 import java.util.List;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.Perspective;
 import net.runelite.api.Point;
@@ -43,6 +44,7 @@ import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 
+@Singleton
 public class DemonicGorillaOverlay extends Overlay
 {
 	private static final Color COLOR_ICON_BACKGROUND = new Color(0, 0, 0, 128);
@@ -51,14 +53,14 @@ public class DemonicGorillaOverlay extends Overlay
 	private static final int OVERLAY_ICON_DISTANCE = 50;
 	private static final int OVERLAY_ICON_MARGIN = 8;
 
-	private Client client;
-	private DemonicGorillaPlugin plugin;
+	private final Client client;
+	private final DemonicGorillaPlugin plugin;
 
 	@Inject
 	private SkillIconManager iconManager;
 
 	@Inject
-	public DemonicGorillaOverlay(Client client, DemonicGorillaPlugin plugin)
+	public DemonicGorillaOverlay(final Client client, final DemonicGorillaPlugin plugin)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_SCENE);
@@ -106,7 +108,10 @@ public class DemonicGorillaOverlay extends Overlay
 					{
 						BufferedImage icon = getIcon(attackStyle);
 						icons.add(icon);
-						totalWidth += icon.getWidth();
+						if (icon != null)
+						{
+							totalWidth += icon.getWidth();
+						}
 					}
 
 					int bgPadding = 4;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaPlugin.java
index 0df801bda5..9b4d7f8a21 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaPlugin.java
@@ -32,6 +32,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.AnimationID;
 import net.runelite.api.Client;
@@ -64,6 +66,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	description = "Count demonic gorilla attacks and display their next possible attack styles",
 	tags = {"combat", "overlay", "pve", "pvm"}
 )
+@Singleton
 public class DemonicGorillaPlugin extends Plugin
 {
 	@Inject
@@ -78,7 +81,7 @@ public class DemonicGorillaPlugin extends Plugin
 	@Inject
 	private ClientThread clientThread;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private Map<NPC, DemonicGorilla> gorillas;
 
 	private List<WorldPoint> recentBoulders;
@@ -145,7 +148,7 @@ public class DemonicGorillaPlugin extends Plugin
 		}
 	}
 
-	public static boolean isNpcGorilla(int npcId)
+	private static boolean isNpcGorilla(int npcId)
 	{
 		return npcId == NpcID.DEMONIC_GORILLA ||
 			npcId == NpcID.DEMONIC_GORILLA_7145 ||
@@ -203,7 +206,8 @@ public class DemonicGorillaPlugin extends Plugin
 		}
 		boolean correctPrayer =
 			target == null || // If player is out of memory, assume prayer was correct
-				attackStyle == protectedStyle;
+				(attackStyle != null &&
+					attackStyle.equals(protectedStyle));
 
 		if (attackStyle == DemonicGorilla.AttackStyle.BOULDER)
 		{
@@ -321,8 +325,11 @@ public class DemonicGorillaPlugin extends Plugin
 						.stream()
 						.filter(x -> x != DemonicGorilla.AttackStyle.MELEE)
 						.collect(Collectors.toList()));
-					checkGorillaAttackStyleSwitch(gorilla, DemonicGorilla.AttackStyle.MELEE,
-						getProtectedStyle(interacting));
+					if (interacting != null)
+					{
+						checkGorillaAttackStyleSwitch(gorilla, DemonicGorilla.AttackStyle.MELEE,
+							getProtectedStyle(interacting));
+					}
 				}
 			}
 			else if (animationId != gorilla.getLastTickAnimation())
@@ -373,8 +380,7 @@ public class DemonicGorillaPlugin extends Plugin
 							else if (mp != null)
 							{
 								WorldArea lastPlayerArea = mp.getLastWorldArea();
-								if (lastPlayerArea != null &&
-									interacting != null && recentBoulders.stream()
+								if (lastPlayerArea != null && recentBoulders.stream()
 									.anyMatch(x -> x.distanceTo(lastPlayerArea) == 0))
 								{
 									// A boulder started falling on the gorillas target,
@@ -425,23 +431,21 @@ public class DemonicGorillaPlugin extends Plugin
 							// Gorillas can't normally walk through other gorillas
 							// or other players
 							final WorldArea area1 = new WorldArea(x, 1, 1);
-							return area1 != null &&
-								gorillas.values().stream().noneMatch(y ->
+							return gorillas.values().stream().noneMatch(y ->
+							{
+								if (y == gorilla)
 								{
-									if (y == gorilla)
-									{
-										return false;
-									}
-									final WorldArea area2 =
-										y.getNpc().getIndex() < gorilla.getNpc().getIndex() ?
-											y.getNpc().getWorldArea() : y.getLastWorldArea();
-									return area2 != null && area1.intersectsWith(area2);
-								}) &&
-								memorizedPlayers.values().stream().noneMatch(y ->
-								{
-									final WorldArea area2 = y.getLastWorldArea();
-									return area2 != null && area1.intersectsWith(area2);
-								});
+									return false;
+								}
+								final WorldArea area2 =
+									y.getNpc().getIndex() < gorilla.getNpc().getIndex() ?
+										y.getNpc().getWorldArea() : y.getLastWorldArea();
+								return area2 != null && area1.intersectsWith(area2);
+							}) && memorizedPlayers.values().stream().noneMatch(y ->
+							{
+								final WorldArea area2 = y.getLastWorldArea();
+								return area2 != null && area1.intersectsWith(area2);
+							});
 
 							// There is a special case where if a player walked through
 							// a gorilla, or a player walked through another player,
@@ -453,9 +457,7 @@ public class DemonicGorillaPlugin extends Plugin
 					{
 						int distance = gorilla.getNpc().getWorldArea().distanceTo(mp.getLastWorldArea());
 						WorldPoint predictedMovement = predictedNewArea.toWorldPoint();
-						if (distance <= DemonicGorilla.MAX_ATTACK_RANGE &&
-							mp != null &&
-							mp.getLastWorldArea().hasLineOfSightTo(client, gorilla.getLastWorldArea()))
+						if (distance <= DemonicGorilla.MAX_ATTACK_RANGE && mp.getLastWorldArea().hasLineOfSightTo(client, gorilla.getLastWorldArea()))
 						{
 							if (predictedMovement.distanceTo(gorilla.getLastWorldArea().toWorldPoint()) != 0)
 							{
@@ -549,8 +551,7 @@ public class DemonicGorillaPlugin extends Plugin
 		{
 			recentBoulders.add(WorldPoint.fromLocal(client, event.getPosition()));
 		}
-		else if (projectileId == ProjectileID.DEMONIC_GORILLA_MAGIC ||
-			projectileId == ProjectileID.DEMONIC_GORILLA_RANGED)
+		else
 		{
 			WorldPoint projectileSourcePosition = WorldPoint.fromLocal(
 				client, projectile.getX1(), projectile.getY1(), client.getPlane());
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/MemorizedPlayer.java b/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/MemorizedPlayer.java
index 7dd0058cd6..262042b7e1 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/MemorizedPlayer.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/MemorizedPlayer.java
@@ -26,25 +26,26 @@ package net.runelite.client.plugins.demonicgorilla;
 
 import java.util.ArrayList;
 import java.util.List;
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
 import net.runelite.api.Hitsplat;
 import net.runelite.api.Player;
 import net.runelite.api.coords.WorldArea;
 
-public class MemorizedPlayer
+class MemorizedPlayer
 {
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private Player player;
 
-	@Getter
-	@Setter
+	@Getter(AccessLevel.PACKAGE)
+	@Setter(AccessLevel.PACKAGE)
 	private WorldArea lastWorldArea;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private List<Hitsplat> recentHitsplats;
 
-	public MemorizedPlayer(Player player)
+	MemorizedPlayer(final Player player)
 	{
 		this.player = player;
 		this.recentHitsplats = new ArrayList<>();
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/PendingGorillaAttack.java b/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/PendingGorillaAttack.java
index 6f3faff8d2..405f889469 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/PendingGorillaAttack.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/PendingGorillaAttack.java
@@ -24,25 +24,25 @@
  */
 package net.runelite.client.plugins.demonicgorilla;
 
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.Player;
 
-public class PendingGorillaAttack
+class PendingGorillaAttack
 {
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private DemonicGorilla attacker;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private DemonicGorilla.AttackStyle attackStyle;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private Player target;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private int finishesOnTick;
 
-	public PendingGorillaAttack(DemonicGorilla attacker, DemonicGorilla.AttackStyle attackStyle,
-								Player target, int finishesOnTick)
+	PendingGorillaAttack(final DemonicGorilla attacker, final DemonicGorilla.AttackStyle attackStyle, final Player target, final int finishesOnTick)
 	{
 		this.attacker = attacker;
 		this.attackStyle = attackStyle;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java
index 08e9df8e5b..42e0a731cd 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsOverlay.java
@@ -160,7 +160,7 @@ class DevToolsOverlay extends Overlay
 
 		for (Player p : players)
 		{
-			if (p != local)
+			if (!p.equals(local))
 			{
 				String text = p.getName() + " (A: " + p.getAnimation() + ") (G: " + p.getSpotAnimation() + ")";
 				OverlayUtil.renderActorOverlay(graphics, p, text, BLUE);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/VarInspector.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/VarInspector.java
index 74e75d23df..bea864d8bc 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/VarInspector.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/VarInspector.java
@@ -86,7 +86,6 @@ class VarInspector extends JFrame
 	private final static int MAX_LOG_ENTRIES = 10_000;
 
 	private final Client client;
-	private final DevToolsPlugin plugin;
 	private final EventBus eventBus;
 
 	private final JPanel tracker = new JPanel();
@@ -104,7 +103,6 @@ class VarInspector extends JFrame
 	{
 		this.eventBus = eventBus;
 		this.client = client;
-		this.plugin = plugin;
 
 		setTitle("RuneLite Var Inspector");
 		setIconImage(ClientUI.ICON);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetInspector.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetInspector.java
index cea9a2b9c1..f622b59677 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetInspector.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetInspector.java
@@ -63,7 +63,6 @@ class WidgetInspector extends JFrame
 	private final ClientThread clientThread;
 	private final DevToolsConfig config;
 	private final DevToolsOverlay overlay;
-	private final DevToolsPlugin plugin;
 
 	private final JTree widgetTree;
 	private final WidgetInfoTableModel infoTableModel;
@@ -86,7 +85,6 @@ class WidgetInspector extends JFrame
 		this.infoTableModel = infoTableModel;
 		this.config = config;
 		this.overlay = overlay;
-		this.plugin = plugin;
 
 		eventBus.register(this);
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java
index 29bce7dc98..ea63fe7136 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java
@@ -29,6 +29,7 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import java.util.List;
 import java.util.Map;
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import net.runelite.api.Client;
@@ -36,7 +37,7 @@ import net.runelite.api.Skill;
 import net.runelite.api.Varbits;
 
 @AllArgsConstructor
-@Getter
+@Getter(AccessLevel.PACKAGE)
 enum DiscordGameEventType
 {
 
@@ -300,7 +301,6 @@ enum DiscordGameEventType
 		this.details = training(skill);
 		this.priority = priority;
 		this.imageKey = imageKeyOf(skill);
-		this.priority = priority;
 		this.shouldTimeout = true;
 	}
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java
index 9d698b2085..cfeff83a8d 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java
@@ -28,6 +28,7 @@ package net.runelite.client.plugins.discord;
 import com.google.common.base.Strings;
 import com.google.inject.Inject;
 import com.google.inject.Provides;
+import com.google.inject.Singleton;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.InputStream;
@@ -37,6 +38,8 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 import javax.imageio.ImageIO;
+import lombok.AccessLevel;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
 import net.runelite.api.GameState;
@@ -80,10 +83,9 @@ import okhttp3.Response;
 	tags = {"action", "activity", "external", "integration", "status"}
 )
 @Slf4j
+@Singleton
 public class DiscordPlugin extends Plugin
 {
-	public static boolean discordEnabled = false;
-
 	@Inject
 	private Client client;
 
@@ -108,10 +110,23 @@ public class DiscordPlugin extends Plugin
 	@Inject
 	private WSClient wsClient;
 
-	private Map<Skill, Integer> skillExp = new HashMap<>();
+	private final Map<Skill, Integer> skillExp = new HashMap<>();
 	private NavigationButton discordButton;
 	private boolean loginFlag;
 
+	@Getter(AccessLevel.PACKAGE)
+	private int actionTimeout;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean hideElapsedTime;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean alwaysShowParty;
+	private boolean showSkillingActivity;
+	private boolean showBossActivity;
+	private boolean showCityActivity;
+	private boolean showDungeonActivity;
+	private boolean showMinigameActivity;
+	private boolean showRaidingActivity;
+
 	@Provides
 	private DiscordConfig provideConfig(ConfigManager configManager)
 	{
@@ -121,6 +136,8 @@ public class DiscordPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
+
 		final BufferedImage icon = ImageUtil.getResourceStreamFromClass(getClass(), "discord.png");
 
 		discordButton = NavigationButton.builder()
@@ -140,7 +157,6 @@ public class DiscordPlugin extends Plugin
 		}
 
 		wsClient.registerMessage(DiscordUserInfo.class);
-		discordEnabled = true;
 	}
 
 	@Override
@@ -150,7 +166,6 @@ public class DiscordPlugin extends Plugin
 		discordState.reset();
 		partyService.changeParty(null);
 		wsClient.unregisterMessage(DiscordUserInfo.class);
-		discordEnabled = false;
 	}
 
 	@Subscribe
@@ -182,6 +197,8 @@ public class DiscordPlugin extends Plugin
 	{
 		if (event.getGroup().equalsIgnoreCase("discord"))
 		{
+			updateConfig();
+
 			checkForGameStateUpdate();
 			checkForAreaUpdate();
 			updatePresence();
@@ -201,7 +218,7 @@ public class DiscordPlugin extends Plugin
 
 		final DiscordGameEventType discordGameEventType = DiscordGameEventType.fromSkill(event.getSkill());
 
-		if (discordGameEventType != null && config.showSkillingActivity())
+		if (discordGameEventType != null && this.showSkillingActivity)
 		{
 			discordState.triggerEvent(discordGameEventType);
 		}
@@ -210,7 +227,7 @@ public class DiscordPlugin extends Plugin
 	@Subscribe
 	public void onVarbitChanged(VarbitChanged event)
 	{
-		if (!config.showRaidingActivity())
+		if (!this.showRaidingActivity)
 		{
 			return;
 		}
@@ -321,17 +338,14 @@ public class DiscordPlugin extends Plugin
 	{
 		final PartyMember localMember = partyService.getLocalMember();
 
-		if (localMember != null)
+		if (localMember != null && discordService.getCurrentUser() != null)
 		{
-			if (discordService.getCurrentUser() != null)
-			{
-				final DiscordUserInfo userInfo = new DiscordUserInfo(
-					discordService.getCurrentUser().userId,
-					discordService.getCurrentUser().avatar);
+			final DiscordUserInfo userInfo = new DiscordUserInfo(
+				discordService.getCurrentUser().userId,
+				discordService.getCurrentUser().avatar);
 
-				userInfo.setMemberId(localMember.getMemberId());
-				wsClient.send(userInfo);
-			}
+			userInfo.setMemberId(localMember.getMemberId());
+			wsClient.send(userInfo);
 		}
 	}
 
@@ -419,15 +433,28 @@ public class DiscordPlugin extends Plugin
 		switch (event.getDiscordAreaType())
 		{
 			case BOSSES:
-				return config.showBossActivity();
+				return this.showBossActivity;
 			case CITIES:
-				return config.showCityActivity();
+				return this.showCityActivity;
 			case DUNGEONS:
-				return config.showDungeonActivity();
+				return this.showDungeonActivity;
 			case MINIGAMES:
-				return config.showMinigameActivity();
+				return this.showMinigameActivity;
 		}
 
 		return false;
 	}
+
+	private void updateConfig()
+	{
+		this.actionTimeout = config.actionTimeout();
+		this.hideElapsedTime = config.hideElapsedTime();
+		this.alwaysShowParty = config.alwaysShowParty();
+		this.showSkillingActivity = config.showSkillingActivity();
+		this.showBossActivity = config.showBossActivity();
+		this.showCityActivity = config.showCityActivity();
+		this.showDungeonActivity = config.showDungeonActivity();
+		this.showMinigameActivity = config.showMinigameActivity();
+		this.showRaidingActivity = config.showRaidingActivity();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordState.java b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordState.java
index c110194187..93c3c1b28c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordState.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordState.java
@@ -46,7 +46,7 @@ import static net.runelite.client.ws.PartyService.PARTY_MAX;
 class DiscordState
 {
 	@Data
-	private class EventWithTime
+	private static class EventWithTime
 	{
 		private final DiscordGameEventType type;
 		private final Instant start;
@@ -56,16 +56,16 @@ class DiscordState
 	private final UUID partyId = UUID.randomUUID();
 	private final List<EventWithTime> events = new ArrayList<>();
 	private final DiscordService discordService;
-	private final DiscordConfig config;
-	private PartyService party;
+	private final DiscordPlugin plugin;
+	private final PartyService party;
 	private final RuneLiteProperties properties;
 	private DiscordPresence lastPresence;
 
 	@Inject
-	private DiscordState(final DiscordService discordService, final DiscordConfig config, final PartyService party, final RuneLiteProperties properties)
+	private DiscordState(final DiscordService discordService, final DiscordPlugin plugin, final PartyService party, final RuneLiteProperties properties)
 	{
 		this.discordService = discordService;
-		this.config = config;
+		this.plugin = plugin;
 		this.party = party;
 		this.properties = properties;
 	}
@@ -97,7 +97,7 @@ class DiscordState
 			.startTimestamp(lastPresence.getStartTimestamp())
 			.smallImageKey(lastPresence.getSmallImageKey())
 			.partyMax(lastPresence.getPartyMax())
-			.partySize(Math.max(config.alwaysShowParty() ? 1 : 0, party.getMembers().size()));
+			.partySize(Math.max(plugin.isAlwaysShowParty() ? 1 : 0, party.getMembers().size()));
 
 		if (party.isOwner())
 		{
@@ -126,7 +126,7 @@ class DiscordState
 		{
 			// If we aren't showing the elapsed time within Discord then
 			// We null out the event start property
-			event = new EventWithTime(eventType, config.hideElapsedTime() ? null : Instant.now());
+			event = new EventWithTime(eventType, plugin.isHideElapsedTime() ? null : Instant.now());
 
 			events.add(event);
 		}
@@ -205,7 +205,7 @@ class DiscordState
 	 */
 	void checkForTimeout()
 	{
-		final Duration actionTimeout = Duration.ofMinutes(config.actionTimeout());
+		final Duration actionTimeout = Duration.ofMinutes(plugin.getActionTimeout());
 		final Instant now = Instant.now();
 		events.removeIf(event -> event.getType().isShouldTimeout() && now.isAfter(event.getUpdated().plus(actionTimeout)));
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/emojis/EmojiPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/emojis/EmojiPlugin.java
index 21eb1eab10..dff53b98c1 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/emojis/EmojiPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/emojis/EmojiPlugin.java
@@ -30,6 +30,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.annotation.Nullable;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import joptsimple.internal.Strings;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
@@ -52,6 +53,7 @@ import net.runelite.client.util.ImageUtil;
 	enabledByDefault = false
 )
 @Slf4j
+@Singleton
 public class EmojiPlugin extends Plugin
 {
 	private static final Pattern TAG_REGEXP = Pattern.compile("<[^>]*>");
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/entityhider/EntityHiderPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/entityhider/EntityHiderPlugin.java
index 73069862cd..72a13d5fe9 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/entityhider/EntityHiderPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/entityhider/EntityHiderPlugin.java
@@ -27,6 +27,7 @@ package net.runelite.client.plugins.entityhider;
 
 import com.google.inject.Provides;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.GameState;
 import net.runelite.api.Player;
@@ -44,6 +45,7 @@ import net.runelite.client.plugins.PluginDescriptor;
 	tags = {"npcs", "players", "projectiles"},
 	enabledByDefault = false
 )
+@Singleton
 public class EntityHiderPlugin extends Plugin
 {
 	@Inject
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorConfig.java
index a43592e5d7..91c7a4b065 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorConfig.java
@@ -29,7 +29,7 @@ import net.runelite.client.config.ConfigGroup;
 import net.runelite.client.config.ConfigItem;
 import net.runelite.client.config.Range;
 
-@ConfigGroup("grounditems")
+@ConfigGroup("equipmentinspector")
 public interface EquipmentInspectorConfig extends Config
 {
 	@ConfigItem(
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPanel.java
index b48a58e153..967d0fb730 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPanel.java
@@ -49,14 +49,14 @@ import net.runelite.client.ui.PluginPanel;
 
 @Slf4j
 @Singleton
-public class EquipmentInspectorPanel extends PluginPanel
+class EquipmentInspectorPanel extends PluginPanel
 {
 	private final static String NO_PLAYER_SELECTED = "No player selected";
 
-	private GridBagConstraints c;
-	private JPanel equipmentPanels;
-	private JPanel header;
-	private JLabel nameLabel;
+	private final GridBagConstraints c;
+	private final JPanel equipmentPanels;
+	private final JPanel header;
+	private final JLabel nameLabel;
 
 	@Inject
 	private ItemManager itemManager;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java
index d85f8127ac..84e784ba48 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java
@@ -37,12 +37,14 @@ import java.util.Optional;
 import java.util.concurrent.ScheduledExecutorService;
 import javax.annotation.Nullable;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import javax.swing.SwingUtilities;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.ChatMessageType;
 import net.runelite.api.Client;
 import net.runelite.api.ItemDefinition;
 import net.runelite.api.Player;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.PlayerMenuOptionClicked;
 import net.runelite.api.kit.KitType;
 import net.runelite.client.chat.ChatColorType;
@@ -66,7 +68,7 @@ import net.runelite.client.util.Text;
 	type = PluginType.PVP,
 	enabledByDefault = false
 )
-
+@Singleton
 @Slf4j
 public class EquipmentInspectorPlugin extends Plugin
 {
@@ -100,6 +102,10 @@ public class EquipmentInspectorPlugin extends Plugin
 	private int Prot3 = 0;
 	private int Prot4 = 0;
 
+	private boolean ShowValue;
+	private int protecteditems;
+	private boolean ExactValue;
+
 	@Provides
 	EquipmentInspectorConfig provideConfig(ConfigManager configManager)
 	{
@@ -109,6 +115,7 @@ public class EquipmentInspectorPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
 
 		equipmentInspectorPanel = injector.getInstance(EquipmentInspectorPanel.class);
 		if (client != null)
@@ -166,10 +173,18 @@ public class EquipmentInspectorPlugin extends Plugin
 				// The player menu uses a non-breaking space in the player name, we need to replace this to compare
 				// against the playerName in the player cache.
 				String finalPlayerName = playerName.replace('\u00A0', ' ');
-				List<Player> players = client.getPlayers();
-				Optional<Player> targetPlayer = players.stream()
-					.filter(Objects::nonNull)
-					.filter(p -> p.getName().equals(finalPlayerName)).findFirst();
+				List<Player> players = null;
+				if (client != null)
+				{
+					players = client.getPlayers();
+				}
+				Optional<Player> targetPlayer = Optional.empty();
+				if (players != null)
+				{
+					targetPlayer = players.stream()
+						.filter(Objects::nonNull)
+						.filter(p -> p.getName().equals(finalPlayerName)).findFirst();
+				}
 
 				if (targetPlayer.isPresent())
 				{
@@ -224,13 +239,13 @@ public class EquipmentInspectorPlugin extends Plugin
 							}
 						}
 					}
-					int IgnoredItems = config.protecteditems();
+					int IgnoredItems = this.protecteditems;
 					if (IgnoredItems != 0 && IgnoredItems != 1 && IgnoredItems != 2 && IgnoredItems != 3)
 					{
 						IgnoredItems = 4;
 
 					}
-					if (config.ShowValue())
+					if (this.ShowValue)
 					{
 						switch (IgnoredItems)
 						{
@@ -255,13 +270,13 @@ public class EquipmentInspectorPlugin extends Plugin
 								break;
 						}
 						String StringPrice = "";
-						if (!config.ExactValue())
+						if (!this.ExactValue)
 						{
 							TotalPrice = TotalPrice / 1000;
 							StringPrice = NumberFormat.getIntegerInstance().format(TotalPrice);
 							StringPrice = StringPrice + 'K';
 						}
-						if (config.ExactValue())
+						if (this.ExactValue)
 						{
 							StringPrice = NumberFormat.getIntegerInstance().format(TotalPrice);
 						}
@@ -281,4 +296,20 @@ public class EquipmentInspectorPlugin extends Plugin
 			});
 		}
 	}
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (event.getGroup().equalsIgnoreCase("equipmentinspector"))
+		{
+			updateConfig();
+		}
+	}
+
+	private void updateConfig()
+	{
+		this.ShowValue = config.ShowValue();
+		this.protecteditems = config.protecteditems();
+		this.ExactValue = config.ExactValue();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/ItemPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/ItemPanel.java
index 20f1c2f9be..684cb8ab31 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/ItemPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/ItemPanel.java
@@ -49,7 +49,7 @@ class ItemPanel extends JPanel
 		JLabel name = new JLabel(item.getName());
 
 		JLabel location = new JLabel(StringUtils.capitalize(kitType.toString().toLowerCase()));
-		location.setFont(FontManager.getRunescapeSmallFont());
+		location.setFont(FontManager.getSmallFont(getFont()));
 
 		JLabel imageLabel = new JLabel();
 		icon.addTo(imageLabel);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/normal.png b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/normal.png
deleted file mode 100644
index 613f95e46d..0000000000
Binary files a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/normal.png and /dev/null differ
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/examine/CacheKey.java b/runelite-client/src/main/java/net/runelite/client/plugins/examine/CacheKey.java
index 8cd0340b69..623aa869e7 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/examine/CacheKey.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/examine/CacheKey.java
@@ -31,7 +31,7 @@ class CacheKey
 	private final ExamineType type;
 	private final int id;
 
-	public CacheKey(ExamineType type, int id)
+	CacheKey(final ExamineType type, final int id)
 	{
 		this.type = type;
 		this.id = id;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java
index ddc21c724b..26e77760a7 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java
@@ -33,6 +33,7 @@ import java.util.Deque;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.regex.Pattern;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.ChatMessageType;
 import net.runelite.api.Client;
@@ -69,6 +70,7 @@ import net.runelite.http.api.osbuddy.OSBGrandExchangeResult;
 	tags = {"npcs", "items", "inventory", "objects"}
 )
 @Slf4j
+@Singleton
 public class ExaminePlugin extends Plugin
 {
 	private static final Pattern X_PATTERN = Pattern.compile("^\\d+ x ");
@@ -352,7 +354,7 @@ public class ExaminePlugin extends Plugin
 				}
 				catch (IOException e)
 				{
-					e.printStackTrace();
+					log.error(e.toString());
 				}
 				message
 					.append(ChatColorType.NORMAL)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropOverlay.java
index cfdd113ef6..ee6ee0f26e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropOverlay.java
@@ -27,6 +27,7 @@ package net.runelite.client.plugins.experiencedrop;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Actor;
 import net.runelite.api.Point;
 import net.runelite.client.ui.overlay.Overlay;
@@ -34,16 +35,15 @@ import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayPriority;
 import net.runelite.client.ui.overlay.OverlayUtil;
 
+@Singleton
 class XpDropOverlay extends Overlay
 {
 	private final XpDropPlugin plugin;
-	private final XpDropConfig config;
 
 	@Inject
-	private XpDropOverlay(XpDropPlugin plugin, XpDropConfig config)
+	private XpDropOverlay(final XpDropPlugin plugin)
 	{
 		this.plugin = plugin;
-		this.config = config;
 		setPosition(OverlayPosition.DYNAMIC);
 		setPriority(OverlayPriority.MED);
 	}
@@ -57,12 +57,12 @@ class XpDropOverlay extends Overlay
 			if (opponent != null)
 			{
 				int offset = opponent.getLogicalHeight() + 50;
-				String damageStr = String.valueOf(this.plugin.getDamage());
+				String damageStr = String.valueOf(plugin.getDamage());
 				Point textLocation = opponent.getCanvasTextLocation(graphics, damageStr, offset);
 
-				if (textLocation != null && this.plugin.getDamage() != 0)
+				if (textLocation != null && plugin.getDamage() != 0)
 				{
-					OverlayUtil.renderTextLocation(graphics, textLocation, damageStr, config.getDamageColor());
+					OverlayUtil.renderTextLocation(graphics, textLocation, damageStr, plugin.getDamageColor());
 				}
 			}
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java
index e6e4aa3811..ce76c45f00 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java
@@ -27,11 +27,13 @@
 package net.runelite.client.plugins.experiencedrop;
 
 import com.google.inject.Provides;
+import java.awt.Color;
 import java.util.Arrays;
 import java.util.EnumMap;
 import java.util.Map;
 import java.util.stream.IntStream;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.Actor;
@@ -65,6 +67,7 @@ import net.runelite.client.util.ColorUtil;
 	description = "Enable customization of the way XP drops are displayed",
 	tags = {"experience", "levels", "tick"}
 )
+@Singleton
 public class XpDropPlugin extends Plugin
 {
 	private static final int XPDROP_PADDING = 2; // space between xp drop icons
@@ -100,10 +103,19 @@ public class XpDropPlugin extends Plugin
 	private boolean hasDropped = false;
 	private boolean correctPrayer;
 	private Skill lastSkill = null;
-	private Map<Skill, Integer> previousSkillExpTable = new EnumMap<>(Skill.class);
+	private final Map<Skill, Integer> previousSkillExpTable = new EnumMap<>(Skill.class);
 	private PrayerType currentTickPrayer;
 	private XpDropConfig.DamageMode damageMode;
 
+	private boolean hideSkillIcons;
+	private Color getMeleePrayerColor;
+	private Color getRangePrayerColor;
+	private Color getMagePrayerColor;
+	private int fakeXpDropDelay;
+	private XpDropConfig.DamageMode showdamagedrops;
+	@Getter(AccessLevel.PACKAGE)
+	private Color damageColor;
+
 	@Provides
 	XpDropConfig provideConfig(ConfigManager configManager)
 	{
@@ -113,6 +125,8 @@ public class XpDropPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
+
 		damageMode = config.showdamagedrops();
 
 		if (damageMode == XpDropConfig.DamageMode.ABOVE_OPPONENT)
@@ -135,10 +149,11 @@ public class XpDropPlugin extends Plugin
 			return;
 		}
 
+		updateConfig();
 
 		if (damageMode != XpDropConfig.DamageMode.ABOVE_OPPONENT)
 		{
-			damageMode = config.showdamagedrops();
+			damageMode = this.showdamagedrops;
 
 			if (damageMode == XpDropConfig.DamageMode.ABOVE_OPPONENT)
 			{
@@ -147,7 +162,7 @@ public class XpDropPlugin extends Plugin
 		}
 		else
 		{
-			damageMode = config.showdamagedrops();
+			damageMode = this.showdamagedrops;
 
 			if (damageMode != XpDropConfig.DamageMode.ABOVE_OPPONENT)
 			{
@@ -180,7 +195,7 @@ public class XpDropPlugin extends Plugin
 			return;
 		}
 
-		if (config.hideSkillIcons())
+		if (this.hideSkillIcons)
 		{
 			if (widget.getSpriteId() > 0)
 			{
@@ -245,21 +260,21 @@ public class XpDropPlugin extends Plugin
 						id == SpriteID.SKILL_ATTACK || id == SpriteID.SKILL_STRENGTH || id == SpriteID.SKILL_DEFENCE
 							|| correctPrayer))
 					{
-						color = config.getMeleePrayerColor().getRGB();
+						color = this.getMeleePrayerColor.getRGB();
 						correctPrayer = true;
 					}
 					break;
 				case RANGE:
 					if (spriteIDs.anyMatch(id -> id == SpriteID.SKILL_RANGED || correctPrayer))
 					{
-						color = config.getRangePrayerColor().getRGB();
+						color = this.getRangePrayerColor.getRGB();
 						correctPrayer = true;
 					}
 					break;
 				case MAGIC:
 					if (spriteIDs.anyMatch(id -> id == SpriteID.SKILL_MAGIC || correctPrayer))
 					{
-						color = config.getMagePrayerColor().getRGB();
+						color = this.getMagePrayerColor.getRGB();
 						correctPrayer = true;
 					}
 					break;
@@ -301,7 +316,7 @@ public class XpDropPlugin extends Plugin
 		currentTickPrayer = getActivePrayerType();
 		correctPrayer = false;
 
-		final int fakeTickDelay = config.fakeXpDropDelay();
+		final int fakeTickDelay = this.fakeXpDropDelay;
 
 		if (fakeTickDelay == 0 || lastSkill == null)
 		{
@@ -343,7 +358,7 @@ public class XpDropPlugin extends Plugin
 	@Subscribe
 	public void onScriptCallbackEvent(ScriptCallbackEvent e)
 	{
-		if (config.showdamagedrops() == XpDropConfig.DamageMode.NONE)
+		if (this.showdamagedrops == XpDropConfig.DamageMode.NONE)
 		{
 			return;
 		}
@@ -386,12 +401,10 @@ public class XpDropPlugin extends Plugin
 			final String[] stringStack = client.getStringStack();
 			final int stringStackSize = client.getStringStackSize();
 
-			StringBuilder builder = new StringBuilder()
-				.append(stringStack[stringStackSize - 1])
-				.append(ColorUtil.colorTag(config.getDamageColor()))
-				.append(" (").append(damage).append(")");
-
-			stringStack[stringStackSize - 1] = builder.toString();
+			String builder = stringStack[stringStackSize - 1] +
+				ColorUtil.colorTag(this.damageColor) +
+				" (" + damage + ")";
+			stringStack[stringStackSize - 1] = builder;
 		}
 	}
 
@@ -430,4 +443,15 @@ public class XpDropPlugin extends Plugin
 		damage = (int) Math.rint(damageDealt / npcManager.getXpModifier(target.getId()));
 		tickShow = 3;
 	}
+
+	private void updateConfig()
+	{
+		this.hideSkillIcons = config.hideSkillIcons();
+		this.getMeleePrayerColor = config.getMeleePrayerColor();
+		this.getRangePrayerColor = config.getRangePrayerColor();
+		this.getMagePrayerColor = config.getMagePrayerColor();
+		this.fakeXpDropDelay = config.fakeXpDropDelay();
+		this.showdamagedrops = config.showdamagedrops();
+		this.damageColor = config.getDamageColor();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fairyring/FairyRingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/fairyring/FairyRingPlugin.java
index b32f7f6c10..ee66d4271f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/fairyring/FairyRingPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/fairyring/FairyRingPlugin.java
@@ -35,6 +35,7 @@ import java.util.Map;
 import java.util.TreeMap;
 import javax.annotation.Nullable;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
@@ -43,6 +44,7 @@ import net.runelite.api.ScriptID;
 import net.runelite.api.SoundEffectID;
 import net.runelite.api.SpriteID;
 import net.runelite.api.Varbits;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.GameTick;
 import net.runelite.api.events.VarbitChanged;
 import net.runelite.api.events.WidgetLoaded;
@@ -66,6 +68,7 @@ import net.runelite.client.util.Text;
 	description = "Show the location of the fairy ring teleport",
 	tags = {"teleportation"}
 )
+@Singleton
 public class FairyRingPlugin extends Plugin
 {
 	private static final String[] leftDial = new String[]{"A", "D", "C", "B"};
@@ -93,6 +96,8 @@ public class FairyRingPlugin extends Plugin
 	private Widget searchBtn;
 	private Collection<CodeWidgets> codes = null;
 
+	private boolean autoOpen;
+
 	@Data
 	private static class CodeWidgets
 	{
@@ -106,6 +111,23 @@ public class FairyRingPlugin extends Plugin
 		private Widget description;
 	}
 
+	@Override
+	protected void startUp() throws Exception
+	{
+		this.autoOpen = config.autoOpen();
+	}
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (!event.getGroup().equals("fairyrings"))
+		{
+			return;
+		}
+
+		this.autoOpen = config.autoOpen();
+	}
+
 	@Provides
 	FairyRingConfig getConfig(ConfigManager configManager)
 	{
@@ -142,7 +164,7 @@ public class FairyRingPlugin extends Plugin
 
 				codes = null;
 
-				if (config.autoOpen())
+				if (this.autoOpen)
 				{
 					openSearch();
 				}
@@ -230,11 +252,10 @@ public class FairyRingPlugin extends Plugin
 			return;
 		}
 
-		if (codes != null)
-		{
+		if (codes != null &&
 			// Check to make sure the list hasn't been rebuild since we were last her
 			// Do this by making sure the list's dynamic children are the same as when we last saw them
-			if (codes.stream().noneMatch(w ->
+			codes.stream().noneMatch(w ->
 			{
 				Widget codeWidget = w.getCode();
 				if (codeWidget == null)
@@ -243,9 +264,8 @@ public class FairyRingPlugin extends Plugin
 				}
 				return list.getChild(codeWidget.getIndex()) == codeWidget;
 			}))
-			{
-				codes = null;
-			}
+		{
+			codes = null;
 		}
 
 		if (codes == null)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPanel.java
index b6eb858b72..622ef7d273 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPanel.java
@@ -41,6 +41,7 @@ import java.time.Instant;
 import java.util.Comparator;
 import java.util.function.Supplier;
 import javax.imageio.ImageIO;
+import javax.inject.Singleton;
 import javax.swing.Box;
 import javax.swing.BoxLayout;
 import javax.swing.ImageIcon;
@@ -66,6 +67,7 @@ import okhttp3.Response;
 import okhttp3.ResponseBody;
 
 @Slf4j
+@Singleton
 class FeedPanel extends PluginPanel
 {
 	private static final ImageIcon RUNELITE_ICON;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPlugin.java
index 8a34a73cf1..59de3a4465 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPlugin.java
@@ -33,6 +33,7 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.events.ConfigChanged;
 import net.runelite.client.config.ConfigManager;
@@ -53,6 +54,7 @@ import net.runelite.http.api.feed.FeedResult;
 	loadWhenOutdated = true
 )
 @Slf4j
+@Singleton
 public class FeedPlugin extends Plugin
 {
 	@Inject
@@ -67,8 +69,8 @@ public class FeedPlugin extends Plugin
 	private FeedPanel feedPanel;
 	private NavigationButton navButton;
 
-	private FeedClient feedClient = new FeedClient();
-	private Supplier<FeedResult> feedSupplier = Suppliers.memoizeWithExpiration(() ->
+	private final FeedClient feedClient = new FeedClient();
+	private final Supplier<FeedResult> feedSupplier = Suppliers.memoizeWithExpiration(() ->
 	{
 		try
 		{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveContainer.java b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveContainer.java
index cc0f1a523c..7b32f5c087 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveContainer.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveContainer.java
@@ -40,7 +40,7 @@ import net.runelite.api.NPCDefinition;
 import net.runelite.api.NpcID;
 import net.runelite.api.Prayer;
 
-@Getter
+@Getter(AccessLevel.PACKAGE)
 class FightCaveContainer
 {
 	private NPC npc;
@@ -50,11 +50,11 @@ class FightCaveContainer
 	private int attackSpeed;
 	private int priority;
 	private ImmutableSet<Integer> animations;
-	@Setter
+	@Setter(AccessLevel.PACKAGE)
 	private int ticksUntilAttack;
-	@Setter
+	@Setter(AccessLevel.PACKAGE)
 	private Actor npcInteracting;
-	@Setter
+	@Setter(AccessLevel.PACKAGE)
 	private AttackStyle attackStyle;
 
 	FightCaveContainer(NPC npc, int attackSpeed)
@@ -97,7 +97,7 @@ class FightCaveContainer
 		TZTOKJAD1(NpcID.TZTOKJAD, AttackStyle.UNKNOWN, ImmutableSet.of(AnimationID.TZTOK_JAD_MAGIC_ATTACK, AnimationID.TZTOK_JAD_RANGE_ATTACK, AnimationID.TZTOK_JAD_MELEE_ATTACK), 0),
 		TZTOKJAD2(NpcID.TZTOKJAD_6506, AttackStyle.UNKNOWN, ImmutableSet.of(AnimationID.TZTOK_JAD_MAGIC_ATTACK, AnimationID.TZTOK_JAD_RANGE_ATTACK, AnimationID.TZTOK_JAD_MELEE_ATTACK), 0);
 
-		private static ImmutableMap<Integer, BossMonsters> idMap;
+		private static final ImmutableMap<Integer, BossMonsters> idMap;
 
 		static
 		{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveOverlay.java
index 68569157d5..8cf64da3f4 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCaveOverlay.java
@@ -32,6 +32,7 @@ import java.awt.Graphics2D;
 import java.awt.Rectangle;
 import java.awt.image.BufferedImage;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.Point;
 import net.runelite.api.Prayer;
@@ -44,19 +45,18 @@ import net.runelite.client.ui.overlay.OverlayPriority;
 import net.runelite.client.ui.overlay.OverlayUtil;
 import net.runelite.client.util.ImageUtil;
 
+@Singleton
 public class FightCaveOverlay extends Overlay
 {
-	private FightCavePlugin plugin;
-	private FightCaveConfig config;
-	private Client client;
-	private SpriteManager spriteManager;
+	private final FightCavePlugin plugin;
+	private final Client client;
+	private final SpriteManager spriteManager;
 
 	@Inject
-	FightCaveOverlay(Client client, FightCavePlugin plugin, FightCaveConfig config, SpriteManager spriteManager)
+	FightCaveOverlay(final Client client, final FightCavePlugin plugin, final SpriteManager spriteManager)
 	{
 		this.client = client;
 		this.plugin = plugin;
-		this.config = config;
 		this.spriteManager = spriteManager;
 		setPosition(OverlayPosition.DYNAMIC);
 		setPriority(OverlayPriority.HIGHEST);
@@ -82,8 +82,8 @@ public class FightCaveOverlay extends Overlay
 			}
 
 			final String ticksLeftStr = String.valueOf(ticksLeft);
-			final int font = config.fontStyle().getFont();
-			final boolean shadows = config.shadows();
+			final int font = plugin.getFontStyle().getFont();
+			final boolean shadows = plugin.isShadows();
 			Color color = (ticksLeft <= 1 ? Color.WHITE : attackStyle.getColor());
 			final Point canvasPoint = npc.getNpc().getCanvasTextLocation(graphics, Integer.toString(ticksLeft), 0);
 
@@ -101,10 +101,10 @@ public class FightCaveOverlay extends Overlay
 				renderImageLocation(graphics, npc.getNpc().getCanvasImageLocation(ImageUtil.resizeImage(pray, 36, 36), 0), pray, 12, 30);
 			}
 
-			OverlayUtil.renderTextLocation(graphics, ticksLeftStr, config.textSize(), font, color, canvasPoint, shadows, 0);
+			OverlayUtil.renderTextLocation(graphics, ticksLeftStr, plugin.getTextSize(), font, color, canvasPoint, shadows, 0);
 		}
 
-		if (config.tickTimersWidget())
+		if (plugin.isTickTimersWidget())
 		{
 
 			if (!plugin.getMageTicks().isEmpty())
@@ -113,7 +113,7 @@ public class FightCaveOverlay extends Overlay
 					Prayer.PROTECT_FROM_MAGIC,
 					plugin.getMageTicks().get(0) == 1 ? Color.WHITE : Color.CYAN,
 					Integer.toString(plugin.getMageTicks().get(0)),
-					config.shadows()
+					plugin.isShadows()
 				);
 			}
 			if (!plugin.getRangedTicks().isEmpty())
@@ -122,7 +122,7 @@ public class FightCaveOverlay extends Overlay
 					Prayer.PROTECT_FROM_MISSILES,
 					plugin.getRangedTicks().get(0) == 1 ? Color.WHITE : Color.GREEN,
 					Integer.toString(plugin.getRangedTicks().get(0)),
-					config.shadows()
+					plugin.isShadows()
 				);
 			}
 			if (!plugin.getMeleeTicks().isEmpty())
@@ -131,7 +131,7 @@ public class FightCaveOverlay extends Overlay
 					Prayer.PROTECT_FROM_MELEE,
 					plugin.getMeleeTicks().get(0) == 1 ? Color.WHITE : Color.RED,
 					Integer.toString(plugin.getMeleeTicks().get(0)),
-					config.shadows()
+					plugin.isShadows()
 				);
 			}
 		}
@@ -146,7 +146,7 @@ public class FightCaveOverlay extends Overlay
 
 			if (bounds != null)
 			{
-				renderTextLocation(graphics, ticks, 16, config.fontStyle().getFont(), color, centerPoint(bounds), shadows);
+				renderTextLocation(graphics, ticks, 16, plugin.getFontStyle().getFont(), color, centerPoint(bounds), shadows);
 			}
 		}
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCavePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCavePlugin.java
index c694aae2f2..2376f09fb6 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCavePlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCavePlugin.java
@@ -35,6 +35,7 @@ import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
@@ -45,6 +46,7 @@ import net.runelite.api.GameState;
 import net.runelite.api.NPC;
 import net.runelite.api.NpcID;
 import net.runelite.api.events.ChatMessage;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.GameStateChanged;
 import net.runelite.api.events.GameTick;
 import net.runelite.api.events.NpcDespawned;
@@ -65,7 +67,7 @@ import org.apache.commons.lang3.ArrayUtils;
 	type = PluginType.PVM,
 	enabledByDefault = false
 )
-
+@Singleton
 @Slf4j
 public class FightCavePlugin extends Plugin
 {
@@ -146,6 +148,18 @@ public class FightCavePlugin extends Plugin
 		return String.format("%dx %s", quantity, monster);
 	}
 
+
+	@Getter(AccessLevel.PACKAGE)
+	private WaveDisplayMode waveDisplay;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean tickTimersWidget;
+	@Getter(AccessLevel.PACKAGE)
+	private FightCaveConfig.FontStyle fontStyle;
+	@Getter(AccessLevel.PACKAGE)
+	private int textSize;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean shadows;
+
 	@Provides
 	FightCaveConfig provideConfig(ConfigManager configManager)
 	{
@@ -155,14 +169,13 @@ public class FightCavePlugin extends Plugin
 	@Override
 	public void startUp()
 	{
-		if (client.getGameState() == GameState.LOGGED_IN)
+		updateConfig();
+
+		if (client.getGameState() == GameState.LOGGED_IN && regionCheck())
 		{
-			if (regionCheck())
-			{
-				validRegion = true;
-				overlayManager.add(waveOverlay);
-				overlayManager.add(fightCaveOverlay);
-			}
+			validRegion = true;
+			overlayManager.add(waveOverlay);
+			overlayManager.add(fightCaveOverlay);
 		}
 	}
 
@@ -174,6 +187,17 @@ public class FightCavePlugin extends Plugin
 		currentWave = -1;
 	}
 
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (!event.getGroup().equals("fightcave"))
+		{
+			return;
+		}
+
+		updateConfig();
+	}
+
 	@Subscribe
 	public void onChatMessage(ChatMessage event)
 	{
@@ -346,4 +370,13 @@ public class FightCavePlugin extends Plugin
 	{
 		return ArrayUtils.contains(client.getMapRegions(), FIGHT_CAVE_REGION);
 	}
+
+	private void updateConfig()
+	{
+		this.waveDisplay = config.waveDisplay();
+		this.tickTimersWidget = config.tickTimersWidget();
+		this.fontStyle = config.fontStyle();
+		this.textSize = config.textSize();
+		this.shadows = config.shadows();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/WaveOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/WaveOverlay.java
index f1d81816f6..12beb81be2 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/WaveOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/WaveOverlay.java
@@ -32,6 +32,7 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.client.ui.ColorScheme;
 import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayPosition;
@@ -40,6 +41,7 @@ import net.runelite.client.ui.overlay.components.TitleComponent;
 import net.runelite.client.ui.overlay.components.table.TableAlignment;
 import net.runelite.client.ui.overlay.components.table.TableComponent;
 
+@Singleton
 class WaveOverlay extends Overlay
 {
 	private static final Color HEADER_COLOR = ColorScheme.BRAND_ORANGE;
@@ -49,7 +51,7 @@ class WaveOverlay extends Overlay
 	private final PanelComponent panelComponent = new PanelComponent();
 
 	@Inject
-	private WaveOverlay(FightCaveConfig config, FightCavePlugin plugin)
+	private WaveOverlay(final FightCaveConfig config, final FightCavePlugin plugin)
 	{
 		this.config = config;
 		this.plugin = plugin;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingOverlay.java
index 78082d052a..24f15c5e42 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingOverlay.java
@@ -28,6 +28,7 @@ import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.api.Skill;
@@ -41,25 +42,24 @@ import net.runelite.client.ui.overlay.components.TitleComponent;
 import net.runelite.client.ui.overlay.components.table.TableAlignment;
 import net.runelite.client.ui.overlay.components.table.TableComponent;
 
+@Singleton
 class FishingOverlay extends Overlay
 {
 	private static final String FISHING_SPOT = "Fishing spot";
 
 	private final Client client;
 	private final FishingPlugin plugin;
-	private final FishingConfig config;
 	private final XpTrackerService xpTrackerService;
 
 	private final PanelComponent panelComponent = new PanelComponent();
 
 	@Inject
-	public FishingOverlay(Client client, FishingPlugin plugin, FishingConfig config, XpTrackerService xpTrackerService)
+	public FishingOverlay(final Client client, final FishingPlugin plugin, final XpTrackerService xpTrackerService)
 	{
 		super(plugin);
 		setPosition(OverlayPosition.TOP_LEFT);
 		this.client = client;
 		this.plugin = plugin;
-		this.config = config;
 		this.xpTrackerService = xpTrackerService;
 		getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY_CONFIG, OPTION_CONFIGURE, "Fishing overlay"));
 	}
@@ -67,7 +67,7 @@ class FishingOverlay extends Overlay
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (!config.showFishingStats() || plugin.getSession().getLastFishCaught() == null)
+		if (!plugin.isShowFishingStats() || plugin.getSession().getLastFishCaught() == null)
 		{
 			return null;
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java
index aa4db54c50..074a4d4858 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java
@@ -50,6 +50,7 @@ import net.runelite.api.NPC;
 import net.runelite.api.Varbits;
 import net.runelite.api.coords.LocalPoint;
 import net.runelite.api.events.ChatMessage;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.GameStateChanged;
 import net.runelite.api.events.GameTick;
 import net.runelite.api.events.InteractingChanged;
@@ -138,9 +139,27 @@ public class FishingPlugin extends Plugin
 		return configManager.getConfig(FishingConfig.class);
 	}
 
+	@Getter(AccessLevel.PACKAGE)
+	private boolean onlyCurrentSpot;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showSpotTiles;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showSpotIcons;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showSpotNames;
+	private int statTimeout;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showFishingStats;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showMinnowOverlay;
+	private boolean trawlerNotification;
+	private boolean trawlerTimer;
+
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
+
 		overlayManager.add(overlay);
 		overlayManager.add(spotOverlay);
 		overlayManager.add(fishingSpotMinimapOverlay);
@@ -161,6 +180,17 @@ public class FishingPlugin extends Plugin
 		trawlerStartTime = null;
 	}
 
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (!event.getGroup().equals("fishing"))
+		{
+			return;
+		}
+
+		updateConfig();
+	}
+
 	@Subscribe
 	public void onGameStateChanged(GameStateChanged gameStateChanged)
 	{
@@ -253,7 +283,7 @@ public class FishingPlugin extends Plugin
 		// Reset fishing session
 		if (session.getLastFishCaught() != null)
 		{
-			final Duration statTimeout = Duration.ofMinutes(config.statTimeout());
+			final Duration statTimeout = Duration.ofMinutes(this.statTimeout);
 			final Duration sinceCaught = Duration.between(session.getLastFishCaught(), Instant.now());
 
 			if (sinceCaught.compareTo(statTimeout) >= 0)
@@ -267,7 +297,7 @@ public class FishingPlugin extends Plugin
 
 		for (NPC npc : fishingSpots)
 		{
-			if (FishingSpot.getSPOTS().get(npc.getId()) == FishingSpot.MINNOW && config.showMinnowOverlay())
+			if (FishingSpot.getSPOTS().get(npc.getId()) == FishingSpot.MINNOW && this.showMinnowOverlay)
 			{
 				final int id = npc.getIndex();
 				final MinnowSpot minnowSpot = minnowSpots.get(id);
@@ -282,7 +312,7 @@ public class FishingPlugin extends Plugin
 			}
 		}
 
-		if (config.trawlerTimer())
+		if (this.trawlerTimer)
 		{
 			updateTrawlerTimer();
 		}
@@ -319,7 +349,7 @@ public class FishingPlugin extends Plugin
 	@Subscribe
 	public void onVarbitChanged(VarbitChanged event)
 	{
-		if (!config.trawlerNotification() || client.getGameState() != GameState.LOGGED_IN)
+		if (!this.trawlerNotification || client.getGameState() != GameState.LOGGED_IN)
 		{
 			return;
 		}
@@ -411,4 +441,17 @@ public class FishingPlugin extends Plugin
 		final LocalPoint cameraPoint = new LocalPoint(client.getCameraX(), client.getCameraY());
 		fishingSpots.sort(Comparator.comparing(npc -> -1 * npc.getLocalLocation().distanceTo(cameraPoint)));
 	}
+
+	private void updateConfig()
+	{
+		this.onlyCurrentSpot = config.onlyCurrentSpot();
+		this.showSpotTiles = config.showSpotTiles();
+		this.showSpotIcons = config.showSpotIcons();
+		this.showSpotNames = config.showSpotNames();
+		this.statTimeout = config.statTimeout();
+		this.showFishingStats = config.showFishingStats();
+		this.showMinnowOverlay = config.showMinnowOverlay();
+		this.trawlerNotification = config.trawlerNotification();
+		this.trawlerTimer = config.trawlerTimer();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSession.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSession.java
index ae1f387747..f5daf21ce6 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSession.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSession.java
@@ -25,12 +25,13 @@
 package net.runelite.client.plugins.fishing;
 
 import java.time.Instant;
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
 
 class FishingSession
 {
-	@Getter
-	@Setter
+	@Getter(AccessLevel.PACKAGE)
+	@Setter(AccessLevel.PACKAGE)
 	private Instant lastFishCaught;
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotMinimapOverlay.java
index c241cd695f..c04ae8426b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotMinimapOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotMinimapOverlay.java
@@ -28,6 +28,7 @@ import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Setter;
 import net.runelite.api.GraphicID;
@@ -37,21 +38,20 @@ import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayUtil;
 
+@Singleton
 class FishingSpotMinimapOverlay extends Overlay
 {
 	private final FishingPlugin plugin;
-	private final FishingConfig config;
 
 	@Setter(AccessLevel.PACKAGE)
 	private boolean hidden;
 
 	@Inject
-	public FishingSpotMinimapOverlay(FishingPlugin plugin, FishingConfig config)
+	public FishingSpotMinimapOverlay(final FishingPlugin plugin)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_WIDGETS);
 		this.plugin = plugin;
-		this.config = config;
 	}
 
 	@Override
@@ -71,7 +71,7 @@ class FishingSpotMinimapOverlay extends Overlay
 				continue;
 			}
 
-			if (config.onlyCurrentSpot() && plugin.getCurrentSpot() != null && plugin.getCurrentSpot() != spot)
+			if (plugin.isOnlyCurrentSpot() && plugin.getCurrentSpot() != null && plugin.getCurrentSpot() != spot)
 			{
 				continue;
 			}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotOverlay.java
index 1b9c27eda0..7f7f058438 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpotOverlay.java
@@ -32,6 +32,7 @@ import java.awt.image.BufferedImage;
 import java.time.Duration;
 import java.time.Instant;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Setter;
 import net.runelite.api.Client;
@@ -48,6 +49,7 @@ import net.runelite.client.ui.overlay.OverlayUtil;
 import net.runelite.client.ui.overlay.components.ProgressPieComponent;
 import net.runelite.client.util.ImageUtil;
 
+@Singleton
 class FishingSpotOverlay extends Overlay
 {
 	private static final Duration MINNOW_MOVE = Duration.ofSeconds(15);
@@ -55,7 +57,6 @@ class FishingSpotOverlay extends Overlay
 	private static final int ONE_TICK_AERIAL_FISHING = 3;
 
 	private final FishingPlugin plugin;
-	private final FishingConfig config;
 	private final Client client;
 	private final ItemManager itemManager;
 
@@ -63,12 +64,11 @@ class FishingSpotOverlay extends Overlay
 	private boolean hidden;
 
 	@Inject
-	private FishingSpotOverlay(FishingPlugin plugin, FishingConfig config, Client client, ItemManager itemManager)
+	private FishingSpotOverlay(final FishingPlugin plugin, final Client client, final ItemManager itemManager)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_SCENE);
 		this.plugin = plugin;
-		this.config = config;
 		this.client = client;
 		this.itemManager = itemManager;
 	}
@@ -90,14 +90,14 @@ class FishingSpotOverlay extends Overlay
 				continue;
 			}
 
-			if (config.onlyCurrentSpot() && plugin.getCurrentSpot() != null && plugin.getCurrentSpot() != spot)
+			if (plugin.isOnlyCurrentSpot() && plugin.getCurrentSpot() != null && plugin.getCurrentSpot() != spot)
 			{
 				continue;
 			}
 
 			Color color = npc.getSpotAnimation() == GraphicID.FLYING_FISH ? Color.RED : Color.CYAN;
 
-			if (spot == FishingSpot.MINNOW && config.showMinnowOverlay())
+			if (spot == FishingSpot.MINNOW && plugin.isShowMinnowOverlay())
 			{
 				MinnowSpot minnowSpot = plugin.getMinnowSpots().get(npc.getIndex());
 				if (minnowSpot != null)
@@ -123,7 +123,7 @@ class FishingSpotOverlay extends Overlay
 				}
 			}
 
-			if (config.showSpotTiles())
+			if (plugin.isShowSpotTiles())
 			{
 				Polygon poly = npc.getCanvasTilePoly();
 
@@ -139,7 +139,7 @@ class FishingSpotOverlay extends Overlay
 				}
 			}
 
-			if (config.showSpotIcons())
+			if (plugin.isShowSpotIcons())
 			{
 				BufferedImage fishImage = itemManager.getImage(spot.getFishSpriteId());
 
@@ -159,7 +159,7 @@ class FishingSpotOverlay extends Overlay
 				}
 			}
 
-			if (config.showSpotNames())
+			if (plugin.isShowSpotNames())
 			{
 				String text = spot.getName();
 				Point textLocation = npc.getCanvasTextLocation(graphics, text, npc.getLogicalHeight() + 40);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoOverlay.java
index 4c145ae303..3ead0d19d9 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoOverlay.java
@@ -33,40 +33,39 @@ import java.awt.Graphics2D;
 import java.awt.Point;
 import java.awt.Rectangle;
 import java.awt.geom.Line2D;
-import java.util.ArrayList;
+import java.util.List;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 
+@Singleton
 public class FlexoOverlay extends Overlay
 {
-	private static Rectangle clickArea;
-
-	ArrayList<Rectangle> clickAreas = new ArrayList<>();
-	ArrayList<Point> clickPoints = new ArrayList<>();
+	@Inject
+	private FlexoPlugin plugin;
 
 	@Inject
-	private FlexoConfig config;
-
-	@Inject
-	public FlexoOverlay(FlexoConfig config)
+	public FlexoOverlay(final FlexoPlugin plugin)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_WIDGETS);
-		this.config = config;
+		this.plugin = plugin;
 	}
 
 
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (config.getDebugNPCs() || config.getDebugGroundItems() || config.getDebugPlayers())
+		if (!plugin.isOverlayEnabled())
 		{
-			if (clickArea != null)
-			{
-				graphics.draw(clickArea);
-			}
+			return null;
+		}
+
+		if (plugin.isDebugNPCs() || plugin.isDebugGroundItems() || plugin.isDebugPlayers())
+		{
+			List<Rectangle> clickAreas = plugin.getClickAreas();
 			if (clickAreas != null)
 			{
 				for (Rectangle clickArea : clickAreas)
@@ -77,6 +76,8 @@ public class FlexoOverlay extends Overlay
 					}
 				}
 			}
+
+			List<Point> clickPoints = plugin.getClickPoints();
 			if (clickPoints != null)
 			{
 				for (Point p : clickPoints)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoPlugin.java
index ed49c53b91..e0e1b57b20 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/flexo/FlexoPlugin.java
@@ -36,10 +36,13 @@ import com.github.joonasvali.naturalmouse.support.SinusoidalDeviationProvider;
 import com.github.joonasvali.naturalmouse.util.FlowTemplates;
 import com.google.inject.Provides;
 import java.awt.AWTException;
+import java.awt.Point;
 import java.awt.Rectangle;
 import java.util.ArrayList;
 import java.util.List;
 import javax.inject.Inject;
+import lombok.AccessLevel;
+import lombok.Getter;
 import net.runelite.api.Client;
 import net.runelite.api.NPC;
 import net.runelite.api.Perspective;
@@ -64,7 +67,8 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	name = "Flexo Config",
 	description = "Customizes the flexo api",
 	tags = {"flexo", "null"},
-	type = PluginType.UTILITY
+	type = PluginType.EXTERNAL,
+	enabledByDefault = false
 )
 
 public class FlexoPlugin extends Plugin
@@ -97,26 +101,52 @@ public class FlexoPlugin extends Plugin
 	@Inject
 	private FlexoOverlay overlay;
 
+	@Inject
+	private FlexoConfig config;
+
 	@Provides
 	FlexoConfig getConfig(ConfigManager configManager)
 	{
 		return configManager.getConfig(FlexoConfig.class);
 	}
 
+	@Getter(AccessLevel.PACKAGE)
+	private boolean overlayEnabled;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean debugNPCs;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean debugPlayers;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean debugGroundItems;
+	private int minDelayAmt;
+	private int getReactionTimeVariation;
+	private int getMouseDragSpeed;
+	private int getOvershoots;
+	private boolean getVariatingFlow;
+	private boolean getSlowStartupFlow;
+	private boolean getSlowStartup2Flow;
+	private boolean getJaggedFlow;
+	private boolean getInterruptedFlow;
+	private boolean getInterruptedFlow2;
+	private boolean getStoppingFlow;
+	private int getDeviationSlope;
+	private String getNoisinessDivider;
+	private int scalingFactor;
+
+	@Getter(AccessLevel.PACKAGE)
+	private List<Rectangle> clickAreas = new ArrayList<>();
+	@Getter(AccessLevel.PACKAGE)
+	private List<Point> clickPoints = new ArrayList<>();
+
 	@Subscribe
 	private void onConfigChanged(ConfigChanged event)
 	{
-		if (event.getKey().compareTo("overlayEnabled") == 0)
+		if (!event.getGroup().equals("flexo") || (!event.getGroup().equals("stretchedmode")) )
 		{
-			if (getConfig(configManager).overlayEnabled())
-			{
-				overlayManager.add(overlay);
-			}
-			else
-			{
-				overlayManager.remove(overlay);
-			}
+			return;
 		}
+
+		updateConfig();
 		updateMouseMotionFactory();
 	}
 
@@ -132,79 +162,67 @@ public class FlexoPlugin extends Plugin
 		{
 			Flexo.clientUI = clientUI;
 		}
-		overlay.clickAreas = new ArrayList<>();
-		overlay.clickPoints = new ArrayList<>();
-		if (getConfig(configManager).getDebugNPCs())
+		this.clickAreas = new ArrayList<>();
+		this.clickPoints = new ArrayList<>();
+		if (this.debugNPCs)
 		{
 			Flexo.isStretched = client.isStretchedEnabled();
-			Flexo.scale = configManager.getConfig(StretchedModeConfig.class).scalingFactor();
+			Flexo.scale = this.scalingFactor;
 			if (flexo != null)
 			{
 				for (NPC npc : client.getNpcs())
 				{
-					if (npc != null)
+					if (npc != null && npc.getConvexHull() != null)
 					{
-						if (npc.getConvexHull() != null)
-						{
-							Rectangle r = FlexoMouse.getClickArea(npc.getConvexHull().getBounds());
-							overlay.clickAreas.add(r);
-							java.awt.Point p = FlexoMouse.getClickPoint(r);
-							overlay.clickPoints.add(p);
-						}
+						Rectangle r = FlexoMouse.getClickArea(npc.getConvexHull().getBounds());
+						this.clickAreas.add(r);
+						java.awt.Point p = FlexoMouse.getClickPoint(r);
+						this.clickPoints.add(p);
 					}
 				}
 			}
 		}
 
-		if (getConfig(configManager).getDebugPlayers())
+		if (this.debugPlayers)
 		{
 			Flexo.isStretched = client.isStretchedEnabled();
-			Flexo.scale = configManager.getConfig(StretchedModeConfig.class).scalingFactor();
+			Flexo.scale = this.scalingFactor;
 			if (flexo != null)
 			{
 				for (Player player : client.getPlayers())
 				{
-					if (player != null)
+					if (player != null && player.getConvexHull() != null)
 					{
-						if (player.getConvexHull() != null)
-						{
-							Rectangle r = FlexoMouse.getClickArea(player.getConvexHull().getBounds());
-							overlay.clickAreas.add(r);
-							java.awt.Point p = FlexoMouse.getClickPoint(r);
-							overlay.clickPoints.add(p);
-						}
+						Rectangle r = FlexoMouse.getClickArea(player.getConvexHull().getBounds());
+						this.clickAreas.add(r);
+						java.awt.Point p = FlexoMouse.getClickPoint(r);
+						this.clickPoints.add(p);
 					}
 				}
 			}
 		}
 
 		// Could still use some improvement
-		if (getConfig(configManager).getDebugGroundItems())
+		if (this.debugGroundItems)
 		{
 			Flexo.isStretched = client.isStretchedEnabled();
-			Flexo.scale = configManager.getConfig(StretchedModeConfig.class).scalingFactor();
+			Flexo.scale = this.scalingFactor;
 
-			if (flexo != null)
+			if (flexo != null && GroundItemsPlugin.getCollectedGroundItems() != null)
 			{
-				if (GroundItemsPlugin.getCollectedGroundItems() != null)
+				for (GroundItem gi : GroundItemsPlugin.getCollectedGroundItems().values())
 				{
-					for (GroundItem gi : GroundItemsPlugin.getCollectedGroundItems().values())
+					if (gi != null)
 					{
-						if (gi != null)
+						LocalPoint lp = LocalPoint.fromWorld(client, gi.getLocation());
+						if (lp != null && Perspective.getCanvasTilePoly(client, lp) != null)
 						{
-							LocalPoint lp = LocalPoint.fromWorld(client, gi.getLocation());
-							if (lp != null)
-							{
-								if (Perspective.getCanvasTilePoly(client, lp) != null)
-								{
-									Rectangle r1 = FlexoMouse.getClickArea(Perspective.getCanvasTilePoly(client, lp).getBounds());
-									Rectangle r2 = FlexoMouse.getClickArea(r1);
-									Rectangle r3 = FlexoMouse.getClickArea(r2);
-									overlay.clickAreas.add(r3);
-									java.awt.Point p = FlexoMouse.getClickPoint(r3);
-									overlay.clickPoints.add(p);
-								}
-							}
+							Rectangle r1 = FlexoMouse.getClickArea(Perspective.getCanvasTilePoly(client, lp).getBounds());
+							Rectangle r2 = FlexoMouse.getClickArea(r1);
+							Rectangle r3 = FlexoMouse.getClickArea(r2);
+							this.clickAreas.add(r3);
+							java.awt.Point p = FlexoMouse.getClickPoint(r3);
+							this.clickPoints.add(p);
 						}
 					}
 				}
@@ -214,7 +232,7 @@ public class FlexoPlugin extends Plugin
 
 	private void updateMouseMotionFactory()
 	{
-		Flexo.minDelay = getConfig(configManager).minDelayAmt();
+		Flexo.minDelay = this.minDelayAmt;
 		MouseMotionFactory factory = new MouseMotionFactory();
 		// TODO:Add Options for various flows to allow more personalization
 		List<Flow> flows = new ArrayList<>();
@@ -222,50 +240,50 @@ public class FlexoPlugin extends Plugin
 		// Always add random
 		flows.add(new Flow(FlowTemplates.random()));
 
-		if (getConfig(configManager).getVariatingFlow())
+		if (this.getVariatingFlow)
 		{
 			flows.add(new Flow(FlowTemplates.variatingFlow()));
 		}
 
-		if (getConfig(configManager).getSlowStartupFlow())
+		if (this.getSlowStartupFlow)
 		{
 			flows.add(new Flow(FlowTemplates.slowStartupFlow()));
 		}
 
-		if (getConfig(configManager).getSlowStartup2Flow())
+		if (this.getSlowStartup2Flow)
 		{
 			flows.add(new Flow(FlowTemplates.slowStartup2Flow()));
 		}
 
-		if (getConfig(configManager).getJaggedFlow())
+		if (this.getJaggedFlow)
 		{
 			flows.add(new Flow(FlowTemplates.jaggedFlow()));
 		}
 
-		if (getConfig(configManager).getInterruptedFlow())
+		if (this.getInterruptedFlow)
 		{
 			flows.add(new Flow(FlowTemplates.interruptedFlow()));
 		}
 
-		if (getConfig(configManager).getInterruptedFlow2())
+		if (this.getInterruptedFlow2)
 		{
 			flows.add(new Flow(FlowTemplates.interruptedFlow2()));
 		}
 
-		if (getConfig(configManager).getStoppingFlow())
+		if (this.getStoppingFlow)
 		{
 			flows.add(new Flow(FlowTemplates.stoppingFlow()));
 		}
 
 		DefaultSpeedManager manager = new DefaultSpeedManager(flows);
 		//TODO:Add options for custom Deviation Provider and Noise Provider
-		factory.setDeviationProvider(new SinusoidalDeviationProvider(getConfig(configManager).getDeviationSlope()));
-		factory.setNoiseProvider(new DefaultNoiseProvider(Double.valueOf(getConfig(configManager).getNoisinessDivider())));
-		factory.getNature().setReactionTimeVariationMs(getConfig(configManager).getReactionTimeVariation());
-		manager.setMouseMovementBaseTimeMs(getConfig(configManager).getMouseDragSpeed());
+		factory.setDeviationProvider(new SinusoidalDeviationProvider(this.getDeviationSlope));
+		factory.setNoiseProvider(new DefaultNoiseProvider(Double.valueOf(this.getNoisinessDivider)));
+		factory.getNature().setReactionTimeVariationMs(this.getReactionTimeVariation);
+		manager.setMouseMovementBaseTimeMs(this.getMouseDragSpeed);
 
 		DefaultOvershootManager overshootManager = (DefaultOvershootManager) factory.getOvershootManager();
-		overshootManager.setOvershoots(getConfig(configManager).getOvershoots());
+		overshootManager.setOvershoots(this.getOvershoots);
 
 		factory.setSpeedManager(manager);
 		Flexo.currentMouseMotionFactory = factory;
@@ -274,6 +292,8 @@ public class FlexoPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
+
 		Flexo.isStretched = client.isStretchedEnabled();
 		overlayManager.add(overlay);
 		updateMouseMotionFactory();
@@ -284,4 +304,26 @@ public class FlexoPlugin extends Plugin
 	{
 		overlayManager.remove(overlay);
 	}
+
+	private void updateConfig()
+	{
+		this.overlayEnabled = config.overlayEnabled();
+		this.debugNPCs = config.getDebugNPCs();
+		this.debugPlayers = config.getDebugPlayers();
+		this.debugGroundItems = config.getDebugGroundItems();
+		this.minDelayAmt = config.minDelayAmt();
+		this.getReactionTimeVariation = config.getReactionTimeVariation();
+		this.getMouseDragSpeed = config.getMouseDragSpeed();
+		this.getOvershoots = config.getOvershoots();
+		this.getVariatingFlow = config.getVariatingFlow();
+		this.getSlowStartupFlow = config.getSlowStartupFlow();
+		this.getSlowStartup2Flow = config.getSlowStartup2Flow();
+		this.getJaggedFlow = config.getJaggedFlow();
+		this.getInterruptedFlow = config.getInterruptedFlow();
+		this.getInterruptedFlow2 = config.getInterruptedFlow2();
+		this.getStoppingFlow = config.getStoppingFlow();
+		this.getDeviationSlope = config.getDeviationSlope();
+		this.getNoisinessDivider = config.getNoisinessDivider();
+		this.scalingFactor = configManager.getConfig(StretchedModeConfig.class).scalingFactor();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingConfig.java
deleted file mode 100644
index 65900900d8..0000000000
--- a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingConfig.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 2018, Fluffeh <berserkfluff@gmail.com>
- * 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.flinching;
-
-import java.awt.Color;
-import net.runelite.client.config.Config;
-import net.runelite.client.config.ConfigGroup;
-import net.runelite.client.config.ConfigItem;
-import net.runelite.client.config.Stub;
-
-@ConfigGroup("flinching")
-public interface FlinchingConfig extends Config
-{
-
-	@ConfigItem(
-		keyName = "flinchStub",
-		name = "Flinch",
-		description = "",
-		position = 1
-	)
-	default Stub flinchStub()
-	{
-		return new Stub();
-	}
-
-	@ConfigItem(
-		position = 2,
-		keyName = "flinchOnHitReceivedDelay",
-		name = "Flinch Hit Received Delay",
-		description = "Slightly longer delay after being attacked milliseconds",
-		parent = "flinchStub"
-	)
-	default int getFlinchAttackedDelay()
-	{
-		return 6600;
-	}
-
-	@ConfigItem(
-		position = 3,
-		keyName = "flinchDelay",
-		name = "Flinch Timer Delay",
-		description = "Shows the appropriate time to attack while flinching milliseconds",
-		parent = "flinchStub"
-	)
-	default int getFlinchDelay()
-	{
-		return 5400;
-	}
-
-	@ConfigItem(
-		keyName = "overlayStub",
-		name = "Overlay",
-		description = "",
-		position = 4
-	)
-	default Stub overlayStub()
-	{
-		return new Stub();
-	}
-
-	@ConfigItem(
-		position = 5,
-		keyName = "flinchOverlaySize",
-		name = "Overlay Diameter",
-		description = "Flinch overlay timer diameter",
-		parent = "overlayStub"
-	)
-	default int getFlinchOverlaySize()
-	{
-		return 30;
-	}
-
-	@ConfigItem(
-		position = 6,
-		keyName = "hexColorFlinch",
-		name = "Overlay Color",
-		description = "Color of flinching timer overlay",
-		parent = "overlayStub"
-	)
-	default Color getFlinchOverlayColor()
-	{
-		return Color.CYAN;
-	}
-
-	@ConfigItem(
-		position = 7,
-		keyName = "flinchResetOnHit",
-		name = "Reset on Hit",
-		description = "Timer resets after every attack from your character"
-	)
-	default boolean getFlinchResetOnHit()
-	{
-		return true;
-	}
-
-	@ConfigItem(
-		position = 8,
-		keyName = "flinchResetOnHitReceived",
-		name = "Reset on Hit Received",
-		description = "Timer resets when your character gets attacked"
-	)
-	default boolean getFlinchResetOnHitReceived()
-	{
-		return true;
-	}
-}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingOverlay.java
deleted file mode 100644
index 1dfbc0bda0..0000000000
--- a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingOverlay.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (c) 2018, Fluffeh <berserkfluff@gmail.com>
- * 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.flinching;
-
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics2D;
-import java.util.Map;
-import javax.inject.Inject;
-import net.runelite.api.Client;
-import net.runelite.api.Perspective;
-import net.runelite.api.Point;
-import net.runelite.api.coords.LocalPoint;
-import net.runelite.api.coords.WorldPoint;
-import net.runelite.client.ui.overlay.Overlay;
-import net.runelite.client.ui.overlay.OverlayLayer;
-import net.runelite.client.ui.overlay.OverlayPosition;
-import net.runelite.client.ui.overlay.components.ProgressPieComponent;
-
-
-public class FlinchingOverlay extends Overlay
-{
-	private final Client client;
-	private final FlinchingPlugin plugin;
-	private final FlinchingConfig config;
-
-	private Color color;
-	private Color borderColor;
-
-	private int overlaySize;
-
-	@Inject
-	FlinchingOverlay(Client client, FlinchingPlugin plugin, FlinchingConfig config)
-	{
-		setPosition(OverlayPosition.DYNAMIC);
-		setLayer(OverlayLayer.ABOVE_SCENE);
-		this.plugin = plugin;
-		this.config = config;
-		this.client = client;
-
-		overlaySize = this.config.getFlinchOverlaySize();
-	}
-
-	@Override
-	public Dimension render(Graphics2D graphics)
-	{
-		drawOverlays(graphics);
-		return null;
-	}
-
-	public void updateConfig()
-	{
-		borderColor = config.getFlinchOverlayColor();
-		color = new Color(borderColor.getRed(), borderColor.getGreen(), borderColor.getBlue(), 100);
-
-		overlaySize = config.getFlinchOverlaySize();
-	}
-
-	private void drawOverlays(Graphics2D graphics)
-	{
-		for (Map.Entry<Integer, FlinchingTarget> entry : plugin.GetTargets().entrySet())
-		{
-			FlinchingTarget target = entry.getValue();
-
-			drawFlinchTimer(graphics, target.worldLocation, target.GetRemainingTimePercent());
-		}
-	}
-
-
-	private void drawFlinchTimer(Graphics2D graphics, WorldPoint targetLocation, double fillAmount)
-	{
-		if (targetLocation.getPlane() != client.getPlane())
-		{
-			return;
-		}
-
-		LocalPoint localLoc = LocalPoint.fromWorld(client, targetLocation);
-		if (localLoc == null)
-		{
-			return;
-		}
-
-		Point loc = Perspective.localToCanvas(client, localLoc, client.getPlane());
-
-		ProgressPieComponent pie = new ProgressPieComponent();
-		pie.setDiameter(overlaySize);
-		pie.setFill(color);
-		pie.setBorderColor(borderColor);
-		pie.setPosition(loc);
-		pie.setProgress(fillAmount);
-		pie.render(graphics);
-	}
-}
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingPlugin.java
deleted file mode 100644
index bbe125e4f7..0000000000
--- a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingPlugin.java
+++ /dev/null
@@ -1,282 +0,0 @@
-/*
- * Copyright (c) 2018, Fluffeh <berserkfluff@gmail.com>
- * 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.flinching;
-
-import com.google.inject.Provides;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import javax.inject.Inject;
-import lombok.extern.slf4j.Slf4j;
-import net.runelite.api.Actor;
-import net.runelite.api.Client;
-import net.runelite.api.GameState;
-import net.runelite.api.NPC;
-import net.runelite.api.Player;
-import net.runelite.api.events.ConfigChanged;
-import net.runelite.api.events.GameStateChanged;
-import net.runelite.api.events.GameTick;
-import net.runelite.api.events.HitsplatApplied;
-import net.runelite.api.events.NpcDespawned;
-import net.runelite.client.config.ConfigManager;
-import net.runelite.client.eventbus.Subscribe;
-import net.runelite.client.plugins.Plugin;
-import net.runelite.client.plugins.PluginDescriptor;
-import net.runelite.client.plugins.PluginType;
-import net.runelite.client.ui.overlay.OverlayManager;
-
-
-@Slf4j
-@PluginDescriptor(
-	name = "Flinching Timer",
-	description = "Time your attacks while flinching",
-	tags = {"overlay", "flinching", "timers", "combat"},
-	type = PluginType.PVM,
-	enabledByDefault = false
-)
-
-public class FlinchingPlugin extends Plugin
-{
-	@Inject
-	private Client client;
-
-	@Inject
-	private OverlayManager overlayManager;
-
-	@Inject
-	private FlinchingConfig config;
-
-	@Inject
-	private FlinchingOverlay overlay;
-
-	private int currentWorld = -1;
-
-	private int currentInteractingId = -1;
-	private final Map<Integer, FlinchingTarget> flinchingTargets = new HashMap<>();
-
-	private boolean resetOnHit = true;
-	private boolean resetOnHitReceived = true;
-
-	@Provides
-	FlinchingConfig provideConfig(ConfigManager configManager)
-	{
-		return configManager.getConfig(FlinchingConfig.class);
-	}
-
-	@Override
-	protected void startUp()
-	{
-		overlayManager.add(overlay);
-
-		overlay.updateConfig();
-		resetOnHit = config.getFlinchResetOnHit();
-		resetOnHitReceived = config.getFlinchResetOnHitReceived();
-
-		ClearTargets();
-	}
-
-	@Override
-	protected void shutDown()
-	{
-		ClearTargets();
-	}
-
-	@Subscribe
-	public void onConfigChanged(ConfigChanged event)
-	{
-		if (event.getGroup().equals("flinching"))
-		{
-			overlay.updateConfig();
-			resetOnHit = config.getFlinchResetOnHit();
-			resetOnHitReceived = config.getFlinchResetOnHitReceived();
-
-			for (Map.Entry<Integer, FlinchingTarget> integerFlinchingTargetEntry : flinchingTargets.entrySet())
-			{
-				FlinchingTarget target = integerFlinchingTargetEntry.getValue();
-				if (target != null)
-				{
-					target.SetDelayTime(config.getFlinchDelay(), config.getFlinchAttackedDelay());
-				}
-			}
-		}
-	}
-
-	@Subscribe
-	public void onGameStateChanged(GameStateChanged event)
-	{
-		if (event.getGameState() == GameState.LOGGED_IN)
-		{
-			if (currentWorld == -1)
-			{
-				currentWorld = client.getWorld();
-			}
-			else if (currentWorld != client.getWorld())
-			{
-				ClearTargets();
-			}
-		}
-	}
-
-	private void ClearTargets()
-	{
-		Iterator<Map.Entry<Integer, FlinchingTarget>> it = flinchingTargets.entrySet().iterator();
-
-		while (it.hasNext())
-		{
-			it.remove();
-		}
-	}
-
-	@Subscribe
-	private void onGameTick(GameTick tick)
-	{
-		if (client.getGameState() == GameState.LOGGED_IN)
-		{
-			return;
-		}
-
-		TickTargets();
-		checkInteracting();
-	}
-
-	@Subscribe
-	public void onHitsplatApplied(HitsplatApplied hitsplatApplied)
-	{
-		Actor actor = hitsplatApplied.getActor();
-
-		if (actor instanceof NPC)
-		{
-			NPC hitTarget = (NPC) actor;
-
-			int hitId = hitTarget.getId();
-			if (hitId == currentInteractingId)
-			{
-				if (!flinchingTargets.containsKey(hitId))
-				{
-					TargetGained(hitTarget);
-				}
-				else
-				{
-					FlinchingTarget currentTarget = flinchingTargets.get(hitId);
-					if (currentTarget != null)
-					{
-						if (resetOnHit)
-						{
-							currentTarget.TargetHit();
-						}
-					}
-				}
-			}
-		}
-		else if (resetOnHitReceived && actor == client.getLocalPlayer())
-		{
-			PlayerHit();
-		}
-	}
-
-	private void checkInteracting()
-	{
-		Player localPlayer = client.getLocalPlayer();
-		Actor interacting = localPlayer.getInteracting();
-
-		if (interacting instanceof NPC)
-		{
-			NPC newTarget = (NPC) interacting;
-			currentInteractingId = newTarget.getId();
-
-			if (newTarget.getHealth() <= 0 || newTarget.isDead())
-			{
-				if (flinchingTargets.containsKey(currentInteractingId))
-				{
-					flinchingTargets.remove(currentInteractingId);
-					currentInteractingId = -1;
-				}
-			}
-		}
-	}
-
-	private void TickTargets()
-	{
-		Iterator<Map.Entry<Integer, FlinchingTarget>> it = flinchingTargets.entrySet().iterator();
-
-		while (it.hasNext())
-		{
-			FlinchingTarget target = it.next().getValue();
-			if (target != null)
-			{
-				target.Tick();
-				if (!target.isActive)
-				{
-					it.remove();
-				}
-			}
-			else
-			{
-				it.remove();
-			}
-		}
-	}
-
-	@Subscribe
-	public void onNpcDespawned(NpcDespawned npcDespawned)
-	{
-		NPC actor = npcDespawned.getNpc();
-
-		int actorId = actor.getId();
-		if (actor.isDead() && flinchingTargets.containsKey(actorId))
-		{
-			TargetLost(actorId);
-		}
-	}
-
-	private void TargetLost(int targetId)
-	{
-		flinchingTargets.remove(targetId);
-	}
-
-	private void TargetGained(NPC _newTarget)
-	{
-		FlinchingTarget newTarget = new FlinchingTarget(_newTarget);
-		newTarget.SetDelayTime(config.getFlinchDelay(), config.getFlinchAttackedDelay());
-		flinchingTargets.put(_newTarget.getId(), newTarget);
-	}
-
-	private void PlayerHit()
-	{
-		for (Map.Entry<Integer, FlinchingTarget> integerFlinchingTargetEntry : flinchingTargets.entrySet())
-		{
-			FlinchingTarget target = integerFlinchingTargetEntry.getValue();
-			if (target != null)
-			{
-				target.PlayerHit();
-			}
-		}
-	}
-
-	Map<Integer, FlinchingTarget> GetTargets()
-	{
-		return (flinchingTargets);
-	}
-}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingTarget.java b/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingTarget.java
deleted file mode 100644
index 24c0aad399..0000000000
--- a/runelite-client/src/main/java/net/runelite/client/plugins/flinching/FlinchingTarget.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (c) 2018, Fluffeh <berserkfluff@gmail.com>
- * 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.flinching;
-
-import java.time.Duration;
-import java.time.Instant;
-import lombok.Getter;
-import net.runelite.api.NPC;
-import net.runelite.api.coords.WorldPoint;
-
-public class FlinchingTarget
-{
-	private int currentDisplayLength = 5400;
-
-	private boolean usingHitDelay = false;
-
-	private int displayLength = 5400;
-	private int displayHitReceivedLength = 6600;
-	private Instant lastAttacked;
-
-	public boolean isActive;
-
-	@Getter
-	private int objectId;
-	private NPC targetObject;
-
-	@Getter
-	public WorldPoint worldLocation;
-
-	FlinchingTarget(NPC target)
-	{
-		isActive = true;
-
-		this.targetObject = target;
-		this.lastAttacked = Instant.now();
-		this.objectId = target.getId();
-		this.worldLocation = target.getWorldLocation();
-	}
-
-	void TargetHit()
-	{
-		boolean shouldHit = true;
-		if (usingHitDelay)
-		{
-			if (GetRemainingTime() > displayLength)
-			{
-				shouldHit = false;
-			}
-		}
-
-		if (shouldHit)
-		{
-			lastAttacked = Instant.now();
-
-			usingHitDelay = false;
-			currentDisplayLength = displayLength;
-		}
-	}
-
-	double GetRemainingTimePercent()
-	{
-		double remainingTime = GetRemainingTime();
-		double timePercent = remainingTime / currentDisplayLength;
-		if (timePercent < 0)
-		{
-			timePercent = 0;
-		}
-		else if (timePercent > 1)
-		{
-			timePercent = 1;
-		}
-
-		return (timePercent);
-	}
-
-	private double GetRemainingTime()
-	{
-		Duration duration = Duration.between(lastAttacked, Instant.now());
-		return ((currentDisplayLength - ((double) duration.toMillis())));
-	}
-
-	void Tick()
-	{
-		if (targetObject == null)
-		{
-			isActive = false;
-		}
-		else
-		{
-			worldLocation = targetObject.getWorldLocation();
-
-			double remainingTime = GetRemainingTime();
-			if (remainingTime <= 0)
-			{
-				isActive = false;
-			}
-		}
-	}
-
-	void SetDelayTime(int delayTime, int delayHitReceivedTime)
-	{
-		displayLength = delayTime;
-		displayHitReceivedLength = delayHitReceivedTime;
-
-		if (usingHitDelay)
-		{
-			currentDisplayLength = displayHitReceivedLength;
-		}
-		else
-		{
-			currentDisplayLength = displayLength;
-		}
-	}
-
-	void PlayerHit()
-	{
-		usingHitDelay = true;
-		currentDisplayLength = displayHitReceivedLength;
-
-		lastAttacked = Instant.now();
-	}
-}
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsDrawListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsDrawListener.java
index 671098a333..b729a4ad9f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsDrawListener.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsDrawListener.java
@@ -54,12 +54,12 @@ public class FpsDrawListener implements Runnable
 
 	// Working set
 	private long lastMillis = 0;
-	private long[] lastDelays = new long[SAMPLE_SIZE];
+	private final long[] lastDelays = new long[SAMPLE_SIZE];
 	private int lastDelayIndex = 0;
 	private long sleepDelay = 0;
 
 	@Inject
-	private FpsDrawListener(FpsConfig config, FpsPlugin plugin)
+	private FpsDrawListener(final FpsConfig config, final FpsPlugin plugin)
 	{
 		this.config = config;
 		this.plugin = plugin;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsOverlay.java
index 110a447966..17afae61b6 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsOverlay.java
@@ -29,6 +29,7 @@ import java.awt.Dimension;
 import java.awt.FontMetrics;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.Point;
 import net.runelite.api.Varbits;
@@ -47,6 +48,7 @@ import net.runelite.client.ui.overlay.OverlayUtil;
  * This locks "FPS:" into one position (the far top right corner of the canvas),
  * along with a locked position for the FPS value.
  */
+@Singleton
 public class FpsOverlay extends Overlay
 {
 	// Local dependencies
@@ -57,7 +59,7 @@ public class FpsOverlay extends Overlay
 	private boolean isFocused = true;
 
 	@Inject
-	private FpsOverlay(FpsPlugin plugin, Client client)
+	private FpsOverlay(final FpsPlugin plugin, final Client client)
 	{
 		this.client = client;
 		this.plugin = plugin;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsPlugin.java
index 2ef788fab8..fb8bffc9d6 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsPlugin.java
@@ -26,6 +26,7 @@ package net.runelite.client.plugins.fps;
 
 import com.google.inject.Inject;
 import com.google.inject.Provides;
+import com.google.inject.Singleton;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -35,6 +36,7 @@ import net.runelite.api.Client;
 import net.runelite.api.GameState;
 import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.FocusChanged;
+import net.runelite.api.events.GameStateChanged;
 import net.runelite.client.config.ConfigManager;
 import net.runelite.client.eventbus.Subscribe;
 import net.runelite.client.plugins.Plugin;
@@ -64,6 +66,7 @@ import net.runelite.client.util.ping.Ping;
 	tags = {"frames", "framerate", "limit", "overlay", "ping"},
 	enabledByDefault = false
 )
+@Singleton
 public class FpsPlugin extends Plugin
 {
 	static final String CONFIG_GROUP_KEY = "fpscontrol";
@@ -91,6 +94,10 @@ public class FpsPlugin extends Plugin
 
 	private final ScheduledExecutorService pingExecutorService = new ExecutorServiceExceptionLogger(Executors.newSingleThreadScheduledExecutor());
 
+	private boolean loaded = false;
+
+	private boolean shutdown;
+
 	@Getter(AccessLevel.PACKAGE)
 	private FpsLimitMode limitMode;
 
@@ -126,6 +133,12 @@ public class FpsPlugin extends Plugin
 		overlay.onFocusChanged(event);
 	}
 
+	@Subscribe
+	public void onGameStateChanged(GameStateChanged event)
+	{
+		shutdown = event.getGameState() != GameState.LOGGED_IN;
+	}
+
 	@Override
 	protected void startUp() throws Exception
 	{
@@ -135,7 +148,13 @@ public class FpsPlugin extends Plugin
 		overlayManager.add(overlay);
 		drawManager.registerEveryFrameListener(drawListener);
 		drawListener.reloadConfig();
-		pingExecutorService.scheduleAtFixedRate(this::getPingToCurrentWorld, 5, 5, TimeUnit.SECONDS);
+		shutdown = client.getGameState() != GameState.LOGGED_IN;
+
+		if (!loaded)
+		{
+			pingExecutorService.scheduleAtFixedRate(this::getPingToCurrentWorld, 5, 5, TimeUnit.SECONDS);
+			loaded = true;
+		}
 	}
 
 	@Override
@@ -143,12 +162,12 @@ public class FpsPlugin extends Plugin
 	{
 		overlayManager.remove(overlay);
 		drawManager.unregisterEveryFrameListener(drawListener);
-		pingExecutorService.shutdown();
+		shutdown = true;
 	}
 
 	private void getPingToCurrentWorld()
 	{
-		if (client.getGameState().equals(GameState.LOGGED_IN) && drawPing)
+		if (!shutdown && drawPing)
 		{
 			ping = Ping.ping(String.format("oldschool%d.runescape.com", client.getWorld() - 300));
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FontStyle.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FontStyle.java
index 47cbd82c69..c9921af410 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FontStyle.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FontStyle.java
@@ -24,10 +24,11 @@
 package net.runelite.client.plugins.freezetimers;
 
 import java.awt.Font;
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
-@Getter
+@Getter(AccessLevel.PACKAGE)
 @AllArgsConstructor
 public enum FontStyle
 {
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeInfo.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeInfo.java
index 233c6710c0..2a5409cd4d 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeInfo.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeInfo.java
@@ -1,5 +1,6 @@
 package net.runelite.client.plugins.freezetimers;
 
+import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;
 import net.runelite.api.Actor;
@@ -8,8 +9,8 @@ import net.runelite.api.coords.LocalPoint;
 @Builder
 class FreezeInfo
 {
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final Actor actor;
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final LocalPoint freezePoint;
 }
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersOverlay.java
index 6842cd111d..b17e2b871e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersOverlay.java
@@ -34,6 +34,7 @@ import java.awt.Graphics2D;
 import java.awt.Polygon;
 import java.awt.image.BufferedImage;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Actor;
 import net.runelite.api.Client;
 import net.runelite.api.GraphicID;
@@ -45,24 +46,22 @@ import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayPriority;
 import net.runelite.client.ui.overlay.OverlayUtil;
 import net.runelite.client.util.ImageUtil;
-
+@Singleton
 public class FreezeTimersOverlay extends Overlay
 {
-	private final FreezeTimersConfig config;
+	private final FreezeTimersPlugin plugin;
 	private final Client client;
 	private final Font timerFont = FontManager.getRunescapeBoldFont().deriveFont(14.0f);
 	private final BufferedImage FREEZE_IMAGE = ImageUtil.getResourceStreamFromClass(getClass(), "freeze.png");
 	private final BufferedImage TB_IMAGE = ImageUtil.getResourceStreamFromClass(getClass(), "teleblock.png");
 	private final BufferedImage VENG_IMAGE = ImageUtil.getResourceStreamFromClass(getClass(), "veng.png");
-	private Timers timers;
-	private boolean lock;
-	private long finishedAtTest;
+	private final Timers timers;
 
 
 	@Inject
-	public FreezeTimersOverlay(FreezeTimersConfig config, Client client, Timers timers)
+	public FreezeTimersOverlay(final FreezeTimersPlugin plugin, final Client client, final Timers timers)
 	{
-		this.config = config;
+		this.plugin = plugin;
 		this.client = client;
 		this.timers = timers;
 		setPriority(OverlayPriority.HIGHEST);
@@ -73,11 +72,11 @@ public class FreezeTimersOverlay extends Overlay
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (config.showPlayers())
+		if (plugin.isShowPlayers())
 		{
 			client.getPlayers().forEach((p) -> renderOverlayFor(graphics, p));
 		}
-		if (config.showNpcs())
+		if (plugin.isShowNpcs())
 		{
 			client.getNpcs().forEach((npc) -> renderOverlayFor(graphics, npc));
 		}
@@ -93,15 +92,15 @@ public class FreezeTimersOverlay extends Overlay
 
 		int overlaysDrawn = 0;
 
-		if (drawFreezeOverlay(g, actor, overlaysDrawn) && config.FreezeTimers())
+		if (drawFreezeOverlay(g, actor, overlaysDrawn) && plugin.isFreezeTimers())
 		{
 			overlaysDrawn++;
 		}
-		if (drawTBOverlay(g, actor, overlaysDrawn) && config.TB())
+		if (drawTBOverlay(g, actor, overlaysDrawn) && plugin.isTB())
 		{
 			overlaysDrawn++;
 		}
-		if (drawVengOverlay(g, actor, overlaysDrawn) && config.Veng())
+		if (drawVengOverlay(g, actor, overlaysDrawn) && plugin.isVeng())
 		{
 			overlaysDrawn++;
 		}
@@ -127,15 +126,15 @@ public class FreezeTimersOverlay extends Overlay
 
 		Point FixedPoint = new Point(poi.getX(), poi.getY());
 
-		if (config.noImage())
+		if (plugin.isNoImage())
 		{
 			if (test > 3)
 			{
-				OverlayUtil.renderTextLocation(g, text, config.textSize(), config.fontStyle().getFont(), Color.WHITE, FixedPoint, false, 0);
+				OverlayUtil.renderTextLocation(g, text, plugin.getTextSize(), plugin.getFontStyle().getFont(), Color.WHITE, FixedPoint, false, 0);
 			}
 			else
 			{
-				OverlayUtil.renderTextLocation(g, text, config.textSize(), config.fontStyle().getFont(), Color.YELLOW, FixedPoint, false, 0);
+				OverlayUtil.renderTextLocation(g, text, plugin.getTextSize(), plugin.getFontStyle().getFont(), Color.YELLOW, FixedPoint, false, 0);
 			}
 		}
 		else
@@ -148,7 +147,7 @@ public class FreezeTimersOverlay extends Overlay
 	private boolean drawTBOverlay(Graphics2D g, Actor actor, int overlaysDrawn)
 	{
 		long currentTick = System.currentTimeMillis();
-		if (!config.TB())
+		if (!plugin.isTB())
 		{
 			return false;
 		}
@@ -167,19 +166,19 @@ public class FreezeTimersOverlay extends Overlay
 		}
 
 		Point FixedPoint = new Point(poi.getX() + 20, poi.getY());
-		if (config.noImage())
+		if (plugin.isNoImage())
 		{
 			if (timers.getTimerEnd(actor, TimerType.FREEZE) <= currentTick)
 			{
-				OverlayUtil.renderTextLocation(g, text, config.textSize(), config.fontStyle().getFont(), Color.CYAN, poi, false, 0);
+				OverlayUtil.renderTextLocation(g, text, plugin.getTextSize(), plugin.getFontStyle().getFont(), Color.CYAN, poi, false, 0);
 			}
 			if (timers.getTimerEnd(actor, TimerType.FREEZE) >= currentTick)
 			{
-				OverlayUtil.renderTextLocation(g, " | " + text, config.textSize(), config.fontStyle().getFont(), Color.CYAN, FixedPoint, false, 0);
+				OverlayUtil.renderTextLocation(g, " | " + text, plugin.getTextSize(), plugin.getFontStyle().getFont(), Color.CYAN, FixedPoint, false, 0);
 			}
 			if (timers.getTimerEnd(actor, TimerType.VENG) >= currentTick)
 			{
-				OverlayUtil.renderTextLocation(g, " | " + text, config.textSize(), config.fontStyle().getFont(), Color.CYAN, FixedPoint, false, 0);
+				OverlayUtil.renderTextLocation(g, " | " + text, plugin.getTextSize(), plugin.getFontStyle().getFont(), Color.CYAN, FixedPoint, false, 0);
 			}
 		}
 		else
@@ -192,7 +191,7 @@ public class FreezeTimersOverlay extends Overlay
 	private boolean drawVengOverlay(Graphics2D g, Actor actor, int overlaysDrawn)
 	{
 		long currentTick = System.currentTimeMillis();
-		if (!config.Veng())
+		if (!plugin.isVeng())
 		{
 			return false;
 		}
@@ -211,19 +210,19 @@ public class FreezeTimersOverlay extends Overlay
 		}
 
 		Point FixedPoint = new Point(poi.getX() - 20, poi.getY());
-		if (config.noImage())
+		if (plugin.isNoImage())
 		{
 			if (timers.getTimerEnd(actor, TimerType.FREEZE) <= currentTick)
 			{
-				OverlayUtil.renderTextLocation(g, text, config.textSize(), config.fontStyle().getFont(), Color.RED, poi, false, 0);
+				OverlayUtil.renderTextLocation(g, text, plugin.getTextSize(), plugin.getFontStyle().getFont(), Color.RED, poi, false, 0);
 			}
 			if (timers.getTimerEnd(actor, TimerType.FREEZE) >= currentTick)
 			{
-				OverlayUtil.renderTextLocation(g, text + " | ", config.textSize(), config.fontStyle().getFont(), Color.RED, FixedPoint, false, 0);
+				OverlayUtil.renderTextLocation(g, text + " | ", plugin.getTextSize(), plugin.getFontStyle().getFont(), Color.RED, FixedPoint, false, 0);
 			}
 			if (timers.getTimerEnd(actor, TimerType.TELEBLOCK) >= currentTick)
 			{
-				OverlayUtil.renderTextLocation(g, text + " | ", config.textSize(), config.fontStyle().getFont(), Color.RED, FixedPoint, false, 0);
+				OverlayUtil.renderTextLocation(g, text + " | ", plugin.getTextSize(), plugin.getFontStyle().getFont(), Color.RED, FixedPoint, false, 0);
 			}
 		}
 		else
@@ -253,12 +252,12 @@ public class FreezeTimersOverlay extends Overlay
 		int yOffset = (overlaysDrawn * 18);
 		g.setFont(timerFont);
 		g.setColor(WHITE);
-		int xOffset = config.offset();
+		int xOffset = plugin.getOffset();
 		renderActorTextAndImage(g, actor, text, Color.WHITE, image, yOffset,
 			xOffset);
 	}
 
-	public void renderImageLocation(Graphics2D graphics, Point imgLoc, BufferedImage image)
+	private void renderImageLocation(Graphics2D graphics, Point imgLoc, BufferedImage image)
 	{
 		int x = imgLoc.getX();
 		int y = imgLoc.getY();
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersPlugin.java
index e66279aa4d..3a19f7be49 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersPlugin.java
@@ -28,9 +28,13 @@ import com.google.inject.Provides;
 import java.util.HashMap;
 import java.util.Map;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
+import lombok.Getter;
 import net.runelite.api.Actor;
 import net.runelite.api.Client;
 import net.runelite.api.Player;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.GameTick;
 import net.runelite.api.events.SpotAnimationChanged;
 import net.runelite.api.events.PlayerDespawned;
@@ -48,11 +52,10 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	type = PluginType.PVP,
 	enabledByDefault = false
 )
-
+@Singleton
 public class FreezeTimersPlugin extends Plugin
 {
 	private final Map<String, FreezeInfo> freezes = new HashMap<>();
-	private Actor player;
 
 	@Inject
 	private Client client;
@@ -69,8 +72,31 @@ public class FreezeTimersPlugin extends Plugin
 	@Inject
 	private FreezeTimersOverlay overlay;
 
+	@Inject
+	private FreezeTimersConfig config;
+
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showPlayers;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showNpcs;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean FreezeTimers;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean TB;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean Veng;
+	@Getter(AccessLevel.PACKAGE)
+	private int offset;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean noImage;
+	@Getter(AccessLevel.PACKAGE)
+	private FontStyle fontStyle;
+	@Getter(AccessLevel.PACKAGE)
+	private int textSize;
+
 	public void startUp()
 	{
+		updateConfig();
 		overlayManager.add(overlay);
 	}
 
@@ -136,9 +162,31 @@ public class FreezeTimersPlugin extends Plugin
 		this.remove(player);
 	}
 
-	public void remove(Actor actor)
+	private void remove(Actor actor)
 	{
 		freezes.remove(actor.getName());
 	}
 
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (event.getGroup().equals("freezetimers"))
+		{
+			updateConfig();
+		}
+	}
+
+	private void updateConfig()
+	{
+		this.showPlayers = config.showPlayers();
+		this.showNpcs = config.showNpcs();
+		this.FreezeTimers = config.FreezeTimers();
+		this.TB = config.TB();
+		this.Veng = config.Veng();
+		this.offset = config.offset();
+		this.noImage = config.noImage();
+		this.fontStyle = config.fontStyle();
+		this.textSize = config.textSize();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/PlayerSpellEffect.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/PlayerSpellEffect.java
index 7c8fbf80ce..bc95d19900 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/PlayerSpellEffect.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/PlayerSpellEffect.java
@@ -24,6 +24,7 @@
  */
 package net.runelite.client.plugins.freezetimers;
 
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -42,20 +43,20 @@ public enum PlayerSpellEffect
 	VENG_OTHER("Vengeance Other", 725, 30000, false, 9, TimerType.VENG),
 	NONE("Nothing", -69, 420, true, 9999, TimerType.THIS_SHIT_BROKE);
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final String name;
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final int spotAnimId;
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final int timerLengthTicks;
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private boolean halvable;
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final int spriteIdx;
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final TimerType type;
 
-	public static PlayerSpellEffect getFromSpotAnim(int spotAnim)
+	static PlayerSpellEffect getFromSpotAnim(int spotAnim)
 	{
 		for (PlayerSpellEffect effect : values())
 		{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/PrayerTracker.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/PrayerTracker.java
index 475cff14ad..38f236567c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/PrayerTracker.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/PrayerTracker.java
@@ -24,6 +24,7 @@
 package net.runelite.client.plugins.freezetimers;
 
 import java.util.HashMap;
+import java.util.Map;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
@@ -34,14 +35,14 @@ import net.runelite.api.Player;
 
 @Slf4j
 @Singleton
-public class PrayerTracker
+class PrayerTracker
 {
 
 	@Inject
 	private Client client;
 
-	private HashMap<Actor, HashMap<String, Integer>> lastTick = new HashMap<>();
-	private HashMap<Actor, HashMap<String, Integer>> newTick = new HashMap<>();
+	private final Map<Actor, HashMap<String, Integer>> lastTick = new HashMap<>();
+	private final Map<Actor, HashMap<String, Integer>> newTick = new HashMap<>();
 
 	public void gameTick()
 	{
@@ -71,12 +72,12 @@ public class PrayerTracker
 		newTick.get(actor).put("SpotAnim", actor.getSpotAnimation());
 	}
 
-	public int getPrayerIconLastTick(Actor p)
+	int getPrayerIconLastTick(Actor p)
 	{
 		return lastTick.getOrDefault(p, new HashMap<>()).getOrDefault("PrayerIcon", -1337);
 	}
 
-	public int getSpotanimLastTick(Actor p)
+	int getSpotanimLastTick(Actor p)
 	{
 		return lastTick.getOrDefault(p, new HashMap<>()).getOrDefault("SpotAnim", -1337);
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/Timers.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/Timers.java
index c74ab74c3d..3a61e5ed2d 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/Timers.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/Timers.java
@@ -24,28 +24,23 @@
 package net.runelite.client.plugins.freezetimers;
 
 import java.util.HashMap;
-import javax.inject.Inject;
+import java.util.Map;
 import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Actor;
-import net.runelite.api.Client;
 
 @Slf4j
 @Singleton
-public class Timers
+class Timers
 {
+	private final Map<Actor, HashMap<TimerType, Long>> timerMap = new HashMap<>();
 
-	@Inject
-	private Client client;
-
-	private HashMap<Actor, HashMap<TimerType, Long>> timerMap = new HashMap<>();
-
-	public void gameTick()
+	void gameTick()
 	{
 
 	}
 
-	public void setTimerEnd(Actor actor, TimerType type, long n)
+	void setTimerEnd(Actor actor, TimerType type, long n)
 	{
 		if (!timerMap.containsKey(actor))
 		{
@@ -54,7 +49,7 @@ public class Timers
 		timerMap.get(actor).put(type, n);
 	}
 
-	public long getTimerEnd(Actor actor, TimerType type)
+	long getTimerEnd(Actor actor, TimerType type)
 	{
 		if (!timerMap.containsKey(actor))
 		{
@@ -63,7 +58,7 @@ public class Timers
 		return timerMap.get(actor).getOrDefault(type, (long) 0);
 	}
 
-	public boolean areAllTimersZero(Actor actor)
+	boolean areAllTimersZero(Actor actor)
 	{
 		for (TimerType type : TimerType.values())
 		{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/friendlist/FriendListPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/friendlist/FriendListPlugin.java
index 355d9db46a..b98b68d7eb 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/friendlist/FriendListPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/friendlist/FriendListPlugin.java
@@ -26,6 +26,7 @@
 package net.runelite.client.plugins.friendlist;
 
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.VarPlayer;
 import net.runelite.api.events.GameTick;
@@ -39,6 +40,7 @@ import net.runelite.client.plugins.PluginDescriptor;
 	name = "Friend List",
 	description = "Add extra information to the friend and ignore lists"
 )
+@Singleton
 public class FriendListPlugin extends Plugin
 {
 	private static final int MAX_FRIENDS_P2P = 400;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNoteOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNoteOverlay.java
index 554a823573..acac979de6 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNoteOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNoteOverlay.java
@@ -30,11 +30,13 @@ package net.runelite.client.plugins.friendnotes;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.tooltip.Tooltip;
 import net.runelite.client.ui.overlay.tooltip.TooltipManager;
 
+@Singleton
 class FriendNoteOverlay extends Overlay
 {
 	private final Client client;
@@ -42,7 +44,7 @@ class FriendNoteOverlay extends Overlay
 	private final TooltipManager tooltipManager;
 
 	@Inject
-	private FriendNoteOverlay(Client client, FriendNotesPlugin plugin, TooltipManager tooltipManager)
+	private FriendNoteOverlay(final Client client, final FriendNotesPlugin plugin, final TooltipManager tooltipManager)
 	{
 		this.client = client;
 		this.plugin = plugin;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java
index fe27938a7e..caefd58452 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java
@@ -32,6 +32,7 @@ import com.google.common.collect.ObjectArrays;
 import java.awt.Color;
 import javax.annotation.Nullable;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
@@ -42,7 +43,7 @@ import net.runelite.api.Nameable;
 import net.runelite.api.events.MenuEntryAdded;
 import net.runelite.api.events.MenuOptionClicked;
 import net.runelite.api.events.NameableNameChanged;
-import net.runelite.api.events.RemovedFriend;
+import net.runelite.api.events.FriendRemoved;
 import net.runelite.api.widgets.WidgetInfo;
 import net.runelite.client.config.ConfigManager;
 import net.runelite.client.eventbus.Subscribe;
@@ -58,6 +59,7 @@ import net.runelite.client.util.Text;
 	name = "Friend Notes",
 	description = "Store notes about your friends"
 )
+@Singleton
 public class FriendNotesPlugin extends Plugin
 {
 	private static final String CONFIG_GROUP = "friendNotes";
@@ -248,7 +250,7 @@ public class FriendNotesPlugin extends Plugin
 	}
 
 	@Subscribe
-	public void onRemovedFriend(RemovedFriend event)
+	public void onFriendRemoved(FriendRemoved event)
 	{
 		// Delete a friend's note if they are removed
 		final String displayName = Text.toJagexName(event.getName());
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/friendtagging/FriendTaggingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/friendtagging/FriendTaggingPlugin.java
index 99434bcffe..4a693a64a3 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/friendtagging/FriendTaggingPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/friendtagging/FriendTaggingPlugin.java
@@ -18,6 +18,7 @@ import java.util.HashSet;
 import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
@@ -29,7 +30,7 @@ import net.runelite.api.Nameable;
 import net.runelite.api.events.MenuEntryAdded;
 import net.runelite.api.events.MenuOptionClicked;
 import net.runelite.api.events.NameableNameChanged;
-import net.runelite.api.events.RemovedFriend;
+import net.runelite.api.events.FriendRemoved;
 import net.runelite.api.events.WidgetMenuOptionClicked;
 import net.runelite.api.widgets.WidgetInfo;
 import net.runelite.client.config.ConfigManager;
@@ -52,7 +53,7 @@ import org.apache.commons.lang3.ArrayUtils;
 	type = PluginType.UTILITY,
 	enabledByDefault = false
 )
-
+@Singleton
 public class FriendTaggingPlugin extends Plugin
 {
 	public static final ConcurrentHashMap<String, String> taggedFriends = new ConcurrentHashMap<>();
@@ -62,13 +63,13 @@ public class FriendTaggingPlugin extends Plugin
 	private static final String KEY_PREFIX = "tag_";
 	private static final String ADD_TAG = "Add Tag";
 	private static final String DELETE_TAG = "Delete Tag";
-	private WidgetMenuOption friendsTabMenuOption = new WidgetMenuOption("Copy to", "clipboard",
+	private final WidgetMenuOption friendsTabMenuOption = new WidgetMenuOption("Copy to", "clipboard",
 		WidgetInfo.FIXED_VIEWPORT_FRIENDS_TAB);
-	private WidgetMenuOption ignoreTabMenuOption = new WidgetMenuOption("Copy to", "clipboard",
+	private final WidgetMenuOption ignoreTabMenuOption = new WidgetMenuOption("Copy to", "clipboard",
 		WidgetInfo.FIXED_VIEWPORT_IGNORES_TAB);
-	private WidgetMenuOption friendTabResizableOption = new WidgetMenuOption("Copy to", "clipboard",
+	private final WidgetMenuOption friendTabResizableOption = new WidgetMenuOption("Copy to", "clipboard",
 		WidgetInfo.FIXED_VIEWPORT_FRIENDS_TAB);
-	private WidgetMenuOption ignoreTabResizableOption = new WidgetMenuOption("Copy to", "clipboard",
+	private final WidgetMenuOption ignoreTabResizableOption = new WidgetMenuOption("Copy to", "clipboard",
 		WidgetInfo.FIXED_VIEWPORT_IGNORES_TAB);
 
 	@Inject
@@ -127,7 +128,7 @@ public class FriendTaggingPlugin extends Plugin
 	}
 
 	@Subscribe
-	public void onRemovedFriend(RemovedFriend event)
+	public void onFriendRemoved(FriendRemoved event)
 	{
 		final String displayName = event.getName().trim().toLowerCase();
 		deleteTag(displayName);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GLUtil.java b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GLUtil.java
index 2629e81e4b..8c4bf270fc 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GLUtil.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GLUtil.java
@@ -37,33 +37,33 @@ class GLUtil
 	private static final int[] buf = new int[1];
 	private static final float[] fbuf = new float[1];
 
-	static int glGetInteger(GL4 gl, int pname)
+	static int glGetInteger(GL4 gl)
 	{
-		gl.glGetIntegerv(pname, buf, 0);
+		gl.glGetIntegerv(com.jogamp.opengl.GL.GL_MAX_SAMPLES, buf, 0);
 		return buf[0];
 	}
 
-	static float glGetFloat(GL4 gl, int pname)
+	static float glGetFloat(GL4 gl)
 	{
-		gl.glGetFloatv(pname, fbuf, 0);
+		gl.glGetFloatv(com.jogamp.opengl.GL.GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, fbuf, 0);
 		return fbuf[0];
 	}
 
-	static int glGetShader(GL4 gl, int shader, int pname)
+	private static int glGetShader(GL4 gl, int shader)
 	{
-		gl.glGetShaderiv(shader, pname, buf, 0);
+		gl.glGetShaderiv(shader, com.jogamp.opengl.GL2ES2.GL_COMPILE_STATUS, buf, 0);
 		assert buf[0] > -1;
 		return buf[0];
 	}
 
-	static int glGetProgram(GL4 gl, int program, int pname)
+	private static int glGetProgram(GL4 gl, int program, int pname)
 	{
 		gl.glGetProgramiv(program, pname, buf, 0);
 		assert buf[0] > -1;
 		return buf[0];
 	}
 
-	static String glGetShaderInfoLog(GL4 gl, int shader)
+	private static String glGetShaderInfoLog(GL4 gl, int shader)
 	{
 		byte[] err = new byte[ERR_LEN];
 		gl.glGetShaderInfoLog(shader, ERR_LEN, buf, 0, err, 0);
@@ -192,7 +192,7 @@ class GLUtil
 		gl.glShaderSource(shader, 1, new String[]{source}, null);
 		gl.glCompileShader(shader);
 
-		if (glGetShader(gl, shader, gl.GL_COMPILE_STATUS) == gl.GL_TRUE)
+		if (glGetShader(gl, shader) == gl.GL_TRUE)
 		{
 			gl.glAttachShader(program, shader);
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuFloatBuffer.java b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuFloatBuffer.java
index a90d85a16d..a5901d65b2 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuFloatBuffer.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuFloatBuffer.java
@@ -32,9 +32,9 @@ class GpuFloatBuffer
 {
 	private FloatBuffer buffer = allocateDirect(65536);
 
-	void put(float texture, float u, float v, float pad)
+	void put(float texture, float u, float v)
 	{
-		buffer.put(texture).put(u).put(v).put(pad);
+		buffer.put(texture).put(u).put(v).put((float) 0.0);
 	}
 
 	void flip()
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuIntBuffer.java b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuIntBuffer.java
index 15ea5461ad..bc85a230b0 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuIntBuffer.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuIntBuffer.java
@@ -32,11 +32,6 @@ class GpuIntBuffer
 {
 	private IntBuffer buffer = allocateDirect(65536);
 
-	void put(int x, int y, int z)
-	{
-		buffer.put(x).put(y).put(z);
-	}
-
 	void put(int x, int y, int z, int c)
 	{
 		buffer.put(x).put(y).put(z).put(c);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java
index e437d3cbe9..e8cbcb9977 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java
@@ -48,6 +48,7 @@ import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
 import java.util.function.Function;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import jogamp.nativewindow.SurfaceScaleUtils;
 import jogamp.nativewindow.jawt.x11.X11JAWTWindow;
 import jogamp.newt.awt.NewtFactoryAWT;
@@ -65,6 +66,7 @@ import net.runelite.api.SceneTileModel;
 import net.runelite.api.SceneTilePaint;
 import net.runelite.api.Texture;
 import net.runelite.api.TextureProvider;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.GameStateChanged;
 import net.runelite.api.hooks.DrawCallbacks;
 import net.runelite.client.callback.ClientThread;
@@ -88,6 +90,7 @@ import net.runelite.client.util.OSType;
 	tags = {"fog", "draw distance"}
 )
 @Slf4j
+@Singleton
 public class GpuPlugin extends Plugin implements DrawCallbacks
 {
 	// This is the maximum number of triangles the compute shaders support
@@ -227,9 +230,38 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
 	private int uniBlockMain;
 	private int uniSmoothBanding;
 
+	private int drawDistance;
+	private boolean smoothBanding;
+	private AntiAliasingMode antiAliasingMode;
+	private AnisotropicFilteringMode anisotropicFilteringMode;
+	private int fogDepth;
+	private int fogCircularity;
+	private int fogDensity;
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (event.getGroup().equals("gpu"))
+		{
+			updateConfig();
+		}
+	}
+
+	private void updateConfig()
+	{
+		this.drawDistance = config.drawDistance();
+		this.smoothBanding = config.smoothBanding();
+		this.antiAliasingMode = config.antiAliasingMode();
+		this.anisotropicFilteringMode = config.anisotropicFilteringMode();
+		this.fogDepth = config.fogDepth();
+		this.fogCircularity = config.fogCircularity();
+		this.fogDensity = config.fogDensity();
+	}
+
 	@Override
 	protected void startUp()
 	{
+		updateConfig();
 		clientThread.invoke(() ->
 		{
 			try
@@ -704,7 +736,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
 		centerY = client.getCenterY();
 
 		final Scene scene = client.getScene();
-		final int drawDistance = Math.max(0, Math.min(MAX_DISTANCE, config.drawDistance()));
+		final int drawDistance = Math.max(0, Math.min(MAX_DISTANCE, this.drawDistance));
 		scene.setDrawDistance(drawDistance);
 	}
 
@@ -794,7 +826,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
 		}
 
 		// Setup anti-aliasing
-		final AntiAliasingMode antiAliasingMode = config.antiAliasingMode();
+		final AntiAliasingMode antiAliasingMode = this.antiAliasingMode;
 		final boolean aaEnabled = antiAliasingMode != AntiAliasingMode.DISABLED;
 
 		if (aaEnabled)
@@ -809,11 +841,12 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
 			// Re-create fbo
 			if (lastStretchedCanvasWidth != stretchedCanvasWidth
 				|| lastStretchedCanvasHeight != stretchedCanvasHeight
-				|| lastAntiAliasingMode != antiAliasingMode)
+				|| (lastAntiAliasingMode != null
+				&& !lastAntiAliasingMode.equals(antiAliasingMode)))
 			{
 				shutdownSceneFbo();
 
-				final int maxSamples = glGetInteger(gl, gl.GL_MAX_SAMPLES);
+				final int maxSamples = glGetInteger(gl);
 				final int samples = Math.min(antiAliasingMode.getSamples(), maxSamples);
 
 				initSceneFbo(stretchedCanvasWidth, stretchedCanvasHeight, samples);
@@ -977,10 +1010,10 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
 			int renderViewportWidth = viewportWidth;
 
 			// Setup anisotropic filtering
-			final AnisotropicFilteringMode anisotropicFilteringMode = config.anisotropicFilteringMode();
-			final boolean afEnabled = anisotropicFilteringMode != anisotropicFilteringMode.DISABLED;
+			final AnisotropicFilteringMode anisotropicFilteringMode = this.anisotropicFilteringMode;
+			final boolean afEnabled = anisotropicFilteringMode != AnisotropicFilteringMode.DISABLED;
 
-			if (lastAnisotropicFilteringMode != anisotropicFilteringMode)
+			if (lastAnisotropicFilteringMode != null && !lastAnisotropicFilteringMode.equals(anisotropicFilteringMode))
 			{
 				if (afEnabled)
 				{
@@ -993,7 +1026,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
 							gl.glTexParameteri(gl.GL_TEXTURE_2D_ARRAY, gl.GL_TEXTURE_MIN_FILTER, gl.GL_LINEAR_MIPMAP_LINEAR);
 							break;
 						default:
-							final float maxSamples = glGetFloat(gl, gl.GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT);
+							final float maxSamples = glGetFloat(gl);
 							final float samples = Math.min(anisotropicFilteringMode.getSamples(), maxSamples);
 							gl.glTexParameteri(gl.GL_TEXTURE_2D_ARRAY, gl.GL_TEXTURE_MIN_FILTER, gl.GL_LINEAR_MIPMAP_LINEAR);
 							gl.glTexParameterf(gl.GL_TEXTURE_2D_ARRAY, gl.GL_TEXTURE_MAX_ANISOTROPY_EXT, samples);
@@ -1034,19 +1067,19 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
 
 			gl.glUseProgram(glProgram);
 
-			final int drawDistance = Math.max(0, Math.min(MAX_DISTANCE, config.drawDistance()));
-			final int fogDepth = config.fogDepth();
+			final int drawDistance = Math.max(0, Math.min(MAX_DISTANCE, this.drawDistance));
+			final int fogDepth = this.fogDepth;
 			float effectiveDrawDistance = Perspective.LOCAL_TILE_SIZE * Math.min(Constants.SCENE_SIZE / 2, drawDistance);
 			gl.glUniform1i(uniUseFog, fogDepth > 0 ? 1 : 0);
 			gl.glUniform4f(uniFogColor, (sky >> 16 & 0xFF) / 255f, (sky >> 8 & 0xFF) / 255f, (sky & 0xFF) / 255f, 1f);
-			gl.glUniform1f(uniFogDepth, config.fogDepth() * 0.01f * effectiveDrawDistance);
-			gl.glUniform1f(uniFogCornerRadius, config.fogCircularity() * 0.01f * effectiveDrawDistance);
-			gl.glUniform1f(uniFogDensity, config.fogDensity() * 0.1f);
+			gl.glUniform1f(uniFogDepth, this.fogDepth * 0.01f * effectiveDrawDistance);
+			gl.glUniform1f(uniFogCornerRadius, this.fogCircularity * 0.01f * effectiveDrawDistance);
+			gl.glUniform1f(uniFogDensity, this.fogDensity * 0.1f);
 			gl.glUniform1i(uniDrawDistance, drawDistance * Perspective.LOCAL_TILE_SIZE);
 
 			// Brightness happens to also be stored in the texture provider, so we use that
 			gl.glUniform1f(uniBrightness, (float) textureProvider.getBrightness());
-			gl.glUniform1f(uniSmoothBanding, config.smoothBanding() ? 0f : 1f);
+			gl.glUniform1f(uniSmoothBanding, this.smoothBanding ? 0f : 1f);
 
 			for (int id = 0; id < textures.length; ++id)
 			{
@@ -1303,7 +1336,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
 	/**
 	 * Check is a model is visible and should be drawn.
 	 */
-	private boolean isVisible(Model model, int orientation, int pitchSin, int pitchCos, int yawSin, int yawCos, int _x, int _y, int _z, long hash)
+	private boolean isNotVisible(Model model, int orientation, int pitchSin, int pitchCos, int yawSin, int yawCos, int _x, int _y, int _z, long hash)
 	{
 		final int XYZMag = model.getXYZMag();
 		final int zoom = client.get3dZoom();
@@ -1334,12 +1367,12 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
 					{
 						int var21 = (pitchCos * modelHeight >> 16) + var19;
 						int var22 = (var18 - var21) * zoom;
-						return var22 / var14 < Rasterizer3D_clipMidY2;
+						return var22 / var14 >= Rasterizer3D_clipMidY2;
 					}
 				}
 			}
 		}
-		return false;
+		return true;
 	}
 
 	/**
@@ -1367,7 +1400,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
 			model.calculateBoundsCylinder();
 			model.calculateExtreme(orientation);
 
-			if (!isVisible(model, orientation, pitchSin, pitchCos, yawSin, yawCos, x, y, z, hash))
+			if (isNotVisible(model, orientation, pitchSin, pitchCos, yawSin, yawCos, x, y, z, hash))
 			{
 				return;
 			}
@@ -1431,7 +1464,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
 				model.calculateBoundsCylinder();
 				model.calculateExtreme(orientation);
 
-				if (!isVisible(model, orientation, pitchSin, pitchCos, yawSin, yawCos, x, y, z, hash))
+				if (isNotVisible(model, orientation, pitchSin, pitchCos, yawSin, yawCos, x, y, z, hash))
 				{
 					return;
 				}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/SceneUploader.java b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/SceneUploader.java
index cb7d283d69..44dfa51dfa 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/SceneUploader.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/SceneUploader.java
@@ -126,21 +126,15 @@ class SceneUploader
 		}
 
 		GroundObject groundObject = tile.getGroundObject();
-		if (groundObject != null)
+		if (groundObject != null && groundObject.getRenderable() instanceof Model)
 		{
-			if (groundObject.getRenderable() instanceof Model)
-			{
-				((Model) groundObject.getRenderable()).setBufferOffset(-1);
-			}
+			((Model) groundObject.getRenderable()).setBufferOffset(-1);
 		}
 
 		DecorativeObject decorativeObject = tile.getDecorativeObject();
-		if (decorativeObject != null)
+		if (decorativeObject != null && decorativeObject.getRenderable() instanceof Model)
 		{
-			if (decorativeObject.getRenderable() instanceof Model)
-			{
-				((Model) decorativeObject.getRenderable()).setBufferOffset(-1);
-			}
+			((Model) decorativeObject.getRenderable()).setBufferOffset(-1);
 		}
 
 		GameObject[] gameObjects = tile.getGameObjects();
@@ -292,48 +286,34 @@ class SceneUploader
 		vertexBuffer.ensureCapacity(24);
 		uvBuffer.ensureCapacity(24);
 
-		// 0,0
-		int vertexDx = localX;
-		int vertexDy = localY;
-		int vertexDz = swHeight;
-		final int c1 = swColor;
-
 		// 1,0
 		int vertexCx = localX + Perspective.LOCAL_TILE_SIZE;
-		int vertexCy = localY;
-		int vertexCz = seHeight;
-		final int c2 = seColor;
 
 		// 1,1
 		int vertexAx = localX + Perspective.LOCAL_TILE_SIZE;
 		int vertexAy = localY + Perspective.LOCAL_TILE_SIZE;
-		int vertexAz = neHeight;
-		final int c3 = neColor;
 
 		// 0,1
-		int vertexBx = localX;
 		int vertexBy = localY + Perspective.LOCAL_TILE_SIZE;
-		int vertexBz = nwHeight;
-		final int c4 = nwColor;
 
-		vertexBuffer.put(vertexAx, vertexAz, vertexAy, c3);
-		vertexBuffer.put(vertexBx, vertexBz, vertexBy, c4);
-		vertexBuffer.put(vertexCx, vertexCz, vertexCy, c2);
+		vertexBuffer.put(vertexAx, neHeight, vertexAy, neColor);
+		vertexBuffer.put(localX, nwHeight, vertexBy, nwColor);
+		vertexBuffer.put(vertexCx, seHeight, localY, seColor);
 
-		vertexBuffer.put(vertexDx, vertexDz, vertexDy, c1);
-		vertexBuffer.put(vertexCx, vertexCz, vertexCy, c2);
-		vertexBuffer.put(vertexBx, vertexBz, vertexBy, c4);
+		vertexBuffer.put(localX, swHeight, localY, swColor);
+		vertexBuffer.put(vertexCx, seHeight, localY, seColor);
+		vertexBuffer.put(localX, nwHeight, vertexBy, nwColor);
 
 		if (tile.getTexture() != -1)
 		{
 			float tex = tile.getTexture() + 1f;
-			uvBuffer.put(tex, 1.0f, 1.0f, 0f);
-			uvBuffer.put(tex, 0.0f, 1.0f, 0f);
-			uvBuffer.put(tex, 1.0f, 0.0f, 0f);
+			uvBuffer.put(tex, 1.0f, 1.0f);
+			uvBuffer.put(tex, 0.0f, 1.0f);
+			uvBuffer.put(tex, 1.0f, 0.0f);
 
-			uvBuffer.put(tex, 0.0f, 0.0f, 0f);
-			uvBuffer.put(tex, 1.0f, 0.0f, 0f);
-			uvBuffer.put(tex, 0.0f, 1.0f, 0f);
+			uvBuffer.put(tex, 0.0f, 0.0f);
+			uvBuffer.put(tex, 1.0f, 0.0f);
+			uvBuffer.put(tex, 0.0f, 1.0f);
 		}
 
 		return 6;
@@ -399,15 +379,15 @@ class SceneUploader
 				if (triangleTextures[i] != -1)
 				{
 					float tex = triangleTextures[i] + 1f;
-					uvBuffer.put(tex, vertexXA / 128f, vertexZA / 128f, 0f);
-					uvBuffer.put(tex, vertexXB / 128f, vertexZB / 128f, 0f);
-					uvBuffer.put(tex, vertexXC / 128f, vertexZC / 128f, 0f);
+					uvBuffer.put(tex, vertexXA / 128f, vertexZA / 128f);
+					uvBuffer.put(tex, vertexXB / 128f, vertexZB / 128f);
+					uvBuffer.put(tex, vertexXC / 128f, vertexZC / 128f);
 				}
 				else
 				{
-					uvBuffer.put(0, 0, 0, 0f);
-					uvBuffer.put(0, 0, 0, 0f);
-					uvBuffer.put(0, 0, 0, 0f);
+					uvBuffer.put(0, 0, 0);
+					uvBuffer.put(0, 0, 0);
+					uvBuffer.put(0, 0, 0);
 				}
 			}
 		}
@@ -537,9 +517,9 @@ class SceneUploader
 
 			if (faceTextures != null)
 			{
-				uvBuffer.put(0, 0, 0, 0f);
-				uvBuffer.put(0, 0, 0, 0f);
-				uvBuffer.put(0, 0, 0, 0f);
+				uvBuffer.put(0, 0, 0);
+				uvBuffer.put(0, 0, 0);
+				uvBuffer.put(0, 0, 0);
 			}
 			return 3;
 		}
@@ -572,15 +552,15 @@ class SceneUploader
 			if (u != null && v != null && (uf = u[face]) != null && (vf = v[face]) != null)
 			{
 				float texture = faceTextures[face] + 1f;
-				uvBuffer.put(texture, uf[0], vf[0], 0f);
-				uvBuffer.put(texture, uf[1], vf[1], 0f);
-				uvBuffer.put(texture, uf[2], vf[2], 0f);
+				uvBuffer.put(texture, uf[0], vf[0]);
+				uvBuffer.put(texture, uf[1], vf[1]);
+				uvBuffer.put(texture, uf[2], vf[2]);
 			}
 			else
 			{
-				uvBuffer.put(0f, 0f, 0f, 0f);
-				uvBuffer.put(0f, 0f, 0f, 0f);
-				uvBuffer.put(0f, 0f, 0f, 0f);
+				uvBuffer.put(0f, 0f, 0f);
+				uvBuffer.put(0f, 0f, 0f);
+				uvBuffer.put(0f, 0f, 0f);
 			}
 		}
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeInputListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeInputListener.java
index c2533d59e4..56cc228a6e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeInputListener.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeInputListener.java
@@ -27,6 +27,7 @@ package net.runelite.client.plugins.grandexchange;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import javax.swing.SwingUtilities;
 import net.runelite.api.Client;
 import net.runelite.api.MenuEntry;
@@ -35,13 +36,14 @@ import net.runelite.client.input.MouseAdapter;
 import static net.runelite.client.plugins.grandexchange.GrandExchangePlugin.SEARCH_GRAND_EXCHANGE;
 import net.runelite.client.util.Text;
 
+@Singleton
 public class GrandExchangeInputListener extends MouseAdapter implements KeyListener
 {
 	private final Client client;
 	private final GrandExchangePlugin plugin;
 
 	@Inject
-	private GrandExchangeInputListener(Client client, GrandExchangePlugin plugin)
+	private GrandExchangeInputListener(final Client client, final GrandExchangePlugin plugin)
 	{
 		this.client = client;
 		this.plugin = plugin;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeItemPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeItemPanel.java
index 9c93d47b0f..c60130e94c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeItemPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeItemPanel.java
@@ -35,6 +35,7 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.ArrayList;
 import java.util.List;
+import javax.inject.Singleton;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.border.CompoundBorder;
@@ -48,6 +49,7 @@ import net.runelite.client.util.StackFormatter;
  * This panel displays an individual item result in the
  * Grand Exchange search plugin.
  */
+@Singleton
 class GrandExchangeItemPanel extends JPanel
 {
 	private static final Dimension ICON_SIZE = new Dimension(32, 32);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOfferSlot.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOfferSlot.java
index 0f2f75b0de..e311fdc9e1 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOfferSlot.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOfferSlot.java
@@ -37,6 +37,7 @@ import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.awt.image.BufferedImage;
 import javax.annotation.Nullable;
+import javax.inject.Singleton;
 import javax.swing.ImageIcon;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -54,7 +55,8 @@ import net.runelite.client.util.ColorUtil;
 import net.runelite.client.util.ImageUtil;
 import net.runelite.client.util.StackFormatter;
 
-public class GrandExchangeOfferSlot extends JPanel
+@Singleton
+class GrandExchangeOfferSlot extends JPanel
 {
 	private static final String FACE_CARD = "FACE_CARD";
 	private static final String DETAILS_CARD = "DETAILS_CARD";
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOffersPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOffersPanel.java
index 0531651a56..b58e28cbac 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOffersPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOffersPanel.java
@@ -30,6 +30,7 @@ import java.awt.CardLayout;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.image.BufferedImage;
+import javax.inject.Singleton;
 import javax.swing.JPanel;
 import javax.swing.border.EmptyBorder;
 import net.runelite.api.GrandExchangeOffer;
@@ -38,7 +39,8 @@ import net.runelite.api.ItemDefinition;
 import net.runelite.client.ui.ColorScheme;
 import net.runelite.client.ui.components.PluginErrorPanel;
 
-public class GrandExchangeOffersPanel extends JPanel
+@Singleton
+class GrandExchangeOffersPanel extends JPanel
 {
 	private static final String ERROR_PANEL = "ERROR_PANEL";
 	private static final String OFFERS_PANEL = "OFFERS_PANEL";
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePanel.java
index 68e18cecc0..2544ad2c07 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePanel.java
@@ -30,8 +30,10 @@ import java.awt.BorderLayout;
 import java.util.Map;
 import java.util.concurrent.ScheduledExecutorService;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import javax.swing.JPanel;
 import javax.swing.border.EmptyBorder;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.client.callback.ClientThread;
 import net.runelite.client.game.ItemManager;
@@ -40,6 +42,7 @@ import net.runelite.client.ui.PluginPanel;
 import net.runelite.client.ui.components.materialtabs.MaterialTab;
 import net.runelite.client.ui.components.materialtabs.MaterialTabGroup;
 
+@Singleton
 class GrandExchangePanel extends PluginPanel
 {
 
@@ -49,9 +52,9 @@ class GrandExchangePanel extends PluginPanel
 	private final MaterialTabGroup tabGroup = new MaterialTabGroup(display);
 	private final MaterialTab searchTab;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private GrandExchangeSearchPanel searchPanel;
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private GrandExchangeOffersPanel offersPanel;
 
 	@Inject
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java
index 1cec9f64f1..4ce28688b9 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java
@@ -37,6 +37,7 @@ import java.io.InputStreamReader;
 import java.util.Map;
 import java.util.concurrent.ScheduledExecutorService;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import javax.swing.SwingUtilities;
 import lombok.AccessLevel;
 import lombok.Getter;
@@ -90,6 +91,7 @@ import net.runelite.http.api.osbuddy.OSBGrandExchangeResult;
 	tags = {"external", "integration", "notifications", "panel", "prices", "trade"}
 )
 @Slf4j
+@Singleton
 public class GrandExchangePlugin extends Plugin
 {
 	private static final int OFFER_CONTAINER_ITEM = 21;
@@ -174,6 +176,11 @@ public class GrandExchangePlugin extends Plugin
 		configManager.unsetConfiguration("geoffer." + client.getUsername().toLowerCase(), Integer.toString(slot));
 	}
 
+	private boolean quickLookup;
+	private boolean enableNotifications;
+	private boolean enableOsbPrices;
+	private boolean enableGELimits;
+
 	@Provides
 	GrandExchangeConfig provideConfig(ConfigManager configManager)
 	{
@@ -183,6 +190,8 @@ public class GrandExchangePlugin extends Plugin
 	@Override
 	protected void startUp()
 	{
+		updateConfig();
+
 		itemGELimits = loadGELimits();
 		panel = injector.getInstance(GrandExchangePanel.class);
 		panel.setGELimits(itemGELimits);
@@ -198,7 +207,7 @@ public class GrandExchangePlugin extends Plugin
 
 		clientToolbar.addNavigation(button);
 
-		if (config.quickLookup())
+		if (this.quickLookup)
 		{
 			mouseManager.registerMouseListener(inputListener);
 			keyManager.registerKeyListener(inputListener);
@@ -237,6 +246,14 @@ public class GrandExchangePlugin extends Plugin
 		}
 	}
 
+	private void updateConfig()
+	{
+		this.quickLookup = config.quickLookup();
+		this.enableNotifications = config.enableNotifications();
+		this.enableOsbPrices = config.enableOsbPrices();
+		this.enableGELimits = config.enableGELimits();
+	}
+
 	@Subscribe
 	public void onSessionClose(SessionClose sessionClose)
 	{
@@ -248,9 +265,10 @@ public class GrandExchangePlugin extends Plugin
 	{
 		if (event.getGroup().equals("grandexchange"))
 		{
+			updateConfig();
 			if (event.getKey().equals("quickLookup"))
 			{
-				if (config.quickLookup())
+				if (this.quickLookup)
 				{
 					mouseManager.registerMouseListener(inputListener);
 					keyManager.registerKeyListener(inputListener);
@@ -345,7 +363,7 @@ public class GrandExchangePlugin extends Plugin
 	@Subscribe
 	public void onChatMessage(ChatMessage event)
 	{
-		if (!this.config.enableNotifications() || event.getType() != ChatMessageType.GAMEMESSAGE)
+		if (!this.enableNotifications || event.getType() != ChatMessageType.GAMEMESSAGE)
 		{
 			return;
 		}
@@ -490,7 +508,7 @@ public class GrandExchangePlugin extends Plugin
 			return;
 		}
 
-		if (config.enableGELimits() && itemGELimits != null && !geTextString.contains(BUY_LIMIT_GE_TEXT))
+		if (this.enableGELimits && itemGELimits != null && !geTextString.contains(BUY_LIMIT_GE_TEXT))
 		{
 			final Integer itemLimit = itemGELimits.get(itemId);
 
@@ -502,7 +520,7 @@ public class GrandExchangePlugin extends Plugin
 			}
 		}
 
-		if (!config.enableOsbPrices() || geTextString.contains(OSB_GE_TEXT))
+		if (!this.enableOsbPrices || geTextString.contains(OSB_GE_TEXT))
 		{
 			// OSB prices are disabled or price was already looked up, so no need to set it again
 			return;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeSearchPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeSearchPanel.java
index b5443be68d..d8d88e3933 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeSearchPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeSearchPanel.java
@@ -36,10 +36,12 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ScheduledExecutorService;
+import javax.inject.Singleton;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.SwingUtilities;
 import javax.swing.border.EmptyBorder;
+import lombok.AccessLevel;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.ItemDefinition;
@@ -56,6 +58,7 @@ import net.runelite.http.api.item.ItemPrice;
  * It should display a search bar and either item results or a error panel.
  */
 @Slf4j
+@Singleton
 class GrandExchangeSearchPanel extends JPanel
 {
 	private static final String ERROR_PANEL = "ERROR_PANEL";
@@ -82,10 +85,10 @@ class GrandExchangeSearchPanel extends JPanel
 
 	private final List<GrandExchangeItems> itemsList = new ArrayList<>();
 
-	@Setter
+	@Setter(AccessLevel.PACKAGE)
 	private Map<Integer, Integer> itemGELimits = Collections.emptyMap();
 
-	GrandExchangeSearchPanel(ClientThread clientThread, ItemManager itemManager, ScheduledExecutorService executor)
+	GrandExchangeSearchPanel(final ClientThread clientThread, final ItemManager itemManager, final ScheduledExecutorService executor)
 	{
 		this.clientThread = clientThread;
 		this.itemManager = itemManager;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/DuskAttack.java b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/DuskAttack.java
index ece52fe62e..afe3107282 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/DuskAttack.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/DuskAttack.java
@@ -34,7 +34,7 @@ public enum DuskAttack
 	private final int animation;
 	private final Prayer prayer;
 
-	DuskAttack(int animation, Prayer prayer)
+	DuskAttack(final int animation, final Prayer prayer)
 	{
 		this.animation = animation;
 		this.prayer = prayer;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansOverlay.java
index 0c02d79b92..0a83e9c904 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansOverlay.java
@@ -28,7 +28,9 @@ import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.awt.Polygon;
+import java.util.Objects;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.GraphicsObject;
 import net.runelite.api.Perspective;
@@ -40,6 +42,7 @@ import net.runelite.client.ui.overlay.OverlayPriority;
 import net.runelite.client.ui.overlay.OverlayUtil;
 import net.runelite.client.ui.overlay.components.TextComponent;
 
+@Singleton
 class GrotesqueGuardiansOverlay extends Overlay
 {
 	private static final int GROTESQUE_GUARDIANS_REGION_ID = 6727;
@@ -51,7 +54,7 @@ class GrotesqueGuardiansOverlay extends Overlay
 	private static final int GROTESQUE_GUARDIANS_STONE_ORB = 160;
 
 	@Inject
-	private GrotesqueGuardiansOverlay(Client client, GrotesqueGuardiansPlugin plugin)
+	private GrotesqueGuardiansOverlay(final Client client, final GrotesqueGuardiansPlugin plugin)
 	{
 		this.client = client;
 		this.plugin = plugin;
@@ -71,7 +74,7 @@ class GrotesqueGuardiansOverlay extends Overlay
 		// TODO: Awaiting GraphicsObjectDespawn event to be tracked to make this more efficient.
 		for (GraphicsObject graphicsObject : client.getGraphicsObjects())
 		{
-			Color color = null;
+			Color color;
 
 			if (graphicsObject.getId() >= GROTESQUE_GUARDIANS_LIGHTNING_START && graphicsObject.getId() <= GROTESQUE_GUARDIANS_LIGHTNING_END)
 			{
@@ -97,22 +100,19 @@ class GrotesqueGuardiansOverlay extends Overlay
 			{
 				OverlayUtil.renderPolygon(graphics, poly, color);
 			}
-			if ((plugin.isInGargs()) && (plugin.isNeedingToRun()))
+			if (plugin.isInGargs() && plugin.isNeedingToRun() && plugin.getDusk() != null && plugin.getDusk().getLocalLocation() != null)
 			{
-				if ((plugin.getDusk() != null) && (plugin.getDusk().getLocalLocation() != null))
-				{
-					TextComponent textComponent = new TextComponent();
-					LocalPoint duskPoint;
+				TextComponent textComponent = new TextComponent();
+				LocalPoint duskPoint;
 
-					duskPoint = new LocalPoint(plugin.getDusk().getLocalLocation().getX() + 128 * (plugin.getDusk().getTransformedDefinition().getSize() - 1) / 2, plugin.getDusk().getLocalLocation().getY() + 128 * (plugin.getDusk().getTransformedDefinition().getSize() - 1) / 2);
-					net.runelite.api.Point duskLoc = Perspective.getCanvasTextLocation(client, graphics, duskPoint, "RUN AWAY", 500);
-					if (duskLoc != null)
-					{
-						textComponent.setText("RUN AWAY");
-						textComponent.setPosition(new java.awt.Point(duskLoc.getX(), duskLoc.getY()));
-						textComponent.setColor(Color.red);
-						textComponent.render(graphics);
-					}
+				duskPoint = new LocalPoint(plugin.getDusk().getLocalLocation().getX() + 128 * (Objects.requireNonNull(plugin.getDusk().getTransformedDefinition()).getSize() - 1) / 2, plugin.getDusk().getLocalLocation().getY() + 128 * (plugin.getDusk().getTransformedDefinition().getSize() - 1) / 2);
+				net.runelite.api.Point duskLoc = Perspective.getCanvasTextLocation(client, graphics, duskPoint, "RUN AWAY", 500);
+				if (duskLoc != null)
+				{
+					textComponent.setText("RUN AWAY");
+					textComponent.setPosition(new java.awt.Point(duskLoc.getX(), duskLoc.getY()));
+					textComponent.setColor(Color.red);
+					textComponent.render(graphics);
 				}
 			}
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPlugin.java
index 77332e3c93..1ef158830f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPlugin.java
@@ -25,6 +25,7 @@
 package net.runelite.client.plugins.grotesqueguardians;
 
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginDescriptor;
 import net.runelite.client.plugins.PluginType;
@@ -46,7 +47,7 @@ import static net.runelite.api.NpcID.DUSK_7888;
 	type = PluginType.PVM,
 	enabledByDefault = false
 )
-
+@Singleton
 public class GrotesqueGuardiansPlugin extends Plugin
 {
 	private static final int GARGOYLES_REGION = 6727;
@@ -93,7 +94,7 @@ public class GrotesqueGuardiansPlugin extends Plugin
 	@Subscribe
 	public void onGameTick(final GameTick event)
 	{
-		final ArrayList<Integer> regions = new ArrayList<Integer>();
+		final ArrayList<Integer> regions = new ArrayList<>();
 		for (final int intValue : client.getMapRegions())
 		{
 			regions.add(intValue);
@@ -126,14 +127,7 @@ public class GrotesqueGuardiansPlugin extends Plugin
 					{
 					prayAgainst = null;
 				}
-				if (dusk.getAnimation() == 7802)
-				{
-					needingToRun = true;
-				}
-				else
-					{
-					needingToRun = false;
-				}
+				needingToRun = dusk.getAnimation() == 7802;
 			}
 		}
 		else
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPrayerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPrayerOverlay.java
index c63c0845da..bc3c398cb6 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPrayerOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPrayerOverlay.java
@@ -29,7 +29,9 @@ import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
 
+import java.util.Objects;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.NPC;
 import net.runelite.api.Perspective;
@@ -43,6 +45,7 @@ import net.runelite.client.ui.overlay.components.ComponentConstants;
 import net.runelite.client.ui.overlay.components.ImageComponent;
 import net.runelite.client.ui.overlay.components.PanelComponent;
 
+@Singleton
 public class GrotesqueGuardiansPrayerOverlay extends Overlay
 {
 	private static final Color NOT_ACTIVATED_BACKGROUND_COLOR = new Color(150, 0, 0, 150);
@@ -52,7 +55,7 @@ public class GrotesqueGuardiansPrayerOverlay extends Overlay
 	private final PanelComponent imagePanelComponent = new PanelComponent();
 
 	@Inject
-	private GrotesqueGuardiansPrayerOverlay(Client client, GrotesqueGuardiansPlugin plugin, SpriteManager spriteManager)
+	private GrotesqueGuardiansPrayerOverlay(final Client client, final GrotesqueGuardiansPlugin plugin, final SpriteManager spriteManager)
 	{
 		setLayer(OverlayLayer.ABOVE_SCENE);
 		setPriority(OverlayPriority.HIGH);
@@ -68,7 +71,7 @@ public class GrotesqueGuardiansPrayerOverlay extends Overlay
 		if ((plugin.isInGargs()) && (plugin.getPrayAgainst() != null) && (plugin.getDusk() != null))
 		{
 			DuskAttack attack = plugin.getPrayAgainst();
-			BufferedImage prayerImage = null;
+			BufferedImage prayerImage;
 			prayerImage = getPrayerImage(attack);
 			imagePanelComponent.setBackgroundColor(client
 					.isPrayerActive(attack.getPrayer()) ? ComponentConstants.STANDARD_BACKGROUND_COLOR : NOT_ACTIVATED_BACKGROUND_COLOR);
@@ -77,7 +80,7 @@ public class GrotesqueGuardiansPrayerOverlay extends Overlay
 			imagePanelComponent.getChildren().add(new ImageComponent(prayerImage));
 
 
-			LocalPoint duskPoint = new LocalPoint(dusk.getLocalLocation().getX() + 128 * (dusk.getTransformedDefinition().getSize() - 1) / 2, dusk.getLocalLocation().getY() + 128 * (dusk.getTransformedDefinition().getSize() - 1) / 2);
+			LocalPoint duskPoint = new LocalPoint(dusk.getLocalLocation().getX() + 128 * (Objects.requireNonNull(dusk.getTransformedDefinition()).getSize() - 1) / 2, dusk.getLocalLocation().getY() + 128 * (dusk.getTransformedDefinition().getSize() - 1) / 2);
 			net.runelite.api.Point duskLoc = Perspective.getCanvasImageLocation(client, duskPoint, prayerImage, 400);
 			if (duskLoc != null)
 			{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemInputListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemInputListener.java
index da6c3a80c5..8a53d9c2dc 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemInputListener.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemInputListener.java
@@ -30,11 +30,13 @@ import java.awt.event.MouseEvent;
 import java.time.Duration;
 import java.time.Instant;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import javax.swing.SwingUtilities;
 import net.runelite.client.input.KeyListener;
 import net.runelite.client.input.MouseAdapter;
 
-public class GroundItemInputListener extends MouseAdapter implements KeyListener
+@Singleton
+class GroundItemInputListener extends MouseAdapter implements KeyListener
 {
 	private static final int HOTKEY = KeyEvent.VK_ALT;
 
@@ -43,9 +45,6 @@ public class GroundItemInputListener extends MouseAdapter implements KeyListener
 	@Inject
 	private GroundItemsPlugin plugin;
 
-	@Inject
-	private GroundItemsConfig config;
-
 	@Override
 	public void keyTyped(KeyEvent e)
 	{
@@ -63,7 +62,7 @@ public class GroundItemInputListener extends MouseAdapter implements KeyListener
 				plugin.setHotKeyPressed(true);
 				lastPress = null;
 			}
-			else if (lastPress != null && !plugin.isHotKeyPressed() && config.doubleTapDelay() > 0 && Duration.between(lastPress, Instant.now()).compareTo(Duration.ofMillis(config.doubleTapDelay())) < 0)
+			else if (lastPress != null && !plugin.isHotKeyPressed() && plugin.getDoubleTapDelay() > 0 && Duration.between(lastPress, Instant.now()).compareTo(Duration.ofMillis(plugin.getDoubleTapDelay())) < 0)
 			{
 				plugin.setHideAll(true);
 				lastPress = null;
@@ -120,14 +119,11 @@ public class GroundItemInputListener extends MouseAdapter implements KeyListener
 					return e;
 				}
 			}
-			else if (SwingUtilities.isRightMouseButton(e))
+			else if (SwingUtilities.isRightMouseButton(e) && plugin.getTextBoxBounds() != null && plugin.getTextBoxBounds().getKey().contains(mousePos))
 			{
-				if (plugin.getTextBoxBounds() != null && plugin.getTextBoxBounds().getKey().contains(mousePos))
-				{
-					plugin.updateList(plugin.getTextBoxBounds().getValue().getName(), true);
-					e.consume();
-					return e;
-				}
+				plugin.updateList(plugin.getTextBoxBounds().getValue().getName(), true);
+				e.consume();
+				return e;
 			}
 		}
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java
index f9ce93dad6..40b8a7f97c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsOverlay.java
@@ -41,6 +41,7 @@ import java.util.Map;
 import java.util.List;
 import java.util.Comparator;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.Perspective;
 import net.runelite.api.Player;
@@ -60,6 +61,7 @@ import net.runelite.client.ui.overlay.components.ProgressPieComponent;
 import net.runelite.client.ui.overlay.components.TextComponent;
 import net.runelite.client.util.StackFormatter;
 
+@Singleton
 public class GroundItemsOverlay extends Overlay
 {
 	private static final int MAX_DISTANCE = 2500;
@@ -83,7 +85,6 @@ public class GroundItemsOverlay extends Overlay
 
 	private final Client client;
 	private final GroundItemsPlugin plugin;
-	private final GroundItemsConfig config;
 	private final StringBuilder itemStringBuilder = new StringBuilder();
 	private final BackgroundComponent backgroundComponent = new BackgroundComponent();
 	private final TextComponent textComponent = new TextComponent();
@@ -91,21 +92,20 @@ public class GroundItemsOverlay extends Overlay
 	private final Map<WorldPoint, Integer> offsetMap = new HashMap<>();
 
 	@Inject
-	private GroundItemsOverlay(Client client, GroundItemsPlugin plugin, GroundItemsConfig config)
+	private GroundItemsOverlay(final Client client, final GroundItemsPlugin plugin)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_SCENE);
 		this.client = client;
 		this.plugin = plugin;
-		this.config = config;
 	}
 
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		final boolean dontShowOverlay = (config.itemHighlightMode() == MENU || plugin.isHideAll()) && !plugin.isHotKeyPressed();
+		final boolean dontShowOverlay = (plugin.getItemHighlightMode() == MENU || plugin.isHideAll()) && !plugin.isHotKeyPressed();
 
-		if (dontShowOverlay && !config.highlightTiles())
+		if (dontShowOverlay && !plugin.isHighlightTiles())
 		{
 			return null;
 		}
@@ -177,13 +177,13 @@ public class GroundItemsOverlay extends Overlay
 		plugin.setHiddenBoxBounds(null);
 		plugin.setHighlightBoxBounds(null);
 
-		final boolean onlyShowLoot = config.onlyShowLoot();
+		final boolean onlyShowLoot = plugin.isOnlyShowLoot();
 
 		List<GroundItem> groundItemListAsList = new ArrayList<>(groundItemList);  // make a copy so we can non-destructively modify the list
 
 		Comparator<GroundItem> compareByHaPrice = Comparator.comparingInt(GroundItem::getHaPrice);
 		Comparator<GroundItem> compareByGePrice = Comparator.comparingInt(GroundItem::getGePrice);
-		groundItemListAsList.sort(config.sortByGEPrice() ? compareByGePrice : compareByHaPrice);
+		groundItemListAsList.sort(plugin.isSortByGEPrice() ? compareByGePrice : compareByHaPrice);
 
 		for (GroundItem item : groundItemListAsList)
 		{
@@ -207,7 +207,7 @@ public class GroundItemsOverlay extends Overlay
 				}
 
 				// Do not display non-highlighted items
-				if (config.showHighlightedOnly())
+				if (plugin.isShowHighlightedOnly())
 				{
 					continue;
 				}
@@ -215,7 +215,7 @@ public class GroundItemsOverlay extends Overlay
 
 			final Color color = plugin.getItemColor(highlighted, hidden);
 
-			if (config.highlightTiles())
+			if (plugin.isHighlightTiles())
 			{
 				final Polygon poly = Perspective.getCanvasTilePoly(client, groundPoint);
 
@@ -246,7 +246,7 @@ public class GroundItemsOverlay extends Overlay
 				}
 			}
 
-			if (config.priceDisplayMode() == PriceDisplayMode.BOTH)
+			if (plugin.getPriceDisplayMode() == PriceDisplayMode.BOTH)
 			{
 				if (item.getGePrice() > 0)
 				{
@@ -262,9 +262,9 @@ public class GroundItemsOverlay extends Overlay
 						.append(" gp)");
 				}
 			}
-			else if (config.priceDisplayMode() != PriceDisplayMode.OFF)
+			else if (plugin.getPriceDisplayMode() != PriceDisplayMode.OFF)
 			{
-				final int price = config.priceDisplayMode() == PriceDisplayMode.GE
+				final int price = plugin.getPriceDisplayMode() == PriceDisplayMode.GE
 					? item.getGePrice()
 					: item.getHaPrice();
 
@@ -277,7 +277,7 @@ public class GroundItemsOverlay extends Overlay
 				}
 			}
 
-			if (item.getTicks() > 0 && config.showTimer())
+			if (item.getTicks() > 0 && plugin.isShowTimer())
 			{
 				itemStringBuilder
 						.append(" - ")
@@ -352,7 +352,11 @@ public class GroundItemsOverlay extends Overlay
 					plugin.setHighlightBoxBounds(new SimpleEntry<>(itemHighlightBox, item));
 				}
 
-				boolean topItem = topGroundItem == item;
+				boolean topItem = false;
+				if (topGroundItem != null)
+				{
+					topItem = topGroundItem.equals(item);
+				}
 
 				// Draw background if hovering
 				if (topItem && (mouseInBox || mouseInHiddenBox || mouseInHighlightBox))
@@ -368,15 +372,15 @@ public class GroundItemsOverlay extends Overlay
 				drawRectangle(graphics, itemHighlightBox, topItem && mouseInHighlightBox ? Color.GREEN : color, highlighted != null, false);
 			}
 
-			if (config.showGroundItemDuration() == TimerDisplayMode.ALWAYS
-				|| (config.showGroundItemDuration() == TimerDisplayMode.HOTKEY_PRESSED && plugin.isHotKeyPressed()))
+			if (plugin.getShowGroundItemDuration() == TimerDisplayMode.ALWAYS
+				|| (plugin.getShowGroundItemDuration() == TimerDisplayMode.HOTKEY_PRESSED && plugin.isHotKeyPressed()))
 			{
 				drawTimerOverlay(graphics, new java.awt.Point(textX, textY), item);
 			}
 
-			if (config.toggleOutline())
+			if (plugin.isToggleOutline())
 			{
-				final Color bordercolor = config.bordercolor();
+				final Color bordercolor = plugin.getBordercolor();
 				graphics.setColor(bordercolor);
 				graphics.drawString(itemString, textX + 1, textY + 1);
 				graphics.drawString(itemString, textX - 1, textY - 1);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java
index 0754a4616f..ca28c8f797 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java
@@ -46,6 +46,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
@@ -82,11 +83,14 @@ import net.runelite.client.input.KeyManager;
 import net.runelite.client.input.MouseManager;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginDescriptor;
+import net.runelite.client.plugins.grounditems.config.ItemHighlightMode;
 import static net.runelite.client.plugins.grounditems.config.ItemHighlightMode.OVERLAY;
 import net.runelite.client.plugins.grounditems.config.MenuHighlightMode;
 import static net.runelite.client.plugins.grounditems.config.MenuHighlightMode.BOTH;
 import static net.runelite.client.plugins.grounditems.config.MenuHighlightMode.NAME;
 import static net.runelite.client.plugins.grounditems.config.MenuHighlightMode.OPTION;
+import net.runelite.client.plugins.grounditems.config.PriceDisplayMode;
+import net.runelite.client.plugins.grounditems.config.TimerDisplayMode;
 import net.runelite.client.plugins.grounditems.config.ValueCalculationMode;
 import net.runelite.client.ui.overlay.OverlayManager;
 import net.runelite.client.util.ColorUtil;
@@ -98,6 +102,7 @@ import net.runelite.client.util.Text;
 	description = "Highlight ground items and/or show price information",
 	tags = {"grand", "exchange", "high", "alchemy", "prices", "highlight", "overlay"}
 )
+@Singleton
 public class GroundItemsPlugin extends Plugin
 {
 	// ItemID for coins
@@ -175,12 +180,63 @@ public class GroundItemsPlugin extends Plugin
 	@Inject
 	private Notifier notifier;
 
-	@Getter
+	@Getter(AccessLevel.PUBLIC)
 	public static final Map<GroundItem.GroundItemKey, GroundItem> collectedGroundItems = new LinkedHashMap<>();
 	private final Map<Integer, Color> priceChecks = new LinkedHashMap<>();
 	private LoadingCache<String, Boolean> highlightedItems;
 	private LoadingCache<String, Boolean> hiddenItems;
 
+	private Color defaultColor;
+	private Color highlightedColor;
+	private Color hiddenColor;
+	private String getHighlightItems;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showHighlightedOnly;
+	private ValueCalculationMode valueCalculationMode;
+	private int getHighlightOverValue;
+	private boolean notifyHighlightedDrops;
+	private boolean dontHideUntradeables;
+	private String getHiddenItems;
+	private boolean recolorMenuHiddenItems;
+	private int getHideUnderValue;
+	private boolean removeIgnored;
+	private boolean rightClickHidden;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean highlightTiles;
+	@Getter(AccessLevel.PACKAGE)
+	private ItemHighlightMode itemHighlightMode;
+	private MenuHighlightMode menuHighlightMode;
+	private Color lowValueColor;
+	private int lowValuePrice;
+	private boolean notifyLowValueDrops;
+	private Color mediumValueColor;
+	private int mediumValuePrice;
+	private boolean notifyMediumValueDrops;
+	private Color highValueColor;
+	private int highValuePrice;
+	private boolean notifyHighValueDrops;
+	private Color insaneValueColor;
+	private int insaneValuePrice;
+	private boolean notifyInsaneValueDrops;
+	@Getter(AccessLevel.PACKAGE)
+	private PriceDisplayMode priceDisplayMode;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean sortByGEPrice;
+	private boolean showMenuItemQuantities;
+	private boolean collapseEntries;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean onlyShowLoot;
+	@Getter(AccessLevel.PACKAGE)
+	private TimerDisplayMode showGroundItemDuration;
+	@Getter(AccessLevel.PACKAGE)
+	private int doubleTapDelay;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean toggleOutline;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showTimer;
+	@Getter(AccessLevel.PACKAGE)
+	private Color bordercolor;
+
 	@Provides
 	GroundItemsConfig provideConfig(ConfigManager configManager)
 	{
@@ -190,6 +246,7 @@ public class GroundItemsPlugin extends Plugin
 	@Override
 	protected void startUp()
 	{
+		updateConfig();
 		overlayManager.add(overlay);
 		reset();
 		mouseManager.registerMouseListener(inputListener);
@@ -216,7 +273,10 @@ public class GroundItemsPlugin extends Plugin
 	{
 		for (GroundItem item : collectedGroundItems.values())
 		{
-			if (item.getTicks() == -1) continue;
+			if (item.getTicks() == -1)
+			{
+				continue;
+			}
 			item.setTicks(item.getTicks() - 1);
 		}
 	}
@@ -226,6 +286,7 @@ public class GroundItemsPlugin extends Plugin
 	{
 		if (event.getGroup().equals("grounditems"))
 		{
+			updateConfig();
 			reset();
 		}
 	}
@@ -254,12 +315,12 @@ public class GroundItemsPlugin extends Plugin
 			existing.setQuantity(existing.getQuantity() + groundItem.getQuantity());
 		}
 
-		boolean shouldNotify = !config.onlyShowLoot() && config.highlightedColor().equals(getHighlighted(
+		boolean shouldNotify = !this.onlyShowLoot && this.highlightedColor.equals(getHighlighted(
 			groundItem.getName(),
 			groundItem.getGePrice(),
 			groundItem.getHaPrice()));
 
-		if (config.notifyHighlightedDrops() && shouldNotify)
+		if (this.notifyHighlightedDrops && shouldNotify)
 		{
 			notifyHighlightedItem(groundItem);
 		}
@@ -340,23 +401,23 @@ public class GroundItemsPlugin extends Plugin
 			Color itemColor = getHighlighted(composition.getName(), itemManager.getItemPrice(is.getId()) * is.getQuantity(), itemManager.getAlchValue(is.getId()) * is.getQuantity());
 			if (itemColor != null)
 			{
-				if (config.notifyHighlightedDrops() && itemColor.equals(config.highlightedColor()))
+				if (this.notifyHighlightedDrops && itemColor.equals(this.highlightedColor))
 				{
 					sendLootNotification(composition.getName(), "highlighted");
 				}
-				else if (config.notifyLowValueDrops() && itemColor.equals(config.lowValueColor()))
+				else if (this.notifyLowValueDrops && itemColor.equals(this.lowValueColor))
 				{
 					sendLootNotification(composition.getName(), "low value");
 				}
-				else if (config.notifyMediumValueDrops() && itemColor.equals(config.mediumValueColor()))
+				else if (this.notifyMediumValueDrops && itemColor.equals(this.mediumValueColor))
 				{
 					sendLootNotification(composition.getName(), "medium value");
 				}
-				else if (config.notifyHighValueDrops() && itemColor.equals(config.highValueColor()))
+				else if (this.notifyHighValueDrops && itemColor.equals(this.highValueColor))
 				{
 					sendLootNotification(composition.getName(), "high value");
 				}
-				else if (config.notifyInsaneValueDrops() && itemColor.equals(config.insaneValueColor()))
+				else if (this.notifyInsaneValueDrops && itemColor.equals(this.insaneValueColor))
 				{
 					sendLootNotification(composition.getName(), "insane value");
 				}
@@ -382,7 +443,7 @@ public class GroundItemsPlugin extends Plugin
 		{
 			MenuEntry menuEntry = menuEntries[i];
 
-			if (config.collapseEntries())
+			if (this.collapseEntries)
 			{
 				int menuType = menuEntry.getType();
 				if (menuType == FIRST_OPTION || menuType == SECOND_OPTION || menuType == THIRD_OPTION
@@ -427,24 +488,34 @@ public class GroundItemsPlugin extends Plugin
 					final int bQuantity = getCollapsedItemQuantity(bId, bEntry.getTarget());
 
 					// only put items below walk if the config is set for it
-					if (config.rightClickHidden())
+					if (this.rightClickHidden)
 					{
 						if (aHidden && bMenuType == WALK)
+						{
 							return -1;
+						}
 						if (bHidden && aMenuType == WALK)
+						{
 							return 1;
+						}
 					}
 
 					// sort hidden items below non-hidden items
 					if (aHidden && !bHidden && bMenuType != WALK)
+					{
 						return -1;
+					}
 					if (bHidden && !aHidden && aMenuType != WALK)
+					{
 						return 1;
+					}
 
 
-					// RS sorts by alch price by default, so no need to sort if config not set
-					if (config.sortByGEPrice())
+					// RS sorts by alch price by private, so no need to sort if config not set
+					if (this.sortByGEPrice)
+					{
 						return (getGePriceFromItemId(aId) * aQuantity) - (getGePriceFromItemId(bId) * bQuantity);
+					}
 				}
 			}
 
@@ -455,7 +526,7 @@ public class GroundItemsPlugin extends Plugin
 		{
 			final MenuEntry entry = e.getEntry();
 
-			if (config.collapseEntries())
+			if (this.collapseEntries)
 			{
 				final int count = e.getCount();
 				if (count > 1)
@@ -480,12 +551,12 @@ public class GroundItemsPlugin extends Plugin
 				groundItem.setMine(true);
 				groundItem.setTicks(200);
 
-				boolean shouldNotify = config.onlyShowLoot() && config.highlightedColor().equals(getHighlighted(
+				boolean shouldNotify = this.onlyShowLoot && this.highlightedColor.equals(getHighlighted(
 					groundItem.getName(),
 					groundItem.getGePrice(),
 					groundItem.getHaPrice()));
 
-				if (config.notifyHighlightedDrops() && shouldNotify)
+				if (this.notifyHighlightedDrops && shouldNotify)
 				{
 					notifyHighlightedItem(groundItem);
 				}
@@ -555,10 +626,10 @@ public class GroundItemsPlugin extends Plugin
 	private void reset()
 	{
 		// gets the hidden items from the text box in the config
-		hiddenItemList = Text.fromCSV(config.getHiddenItems());
+		hiddenItemList = Text.fromCSV(this.getHiddenItems);
 
 		// gets the highlighted items from the text box in the config
-		highlightedItemsList = Text.fromCSV(config.getHighlightItems());
+		highlightedItemsList = Text.fromCSV(this.getHighlightItems);
 
 		highlightedItems = CacheBuilder.newBuilder()
 			.maximumSize(512L)
@@ -573,36 +644,36 @@ public class GroundItemsPlugin extends Plugin
 		// Cache colors
 		priceChecks.clear();
 
-		if (config.insaneValuePrice() > 0)
+		if (this.insaneValuePrice > 0)
 		{
-			priceChecks.put(config.insaneValuePrice(), config.insaneValueColor());
+			priceChecks.put(this.insaneValuePrice, this.insaneValueColor);
 		}
 
-		if (config.highValuePrice() > 0)
+		if (this.highValuePrice > 0)
 		{
-			priceChecks.put(config.highValuePrice(), config.highValueColor());
+			priceChecks.put(this.highValuePrice, this.highValueColor);
 		}
 
-		if (config.mediumValuePrice() > 0)
+		if (this.mediumValuePrice > 0)
 		{
-			priceChecks.put(config.mediumValuePrice(), config.mediumValueColor());
+			priceChecks.put(this.mediumValuePrice, this.mediumValueColor);
 		}
 
-		if (config.lowValuePrice() > 0)
+		if (this.lowValuePrice > 0)
 		{
-			priceChecks.put(config.lowValuePrice(), config.lowValueColor());
+			priceChecks.put(this.lowValuePrice, this.lowValueColor);
 		}
 
-		if (config.getHighlightOverValue() > 0)
+		if (this.getHighlightOverValue > 0)
 		{
-			priceChecks.put(config.getHighlightOverValue(), config.highlightedColor());
+			priceChecks.put(this.getHighlightOverValue, this.highlightedColor);
 		}
 	}
 
 	@Subscribe
 	public void onMenuEntryAdded(MenuEntryAdded event)
 	{
-		if (config.itemHighlightMode() != OVERLAY
+		if (this.itemHighlightMode != OVERLAY
 			&& event.getOption().equals("Take")
 			&& event.getIdentifier() == THIRD_OPTION)
 		{
@@ -641,11 +712,11 @@ public class GroundItemsPlugin extends Plugin
 			final Color hidden = getHidden(itemComposition.getName(), gePrice, haPrice, itemComposition.isTradeable());
 			final Color highlighted = getHighlighted(itemComposition.getName(), gePrice, haPrice);
 			final Color color = getItemColor(highlighted, hidden);
-			final boolean canBeRecolored = highlighted != null || (hidden != null && config.recolorMenuHiddenItems());
+			final boolean canBeRecolored = highlighted != null || (hidden != null && this.recolorMenuHiddenItems);
 
-			if (color != null && canBeRecolored && !color.equals(config.defaultColor()))
+			if (color != null && canBeRecolored && !color.equals(this.defaultColor))
 			{
-				final MenuHighlightMode mode = config.menuHighlightMode();
+				final MenuHighlightMode mode = this.menuHighlightMode;
 
 				if (mode == BOTH || mode == OPTION)
 				{
@@ -659,12 +730,12 @@ public class GroundItemsPlugin extends Plugin
 				}
 			}
 
-			if (config.showMenuItemQuantities() && itemComposition.isStackable() && quantity > 1)
+			if (this.showMenuItemQuantities && itemComposition.isStackable() && quantity > 1)
 			{
 				lastEntry.setTarget(lastEntry.getTarget() + " (" + quantity + ")");
 			}
 
-			if (config.removeIgnored() && event.getOption().equals("Take") && hiddenItemList.contains(Text.removeTags(event.getTarget())))
+			if (this.removeIgnored && event.getOption().equals("Take") && hiddenItemList.contains(Text.removeTags(event.getTarget())))
 			{
 				menuEntries = removeOption(event.getOption(), event.getTarget());
 			}
@@ -680,11 +751,11 @@ public class GroundItemsPlugin extends Plugin
 		if (entries.length > 1)
 		{
 			MenuEntry[] newEntries = new MenuEntry[entries.length - 1];
-			for (int i = 0; i < entries.length; ++i)
+			for (MenuEntry entry : entries)
 			{
-				if (!(entries[i].getOption().equals(option) && entries[i].getTarget().equals(target)))
+				if (!(entry.getOption().equals(option) && entry.getTarget().equals(target)))
 				{
-					newEntries[j++] = entries[i];
+					newEntries[j++] = entry;
 				}
 			}
 
@@ -718,14 +789,16 @@ public class GroundItemsPlugin extends Plugin
 		}
 
 		config.setHiddenItems(Text.toCSV(hiddenItemSet));
+		this.getHiddenItems = Text.toCSV(hiddenItemSet);
 		config.setHighlightedItem(Text.toCSV(highlightedItemSet));
+		this.getHighlightItems = Text.toCSV(highlightedItemSet);
 	}
 
 	Color getHighlighted(String item, int gePrice, int haPrice)
 	{
 		if (TRUE.equals(highlightedItems.getUnchecked(item)))
 		{
-			return config.highlightedColor();
+			return this.highlightedColor;
 		}
 
 		// Explicit hide takes priority over implicit highlight
@@ -734,7 +807,7 @@ public class GroundItemsPlugin extends Plugin
 			return null;
 		}
 
-		ValueCalculationMode mode = config.valueCalculationMode();
+		ValueCalculationMode mode = this.valueCalculationMode;
 		for (Map.Entry<Integer, Color> entry : priceChecks.entrySet())
 		{
 			switch (mode)
@@ -767,13 +840,13 @@ public class GroundItemsPlugin extends Plugin
 	{
 		final boolean isExplicitHidden = TRUE.equals(hiddenItems.getUnchecked(item));
 		final boolean isExplicitHighlight = TRUE.equals(highlightedItems.getUnchecked(item));
-		final boolean canBeHidden = gePrice > 0 || isTradeable || !config.dontHideUntradeables();
-		final boolean underGe = gePrice < config.getHideUnderValue();
-		final boolean underHa = haPrice < config.getHideUnderValue();
+		final boolean canBeHidden = gePrice > 0 || isTradeable || !this.dontHideUntradeables;
+		final boolean underGe = gePrice < this.getHideUnderValue;
+		final boolean underHa = haPrice < this.getHideUnderValue;
 
 		// Explicit highlight takes priority over implicit hide
 		return isExplicitHidden || (!isExplicitHighlight && canBeHidden && underGe && underHa)
-				? config.hiddenColor()
+				? this.hiddenColor
 				: null;
 	}
 
@@ -807,7 +880,9 @@ public class GroundItemsPlugin extends Plugin
 		{
 			// so that "Prayer Potion (4)" returns 1 instead of 4 and "Coins (25)" returns 25 instead of 1
 			if (!itemNameIncludesQuantity || matches >= 1)
+			{
 				lastMatch = matcher.group(1);
+			}
 
 			matches++;
 		}
@@ -827,7 +902,7 @@ public class GroundItemsPlugin extends Plugin
 			return hidden;
 		}
 
-		return config.defaultColor();
+		return this.defaultColor;
 	}
 
 	@Subscribe
@@ -868,4 +943,47 @@ public class GroundItemsPlugin extends Plugin
 		notificationStringBuilder.append("!");
 		notifier.notify(notificationStringBuilder.toString());
 	}
+
+	private void updateConfig()
+	{
+		this.defaultColor = config.defaultColor();
+		this.highlightedColor = config.highlightedColor();
+		this.hiddenColor = config.hiddenColor();
+		this.getHighlightItems = config.getHighlightItems();
+		this.showHighlightedOnly = config.showHighlightedOnly();
+		this.valueCalculationMode = config.valueCalculationMode();
+		this.getHighlightOverValue = config.getHighlightOverValue();
+		this.notifyHighlightedDrops = config.notifyHighlightedDrops();
+		this.dontHideUntradeables = config.dontHideUntradeables();
+		this.getHiddenItems = config.getHiddenItems();
+		this.recolorMenuHiddenItems = config.recolorMenuHiddenItems();
+		this.getHideUnderValue = config.getHideUnderValue();
+		this.removeIgnored = config.removeIgnored();
+		this.rightClickHidden = config.rightClickHidden();
+		this.highlightTiles = config.highlightTiles();
+		this.itemHighlightMode = config.itemHighlightMode();
+		this.menuHighlightMode = config.menuHighlightMode();
+		this.lowValueColor = config.lowValueColor();
+		this.lowValuePrice = config.lowValuePrice();
+		this.notifyLowValueDrops = config.notifyLowValueDrops();
+		this.mediumValueColor = config.mediumValueColor();
+		this.mediumValuePrice = config.mediumValuePrice();
+		this.notifyMediumValueDrops = config.notifyMediumValueDrops();
+		this.highValueColor = config.highValueColor();
+		this.highValuePrice = config.highValuePrice();
+		this.notifyHighValueDrops = config.notifyHighValueDrops();
+		this.insaneValueColor = config.insaneValueColor();
+		this.insaneValuePrice = config.insaneValuePrice();
+		this.notifyInsaneValueDrops = config.notifyInsaneValueDrops();
+		this.priceDisplayMode = config.priceDisplayMode();
+		this.sortByGEPrice = config.sortByGEPrice();
+		this.showMenuItemQuantities = config.showMenuItemQuantities();
+		this.collapseEntries = config.collapseEntries();
+		this.onlyShowLoot = config.onlyShowLoot();
+		this.showGroundItemDuration = config.showGroundItemDuration();
+		this.doubleTapDelay = config.doubleTapDelay();
+		this.toggleOutline = config.toggleOutline();
+		this.showTimer = config.showTimer();
+		this.bordercolor = config.bordercolor();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/MenuEntryWithCount.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/MenuEntryWithCount.java
index a8539921c0..172bbc94ee 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/MenuEntryWithCount.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/MenuEntryWithCount.java
@@ -24,6 +24,7 @@
  */
 package net.runelite.client.plugins.grounditems;
 
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import net.runelite.api.MenuEntry;
@@ -31,10 +32,10 @@ import net.runelite.api.MenuEntry;
 @RequiredArgsConstructor
 class MenuEntryWithCount
 {
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final MenuEntry entry;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private int count = 1;
 
 	void increment()
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/WildcardMatchLoader.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/WildcardMatchLoader.java
index 7b91067ba4..0aeea2e1dd 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/WildcardMatchLoader.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/WildcardMatchLoader.java
@@ -34,7 +34,7 @@ class WildcardMatchLoader extends CacheLoader<String, Boolean>
 {
 	private final List<String> nameFilters;
 
-	WildcardMatchLoader(List<String> nameFilters)
+	WildcardMatchLoader(final List<String> nameFilters)
 	{
 		this.nameFilters = nameFilters;
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerInputListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerInputListener.java
index a097d47d29..6a92bb0e99 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerInputListener.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerInputListener.java
@@ -27,8 +27,10 @@ package net.runelite.client.plugins.groundmarkers;
 
 import java.awt.event.KeyEvent;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.client.input.KeyListener;
 
+@Singleton
 public class GroundMarkerInputListener implements KeyListener
 {
 	private static final int HOTKEY = KeyEvent.VK_SHIFT;
@@ -36,7 +38,7 @@ public class GroundMarkerInputListener implements KeyListener
 	private final GroundMarkerPlugin plugin;
 
 	@Inject
-	private GroundMarkerInputListener(GroundMarkerPlugin plugin)
+	private GroundMarkerInputListener(final GroundMarkerPlugin plugin)
 	{
 		this.plugin = plugin;
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerMinimapOverlay.java
index 4e53a7d966..c2d2f06bb3 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerMinimapOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerMinimapOverlay.java
@@ -30,6 +30,7 @@ import java.awt.Graphics2D;
 import static java.lang.Math.floor;
 import java.util.List;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.Perspective;
 import net.runelite.api.Point;
@@ -41,21 +42,19 @@ import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayPriority;
 import net.runelite.client.ui.overlay.OverlayUtil;
 
+@Singleton
 class GroundMarkerMinimapOverlay extends Overlay
 {
-	private static final int MAX_DRAW_DISTANCE = 16;
 	private static final int TILE_WIDTH = 4;
 	private static final int TILE_HEIGHT = 4;
 
 	private final Client client;
-	private final GroundMarkerConfig config;
 	private final GroundMarkerPlugin plugin;
 
 	@Inject
-	private GroundMarkerMinimapOverlay(Client client, GroundMarkerConfig config, GroundMarkerPlugin plugin)
+	private GroundMarkerMinimapOverlay(final Client client, final GroundMarkerPlugin plugin)
 	{
 		this.client = client;
-		this.config = config;
 		this.plugin = plugin;
 		setPosition(OverlayPosition.DYNAMIC);
 		setPriority(OverlayPriority.LOW);
@@ -65,7 +64,7 @@ class GroundMarkerMinimapOverlay extends Overlay
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (!config.showMinimap())
+		if (!plugin.isShowMinimap())
 		{
 			return null;
 		}
@@ -79,20 +78,20 @@ class GroundMarkerMinimapOverlay extends Overlay
 				continue;
 			}
 
-			Color color = config.markerColor();
+			Color color = plugin.getMarkerColor();
 			switch (point.getGroundMarkerPoint().getGroup())
 			{
 				case 2:
-					color = config.markerColor2();
+					color = plugin.getMarkerColor2();
 					break;
 				case 3:
-					color = config.markerColor3();
+					color = plugin.getMarkerColor3();
 					break;
 				case 4:
-					color = config.markerColor4();
+					color = plugin.getMarkerColor4();
 			}
 
-			int opacity = (int) floor(config.minimapOverlayOpacity() * 2.55);
+			int opacity = (int) floor(plugin.getMinimapOverlayOpacity() * 2.55);
 			Color tileColor = new Color(color.getRed(), color.getGreen(), color.getBlue(), opacity);
 
 			drawOnMinimap(graphics, worldPoint, tileColor);
@@ -103,12 +102,6 @@ class GroundMarkerMinimapOverlay extends Overlay
 
 	private void drawOnMinimap(Graphics2D graphics, WorldPoint point, Color color)
 	{
-		WorldPoint playerLocation = client.getLocalPlayer().getWorldLocation();
-
-		if (point.distanceTo(playerLocation) >= MAX_DRAW_DISTANCE)
-		{
-			return;
-		}
 
 		LocalPoint lp = LocalPoint.fromWorld(client, point);
 		if (lp == null)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerOverlay.java
index 0d11dbf4a9..cb9b3c2eba 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerOverlay.java
@@ -31,6 +31,7 @@ import java.awt.Graphics2D;
 import java.awt.Polygon;
 import java.util.List;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.Perspective;
 import net.runelite.api.coords.LocalPoint;
@@ -41,17 +42,16 @@ import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayPriority;
 import net.runelite.client.ui.overlay.OverlayUtil;
 
+@Singleton
 public class GroundMarkerOverlay extends Overlay
 {
 	private final Client client;
-	private final GroundMarkerConfig config;
 	private final GroundMarkerPlugin plugin;
 
 	@Inject
-	private GroundMarkerOverlay(Client client, GroundMarkerConfig config, GroundMarkerPlugin plugin)
+	private GroundMarkerOverlay(final Client client, final GroundMarkerPlugin plugin)
 	{
 		this.client = client;
-		this.config = config;
 		this.plugin = plugin;
 		setPosition(OverlayPosition.DYNAMIC);
 		setPriority(OverlayPriority.LOW);
@@ -78,8 +78,6 @@ public class GroundMarkerOverlay extends Overlay
 			return;
 		}
 
-		WorldPoint playerLocation = client.getLocalPlayer().getWorldLocation();
-
 		LocalPoint lp = LocalPoint.fromWorld(client, point);
 		if (lp == null)
 		{
@@ -92,17 +90,17 @@ public class GroundMarkerOverlay extends Overlay
 			return;
 		}
 
-		Color color = config.markerColor();
+		Color color = plugin.getMarkerColor();
 		switch (groundMarkerWorldPoint.getGroundMarkerPoint().getGroup())
 		{
 			case 2:
-				color = config.markerColor2();
+				color = plugin.getMarkerColor2();
 				break;
 			case 3:
-				color = config.markerColor3();
+				color = plugin.getMarkerColor3();
 				break;
 			case 4:
-				color = config.markerColor4();
+				color = plugin.getMarkerColor4();
 		}
 		OverlayUtil.renderPolygon(graphics, poly, color);
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java
index 400b01bd52..f5ed119b16 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java
@@ -39,6 +39,7 @@ import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
@@ -51,6 +52,7 @@ import net.runelite.api.MenuEntry;
 import net.runelite.api.Tile;
 import net.runelite.api.coords.LocalPoint;
 import net.runelite.api.coords.WorldPoint;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.FocusChanged;
 import net.runelite.api.events.GameStateChanged;
 import net.runelite.api.events.MenuEntryAdded;
@@ -70,6 +72,7 @@ import net.runelite.client.util.Text;
 	description = "Enable marking of tiles using the Shift key",
 	tags = {"overlay", "tiles"}
 )
+@Singleton
 public class GroundMarkerPlugin extends Plugin
 {
 	private static final String CONFIG_GROUP = "groundMarker";
@@ -138,6 +141,19 @@ public class GroundMarkerPlugin extends Plugin
 	{
 	}
 
+	@Getter(AccessLevel.PACKAGE)
+	private Color markerColor;
+	@Getter(AccessLevel.PACKAGE)
+	private Color markerColor2;
+	@Getter(AccessLevel.PACKAGE)
+	private Color markerColor3;
+	@Getter(AccessLevel.PACKAGE)
+	private Color markerColor4;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showMinimap;
+	@Getter(AccessLevel.PACKAGE)
+	private int minimapOverlayOpacity;
+
 	@Provides
 	GroundMarkerConfig provideConfig(ConfigManager configManager)
 	{
@@ -339,6 +355,8 @@ public class GroundMarkerPlugin extends Plugin
 	@Override
 	protected void startUp()
 	{
+		updateConfig();
+
 		overlayManager.add(overlay);
 		overlayManager.add(minimapOverlay);
 		keyManager.registerKeyListener(inputListener);
@@ -354,7 +372,7 @@ public class GroundMarkerPlugin extends Plugin
 		points.clear();
 	}
 
-	protected void markTile(LocalPoint localPoint, int group)
+	private void markTile(LocalPoint localPoint, int group)
 	{
 		if (localPoint == null)
 		{
@@ -390,19 +408,38 @@ public class GroundMarkerPlugin extends Plugin
 
 	private Color getColor(int group)
 	{
-		Color color = config.markerColor();
+		Color color = this.markerColor;
 		switch (group)
 		{
 			case 2:
-				color = config.markerColor2();
+				color = this.markerColor2;
 				break;
 			case 3:
-				color = config.markerColor3();
+				color = this.markerColor3;
 				break;
 			case 4:
-				color = config.markerColor4();
+				color = this.markerColor4;
 		}
 
 		return color;
 	}
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (event.getGroup().equals("groundMarker"))
+		{
+			updateConfig();
+		}
+	}
+
+	private void updateConfig()
+	{
+		this.markerColor = config.markerColor();
+		this.markerColor2 = config.markerColor2();
+		this.markerColor3 = config.markerColor3();
+		this.markerColor4 = config.markerColor4();
+		this.showMinimap = config.showMinimap();
+		this.minimapOverlayOpacity = config.minimapOverlayOpacity();
+	}
 }
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPoint.java b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPoint.java
index e287f44efe..1d4e987862 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPoint.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPoint.java
@@ -26,31 +26,16 @@
 
 package net.runelite.client.plugins.groundmarkers;
 
+import lombok.EqualsAndHashCode;
 import lombok.Value;
 
 @Value
-public class GroundMarkerPoint
+@EqualsAndHashCode(exclude = { "group" })
+class GroundMarkerPoint
 {
 	private int regionId;
 	private int regionX;
 	private int regionY;
 	private int z;
 	private int group;
-
-	@Override
-	public String toString()
-	{
-		return "GroundMarkerPoint(regionId=" + regionId + ",regionX=" + regionX + ",=regionY" + regionY + ",z=" + z + ")";
-	}
-
-	@Override
-	public boolean equals(Object o)
-	{
-		if (!(o instanceof GroundMarkerPoint))
-		{
-			return false;
-		}
-
-		return o.toString().equals(this.toString());
-	}
 }
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerWorldPoint.java b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerWorldPoint.java
index 9ea9915459..57234eeca0 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerWorldPoint.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerWorldPoint.java
@@ -28,7 +28,7 @@ import lombok.Value;
 import net.runelite.api.coords.WorldPoint;
 
 @Value
-public class GroundMarkerWorldPoint
+class GroundMarkerWorldPoint
 {
 	private GroundMarkerPoint groundMarkerPoint;
 	private WorldPoint worldPoint;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarMinimapOverlay.java
index fff22cbc39..8e05236ea3 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarMinimapOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarMinimapOverlay.java
@@ -25,6 +25,7 @@
 package net.runelite.client.plugins.herbiboars;
 
 import com.google.inject.Inject;
+import com.google.inject.Singleton;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.util.Set;
@@ -34,25 +35,23 @@ import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayUtil;
-
+@Singleton
 public class HerbiboarMinimapOverlay extends Overlay
 {
 	private final HerbiboarPlugin plugin;
-	private final HerbiboarConfig config;
 
 	@Inject
-	public HerbiboarMinimapOverlay(HerbiboarPlugin plugin, HerbiboarConfig config)
+	public HerbiboarMinimapOverlay(final HerbiboarPlugin plugin)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_WIDGETS);
 		this.plugin = plugin;
-		this.config = config;
 	}
 
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (config.isTrailShown() && plugin.isInHerbiboarArea())
+		if (plugin.isTrailShown() && plugin.isInHerbiboarArea())
 		{
 			HerbiboarTrail currentTrail = plugin.getCurrentTrail();
 			int finishId = plugin.getFinishId();
@@ -70,7 +69,7 @@ public class HerbiboarMinimapOverlay extends Overlay
 
 				if (shownTrailIds.contains(id) && (finishId > 0 || (currentTrail != null && currentTrail.getTrailId() != id && currentTrail.getTrailId() + 1 != id)))
 				{
-					OverlayUtil.renderMinimapLocation(graphics, minimapLocation, config.getTrailColor());
+					OverlayUtil.renderMinimapLocation(graphics, minimapLocation, plugin.getGetTrailColor());
 				}
 			}
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarOverlay.java
index 653228cdb3..ad79b5b9e2 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarOverlay.java
@@ -25,6 +25,7 @@
 package net.runelite.client.plugins.herbiboars;
 
 import com.google.inject.Inject;
+import com.google.inject.Singleton;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
@@ -37,18 +38,17 @@ import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayUtil;
 
+@Singleton
 class HerbiboarOverlay extends Overlay
 {
 	private final HerbiboarPlugin plugin;
-	private final HerbiboarConfig config;
 
 	@Inject
-	public HerbiboarOverlay(HerbiboarPlugin plugin, HerbiboarConfig config)
+	public HerbiboarOverlay(final HerbiboarPlugin plugin)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_SCENE);
 		this.plugin = plugin;
-		this.config = config;
 	}
 
 	@Override
@@ -64,16 +64,14 @@ class HerbiboarOverlay extends Overlay
 		int finishId = plugin.getFinishId();
 
 		// Draw start objects
-		if (config.isStartShown() && (currentTrail == null && finishId == 0))
+		if (plugin.isStartShown() && (currentTrail == null && finishId == 0))
 		{
 			plugin.getStarts().values().forEach((obj) ->
-			{
-				OverlayUtil.renderTileOverlay(graphics, obj, "", config.getStartColor());
-			});
+				OverlayUtil.renderTileOverlay(graphics, obj, "", plugin.getGetStartColor()));
 		}
 
 		// Draw trails
-		if (config.isTrailShown())
+		if (plugin.isTrailShown())
 		{
 			Set<Integer> shownTrailIds = plugin.getShownTrails();
 			plugin.getTrails().values().forEach((x) ->
@@ -81,13 +79,13 @@ class HerbiboarOverlay extends Overlay
 				int id = x.getId();
 				if (shownTrailIds.contains(id) && (finishId > 0 || (currentTrail != null && currentTrail.getTrailId() != id && currentTrail.getTrailId() + 1 != id)))
 				{
-					OverlayUtil.renderTileOverlay(graphics, x, "", config.getTrailColor());
+					OverlayUtil.renderTileOverlay(graphics, x, "", plugin.getGetTrailColor());
 				}
 			});
 		}
 
 		// Draw trail objects (mushrooms, mud, etc)
-		if (config.isObjectShown() && currentTrail != null)
+		if (plugin.isObjectShown() && currentTrail != null)
 		{
 			int currentPath = plugin.getCurrentPath();
 			WorldPoint[] trailLocs = currentTrail.getObjectLocs(currentPath);
@@ -101,12 +99,12 @@ class HerbiboarOverlay extends Overlay
 				TileObject object = plugin.getTrailObjects().get(trailLoc);
 				if (object != null)
 				{
-					if (config.showClickBoxes())
+					if (plugin.isShowClickBoxes())
 					{
 						Area clickbox = object.getClickbox();
 						if (clickbox != null)
 						{
-							graphics.setColor(config.getObjectColor());
+							graphics.setColor(plugin.getGetObjectColor());
 							graphics.draw(clickbox);
 							graphics.setColor(new Color(255, 0, 255, 20));
 							graphics.fill(clickbox);
@@ -114,25 +112,25 @@ class HerbiboarOverlay extends Overlay
 					}
 					else
 					{
-						OverlayUtil.renderTileOverlay(graphics, object, "", config.getObjectColor());
+						OverlayUtil.renderTileOverlay(graphics, object, "", plugin.getGetObjectColor());
 					}
 				}
 			}
 		}
 
 		// Draw finish tunnels
-		if (config.isTunnelShown() && finishId > 0)
+		if (plugin.isTunnelShown() && finishId > 0)
 		{
 			WorldPoint finishLoc = plugin.getEndLocations().get(finishId - 1);
 			TileObject object = plugin.getTunnels().get(finishLoc);
 			if (object != null)
 			{
-				if (config.showClickBoxes())
+				if (plugin.isShowClickBoxes())
 				{
 					Area clickbox = object.getClickbox();
 					if (clickbox != null)
 					{
-						Color col = config.getObjectColor();
+						Color col = plugin.getGetObjectColor();
 						graphics.setColor(col);
 						graphics.draw(clickbox);
 						graphics.setColor(new Color(col.getRed(), col.getGreen(), col.getBlue(), 20));
@@ -141,7 +139,7 @@ class HerbiboarOverlay extends Overlay
 				}
 				else
 				{
-					OverlayUtil.renderTileOverlay(graphics, object, "", config.getTunnelColor());
+					OverlayUtil.renderTileOverlay(graphics, object, "", plugin.getGetTunnelColor());
 				}
 			}
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarPlugin.java
index b921bb5495..cc6dc7258d 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarPlugin.java
@@ -25,6 +25,7 @@
 package net.runelite.client.plugins.herbiboars;
 
 import com.google.inject.Provides;
+import java.awt.Color;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -32,6 +33,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
 import net.runelite.api.Client;
@@ -44,6 +47,7 @@ import net.runelite.api.Tile;
 import net.runelite.api.TileObject;
 import net.runelite.api.Varbits;
 import net.runelite.api.coords.WorldPoint;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.GameObjectChanged;
 import net.runelite.api.events.GameObjectDespawned;
 import net.runelite.api.events.GameObjectSpawned;
@@ -63,6 +67,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	description = "Highlight starting rocks, trails, and the objects to search at the end of each trail",
 	tags = {"herblore", "hunter", "skilling", "overlay"}
 )
+@Singleton
 public class HerbiboarPlugin extends Plugin
 {
 	private static final List<WorldPoint> END_LOCATIONS = Arrays.asList(
@@ -104,37 +109,59 @@ public class HerbiboarPlugin extends Plugin
 	@Inject
 	private HerbiboarMinimapOverlay minimapOverlay;
 
-	@Getter
+	@Inject
+	private HerbiboarConfig config;
+
+	@Getter(AccessLevel.PACKAGE)
 	private boolean inHerbiboarArea;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private Map<WorldPoint, TileObject> trails = new HashMap<>();
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private Map<WorldPoint, TileObject> tunnels = new HashMap<>();
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private Map<WorldPoint, TileObject> starts = new HashMap<>();
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private Map<WorldPoint, TileObject> trailObjects = new HashMap<>();
 
-	@Getter
-	@Setter
+	@Getter(AccessLevel.PACKAGE)
+	@Setter(AccessLevel.PACKAGE)
 	private Set<Integer> shownTrails = new HashSet<>();
 
-	@Getter
-	@Setter
+	@Getter(AccessLevel.PACKAGE)
+	@Setter(AccessLevel.PACKAGE)
 	private HerbiboarTrail currentTrail;
 
-	@Getter
-	@Setter
+	@Getter(AccessLevel.PACKAGE)
+	@Setter(AccessLevel.PACKAGE)
 	private int currentPath;
 
-	@Getter
-	@Setter
+	@Getter(AccessLevel.PACKAGE)
+	@Setter(AccessLevel.PACKAGE)
 	private int finishId;
 
+	@Getter(AccessLevel.PACKAGE)
+	private boolean isStartShown;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showClickBoxes;
+	@Getter(AccessLevel.PACKAGE)
+	private Color getStartColor;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean isTunnelShown;
+	@Getter(AccessLevel.PACKAGE)
+	private Color getTunnelColor;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean isObjectShown;
+	@Getter(AccessLevel.PACKAGE)
+	private Color getObjectColor;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean isTrailShown;
+	@Getter(AccessLevel.PACKAGE)
+	private Color getTrailColor;
+
 	@Provides
 	HerbiboarConfig getConfig(ConfigManager configManager)
 	{
@@ -144,6 +171,8 @@ public class HerbiboarPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
+
 		overlayManager.add(overlay);
 		overlayManager.add(minimapOverlay);
 		inHerbiboarArea = checkArea();
@@ -260,19 +289,19 @@ public class HerbiboarPlugin extends Plugin
 	@Subscribe
 	public void onGroundObjectSpawned(GroundObjectSpawned event)
 	{
-		onGroundObject(event.getTile(), null, event.getGroundObject());
+		onGroundObject( null, event.getGroundObject());
 	}
 
 	@Subscribe
 	public void onGroundObjectChanged(GroundObjectChanged event)
 	{
-		onGroundObject(event.getTile(), event.getPrevious(), event.getGroundObject());
+		onGroundObject(event.getPrevious(), event.getGroundObject());
 	}
 
 	@Subscribe
 	public void onGroundObjectDespawned(GroundObjectDespawned event)
 	{
-		onGroundObject(event.getTile(), event.getGroundObject(), null);
+		onGroundObject(event.getGroundObject(), null);
 	}
 
 	// Store relevant GameObjects (starts, objects used to trigger next trails, and some tunnels)
@@ -313,7 +342,7 @@ public class HerbiboarPlugin extends Plugin
 	}
 
 	// Store relevant GroundObjects (tracks on trails, and some tunnels)
-	private void onGroundObject(Tile tile, TileObject oldObject, TileObject newObject)
+	private void onGroundObject(TileObject oldObject, TileObject newObject)
 	{
 		if (oldObject != null)
 		{
@@ -348,8 +377,30 @@ public class HerbiboarPlugin extends Plugin
 			.toArray().length > 0;
 	}
 
-	public List<WorldPoint> getEndLocations()
+	List<WorldPoint> getEndLocations()
 	{
 		return END_LOCATIONS;
 	}
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (event.getGroup().equals("herbiboar"))
+		{
+			updateConfig();
+		}
+	}
+
+	private void updateConfig()
+	{
+		this.isStartShown = config.isStartShown();
+		this.showClickBoxes = config.showClickBoxes();
+		this.getStartColor = config.getStartColor();
+		this.isTunnelShown = config.isTunnelShown();
+		this.getTunnelColor = config.getTunnelColor();
+		this.isObjectShown = config.isObjectShown();
+		this.getObjectColor = config.getObjectColor();
+		this.isTrailShown = config.isTrailShown();
+		this.getTrailColor = config.getTrailColor();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersPlugin.java
index 15ae602352..0fb87507c7 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersPlugin.java
@@ -33,6 +33,7 @@ import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.GameState;
 import net.runelite.api.HashTable;
@@ -50,7 +51,16 @@ import net.runelite.client.eventbus.Subscribe;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginDescriptor;
 import net.runelite.client.plugins.PluginType;
+import net.runelite.client.plugins.hideprayers.util.Armadyl;
+import net.runelite.client.plugins.hideprayers.util.Bandos;
+import net.runelite.client.plugins.hideprayers.util.Barrows;
+import net.runelite.client.plugins.hideprayers.util.Cerberus;
+import net.runelite.client.plugins.hideprayers.util.PVPPrayers;
 import net.runelite.client.plugins.hideprayers.util.PrayerTabStates;
+import net.runelite.client.plugins.hideprayers.util.Saradomin;
+import net.runelite.client.plugins.hideprayers.util.Vorkath;
+import net.runelite.client.plugins.hideprayers.util.Zamorak;
+import net.runelite.client.plugins.hideprayers.util.Zulrah;
 
 @PluginDescriptor(
 	name = "Show/Hide Prayers",
@@ -58,7 +68,7 @@ import net.runelite.client.plugins.hideprayers.util.PrayerTabStates;
 	type = PluginType.UTILITY,
 	enabledByDefault = false
 )
-
+@Singleton
 public class HidePrayersPlugin extends Plugin
 {
 	private static final List<WidgetInfo> PRAYER_WIDGET_INFO_LIST = ImmutableList.of(
@@ -99,6 +109,56 @@ public class HidePrayersPlugin extends Plugin
 	@Inject
 	private HidePrayersConfig config;
 
+	private boolean showindividualprayers;
+	private boolean ShowTHICK_SKIN;
+	private boolean ShowBURST_OF_STRENGTH;
+	private boolean ShowCLARITY_OF_THOUGHT;
+	private boolean ShowSHARP_EYE;
+	private boolean ShowMYSTIC_WILL;
+	private boolean ShowROCK_SKIN;
+	private boolean ShowSUPERHUMAN_STRENGTH;
+	private boolean ShowIMPROVED_REFLEXES;
+	private boolean ShowRapidRestore;
+	private boolean ShowRapidHeal;
+	private boolean ShowProtectItem;
+	private boolean ShowHAWK_EYE;
+	private boolean ShowMYSTIC_LORE;
+	private boolean ShowSteelSkin;
+	private boolean ShowUltimateStrength;
+	private boolean ShowIncredibleReflex;
+	private boolean ShowPTFMagic;
+	private boolean ShowPTFRange;
+	private boolean ShowPTFMelee;
+	private boolean ShowEagle;
+	private boolean ShowMystic;
+	private boolean ShowRETRIBUTION;
+	private boolean ShowRedemption;
+	private boolean ShowSmite;
+	private boolean ShowPreserve;
+	private boolean ShowChivalry;
+	private boolean ShowPiety;
+	private boolean ShowRigour;
+	private boolean ShowAugury;
+	private boolean getarmadylprayers;
+	private Armadyl armadyl;
+	private boolean getbarrowsprayers;
+	private Barrows barrows;
+	private boolean getbandosprayers;
+	private Bandos bandos;
+	private boolean getcerberusprayers;
+	private Cerberus cerberus;
+	private boolean getsaradominprayers;
+	private Saradomin saradomin;
+	private boolean getvorkathprayers;
+	private Vorkath vorkath;
+	private boolean getzamorakprayers;
+	private Zamorak zamorak;
+	private boolean getzulrahprayers;
+	private Zulrah zulrah;
+	private boolean getpvpprayers;
+	private PVPPrayers pvpprayers;
+	private boolean HideRapidHealRestore;
+
 	@Provides
 	HidePrayersConfig provideConfig(ConfigManager configManager)
 	{
@@ -108,6 +168,7 @@ public class HidePrayersPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
 		hidePrayers();
 	}
 
@@ -132,6 +193,7 @@ public class HidePrayersPlugin extends Plugin
 	{
 		if (event.getGroup().equals("hideprayers"))
 		{
+			updateConfig();
 			hidePrayers();
 		}
 	}
@@ -233,16 +295,16 @@ public class HidePrayersPlugin extends Plugin
 				return;
 			}
 
-			if ( !config.showindividualprayers()
-				&& !config.getarmadylprayers()
-				&& !config.getbarrowsprayers()
-				&& !config.getbandosprayers()
-				&& !config.getcerberusprayers()
-				&& !config.getsaradominprayers()
-				&& !config.getvorkathprayers()
-				&& !config.getzamorakprayers()
-				&& !config.getzulrahprayers()
-				&& !config.getpvpprayers())
+			if ( !this.showindividualprayers
+				&& !this.getarmadylprayers
+				&& !this.getbarrowsprayers
+				&& !this.getbandosprayers
+				&& !this.getcerberusprayers
+				&& !this.getsaradominprayers
+				&& !this.getvorkathprayers
+				&& !this.getzamorakprayers
+				&& !this.getzulrahprayers
+				&& !this.getpvpprayers)
 			{
 				restorePrayers();
 				return;
@@ -250,42 +312,42 @@ public class HidePrayersPlugin extends Plugin
 
 			reallyHidePrayers();
 
-			if (config.showindividualprayers())
+			if (this.showindividualprayers)
 			{
-				prayerWidgets.get(0).setHidden(!config.ShowTHICK_SKIN());	// Thick Skin
-				prayerWidgets.get(1).setHidden(!config.ShowBURST_OF_STRENGTH());	// Burst of Strength
-				prayerWidgets.get(2).setHidden(!config.ShowCLARITY_OF_THOUGHT());	// Clarity of Thought
-				prayerWidgets.get(3).setHidden(!config.ShowSHARP_EYE());	// Sharp Eye
-				prayerWidgets.get(4).setHidden(!config.ShowMYSTIC_WILL());	// Mystic Will
-				prayerWidgets.get(5).setHidden(!config.ShowROCK_SKIN());	// Rock Skin
-				prayerWidgets.get(6).setHidden(!config.ShowSUPERHUMAN_STRENGTH());	// Super Human Strength
-				prayerWidgets.get(7).setHidden(!config.ShowIMPROVED_REFLEXES());	// Improved_Reflexes
-				prayerWidgets.get(8).setHidden(!config.ShowRapidRestore());	// Rapid Restore
-				prayerWidgets.get(9).setHidden(!config.ShowRapidHeal());	// Rapid Heal
-				prayerWidgets.get(10).setHidden(!config.ShowProtectItem());	// Protect Item
-				prayerWidgets.get(11).setHidden(!config.ShowHAWK_EYE());	// Hawk Eye
-				prayerWidgets.get(12).setHidden(!config.ShowMYSTIC_LORE());	// Mystic Lore
-				prayerWidgets.get(13).setHidden(!config.ShowSteelSkin());	// Steel Skin
-				prayerWidgets.get(14).setHidden(!config.ShowUltimateStrength());	// Ultimate Strength
-				prayerWidgets.get(15).setHidden(!config.ShowIncredibleReflex());	// Incredible Reflexes
-				prayerWidgets.get(16).setHidden(!config.ShowPTFMagic());	// Protect from Magic
-				prayerWidgets.get(17).setHidden(!config.ShowPTFRange());	// Protect from Range
-				prayerWidgets.get(18).setHidden(!config.ShowPTFMelee());	// Protect from Melee
-				prayerWidgets.get(19).setHidden(!config.ShowEagle());	// eagle eye
-				prayerWidgets.get(20).setHidden(!config.ShowMystic());	// Mystic Might
-				prayerWidgets.get(21).setHidden(!config.ShowRETRIBUTION());	// Retribution
-				prayerWidgets.get(22).setHidden(!config.ShowRedemption());	// Redemption
-				prayerWidgets.get(23).setHidden(!config.ShowSmite());	// Smite
-				prayerWidgets.get(24).setHidden(!config.ShowPreserve());	// Preserve
-				prayerWidgets.get(25).setHidden(!config.ShowChivalry());	// Chivalry
-				prayerWidgets.get(26).setHidden(!config.ShowPiety());	// Piety
-				prayerWidgets.get(27).setHidden(!config.ShowRigour());	// Rigour
-				prayerWidgets.get(28).setHidden(!config.ShowAugury());	// Augury
+				prayerWidgets.get(0).setHidden(!this.ShowTHICK_SKIN);	// Thick Skin
+				prayerWidgets.get(1).setHidden(!this.ShowBURST_OF_STRENGTH);	// Burst of Strength
+				prayerWidgets.get(2).setHidden(!this.ShowCLARITY_OF_THOUGHT);	// Clarity of Thought
+				prayerWidgets.get(3).setHidden(!this.ShowSHARP_EYE);	// Sharp Eye
+				prayerWidgets.get(4).setHidden(!this.ShowMYSTIC_WILL);	// Mystic Will
+				prayerWidgets.get(5).setHidden(!this.ShowROCK_SKIN);	// Rock Skin
+				prayerWidgets.get(6).setHidden(!this.ShowSUPERHUMAN_STRENGTH);	// Super Human Strength
+				prayerWidgets.get(7).setHidden(!this.ShowIMPROVED_REFLEXES);	// Improved_Reflexes
+				prayerWidgets.get(8).setHidden(!this.ShowRapidRestore);	// Rapid Restore
+				prayerWidgets.get(9).setHidden(!this.ShowRapidHeal);	// Rapid Heal
+				prayerWidgets.get(10).setHidden(!this.ShowProtectItem);	// Protect Item
+				prayerWidgets.get(11).setHidden(!this.ShowHAWK_EYE);	// Hawk Eye
+				prayerWidgets.get(12).setHidden(!this.ShowMYSTIC_LORE);	// Mystic Lore
+				prayerWidgets.get(13).setHidden(!this.ShowSteelSkin);	// Steel Skin
+				prayerWidgets.get(14).setHidden(!this.ShowUltimateStrength);	// Ultimate Strength
+				prayerWidgets.get(15).setHidden(!this.ShowIncredibleReflex);	// Incredible Reflexes
+				prayerWidgets.get(16).setHidden(!this.ShowPTFMagic);	// Protect from Magic
+				prayerWidgets.get(17).setHidden(!this.ShowPTFRange);	// Protect from Range
+				prayerWidgets.get(18).setHidden(!this.ShowPTFMelee);	// Protect from Melee
+				prayerWidgets.get(19).setHidden(!this.ShowEagle);	// eagle eye
+				prayerWidgets.get(20).setHidden(!this.ShowMystic);	// Mystic Might
+				prayerWidgets.get(21).setHidden(!this.ShowRETRIBUTION);	// Retribution
+				prayerWidgets.get(22).setHidden(!this.ShowRedemption);	// Redemption
+				prayerWidgets.get(23).setHidden(!this.ShowSmite);	// Smite
+				prayerWidgets.get(24).setHidden(!this.ShowPreserve);	// Preserve
+				prayerWidgets.get(25).setHidden(!this.ShowChivalry);	// Chivalry
+				prayerWidgets.get(26).setHidden(!this.ShowPiety);	// Piety
+				prayerWidgets.get(27).setHidden(!this.ShowRigour);	// Rigour
+				prayerWidgets.get(28).setHidden(!this.ShowAugury);	// Augury
 			}
 
-			else if (config.getarmadylprayers())
+			else if (this.getarmadylprayers)
 			{
-				switch (config.armadyl())
+				switch (this.armadyl)
 				{
 					case DISABLED:
 						break;
@@ -306,9 +368,9 @@ public class HidePrayersPlugin extends Plugin
 				}
 			}
 
-			else if (config.getbandosprayers())
+			else if (this.getbandosprayers)
 			{
-				switch (config.bandos())
+				switch (this.bandos)
 				{
 					case DISABLED:
 						break;
@@ -329,9 +391,9 @@ public class HidePrayersPlugin extends Plugin
 				}
 			}
 
-			else if (config.getbarrowsprayers())
+			else if (this.getbarrowsprayers)
 			{
-				switch (config.barrows())
+				switch (this.barrows)
 				{
 					case DISABLED:
 						break;
@@ -356,9 +418,9 @@ public class HidePrayersPlugin extends Plugin
 				}
 			}
 
-			else if (config.getcerberusprayers())
+			else if (this.getcerberusprayers)
 			{
-				switch (config.cerberus())
+				switch (this.cerberus)
 				{
 					case DISABLED:
 						break;
@@ -399,9 +461,9 @@ public class HidePrayersPlugin extends Plugin
 				}
 			}
 
-			else if (config.getsaradominprayers())
+			else if (this.getsaradominprayers)
 			{
-				switch (config.saradomin())
+				switch (this.saradomin)
 				{
 					case DISABLED:
 						break;
@@ -423,9 +485,9 @@ public class HidePrayersPlugin extends Plugin
 						break;
 				}
 			}
-			else if (config.getvorkathprayers())
+			else if (this.getvorkathprayers)
 			{
-				switch (config.vorkath())
+				switch (this.vorkath)
 				{
 					case DISABLED:
 						break;
@@ -446,9 +508,9 @@ public class HidePrayersPlugin extends Plugin
 				}
 			}
 			
-			else if (config.getzamorakprayers())
+			else if (this.getzamorakprayers)
 			{
-				switch (config.zamorak())
+				switch (this.zamorak)
 				{
 					case DISABLED:
 						break;
@@ -471,9 +533,9 @@ public class HidePrayersPlugin extends Plugin
 				}
 			}
 
-			else if (config.getzulrahprayers())
+			else if (this.getzulrahprayers)
 			{
-				switch (config.zulrah())
+				switch (this.zulrah)
 				{
 					case DISABLED:
 						break;
@@ -496,9 +558,9 @@ public class HidePrayersPlugin extends Plugin
 				}
 			}
 
-			else if (config.getpvpprayers())
+			else if (this.getpvpprayers)
 			{
-				if (config.HideRapidHealRestore())
+				if (this.HideRapidHealRestore)
 				{
 					prayerWidgets.get(8).setHidden(true);    // Rapid Restore
 					prayerWidgets.get(9).setHidden(true);    // Rapid Heal
@@ -518,7 +580,7 @@ public class HidePrayersPlugin extends Plugin
 					prayerWidgets.get(10).setHidden(false);    // Protect Item
 				}
 
-				switch (config.pvpprayers())
+				switch (this.pvpprayers)
 				{
 					case DISABLED:
 						reallyHidePrayers();
@@ -651,4 +713,57 @@ public class HidePrayersPlugin extends Plugin
 			}
 		}
 	}
+
+	private void updateConfig()
+	{
+		this.showindividualprayers = config.showindividualprayers();
+		this.ShowTHICK_SKIN = config.ShowTHICK_SKIN();
+		this.ShowBURST_OF_STRENGTH = config.ShowBURST_OF_STRENGTH();
+		this.ShowCLARITY_OF_THOUGHT = config.ShowCLARITY_OF_THOUGHT();
+		this.ShowSHARP_EYE = config.ShowSHARP_EYE();
+		this.ShowMYSTIC_WILL = config.ShowMYSTIC_WILL();
+		this.ShowROCK_SKIN = config.ShowROCK_SKIN();
+		this.ShowSUPERHUMAN_STRENGTH = config.ShowSUPERHUMAN_STRENGTH();
+		this.ShowIMPROVED_REFLEXES = config.ShowIMPROVED_REFLEXES();
+		this.ShowRapidRestore = config.ShowRapidRestore();
+		this.ShowRapidHeal = config.ShowRapidHeal();
+		this.ShowProtectItem = config.ShowProtectItem();
+		this.ShowHAWK_EYE = config.ShowHAWK_EYE();
+		this.ShowMYSTIC_LORE = config.ShowMYSTIC_LORE();
+		this.ShowSteelSkin = config.ShowSteelSkin();
+		this.ShowUltimateStrength = config.ShowUltimateStrength();
+		this.ShowIncredibleReflex = config.ShowIncredibleReflex();
+		this.ShowPTFMagic = config.ShowPTFMagic();
+		this.ShowPTFRange = config.ShowPTFRange();
+		this.ShowPTFMelee = config.ShowPTFMelee();
+		this.ShowEagle = config.ShowEagle();
+		this.ShowMystic = config.ShowMystic();
+		this.ShowRETRIBUTION = config.ShowRETRIBUTION();
+		this.ShowRedemption = config.ShowRedemption();
+		this.ShowSmite = config.ShowSmite();
+		this.ShowPreserve = config.ShowPreserve();
+		this.ShowChivalry = config.ShowChivalry();
+		this.ShowPiety = config.ShowPiety();
+		this.ShowRigour = config.ShowRigour();
+		this.ShowAugury = config.ShowAugury();
+		this.getarmadylprayers = config.getarmadylprayers();
+		this.armadyl = config.armadyl();
+		this.getbarrowsprayers = config.getbarrowsprayers();
+		this.barrows = config.barrows();
+		this.getbandosprayers = config.getbandosprayers();
+		this.bandos = config.bandos();
+		this.getcerberusprayers = config.getcerberusprayers();
+		this.cerberus = config.cerberus();
+		this.getsaradominprayers = config.getsaradominprayers();
+		this.saradomin = config.saradomin();
+		this.getvorkathprayers = config.getvorkathprayers();
+		this.vorkath = config.vorkath();
+		this.getzamorakprayers = config.getzamorakprayers();
+		this.zamorak = config.zamorak();
+		this.getzulrahprayers = config.getzulrahprayers();
+		this.zulrah = config.zulrah();
+		this.getpvpprayers = config.getpvpprayers();
+		this.pvpprayers = config.pvpprayers();
+		this.HideRapidHealRestore = config.HideRapidHealRestore();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/highalchemy/HighAlchemyOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/highalchemy/HighAlchemyOverlay.java
index 191b7c9cf9..d4de57b30e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/highalchemy/HighAlchemyOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/highalchemy/HighAlchemyOverlay.java
@@ -33,6 +33,7 @@ import java.awt.Graphics2D;
 import java.awt.Rectangle;
 import java.awt.image.BufferedImage;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.ItemDefinition;
 import net.runelite.api.ItemID;
 import net.runelite.api.widgets.Widget;
@@ -41,19 +42,18 @@ import net.runelite.api.widgets.WidgetItem;
 import net.runelite.client.game.ItemManager;
 import net.runelite.client.ui.overlay.WidgetItemOverlay;
 
+@Singleton
 public class HighAlchemyOverlay extends WidgetItemOverlay
 {
 	private final ItemManager itemManager;
-	private final HighAlchemyConfig config;
 	private final HighAlchemyPlugin plugin;
 	private final int alchPrice;
 	private final int alchPriceNoStaff;
 
 	@Inject
-	public HighAlchemyOverlay(ItemManager itemManager, HighAlchemyPlugin plugin, HighAlchemyConfig config)
+	public HighAlchemyOverlay(final ItemManager itemManager, final HighAlchemyPlugin plugin)
 	{
 		this.itemManager = itemManager;
-		this.config = config;
 		this.plugin = plugin;
 
 		int natPrice = itemManager.getItemPrice(ItemID.NATURE_RUNE);
@@ -78,13 +78,13 @@ public class HighAlchemyOverlay extends WidgetItemOverlay
 		final int id = getNotedId(itemId);
 		final int gePrice = getGEPrice(id);
 		final int haPrice = getHAPrice(id);
-		final int materialCost = config.usingFireRunes() ? alchPriceNoStaff : alchPrice;
-		final int desiredProfit = config.minProfit();
+		final int materialCost = plugin.isUsingFireRunes() ? alchPriceNoStaff : alchPrice;
+		final int desiredProfit = plugin.getMinProfit();
 		final int haProfit = getHAProfit(haPrice, gePrice, materialCost);
 
 		if (gePrice > 0 && haPrice > 0 && haProfit >= desiredProfit)
 		{
-			final Color color = config.getHighlightColor();
+			final Color color = plugin.getGetHighlightColor();
 
 			if (color != null)
 			{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/highalchemy/HighAlchemyPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/highalchemy/HighAlchemyPlugin.java
index ecfa486fed..79be6bbac4 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/highalchemy/HighAlchemyPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/highalchemy/HighAlchemyPlugin.java
@@ -28,10 +28,12 @@
 package net.runelite.client.plugins.highalchemy;
 
 import com.google.inject.Provides;
+import java.awt.Color;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.events.ConfigChanged;
@@ -57,7 +59,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	type = PluginType.UTILITY,
 	enabledByDefault = false
 )
-
+@Singleton
 public class HighAlchemyPlugin extends Plugin
 {
 	private static final String CONFIG_GROUP = "highalchemy";
@@ -80,9 +82,19 @@ public class HighAlchemyPlugin extends Plugin
 		return configManager.getConfig(HighAlchemyConfig.class);
 	}
 
+	private boolean showBank;
+	private boolean showInventory;
+	@Getter(AccessLevel.PACKAGE)
+	private Color getHighlightColor;
+	@Getter(AccessLevel.PACKAGE)
+	private int minProfit;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean usingFireRunes;
+
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
 		buildGroupList();
 		overlayManager.add(overlay);
 	}
@@ -98,6 +110,7 @@ public class HighAlchemyPlugin extends Plugin
 	{
 		if (event.getGroup().equals(CONFIG_GROUP))
 		{
+			updateConfig();
 			buildGroupList();
 		}
 	}
@@ -106,12 +119,12 @@ public class HighAlchemyPlugin extends Plugin
 	{
 		interfaceGroups.clear();
 
-		if (config.showBank())
+		if (this.showBank)
 		{
 			interfaceGroups.add(BANK_GROUP_ID);
 		}
 
-		if (config.showInventory())
+		if (this.showInventory)
 		{
 			Arrays.stream(
 				new int[]{
@@ -126,4 +139,13 @@ public class HighAlchemyPlugin extends Plugin
 			).forEach(interfaceGroups::add);
 		}
 	}
+
+	private void updateConfig()
+	{
+		this.showBank = config.showBank();
+		this.showInventory = config.showInventory();
+		this.getHighlightColor = config.getHighlightColor();
+		this.minProfit = config.minProfit();
+		this.usingFireRunes = config.usingFireRunes();
+	}
 }
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java
index cf2de858e9..f0c7df167c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java
@@ -43,6 +43,7 @@ import java.util.List;
 import java.util.concurrent.ScheduledExecutorService;
 import javax.annotation.Nullable;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import javax.swing.ImageIcon;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -95,6 +96,7 @@ import static net.runelite.http.api.hiscore.HiscoreSkill.WOODCUTTING;
 import net.runelite.http.api.hiscore.Skill;
 
 @Slf4j
+@Singleton
 public class HiscorePanel extends PluginPanel
 {
 	/* The maximum allowed username length in runescape accounts */
@@ -127,15 +129,11 @@ public class HiscorePanel extends PluginPanel
 
 	private final List<JLabel> skillLabels = new ArrayList<>();
 
-	private final JPanel statsPanel = new JPanel();
-
 	/* Container of all the selectable endpoints (ironman, deadman, etc) */
 	private final MaterialTabGroup tabGroup;
 
 	private final HiscoreClient hiscoreClient = new HiscoreClient();
 
-	private HiscoreResult result;
-
 	/* The currently selected endpoint */
 	private HiscoreEndpoint selectedEndPoint;
 
@@ -245,6 +243,7 @@ public class HiscorePanel extends PluginPanel
 
 		// Panel that holds skill icons
 		GridLayout stats = new GridLayout(8, 3);
+		JPanel statsPanel = new JPanel();
 		statsPanel.setLayout(stats);
 		statsPanel.setBackground(ColorScheme.DARKER_GRAY_COLOR);
 		statsPanel.setBorder(new EmptyBorder(5, 0, 5, 0));
@@ -369,6 +368,7 @@ public class HiscorePanel extends PluginPanel
 			selectedEndPoint = HiscoreEndpoint.NORMAL;
 		}
 
+		HiscoreResult result;
 		try
 		{
 			log.debug("Hiscore endpoint " + selectedEndPoint.name() + " selected");
@@ -605,7 +605,11 @@ public class HiscorePanel extends PluginPanel
 		 */
 		if (SKILLS.contains(skill))
 		{
-			long experience = result.getSkill(skill).getExperience();
+			long experience = 0;
+			if (skill != null)
+			{
+				experience = result.getSkill(skill).getExperience();
+			}
 			if (experience >= 0)
 			{
 				int currentXp = (int) experience;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java
index a7f7dd9b4a..a90ca7b8ba 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java
@@ -35,6 +35,7 @@ import java.util.regex.Pattern;
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 import javax.inject.Provider;
+import javax.inject.Singleton;
 import javax.swing.SwingUtilities;
 import net.runelite.api.ChatMessageType;
 import net.runelite.api.Client;
@@ -62,6 +63,7 @@ import org.apache.commons.lang3.ArrayUtils;
 	tags = {"panel", "players"},
 	loadWhenOutdated = true
 )
+@Singleton
 public class HiscorePlugin extends Plugin
 {
 	private static final String LOOKUP = "Lookup";
@@ -179,8 +181,6 @@ public class HiscorePlugin extends Plugin
 			groupId == WidgetInfo.CHATBOX.getGroupId() && !KICK_OPTION.equals(option) || //prevent from adding for Kick option (interferes with the raiding party one)
 			groupId == WidgetInfo.RAIDING_PARTY.getGroupId() || groupId == WidgetInfo.PRIVATE_CHAT_MESSAGE.getGroupId())
 		{
-			boolean after;
-
 			if (!AFTER_OPTIONS.contains(option))
 			{
 				return;
@@ -194,7 +194,10 @@ public class HiscorePlugin extends Plugin
 			lookup.setParam1(event.getActionParam1());
 			lookup.setIdentifier(event.getIdentifier());
 
-			insertMenuEntry(lookup, client.getMenuEntries());
+			if (client != null)
+			{
+				insertMenuEntry(lookup, client.getMenuEntries());
+			}
 		}
 	}
 
@@ -228,7 +231,10 @@ public class HiscorePlugin extends Plugin
 		MenuEntry[] newMenu = ObjectArrays.concat(entries, newEntry);
 		int menuEntryCount = newMenu.length;
 		ArrayUtils.swap(newMenu, menuEntryCount - 1, menuEntryCount - 2);
-		client.setMenuEntries(newMenu);
+		if (client != null)
+		{
+			client.setMenuEntries(newMenu);
+		}
 	}
 
 	private void lookupPlayer(String playerName)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/NameAutocompleter.java b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/NameAutocompleter.java
index 3fd3fbe26d..bf23f9190f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/NameAutocompleter.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/NameAutocompleter.java
@@ -68,7 +68,7 @@ class NameAutocompleter implements KeyListener
 	private Pattern autocompleteNamePattern;
 
 	@Inject
-	private NameAutocompleter(@Nullable Client client)
+	private NameAutocompleter(@Nullable final Client client)
 	{
 		this.client = client;
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hunter/HunterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/hunter/HunterPlugin.java
index 2e307a4992..8601a91289 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/hunter/HunterPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/hunter/HunterPlugin.java
@@ -25,11 +25,14 @@
 package net.runelite.client.plugins.hunter;
 
 import com.google.inject.Provides;
+import java.awt.Color;
 import java.time.Instant;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
@@ -56,6 +59,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	description = "Show the state of your traps",
 	tags = {"overlay", "skilling", "timers"}
 )
+@Singleton
 public class HunterPlugin extends Plugin
 {
 	@Inject
@@ -73,14 +77,24 @@ public class HunterPlugin extends Plugin
 	@Inject
 	private HunterConfig config;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final Map<WorldPoint, HunterTrap> traps = new HashMap<>();
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private Instant lastActionTime = Instant.ofEpochMilli(0);
 
 	private WorldPoint lastTickLocalPlayerLocation;
 
+	@Getter(AccessLevel.PACKAGE)
+	private Color getOpenTrapColor;
+	@Getter(AccessLevel.PACKAGE)
+	private Color getFullTrapColor;
+	@Getter(AccessLevel.PACKAGE)
+	private Color getEmptyTrapColor;
+	@Getter(AccessLevel.PACKAGE)
+	private Color getTransTrapColor;
+	private boolean maniacalMonkeyNotify;
+
 	@Provides
 	HunterConfig provideConfig(ConfigManager configManager)
 	{
@@ -90,6 +104,8 @@ public class HunterPlugin extends Plugin
 	@Override
 	protected void startUp()
 	{
+		updateConfig();
+
 		overlayManager.add(overlay);
 		overlay.updateConfig();
 	}
@@ -118,14 +134,6 @@ public class HunterPlugin extends Plugin
 			 * ------------------------------------------------------------------------------
 			 */
 			case ObjectID.DEADFALL: // Deadfall trap placed
-				if (localPlayer.getWorldLocation().distanceTo(trapLocation) <= 2)
-				{
-					log.debug("Trap placed by \"{}\" on {}", localPlayer.getName(), trapLocation);
-					traps.put(trapLocation, new HunterTrap(gameObject));
-					lastActionTime = Instant.now();
-				}
-				break;
-
 			case ObjectID.MONKEY_TRAP: // Maniacal monkey trap placed
 				// If player is right next to "object" trap assume that player placed the trap
 				if (localPlayer.getWorldLocation().distanceTo(trapLocation) <= 2)
@@ -210,7 +218,7 @@ public class HunterPlugin extends Plugin
 					myTrap.resetTimer();
 					lastActionTime = Instant.now();
 
-					if (config.maniacalMonkeyNotify() && myTrap.getObjectId() == ObjectID.MONKEY_TRAP)
+					if (this.maniacalMonkeyNotify && myTrap.getObjectId() == ObjectID.MONKEY_TRAP)
 					{
 						notifier.notify("You've caught part of a monkey's tail.");
 					}
@@ -384,7 +392,17 @@ public class HunterPlugin extends Plugin
 	{
 		if (event.getGroup().equals("hunterplugin"))
 		{
+			updateConfig();
 			overlay.updateConfig();
 		}
 	}
+
+	private void updateConfig()
+	{
+		this.getOpenTrapColor = config.getOpenTrapColor();
+		this.getFullTrapColor = config.getFullTrapColor();
+		this.getEmptyTrapColor = config.getEmptyTrapColor();
+		this.getTransTrapColor = config.getTransTrapColor();
+		this.maniacalMonkeyNotify = config.maniacalMonkeyNotify();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hunter/HunterTrap.java b/runelite-client/src/main/java/net/runelite/client/plugins/hunter/HunterTrap.java
index 4a28288994..3312a5a4f7 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/hunter/HunterTrap.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/hunter/HunterTrap.java
@@ -26,6 +26,7 @@ package net.runelite.client.plugins.hunter;
 
 import java.time.Duration;
 import java.time.Instant;
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
 import net.runelite.api.GameObject;
@@ -44,23 +45,23 @@ class HunterTrap
 	/**
 	 * The time in milliseconds when the trap was placed.
 	 */
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private Instant placedOn;
 
 	/**
 	 * The state of the trap.
 	 */
-	@Getter
-	@Setter
+	@Getter(AccessLevel.PACKAGE)
+	@Setter(AccessLevel.PACKAGE)
 	private State state;
 
 	/**
 	 * The ID of the game object this is representing
 	 */
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private int objectId;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private WorldPoint worldLocation;
 
 	/**
@@ -91,7 +92,7 @@ class HunterTrap
 	 *
 	 * @param gameObject The gameobject thats corresponds with this trap.
 	 */
-	HunterTrap(GameObject gameObject)
+	HunterTrap(final GameObject gameObject)
 	{
 		this.state = State.OPEN;
 		this.placedOn = Instant.now();
@@ -105,7 +106,7 @@ class HunterTrap
 	 * @return Value between 0 and 1. 0 means the trap was laid moments ago.
 	 * 1 is a trap that's about to collapse.
 	 */
-	public double getTrapTimeRelative()
+	double getTrapTimeRelative()
 	{
 		Duration duration = Duration.between(placedOn, Instant.now());
 		return duration.compareTo(TRAP_TIME) < 0 ? (double) duration.toMillis() / TRAP_TIME.toMillis() : 1;
@@ -114,7 +115,7 @@ class HunterTrap
 	/**
 	 * Resets the time value when the trap was placed.
 	 */
-	public void resetTimer()
+	void resetTimer()
 	{
 		placedOn = Instant.now();
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hunter/TrapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/hunter/TrapOverlay.java
index 6c41519726..cb774336d4 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/hunter/TrapOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/hunter/TrapOverlay.java
@@ -29,6 +29,7 @@ import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.util.Map;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.Perspective;
 import net.runelite.api.coords.LocalPoint;
@@ -42,6 +43,7 @@ import net.runelite.client.ui.overlay.components.ProgressPieComponent;
  * Represents the overlay that shows timers on traps that are placed by the
  * player.
  */
+@Singleton
 public class TrapOverlay extends Overlay
 {
 	/**
@@ -51,7 +53,6 @@ public class TrapOverlay extends Overlay
 
 	private final Client client;
 	private final HunterPlugin plugin;
-	private final HunterConfig config;
 
 	private Color colorOpen, colorOpenBorder;
 	private Color colorEmpty, colorEmptyBorder;
@@ -59,12 +60,11 @@ public class TrapOverlay extends Overlay
 	private Color colorTrans, colorTransBorder;
 
 	@Inject
-	TrapOverlay(Client client, HunterPlugin plugin, HunterConfig config)
+	TrapOverlay(final Client client, final HunterPlugin plugin)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_SCENE);
 		this.plugin = plugin;
-		this.config = config;
 		this.client = client;
 	}
 
@@ -80,13 +80,13 @@ public class TrapOverlay extends Overlay
 	 */
 	public void updateConfig()
 	{
-		colorEmptyBorder = config.getEmptyTrapColor();
+		colorEmptyBorder = plugin.getGetEmptyTrapColor();
 		colorEmpty = new Color(colorEmptyBorder.getRed(), colorEmptyBorder.getGreen(), colorEmptyBorder.getBlue(), 100);
-		colorFullBorder = config.getFullTrapColor();
+		colorFullBorder = plugin.getGetFullTrapColor();
 		colorFull = new Color(colorFullBorder.getRed(), colorFullBorder.getGreen(), colorFullBorder.getBlue(), 100);
-		colorOpenBorder = config.getOpenTrapColor();
+		colorOpenBorder = plugin.getGetOpenTrapColor();
 		colorOpen = new Color(colorOpenBorder.getRed(), colorOpenBorder.getGreen(), colorOpenBorder.getBlue(), 100);
-		colorTransBorder = config.getTransTrapColor();
+		colorTransBorder = plugin.getGetTransTrapColor();
 		colorTrans = new Color(colorTransBorder.getRed(), colorTransBorder.getGreen(), colorTransBorder.getBlue(), 100);
 	}
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraIndicatorOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraIndicatorOverlay.java
index 67523eebe3..751db82ee1 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraIndicatorOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraIndicatorOverlay.java
@@ -27,12 +27,14 @@ package net.runelite.client.plugins.hydra;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayPriority;
 import net.runelite.client.ui.overlay.components.LineComponent;
 import net.runelite.client.ui.overlay.components.PanelComponent;
 
+@Singleton
 public class BabyHydraIndicatorOverlay extends Overlay
 {
 	private final BabyHydraPlugin plugin;
@@ -40,7 +42,7 @@ public class BabyHydraIndicatorOverlay extends Overlay
 	private final PanelComponent panelComponent = new PanelComponent();
 
 	@Inject
-	private BabyHydraIndicatorOverlay(BabyHydraPlugin plugin)
+	private BabyHydraIndicatorOverlay(final BabyHydraPlugin plugin)
 	{
 		this.plugin = plugin;
 		setPosition(OverlayPosition.BOTTOM_RIGHT);
@@ -51,17 +53,14 @@ public class BabyHydraIndicatorOverlay extends Overlay
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (plugin.getHydra() != null)
+		if (plugin.getHydra() != null && plugin.getHydras().containsKey(plugin.getHydra().getIndex()))
 		{
-			if (plugin.getHydras().containsKey(plugin.getHydra().getIndex()))
+			int val = plugin.getHydras().get(plugin.getHydra().getIndex());
+			if (val != 0)
 			{
-				int val = plugin.getHydras().get(plugin.getHydra().getIndex());
-				if (val != 0)
-				{
-					panelComponent.getChildren().clear();
-					panelComponent.getChildren().add(LineComponent.builder().right(Integer.toString(val)).build());
-					return panelComponent.render(graphics);
-				}
+				panelComponent.getChildren().clear();
+				panelComponent.getChildren().add(LineComponent.builder().right(Integer.toString(val)).build());
+				return panelComponent.render(graphics);
 			}
 		}
 		return null;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraOverlay.java
index 08ea0a13c9..3e392cd878 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraOverlay.java
@@ -28,6 +28,7 @@ import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.NPC;
 import net.runelite.api.Point;
@@ -38,19 +39,17 @@ import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayPriority;
 import net.runelite.client.ui.overlay.OverlayUtil;
 
+@Singleton
 public class BabyHydraOverlay extends Overlay
 {
-	private final BabyHydraConfig config;
 	private final BabyHydraPlugin plugin;
 
-
 	@Inject
 	private Client client;
 
 	@Inject
-	private BabyHydraOverlay(BabyHydraConfig config, BabyHydraPlugin plugin)
+	private BabyHydraOverlay(final BabyHydraPlugin plugin)
 	{
-		this.config = config;
 		this.plugin = plugin;
 		setLayer(OverlayLayer.ABOVE_SCENE);
 		setPosition(OverlayPosition.DYNAMIC);
@@ -66,52 +65,49 @@ public class BabyHydraOverlay extends Overlay
 			{
 				continue;
 			}
-			if (hydra.getName().equalsIgnoreCase("Hydra"))
+			if (hydra.getName().equalsIgnoreCase("Hydra") && plugin.getHydras().containsKey(hydra.getIndex()))
 			{
-				if (plugin.getHydras().containsKey(hydra.getIndex()))
+				int val = plugin.getHydras().get(hydra.getIndex());
+				if (val != 0)
 				{
-					int val = plugin.getHydras().get(hydra.getIndex());
-					if (val != 0)
+					if (plugin.isBoldText())
 					{
-						if (config.BoldText())
-						{
-							graphics.setFont(FontManager.getRunescapeBoldFont());
-						}
-						if (plugin.getHydraattacks().containsKey(hydra.getIndex()))
-						{
-							int attack = plugin.getHydraattacks().get(hydra.getIndex());
+						graphics.setFont(FontManager.getRunescapeBoldFont());
+					}
+					if (plugin.getHydraattacks().containsKey(hydra.getIndex()))
+					{
+						int attack = plugin.getHydraattacks().get(hydra.getIndex());
 
-							Point textLocation = hydra.getCanvasTextLocation(graphics, "TEMP!!", hydra.getLogicalHeight() + 100);
+						Point textLocation = hydra.getCanvasTextLocation(graphics, "TEMP!!", hydra.getLogicalHeight() + 100);
 
-							if (textLocation != null && attack == 8261)
+						if (textLocation != null && attack == 8261)
+						{
+							if (val == 3)
 							{
-								if (val == 3)
-								{
-									OverlayUtil.renderTextLocation(graphics, textLocation, "MAGE", Color.BLUE);
-								}
-								else
-								{
-									OverlayUtil.renderTextLocation(graphics, textLocation, "RANGE", Color.GREEN);
-								}
+								OverlayUtil.renderTextLocation(graphics, textLocation, "MAGE", Color.BLUE);
 							}
-							else if (textLocation != null && attack == 8262)
+							else
 							{
-								if (val == 3)
-								{
-									OverlayUtil.renderTextLocation(graphics, textLocation, "RANGE", Color.GREEN);
-								}
-								else
-								{
-									OverlayUtil.renderTextLocation(graphics, textLocation, "MAGE", Color.BLUE);
-								}
+								OverlayUtil.renderTextLocation(graphics, textLocation, "RANGE", Color.GREEN);
 							}
 						}
-						Point hydraPoint = hydra.getCanvasTextLocation(graphics, Integer.toString(val), hydra.getLogicalHeight() + 40);
-						if (hydraPoint != null)
+						else if (textLocation != null && attack == 8262)
 						{
-							OverlayUtil.renderTextLocation(graphics, hydraPoint, Integer.toString(val), Color.WHITE);
+							if (val == 3)
+							{
+								OverlayUtil.renderTextLocation(graphics, textLocation, "RANGE", Color.GREEN);
+							}
+							else
+							{
+								OverlayUtil.renderTextLocation(graphics, textLocation, "MAGE", Color.BLUE);
+							}
 						}
 					}
+					Point hydraPoint = hydra.getCanvasTextLocation(graphics, Integer.toString(val), hydra.getLogicalHeight() + 40);
+					if (hydraPoint != null)
+					{
+						OverlayUtil.renderTextLocation(graphics, hydraPoint, Integer.toString(val), Color.WHITE);
+					}
 				}
 			}
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPlugin.java
index dfd72f8ee1..8c2f0fff42 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPlugin.java
@@ -28,6 +28,8 @@ import com.google.inject.Provides;
 import java.util.HashMap;
 import java.util.Map;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.Actor;
 import net.runelite.api.Client;
@@ -50,7 +52,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	type = PluginType.PVM,
 	enabledByDefault = false
 )
-
+@Singleton
 public class BabyHydraPlugin extends Plugin
 {
 	@Inject
@@ -77,23 +79,30 @@ public class BabyHydraPlugin extends Plugin
 		return configManager.getConfig(BabyHydraConfig.class);
 	}
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private Map<Integer, Integer> hydras = new HashMap<>();
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private Map<Integer, Integer> hydraattacks = new HashMap<>();
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private NPC hydra;
 
+	private boolean TextIndicator;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean BoldText;
+	private boolean PrayerHelper;
+
 	@Override
 	protected void startUp() throws Exception
 	{
-		if (config.TextIndicator())
+		updateConfig();
+
+		if (this.TextIndicator)
 		{
 			overlayManager.add(hydraOverlay);
 		}
-		if (config.PrayerHelper())
+		if (this.PrayerHelper)
 		{
 			overlayManager.add(hydraPrayOverlay);
 			overlayManager.add(hydraIndicatorOverlay);
@@ -118,6 +127,8 @@ public class BabyHydraPlugin extends Plugin
 			return;
 		}
 
+		updateConfig();
+
 		if (event.getKey().equals("textindicators"))
 		{
 			if (Boolean.parseBoolean(event.getNewValue()))
@@ -148,15 +159,9 @@ public class BabyHydraPlugin extends Plugin
 	public void onNpcSpawned(NpcSpawned event)
 	{
 		NPC hydra = event.getNpc();
-		if (hydra.getCombatLevel() != 0 && hydra.getName() != null)
+		if (hydra.getCombatLevel() != 0 && hydra.getName() != null && hydra.getName().equalsIgnoreCase("Hydra") && !hydras.containsKey(hydra.getIndex()))
 		{
-			if (hydra.getName().equalsIgnoreCase("Hydra"))
-			{
-				if (!hydras.containsKey(hydra.getIndex()))
-				{
-					hydras.put(hydra.getIndex(), 3);
-				}
-			}
+			hydras.put(hydra.getIndex(), 3);
 		}
 	}
 
@@ -164,13 +169,10 @@ public class BabyHydraPlugin extends Plugin
 	public void onNpcDespawned(NpcDespawned event)
 	{
 		NPC hydra = event.getNpc();
-		if (hydra.getCombatLevel() != 0 && hydra.getName() != null)
+		if (hydra.getCombatLevel() != 0 && hydra.getName() != null && hydra.getName().equalsIgnoreCase("Hydra"))
 		{
-			if (hydra.getName().equalsIgnoreCase("Hydra"))
-			{
-				hydras.remove(hydra.getIndex());
-				hydraattacks.remove(hydra.getIndex());
-			}
+			hydras.remove(hydra.getIndex());
+			hydraattacks.remove(hydra.getIndex());
 		}
 	}
 
@@ -241,4 +243,11 @@ public class BabyHydraPlugin extends Plugin
 			}
 		}
 	}
+
+	private void updateConfig()
+	{
+		this.TextIndicator = config.TextIndicator();
+		this.BoldText = config.BoldText();
+		this.PrayerHelper = config.PrayerHelper();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPrayOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPrayOverlay.java
index f11c6b172d..977bb80afc 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPrayOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPrayOverlay.java
@@ -29,6 +29,7 @@ import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.Prayer;
 import net.runelite.api.SpriteID;
@@ -40,13 +41,14 @@ import net.runelite.client.ui.overlay.components.ComponentConstants;
 import net.runelite.client.ui.overlay.components.ImageComponent;
 import net.runelite.client.ui.overlay.components.PanelComponent;
 
+@Singleton
 public class BabyHydraPrayOverlay extends Overlay
 {
 	private final BabyHydraPlugin plugin;
 
 	private static final Color NOT_ACTIVATED_BACKGROUND_COLOR = new Color(150, 0, 0, 150);
-	private BufferedImage PRAY_MAGE;
-	private BufferedImage PRAY_RANGED;
+	private BufferedImage prayMage;
+	private BufferedImage prayRanged;
 	private final PanelComponent imagePanelComponent = new PanelComponent();
 
 	@Inject
@@ -56,7 +58,7 @@ public class BabyHydraPrayOverlay extends Overlay
 	private Client client;
 
 	@Inject
-	private BabyHydraPrayOverlay(BabyHydraPlugin plugin, SpriteManager spriteManager)
+	private BabyHydraPrayOverlay(final BabyHydraPlugin plugin, final SpriteManager spriteManager)
 	{
 		this.plugin = plugin;
 		this.spriteManager = spriteManager;
@@ -67,71 +69,65 @@ public class BabyHydraPrayOverlay extends Overlay
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (PRAY_MAGE == null)
+		if (prayMage == null)
 		{
-			PRAY_MAGE = spriteManager.getSprite(SpriteID.PRAYER_PROTECT_FROM_MAGIC, 0);
+			prayMage = spriteManager.getSprite(SpriteID.PRAYER_PROTECT_FROM_MAGIC, 0);
 		}
-		if (PRAY_RANGED == null)
+		if (prayRanged == null)
 		{
-			PRAY_RANGED = spriteManager.getSprite(SpriteID.PRAYER_PROTECT_FROM_MISSILES, 0);
+			prayRanged = spriteManager.getSprite(SpriteID.PRAYER_PROTECT_FROM_MISSILES, 0);
 		}
 
-		if (plugin.getHydra() != null)
+		if (plugin.getHydra() != null && plugin.getHydras().containsKey(plugin.getHydra().getIndex()))
 		{
-			if (plugin.getHydras().containsKey(plugin.getHydra().getIndex()))
+			int val = plugin.getHydras().get(plugin.getHydra().getIndex());
+			if (val != 0 && plugin.getHydraattacks().containsKey(plugin.getHydra().getIndex()))
 			{
-				int val = plugin.getHydras().get(plugin.getHydra().getIndex());
-				if (val != 0)
+				int attack = plugin.getHydraattacks().get(plugin.getHydra().getIndex());
+				if (attack == 8261)
 				{
-					if (plugin.getHydraattacks().containsKey(plugin.getHydra().getIndex()))
+					if (val == 3)
 					{
-						int attack = plugin.getHydraattacks().get(plugin.getHydra().getIndex());
-						if (attack == 8261)
-						{
-							if (val == 3)
-							{
-								imagePanelComponent.getChildren().clear();
-								imagePanelComponent.getChildren().add(new ImageComponent(PRAY_MAGE));
-								imagePanelComponent.setBackgroundColor(client.isPrayerActive(Prayer.PROTECT_FROM_MAGIC)
-									? ComponentConstants.STANDARD_BACKGROUND_COLOR
-									: NOT_ACTIVATED_BACKGROUND_COLOR);
+						imagePanelComponent.getChildren().clear();
+						imagePanelComponent.getChildren().add(new ImageComponent(prayMage));
+						imagePanelComponent.setBackgroundColor(client.isPrayerActive(Prayer.PROTECT_FROM_MAGIC)
+							? ComponentConstants.STANDARD_BACKGROUND_COLOR
+							: NOT_ACTIVATED_BACKGROUND_COLOR);
 
-								return imagePanelComponent.render(graphics);
-							}
-							else
-							{
-								imagePanelComponent.getChildren().clear();
-								imagePanelComponent.getChildren().add(new ImageComponent(PRAY_RANGED));
-								imagePanelComponent.setBackgroundColor(client.isPrayerActive(Prayer.PROTECT_FROM_MISSILES)
-									? ComponentConstants.STANDARD_BACKGROUND_COLOR
-									: NOT_ACTIVATED_BACKGROUND_COLOR);
+						return imagePanelComponent.render(graphics);
+					}
+					else
+					{
+						imagePanelComponent.getChildren().clear();
+						imagePanelComponent.getChildren().add(new ImageComponent(prayRanged));
+						imagePanelComponent.setBackgroundColor(client.isPrayerActive(Prayer.PROTECT_FROM_MISSILES)
+							? ComponentConstants.STANDARD_BACKGROUND_COLOR
+							: NOT_ACTIVATED_BACKGROUND_COLOR);
 
-								return imagePanelComponent.render(graphics);
-							}
-						}
-						else if (attack == 8262)
-						{
-							if (val == 3)
-							{
-								imagePanelComponent.getChildren().clear();
-								imagePanelComponent.getChildren().add(new ImageComponent(PRAY_RANGED));
-								imagePanelComponent.setBackgroundColor(client.isPrayerActive(Prayer.PROTECT_FROM_MISSILES)
-									? ComponentConstants.STANDARD_BACKGROUND_COLOR
-									: NOT_ACTIVATED_BACKGROUND_COLOR);
+						return imagePanelComponent.render(graphics);
+					}
+				}
+				else if (attack == 8262)
+				{
+					if (val == 3)
+					{
+						imagePanelComponent.getChildren().clear();
+						imagePanelComponent.getChildren().add(new ImageComponent(prayRanged));
+						imagePanelComponent.setBackgroundColor(client.isPrayerActive(Prayer.PROTECT_FROM_MISSILES)
+							? ComponentConstants.STANDARD_BACKGROUND_COLOR
+							: NOT_ACTIVATED_BACKGROUND_COLOR);
 
-								return imagePanelComponent.render(graphics);
-							}
-							else
-							{
-								imagePanelComponent.getChildren().clear();
-								imagePanelComponent.getChildren().add(new ImageComponent(PRAY_MAGE));
-								imagePanelComponent.setBackgroundColor(client.isPrayerActive(Prayer.PROTECT_FROM_MAGIC)
-									? ComponentConstants.STANDARD_BACKGROUND_COLOR
-									: NOT_ACTIVATED_BACKGROUND_COLOR);
+						return imagePanelComponent.render(graphics);
+					}
+					else
+					{
+						imagePanelComponent.getChildren().clear();
+						imagePanelComponent.getChildren().add(new ImageComponent(prayMage));
+						imagePanelComponent.setBackgroundColor(client.isPrayerActive(Prayer.PROTECT_FROM_MAGIC)
+							? ComponentConstants.STANDARD_BACKGROUND_COLOR
+							: NOT_ACTIVATED_BACKGROUND_COLOR);
 
-								return imagePanelComponent.render(graphics);
-							}
-						}
+						return imagePanelComponent.render(graphics);
 					}
 				}
 			}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java
index e0d3925cb6..10a72b7667 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java
@@ -27,96 +27,18 @@ package net.runelite.client.plugins.idlenotifier;
 
 import com.google.inject.Provides;
 import java.awt.TrayIcon;
-//import java.io.IOException;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.List;
 import javax.inject.Inject;
-//import javax.sound.sampled.LineUnavailableException;
-//import javax.sound.sampled.UnsupportedAudioFileException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import javax.inject.Singleton;
+import lombok.AccessLevel;
+import lombok.Setter;
 import net.runelite.api.Actor;
 import net.runelite.api.AnimationID;
-import static net.runelite.api.AnimationID.COOKING_FIRE;
-import static net.runelite.api.AnimationID.COOKING_RANGE;
-import static net.runelite.api.AnimationID.COOKING_WINE;
-import static net.runelite.api.AnimationID.CRAFTING_BATTLESTAVES;
-import static net.runelite.api.AnimationID.CRAFTING_GLASSBLOWING;
-import static net.runelite.api.AnimationID.CRAFTING_LEATHER;
-import static net.runelite.api.AnimationID.CRAFTING_POTTERS_WHEEL;
-import static net.runelite.api.AnimationID.CRAFTING_POTTERY_OVEN;
-import static net.runelite.api.AnimationID.CRAFTING_SPINNING;
-import static net.runelite.api.AnimationID.DENSE_ESSENCE_CHIPPING;
-import static net.runelite.api.AnimationID.DENSE_ESSENCE_CHISELING;
-import static net.runelite.api.AnimationID.FARMING_MIX_ULTRACOMPOST;
-import static net.runelite.api.AnimationID.FISHING_CRUSHING_INFERNAL_EELS;
-import static net.runelite.api.AnimationID.FISHING_CUTTING_SACRED_EELS;
-import static net.runelite.api.AnimationID.FLETCHING_BOW_CUTTING;
-import static net.runelite.api.AnimationID.FLETCHING_STRING_MAGIC_LONGBOW;
-import static net.runelite.api.AnimationID.FLETCHING_STRING_MAGIC_SHORTBOW;
-import static net.runelite.api.AnimationID.FLETCHING_STRING_MAPLE_LONGBOW;
-import static net.runelite.api.AnimationID.FLETCHING_STRING_MAPLE_SHORTBOW;
-import static net.runelite.api.AnimationID.FLETCHING_STRING_NORMAL_LONGBOW;
-import static net.runelite.api.AnimationID.FLETCHING_STRING_NORMAL_SHORTBOW;
-import static net.runelite.api.AnimationID.FLETCHING_STRING_OAK_LONGBOW;
-import static net.runelite.api.AnimationID.FLETCHING_STRING_OAK_SHORTBOW;
-import static net.runelite.api.AnimationID.FLETCHING_STRING_WILLOW_LONGBOW;
-import static net.runelite.api.AnimationID.FLETCHING_STRING_WILLOW_SHORTBOW;
-import static net.runelite.api.AnimationID.FLETCHING_STRING_YEW_LONGBOW;
-import static net.runelite.api.AnimationID.FLETCHING_STRING_YEW_SHORTBOW;
-import static net.runelite.api.AnimationID.GEM_CUTTING_AMETHYST;
-import static net.runelite.api.AnimationID.GEM_CUTTING_DIAMOND;
-import static net.runelite.api.AnimationID.GEM_CUTTING_EMERALD;
-import static net.runelite.api.AnimationID.GEM_CUTTING_JADE;
-import static net.runelite.api.AnimationID.GEM_CUTTING_OPAL;
-import static net.runelite.api.AnimationID.GEM_CUTTING_REDTOPAZ;
-import static net.runelite.api.AnimationID.GEM_CUTTING_RUBY;
-import static net.runelite.api.AnimationID.GEM_CUTTING_SAPPHIRE;
-import static net.runelite.api.AnimationID.HERBLORE_MAKE_TAR;
-import static net.runelite.api.AnimationID.HERBLORE_PESTLE_AND_MORTAR;
-import static net.runelite.api.AnimationID.HERBLORE_POTIONMAKING;
-import static net.runelite.api.AnimationID.HOME_MAKE_TABLET;
-import static net.runelite.api.AnimationID.IDLE;
-import static net.runelite.api.AnimationID.MAGIC_CHARGING_ORBS;
-import static net.runelite.api.AnimationID.MAGIC_ENCHANTING_AMULET_1;
-import static net.runelite.api.AnimationID.MAGIC_ENCHANTING_AMULET_2;
-import static net.runelite.api.AnimationID.MAGIC_ENCHANTING_AMULET_3;
-import static net.runelite.api.AnimationID.MAGIC_ENCHANTING_JEWELRY;
-import static net.runelite.api.AnimationID.MAGIC_LUNAR_PLANK_MAKE;
-import static net.runelite.api.AnimationID.MAGIC_LUNAR_SHARED;
-import static net.runelite.api.AnimationID.MAGIC_LUNAR_STRING_JEWELRY;
-import static net.runelite.api.AnimationID.MAGIC_MAKE_TABLET;
-import static net.runelite.api.AnimationID.MINING_3A_PICKAXE;
-import static net.runelite.api.AnimationID.MINING_ADAMANT_PICKAXE;
-import static net.runelite.api.AnimationID.MINING_BLACK_PICKAXE;
-import static net.runelite.api.AnimationID.MINING_BRONZE_PICKAXE;
-import static net.runelite.api.AnimationID.MINING_DRAGON_PICKAXE;
-import static net.runelite.api.AnimationID.MINING_DRAGON_PICKAXE_ORN;
-import static net.runelite.api.AnimationID.MINING_INFERNAL_PICKAXE;
-import static net.runelite.api.AnimationID.MINING_IRON_PICKAXE;
-import static net.runelite.api.AnimationID.MINING_MITHRIL_PICKAXE;
-import static net.runelite.api.AnimationID.MINING_RUNE_PICKAXE;
-import static net.runelite.api.AnimationID.MINING_STEEL_PICKAXE;
-import static net.runelite.api.AnimationID.PISCARILIUS_CRANE_REPAIR;
-import static net.runelite.api.AnimationID.SAND_COLLECTION;
-import static net.runelite.api.AnimationID.SMITHING_ANVIL;
-import static net.runelite.api.AnimationID.SMITHING_CANNONBALL;
-import static net.runelite.api.AnimationID.SMITHING_SMELTING;
-import static net.runelite.api.AnimationID.USING_GILDED_ALTAR;
-import static net.runelite.api.AnimationID.WOODCUTTING_3A_AXE;
-import static net.runelite.api.AnimationID.WOODCUTTING_ADAMANT;
-import static net.runelite.api.AnimationID.WOODCUTTING_BLACK;
-import static net.runelite.api.AnimationID.WOODCUTTING_BRONZE;
-import static net.runelite.api.AnimationID.WOODCUTTING_DRAGON;
-import static net.runelite.api.AnimationID.WOODCUTTING_INFERNAL;
-import static net.runelite.api.AnimationID.WOODCUTTING_IRON;
-import static net.runelite.api.AnimationID.WOODCUTTING_MITHRIL;
-import static net.runelite.api.AnimationID.WOODCUTTING_RUNE;
-import static net.runelite.api.AnimationID.WOODCUTTING_STEEL;
+import static net.runelite.api.AnimationID.*;
 import net.runelite.api.Client;
 import net.runelite.api.Constants;
 import net.runelite.api.GameState;
@@ -131,12 +53,13 @@ import net.runelite.api.VarPlayer;
 import net.runelite.api.Varbits;
 import net.runelite.api.WorldType;
 import net.runelite.api.events.AnimationChanged;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.GameStateChanged;
 import net.runelite.api.events.GameTick;
-import net.runelite.api.events.SpotAnimationChanged;
 import net.runelite.api.events.HitsplatApplied;
 import net.runelite.api.events.InteractingChanged;
 import net.runelite.api.events.PlayerSpawned;
+import net.runelite.api.events.SpotAnimationChanged;
 import net.runelite.client.Notifier;
 import net.runelite.client.config.ConfigManager;
 import net.runelite.client.eventbus.Subscribe;
@@ -146,15 +69,18 @@ import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginDescriptor;
 import net.runelite.client.util.PvPUtil;
 
+//import java.io.IOException;
+//import javax.sound.sampled.LineUnavailableException;
+//import javax.sound.sampled.UnsupportedAudioFileException;
+
 @PluginDescriptor(
 	name = "Idle Notifier",
 	description = "Send a notification when going idle, or when HP/Prayer reaches a threshold",
 	tags = {"health", "hitpoints", "notifications", "prayer", "pvp", "pker"}
 )
+@Singleton
 public class IdleNotifierPlugin extends Plugin
 {
-	private static final Logger logger = LoggerFactory.getLogger(IdleNotifierPlugin.class);
-
 	// This must be more than 500 client ticks (10 seconds) before you get AFK kicked
 	private static final int LOGOUT_WARNING_MILLIS = (4 * 60 + 40) * 1000; // 4 minutes and 40 seconds
 	private static final int COMBAT_WARNING_MILLIS = 19 * 60 * 1000; // 19 minutes
@@ -195,6 +121,32 @@ public class IdleNotifierPlugin extends Plugin
 	private SkullIcon lastTickSkull = null;
 	private boolean isFirstTick = true;
 
+	@Setter(AccessLevel.PACKAGE)
+	private boolean animationIdle;
+	private boolean animationIdleSound;
+	@Setter(AccessLevel.PACKAGE)
+	private boolean interactionIdle;
+	private boolean interactionIdleSound;
+	@Setter(AccessLevel.PACKAGE)
+	private boolean logoutIdle;
+	private boolean outOfCombatSound;
+	private boolean showSkullNotification;
+	private boolean showUnskullNotification;
+	@Setter(AccessLevel.PACKAGE)
+	private int getIdleNotificationDelay;
+	@Setter(AccessLevel.PACKAGE)
+	private int getHitpointsThreshold;
+	private boolean getPlayHealthSound;
+	@Setter(AccessLevel.PACKAGE)
+	private int getPrayerThreshold;
+	private boolean getPlayPrayerSound;
+	private int getOxygenThreshold;
+	@Setter(AccessLevel.PACKAGE)
+	private int getSpecEnergyThreshold;
+	private boolean getSpecSound;
+	private boolean getOverSpecEnergy;
+	private boolean notifyPkers;
+
 	@Provides
 	IdleNotifierConfig provideConfig(ConfigManager configManager)
 	{
@@ -331,22 +283,14 @@ public class IdleNotifierPlugin extends Plugin
 	private void onPlayerSpawned(PlayerSpawned event)
 	{
 		final Player p = event.getPlayer();
-		if (config.notifyPkers())
+		if (this.notifyPkers && p != null && p != client.getLocalPlayer()
+			&& PvPUtil.isAttackable(client, p) && !client.isFriended(p.getName(), false)
+			&& !client.isClanMember(p.getName()))
 		{
-			if (p != null)
-			{
-				if (p != client.getLocalPlayer())
-				{
-					if (PvPUtil.isAttackable(client, p) && !client.isFriended(p.getName(), false)
-						&& !client.isClanMember(p.getName()))
-					{
-						String playerName = p.getName();
-						int combat = p.getCombatLevel();
-						notifier.notify("PK'er warning! A level " + combat + " player named " + playerName +
-							" appeared!", TrayIcon.MessageType.WARNING);
-					}
-				}
-			}
+			String playerName = p.getName();
+			int combat = p.getCombatLevel();
+			notifier.notify("PK'er warning! A level " + combat + " player named " + playerName +
+				" appeared!", TrayIcon.MessageType.WARNING);
 		}
 	}
 
@@ -473,7 +417,7 @@ public class IdleNotifierPlugin extends Plugin
 		skullNotifier();
 
 		final Player local = client.getLocalPlayer();
-		final Duration waitDuration = Duration.ofMillis(config.getIdleNotificationDelay());
+		final Duration waitDuration = Duration.ofMillis(this.getIdleNotificationDelay);
 		lastCombatCountdown = Math.max(lastCombatCountdown - 1, 0);
 
 		if (client.getGameState() != GameState.LOGGED_IN
@@ -486,7 +430,7 @@ public class IdleNotifierPlugin extends Plugin
 			return;
 		}
 
-		if (config.logoutIdle() && checkIdleLogout())
+		if (this.logoutIdle && checkIdleLogout())
 		{
 			notifier.notify("[" + local.getName() + "] is about to log out from idling too long!");
 		}
@@ -496,20 +440,20 @@ public class IdleNotifierPlugin extends Plugin
 			notifier.notify("[" + local.getName() + "] is about to log out from being online for 6 hours!");
 		}
 
-		if (config.animationIdle() && checkAnimationIdle(waitDuration, local))
+		if (this.animationIdle && checkAnimationIdle(waitDuration, local))
 		{
 			notifier.notify("[" + local.getName() + "] is now idle!");
-			if (config.animationIdleSound())
+			if (this.animationIdleSound)
 			{
 				soundManager.playSound(Sound.IDLE);
 			}
 		}
-		if (config.interactionIdle() && checkInteractionIdle(waitDuration, local))
+		if (this.interactionIdle && checkInteractionIdle(waitDuration, local))
 		{
 			if (lastInteractWasCombat)
 			{
 				notifier.notify("[" + local.getName() + "] is now out of combat!");
-				if (config.outOfCombatSound())
+				if (this.outOfCombatSound)
 				{
 					soundManager.playSound(Sound.OUT_OF_COMBAT);
 				}
@@ -517,7 +461,7 @@ public class IdleNotifierPlugin extends Plugin
 			else
 			{
 				notifier.notify("[" + local.getName() + "] is now idle!");
-				if (config.interactionIdleSound())
+				if (this.interactionIdleSound)
 				{
 					soundManager.playSound(Sound.IDLE);
 				}
@@ -527,7 +471,7 @@ public class IdleNotifierPlugin extends Plugin
 		if (checkLowHitpoints())
 		{
 			notifier.notify("[" + local.getName() + "] has low hitpoints!");
-			if (config.getPlayHealthSound())
+			if (this.getPlayHealthSound)
 			{
 				soundManager.playSound(Sound.LOW_HEATLH);
 			}
@@ -536,7 +480,7 @@ public class IdleNotifierPlugin extends Plugin
 		if (checkLowPrayer())
 		{
 			notifier.notify("[" + local.getName() + "] has low prayer!");
-			if (config.getPlayPrayerSound())
+			if (this.getPlayPrayerSound)
 			{
 				soundManager.playSound(Sound.LOW_PRAYER);
 			}
@@ -550,7 +494,7 @@ public class IdleNotifierPlugin extends Plugin
 		if (checkFullSpecEnergy())
 		{
 			notifier.notify("[" + local.getName() + "] has restored spec energy!");
-			if (config.getSpecSound())
+			if (this.getSpecSound)
 			{
 				soundManager.playSound(Sound.RESTORED_SPECIAL_ATTACK);
 			}
@@ -561,7 +505,7 @@ public class IdleNotifierPlugin extends Plugin
 	{
 		int currentSpecEnergy = client.getVar(VarPlayer.SPECIAL_ATTACK_PERCENT);
 
-		int threshold = config.getSpecEnergyThreshold() * 10;
+		int threshold = this.getSpecEnergyThreshold * 10;
 		if (threshold == 0)
 		{
 			lastSpecEnergy = currentSpecEnergy;
@@ -572,7 +516,7 @@ public class IdleNotifierPlugin extends Plugin
 		// regen was small enough.
 		boolean notify = lastSpecEnergy < threshold && currentSpecEnergy >= threshold && currentSpecEnergy - lastSpecEnergy <= 100;
 
-		notify = (notify) || ((config.getOverSpecEnergy()) && (currentSpecEnergy >= threshold) && (currentSpecEnergy != lastSpecEnergy) && (currentSpecEnergy - lastSpecEnergy <= 100));
+		notify = (notify) || ((this.getOverSpecEnergy) && (currentSpecEnergy >= threshold) && (currentSpecEnergy != lastSpecEnergy) && (currentSpecEnergy - lastSpecEnergy <= 100));
 
 		lastSpecEnergy = currentSpecEnergy;
 		return notify;
@@ -580,11 +524,11 @@ public class IdleNotifierPlugin extends Plugin
 
 	private boolean checkLowOxygen()
 	{
-		if (config.getOxygenThreshold() == 0)
+		if (this.getOxygenThreshold == 0)
 		{
 			return false;
 		}
-		if (config.getOxygenThreshold() >= client.getVar(Varbits.OXYGEN_LEVEL) * 0.1)
+		if (this.getOxygenThreshold >= client.getVar(Varbits.OXYGEN_LEVEL) * 0.1)
 		{
 			if (!notifyOxygen)
 			{
@@ -601,13 +545,13 @@ public class IdleNotifierPlugin extends Plugin
 
 	private boolean checkLowHitpoints()
 	{
-		if (config.getHitpointsThreshold() == 0)
+		if (this.getHitpointsThreshold == 0)
 		{
 			return false;
 		}
-		if (client.getRealSkillLevel(Skill.HITPOINTS) > config.getHitpointsThreshold())
+		if (client.getRealSkillLevel(Skill.HITPOINTS) > this.getHitpointsThreshold)
 		{
-			if (client.getBoostedSkillLevel(Skill.HITPOINTS) + client.getVar(Varbits.NMZ_ABSORPTION) <= config.getHitpointsThreshold())
+			if (client.getBoostedSkillLevel(Skill.HITPOINTS) + client.getVar(Varbits.NMZ_ABSORPTION) <= this.getHitpointsThreshold)
 			{
 				if (!notifyHitpoints)
 				{
@@ -626,13 +570,13 @@ public class IdleNotifierPlugin extends Plugin
 
 	private boolean checkLowPrayer()
 	{
-		if (config.getPrayerThreshold() == 0)
+		if (this.getPrayerThreshold == 0)
 		{
 			return false;
 		}
-		if (client.getRealSkillLevel(Skill.PRAYER) > config.getPrayerThreshold())
+		if (client.getRealSkillLevel(Skill.PRAYER) > this.getPrayerThreshold)
 		{
-			if (client.getBoostedSkillLevel(Skill.PRAYER) <= config.getPrayerThreshold())
+			if (client.getBoostedSkillLevel(Skill.PRAYER) <= this.getPrayerThreshold)
 			{
 				if (!notifyPrayer)
 				{
@@ -792,11 +736,11 @@ public class IdleNotifierPlugin extends Plugin
 		{
 			if (!isFirstTick)
 			{
-				if (config.showSkullNotification() && lastTickSkull == null && currentTickSkull == SkullIcon.SKULL)
+				if (this.showSkullNotification && lastTickSkull == null && currentTickSkull == SkullIcon.SKULL)
 				{
 					notifier.notify("[" + local.getName() + "] is now skulled!");
 				}
-				else if (config.showUnskullNotification() && lastTickSkull == SkullIcon.SKULL && currentTickSkull == null)
+				else if (this.showUnskullNotification && lastTickSkull == SkullIcon.SKULL && currentTickSkull == null)
 				{
 					notifier.notify("[" + local.getName() + "] is now unskulled!");
 				}
@@ -809,4 +753,43 @@ public class IdleNotifierPlugin extends Plugin
 			lastTickSkull = currentTickSkull;
 		}
 	}
+
+	@Override
+	protected void startUp() throws Exception
+	{
+		updateConfig();
+	}
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (!event.getGroup().equals("idlenotifier"))
+		{
+			return;
+		}
+
+		updateConfig();
+	}
+
+	private void updateConfig()
+	{
+		this.animationIdle = config.animationIdle();
+		this.animationIdleSound = config.animationIdleSound();
+		this.interactionIdle = config.interactionIdle();
+		this.interactionIdleSound = config.interactionIdleSound();
+		this.logoutIdle = config.logoutIdle();
+		this.outOfCombatSound = config.outOfCombatSound();
+		this.showSkullNotification = config.showSkullNotification();
+		this.showUnskullNotification = config.showUnskullNotification();
+		this.getIdleNotificationDelay = config.getIdleNotificationDelay();
+		this.getHitpointsThreshold = config.getHitpointsThreshold();
+		this.getPlayHealthSound = config.getPlayHealthSound();
+		this.getPrayerThreshold = config.getPrayerThreshold();
+		this.getPlayPrayerSound = config.getPlayPrayerSound();
+		this.getOxygenThreshold = config.getOxygenThreshold();
+		this.getSpecEnergyThreshold = config.getSpecEnergyThreshold();
+		this.getSpecSound = config.getSpecSound();
+		this.getOverSpecEnergy = config.getOverSpecEnergy();
+		this.notifyPkers = config.notifyPkers();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingCounterOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingCounterOverlay.java
index c88d433254..6b429da714 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingCounterOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingCounterOverlay.java
@@ -4,26 +4,23 @@ import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.util.Map;
 import javax.inject.Inject;
-import net.runelite.api.Client;
+import javax.inject.Singleton;
 import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.components.table.TableAlignment;
 import net.runelite.client.ui.overlay.components.table.TableComponent;
 import net.runelite.client.ui.overlay.components.PanelComponent;
 
+@Singleton
 public class ImplingCounterOverlay extends Overlay
 {
-	private final Client client;
 	private final ImplingsPlugin plugin;
-	private final ImplingsConfig config;
 
 	private final PanelComponent panelComponent = new PanelComponent();
 
 	@Inject
-	public ImplingCounterOverlay(Client client, ImplingsConfig config, ImplingsPlugin plugin)
+	public ImplingCounterOverlay(final ImplingsPlugin plugin)
 	{
-		this.client = client;
-		this.config = config;
 		this.plugin = plugin;
 		setPosition(OverlayPosition.TOP_LEFT);
 	}
@@ -31,8 +28,10 @@ public class ImplingCounterOverlay extends Overlay
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (!config.showCounter() || plugin.getImplings().isEmpty())
+		if (!plugin.isShowSpawn() || plugin.getImplings().isEmpty())
+		{
 			return null;
+		}
 
 		panelComponent.getChildren().clear();
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingMinimapOverlay.java
index ab35f9f945..cb78082865 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingMinimapOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingMinimapOverlay.java
@@ -29,6 +29,7 @@ import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.util.List;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.NPC;
 import net.runelite.api.Point;
 import net.runelite.client.ui.overlay.Overlay;
@@ -36,18 +37,17 @@ import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayUtil;
 
+@Singleton
 public class ImplingMinimapOverlay extends Overlay
 {
 	private final ImplingsPlugin plugin;
-	private final ImplingsConfig config;
 
 	@Inject
-	private ImplingMinimapOverlay(ImplingsPlugin plugin, ImplingsConfig config)
+	private ImplingMinimapOverlay(final ImplingsPlugin plugin)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_WIDGETS);
 		this.plugin = plugin;
-		this.config = config;
 	}
 
 	@Override
@@ -63,14 +63,14 @@ public class ImplingMinimapOverlay extends Overlay
 		{
 			Point impLocation = imp.getMinimapLocation();
 			Color color = plugin.npcToColor(imp);
-			if (!plugin.showNpc(imp) || impLocation == null || color == null)
+			if (plugin.showNpc(imp) || impLocation == null || color == null)
 			{
 				continue;
 			}
 
 			OverlayUtil.renderMinimapLocation(graphics, impLocation, color);
 
-			if (config.showName())
+			if (plugin.isShowName())
 			{
 				Point textLocation = new Point(impLocation.getX() + 1, impLocation.getY());
 				OverlayUtil.renderTextLocation(graphics, textLocation, imp.getName(), color);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingSpawn.java b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingSpawn.java
index d624c02682..122c0b5583 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingSpawn.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingSpawn.java
@@ -24,6 +24,7 @@
  */
 package net.runelite.client.plugins.implings;
 
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import net.runelite.api.coords.WorldPoint;
@@ -32,7 +33,7 @@ import net.runelite.api.coords.WorldPoint;
  * @author Juzzed
  */
 @AllArgsConstructor
-@Getter
+@Getter(AccessLevel.PACKAGE)
 enum ImplingSpawn
 {
 	//Baby spawns
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingType.java b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingType.java
index cacac2f167..787adcc46a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingType.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingType.java
@@ -24,11 +24,12 @@
  */
 package net.runelite.client.plugins.implings;
 
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @AllArgsConstructor
-@Getter
+@Getter(AccessLevel.PACKAGE)
 enum ImplingType
 {
 	BABY("Baby"),
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsConfig.java
index d55be9f962..386284a874 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsConfig.java
@@ -320,15 +320,4 @@ public interface ImplingsConfig extends Config
 	{
 		return Color.WHITE;
 	}
-
-	@ConfigItem(
-			position = 26,
-			keyName = "showCounter",
-			name = "Show impling counter overlay",
-			description = "Shows how many of each impling there is nearby"
-	)
-	default boolean showCounter()
-	{
-		return false;
-	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsOverlay.java
index 8b4e404bd3..47a1e42271 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsOverlay.java
@@ -31,6 +31,7 @@ import java.awt.Polygon;
 import java.util.List;
 import java.util.Map;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Actor;
 import net.runelite.api.Client;
 import net.runelite.api.NPC;
@@ -47,18 +48,17 @@ import net.runelite.client.ui.overlay.OverlayUtil;
 /**
  * @author robin
  */
+@Singleton
 public class ImplingsOverlay extends Overlay
 {
 	private final Client client;
-	private final ImplingsConfig config;
 	private final ImplingsPlugin plugin;
 
 	@Inject
-	private ImplingsOverlay(Client client, ImplingsConfig config, ImplingsPlugin plugin)
+	private ImplingsOverlay(final Client client, final ImplingsPlugin plugin)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_SCENE);
-		this.config = config;
 		this.client = client;
 		this.plugin = plugin;
 	}
@@ -76,7 +76,7 @@ public class ImplingsOverlay extends Overlay
 		for (NPC imp : implings)
 		{
 			Color color = plugin.npcToColor(imp);
-			if (!plugin.showNpc(imp) || color == null)
+			if (plugin.showNpc(imp) || color == null)
 			{
 				continue;
 			}
@@ -85,7 +85,7 @@ public class ImplingsOverlay extends Overlay
 		}
 
 		//Draw static spawns
-		if (config.showSpawn())
+		if (plugin.isShowSpawn())
 		{
 			for (ImplingSpawn spawn : ImplingSpawn.values())
 			{
@@ -95,14 +95,14 @@ public class ImplingsOverlay extends Overlay
 				}
 
 				String impName = spawn.getType().getName();
-				drawSpawn(graphics, spawn.getSpawnLocation(), impName, config.getSpawnColor());
+				drawSpawn(graphics, spawn.getSpawnLocation(), impName, plugin.getGetSpawnColor());
 			}
 
 			//Draw dynamic spawns
 			Map<Integer, String> dynamicSpawns = plugin.getDynamicSpawns();
 			for (Map.Entry<Integer, String> dynamicSpawn : dynamicSpawns.entrySet())
 			{
-				drawDynamicSpawn(graphics, dynamicSpawn.getKey(), dynamicSpawn.getValue(), config.getDynamicSpawnColor());
+				drawDynamicSpawn(graphics, dynamicSpawn.getKey(), dynamicSpawn.getValue(), plugin.getGetDynamicSpawnColor());
 
 			}
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsPlugin.java
index 5ec61041da..8458b45735 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsPlugin.java
@@ -31,10 +31,12 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.GameState;
 import net.runelite.api.NPC;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.GameStateChanged;
 import net.runelite.api.events.GameTick;
 import net.runelite.api.events.NpcDespawned;
@@ -53,13 +55,14 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	description = "Highlight nearby implings on the minimap and on-screen",
 	tags = {"hunter", "minimap", "overlay"}
 )
+@Singleton
 public class ImplingsPlugin extends Plugin
 {
 	private static final int DYNAMIC_SPAWN_NATURE_DRAGON = 1618;
 	private static final int DYNAMIC_SPAWN_ECLECTIC = 1633;
 	private static final int DYNAMIC_SPAWN_BABY_ESSENCE = 1634;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private Map<ImplingType, Integer> implingCounterMap = new HashMap<>();
 
 	@Getter(AccessLevel.PACKAGE)
@@ -84,6 +87,37 @@ public class ImplingsPlugin extends Plugin
 	@Inject
 	private ImplingsConfig config;
 
+	private boolean showBaby;
+	private Color getBabyColor;
+	private boolean showYoung;
+	private Color getYoungColor;
+	private boolean showGourmet;
+	private Color getGourmetColor;
+	private boolean showEarth;
+	private Color getEarthColor;
+	private boolean showEssence;
+	private Color getEssenceColor;
+	private boolean showEclectic;
+	private Color getEclecticColor;
+	private boolean showNature;
+	private Color getNatureColor;
+	private boolean showMagpie;
+	private Color getMagpieColor;
+	private boolean showNinja;
+	private Color getNinjaColor;
+	private boolean showDragon;
+	private Color getDragonColor;
+	private boolean showLucky;
+	private Color getLuckyColor;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showSpawn;
+	@Getter(AccessLevel.PACKAGE)
+	private Color getSpawnColor;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showName;
+	@Getter(AccessLevel.PACKAGE)
+	private Color getDynamicSpawnColor;
+
 	@Provides
 	ImplingsConfig getConfig(ConfigManager configManager)
 	{
@@ -93,6 +127,8 @@ public class ImplingsPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
+
 		dynamicSpawns.put(DYNAMIC_SPAWN_NATURE_DRAGON, "T3 Nature-Lucky Dynamic");
 		dynamicSpawns.put(DYNAMIC_SPAWN_ECLECTIC, "T2 Eclectic Dynamic");
 		dynamicSpawns.put(DYNAMIC_SPAWN_BABY_ESSENCE, "T1 Baby-Essence Dynamic");
@@ -175,10 +211,10 @@ public class ImplingsPlugin extends Plugin
 		Impling impling = Impling.findImpling(npc.getId());
 		if (impling == null)
 		{
-			return false;
+			return true;
 		}
 
-		return showImplingType(impling.getImplingType());
+		return !showImplingType(impling.getImplingType());
 	}
 
 	boolean showImplingType(ImplingType implingType)
@@ -186,27 +222,27 @@ public class ImplingsPlugin extends Plugin
 		switch (implingType)
 		{
 			case BABY:
-				return config.showBaby();
+				return this.showBaby;
 			case YOUNG:
-				return config.showYoung();
+				return this.showYoung;
 			case GOURMET:
-				return config.showGourmet();
+				return this.showGourmet;
 			case EARTH:
-				return config.showEarth();
+				return this.showEarth;
 			case ESSENCE:
-				return config.showEssence();
+				return this.showEssence;
 			case ECLECTIC:
-				return config.showEclectic();
+				return this.showEclectic;
 			case NATURE:
-				return config.showNature();
+				return this.showNature;
 			case MAGPIE:
-				return config.showMagpie();
+				return this.showMagpie;
 			case NINJA:
-				return config.showNinja();
+				return this.showNinja;
 			case DRAGON:
-				return config.showDragon();
+				return this.showDragon;
 			case LUCKY:
-				return config.showLucky();
+				return this.showLucky;
 			default:
 				return false;
 		}
@@ -223,35 +259,76 @@ public class ImplingsPlugin extends Plugin
 		return typeToColor(impling.getImplingType());
 	}
 
-	Color typeToColor(ImplingType type)
+	private Color typeToColor(ImplingType type)
 	{
 		switch (type)
 		{
 
 			case BABY:
-				return config.getBabyColor();
+				return this.getBabyColor;
 			case YOUNG:
-				return config.getYoungColor();
+				return this.getYoungColor;
 			case GOURMET:
-				return config.getGourmetColor();
+				return this.getGourmetColor;
 			case EARTH:
-				return config.getEarthColor();
+				return this.getEarthColor;
 			case ESSENCE:
-				return config.getEssenceColor();
+				return this.getEssenceColor;
 			case ECLECTIC:
-				return config.getEclecticColor();
+				return this.getEclecticColor;
 			case NATURE:
-				return config.getNatureColor();
+				return this.getNatureColor;
 			case MAGPIE:
-				return config.getMagpieColor();
+				return this.getMagpieColor;
 			case NINJA:
-				return config.getNinjaColor();
+				return this.getNinjaColor;
 			case DRAGON:
-				return config.getDragonColor();
+				return this.getDragonColor;
 			case LUCKY:
-				return config.getLuckyColor();
+				return this.getLuckyColor;
 			default:
 				return null;
 		}
 	}
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (!event.getGroup().equals("implings"))
+		{
+			return;
+		}
+
+		updateConfig();
+	}
+
+	private void updateConfig()
+	{
+		this.showBaby = config.showBaby();
+		this.getBabyColor = config.getBabyColor();
+		this.showYoung = config.showYoung();
+		this.getYoungColor = config.getYoungColor();
+		this.showGourmet = config.showGourmet();
+		this.getGourmetColor = config.getGourmetColor();
+		this.showEarth = config.showEarth();
+		this.getEarthColor = config.getEarthColor();
+		this.showEssence = config.showEssence();
+		this.getEssenceColor = config.getEssenceColor();
+		this.showEclectic = config.showEclectic();
+		this.getEclecticColor = config.getEclecticColor();
+		this.showNature = config.showNature();
+		this.getNatureColor = config.getNatureColor();
+		this.showMagpie = config.showMagpie();
+		this.getMagpieColor = config.getMagpieColor();
+		this.showNinja = config.showNinja();
+		this.getNinjaColor = config.getNinjaColor();
+		this.showDragon = config.showDragon();
+		this.getDragonColor = config.getDragonColor();
+		this.showLucky = config.showLucky();
+		this.getLuckyColor = config.getLuckyColor();
+		this.showSpawn = config.showSpawn();
+		this.getSpawnColor = config.getSpawnColor();
+		this.showName = config.showName();
+		this.getDynamicSpawnColor = config.getDynamicSpawnColor();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoConfig.java
index bd7c2b045e..7e6f0ece3a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoConfig.java
@@ -24,66 +24,66 @@
  */
 package net.runelite.client.plugins.inferno;
 
+import java.awt.Color;
 import net.runelite.client.config.Config;
 import net.runelite.client.config.ConfigGroup;
 import net.runelite.client.config.ConfigItem;
-import java.awt.Color;
 
 @ConfigGroup("inferno")
 public interface InfernoConfig extends Config
-	{
+{
 	@ConfigItem(
-			position = 0,
-			keyName = "Nibbler Overlay",
-			name = "Nibbler Overlay",
-			description = "Shows if there are any Nibblers left"
+		position = 0,
+		keyName = "Nibbler Overlay",
+		name = "Nibbler Overlay",
+		description = "Shows if there are any Nibblers left"
 	)
 	default boolean displayNibblerOverlay()
-		{
-			return false;
-		}
+	{
+		return false;
+	}
 
 	@ConfigItem(
-			position = 1,
-			keyName = "Prayer Helper",
-			name = "Prayer Helper",
-			description = "Tells you what to flick in how many ticks"
+		position = 1,
+		keyName = "Prayer Helper",
+		name = "Prayer Helper",
+		description = "Tells you what to flick in how many ticks"
 	)
 	default boolean showPrayerHelp()
-		{
-			return false;
-		}
+	{
+		return false;
+	}
 
 	@ConfigItem(
-			position = 2,
-			keyName = "waveDisplay",
-			name = "Wave display",
-			description = "Shows monsters that will spawn on the selected wave(s)."
+		position = 2,
+		keyName = "waveDisplay",
+		name = "Wave display",
+		description = "Shows monsters that will spawn on the selected wave(s)."
 	)
 	default InfernoWaveDisplayMode waveDisplay()
-		{
-			return InfernoWaveDisplayMode.BOTH;
-		}
+	{
+		return InfernoWaveDisplayMode.BOTH;
+	}
 
 	@ConfigItem(
-			position = 3,
-			keyName = "getWaveOverlayHeaderColor",
-			name = "Wave Header",
-			description = "Color for Wave Header"
+		position = 3,
+		keyName = "getWaveOverlayHeaderColor",
+		name = "Wave Header",
+		description = "Color for Wave Header"
 	)
 	default Color getWaveOverlayHeaderColor()
-		{
-			return Color.ORANGE;
-		}
+	{
+		return Color.ORANGE;
+	}
 
 	@ConfigItem(
-			position = 4,
-			keyName = "getWaveTextColor",
-			name = "Wave Text Color",
-			description = "Color for Wave Texts"
+		position = 4,
+		keyName = "getWaveTextColor",
+		name = "Wave Text Color",
+		description = "Color for Wave Texts"
 	)
 	default Color getWaveTextColor()
-		{
-			return Color.WHITE;
-		}
-	}
\ No newline at end of file
+	{
+		return Color.WHITE;
+	}
+}
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoInfobox.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoInfobox.java
index 12b4571b09..9e1af9a978 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoInfobox.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoInfobox.java
@@ -27,26 +27,26 @@ package net.runelite.client.plugins.inferno;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayPosition;
+import net.runelite.client.ui.overlay.components.PanelComponent;
 import net.runelite.client.ui.overlay.components.table.TableAlignment;
 import net.runelite.client.ui.overlay.components.table.TableComponent;
-import net.runelite.client.ui.overlay.components.PanelComponent;
 
+@Singleton
 public class InfernoInfobox extends Overlay
 {
 	private final Client client;
 	private final InfernoPlugin plugin;
-	private final InfernoConfig config;
 
 	private final PanelComponent panelComponent = new PanelComponent();
 
 	@Inject
-	public InfernoInfobox(Client client, InfernoConfig config, InfernoPlugin plugin)
+	public InfernoInfobox(final Client client, final InfernoPlugin plugin)
 	{
 		this.client = client;
-		this.config = config;
 		this.plugin = plugin;
 		setPosition(OverlayPosition.TOP_LEFT);
 	}
@@ -54,7 +54,10 @@ public class InfernoInfobox extends Overlay
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (!config.showPrayerHelp() || client.getMapRegions()[0] != 9043) return null;
+		if (!plugin.isShowPrayerHelp() || client.getMapRegions()[0] != 9043)
+		{
+			return null;
+		}
 
 		panelComponent.getChildren().clear();
 		TableComponent tableComponent = new TableComponent();
@@ -68,7 +71,7 @@ public class InfernoInfobox extends Overlay
 			}
 			else
 			{
-				tableComponent.addRow(plugin.getPriorityNPC()[i - 1].getName(), plugin.getPriorityNPC()[i - 1 ].getAttackstyle().getName());
+				tableComponent.addRow(plugin.getPriorityNPC()[i - 1].getName(), plugin.getPriorityNPC()[i - 1].getAttackstyle().getName());
 			}
 		}
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoJadAttack.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoJadAttack.java
index 28ae29c1cd..1451a96216 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoJadAttack.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoJadAttack.java
@@ -28,26 +28,26 @@ import net.runelite.api.AnimationID;
 import net.runelite.api.Prayer;
 
 public enum InfernoJadAttack
-	{
-		MAGIC(AnimationID.JALTOK_JAD_MAGE_ATTACK, Prayer.PROTECT_FROM_MAGIC),
-		RANGE(AnimationID.JALTOK_JAD_RANGE_ATTACK, Prayer.PROTECT_FROM_MISSILES);
+{
+	MAGIC(AnimationID.JALTOK_JAD_MAGE_ATTACK, Prayer.PROTECT_FROM_MAGIC),
+	RANGE(AnimationID.JALTOK_JAD_RANGE_ATTACK, Prayer.PROTECT_FROM_MISSILES);
 
 	private final int animation;
 	private final Prayer prayer;
 
-	InfernoJadAttack(int animation, Prayer prayer)
-		{
-			this.animation = animation;
-			this.prayer = prayer;
-		}
+	InfernoJadAttack(final int animation, final Prayer prayer)
+	{
+		this.animation = animation;
+		this.prayer = prayer;
+	}
 
 	public int getAnimation()
-		{
-			return animation;
-		}
+	{
+		return animation;
+	}
 
 	public Prayer getPrayer()
-		{
-			return prayer;
-		}
+	{
+		return prayer;
 	}
+}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoJadOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoJadOverlay.java
index 43252b4c95..50af2fb664 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoJadOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoJadOverlay.java
@@ -29,7 +29,7 @@ import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
 import javax.inject.Inject;
-
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.SpriteID;
 import net.runelite.client.game.SpriteManager;
@@ -40,8 +40,9 @@ import net.runelite.client.ui.overlay.components.ComponentConstants;
 import net.runelite.client.ui.overlay.components.ImageComponent;
 import net.runelite.client.ui.overlay.components.PanelComponent;
 
+@Singleton
 public class InfernoJadOverlay extends Overlay
-	{
+{
 	private static final Color NOT_ACTIVATED_BACKGROUND_COLOR = new Color(150, 0, 0, 150);
 	private final Client client;
 	private final InfernoPlugin plugin;
@@ -49,39 +50,39 @@ public class InfernoJadOverlay extends Overlay
 	private final PanelComponent imagePanelComponent = new PanelComponent();
 
 	@Inject
-	private InfernoJadOverlay(Client client, InfernoPlugin plugin, SpriteManager spriteManager)
-		{
-			setPosition(OverlayPosition.BOTTOM_RIGHT);
-			setPriority(OverlayPriority.HIGH);
-			this.client = client;
-			this.plugin = plugin;
-			this.spriteManager = spriteManager;
-		}
+	private InfernoJadOverlay(final Client client, final InfernoPlugin plugin, final SpriteManager spriteManager)
+	{
+		setPosition(OverlayPosition.BOTTOM_RIGHT);
+		setPriority(OverlayPriority.HIGH);
+		this.client = client;
+		this.plugin = plugin;
+		this.spriteManager = spriteManager;
+	}
 
 	@Override
 	public Dimension render(Graphics2D graphics)
+	{
+		final InfernoJadAttack attack = plugin.getAttack();
+
+		if (attack == null)
 		{
-			final InfernoJadAttack attack = plugin.getAttack();
-
-			if (attack == null)
-				{
-				return null;
-				}
-
-			final BufferedImage prayerImage = getPrayerImage(attack);
-
-			imagePanelComponent.getChildren().clear();
-			imagePanelComponent.getChildren().add(new ImageComponent(prayerImage));
-			imagePanelComponent.setBackgroundColor(client.isPrayerActive(attack.getPrayer())
-					? ComponentConstants.STANDARD_BACKGROUND_COLOR
-					: NOT_ACTIVATED_BACKGROUND_COLOR);
-
-			return imagePanelComponent.render(graphics);
+			return null;
 		}
 
+		final BufferedImage prayerImage = getPrayerImage(attack);
+
+		imagePanelComponent.getChildren().clear();
+		imagePanelComponent.getChildren().add(new ImageComponent(prayerImage));
+		imagePanelComponent.setBackgroundColor(client.isPrayerActive(attack.getPrayer())
+			? ComponentConstants.STANDARD_BACKGROUND_COLOR
+			: NOT_ACTIVATED_BACKGROUND_COLOR);
+
+		return imagePanelComponent.render(graphics);
+	}
+
 	private BufferedImage getPrayerImage(InfernoJadAttack attack)
-		{
-			final int prayerSpriteID = attack == InfernoJadAttack.MAGIC ? SpriteID.PRAYER_PROTECT_FROM_MAGIC : SpriteID.PRAYER_PROTECT_FROM_MISSILES;
-			return spriteManager.getSprite(prayerSpriteID, 0);
-		}
+	{
+		final int prayerSpriteID = attack == InfernoJadAttack.MAGIC ? SpriteID.PRAYER_PROTECT_FROM_MAGIC : SpriteID.PRAYER_PROTECT_FROM_MISSILES;
+		return spriteManager.getSprite(prayerSpriteID, 0);
 	}
+}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNPC.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNPC.java
index 392ec4bad6..1bcd8702f9 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNPC.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNPC.java
@@ -25,6 +25,7 @@
 package net.runelite.client.plugins.inferno;
 
 import java.awt.Color;
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
 import net.runelite.api.NPC;
@@ -39,10 +40,10 @@ public class InfernoNPC
 		MELEE("Melee", Color.WHITE),
 		RANDOM("Random", Color.ORANGE);
 
-		@Getter
-		private String name = "";
+		@Getter(AccessLevel.PACKAGE)
+		private String name;
 
-		@Getter
+		@Getter(AccessLevel.PACKAGE)
 		private Color color;
 
 		Attackstyle(String s, Color c)
@@ -52,44 +53,44 @@ public class InfernoNPC
 		}
 	}
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private NPC npc;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private String name;
 
-	@Getter
-	@Setter
+	@Getter(AccessLevel.PACKAGE)
+	@Setter(AccessLevel.PACKAGE)
 	private Attackstyle attackstyle;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private int attackTicks;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private int priority;
 
-	@Getter
-	@Setter
+	@Getter(AccessLevel.PACKAGE)
+	@Setter(AccessLevel.PACKAGE)
 	private int ticksTillAttack = -1;
 
-	@Getter
-	@Setter
+	@Getter(AccessLevel.PACKAGE)
+	@Setter(AccessLevel.PACKAGE)
 	private boolean attacking = false;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private int attackAnimation;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private boolean isMidAttack = false;
 
-	@Getter
-	@Setter
+	@Getter(AccessLevel.PACKAGE)
+	@Setter(AccessLevel.PACKAGE)
 	private int distanceToPlayer = 0;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	int textLocHeight;
 
-	public InfernoNPC(NPC npc)
+	InfernoNPC(NPC npc)
 	{
 		this.npc = npc;
 		textLocHeight = npc.getLogicalHeight() + 40;
@@ -177,7 +178,7 @@ public class InfernoNPC
 		return info;
 	}
 
-	public void attacked()
+	void attacked()
 	{
 		ticksTillAttack = attackTicks;
 		attacking = true;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNibblerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNibblerOverlay.java
index 12d88ef2af..a55b0f9f2e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNibblerOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoNibblerOverlay.java
@@ -27,6 +27,7 @@ package net.runelite.client.plugins.inferno;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayPosition;
@@ -34,29 +35,29 @@ import net.runelite.client.ui.overlay.components.PanelComponent;
 import net.runelite.client.ui.overlay.components.table.TableAlignment;
 import net.runelite.client.ui.overlay.components.table.TableComponent;
 
+@Singleton
 public class InfernoNibblerOverlay extends Overlay
 {
 	private final Client client;
 	private final InfernoPlugin plugin;
-	private final InfernoConfig config;
 
 	private final PanelComponent panelComponent = new PanelComponent();
 
 	@Inject
-	public InfernoNibblerOverlay(Client client, InfernoConfig config, InfernoPlugin plugin)
+	public InfernoNibblerOverlay(final Client client, final InfernoPlugin plugin)
 	{
 		this.client = client;
-		this.config = config;
 		this.plugin = plugin;
 		setPosition(OverlayPosition.TOP_LEFT);
 	}
 
-
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (!config.displayNibblerOverlay() || plugin.getNibblers().size() == 0 || client.getMapRegions()[0] != 9043)
-		return null;
+		if (!plugin.isDisplayNibblerOverlay() || plugin.getNibblers().size() == 0 || client.getMapRegions()[0] != 9043)
+		{
+			return null;
+		}
 
 		panelComponent.getChildren().clear();
 		TableComponent tableComponent = new TableComponent();
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoOverlay.java
index 0175e1f751..75f6587bc5 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoOverlay.java
@@ -30,6 +30,7 @@ import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.NPC;
 import net.runelite.api.Perspective;
@@ -38,29 +39,29 @@ import net.runelite.api.coords.LocalPoint;
 import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
-import net.runelite.client.ui.overlay.components.PanelComponent;
 
+@Singleton
 public class InfernoOverlay extends Overlay
 {
 	private final Client client;
 	private final InfernoPlugin plugin;
-	private final InfernoConfig config;
-	private final PanelComponent panelComponent = new PanelComponent();
 
 	@Inject
-	public InfernoOverlay(Client client, InfernoConfig config, InfernoPlugin plugin)
+	public InfernoOverlay(final Client client, final InfernoPlugin plugin)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_SCENE);
 		this.client = client;
-		this.config = config;
 		this.plugin = plugin;
 	}
 
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (!client.isInInstancedRegion() || client.getMapRegions()[0] != 9043) return null;
+		if (!client.isInInstancedRegion() || client.getMapRegions()[0] != 9043)
+		{
+			return null;
+		}
 
 		for (InfernoNPC monster : plugin.getMonsters().values())
 		{
@@ -87,7 +88,7 @@ public class InfernoOverlay extends Overlay
 	}
 
 	// renders text location
-	public static void renderTextLocation(Graphics2D graphics, InfernoNPC actor, String text, Color color)
+	private static void renderTextLocation(Graphics2D graphics, InfernoNPC actor, String text, Color color)
 	{
 		graphics.setFont(new Font("Arial", Font.BOLD, 15));
 		Point textLocation = actor.getNpc().getCanvasTextLocation(graphics, text, actor.textLocHeight + 40);
@@ -96,13 +97,16 @@ public class InfernoOverlay extends Overlay
 			return;
 		}
 
-		int x = textLocation.getX();
-		int y = textLocation.getY();
+		if (textLocation != null)
+		{
+			int x = textLocation.getX();
+			int y = textLocation.getY();
 
-		graphics.setColor(Color.BLACK);
-		graphics.drawString(text, x + 1, y + 1);
+			graphics.setColor(Color.BLACK);
+			graphics.drawString(text, x + 1, y + 1);
 
-		graphics.setColor(color);
-		graphics.drawString(text, x, y);
+			graphics.setColor(color);
+			graphics.drawString(text, x, y);
+		}
 	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoPlugin.java
index 8a8549c4d5..9230985b1b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoPlugin.java
@@ -25,13 +25,14 @@
 package net.runelite.client.plugins.inferno;
 
 import com.google.inject.Provides;
-
+import java.awt.Color;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Nullable;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
@@ -58,12 +59,13 @@ import net.runelite.client.ui.overlay.OverlayManager;
 import org.apache.commons.lang3.ArrayUtils;
 
 @PluginDescriptor(
-		name = "Inferno",
-		description = "Inferno helper",
-		tags = {"combat", "overlay", "pve", "pvm"},
-		type = PluginType.PVM
+	name = "Inferno",
+	description = "Inferno helper",
+	tags = {"combat", "overlay", "pve", "pvm"},
+	type = PluginType.PVM
 )
 @Slf4j
+@Singleton
 public class InfernoPlugin extends Plugin
 {
 	private static final int INFERNO_REGION = 9043;
@@ -92,22 +94,21 @@ public class InfernoPlugin extends Plugin
 	@Inject
 	private InfernoConfig config;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private int currentWave = -1;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private Map<NPC, InfernoNPC> monsters;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private Map<Integer, ArrayList<InfernoNPC>> monsterCurrentAttackMap;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private List<NPC> nibblers;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private InfernoNPC[] priorityNPC;
 
-
 	@Getter(AccessLevel.PACKAGE)
 	@Nullable
 	private InfernoJadAttack attack;
@@ -117,23 +118,32 @@ public class InfernoPlugin extends Plugin
 	@Getter(AccessLevel.PACKAGE)
 	private int currentWaveNumber;
 
-	private List<Actor> waveMonsters;
+	private final List<Actor> waveMonsters;
 
 	public InfernoPlugin()
-		{
-			waveMonsters = new ArrayList<>();
-		}
+	{
+		waveMonsters = new ArrayList<>();
+	}
+
+	@Getter(AccessLevel.PACKAGE)
+	private boolean displayNibblerOverlay;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showPrayerHelp;
+	private InfernoWaveDisplayMode waveDisplay;
+	private Color getWaveOverlayHeaderColor;
+	private Color getWaveTextColor;
 
 	@Provides
 	InfernoConfig provideConfig(ConfigManager configManager)
-		{
-			return configManager.getConfig(InfernoConfig.class);
-		}
+	{
+		return configManager.getConfig(InfernoConfig.class);
+	}
 
 	@Override
 	protected void startUp() throws Exception
 	{
-		waveOverlay.setDisplayMode(config.waveDisplay());
+		updateConfig();
+		waveOverlay.setDisplayMode(this.waveDisplay);
 
 		if (isInInferno())
 		{
@@ -141,7 +151,7 @@ public class InfernoPlugin extends Plugin
 			overlayManager.add(infernoInfobox);
 			overlayManager.add(nibblerOverlay);
 
-			if (config.waveDisplay() != InfernoWaveDisplayMode.NONE)
+			if (this.waveDisplay != InfernoWaveDisplayMode.NONE)
 			{
 				overlayManager.add(waveOverlay);
 			}
@@ -149,8 +159,8 @@ public class InfernoPlugin extends Plugin
 			overlayManager.add(jadOverlay);
 		}
 
-		waveOverlay.setWaveHeaderColor(config.getWaveOverlayHeaderColor());
-		waveOverlay.setWaveTextColor(config.getWaveTextColor());
+		waveOverlay.setWaveHeaderColor(this.getWaveOverlayHeaderColor);
+		waveOverlay.setWaveTextColor(this.getWaveTextColor);
 
 		monsters = new HashMap<>();
 		monsterCurrentAttackMap = new HashMap<>(6);
@@ -177,6 +187,7 @@ public class InfernoPlugin extends Plugin
 		monsters = null;
 		currentWaveNumber = -1;
 	}
+
 	@Subscribe
 	private void onConfigChanged(ConfigChanged event)
 	{
@@ -185,18 +196,20 @@ public class InfernoPlugin extends Plugin
 			return;
 		}
 
+		updateConfig();
+
 		if (event.getKey().endsWith("color"))
 		{
-			waveOverlay.setWaveHeaderColor(config.getWaveOverlayHeaderColor());
-			waveOverlay.setWaveTextColor(config.getWaveTextColor());
+			waveOverlay.setWaveHeaderColor(this.getWaveOverlayHeaderColor);
+			waveOverlay.setWaveTextColor(this.getWaveTextColor);
 		}
 		else if ("waveDisplay".equals(event.getKey()))
 		{
 			overlayManager.remove(waveOverlay);
 
-			waveOverlay.setDisplayMode(config.waveDisplay());
+			waveOverlay.setDisplayMode(this.waveDisplay);
 
-			if (isInInferno() && config.waveDisplay() != InfernoWaveDisplayMode.NONE)
+			if (isInInferno() && this.waveDisplay != InfernoWaveDisplayMode.NONE)
 			{
 				overlayManager.add(waveOverlay);
 			}
@@ -205,40 +218,46 @@ public class InfernoPlugin extends Plugin
 
 	@Subscribe
 	public void onNpcSpawned(NpcSpawned event)
+	{
+		if (client.getMapRegions()[0] != 9043)
 		{
-			if (client.getMapRegions()[0] != 9043) return;
-
-			NPC npc = event.getNpc();
-			if (isValidInfernoMob(npc))
-			{
-				monsters.put(npc, new InfernoNPC(npc));
-				log.debug(String.valueOf(monsters.size()));
-			}
-
-			if (npc.getId() == NpcID.JALNIB)
-			{
-				nibblers.add(npc);
-			}
-
-			final int id = event.getNpc().getId();
-
-			if (id == NpcID.JALTOKJAD || id == NpcID.JALTOKJAD_7704)
-			{
-				jad = event.getNpc();
-			}
-
-			final Actor actor = event.getActor();
-
-			if (actor != null)
-			{
-				waveMonsters.add(actor);
-			}
+			return;
 		}
 
+		NPC npc = event.getNpc();
+		if (isValidInfernoMob(npc))
+		{
+			monsters.put(npc, new InfernoNPC(npc));
+			log.debug(String.valueOf(monsters.size()));
+		}
+
+		if (npc.getId() == NpcID.JALNIB)
+		{
+			nibblers.add(npc);
+		}
+
+		final int id = event.getNpc().getId();
+
+		if (id == NpcID.JALTOKJAD || id == NpcID.JALTOKJAD_7704)
+		{
+			jad = event.getNpc();
+		}
+
+		final Actor actor = event.getActor();
+
+		if (actor != null)
+		{
+			waveMonsters.add(actor);
+		}
+	}
+
 	@Subscribe
 	public void onNpcDespawned(NpcDespawned event)
 	{
-		if (client.getMapRegions()[0] != 9043) return;
+		if (client.getMapRegions()[0] != 9043)
+		{
+			return;
+		}
 
 		NPC npc = event.getNpc();
 		if (monsters.containsKey(npc))
@@ -288,7 +307,7 @@ public class InfernoPlugin extends Plugin
 			overlayManager.add(infernoInfobox);
 			overlayManager.add(nibblerOverlay);
 
-			if (config.waveDisplay() != InfernoWaveDisplayMode.NONE)
+			if (this.waveDisplay != InfernoWaveDisplayMode.NONE)
 			{
 				overlayManager.add(waveOverlay);
 			}
@@ -317,7 +336,10 @@ public class InfernoPlugin extends Plugin
 	@Subscribe
 	public void onGameTick(GameTick event)
 	{
-		if (client.getMapRegions()[0] != 9043) return;
+		if (client.getMapRegions()[0] != 9043)
+		{
+			return;
+		}
 
 		clearMapAndPriority();
 
@@ -405,7 +427,10 @@ public class InfernoPlugin extends Plugin
 		{
 			ArrayList<InfernoNPC> monsters = monsterCurrentAttackMap.get(i + 1);
 
-			if (monsters.size() == 0) continue;
+			if (monsters.size() == 0)
+			{
+				continue;
+			}
 
 			int priority = monsters.get(0).getPriority();
 
@@ -474,4 +499,13 @@ public class InfernoPlugin extends Plugin
 	{
 		return currentWaveNumber == -1 || currentWaveNumber == 69 ? -1 : currentWaveNumber + 1;
 	}
+
+	private void updateConfig()
+	{
+		this.displayNibblerOverlay = config.displayNibblerOverlay();
+		this.showPrayerHelp = config.showPrayerHelp();
+		this.waveDisplay = config.waveDisplay();
+		this.getWaveOverlayHeaderColor = config.getWaveOverlayHeaderColor();
+		this.getWaveTextColor = config.getWaveTextColor();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoWaveMappings.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoWaveMappings.java
index 0e87b0c13b..eb079846cf 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoWaveMappings.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoWaveMappings.java
@@ -28,16 +28,17 @@ package net.runelite.client.plugins.inferno;
 
 import com.google.common.collect.ImmutableMap;
 import java.awt.Color;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.client.ui.overlay.components.PanelComponent;
 import net.runelite.client.ui.overlay.components.TitleComponent;
 
 class InfernoWaveMappings
 {
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private static final ImmutableMap<Integer, int[]> waveMapping;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private static final ImmutableMap<Integer, String> npcNameMapping;
 
 	static
@@ -88,7 +89,7 @@ class InfernoWaveMappings
 		waveMapBuilder.put(42, new int[]{32, 32, 32, 240, 490});
 		waveMapBuilder.put(43, new int[]{32, 32, 32, 85, 240, 490});
 		waveMapBuilder.put(44, new int[]{32, 32, 32, 85, 85, 240, 490});
-		waveMapBuilder.put(45, new int[]{32, 32, 32, 165, 240, 490 });
+		waveMapBuilder.put(45, new int[]{32, 32, 32, 165, 240, 490});
 		waveMapBuilder.put(46, new int[]{32, 32, 32, 85, 165, 240, 490});
 		waveMapBuilder.put(47, new int[]{32, 32, 32, 85, 85, 165, 240, 490});
 		waveMapBuilder.put(48, new int[]{32, 32, 32, 165, 165, 240, 490});
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoWaveOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoWaveOverlay.java
index 88e3e32766..03d86509c0 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoWaveOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoWaveOverlay.java
@@ -1,28 +1,31 @@
 package net.runelite.client.plugins.inferno;
 
-import java.awt.Color;
 import com.google.inject.Inject;
+import com.google.inject.Singleton;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics2D;
+import lombok.AccessLevel;
 import lombok.Setter;
 import static net.runelite.client.plugins.inferno.InfernoWaveMappings.addWaveComponent;
-import java.awt.Graphics2D;
-import net.runelite.client.ui.overlay.OverlayPriority;
-import net.runelite.client.ui.overlay.OverlayPosition;
-import java.awt.Dimension;
-import net.runelite.client.ui.overlay.components.PanelComponent;
 import net.runelite.client.ui.overlay.Overlay;
+import net.runelite.client.ui.overlay.OverlayPosition;
+import net.runelite.client.ui.overlay.OverlayPriority;
+import net.runelite.client.ui.overlay.components.PanelComponent;
 
+@Singleton
 public class InfernoWaveOverlay extends Overlay
-	{
+{
 	private final InfernoPlugin plugin;
 	private final PanelComponent panelComponent;
 
-	@Setter
+	@Setter(AccessLevel.PACKAGE)
 	private Color waveHeaderColor;
 
-	@Setter
+	@Setter(AccessLevel.PACKAGE)
 	private Color waveTextColor;
 
-	@Setter
+	@Setter(AccessLevel.PACKAGE)
 	private InfernoWaveDisplayMode displayMode;
 
 	@Inject
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPanel.java
index c3157b9b85..9227aba3af 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPanel.java
@@ -30,10 +30,13 @@ import com.google.inject.Inject;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Cursor;
+import java.awt.Desktop;
 import java.awt.Font;
 import java.awt.GridLayout;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.io.File;
+import java.io.IOException;
 import java.util.concurrent.ScheduledExecutorService;
 import javax.annotation.Nullable;
 import javax.inject.Singleton;
@@ -45,6 +48,7 @@ import javax.swing.JPanel;
 import javax.swing.border.EmptyBorder;
 import javax.swing.event.HyperlinkEvent;
 import net.runelite.api.Client;
+import static net.runelite.client.RuneLite.LOGS_DIR;
 import net.runelite.client.RuneLiteProperties;
 import net.runelite.client.account.SessionManager;
 import net.runelite.client.config.ConfigManager;
@@ -65,9 +69,9 @@ public class InfoPanel extends PluginPanel
 
 	private static final ImageIcon ARROW_RIGHT_ICON;
 	private static final ImageIcon GITHUB_ICON;
+	private static final ImageIcon FOLDER_ICON;
 	private static final ImageIcon DISCORD_ICON;
 	private static final ImageIcon PATREON_ICON;
-	private static final ImageIcon WIKI_ICON;
 	private static final ImageIcon IMPORT_ICON;
 
 	private final JLabel loggedLabel = new JLabel();
@@ -98,9 +102,9 @@ public class InfoPanel extends PluginPanel
 	{
 		ARROW_RIGHT_ICON = new ImageIcon(ImageUtil.getResourceStreamFromClass(InfoPanel.class, "/util/arrow_right.png"));
 		GITHUB_ICON = new ImageIcon(ImageUtil.getResourceStreamFromClass(InfoPanel.class, "github_icon.png"));
+		FOLDER_ICON = new ImageIcon(ImageUtil.getResourceStreamFromClass(InfoPanel.class, "folder_icon.png"));
 		DISCORD_ICON = new ImageIcon(ImageUtil.getResourceStreamFromClass(InfoPanel.class, "discord_icon.png"));
 		PATREON_ICON = new ImageIcon(ImageUtil.getResourceStreamFromClass(InfoPanel.class, "patreon_icon.png"));
-		WIKI_ICON = new ImageIcon(ImageUtil.getResourceStreamFromClass(InfoPanel.class, "wiki_icon.png"));
 		IMPORT_ICON = new ImageIcon(ImageUtil.getResourceStreamFromClass(InfoPanel.class, "import_icon.png"));
 	}
 
@@ -143,12 +147,9 @@ public class InfoPanel extends PluginPanel
 		emailLabel.enableAutoLinkHandler(false);
 		emailLabel.addHyperlinkListener(e ->
 		{
-			if (HyperlinkEvent.EventType.ACTIVATED.equals(e.getEventType()) && e.getURL() != null)
+			if (HyperlinkEvent.EventType.ACTIVATED.equals(e.getEventType()) && e.getURL() != null && e.getURL().toString().equals(RUNELITE_LOGIN))
 			{
-				if (e.getURL().toString().equals(RUNELITE_LOGIN))
-				{
-					executor.execute(sessionManager::login);
-				}
+				executor.execute(sessionManager::login);
 			}
 		});
 
@@ -161,7 +162,7 @@ public class InfoPanel extends PluginPanel
 
 		actionsContainer = new JPanel();
 		actionsContainer.setBorder(new EmptyBorder(10, 0, 0, 0));
-		actionsContainer.setLayout(new GridLayout(0, 1, 0, 10));
+		actionsContainer.setLayout(new GridLayout(5, 1, 0, 10));
 
 		syncPanel = buildLinkPanel(IMPORT_ICON, "Import local settings", "to remote RuneLite account", () ->
 		{
@@ -177,7 +178,8 @@ public class InfoPanel extends PluginPanel
 		});
 
 		actionsContainer.add(buildLinkPanel(GITHUB_ICON, "License info", "for distribution", "https://github.com/runelite-extended/runelite/blob/master/LICENSE"));
-		actionsContainer.add(buildLinkPanel(DISCORD_ICON, "Talk to us on our", "discord server", "https://discord.gg/s2fzu5U"));
+		actionsContainer.add(buildLinkPanel(FOLDER_ICON, "Open logs directory", "(for bug reports)", LOGS_DIR));
+		actionsContainer.add(buildLinkPanel(DISCORD_ICON, "Talk to us on our", "discord server", "https://discord.gg/HN5gf3m"));
 		actionsContainer.add(buildLinkPanel(PATREON_ICON, "Patreon to support", "the RuneLitePlus devs", runeLiteProperties.getPatreonLink()));
 		/*		actionsContainer.add(buildLinkPanel(WIKI_ICON, "Information about", "RuneLite and plugins", runeLiteProperties.getWikiLink()));*/
 
@@ -188,6 +190,23 @@ public class InfoPanel extends PluginPanel
 		eventBus.register(this);
 	}
 
+	/**
+	 * Builds a link panel with a given icon, text and directory to open.
+	 */
+	private JPanel buildLinkPanel(ImageIcon icon, String topText, String bottomText, File dir)
+	{
+		return buildLinkPanel(icon, topText, bottomText, () ->
+		{
+			try
+			{
+				Desktop.getDesktop().open(dir);
+			}
+			catch (IOException ex)
+			{
+			}
+		});
+	}
+
 	/**
 	 * Builds a link panel with a given icon, text and url to redirect to.
 	 */
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPlugin.java
index 4311fd23e8..1578ee408b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPlugin.java
@@ -26,6 +26,7 @@ package net.runelite.client.plugins.info;
 
 import java.awt.image.BufferedImage;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginDescriptor;
 import net.runelite.client.ui.ClientToolbar;
@@ -37,6 +38,7 @@ import net.runelite.client.util.ImageUtil;
 	description = "Enable the Info panel",
 	loadWhenOutdated = true
 )
+@Singleton
 public class InfoPlugin extends Plugin
 {
 	@Inject
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/info/JRichTextPane.java b/runelite-client/src/main/java/net/runelite/client/plugins/info/JRichTextPane.java
index f24df49e17..e86007d0b0 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/info/JRichTextPane.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/info/JRichTextPane.java
@@ -27,6 +27,7 @@ package net.runelite.client.plugins.info;
 import java.awt.Desktop;
 import java.io.IOException;
 import java.net.URISyntaxException;
+import javax.inject.Singleton;
 import javax.swing.BorderFactory;
 import javax.swing.JEditorPane;
 import javax.swing.event.HyperlinkEvent;
@@ -35,6 +36,7 @@ import javax.swing.text.html.HTMLEditorKit;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
+@Singleton
 public class JRichTextPane extends JEditorPane
 {
 	private HyperlinkListener linkHandler;
@@ -58,7 +60,7 @@ public class JRichTextPane extends JEditorPane
 		setText(text);
 	}
 
-	public void enableAutoLinkHandler(boolean enable)
+	void enableAutoLinkHandler(boolean enable)
 	{
 		if (enable == (linkHandler == null))
 		{
@@ -66,18 +68,15 @@ public class JRichTextPane extends JEditorPane
 			{
 				linkHandler = e ->
 				{
-					if (HyperlinkEvent.EventType.ACTIVATED.equals(e.getEventType()) && e.getURL() != null)
+					if (HyperlinkEvent.EventType.ACTIVATED.equals(e.getEventType()) && e.getURL() != null && Desktop.isDesktopSupported())
 					{
-						if (Desktop.isDesktopSupported())
+						try
 						{
-							try
-							{
-								Desktop.getDesktop().browse(e.getURL().toURI());
-							}
-							catch (URISyntaxException | IOException ex)
-							{
-								log.warn("Error opening link", ex);
-							}
+							Desktop.getDesktop().browse(e.getURL().toURI());
+						}
+						catch (URISyntaxException | IOException ex)
+						{
+							log.warn("Error opening link", ex);
 						}
 					}
 				};
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapInputListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapInputListener.java
index ae75a638ac..6e6cbd9732 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapInputListener.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapInputListener.java
@@ -34,7 +34,7 @@ import net.runelite.client.input.KeyListener;
 import net.runelite.client.input.MouseAdapter;
 import net.runelite.client.input.MouseWheelListener;
 
-public class InstanceMapInputListener extends MouseAdapter implements KeyListener, MouseWheelListener
+class InstanceMapInputListener extends MouseAdapter implements KeyListener, MouseWheelListener
 {
 	@Inject
 	private InstanceMapPlugin plugin;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapOverlay.java
index 87d164b78f..2ef28d51b1 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapOverlay.java
@@ -31,6 +31,7 @@ import java.awt.Rectangle;
 import java.awt.image.BufferedImage;
 import javax.inject.Inject;
 import javax.inject.Singleton;
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
 import net.runelite.api.Client;
@@ -56,7 +57,7 @@ class InstanceMapOverlay extends Overlay
 	 * this value to be 4. Changing this will break the method for rendering
 	 * complex tiles
 	 */
-	static final int TILE_SIZE = 4;
+	private static final int TILE_SIZE = 4;
 
 	/**
 	 * The size of the player's position marker on the map
@@ -85,9 +86,9 @@ class InstanceMapOverlay extends Overlay
 	private volatile boolean showMap = false;
 	private final BackgroundComponent backgroundComponent = new BackgroundComponent();
 
-	@Setter
+	@Setter(AccessLevel.PACKAGE)
 	private boolean isCloseButtonHovered;
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private Rectangle closeButtonBounds;
 	private BufferedImage closeButtonImage;
 	private BufferedImage closeButtonHoveredImage;
@@ -103,7 +104,7 @@ class InstanceMapOverlay extends Overlay
 		backgroundComponent.setFill(false);
 	}
 
-	public boolean isMapShown()
+	boolean isMapShown()
 	{
 		return showMap;
 	}
@@ -114,7 +115,7 @@ class InstanceMapOverlay extends Overlay
 	 *
 	 * @param show Whether or not the map should be shown.
 	 */
-	public synchronized void setShowMap(boolean show)
+	synchronized void setShowMap(boolean show)
 	{
 		showMap = show;
 		if (showMap)
@@ -128,7 +129,7 @@ class InstanceMapOverlay extends Overlay
 	/**
 	 * Increases the viewed plane. The maximum viewedPlane is 3
 	 */
-	public synchronized void onAscend()
+	synchronized void onAscend()
 	{
 		if (viewedPlane >= MAX_PLANE)
 		{
@@ -142,7 +143,7 @@ class InstanceMapOverlay extends Overlay
 	/**
 	 * Decreases the viewed plane. The minimum viewedPlane is 0
 	 */
-	public synchronized void onDescend()
+	synchronized void onDescend()
 	{
 		if (viewedPlane <= MIN_PLANE)
 		{
@@ -235,7 +236,7 @@ class InstanceMapOverlay extends Overlay
 	 *
 	 * @param event The game state change event
 	 */
-	public void onGameStateChange(GameStateChanged event)
+	void onGameStateChange(GameStateChanged event)
 	{
 		mapImage = null;
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapPlugin.java
index 38803e3c1b..d6f4cb3e17 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapPlugin.java
@@ -26,6 +26,7 @@ package net.runelite.client.plugins.instancemap;
 
 import com.google.inject.Binder;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.events.GameStateChanged;
 import net.runelite.api.events.WidgetMenuOptionClicked;
 import net.runelite.api.widgets.WidgetInfo;
@@ -43,6 +44,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	name = "Instance Map",
 	description = "Add an instanced map, accessible by right-clicking the map button"
 )
+@Singleton
 public class InstanceMapPlugin extends Plugin
 {
 	private final WidgetMenuOption openMapOption = new WidgetMenuOption("Show", "Instance Map", WidgetInfo.WORLD_MAP_OPTION);
@@ -134,24 +136,24 @@ public class InstanceMapPlugin extends Plugin
 		}
 	}
 
-	public void showMap()
+	private void showMap()
 	{
 		overlay.setShowMap(true);
 		openMapOption.setMenuOption("Hide");
 	}
 
-	public void closeMap()
+	void closeMap()
 	{
 		overlay.setShowMap(false);
 		openMapOption.setMenuOption("Show");
 	}
 
-	public void ascendMap()
+	void ascendMap()
 	{
 		overlay.onAscend();
 	}
 
-	public void descendMap()
+	void descendMap()
 	{
 		overlay.onDescend();
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/HealthbarOverride.java b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/HealthbarOverride.java
index c0e844939a..500661a8ff 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/HealthbarOverride.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/HealthbarOverride.java
@@ -26,6 +26,7 @@ package net.runelite.client.plugins.interfacestyles;
 
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import static net.runelite.api.SpriteID.*;
@@ -52,12 +53,12 @@ enum HealthbarOverride implements SpriteOverride
 	FRONT_140PX(HEALTHBAR_DEFAULT_FRONT_140PX, "front_90px.png"),
 	FRONT_160PX(HEALTHBAR_DEFAULT_FRONT_160PX, "front_90px.png");
 
-	@Getter
+	@Getter(AccessLevel.PUBLIC)
 	private final int spriteId;
 
 	private final String fileName;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private int padding = 1;
 
 	private static final Map<Integer, HealthbarOverride> MAP;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesPlugin.java
index 6944a982d7..9758434681 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesPlugin.java
@@ -29,6 +29,7 @@ package net.runelite.client.plugins.interfacestyles;
 import com.google.inject.Provides;
 import java.awt.image.BufferedImage;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
 import net.runelite.api.GameState;
@@ -57,6 +58,7 @@ import net.runelite.client.util.ImageUtil;
 	tags = {"2005", "2010", "skin", "theme", "ui"},
 	enabledByDefault = false
 )
+@Singleton
 public class InterfaceStylesPlugin extends Plugin
 {
 	@Inject
@@ -73,6 +75,11 @@ public class InterfaceStylesPlugin extends Plugin
 
 	private Sprite[] defaultCrossSprites;
 
+	private Skin skin;
+	private boolean hdHealthBars;
+	private boolean hdMenu;
+	private boolean rsCrossSprites;
+
 	@Provides
 	InterfaceStylesConfig provideConfig(ConfigManager configManager)
 	{
@@ -82,6 +89,7 @@ public class InterfaceStylesPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
 		clientThread.invoke(this::updateAllOverrides);
 	}
 
@@ -102,6 +110,7 @@ public class InterfaceStylesPlugin extends Plugin
 	{
 		if (config.getGroup().equals("interfaceStyles"))
 		{
+			updateConfig();
 			clientThread.invoke(this::updateAllOverrides);
 		}
 	}
@@ -115,7 +124,7 @@ public class InterfaceStylesPlugin extends Plugin
 	@Subscribe
 	public void onPostHealthBar(PostHealthBar postHealthBar)
 	{
-		if (!config.hdHealthBars())
+		if (!this.hdHealthBars)
 		{
 			return;
 		}
@@ -161,7 +170,7 @@ public class InterfaceStylesPlugin extends Plugin
 	@Subscribe
 	public void onBeforeMenuRender(BeforeMenuRender event)
 	{
-		if (config.hdMenu())
+		if (this.hdMenu)
 		{
 			client.draw2010Menu();
 			event.consume();
@@ -174,9 +183,9 @@ public class InterfaceStylesPlugin extends Plugin
 		{
 			for (Skin skin : spriteOverride.getSkin())
 			{
-				if (skin == config.skin())
+				if (skin == this.skin)
 				{
-					String file = config.skin().toString() + "/" + spriteOverride.getSpriteID() + ".png";
+					String file = this.skin.toString() + "/" + spriteOverride.getSpriteID() + ".png";
 					Sprite spritePixels = getFileSpritePixels(file);
 
 					if (spriteOverride.getSpriteID() == SpriteID.COMPASS_TEXTURE)
@@ -206,9 +215,9 @@ public class InterfaceStylesPlugin extends Plugin
 	{
 		for (WidgetOverride widgetOverride : WidgetOverride.values())
 		{
-			if (widgetOverride.getSkin() == config.skin())
+			if (widgetOverride.getSkin() == this.skin)
 			{
-				String file = config.skin().toString() + "/widget/" + widgetOverride.getName() + ".png";
+				String file = this.skin.toString() + "/widget/" + widgetOverride.getName() + ".png";
 				Sprite spritePixels = getFileSpritePixels(file);
 
 				if (spritePixels != null)
@@ -253,7 +262,7 @@ public class InterfaceStylesPlugin extends Plugin
 	{
 		for (WidgetOffset widgetOffset : WidgetOffset.values())
 		{
-			if (widgetOffset.getSkin() != config.skin())
+			if (widgetOffset.getSkin() != this.skin)
 			{
 				continue;
 			}
@@ -287,7 +296,7 @@ public class InterfaceStylesPlugin extends Plugin
 
 	private void overrideHealthBars()
 	{
-		if (config.hdHealthBars())
+		if (this.hdHealthBars)
 		{
 			spriteManager.addSpriteOverrides(HealthbarOverride.values());
 			// Reset health bar caches to apply the override
@@ -307,7 +316,7 @@ public class InterfaceStylesPlugin extends Plugin
 
 	private void overrideCrossSprites()
 	{
-		if (config.rsCrossSprites())
+		if (this.rsCrossSprites)
 		{
 			// If we've already replaced them,
 			// we don't need to replace them again
@@ -387,4 +396,12 @@ public class InterfaceStylesPlugin extends Plugin
 			client.setCompass(compass);
 		}
 	}
+
+	private void updateConfig()
+	{
+		this.skin = config.skin();
+		this.hdHealthBars = config.hdHealthBars();
+		this.hdMenu = config.hdMenu();
+		this.rsCrossSprites = config.rsCrossSprites();
+	}
 }
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/Skin.java b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/Skin.java
index c041ffedc2..3e9aad9be9 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/Skin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/Skin.java
@@ -26,10 +26,11 @@
  */
 package net.runelite.client.plugins.interfacestyles;
 
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
-@Getter
+@Getter(AccessLevel.PACKAGE)
 @AllArgsConstructor
 public enum Skin
 {
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/SpriteOverride.java b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/SpriteOverride.java
index b5db7bb69c..f46a3bd50c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/SpriteOverride.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/SpriteOverride.java
@@ -26,12 +26,13 @@
  */
 package net.runelite.client.plugins.interfacestyles;
 
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.SpriteID;
 import static net.runelite.client.plugins.interfacestyles.Skin.AROUND_2005;
 import static net.runelite.client.plugins.interfacestyles.Skin.AROUND_2010;
 
-@Getter
+@Getter(AccessLevel.PACKAGE)
 enum SpriteOverride
 {
 	TAB_COMBAT(SpriteID.TAB_COMBAT, AROUND_2005, AROUND_2010),
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/WidgetOffset.java b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/WidgetOffset.java
index 9edf17165e..920aa0a818 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/WidgetOffset.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/WidgetOffset.java
@@ -26,10 +26,11 @@
  */
 package net.runelite.client.plugins.interfacestyles;
 
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.widgets.WidgetInfo;
 
-@Getter
+@Getter(AccessLevel.PACKAGE)
 enum WidgetOffset
 {
 	RESIZABLE_2010_COMBAT_HIGHLIGHT(Skin.AROUND_2010, WidgetInfo.RESIZABLE_VIEWPORT_COMBAT_TAB, -4, 1, null, null),
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/WidgetOverride.java b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/WidgetOverride.java
index 1998fb3808..0a83eb372d 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/WidgetOverride.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/WidgetOverride.java
@@ -26,10 +26,11 @@
  */
 package net.runelite.client.plugins.interfacestyles;
 
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.widgets.WidgetInfo;
 
-@Getter
+@Getter(AccessLevel.PACKAGE)
 enum WidgetOverride
 {
 	FIXED_CORNER_TOP_LEFT_2005(Skin.AROUND_2005, "1026", WidgetInfo.FIXED_VIEWPORT_COMBAT_TAB),
@@ -47,7 +48,7 @@ enum WidgetOverride
 	private String name;
 	private WidgetInfo[] widgetInfo;
 
-	WidgetOverride(Skin skin, String name, WidgetInfo... widgetInfo)
+	WidgetOverride(final Skin skin, final String name, final WidgetInfo... widgetInfo)
 	{
 		this.skin = skin;
 		this.name = name;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorygrid/InventoryGridOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorygrid/InventoryGridOverlay.java
index f9f66e10b8..9309861a98 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorygrid/InventoryGridOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorygrid/InventoryGridOverlay.java
@@ -26,6 +26,7 @@
 package net.runelite.client.plugins.inventorygrid;
 
 import com.google.inject.Inject;
+import com.google.inject.Singleton;
 import java.awt.AlphaComposite;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
@@ -42,20 +43,21 @@ import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 
+@Singleton
 class InventoryGridOverlay extends Overlay
 {
 	private static final int INVENTORY_SIZE = 28;
 
-	private final InventoryGridConfig config;
+	private final InventoryGridPlugin plugin;
 	private final Client client;
 	private final ItemManager itemManager;
 
 	@Inject
-	private InventoryGridOverlay(InventoryGridConfig config, Client client, ItemManager itemManager)
+	private InventoryGridOverlay(final InventoryGridPlugin plugin, final Client client, final ItemManager itemManager)
 	{
 		this.itemManager = itemManager;
 		this.client = client;
-		this.config = config;
+		this.plugin = plugin;
 
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_WIDGETS);
@@ -67,8 +69,8 @@ class InventoryGridOverlay extends Overlay
 		final Widget if1DraggingWidget = client.getIf1DraggedWidget();
 		final Widget inventoryWidget = client.getWidget(WidgetInfo.INVENTORY);
 
-		if (if1DraggingWidget == null || if1DraggingWidget != inventoryWidget
-			|| client.getItemPressedDuration() < config.dragDelay() / Constants.CLIENT_TICK_LENGTH)
+		if (if1DraggingWidget == null || if1DraggingWidget.equals(inventoryWidget)
+			|| client.getItemPressedDuration() < plugin.getDragDelay() / Constants.CLIENT_TICK_LENGTH)
 		{
 			return null;
 		}
@@ -83,7 +85,7 @@ class InventoryGridOverlay extends Overlay
 			final Rectangle bounds = widgetItem.getCanvasBounds();
 			boolean inBounds = bounds.contains(mousePoint);
 
-			if (config.showItem() && inBounds)
+			if (plugin.isShowItem() && inBounds)
 			{
 				final WidgetItem draggedItem = inventoryWidget.getWidgetItem(client.getIf1DraggedItemIndex());
 				final BufferedImage draggedItemImage = itemManager.getImage(draggedItem.getId());
@@ -95,14 +97,14 @@ class InventoryGridOverlay extends Overlay
 				graphics.setComposite(AlphaComposite.SrcOver);
 			}
 
-			if (config.showHighlight() && inBounds)
+			if (plugin.isShowHighlight() && inBounds)
 			{
-				graphics.setColor(config.highlightColor());
+				graphics.setColor(plugin.getHighlightColor());
 				graphics.fill(bounds);
 			}
-			else if (config.showGrid())
+			else if (plugin.isShowGrid())
 			{
-				graphics.setColor(config.gridColor());
+				graphics.setColor(plugin.getGridColor());
 				graphics.fill(bounds);
 			}
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorygrid/InventoryGridPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorygrid/InventoryGridPlugin.java
index dc6b0ae372..0ab7d78067 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorygrid/InventoryGridPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorygrid/InventoryGridPlugin.java
@@ -27,7 +27,13 @@ package net.runelite.client.plugins.inventorygrid;
 
 import com.google.inject.Inject;
 import com.google.inject.Provides;
+import com.google.inject.Singleton;
+import java.awt.Color;
+import lombok.AccessLevel;
+import lombok.Getter;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.client.config.ConfigManager;
+import net.runelite.client.eventbus.Subscribe;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginDescriptor;
 import net.runelite.client.ui.overlay.OverlayManager;
@@ -38,6 +44,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	tags = {"items", "overlay"},
 	enabledByDefault = false
 )
+@Singleton
 public class InventoryGridPlugin extends Plugin
 {
 	@Inject
@@ -46,9 +53,26 @@ public class InventoryGridPlugin extends Plugin
 	@Inject
 	private OverlayManager overlayManager;
 
+	@Inject
+	private InventoryGridConfig config;
+
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showItem;
+	@Getter(AccessLevel.PACKAGE)
+	boolean showGrid;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showHighlight;
+	@Getter(AccessLevel.PACKAGE)
+	private int dragDelay;
+	@Getter(AccessLevel.PACKAGE)
+	private Color gridColor;
+	@Getter(AccessLevel.PACKAGE)
+	private Color highlightColor;
+
 	@Override
 	public void startUp()
 	{
+		updateConfig();
 		overlayManager.add(overlay);
 	}
 
@@ -63,4 +87,23 @@ public class InventoryGridPlugin extends Plugin
 	{
 		return configManager.getConfig(InventoryGridConfig.class);
 	}
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged config)
+	{
+		if (config.getGroup().equals("inventorygrid"))
+		{
+			updateConfig();
+		}
+	}
+
+	private void updateConfig()
+	{
+		this.showItem = config.showItem();
+		this.showGrid = config.showGrid();
+		this.showHighlight = config.showHighlight();
+		this.dragDelay = config.dragDelay();
+		this.gridColor = config.gridColor();
+		this.highlightColor = config.highlightColor();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetup.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetup.java
index e49e8b1512..8e8761e1f3 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetup.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetup.java
@@ -25,7 +25,7 @@
  */
 package net.runelite.client.plugins.inventorysetups;
 
-import java.util.ArrayList;
+import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -33,7 +33,7 @@ import lombok.Getter;
 public class InventorySetup
 {
 	@Getter
-	private ArrayList<InventorySetupItem> inventory;
+	private List<InventorySetupItem> inventory;
 	@Getter
-	private ArrayList<InventorySetupItem> equipment;
+	private List<InventorySetupItem> equipment;
 }
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupBankOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupBankOverlay.java
index 1b0be390fb..95d4276a52 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupBankOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupBankOverlay.java
@@ -42,21 +42,19 @@ public class InventorySetupBankOverlay extends WidgetItemOverlay
 {
 	private final ItemManager itemManager;
 	private final InventorySetupPlugin plugin;
-	private final InventorySetupConfig config;
 
 	@Inject
-	public InventorySetupBankOverlay(ItemManager itemManager, InventorySetupPlugin plugin, InventorySetupConfig config)
+	public InventorySetupBankOverlay(ItemManager itemManager, InventorySetupPlugin plugin)
 	{
 		this.itemManager = itemManager;
 		this.plugin = plugin;
-		this.config = config;
 		showOnBank();
 	}
 
 	@Override
 	public void renderItemOverlay(Graphics2D graphics, int itemId, WidgetItem itemWidget)
 	{
-		if (config.getBankHighlight())
+		if (plugin.isGetBankHighlight())
 		{
 			int[] ids = plugin.getCurrentInventorySetupIds();
 			if (ids == null)
@@ -70,7 +68,7 @@ public class InventorySetupBankOverlay extends WidgetItemOverlay
 			}
 
 
-			final Color color = config.getBankHighlightColor();
+			final Color color = plugin.getGetBankHighlightColor();
 
 			if (color != null)
 			{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java
index fa35f2718e..f7d8cba390 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java
@@ -28,15 +28,20 @@ package net.runelite.client.plugins.inventorysetups;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.google.inject.Provides;
+import java.awt.Color;
 import java.awt.image.BufferedImage;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
+import lombok.AccessLevel;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
 import net.runelite.api.GameState;
@@ -70,6 +75,7 @@ import net.runelite.client.util.ImageUtil;
 )
 
 @Slf4j
+@Singleton
 public class InventorySetupPlugin extends Plugin
 {
 	private static final String CONFIG_GROUP = "inventorysetups";
@@ -103,15 +109,29 @@ public class InventorySetupPlugin extends Plugin
 
 	private InventorySetupPluginPanel panel;
 
-	private Map<String, InventorySetup> inventorySetups = new HashMap<>();
+	private final Map<String, InventorySetup> inventorySetups = new HashMap<>();
 
 	private NavigationButton navButton;
 
 	private boolean highlightDifference;
 
+	private boolean getHighlightDifferences;
+	@Getter(AccessLevel.PUBLIC)
+	private Color getHighlightColor;
+	@Getter(AccessLevel.PUBLIC)
+	private boolean getStackDifference;
+	@Getter(AccessLevel.PUBLIC)
+	private boolean getVariationDifference;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean getBankHighlight;
+	@Getter(AccessLevel.PACKAGE)
+	private Color getBankHighlightColor;
+
 	@Override
 	public void startUp()
 	{
+		updateConfigOptions();
+
 		overlayManager.add(overlay);
 
 		panel = new InventorySetupPluginPanel(this, itemManager);
@@ -186,8 +206,8 @@ public class InventorySetupPlugin extends Plugin
 
 		clientThread.invoke(() ->
 		{
-			ArrayList<InventorySetupItem> inv = getNormalizedContainer(InventoryID.INVENTORY);
-			ArrayList<InventorySetupItem> eqp = getNormalizedContainer(InventoryID.EQUIPMENT);
+			List<InventorySetupItem> inv = getNormalizedContainer(InventoryID.INVENTORY);
+			List<InventorySetupItem> eqp = getNormalizedContainer(InventoryID.EQUIPMENT);
 
 			final InventorySetup invSetup = new InventorySetup(inv, eqp);
 			SwingUtilities.invokeLater(() ->
@@ -242,8 +262,9 @@ public class InventorySetupPlugin extends Plugin
 	{
 		if (event.getGroup().equals(CONFIG_GROUP))
 		{
+			updateConfigOptions();
 			// only allow highlighting if the config is enabled and the player is logged in
-			highlightDifference = config.getHighlightDifferences() && client.getGameState() == GameState.LOGGED_IN;
+			highlightDifference = this.getHighlightDifferences && client.getGameState() == GameState.LOGGED_IN;
 			final String setupName = panel.getSelectedInventorySetup();
 			if (highlightDifference && !setupName.isEmpty())
 			{
@@ -313,13 +334,13 @@ public class InventorySetupPlugin extends Plugin
 
 		if (container == client.getItemContainer(InventoryID.INVENTORY))
 		{
-			ArrayList<InventorySetupItem> normContainer = getNormalizedContainer(InventoryID.INVENTORY);
+			List<InventorySetupItem> normContainer = getNormalizedContainer(InventoryID.INVENTORY);
 			final InventorySetup setup = inventorySetups.get(selectedInventorySetup);
 			panel.highlightDifferences(normContainer, setup, InventoryID.INVENTORY);
 		}
 		else if (container == client.getItemContainer(InventoryID.EQUIPMENT))
 		{
-			ArrayList<InventorySetupItem> normContainer = getNormalizedContainer(InventoryID.EQUIPMENT);
+			List<InventorySetupItem> normContainer = getNormalizedContainer(InventoryID.EQUIPMENT);
 			final InventorySetup setup = inventorySetups.get(selectedInventorySetup);
 			panel.highlightDifferences(normContainer, setup, InventoryID.EQUIPMENT);
 		}
@@ -338,7 +359,7 @@ public class InventorySetupPlugin extends Plugin
 
 			// set highlighting
 			case LOGGED_IN:
-				highlightDifference = config.getHighlightDifferences();
+				highlightDifference = this.getHighlightDifferences;
 				break;
 
 			default:
@@ -351,13 +372,13 @@ public class InventorySetupPlugin extends Plugin
 		}
 	}
 
-	public ArrayList<InventorySetupItem> getNormalizedContainer(final InventoryID id)
+	public List<InventorySetupItem> getNormalizedContainer(final InventoryID id)
 	{
 		assert id == InventoryID.INVENTORY || id == InventoryID.EQUIPMENT : "invalid inventory ID";
 
 		final ItemContainer container = client.getItemContainer(id);
 
-		ArrayList<InventorySetupItem> newContainer = new ArrayList<>();
+		List<InventorySetupItem> newContainer = new ArrayList<>();
 
 		Item[] items = null;
 		if (container != null)
@@ -433,4 +454,14 @@ public class InventorySetupPlugin extends Plugin
 			.filter(id -> id != -1)
 			.toArray();
 	}
+
+	private void updateConfigOptions()
+	{
+		this.getHighlightDifferences = config.getHighlightDifferences();
+		this.getHighlightColor = config.getHighlightColor();
+		this.getStackDifference = config.getHighlightDifferences();
+		this.getVariationDifference = config.getVariationDifference();
+		this.getBankHighlight = config.getBankHighlight();
+		this.getBankHighlightColor = config.getBankHighlightColor();
+	}
 }
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupContainerPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupContainerPanel.java
index 0d5cb02f4d..794f7217b8 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupContainerPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupContainerPanel.java
@@ -27,20 +27,21 @@ package net.runelite.client.plugins.inventorysetups.ui;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
-import java.util.ArrayList;
+import java.util.List;
+import javax.inject.Singleton;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import net.runelite.client.game.AsyncBufferedImage;
 import net.runelite.client.game.ItemManager;
 import net.runelite.client.game.ItemVariationMapping;
-import net.runelite.client.plugins.inventorysetups.InventorySetupConfig;
 import net.runelite.client.plugins.inventorysetups.InventorySetupItem;
 import net.runelite.client.plugins.inventorysetups.InventorySetupPlugin;
 import net.runelite.client.ui.ColorScheme;
 
-public abstract class InventorySetupContainerPanel extends JPanel
+@Singleton
+abstract class InventorySetupContainerPanel extends JPanel
 {
-	protected ItemManager itemManager;
+	private final ItemManager itemManager;
 
 	private final InventorySetupPlugin plugin;
 
@@ -72,7 +73,7 @@ public abstract class InventorySetupContainerPanel extends JPanel
 
 	void setContainerSlot(int index,
 						final InventorySetupSlot containerSlot,
-						final ArrayList<InventorySetupItem> items)
+						final List<InventorySetupItem> items)
 	{
 		if (index >= items.size() || items.get(index).getId() == -1)
 		{
@@ -99,10 +100,9 @@ public abstract class InventorySetupContainerPanel extends JPanel
 		// important note: do not use item names for comparisons
 		// they are all empty to avoid clientThread usage when highlighting
 
-		final InventorySetupConfig config = plugin.getConfig();
-		final Color highlightColor = config.getHighlightColor();
+		final Color highlightColor = plugin.getGetHighlightColor();
 
-		if (config.getStackDifference() && currItem.getQuantity() != savedItem.getQuantity())
+		if (plugin.isGetStackDifference() && currItem.getQuantity() != savedItem.getQuantity())
 		{
 			containerSlot.setBackground(highlightColor);
 			return;
@@ -111,7 +111,7 @@ public abstract class InventorySetupContainerPanel extends JPanel
 		int currId = currItem.getId();
 		int checkId = savedItem.getId();
 
-		if (!config.getVariationDifference())
+		if (!plugin.isGetVariationDifference())
 		{
 			currId = ItemVariationMapping.map(currId);
 			checkId = ItemVariationMapping.map(checkId);
@@ -127,5 +127,5 @@ public abstract class InventorySetupContainerPanel extends JPanel
 		containerSlot.setBackground(ColorScheme.DARKER_GRAY_COLOR);
 	}
 
-	abstract public void setupContainerPanel(final JPanel containerSlotsPanel);
+	protected abstract void setupContainerPanel(final JPanel containerSlotsPanel);
 }
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupEquipmentPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupEquipmentPanel.java
index b964a205eb..6802ecee8a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupEquipmentPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupEquipmentPanel.java
@@ -26,8 +26,10 @@
 package net.runelite.client.plugins.inventorysetups.ui;
 
 import java.awt.GridLayout;
-import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.inject.Singleton;
 import javax.swing.JPanel;
 import net.runelite.api.EquipmentInventorySlot;
 import net.runelite.client.game.ItemManager;
@@ -36,9 +38,10 @@ import net.runelite.client.plugins.inventorysetups.InventorySetupItem;
 import net.runelite.client.plugins.inventorysetups.InventorySetupPlugin;
 import net.runelite.client.ui.ColorScheme;
 
+@Singleton
 public class InventorySetupEquipmentPanel extends InventorySetupContainerPanel
 {
-	private HashMap<EquipmentInventorySlot, InventorySetupSlot> equipmentSlots;
+	private Map<EquipmentInventorySlot, InventorySetupSlot> equipmentSlots;
 
 	InventorySetupEquipmentPanel(final ItemManager itemManager, final InventorySetupPlugin plugin)
 	{
@@ -78,7 +81,7 @@ public class InventorySetupEquipmentPanel extends InventorySetupContainerPanel
 
 	void setEquipmentSetupSlots(final InventorySetup setup)
 	{
-		final ArrayList<InventorySetupItem> equipment = setup.getEquipment();
+		final List<InventorySetupItem> equipment = setup.getEquipment();
 
 		for (final EquipmentInventorySlot slot : EquipmentInventorySlot.values())
 		{
@@ -91,9 +94,9 @@ public class InventorySetupEquipmentPanel extends InventorySetupContainerPanel
 
 	}
 
-	void highlightDifferences(final ArrayList<InventorySetupItem> currEquipment, final InventorySetup inventorySetup)
+	void highlightDifferences(final List<InventorySetupItem> currEquipment, final InventorySetup inventorySetup)
 	{
-		final ArrayList<InventorySetupItem> equipToCheck = inventorySetup.getEquipment();
+		final List<InventorySetupItem> equipToCheck = inventorySetup.getEquipment();
 
 		assert currEquipment.size() == equipToCheck.size() : "size mismatch";
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupInventoryPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupInventoryPanel.java
index 689773b517..fecaf28ce5 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupInventoryPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupInventoryPanel.java
@@ -27,19 +27,21 @@ package net.runelite.client.plugins.inventorysetups.ui;
 
 import java.awt.GridLayout;
 import java.util.ArrayList;
+import java.util.List;
+import javax.inject.Singleton;
 import javax.swing.JPanel;
 import net.runelite.client.game.ItemManager;
 import net.runelite.client.plugins.inventorysetups.InventorySetup;
 import net.runelite.client.plugins.inventorysetups.InventorySetupItem;
 import net.runelite.client.plugins.inventorysetups.InventorySetupPlugin;
 import net.runelite.client.ui.ColorScheme;
-
+@Singleton
 public class InventorySetupInventoryPanel extends InventorySetupContainerPanel
 {
 	private static final int ITEMS_PER_ROW = 4;
 	private static final int NUM_INVENTORY_ITEMS = 28;
 
-	private ArrayList<InventorySetupSlot> inventorySlots;
+	private List<InventorySetupSlot> inventorySlots;
 
 	InventorySetupInventoryPanel(final ItemManager itemManager, final InventorySetupPlugin plugin)
 	{
@@ -66,7 +68,7 @@ public class InventorySetupInventoryPanel extends InventorySetupContainerPanel
 
 	void setInventorySetupSlots(final InventorySetup setup)
 	{
-		ArrayList<InventorySetupItem> inventory = setup.getInventory();
+		List<InventorySetupItem> inventory = setup.getInventory();
 
 		for (int i = 0; i < NUM_INVENTORY_ITEMS; i++)
 		{
@@ -78,10 +80,10 @@ public class InventorySetupInventoryPanel extends InventorySetupContainerPanel
 
 	}
 
-	void highlightDifferentSlots(final ArrayList<InventorySetupItem> currInventory, final InventorySetup inventorySetup)
+	void highlightDifferentSlots(final List<InventorySetupItem> currInventory, final InventorySetup inventorySetup)
 	{
 
-		final ArrayList<InventorySetupItem> inventoryToCheck = inventorySetup.getInventory();
+		final List<InventorySetupItem> inventoryToCheck = inventorySetup.getInventory();
 
 		assert currInventory.size() == inventoryToCheck.size() : "size mismatch";
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupPluginPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupPluginPanel.java
index 73f0033819..77d99029ed 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupPluginPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupPluginPanel.java
@@ -33,7 +33,8 @@ import java.awt.event.ItemEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.image.BufferedImage;
-import java.util.ArrayList;
+import java.util.List;
+import javax.inject.Singleton;
 import javax.swing.Box;
 import javax.swing.BoxLayout;
 import javax.swing.ImageIcon;
@@ -51,12 +52,13 @@ import net.runelite.client.ui.PluginPanel;
 import net.runelite.client.ui.components.PluginErrorPanel;
 import net.runelite.client.util.ImageUtil;
 
+@Singleton
 public class InventorySetupPluginPanel extends PluginPanel
 {
-	private static ImageIcon ADD_ICON;
-	private static ImageIcon ADD_HOVER_ICON;
-	private static ImageIcon REMOVE_ICON;
-	private static ImageIcon REMOVE_HOVER_ICON;
+	private static final ImageIcon ADD_ICON;
+	private static final ImageIcon ADD_HOVER_ICON;
+	private static final ImageIcon REMOVE_ICON;
+	private static final ImageIcon REMOVE_HOVER_ICON;
 
 	private final JPanel noSetupsPanel;
 	private final JPanel invEqPanel;
@@ -252,8 +254,8 @@ public class InventorySetupPluginPanel extends PluginPanel
 
 		if (plugin.getHighlightDifference())
 		{
-			final ArrayList<InventorySetupItem> normInv = plugin.getNormalizedContainer(InventoryID.INVENTORY);
-			final ArrayList<InventorySetupItem> normEqp = plugin.getNormalizedContainer(InventoryID.EQUIPMENT);
+			final List<InventorySetupItem> normInv = plugin.getNormalizedContainer(InventoryID.INVENTORY);
+			final List<InventorySetupItem> normEqp = plugin.getNormalizedContainer(InventoryID.EQUIPMENT);
 
 			highlightDifferences(normInv, inventorySetup, InventoryID.INVENTORY);
 			highlightDifferences(normEqp, inventorySetup, InventoryID.EQUIPMENT);
@@ -285,7 +287,7 @@ public class InventorySetupPluginPanel extends PluginPanel
 		repaint();
 	}
 
-	public void highlightDifferences(final ArrayList<InventorySetupItem> container,
+	public void highlightDifferences(final List<InventorySetupItem> container,
 									final InventorySetup setupToCheck,
 									final InventoryID type)
 	{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupSlot.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupSlot.java
index 0af6a142cb..bf05e88178 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupSlot.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupSlot.java
@@ -27,16 +27,18 @@ package net.runelite.client.plugins.inventorysetups.ui;
 
 import java.awt.Color;
 import java.awt.Dimension;
+import javax.inject.Singleton;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.SwingConstants;
 import net.runelite.client.game.AsyncBufferedImage;
 
-public class InventorySetupSlot extends JPanel
+@Singleton
+class InventorySetupSlot extends JPanel
 {
 	private final JLabel imageLabel;
 
-	public InventorySetupSlot(Color color)
+	InventorySetupSlot(Color color)
 	{
 		imageLabel = new JLabel();
 		imageLabel.setVerticalAlignment(SwingConstants.CENTER);
@@ -46,7 +48,7 @@ public class InventorySetupSlot extends JPanel
 
 	}
 
-	public void setImageLabel(String toolTip, AsyncBufferedImage itemImage)
+	void setImageLabel(String toolTip, AsyncBufferedImage itemImage)
 	{
 		if (itemImage == null || toolTip == null)
 		{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsOverlay.java
index de7d786eb6..85560e0133 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsOverlay.java
@@ -29,17 +29,19 @@ import java.awt.Graphics2D;
 import java.awt.Rectangle;
 import java.awt.image.BufferedImage;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.widgets.WidgetItem;
 import net.runelite.client.game.ItemManager;
 import net.runelite.client.ui.overlay.WidgetItemOverlay;
 
+@Singleton
 public class InventoryTagsOverlay extends WidgetItemOverlay
 {
 	private final ItemManager itemManager;
 	private final InventoryTagsPlugin plugin;
 
 	@Inject
-	private InventoryTagsOverlay(ItemManager itemManager, InventoryTagsPlugin plugin)
+	private InventoryTagsOverlay(final ItemManager itemManager, final InventoryTagsPlugin plugin)
 	{
 		this.itemManager = itemManager;
 		this.plugin = plugin;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsPlugin.java
index 23e518e1f5..4438f22e34 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsPlugin.java
@@ -30,9 +30,11 @@ import com.google.inject.Provides;
 import java.awt.Color;
 import java.util.List;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.MenuAction;
 import net.runelite.api.MenuEntry;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.MenuOpened;
 import net.runelite.api.events.MenuOptionClicked;
 import net.runelite.api.events.WidgetMenuOptionClicked;
@@ -53,6 +55,7 @@ import net.runelite.client.util.Text;
 	tags = {"highlight", "items", "overlay", "tagging"},
 	enabledByDefault = false
 )
+@Singleton
 public class InventoryTagsPlugin extends Plugin
 {
 	private static final String ITEM_KEY_PREFIX = "item_";
@@ -103,6 +106,11 @@ public class InventoryTagsPlugin extends Plugin
 
 	private boolean editorMode;
 
+	private Color group1Color;
+	private Color group2Color;
+	private Color group3Color;
+	private Color group4Color;
+
 	@Provides
 	InventoryTagsConfig provideConfig(ConfigManager configManager)
 	{
@@ -133,6 +141,7 @@ public class InventoryTagsPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
 		refreshInventoryMenuOptions();
 		overlayManager.add(overlay);
 	}
@@ -227,13 +236,13 @@ public class InventoryTagsPlugin extends Plugin
 		switch (name)
 		{
 			case SETNAME_GROUP_1:
-				return config.getGroup1Color();
+				return this.group1Color;
 			case SETNAME_GROUP_2:
-				return config.getGroup2Color();
+				return this.group2Color;
 			case SETNAME_GROUP_3:
-				return config.getGroup3Color();
+				return this.group3Color;
 			case SETNAME_GROUP_4:
-				return config.getGroup4Color();
+				return this.group4Color;
 		}
 
 		return null;
@@ -265,4 +274,21 @@ public class InventoryTagsPlugin extends Plugin
 			menuManager.addManagedCustomMenu(RESIZABLE_BOTTOM_LINE_INVENTORY_TAB_CONFIGURE);
 		}
 	}
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (event.getGroup().equals("inventorytags"))
+		{
+			updateConfig();
+		}
+	}
+
+	private void updateConfig()
+	{
+		this.group1Color = config.getGroup1Color();
+		this.group2Color = config.getGroup2Color();
+		this.group3Color = config.getGroup3Color();
+		this.group4Color = config.getGroup4Color();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerMode.java
index 18405155ee..c6707f8701 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerMode.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerMode.java
@@ -24,10 +24,11 @@
  */
 package net.runelite.client.plugins.inventoryviewer;
 
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
-@Getter
+@Getter(AccessLevel.PACKAGE)
 @RequiredArgsConstructor
 public enum InventoryViewerMode
 {
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerOverlay.java
index efe6df33a0..c4d82e5a90 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerOverlay.java
@@ -33,6 +33,7 @@ import java.awt.Point;
 import java.awt.Rectangle;
 import java.awt.image.BufferedImage;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.Constants;
 import net.runelite.api.InventoryID;
@@ -50,6 +51,7 @@ import net.runelite.client.ui.overlay.components.ImageComponent;
 import net.runelite.client.ui.overlay.components.PanelComponent;
 import net.runelite.client.ui.overlay.components.TitleComponent;
 
+@Singleton
 class InventoryViewerOverlay extends Overlay
 {
 	private static final int INVENTORY_SIZE = 28;
@@ -58,14 +60,14 @@ class InventoryViewerOverlay extends Overlay
 
 	private final Client client;
 	private final ItemManager itemManager;
-	private final InventoryViewerConfig config;
+	private final InventoryViewerPlugin plugin;
 
 	private final PanelComponent wrapperComponent = new PanelComponent();
 	private final PanelComponent inventoryComponent = new PanelComponent();
 	private final TitleComponent freeSlotsComponent = TitleComponent.builder().build();
 
 	@Inject
-	private InventoryViewerOverlay(Client client, ItemManager itemManager, InventoryViewerConfig config)
+	private InventoryViewerOverlay(final Client client, final ItemManager itemManager, final InventoryViewerPlugin plugin)
 	{
 		setPosition(OverlayPosition.BOTTOM_RIGHT);
 
@@ -89,13 +91,13 @@ class InventoryViewerOverlay extends Overlay
 
 		this.itemManager = itemManager;
 		this.client = client;
-		this.config = config;
+		this.plugin = plugin;
 	}
 
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (config.hideWhenInvOpen()
+		if (plugin.isHideWhenInvOpen()
 			&& client.getVar(VarClientInt.PLAYER_INVENTORY_OPENED) == 3)
 		{
 			return null;
@@ -113,7 +115,7 @@ class InventoryViewerOverlay extends Overlay
 
 		final Item[] items = itemContainer.getItems();
 
-		if (config.viewerMode() == InventoryViewerMode.GROUPED)
+		if (plugin.getViewerMode() == InventoryViewerMode.GROUPED)
 		{
 			Multiset<Integer> totals = HashMultiset.create();
 			for (Item item : items)
@@ -140,7 +142,7 @@ class InventoryViewerOverlay extends Overlay
 			}
 			wrapperComponent.getChildren().add(inventoryComponent);
 
-			if (config.showFreeSlots())
+			if (plugin.isShowFreeSlots())
 			{
 				freeSlotsComponent.setText(remaining + " free");
 				wrapperComponent.setPreferredSize(new Dimension(Math.min(totals.elementSet().size(), 4) * (PLACEHOLDER_WIDTH + 6) + ComponentConstants.STANDARD_BORDER * 2, 0));
@@ -175,7 +177,7 @@ class InventoryViewerOverlay extends Overlay
 
 		wrapperComponent.getChildren().add(inventoryComponent);
 
-		if (config.showFreeSlots())
+		if (plugin.isShowFreeSlots())
 		{
 			freeSlotsComponent.setText(remaining + " free");
 			wrapperComponent.setPreferredSize(new Dimension(4 * (PLACEHOLDER_WIDTH + 6) + ComponentConstants.STANDARD_BORDER * 2, 0));
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerPlugin.java
index 71032a10c7..114809287e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerPlugin.java
@@ -26,7 +26,12 @@ package net.runelite.client.plugins.inventoryviewer;
 
 import com.google.inject.Provides;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
+import lombok.Getter;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.client.config.ConfigManager;
+import net.runelite.client.eventbus.Subscribe;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginDescriptor;
 import net.runelite.client.ui.overlay.OverlayManager;
@@ -37,6 +42,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	tags = {"alternate", "items", "overlay", "second"},
 	enabledByDefault = false
 )
+@Singleton
 public class InventoryViewerPlugin extends Plugin
 {
 	static final String CONFIG_GROUP_KEY = "inventoryviewer";
@@ -47,6 +53,16 @@ public class InventoryViewerPlugin extends Plugin
 	@Inject
 	private OverlayManager overlayManager;
 
+	@Inject
+	private InventoryViewerConfig config;
+
+	@Getter(AccessLevel.PACKAGE)
+	private InventoryViewerMode viewerMode;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showFreeSlots;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean hideWhenInvOpen;
+
 	@Provides
 	InventoryViewerConfig provideConfig(ConfigManager configManager)
 	{
@@ -56,12 +72,29 @@ public class InventoryViewerPlugin extends Plugin
 	@Override
 	public void startUp()
 	{
+		updateConfig();
 		overlayManager.add(overlay);
 	}
 
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (event.getGroup().equals(CONFIG_GROUP_KEY))
+		{
+			updateConfig();
+		}
+	}
+
 	@Override
 	public void shutDown()
 	{
 		overlayManager.remove(overlay);
 	}
+
+	private void updateConfig()
+	{
+		this.viewerMode = config.viewerMode();
+		this.showFreeSlots = config.showFreeSlots();
+		this.hideWhenInvOpen = config.hideWhenInvOpen();
+	}
 }
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeConfig.java
index 18b9d6386b..a866064623 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeConfig.java
@@ -284,8 +284,8 @@ public interface ItemChargeConfig extends Config
 	{
 		return false;
 	}
-	
-	
+
+
 	@ConfigItem(
 		keyName = "showSlayerBracelets",
 		name = "Show Slayer Bracelets Charges",
@@ -298,12 +298,11 @@ public interface ItemChargeConfig extends Config
 	}
 
 
-
 	@ConfigItem(
-			keyName = "expeditious",
-			name = "",
-			description = "",
-			hidden = true
+		keyName = "expeditious",
+		name = "",
+		description = "",
+		hidden = true
 	)
 	default int expeditious()
 	{
@@ -311,9 +310,9 @@ public interface ItemChargeConfig extends Config
 	}
 
 	@ConfigItem(
-			keyName = "expeditious",
-			name = "",
-			description = ""
+		keyName = "expeditious",
+		name = "",
+		description = ""
 	)
 	void expeditious(int expeditious);
 
@@ -337,10 +336,10 @@ public interface ItemChargeConfig extends Config
 
 
 	@ConfigItem(
-			keyName = "xericTalisman",
-			name = "",
-			description = "",
-			hidden = true
+		keyName = "xericTalisman",
+		name = "",
+		description = "",
+		hidden = true
 	)
 	default int xericTalisman()
 	{
@@ -348,17 +347,17 @@ public interface ItemChargeConfig extends Config
 	}
 
 	@ConfigItem(
-			keyName = "xericTalisman",
-			name = "",
-			description = ""
+		keyName = "xericTalisman",
+		name = "",
+		description = ""
 	)
 	void xericTalisman(int xericTalisman);
 
 	@ConfigItem(
-			keyName = "showSoulBearerCharges",
-			name = "Show Soul Bearer Charges",
-			description = "Configures if Soul Bearer item charge is shown",
-			position = 19
+		keyName = "showSoulBearerCharges",
+		name = "Show Soul Bearer Charges",
+		description = "Configures if Soul Bearer item charge is shown",
+		position = 19
 	)
 	default boolean showSoulBearerCharges()
 	{
@@ -366,10 +365,10 @@ public interface ItemChargeConfig extends Config
 	}
 
 	@ConfigItem(
-			keyName = "soulBearer",
-			name = "",
-			description = "",
-			hidden = true
+		keyName = "soulBearer",
+		name = "",
+		description = "",
+		hidden = true
 	)
 	default int soulBearer()
 	{
@@ -377,17 +376,17 @@ public interface ItemChargeConfig extends Config
 	}
 
 	@ConfigItem(
-			keyName = "soulBearer",
-			name = "",
-			description = ""
+		keyName = "soulBearer",
+		name = "",
+		description = ""
 	)
 	void soulBearer(int soulBearer);
 
 	@ConfigItem(
-			keyName = "showChronicleCharges",
-			name = "Show Chronicle Charges",
-			description = "Configures if Chronicle item charge is shown",
-			position = 20
+		keyName = "showChronicleCharges",
+		name = "Show Chronicle Charges",
+		description = "Configures if Chronicle item charge is shown",
+		position = 20
 	)
 	default boolean showChronicleCharges()
 	{
@@ -395,23 +394,21 @@ public interface ItemChargeConfig extends Config
 	}
 
 	@ConfigItem(
-			keyName = "showXericTalismanCharges",
-			name = "Show Xeric's Talisman Charges",
-			description = "Configures if Xeric's Talisman item charge is shown",
-			position = 21
+		keyName = "showXericTalismanCharges",
+		name = "Show Xeric's Talisman Charges",
+		description = "Configures if Xeric's Talisman item charge is shown",
+		position = 21
 	)
 	default boolean showXericTalismanCharges()
 	{
 		return false;
 	}
 
-
-
 	@ConfigItem(
-			keyName = "showrecoil",
-			name = "Show If Recoil is activated",
-			description = "Configures if Recoil is activated",
-			position = 22
+		keyName = "showrecoil",
+		name = "Show If Recoil is activated",
+		description = "Configures if Recoil is activated",
+		position = 22
 	)
 	default boolean showrecoil()
 	{
@@ -419,10 +416,10 @@ public interface ItemChargeConfig extends Config
 	}
 
 	@ConfigItem(
-			keyName = "chronicle",
-			name = "",
-			description = "",
-			hidden = true
+		keyName = "chronicle",
+		name = "",
+		description = "",
+		hidden = true
 	)
 	default int chronicle()
 	{
@@ -430,9 +427,9 @@ public interface ItemChargeConfig extends Config
 	}
 
 	@ConfigItem(
-			keyName = "chronicle",
-			name = "",
-			description = ""
+		keyName = "chronicle",
+		name = "",
+		description = ""
 	)
 	void chronicle(int chronicle);
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeInfobox.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeInfobox.java
index 7ee70d44b5..82bd2e411a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeInfobox.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeInfobox.java
@@ -26,11 +26,12 @@ package net.runelite.client.plugins.itemcharges;
 
 import java.awt.Color;
 import java.awt.image.BufferedImage;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.EquipmentInventorySlot;
 import net.runelite.client.ui.overlay.infobox.Counter;
 
-@Getter
+@Getter(AccessLevel.PACKAGE)
 class ItemChargeInfobox extends Counter
 {
 	private final ItemChargePlugin plugin;
@@ -38,12 +39,12 @@ class ItemChargeInfobox extends Counter
 	private final EquipmentInventorySlot slot;
 
 	ItemChargeInfobox(
-		ItemChargePlugin plugin,
-		BufferedImage image,
-		String name,
-		int charges,
-		ItemWithSlot item,
-		EquipmentInventorySlot slot)
+		final ItemChargePlugin plugin,
+		final BufferedImage image,
+		final String name,
+		final int charges,
+		final ItemWithSlot item,
+		final EquipmentInventorySlot slot)
 	{
 		super(image, plugin, charges);
 		setTooltip(name);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeOverlay.java
index 31db7daad1..6253985981 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeOverlay.java
@@ -29,6 +29,7 @@ import java.awt.Graphics2D;
 import java.awt.Point;
 import java.awt.Rectangle;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.ItemID;
 import net.runelite.api.widgets.WidgetItem;
 import static net.runelite.client.plugins.itemcharges.ItemChargeType.ABYSSAL_BRACELET;
@@ -42,16 +43,15 @@ import net.runelite.client.ui.FontManager;
 import net.runelite.client.ui.overlay.WidgetItemOverlay;
 import net.runelite.client.ui.overlay.components.TextComponent;
 
+@Singleton
 class ItemChargeOverlay extends WidgetItemOverlay
 {
-	private final ItemChargePlugin itemChargePlugin;
-	private final ItemChargeConfig config;
+	private final ItemChargePlugin plugin;
 
 	@Inject
-	ItemChargeOverlay(ItemChargePlugin itemChargePlugin, ItemChargeConfig config)
+	ItemChargeOverlay(final ItemChargePlugin itemChargePlugin)
 	{
-		this.itemChargePlugin = itemChargePlugin;
-		this.config = config;
+		this.plugin = itemChargePlugin;
 		showOnInventory();
 		showOnEquipment();
 	}
@@ -69,72 +69,72 @@ class ItemChargeOverlay extends WidgetItemOverlay
 		int charges;
 		if (itemId == ItemID.DODGY_NECKLACE)
 		{
-			if (!config.showDodgyCount())
+			if (!plugin.isShowDodgyCount())
 			{
 				return;
 			}
 
-			charges = config.dodgyNecklace();
+			charges = plugin.getDodgyNecklace();
 		}
 		else if (itemId == ItemID.BRACELET_OF_SLAUGHTER)
 		{
-			if (!config.showSlayerBracelets())
+			if (!plugin.isShowSlayerBracelets())
 			{
 				return;
 			}
 
-			charges = config.slaughter();
+			charges = plugin.getSlaughter();
 		}
 		else if (itemId == ItemID.EXPEDITIOUS_BRACELET)
 		{
-			if (!config.showSlayerBracelets())
+			if (!plugin.isShowSlayerBracelets())
 			{
 				return;
 			}
 
-			charges = config.expeditious();
+			charges = plugin.getExpeditious();
 		}
 		else if (itemId == ItemID.BINDING_NECKLACE)
 		{
-			if (!config.showBindingNecklaceCharges())
+			if (!plugin.isShowBindingNecklaceCharges())
 			{
 				return;
 			}
 
-			charges = config.bindingNecklace();
+			charges = plugin.getBindingNecklace();
 		}
 		else if (itemId == ItemID.XERICS_TALISMAN)
 		{
-			if (!config.showXericTalismanCharges())
+			if (!plugin.isShowXericTalismanCharges())
 			{
 				return;
 			}
-			charges = config.xericTalisman();
+			charges = plugin.getXericTalisman();
 		}
 		else if (itemId == ItemID.SOUL_BEARER)
 		{
-			if (!config.showSoulBearerCharges())
+			if (!plugin.isShowSoulBearerCharges())
 			{
 				return;
 			}
-			charges = config.soulBearer();
+			charges = plugin.getSoulBearer();
 		}
 		else if (itemId == ItemID.CHRONICLE)
 		{
-			if (!config.showChronicleCharges())
+			if (!plugin.isShowChronicleCharges())
 			{
 				return;
 			}
-			charges = config.chronicle();
+			charges = plugin.getChronicle();
 		}
 		else if (itemId >= ItemID.EXPLORERS_RING_1 && itemId <= ItemID.EXPLORERS_RING_4)
 		{
-			if (!config.showExplorerRingCharges())
+			if (!plugin.isShowExplorerRingCharges())
 			{
 				return;
 			}
 
-			charges = config.explorerRing();
+			charges = plugin.getExplorerRing();
 		}
 		else
 
@@ -146,13 +146,13 @@ class ItemChargeOverlay extends WidgetItemOverlay
 			}
 
 			ItemChargeType type = chargeItem.getType();
-			if ((type == TELEPORT && !config.showTeleportCharges())
-				|| (type == FUNGICIDE_SPRAY && !config.showFungicideCharges())
-				|| (type == IMPBOX && !config.showImpCharges())
-				|| (type == WATERCAN && !config.showWateringCanCharges())
-				|| (type == WATERSKIN && !config.showWaterskinCharges())
-				|| (type == BELLOWS && !config.showBellowCharges())
-				|| (type == ABYSSAL_BRACELET && !config.showAbyssalBraceletCharges()))
+			if ((type == TELEPORT && !plugin.isShowTeleportCharges())
+				|| (type == FUNGICIDE_SPRAY && !plugin.isShowFungicideCharges())
+				|| (type == IMPBOX && !plugin.isShowImpCharges())
+				|| (type == WATERCAN && !plugin.isShowWateringCanCharges())
+				|| (type == WATERSKIN && !plugin.isShowWaterskinCharges())
+				|| (type == BELLOWS && !plugin.isShowBellowCharges())
+				|| (type == ABYSSAL_BRACELET && !plugin.isShowAbyssalBraceletCharges()))
 			{
 				return;
 			}
@@ -164,14 +164,14 @@ class ItemChargeOverlay extends WidgetItemOverlay
 		final TextComponent textComponent = new TextComponent();
 		textComponent.setPosition(new Point(bounds.x, bounds.y + 1 + graphics.getFontMetrics().getMaxAscent() - graphics.getFontMetrics().getMaxDescent()));
 		textComponent.setText(charges < 0 ? "?" : String.valueOf(charges));
-		textComponent.setColor(itemChargePlugin.getColor(charges));
+		textComponent.setColor(plugin.getColor(charges));
 		textComponent.render(graphics);
 	}
 
 	private boolean displayOverlay()
 	{
-		return config.showTeleportCharges() || config.showDodgyCount() || config.showFungicideCharges()
-			|| config.showImpCharges() || config.showWateringCanCharges() || config.showWaterskinCharges()
-			|| config.showBellowCharges() || config.showAbyssalBraceletCharges() || config.showExplorerRingCharges();
+		return plugin.isShowTeleportCharges() || plugin.isShowDodgyCount() || plugin.isShowFungicideCharges()
+			|| plugin.isShowImpCharges() || plugin.isShowWateringCanCharges() || plugin.isShowWaterskinCharges()
+			|| plugin.isShowBellowCharges() || plugin.isShowAbyssalBraceletCharges() || plugin.isShowExplorerRingCharges();
 	}
 }
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java
index 5267d8c0f4..0cf44d6f25 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java
@@ -32,6 +32,7 @@ import java.awt.image.BufferedImage;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.ChatMessageType;
@@ -69,6 +70,7 @@ import static net.runelite.api.ItemID.RING_OF_RECOIL;
 	description = "Show number of item charges remaining",
 	tags = {"inventory", "notifications", "overlay"}
 )
+@Singleton
 public class ItemChargePlugin extends Plugin
 {
 	private static final Pattern DODGY_CHECK_PATTERN = Pattern.compile(
@@ -86,7 +88,7 @@ public class ItemChargePlugin extends Plugin
 	private static final Pattern DODGY_BREAK_PATTERN = Pattern.compile(
 		"Your dodgy necklace protects you\\..*It then crumbles to dust\\.");
 	private static final String RING_OF_RECOIL_BREAK_MESSAGE = "<col=7f007f>Your Ring of Recoil has shattered.</col>";
-	private static Pattern BINDING_CHECK_PATTERN = Pattern.compile(
+	private static final Pattern BINDING_CHECK_PATTERN = Pattern.compile(
 		"You have ([0-9]+|one) charges? left before your Binding necklace disintegrates.");
 	private static final Pattern BINDING_USED_PATTERN = Pattern.compile(
 		"You bind the temple's power into (mud|lava|steam|dust|smoke|mist) runes\\.");
@@ -126,8 +128,6 @@ public class ItemChargePlugin extends Plugin
 	private static final int MAX_BINDING_CHARGES = 16;
 	private static final int MAX_EXPLORER_RING_CHARGES = 30;
 
-	private int lastExplorerRingCharge = -1;
-
 	@Getter(AccessLevel.PACKAGE)
 	private boolean ringOfRecoilAvailable = false;
 
@@ -164,6 +164,65 @@ public class ItemChargePlugin extends Plugin
 	// Limits destroy callback to once per tick
 	private int lastCheckTick;
 
+	private Color veryLowWarningColor;
+	private Color lowWarningolor;
+	private int veryLowWarning;
+	private int lowWarning;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showTeleportCharges;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showDodgyCount;
+	private boolean dodgyNotification;
+	@Getter(AccessLevel.PACKAGE)
+	private int dodgyNecklace;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showImpCharges;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showFungicideCharges;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showWateringCanCharges;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showWaterskinCharges;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showBellowCharges;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showBasketCharges;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showSackCharges;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showAbyssalBraceletCharges;
+	private boolean recoilNotification;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showBindingNecklaceCharges;
+	@Getter(AccessLevel.PACKAGE)
+	private int bindingNecklace;
+	private boolean bindingNotification;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showExplorerRingCharges;
+	@Getter(AccessLevel.PACKAGE)
+	private int explorerRing;
+	private boolean showInfoboxes;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showSlayerBracelets;
+	@Getter(AccessLevel.PACKAGE)
+	private int expeditious;
+	@Getter(AccessLevel.PACKAGE)
+	private int slaughter;
+	@Getter(AccessLevel.PACKAGE)
+	private int xericTalisman;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showSoulBearerCharges;
+	@Getter(AccessLevel.PACKAGE)
+	private int soulBearer;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showChronicleCharges;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showXericTalismanCharges;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showrecoil;
+	@Getter(AccessLevel.PACKAGE)
+	private int chronicle;
+
 	@Provides
 	ItemChargeConfig getConfig(ConfigManager configManager)
 	{
@@ -173,6 +232,8 @@ public class ItemChargePlugin extends Plugin
 	@Override
 	protected void startUp()
 	{
+		updateConfig();
+
 		overlayManager.add(overlay);
 		overlayManager.add(recoilOverlay);
 		recoilRingImage = itemManager.getImage(RING_OF_RECOIL);
@@ -195,39 +256,41 @@ public class ItemChargePlugin extends Plugin
 			return;
 		}
 
-		if (!config.showInfoboxes())
+		updateConfig();
+
+		if (!this.showInfoboxes)
 		{
 			infoBoxManager.removeIf(ItemChargeInfobox.class::isInstance);
 			return;
 		}
 
-		if (!config.showTeleportCharges())
+		if (!this.showTeleportCharges)
 		{
 			removeInfobox(ItemWithSlot.TELEPORT);
 		}
 
-		if (!config.showAbyssalBraceletCharges())
+		if (!this.showAbyssalBraceletCharges)
 		{
 			removeInfobox(ItemWithSlot.ABYSSAL_BRACELET);
 		}
 
-		if (!config.showDodgyCount())
+		if (!this.showDodgyCount)
 		{
 			removeInfobox(ItemWithSlot.DODGY_NECKLACE);
 		}
 
-		if (!config.showSlayerBracelets())
+		if (!this.showSlayerBracelets)
 		{
 			removeInfobox(ItemWithSlot.BRACELET_OF_SLAUGHTER);
 			removeInfobox(ItemWithSlot.EXPEDITIOUS_BRACELET);
 		}
 
-		if (!config.showBindingNecklaceCharges())
+		if (!this.showBindingNecklaceCharges)
 		{
 			removeInfobox(ItemWithSlot.BINDING_NECKLACE);
 		}
 
-		if (!config.showExplorerRingCharges())
+		if (!this.showExplorerRingCharges)
 		{
 			removeInfobox(ItemWithSlot.EXPLORER_RING);
 		}
@@ -256,7 +319,7 @@ public class ItemChargePlugin extends Plugin
 
 		if (event.getType() == ChatMessageType.GAMEMESSAGE || event.getType() == ChatMessageType.SPAM)
 		{
-			if (config.recoilNotification() && message.contains(RING_OF_RECOIL_BREAK_MESSAGE))
+			if (this.recoilNotification && message.contains(RING_OF_RECOIL_BREAK_MESSAGE))
 			{
 				notifier.notify("Your Ring of Recoil has shattered");
 			}
@@ -286,7 +349,7 @@ public class ItemChargePlugin extends Plugin
 			}
 			else if (dodgyBreakMatcher.find())
 			{
-				if (config.dodgyNotification())
+				if (this.dodgyNotification)
 				{
 					notifier.notify("Your dodgy necklace has crumbled to dust.");
 				}
@@ -295,7 +358,7 @@ public class ItemChargePlugin extends Plugin
 			}
 			else if (message.contains(BINDING_BREAK_TEXT))
 			{
-				if (config.bindingNotification())
+				if (this.bindingNotification)
 				{
 					notifier.notify(BINDING_BREAK_TEXT);
 				}
@@ -305,7 +368,7 @@ public class ItemChargePlugin extends Plugin
 			}
 			else if (bindingNecklaceUsedMatcher.find())
 			{
-				updateBindingNecklaceCharges(config.bindingNecklace() - 1);
+				updateBindingNecklaceCharges(this.bindingNecklace - 1);
 			}
 			else if (bindingNecklaceCheckMatcher.find())
 			{
@@ -360,40 +423,40 @@ public class ItemChargePlugin extends Plugin
 	@Subscribe
 	public void onItemContainerChanged(ItemContainerChanged event)
 	{
-		if (event.getItemContainer() != client.getItemContainer(InventoryID.EQUIPMENT) || !config.showInfoboxes())
+		if (event.getItemContainer() != client.getItemContainer(InventoryID.EQUIPMENT) || !this.showInfoboxes)
 		{
 			return;
 		}
 
 		final Item[] items = event.getItemContainer().getItems();
 
-		if (config.showTeleportCharges())
+		if (this.showTeleportCharges)
 		{
 			updateJewelleryInfobox(ItemWithSlot.TELEPORT, items);
 		}
 
-		if (config.showDodgyCount())
+		if (this.showDodgyCount)
 		{
 			updateJewelleryInfobox(ItemWithSlot.DODGY_NECKLACE, items);
 		}
 
-		if (config.showAbyssalBraceletCharges())
+		if (this.showAbyssalBraceletCharges)
 		{
 			updateJewelleryInfobox(ItemWithSlot.ABYSSAL_BRACELET, items);
 		}
 
-		if (config.showSlayerBracelets())
+		if (this.showSlayerBracelets)
 		{
 			updateJewelleryInfobox(ItemWithSlot.BRACELET_OF_SLAUGHTER, items);
 			updateJewelleryInfobox(ItemWithSlot.EXPEDITIOUS_BRACELET, items);
 		}
 
-		if (config.showBindingNecklaceCharges())
+		if (this.showBindingNecklaceCharges)
 		{
 			updateJewelleryInfobox(ItemWithSlot.BINDING_NECKLACE, items);
 		}
 
-		if (config.showExplorerRingCharges())
+		if (this.showExplorerRingCharges)
 		{
 			updateJewelleryInfobox(ItemWithSlot.EXPLORER_RING, items);
 		}
@@ -410,10 +473,12 @@ public class ItemChargePlugin extends Plugin
 			if (braceletText.contains("bracelet of slaughter"))
 			{
 				config.slaughter(MAX_SLAUGHTER_CHARGES);
+				this.slaughter = MAX_SLAUGHTER_CHARGES;
 			}
 			else if (braceletText.contains("expeditious bracelet"))
 			{
 				config.expeditious(MAX_EXPEDITIOUS_CHARGES);
+				this.expeditious = MAX_EXPEDITIOUS_CHARGES;
 			}
 		}
 
@@ -502,13 +567,10 @@ public class ItemChargePlugin extends Plugin
 	@Subscribe
 	public void onSpotAnimationChanged(SpotAnimationChanged event)
 	{
-		if (event.getActor() == client.getLocalPlayer())
+		if (event.getActor() == client.getLocalPlayer() && client.getLocalPlayer().getSpotAnimation() == GraphicID.XERIC_TELEPORT)
 		{
-			if (client.getLocalPlayer().getSpotAnimation() == GraphicID.XERIC_TELEPORT)
-			{
-				final int xericCharges = Math.max(config.xericTalisman() - 1, 0);
-				updateXericCharges(xericCharges);
-			}
+			final int xericCharges = Math.max(this.xericTalisman - 1, 0);
+			updateXericCharges(xericCharges);
 		}
 	}
 
@@ -531,6 +593,7 @@ public class ItemChargePlugin extends Plugin
 	private void onVarbitChanged(VarbitChanged event)
 	{
 		int explorerRingCharge = client.getVar(Varbits.EXPLORER_RING_ALCHS);
+		int lastExplorerRingCharge = -1;
 		if (lastExplorerRingCharge != explorerRingCharge)
 		{
 			updateExplorerRingCharges(explorerRingCharge);
@@ -540,8 +603,9 @@ public class ItemChargePlugin extends Plugin
 	private void updateDodgyNecklaceCharges(final int value)
 	{
 		config.dodgyNecklace(value);
+		this.dodgyNecklace = value;
 
-		if (config.showInfoboxes() && config.showDodgyCount())
+		if (this.showInfoboxes && this.showDodgyCount)
 		{
 			final ItemContainer itemContainer = client.getItemContainer(InventoryID.EQUIPMENT);
 
@@ -557,8 +621,9 @@ public class ItemChargePlugin extends Plugin
 	private void updateBraceletOfSlaughterCharges(final int value)
 	{
 		config.slaughter(value);
+		this.slaughter = value;
 
-		if (config.showInfoboxes() && config.showSlayerBracelets())
+		if (this.showInfoboxes && this.showSlayerBracelets)
 		{
 			final ItemContainer itemContainer = client.getItemContainer(InventoryID.EQUIPMENT);
 
@@ -574,8 +639,9 @@ public class ItemChargePlugin extends Plugin
 	private void updateExpeditiousCharges(final int value)
 	{
 		config.expeditious(value);
+		this.expeditious = value;
 
-		if (config.showInfoboxes() && config.showSlayerBracelets())
+		if (this.showInfoboxes && this.showSlayerBracelets)
 		{
 			final ItemContainer itemContainer = client.getItemContainer(InventoryID.EQUIPMENT);
 
@@ -591,8 +657,9 @@ public class ItemChargePlugin extends Plugin
 	private void updateBindingNecklaceCharges(final int value)
 	{
 		config.bindingNecklace(value);
+		this.bindingNecklace = value;
 
-		if (config.showInfoboxes() && config.showBindingNecklaceCharges())
+		if (this.showInfoboxes && this.showBindingNecklaceCharges)
 		{
 			final ItemContainer itemContainer = client.getItemContainer(InventoryID.EQUIPMENT);
 
@@ -608,24 +675,28 @@ public class ItemChargePlugin extends Plugin
 	private void updateXericCharges(int xericCharges)
 	{
 		config.xericTalisman(xericCharges);
+		this.xericTalisman = xericCharges;
 	}
 
 	private void updateSoulBearerCharges(int soulBearerCharges)
 	{
 		config.soulBearer(soulBearerCharges);
+		this.soulBearer = soulBearerCharges;
 	}
 
 	private void updateChronicleCharges(int chronicleCharges)
 	{
 		config.chronicle(chronicleCharges);
+		this.chronicle = chronicleCharges;
 	}
 	
 	private void updateExplorerRingCharges(final int value)
 	{
 		// Note: Varbit counts upwards. We count down from the maximum charges.
 		config.explorerRing(MAX_EXPLORER_RING_CHARGES - value);
+		this.explorerRing = MAX_EXPLORER_RING_CHARGES - value;
 
-		if (config.showInfoboxes() && config.showExplorerRingCharges())
+		if (this.showInfoboxes && this.showExplorerRingCharges)
 		{
 			final ItemContainer itemContainer = client.getItemContainer(InventoryID.EQUIPMENT);
 
@@ -694,23 +765,23 @@ public class ItemChargePlugin extends Plugin
 		{
 			if (id == ItemID.DODGY_NECKLACE && type == ItemWithSlot.DODGY_NECKLACE)
 			{
-				charges = config.dodgyNecklace();
+				charges = this.dodgyNecklace;
 			}
 			else if (id == ItemID.BRACELET_OF_SLAUGHTER && type == ItemWithSlot.BRACELET_OF_SLAUGHTER)
 			{
-				charges = config.slaughter();
+				charges = this.slaughter;
 			}
 			else if (id == ItemID.EXPEDITIOUS_BRACELET && type == ItemWithSlot.EXPEDITIOUS_BRACELET)
 			{
-				charges = config.expeditious();
+				charges = this.expeditious;
 			}
 			else if (id == ItemID.BINDING_NECKLACE && type == ItemWithSlot.BINDING_NECKLACE)
 			{
-				charges = config.bindingNecklace();
+				charges = this.bindingNecklace;
 			}
 			else if ((id >= ItemID.EXPLORERS_RING_1 && id <= ItemID.EXPLORERS_RING_4) && type == ItemWithSlot.EXPLORER_RING)
 			{
-				charges = config.explorerRing();
+				charges = this.explorerRing;
 			}
 		}
 		else if (itemWithCharge.getType() == type.getType())
@@ -751,14 +822,49 @@ public class ItemChargePlugin extends Plugin
 	Color getColor(int charges)
 	{
 		Color color = Color.WHITE;
-		if (charges <= config.veryLowWarning())
+		if (charges <= this.veryLowWarning)
 		{
-			color = config.veryLowWarningColor();
+			color = this.veryLowWarningColor;
 		}
-		else if (charges <= config.lowWarning())
+		else if (charges <= this.lowWarning)
 		{
-			color = config.lowWarningolor();
+			color = this.lowWarningolor;
 		}
 		return color;
 	}
+
+	private void updateConfig()
+	{
+		this.veryLowWarningColor = config.veryLowWarningColor();
+		this.lowWarningolor = config.lowWarningolor();
+		this.veryLowWarning = config.veryLowWarning();
+		this.lowWarning = config.lowWarning();
+		this.showTeleportCharges = config.showTeleportCharges();
+		this.showDodgyCount = config.showDodgyCount();
+		this.dodgyNotification = config.dodgyNotification();
+		this.dodgyNecklace = config.dodgyNecklace();
+		this.showImpCharges = config.showImpCharges();
+		this.showFungicideCharges = config.showFungicideCharges();
+		this.showWateringCanCharges = config.showWateringCanCharges();
+		this.showWaterskinCharges = config.showWaterskinCharges();
+		this.showBellowCharges = config.showBellowCharges();
+		this.showAbyssalBraceletCharges = config.showAbyssalBraceletCharges();
+		this.recoilNotification = config.recoilNotification();
+		this.showBindingNecklaceCharges = config.showBindingNecklaceCharges();
+		this.bindingNecklace = config.bindingNecklace();
+		this.bindingNotification = config.bindingNotification();
+		this.showExplorerRingCharges = config.showExplorerRingCharges();
+		this.explorerRing = config.explorerRing();
+		this.showInfoboxes = config.showInfoboxes();
+		this.showSlayerBracelets = config.showSlayerBracelets();
+		this.expeditious = config.expeditious();
+		this.slaughter = config.slaughter();
+		this.xericTalisman = config.xericTalisman();
+		this.showSoulBearerCharges = config.showSoulBearerCharges();
+		this.soulBearer = config.soulBearer();
+		this.showChronicleCharges = config.showChronicleCharges();
+		this.showXericTalismanCharges = config.showXericTalismanCharges();
+		this.showrecoil = config.showrecoil();
+		this.chronicle = config.chronicle();
+	}
 }
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemRecoilOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemRecoilOverlay.java
index af55d54fe7..bc37d03b27 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemRecoilOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemRecoilOverlay.java
@@ -30,7 +30,7 @@ import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
 import javax.inject.Inject;
-import net.runelite.api.Client;
+import javax.inject.Singleton;
 import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.components.ImageComponent;
@@ -38,20 +38,19 @@ import net.runelite.client.ui.overlay.components.PanelComponent;
 import net.runelite.client.ui.overlay.components.table.TableAlignment;
 import net.runelite.client.ui.overlay.components.table.TableComponent;
 
+@Singleton
 class ItemRecoilOverlay extends Overlay
 {
 	private static final Color NOT_ACTIVATED_BACKGROUND_COLOR = new Color(150, 0, 0, 150);
 	private static final Color ACTIVATED_BACKGROUND_COLOR = new Color(0, 150, 0, 150);
 	private final ItemChargePlugin plugin;
-	private final ItemChargeConfig config;
 	private final PanelComponent imagePanelComponent = new PanelComponent();
 
 	@Inject
-	public ItemRecoilOverlay(Client client, ItemChargePlugin plugin, ItemChargeConfig config)
+	public ItemRecoilOverlay(final ItemChargePlugin plugin)
 	{
 		setPosition(OverlayPosition.TOP_LEFT);
 		this.plugin = plugin;
-		this.config = config;
 	}
 
 	@Override
@@ -61,19 +60,17 @@ class ItemRecoilOverlay extends Overlay
 		tableComponent.setColumnAlignments(TableAlignment.LEFT, TableAlignment.RIGHT);
 
 		this.imagePanelComponent.getChildren().clear();
-		if (config.showrecoil())
+		if (plugin.isShowrecoil() && plugin.isRingOfRecoilAvailable())
 		{
-			if (plugin.isRingOfRecoilAvailable())
-			{
-				BufferedImage recoilImage = plugin.getRecoilRingImage();
-				imagePanelComponent.setBackgroundColor(plugin
-						.isRingOfRecoilEquipped() ? ACTIVATED_BACKGROUND_COLOR : NOT_ACTIVATED_BACKGROUND_COLOR);
-				imagePanelComponent.getChildren().add(new ImageComponent(recoilImage));
+			BufferedImage recoilImage = plugin.getRecoilRingImage();
+			imagePanelComponent.setBackgroundColor(plugin
+					.isRingOfRecoilEquipped() ? ACTIVATED_BACKGROUND_COLOR : NOT_ACTIVATED_BACKGROUND_COLOR);
+			imagePanelComponent.getChildren().add(new ImageComponent(recoilImage));
 
-				imagePanelComponent.getChildren().add(tableComponent);
-				return imagePanelComponent.render(graphics);
-			}
+			imagePanelComponent.getChildren().add(tableComponent);
+			return imagePanelComponent.render(graphics);
 		}
+
 		return null;
 	}
 }
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemWithCharge.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemWithCharge.java
index 2f2fe76469..6df317f5c6 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemWithCharge.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemWithCharge.java
@@ -27,6 +27,7 @@ package net.runelite.client.plugins.itemcharges;
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;
 import javax.annotation.Nullable;
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import static net.runelite.api.ItemID.ABYSSAL_BRACELET1;
@@ -165,7 +166,7 @@ import static net.runelite.client.plugins.itemcharges.ItemChargeType.WATERCAN;
 import static net.runelite.client.plugins.itemcharges.ItemChargeType.WATERSKIN;
 
 @AllArgsConstructor
-@Getter
+@Getter(AccessLevel.PACKAGE)
 enum ItemWithCharge
 {
 	ABRACE1(ABYSSAL_BRACELET, ABYSSAL_BRACELET1, 1),
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemWithSlot.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemWithSlot.java
index 4e7aec6b52..01d37630ae 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemWithSlot.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemWithSlot.java
@@ -27,10 +27,11 @@ package net.runelite.client.plugins.itemcharges;
 
 import com.google.common.collect.Sets;
 import java.util.Set;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.EquipmentInventorySlot;
 
-@Getter
+@Getter(AccessLevel.PACKAGE)
 enum ItemWithSlot
 {
 	ABYSSAL_BRACELET(ItemChargeType.ABYSSAL_BRACELET, EquipmentInventorySlot.GLOVES),
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentification.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentification.java
index d2e9913bbf..c1ccaada8e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentification.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentification.java
@@ -90,7 +90,7 @@ enum ItemIdentification
 	final Type type;
 	final String medName;
 	final String shortName;
-	final int[] itemIDs;
+	private final int[] itemIDs;
 
 	ItemIdentification(Type type, String medName, String shortName, int... ids)
 	{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationOverlay.java
index 588a51173d..416073704f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationOverlay.java
@@ -25,6 +25,7 @@
 package net.runelite.client.plugins.itemidentification;
 
 import com.google.inject.Inject;
+import com.google.inject.Singleton;
 import java.awt.Graphics2D;
 import java.awt.Point;
 import java.awt.Rectangle;
@@ -38,14 +39,15 @@ import net.runelite.client.ui.FontManager;
 import net.runelite.client.ui.overlay.WidgetItemOverlay;
 import net.runelite.client.ui.overlay.components.TextComponent;
 
+@Singleton
 class ItemIdentificationOverlay extends WidgetItemOverlay
 {
-	private final ItemIdentificationConfig config;
+	private final ItemIdentificationPlugin plugin;
 
 	@Inject
-	ItemIdentificationOverlay(ItemIdentificationConfig config)
+	ItemIdentificationOverlay(final ItemIdentificationPlugin plugin)
 	{
-		this.config = config;
+		this.plugin = plugin;
 		showOnInventory();
 		showOnBank();
 		showOnInterfaces(KEPT_ON_DEATH_GROUP_ID, GUIDE_PRICE_GROUP_ID, LOOTING_BAG_GROUP_ID, SEED_BOX_GROUP_ID, KINGDOM_GROUP_ID);
@@ -63,19 +65,19 @@ class ItemIdentificationOverlay extends WidgetItemOverlay
 		switch (iden.type)
 		{
 			case SEED:
-				if (!config.showSeeds())
+				if (!plugin.isShowSeeds())
 				{
 					return;
 				}
 				break;
 			case HERB:
-				if (!config.showHerbs())
+				if (!plugin.isShowHerbs())
 				{
 					return;
 				}
 				break;
 			case SAPLING:
-				if (!config.showSaplings())
+				if (!plugin.isShowSaplings())
 				{
 					return;
 				}
@@ -91,8 +93,8 @@ class ItemIdentificationOverlay extends WidgetItemOverlay
 	{
 		final TextComponent textComponent = new TextComponent();
 		textComponent.setPosition(new Point(bounds.x - 1, bounds.y + bounds.height - 1));
-		textComponent.setColor(config.textColor());
-		switch (config.identificationType())
+		textComponent.setColor(plugin.getTextColor());
+		switch (plugin.getIdentificationType())
 		{
 			case SHORT:
 				textComponent.setText(iden.shortName);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationPlugin.java
index 6e4f331765..1a8e9fa293 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationPlugin.java
@@ -25,8 +25,14 @@
 package net.runelite.client.plugins.itemidentification;
 
 import com.google.inject.Provides;
+import java.awt.Color;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
+import lombok.Getter;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.client.config.ConfigManager;
+import net.runelite.client.eventbus.Subscribe;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginDescriptor;
 import net.runelite.client.ui.overlay.OverlayManager;
@@ -36,6 +42,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	description = "Show identifying text over items with difficult to distinguish sprites",
 	enabledByDefault = false
 )
+@Singleton
 public class ItemIdentificationPlugin extends Plugin
 {
 	@Inject
@@ -44,6 +51,20 @@ public class ItemIdentificationPlugin extends Plugin
 	@Inject
 	private ItemIdentificationOverlay overlay;
 
+	@Inject
+	private ItemIdentificationConfig config;
+
+	@Getter(AccessLevel.PACKAGE)
+	private ItemIdentificationMode identificationType;
+	@Getter(AccessLevel.PACKAGE)
+	private Color textColor;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showSeeds;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showHerbs;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showSaplings;
+
 	@Provides
 	ItemIdentificationConfig getConfig(ConfigManager configManager)
 	{
@@ -53,6 +74,7 @@ public class ItemIdentificationPlugin extends Plugin
 	@Override
 	protected void startUp()
 	{
+		updateConfig();
 		overlayManager.add(overlay);
 	}
 
@@ -61,4 +83,24 @@ public class ItemIdentificationPlugin extends Plugin
 	{
 		overlayManager.remove(overlay);
 	}
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (!event.getGroup().equals("itemidentification"))
+		{
+			return;
+		}
+
+		updateConfig();
+	}
+
+	private void updateConfig()
+	{
+		this.identificationType = config.identificationType();
+		this.textColor = config.textColor();
+		this.showSeeds = config.showSeeds();
+		this.showHerbs = config.showHerbs();
+		this.showSaplings = config.showSaplings();
+	}
 }
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java
index c252bc054c..1b06ce6714 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java
@@ -28,6 +28,7 @@ import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.Constants;
 import net.runelite.api.InventoryID;
@@ -47,6 +48,7 @@ import net.runelite.client.ui.overlay.tooltip.TooltipManager;
 import net.runelite.client.util.ColorUtil;
 import net.runelite.client.util.StackFormatter;
 
+@Singleton
 class ItemPricesOverlay extends Overlay
 {
 	private static final int INVENTORY_ITEM_WIDGETID = WidgetInfo.INVENTORY.getPackedId();
@@ -54,7 +56,7 @@ class ItemPricesOverlay extends Overlay
 	private static final int BANK_ITEM_WIDGETID = WidgetInfo.BANK_ITEM_CONTAINER.getPackedId();
 
 	private final Client client;
-	private final ItemPricesConfig config;
+	private final ItemPricesPlugin plugin;
 	private final TooltipManager tooltipManager;
 	private final StringBuilder itemStringBuilder = new StringBuilder();
 
@@ -62,11 +64,11 @@ class ItemPricesOverlay extends Overlay
 	ItemManager itemManager;
 
 	@Inject
-	ItemPricesOverlay(Client client, ItemPricesConfig config, TooltipManager tooltipManager)
+	ItemPricesOverlay(final Client client, final ItemPricesPlugin plugin, final TooltipManager tooltipManager)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		this.client = client;
-		this.config = config;
+		this.plugin = plugin;
 		this.tooltipManager = tooltipManager;
 	}
 
@@ -95,7 +97,10 @@ class ItemPricesOverlay extends Overlay
 		switch (action)
 		{
 			case ITEM_USE_ON_WIDGET:
-				if (!menuEntry.getTarget().contains("High Level Alchemy") || !config.showAlchProfit()) return null;
+				if (!client.getSelectedSpellName().equalsIgnoreCase("high level alchemy")  || !plugin.isShowAlchProfit())
+				{
+					return null;
+				}
 			case WIDGET_DEFAULT:
 			case ITEM_USE:
 			case ITEM_FIRST_OPTION:
@@ -107,7 +112,7 @@ class ItemPricesOverlay extends Overlay
 				switch (groupId)
 				{
 					case WidgetID.INVENTORY_GROUP_ID:
-						if (config.hideInventory())
+						if (plugin.isHideInventory())
 						{
 							return null;
 						}
@@ -130,7 +135,7 @@ class ItemPricesOverlay extends Overlay
 	private String makeValueTooltip(MenuEntry menuEntry)
 	{
 		// Disabling both disables all value tooltips
-		if (!config.showGEPrice() && !config.showHAValue())
+		if (!plugin.isShowGEPrice() && !plugin.isShowHAValue())
 		{
 			return null;
 		}
@@ -199,15 +204,15 @@ class ItemPricesOverlay extends Overlay
 		int haProfit = 0;
 		final int itemHaPrice = Math.round(itemDef.getPrice() * Constants.HIGH_ALCHEMY_MULTIPLIER);
 
-		if (config.showGEPrice())
+		if (plugin.isShowGEPrice())
 		{
 			gePrice = itemManager.getItemPrice(id);
 		}
-		if (config.showHAValue())
+		if (plugin.isShowHAValue())
 		{
 			haPrice = itemManager.getAlchValue(id);
 		}
-		if (gePrice > 0 && itemHaPrice > 0 && config.showAlchProfit())
+		if (gePrice > 0 && itemHaPrice > 0 && plugin.isShowAlchProfit())
 		{
 			haProfit = calculateHAProfit(itemHaPrice, gePrice);
 		}
@@ -227,7 +232,7 @@ class ItemPricesOverlay extends Overlay
 			itemStringBuilder.append("EX: ")
 				.append(StackFormatter.quantityToStackSize(gePrice * qty))
 				.append(" gp");
-			if (config.showEA() && qty > 1)
+			if (plugin.isShowEA() && qty > 1)
 			{
 				itemStringBuilder.append(" (")
 					.append(StackFormatter.quantityToStackSize(gePrice))
@@ -244,7 +249,7 @@ class ItemPricesOverlay extends Overlay
 			itemStringBuilder.append("HA: ")
 				.append(StackFormatter.quantityToStackSize(haValue * qty))
 				.append(" gp");
-			if (config.showEA() && qty > 1)
+			if (plugin.isShowEA() && qty > 1)
 			{
 				itemStringBuilder.append(" (")
 					.append(StackFormatter.quantityToStackSize(haValue))
@@ -260,7 +265,7 @@ class ItemPricesOverlay extends Overlay
 			itemStringBuilder.append("HA Profit: ")
 				.append(ColorUtil.wrapWithColorTag(String.valueOf(haProfit * qty), haColor))
 				.append(" gp");
-			if (config.showEA() && qty > 1)
+			if (plugin.isShowEA() && qty > 1)
 			{
 				itemStringBuilder.append(" (")
 					.append(ColorUtil.wrapWithColorTag(String.valueOf(haProfit), haColor))
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesPlugin.java
index 2434faade3..302c9d8728 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesPlugin.java
@@ -26,7 +26,12 @@ package net.runelite.client.plugins.itemprices;
 
 import com.google.inject.Provides;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
+import lombok.Getter;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.client.config.ConfigManager;
+import net.runelite.client.eventbus.Subscribe;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginDescriptor;
 import net.runelite.client.ui.overlay.OverlayManager;
@@ -37,6 +42,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	tags = {"bank", "inventory", "overlay", "high", "alchemy", "grand", "exchange", "tooltips"},
 	enabledByDefault = false
 )
+@Singleton
 public class ItemPricesPlugin extends Plugin
 {
 	@Inject
@@ -45,6 +51,20 @@ public class ItemPricesPlugin extends Plugin
 	@Inject
 	private ItemPricesOverlay overlay;
 
+	@Inject
+	private ItemPricesConfig config;
+
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showGEPrice;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showHAValue;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showEA;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean hideInventory;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showAlchProfit;
+
 	@Provides
 	ItemPricesConfig getConfig(ConfigManager configManager)
 	{
@@ -54,6 +74,7 @@ public class ItemPricesPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
 		overlayManager.add(overlay);
 	}
 
@@ -62,4 +83,24 @@ public class ItemPricesPlugin extends Plugin
 	{
 		overlayManager.remove(overlay);
 	}
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (!event.getGroup().equals("itemprices"))
+		{
+			return;
+		}
+
+		updateConfig();
+	}
+
+	private void updateConfig()
+	{
+		this.showGEPrice = config.showGEPrice();
+		this.showHAValue = config.showHAValue();
+		this.showEA = config.showEA();
+		this.hideInventory = config.hideInventory();
+		this.showAlchProfit = config.showAlchProfit();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/AlwaysLostItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/AlwaysLostItem.java
index 37066622bc..2e9ac325cc 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/AlwaysLostItem.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/AlwaysLostItem.java
@@ -25,6 +25,7 @@
 package net.runelite.client.plugins.itemskeptondeath;
 
 import com.google.common.collect.ImmutableMap;
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import net.runelite.api.ItemID;
@@ -36,7 +37,7 @@ import net.runelite.api.ItemID;
  * The white outline will be added to these items when they are lost on death.
  */
 @AllArgsConstructor
-@Getter
+@Getter(AccessLevel.PACKAGE)
 enum AlwaysLostItem
 {
 	RUNE_POUCH(ItemID.RUNE_POUCH, true),
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/FixedPriceItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/FixedPriceItem.java
index a40851dc65..5afb14c931 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/FixedPriceItem.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/FixedPriceItem.java
@@ -28,6 +28,7 @@ package net.runelite.client.plugins.itemskeptondeath;
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;
 import javax.annotation.Nullable;
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import net.runelite.api.ItemID;
@@ -37,7 +38,7 @@ import net.runelite.api.ItemID;
  * These are typically imbued items, such as Berserker ring (i), to help it protect over the non-imbued variants.
  */
 @AllArgsConstructor
-@Getter
+@Getter(AccessLevel.PACKAGE)
 enum FixedPriceItem
 {
 	IMBUED_BLACK_MASK_I(ItemID.BLACK_MASK_I, 5000),
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPlugin.java
index ee761ad9a9..f6d817b54c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPlugin.java
@@ -33,6 +33,7 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
 import net.runelite.api.Constants;
@@ -64,6 +65,7 @@ import net.runelite.client.util.StackFormatter;
 	enabledByDefault = false
 )
 @Slf4j
+@Singleton
 public class ItemsKeptOnDeathPlugin extends Plugin
 {
 	private static final int DEEP_WILDY = 20;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/FoodBase.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/FoodBase.java
index 83409af0ce..b8aaf11616 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/FoodBase.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/FoodBase.java
@@ -28,7 +28,7 @@ import net.runelite.client.plugins.itemstats.stats.Stats;
 
 public abstract class FoodBase extends StatBoost
 {
-	public FoodBase()
+	protected FoodBase()
 	{
 		super(Stats.HITPOINTS, false);
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatOverlay.java
index 209e86aa41..a9a3c766ee 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatOverlay.java
@@ -53,25 +53,26 @@ public class ItemStatOverlay extends Overlay
 			.aspeed(6)
 			.build());
 
-	@Inject
-	private Client client;
+	private final Client client;
+	private final ItemManager itemManager;
+	private final TooltipManager tooltipManager;
+	private final ItemStatChanges statChanges;
+	private final ItemStatPlugin plugin;
 
 	@Inject
-	private ItemManager itemManager;
-
-	@Inject
-	private TooltipManager tooltipManager;
-
-	@Inject
-	private ItemStatChanges statChanges;
-
-	@Inject
-	private ItemStatConfig config;
+	ItemStatOverlay(Client client, ItemStatPlugin plugin, ItemManager itemManager, TooltipManager tooltipManager, ItemStatChanges itemStatChanges)
+	{
+		this.client = client;
+		this.itemManager = itemManager;
+		this.tooltipManager = tooltipManager;
+		this.statChanges = itemStatChanges;
+		this.plugin = plugin;
+	}
 
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (client.isMenuOpen() || (!config.relative() && !config.absolute() && !config.theoretical()))
+		if (client.isMenuOpen() || (!plugin.isRelative() && !plugin.isAbsolute() && !plugin.isTheoretical()))
 		{
 			return null;
 		}
@@ -115,7 +116,7 @@ public class ItemStatOverlay extends Overlay
 			}
 		}
 
-		if (config.consumableStats())
+		if (plugin.isConsumableStats())
 		{
 			final Effect change = statChanges.get(itemId);
 			if (change != null)
@@ -137,7 +138,7 @@ public class ItemStatOverlay extends Overlay
 			}
 		}
 
-		if (config.equipmentStats())
+		if (plugin.isEquipmentStats())
 		{
 			final ItemStats stats = itemManager.getItemStats(itemId, false);
 
@@ -161,8 +162,8 @@ public class ItemStatOverlay extends Overlay
 		final boolean inverse,
 		final boolean showPercent)
 	{
-		final Color plus = Positivity.getColor(config, Positivity.BETTER_UNCAPPED);
-		final Color minus = Positivity.getColor(config, Positivity.WORSE);
+		final Color plus = Positivity.getColor(plugin, Positivity.BETTER_UNCAPPED);
+		final Color minus = Positivity.getColor(plugin, Positivity.WORSE);
 
 		if (value == 0)
 		{
@@ -189,7 +190,7 @@ public class ItemStatOverlay extends Overlay
 	private String buildStatBonusString(ItemStats s)
 	{
 		final StringBuilder b = new StringBuilder();
-		if (config.showWeight())
+		if (plugin.isShowWeight())
 		{
 			b.append(getChangeString("Weight", s.getWeight(), true, false));
 		}
@@ -257,32 +258,32 @@ public class ItemStatOverlay extends Overlay
 	private String buildStatChangeString(StatChange c)
 	{
 		StringBuilder b = new StringBuilder();
-		b.append(ColorUtil.colorTag(Positivity.getColor(config, c.getPositivity())));
+		b.append(ColorUtil.colorTag(Positivity.getColor(plugin, c.getPositivity())));
 
-		if (config.relative())
+		if (plugin.isRelative())
 		{
 			b.append(c.getFormattedRelative());
 		}
 
-		if (config.theoretical())
+		if (plugin.isTheoretical())
 		{
-			if (config.relative())
+			if (plugin.isRelative())
 			{
 				b.append("/");
 			}
 			b.append(c.getFormattedTheoretical());
 		}
 
-		if (config.absolute() && (config.relative() || config.theoretical()))
+		if (plugin.isAbsolute() && (plugin.isRelative() || plugin.isTheoretical()))
 		{
 			b.append(" (");
 		}
-		if (config.absolute())
+		if (plugin.isAbsolute())
 		{
 			b.append(c.getAbsolute());
 		}
 
-		if (config.absolute() && (config.relative() || config.theoretical()))
+		if (plugin.isAbsolute() && (plugin.isRelative() || plugin.isTheoretical()))
 		{
 			b.append(")");
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatPlugin.java
index 2b0e476677..f94a17df0c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatPlugin.java
@@ -30,10 +30,13 @@ import com.google.common.collect.ImmutableSet;
 import com.google.inject.Binder;
 import com.google.inject.Inject;
 import com.google.inject.Provides;
+import java.awt.Color;
 import java.awt.FontMetrics;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import lombok.AccessLevel;
+import lombok.Getter;
 import net.runelite.api.Client;
 import net.runelite.api.Constants;
 import net.runelite.api.FontID;
@@ -97,6 +100,30 @@ public class ItemStatPlugin extends Plugin
 
 	private Widget itemInformationTitle;
 
+	@Getter(AccessLevel.PACKAGE)
+	private boolean consumableStats;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean equipmentStats;
+	private boolean geStats;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean relative;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean absolute;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean theoretical;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showWeight;
+	@Getter(AccessLevel.PACKAGE)
+	private Color colorBetterUncapped;
+	@Getter(AccessLevel.PACKAGE)
+	private Color colorBetterSomeCapped;
+	@Getter(AccessLevel.PACKAGE)
+	private Color colorBetterCapped;
+	@Getter(AccessLevel.PACKAGE)
+	private Color colorNoChange;
+	@Getter(AccessLevel.PACKAGE)
+	private Color colorWorse;
+
 	@Provides
 	ItemStatConfig getConfig(ConfigManager configManager)
 	{
@@ -112,6 +139,7 @@ public class ItemStatPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
 		overlayManager.add(overlay);
 	}
 
@@ -127,6 +155,7 @@ public class ItemStatPlugin extends Plugin
 	{
 		if (event.getKey().equals("geStats"))
 		{
+			updateConfig();
 			clientThread.invokeLater(this::resetGEInventory);
 		}
 	}
@@ -134,7 +163,7 @@ public class ItemStatPlugin extends Plugin
 	@Subscribe
 	public void onGameTick(GameTick event)
 	{
-		if (itemInformationTitle != null && config.geStats()
+		if (itemInformationTitle != null && this.geStats
 			&& (client.getWidget(WidgetInfo.GRAND_EXCHANGE_WINDOW_CONTAINER) == null
 			|| client.getWidget(WidgetInfo.GRAND_EXCHANGE_WINDOW_CONTAINER).isHidden()))
 		{
@@ -145,7 +174,7 @@ public class ItemStatPlugin extends Plugin
 	@Subscribe
 	public void onVarbitChanged(VarbitChanged event)
 	{
-		if (client.getVar(VarPlayer.CURRENT_GE_ITEM) == -1 && config.geStats())
+		if (client.getVar(VarPlayer.CURRENT_GE_ITEM) == -1 && this.geStats)
 		{
 			resetGEInventory();
 		}
@@ -154,7 +183,7 @@ public class ItemStatPlugin extends Plugin
 	@Subscribe
 	public void onScriptCallbackEvent(ScriptCallbackEvent event)
 	{
-		if (event.getEventName().equals("geBuilt") && config.geStats())
+		if (event.getEventName().equals("geBuilt") && this.geStats)
 		{
 			int currentGeItem = client.getVar(VarPlayer.CURRENT_GE_ITEM);
 			if (currentGeItem != -1 && client.getVar(Varbits.GE_OFFER_CREATION_TYPE) == 0)
@@ -431,4 +460,20 @@ public class ItemStatPlugin extends Plugin
 			return client.getWidget(WidgetInfo.FIXED_VIEWPORT_INVENTORY_CONTAINER);
 		}
 	}
+
+	private void updateConfig()
+	{
+		this.consumableStats = config.consumableStats();
+		this.equipmentStats = config.equipmentStats();
+		this.geStats = config.geStats();
+		this.relative = config.relative();
+		this.absolute = config.absolute();
+		this.theoretical = config.theoretical();
+		this.showWeight = config.showWeight();
+		this.colorBetterUncapped = config.colorBetterUncapped();
+		this.colorBetterSomeCapped = config.colorBetterSomeCapped();
+		this.colorBetterCapped = config.colorBetterCapped();
+		this.colorNoChange = config.colorNoChange();
+		this.colorWorse = config.colorWorse();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/Positivity.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/Positivity.java
index d1da3c8176..ea83360a9b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/Positivity.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/Positivity.java
@@ -56,20 +56,20 @@ public enum Positivity
 	 */
 	BETTER_UNCAPPED;
 
-	public static Color getColor(ItemStatConfig config, Positivity positivity)
+	public static Color getColor(ItemStatPlugin plugin, Positivity positivity)
 	{
 		switch (positivity)
 		{
 			case BETTER_UNCAPPED:
-				return config.colorBetterUncapped();
+				return plugin.getColorBetterUncapped();
 			case BETTER_SOMECAPPED:
-				return config.colorBetterSomeCapped();
+				return plugin.getColorBetterSomeCapped();
 			case BETTER_CAPPED:
-				return config.colorBetterCapped();
+				return plugin.getColorBetterCapped();
 			case NO_CHANGE:
-				return config.colorNoChange();
+				return plugin.getColorNoChange();
 			case WORSE:
-				return config.colorWorse();
+				return plugin.getColorWorse();
 			default:
 				return Color.WHITE;
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/StatBoost.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/StatBoost.java
index ad40c469a4..5d55a70694 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/StatBoost.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/StatBoost.java
@@ -38,13 +38,13 @@ public abstract class StatBoost extends SingleEffect
 	@Setter
 	private boolean boost;
 
-	public StatBoost(Stat stat, boolean boost)
+	protected StatBoost(Stat stat, boolean boost)
 	{
 		this.stat = stat;
 		this.boost = boost;
 	}
 
-	public abstract int heals(Client client);
+	protected abstract int heals(Client client);
 
 	@Override
 	public StatChange effect(Client client)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/PrayerPotion.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/PrayerPotion.java
index bd2fbfa4b6..47198e4a29 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/PrayerPotion.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/PrayerPotion.java
@@ -63,7 +63,7 @@ public class PrayerPotion extends StatBoost
 			final int ring = ItemUtil.safeGetItemIdAtIndex(equip, EquipmentInventorySlot.RING.getSlotIdx());
 			final int cape = ItemUtil.safeGetItemIdAtIndex(equip, EquipmentInventorySlot.CAPE.getSlotIdx());
 
-			hasHolyWrench |= ring == ItemID.RING_OF_THE_GODS_I;
+			hasHolyWrench = ring == ItemID.RING_OF_THE_GODS_I;
 			hasHolyWrench |= HOLY_WRENCH_IDS.contains(cape);
 		}
 		if (!hasHolyWrench)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/SaradominBrew.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/SaradominBrew.java
index d4ee16fa1a..ae816900cc 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/SaradominBrew.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/SaradominBrew.java
@@ -77,7 +77,7 @@ public class SaradominBrew implements Effect
 			)
 		).toArray(StatChange[]::new));
 		changes.setPositivity(Stream.of(changes.getStatChanges())
-			.map(sc -> sc.getPositivity())
+			.map(StatChange::getPositivity)
 			.max(Comparator.comparing(Enum::ordinal)).get());
 		return changes;
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/SuperRestore.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/SuperRestore.java
index d8180ae9e0..3ddcf0b137 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/SuperRestore.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/potions/SuperRestore.java
@@ -87,7 +87,7 @@ public class SuperRestore implements Effect
 					return calc.effect(client);
 				})
 		).toArray(StatChange[]::new));
-		changes.setPositivity(Stream.of(changes.getStatChanges()).map(sc -> sc.getPositivity()).max(Comparator.comparing(Enum::ordinal)).get());
+		changes.setPositivity(Stream.of(changes.getStatChanges()).map(StatChange::getPositivity).max(Comparator.comparing(Enum::ordinal)).get());
 		return changes;
 	}
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/special/SpicyStew.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/special/SpicyStew.java
index 25b7f019f8..a2baa6a09e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/special/SpicyStew.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/special/SpicyStew.java
@@ -103,7 +103,7 @@ public class SpicyStew implements Effect
 		}
 
 		StatsChanges changesReturn = new StatsChanges(4);
-		changesReturn.setStatChanges(changes.toArray(new StatChange[changes.size()]));
+		changesReturn.setStatChanges(changes.toArray(new StatChange[0]));
 
 		return changesReturn;
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingListener.java
index 56cf3bbedc..d4a493769f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingListener.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingListener.java
@@ -30,6 +30,7 @@ import java.awt.event.KeyEvent;
 import java.util.HashMap;
 import java.util.Map;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.GameState;
 import net.runelite.api.VarClientStr;
@@ -39,6 +40,7 @@ import net.runelite.client.config.ModifierlessKeybind;
 import net.runelite.client.input.KeyListener;
 import net.runelite.client.input.MouseAdapter;
 
+@Singleton
 class KeyRemappingListener extends MouseAdapter implements KeyListener
 {
 	private static final Keybind ONE = new ModifierlessKeybind(KeyEvent.VK_1, 0);
@@ -57,9 +59,6 @@ class KeyRemappingListener extends MouseAdapter implements KeyListener
 	@Inject
 	private KeyRemappingPlugin plugin;
 
-	@Inject
-	private KeyRemappingConfig config;
-
 	@Inject
 	private Client client;
 
@@ -83,24 +82,24 @@ class KeyRemappingListener extends MouseAdapter implements KeyListener
 
 		if (!plugin.isTyping())
 		{
-			if (config.cameraRemap())
+			if (plugin.isCameraRemap())
 			{
-				if (config.up().matches(e))
+				if (plugin.getUp().matches(e))
 				{
 					modified.put(e.getKeyCode(), KeyEvent.VK_UP);
 					e.setKeyCode(KeyEvent.VK_UP);
 				}
-				else if (config.down().matches(e))
+				else if (plugin.getDown().matches(e))
 				{
 					modified.put(e.getKeyCode(), KeyEvent.VK_DOWN);
 					e.setKeyCode(KeyEvent.VK_DOWN);
 				}
-				else if (config.left().matches(e))
+				else if (plugin.getLeft().matches(e))
 				{
 					modified.put(e.getKeyCode(), KeyEvent.VK_LEFT);
 					e.setKeyCode(KeyEvent.VK_LEFT);
 				}
-				else if (config.right().matches(e))
+				else if (plugin.getRight().matches(e))
 				{
 					modified.put(e.getKeyCode(), KeyEvent.VK_RIGHT);
 					e.setKeyCode(KeyEvent.VK_RIGHT);
@@ -110,7 +109,7 @@ class KeyRemappingListener extends MouseAdapter implements KeyListener
 			// In addition to the above checks, the F-key remapping shouldn't
 			// activate when dialogs are open which listen for number keys
 			// to select options
-			if (config.fkeyRemap() && !plugin.isDialogOpen())
+			if (plugin.isFkeyRemap() && !plugin.isDialogOpen())
 			{
 				if (ONE.matches(e))
 				{
@@ -219,27 +218,27 @@ class KeyRemappingListener extends MouseAdapter implements KeyListener
 		{
 			modified.remove(e.getKeyCode());
 
-			if (config.cameraRemap())
+			if (plugin.isCameraRemap())
 			{
-				if (config.up().matches(e))
+				if (plugin.getUp().matches(e))
 				{
 					e.setKeyCode(KeyEvent.VK_UP);
 				}
-				else if (config.down().matches(e))
+				else if (plugin.getDown().matches(e))
 				{
 					e.setKeyCode(KeyEvent.VK_DOWN);
 				}
-				else if (config.left().matches(e))
+				else if (plugin.getLeft().matches(e))
 				{
 					e.setKeyCode(KeyEvent.VK_LEFT);
 				}
-				else if (config.right().matches(e))
+				else if (plugin.getRight().matches(e))
 				{
 					e.setKeyCode(KeyEvent.VK_RIGHT);
 				}
 			}
 
-			if (config.fkeyRemap())
+			if (plugin.isFkeyRemap())
 			{
 				if (ONE.matches(e))
 				{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java
index 5b38cbdc25..a269a80c8f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java
@@ -28,6 +28,7 @@ package net.runelite.client.plugins.keyremapping;
 import com.google.inject.Provides;
 import java.awt.Color;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
@@ -43,6 +44,7 @@ import net.runelite.api.widgets.Widget;
 import net.runelite.api.widgets.WidgetInfo;
 import net.runelite.client.callback.ClientThread;
 import net.runelite.client.config.ConfigManager;
+import net.runelite.client.config.ModifierlessKeybind;
 import net.runelite.client.eventbus.Subscribe;
 import net.runelite.client.input.KeyManager;
 import net.runelite.client.plugins.Plugin;
@@ -56,6 +58,7 @@ import net.runelite.client.util.ColorUtil;
 	tags = {"enter", "chat", "wasd", "camera"},
 	enabledByDefault = false
 )
+@Singleton
 public class KeyRemappingPlugin extends Plugin
 {
 	private static final String PRESS_ENTER_TO_CHAT = "Press Enter to Chat...";
@@ -81,9 +84,25 @@ public class KeyRemappingPlugin extends Plugin
 	@Setter(AccessLevel.PACKAGE)
 	private boolean typing;
 
+	private boolean hideDisplayName;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean cameraRemap;
+	@Getter(AccessLevel.PACKAGE)
+	private ModifierlessKeybind up;
+	@Getter(AccessLevel.PACKAGE)
+	private ModifierlessKeybind down;
+	@Getter(AccessLevel.PACKAGE)
+	private ModifierlessKeybind left;
+	@Getter(AccessLevel.PACKAGE)
+	private ModifierlessKeybind right;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean fkeyRemap;
+
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
+
 		typing = false;
 		keyManager.registerKeyListener(inputListener);
 
@@ -153,11 +172,13 @@ public class KeyRemappingPlugin extends Plugin
 	@Subscribe
 	public void onConfigChanged(ConfigChanged configChanged)
 	{
-		if (!configChanged.getGroup().equals("keyremapping") || !configChanged.getKey().equals("hideDisplayName"))
+		if (!configChanged.getGroup().equals("keyremapping"))
 		{
 			return;
 		}
 
+		updateConfig();
+
 		clientThread.invoke(() ->
 			{
 				Widget chatboxInput = client.getWidget(WidgetInfo.CHATBOX_INPUT);
@@ -176,12 +197,9 @@ public class KeyRemappingPlugin extends Plugin
 		{
 			case SCRIPT_EVENT_SET_CHATBOX_INPUT:
 				Widget chatboxInput = client.getWidget(WidgetInfo.CHATBOX_INPUT);
-				if (chatboxInput != null)
+				if (chatboxInput != null && chatboxFocused() && !typing)
 				{
-					if (chatboxFocused() && !typing)
-					{
-						chatboxInput.setText(getWaitingText());
-					}
+					chatboxInput.setText(getWaitingText());
 				}
 				break;
 			case SCRIPT_EVENT_BLOCK_CHAT_INPUT:
@@ -209,14 +227,11 @@ public class KeyRemappingPlugin extends Plugin
 	void unlockChat()
 	{
 		Widget chatboxInput = client.getWidget(WidgetInfo.CHATBOX_INPUT);
-		if (chatboxInput != null)
+		if (chatboxInput != null && client.getGameState() == GameState.LOGGED_IN)
 		{
-			if (client.getGameState() == GameState.LOGGED_IN)
-			{
-				final boolean isChatboxTransparent = client.isResized() && client.getVar(Varbits.TRANSPARENT_CHATBOX) == 1;
-				final Color textColor = isChatboxTransparent ? JagexColors.CHAT_TYPED_TEXT_TRANSPARENT_BACKGROUND : JagexColors.CHAT_TYPED_TEXT_OPAQUE_BACKGROUND;
-				chatboxInput.setText(getPlayerNameWithIcon() + ": " + ColorUtil.wrapWithColorTag(client.getVar(VarClientStr.CHATBOX_TYPED_TEXT) + "*", textColor));
-			}
+			final boolean isChatboxTransparent = client.isResized() && client.getVar(Varbits.TRANSPARENT_CHATBOX) == 1;
+			final Color textColor = isChatboxTransparent ? JagexColors.CHAT_TYPED_TEXT_TRANSPARENT_BACKGROUND : JagexColors.CHAT_TYPED_TEXT_OPAQUE_BACKGROUND;
+			chatboxInput.setText(getPlayerNameWithIcon() + ": " + ColorUtil.wrapWithColorTag(client.getVar(VarClientStr.CHATBOX_TYPED_TEXT) + "*", textColor));
 		}
 	}
 
@@ -242,7 +257,7 @@ public class KeyRemappingPlugin extends Plugin
 
 	private String getWaitingText()
 	{
-		if (config.hideDisplayName())
+		if (this.hideDisplayName)
 		{
 			return PRESS_ENTER_TO_CHAT;
 		}
@@ -251,4 +266,15 @@ public class KeyRemappingPlugin extends Plugin
 			return getPlayerNameWithIcon() + ": " + PRESS_ENTER_TO_CHAT;
 		}
 	}
+
+	private void updateConfig()
+	{
+		this.hideDisplayName = config.hideDisplayName();
+		this.cameraRemap = config.cameraRemap();
+		this.up = config.up();
+		this.down = config.down();
+		this.left = config.left();
+		this.right = config.right();
+		this.fkeyRemap = config.fkeyRemap();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomCounter.java
index 8a2871125f..b48a0af346 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomCounter.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomCounter.java
@@ -25,14 +25,16 @@
 package net.runelite.client.plugins.kingdomofmiscellania;
 
 import java.awt.image.BufferedImage;
+import javax.inject.Singleton;
 import net.runelite.client.ui.overlay.infobox.Counter;
 import net.runelite.client.util.StackFormatter;
 
-public class KingdomCounter extends Counter
+@Singleton
+class KingdomCounter extends Counter
 {
 	private final KingdomPlugin plugin;
 
-	KingdomCounter(BufferedImage image, KingdomPlugin plugin)
+	KingdomCounter(final BufferedImage image, final KingdomPlugin plugin)
 	{
 		super(image, plugin, plugin.getFavor());
 		this.plugin = plugin;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomPlugin.java
index 17347b3aac..e0445d6576 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomPlugin.java
@@ -26,6 +26,8 @@ package net.runelite.client.plugins.kingdomofmiscellania;
 
 import com.google.common.collect.ImmutableSet;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
@@ -48,6 +50,7 @@ import net.runelite.client.ui.overlay.infobox.InfoBoxManager;
 	enabledByDefault = false
 )
 @Slf4j
+@Singleton
 public class KingdomPlugin extends Plugin
 {
 	private static final ImmutableSet<Integer> KINGDOM_REGION = ImmutableSet.of(10044, 10300);
@@ -61,7 +64,7 @@ public class KingdomPlugin extends Plugin
 	@Inject
 	private ItemManager itemManager;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private int favor = 0, coffer = 0;
 
 	private KingdomCounter counter;
@@ -75,9 +78,12 @@ public class KingdomPlugin extends Plugin
 	@Subscribe
 	public void onVarbitChanged(VarbitChanged event)
 	{
-		favor = client.getVar(Varbits.KINGDOM_FAVOR);
-		coffer = client.getVar(Varbits.KINGDOM_COFFER);
-		processInfobox();
+		if (isInKingdom())
+		{
+			favor = client.getVar(Varbits.KINGDOM_FAVOR);
+			coffer = client.getVar(Varbits.KINGDOM_COFFER);
+			processInfobox();
+		}
 	}
 
 	@Subscribe
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Book.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Book.java
index 49f6ccf7f9..43b31e52aa 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Book.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Book.java
@@ -27,6 +27,7 @@ package net.runelite.client.plugins.kourendlibrary;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.ItemID;
 import net.runelite.client.game.AsyncBufferedImage;
@@ -99,22 +100,22 @@ enum Book
 		return BY_NAME.get(name);
 	}
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final int item;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final String name;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final String shortName;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private AsyncBufferedImage icon;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final boolean isDarkManuscript;
 
-	Book(int id, String shortName, String name)
+	Book(final int id, final String shortName, final String name)
 	{
 		this.item = id;
 		this.isDarkManuscript = false;
@@ -122,7 +123,7 @@ enum Book
 		this.name = name;
 	}
 
-	Book(int id)
+	Book(final int id)
 	{
 		this.item = id;
 		this.isDarkManuscript = true;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/BookPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/BookPanel.java
index 29976bc0bb..857c50cef3 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/BookPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/BookPanel.java
@@ -25,6 +25,7 @@
 package net.runelite.client.plugins.kourendlibrary;
 
 import java.awt.Color;
+import javax.inject.Singleton;
 import javax.swing.GroupLayout;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -32,11 +33,12 @@ import javax.swing.border.EmptyBorder;
 import net.runelite.client.ui.ColorScheme;
 import net.runelite.client.ui.FontManager;
 
+@Singleton
 class BookPanel extends JPanel
 {
-	private JLabel location = new JLabel();
+	private final JLabel location = new JLabel();
 
-	BookPanel(Book b)
+	BookPanel(final Book b)
 	{
 		setBorder(new EmptyBorder(3, 3, 3, 3));
 		setBackground(ColorScheme.DARK_GRAY_COLOR);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Bookcase.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Bookcase.java
index ee7d7d295d..c4a95d7215 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Bookcase.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Bookcase.java
@@ -29,37 +29,38 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.coords.WorldPoint;
 
 class Bookcase
 {
-	Bookcase(WorldPoint location)
+	Bookcase(final WorldPoint location)
 	{
 		this.location = location;
 		this.index = new ArrayList<>();
 	}
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final WorldPoint location;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final List<Integer> index;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private boolean isBookSet;
 
 	/**
 	 * Book in this bookcase as found by the player.
 	 * Will be correct as long as isBookSet is true, unless the library has reset;
 	 */
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private Book book;
 
 	/**
 	 * Books that can be in this slot. Will only be populated if library.state != SolvedState.NO_DATA
 	 */
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private Set<Book> possibleBooks = new HashSet<>();
 
 	void clearBook()
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryOverlay.java
index 5cf7910ee6..fb60cb0262 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryOverlay.java
@@ -25,6 +25,7 @@
 package net.runelite.client.plugins.kourendlibrary;
 
 import com.google.inject.Inject;
+import com.google.inject.Singleton;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.FontMetrics;
@@ -50,23 +51,22 @@ import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayUtil;
 
+@Singleton
 class KourendLibraryOverlay extends Overlay
 {
 	private final static int MAXIMUM_DISTANCE = 24;
 	private final Library library;
 	private final Client client;
-	private final KourendLibraryConfig config;
 	private final KourendLibraryPlugin plugin;
 
 	@Setter(AccessLevel.PACKAGE)
 	private boolean hidden;
 
 	@Inject
-	private KourendLibraryOverlay(Library library, Client client, KourendLibraryConfig config, KourendLibraryPlugin plugin)
+	private KourendLibraryOverlay(final Library library, final Client client, final KourendLibraryPlugin plugin)
 	{
 		this.library = library;
 		this.client = client;
-		this.config = config;
 		this.plugin = plugin;
 
 		setPosition(OverlayPosition.DYNAMIC);
@@ -138,7 +138,7 @@ class KourendLibraryOverlay extends Overlay
 				Color color = bookIsKnown ? Color.ORANGE : Color.WHITE;
 
 				// Render the poly on the floor
-				if (!(bookIsKnown && book == null) && (library.getState() == SolvedState.NO_DATA || book != null || !possible.isEmpty()) && !shouldHideOverlayIfDuplicateBook(book))
+				if (!(bookIsKnown && book == null) && (library.getState() == SolvedState.NO_DATA || book != null || !possible.isEmpty()) && shouldShowOverlayIfDuplicateBook(book))
 				{
 					Polygon poly = getCanvasTilePoly(client, localBookcase);
 					if (poly != null)
@@ -151,7 +151,7 @@ class KourendLibraryOverlay extends Overlay
 				// If the book is singled out, render the text and the book's icon
 				if (bookIsKnown)
 				{
-					if (book != null && !shouldHideOverlayIfDuplicateBook(book))
+					if (book != null && shouldShowOverlayIfDuplicateBook(book))
 					{
 						FontMetrics fm = g.getFontMetrics();
 						Rectangle2D bounds = fm.getStringBounds(book.getShortName(), g);
@@ -228,7 +228,10 @@ class KourendLibraryOverlay extends Overlay
 					Point screen = Perspective.localToCanvas(client, local, client.getPlane(), n.getLogicalHeight());
 					if (screen != null)
 					{
-						g.drawImage(b.getIcon(), screen.getX() - (b.getIcon().getWidth() / 2), screen.getY() - b.getIcon().getHeight(), null);
+						if (b != null)
+						{
+							g.drawImage(b.getIcon(), screen.getX() - (b.getIcon().getWidth() / 2), screen.getY() - b.getIcon().getHeight(), null);
+						}
 					}
 				});
 		}
@@ -236,11 +239,11 @@ class KourendLibraryOverlay extends Overlay
 		return null;
 	}
 
-	private boolean shouldHideOverlayIfDuplicateBook(@Nullable Book book)
+	private boolean shouldShowOverlayIfDuplicateBook(@Nullable Book book)
 	{
-		return config.hideDuplicateBook()
-			&& book != null
-			&& !book.isDarkManuscript()
-			&& plugin.doesPlayerContainBook(book);
+		return !plugin.isHideDuplicateBook()
+			|| book == null
+			|| book.isDarkManuscript()
+			|| !plugin.doesPlayerContainBook(book);
 	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPanel.java
index 90900667f1..aba91b0911 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPanel.java
@@ -36,7 +36,6 @@ import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javax.inject.Singleton;
 import javax.swing.ImageIcon;
@@ -151,7 +150,7 @@ class KourendLibraryPanel extends PluginPanel
 				}
 				else
 				{
-					e.getValue().setLocation("<html>" + locs.stream().collect(Collectors.joining("<br>")) + "</html>");
+					e.getValue().setLocation("<html>" + String.join("<br>", locs) + "</html>");
 				}
 			}
 		});
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java
index aea8d9b034..54e60eb415 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java
@@ -30,7 +30,10 @@ import java.util.EnumSet;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import javax.swing.SwingUtilities;
+import lombok.AccessLevel;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.AnimationID;
 import net.runelite.api.ChatMessageType;
@@ -65,6 +68,7 @@ import net.runelite.client.util.ImageUtil;
 	tags = {"arceuus", "magic", "runecrafting", "overlay", "panel"}
 )
 @Slf4j
+@Singleton
 public class KourendLibraryPlugin extends Plugin
 {
 	private static final Pattern BOOK_EXTRACTOR = Pattern.compile("'<col=0000ff>(.*)</col>'");
@@ -101,6 +105,10 @@ public class KourendLibraryPlugin extends Plugin
 	private WorldPoint lastBookcaseAnimatedOn = null;
 	private EnumSet<Book> playerBooks = null;
 
+	private boolean hideButton;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean hideDuplicateBook;
+
 	@Provides
 	KourendLibraryConfig provideConfig(ConfigManager configManager)
 	{
@@ -110,6 +118,9 @@ public class KourendLibraryPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		hideButton = config.hideButton();
+		hideDuplicateBook = config.hideDuplicateBook();
+
 		Book.fillImages(itemManager);
 
 		panel = injector.getInstance(KourendLibraryPanel.class);
@@ -128,7 +139,7 @@ public class KourendLibraryPlugin extends Plugin
 
 		updatePlayerBooks();
 
-		if (!config.hideButton())
+		if (!this.hideButton)
 		{
 			clientToolbar.addNavigation(navButton);
 		}
@@ -154,9 +165,12 @@ public class KourendLibraryPlugin extends Plugin
 			return;
 		}
 
+		this.hideButton = config.hideButton();
+		this.hideDuplicateBook = config.hideDuplicateBook();
+
 		SwingUtilities.invokeLater(() ->
 		{
-			if (!config.hideButton())
+			if (!this.hideButton)
 			{
 				clientToolbar.addNavigation(navButton);
 			}
@@ -213,7 +227,7 @@ public class KourendLibraryPlugin extends Plugin
 	public void onGameTick(GameTick tick)
 	{
 		boolean inRegion = client.getLocalPlayer().getWorldLocation().getRegionID() == REGION;
-		if (config.hideButton() && inRegion != buttonAttached)
+		if (this.hideButton && inRegion != buttonAttached)
 		{
 			SwingUtilities.invokeLater(() ->
 			{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Library.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Library.java
index 23afd804a5..85103e8135 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Library.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/Library.java
@@ -33,6 +33,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.IntStream;
 import javax.inject.Singleton;
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.coords.WorldPoint;
@@ -91,13 +92,13 @@ class Library
 
 	private final int step;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private SolvedState state;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private Book customerBook;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private LibraryCustomer customer;
 
 	Library()
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/LibraryCustomer.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/LibraryCustomer.java
index 04cb4829a1..9de04a826a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/LibraryCustomer.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/LibraryCustomer.java
@@ -26,6 +26,7 @@ package net.runelite.client.plugins.kourendlibrary;
 
 import java.util.HashMap;
 import java.util.Map;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.NpcID;
 
@@ -35,10 +36,10 @@ enum LibraryCustomer
 	PROFESSOR_GRACKLEBONE(NpcID.PROFESSOR_GRACKLEBONE, "Prof. Gracklebone"),
 	SAM(NpcID.SAM_7049, "Sam");
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final int id;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final String name;
 
 	private static final Map<Integer, LibraryCustomer> byId = buildIdMap();
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/learntoclick/LearnToClickPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/learntoclick/LearnToClickPlugin.java
index cea339008b..94d1aa6c18 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/learntoclick/LearnToClickPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/learntoclick/LearnToClickPlugin.java
@@ -13,6 +13,7 @@ package net.runelite.client.plugins.learntoclick;
 import com.google.common.collect.ImmutableList;
 import com.google.inject.Provides;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
 import net.runelite.api.MenuEntry;
@@ -29,7 +30,6 @@ import net.runelite.client.plugins.PluginDescriptor;
 import net.runelite.client.plugins.PluginType;
 import org.apache.commons.lang3.ArrayUtils;
 
-
 @PluginDescriptor(
 	name = "Learn to Click",
 	description = "A few modifications to prevent misclicks",
@@ -37,8 +37,8 @@ import org.apache.commons.lang3.ArrayUtils;
 	type = PluginType.PVP,
 	enabledByDefault = false
 )
-
 @Slf4j
+@Singleton
 public class LearnToClickPlugin extends Plugin
 {
 	private static final ImmutableList<WidgetInfo> ORB_WIDGETS = ImmutableList.of(WidgetInfo.MINIMAP_WORLDMAP_ORB,
@@ -50,6 +50,12 @@ public class LearnToClickPlugin extends Plugin
 	@Inject
 	private Client client;
 
+	private boolean shouldBlockCompass;
+	private boolean shouldRightClickMap;
+	private boolean shouldRightClickXp;
+	private boolean shouldRightClickRetaliate;
+	private boolean hideOrbs;
+
 	@Provides
 	LearnToClickConfig provideConfig(ConfigManager configManager)
 	{
@@ -59,6 +65,7 @@ public class LearnToClickPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
 	}
 
 	@Override
@@ -71,11 +78,14 @@ public class LearnToClickPlugin extends Plugin
 	@Subscribe
 	public void onConfigChanged(ConfigChanged event)
 	{
-		if (!event.getGroup().equals("learntoclick") && !event.getKey().equals("hideOrbs"))
+		if (!event.getGroup().equals("learntoclick"))
 		{
 			return;
 		}
-		if (config.hideOrbs())
+
+		updateConfig();
+
+		if (this.hideOrbs)
 		{
 			hideOrbWidgets(true);
 		}
@@ -89,7 +99,7 @@ public class LearnToClickPlugin extends Plugin
 	@Subscribe
 	public void onWidgetLoaded(WidgetLoaded event)
 	{
-		if (!config.hideOrbs())
+		if (!this.hideOrbs)
 		{
 			return;
 		}
@@ -110,10 +120,10 @@ public class LearnToClickPlugin extends Plugin
 		MenuEntry[] menuEntries = client.getMenuEntries();
 		for (MenuEntry entry : menuEntries)
 		{
-			if ((entry.getOption().equals("Floating") && config.shouldRightClickMap()) ||
-				(entry.getOption().equals("Hide") && config.shouldRightClickXp()) || (entry.getOption().equals("Show")
-				&& config.shouldRightClickXp()) || (entry.getOption().equals("Auto retaliate")
-				&& config.shouldRightClickRetaliate()))
+			if ((entry.getOption().equals("Floating") && this.shouldRightClickMap) ||
+				(entry.getOption().equals("Hide") && this.shouldRightClickXp) || (entry.getOption().equals("Show")
+				&& this.shouldRightClickXp) || (entry.getOption().equals("Auto retaliate")
+				&& this.shouldRightClickRetaliate))
 			{
 				event.setForceRightClick(true);
 				return;
@@ -124,14 +134,14 @@ public class LearnToClickPlugin extends Plugin
 	@Subscribe
 	public void onMenuEntryAdded(MenuEntryAdded event)
 	{
-		if ((event.getOption().equals("Floating") && config.shouldRightClickMap()) || (event.getOption().equals("Hide")
-			&& config.shouldRightClickXp()) || (event.getOption().equals("Show") && config.shouldRightClickXp()) ||
-			(event.getOption().equals("Auto retaliate") && config.shouldRightClickRetaliate()))
+		if ((event.getOption().equals("Floating") && this.shouldRightClickMap) || (event.getOption().equals("Hide")
+			&& this.shouldRightClickXp) || (event.getOption().equals("Show") && this.shouldRightClickXp) ||
+			(event.getOption().equals("Auto retaliate") && this.shouldRightClickRetaliate))
 		{
 			forceRightClickFlag = true;
 		}
 		MenuEntry[] entries = client.getMenuEntries();
-		if (config.shouldBlockCompass())
+		if (this.shouldBlockCompass)
 		{
 			for (int i = entries.length - 1; i >= 0; i--)
 			{
@@ -153,4 +163,13 @@ public class LearnToClickPlugin extends Plugin
 	{
 		ORB_WIDGETS.forEach(widgetInfo -> client.getWidget(widgetInfo).setHidden(hidden));
 	}
+
+	private void updateConfig()
+	{
+		this.shouldBlockCompass = config.shouldBlockCompass();
+		this.shouldRightClickMap = config.shouldRightClickMap();
+		this.shouldRightClickXp = config.shouldRightClickXp();
+		this.shouldRightClickRetaliate = config.shouldRightClickRetaliate();
+		this.hideOrbs = config.hideOrbs();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java
index e9eb807ca8..7e76be3560 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java
@@ -28,14 +28,17 @@ import com.google.inject.Provides;
 import java.util.HashMap;
 import java.util.Map;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Actor;
-import net.runelite.api.Client;
+import static net.runelite.api.AnimationID.LIZARDMAN_SHAMAN_SPAWN;
+import net.runelite.api.ChatMessageType;
 import net.runelite.api.coords.LocalPoint;
 import net.runelite.api.events.AnimationChanged;
 import net.runelite.api.events.ChatMessage;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.client.Notifier;
 import net.runelite.client.config.ConfigManager;
 import net.runelite.client.eventbus.Subscribe;
@@ -51,8 +54,8 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	type = PluginType.PVM,
 	enabledByDefault = false
 )
-
 @Slf4j
+@Singleton
 public class LizardmenShamanPlugin extends Plugin
 {
 	private static final String SHAMAN = "Lizardman shaman";
@@ -73,8 +76,8 @@ public class LizardmenShamanPlugin extends Plugin
 	@Inject
 	private Notifier notifier;
 
-	@Inject
-	private Client client;
+	private boolean showTimer;
+	private boolean notifyOnSpawn;
 
 	@Provides
 	LizardmenShamanConfig getConfig(ConfigManager configManager)
@@ -85,6 +88,9 @@ public class LizardmenShamanPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		this.showTimer = config.showTimer();
+		this.notifyOnSpawn = config.notifyOnSpawn();
+
 		overlayManager.add(overlay);
 	}
 
@@ -98,12 +104,9 @@ public class LizardmenShamanPlugin extends Plugin
 	@Subscribe
 	public void onChatMessage(ChatMessage event)
 	{
-		if (config.notifyOnSpawn())
+		if (this.notifyOnSpawn && event.getType() == ChatMessageType.GAMEMESSAGE && event.getMessage().contains(MESSAGE))
 		{
-			if (event.getMessage().contains(MESSAGE))
-			{
-				notifier.notify(MESSAGE);
-			}
+			notifier.notify(MESSAGE);
 		}
 	}
 
@@ -116,12 +119,21 @@ public class LizardmenShamanPlugin extends Plugin
 			return;
 		}
 
-		if (actor.getName().equals(SHAMAN) && actor.getAnimation() == 7157)
+		if (actor.getName().equals(SHAMAN) && actor.getAnimation() == LIZARDMAN_SHAMAN_SPAWN && this.showTimer)
 		{
-			if (config.showTimer())
-			{
-				spawns.put(event.getActor().getLocalLocation(), new LizardmenShamanSpawn(8.4, null));
-			}
+			spawns.put(event.getActor().getLocalLocation(), new LizardmenShamanSpawn(8.4, null));
 		}
 	}
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (!event.getGroup().equals("shaman"))
+		{
+			return;
+		}
+
+		this.showTimer = config.showTimer();
+		this.notifyOnSpawn = config.notifyOnSpawn();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanSpawn.java b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanSpawn.java
index ac52b75fce..627af82c31 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanSpawn.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanSpawn.java
@@ -25,13 +25,14 @@
 package net.runelite.client.plugins.lizardmenshaman;
 
 import java.time.Instant;
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 
-@Getter
-@Setter
+@Getter(AccessLevel.PACKAGE)
+@Setter(AccessLevel.PACKAGE)
 @RequiredArgsConstructor
 @AllArgsConstructor
 class LizardmenShamanSpawn
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/ShamanSpawnOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/ShamanSpawnOverlay.java
index 58f5c6a73a..2ccc721ddf 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/ShamanSpawnOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/ShamanSpawnOverlay.java
@@ -30,6 +30,7 @@ import java.awt.Graphics2D;
 import java.time.Duration;
 import java.time.Instant;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.Perspective;
 import net.runelite.api.Point;
@@ -38,13 +39,14 @@ import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.components.ProgressPieComponent;
 
+@Singleton
 class ShamanSpawnOverlay extends Overlay
 {
 	private final Client client;
 	private final LizardmenShamanPlugin plugin;
 
 	@Inject
-	private ShamanSpawnOverlay(Client client, LizardmenShamanPlugin plugin)
+	private ShamanSpawnOverlay(final Client client, final LizardmenShamanPlugin plugin)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_SCENE);
@@ -61,12 +63,9 @@ class ShamanSpawnOverlay extends Overlay
 			final long startCountdown = Duration.between(spawn.getStart(), now).getSeconds();
 			final double certainSec = spawn.getCountdownTimer() - startCountdown;
 
-			if (certainSec <= 0)
+			if (certainSec <= 0 && spawn.getEnd() == null)
 			{
-				if (spawn.getEnd() == null)
-				{
-					spawn.setEnd(Instant.now());
-				}
+				spawn.setEnd(Instant.now());
 			}
 
 			final ProgressPieComponent pieComponent = new ProgressPieComponent();
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loginscreen/LoginScreenPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/loginscreen/LoginScreenPlugin.java
index b99efb6e62..dbf0a6df64 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/loginscreen/LoginScreenPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/loginscreen/LoginScreenPlugin.java
@@ -32,9 +32,11 @@ import java.awt.datatransfer.UnsupportedFlavorException;
 import java.awt.event.KeyEvent;
 import java.io.IOException;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
 import net.runelite.api.GameState;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.GameStateChanged;
 import net.runelite.client.events.SessionOpen;
 import net.runelite.client.config.ConfigManager;
@@ -50,6 +52,7 @@ import net.runelite.client.util.OSType;
 	description = "Provides various enhancements for login screen"
 )
 @Slf4j
+@Singleton
 public class LoginScreenPlugin extends Plugin implements KeyListener
 {
 	private static final int MAX_USERNAME_LENGTH = 254;
@@ -67,9 +70,14 @@ public class LoginScreenPlugin extends Plugin implements KeyListener
 
 	private String usernameCache;
 
+	private boolean syncUsername;
+	private boolean pasteEnabled;
+	private String username;
+
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
 		applyUsername();
 		keyManager.registerKeyListener(this);
 	}
@@ -77,7 +85,7 @@ public class LoginScreenPlugin extends Plugin implements KeyListener
 	@Override
 	protected void shutDown() throws Exception
 	{
-		if (config.syncUsername())
+		if (this.syncUsername)
 		{
 			client.getPreferences().setRememberedUsername(usernameCache);
 		}
@@ -94,7 +102,7 @@ public class LoginScreenPlugin extends Plugin implements KeyListener
 	@Subscribe
 	public void onGameStateChanged(GameStateChanged event)
 	{
-		if (!config.syncUsername())
+		if (!this.syncUsername)
 		{
 			return;
 		}
@@ -112,13 +120,14 @@ public class LoginScreenPlugin extends Plugin implements KeyListener
 				username = client.getUsername();
 			}
 
-			if (config.username().equals(username))
+			if (this.username.equals(username))
 			{
 				return;
 			}
 
 			log.debug("Saving username: {}", username);
 			config.username(username);
+			this.username = username;
 		}
 	}
 
@@ -131,7 +140,7 @@ public class LoginScreenPlugin extends Plugin implements KeyListener
 
 	private void applyUsername()
 	{
-		if (!config.syncUsername())
+		if (!this.syncUsername)
 		{
 			return;
 		}
@@ -139,7 +148,7 @@ public class LoginScreenPlugin extends Plugin implements KeyListener
 		GameState gameState = client.getGameState();
 		if (gameState == GameState.LOGIN_SCREEN)
 		{
-			String username = config.username();
+			String username = this.username;
 
 			if (Strings.isNullOrEmpty(username))
 			{
@@ -164,7 +173,7 @@ public class LoginScreenPlugin extends Plugin implements KeyListener
 	@Override
 	public void keyPressed(KeyEvent e)
 	{
-		if (!config.pasteEnabled() || (
+		if (!this.pasteEnabled || (
 			client.getGameState() != GameState.LOGIN_SCREEN &&
 				client.getGameState() != GameState.LOGIN_SCREEN_AUTHENTICATOR))
 		{
@@ -220,4 +229,22 @@ public class LoginScreenPlugin extends Plugin implements KeyListener
 	{
 
 	}
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (!event.getGroup().equals("loginscreen"))
+		{
+			return;
+		}
+
+		updateConfig();
+	}
+
+	private void updateConfig()
+	{
+		this.syncUsername = config.syncUsername();
+		this.pasteEnabled = config.pasteEnabled();
+		this.username = config.username();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistOverlay.java
index 132c98e33c..2aa5705337 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistOverlay.java
@@ -7,6 +7,7 @@ import java.awt.Polygon;
 import java.text.DecimalFormat;
 import java.util.Map;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.Perspective;
 import net.runelite.api.Point;
@@ -18,13 +19,14 @@ import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayPriority;
 import net.runelite.client.ui.overlay.OverlayUtil;
 
+@Singleton
 public class LootAssistOverlay extends Overlay
 {
-	private Client client;
-	private DecimalFormat d = new DecimalFormat("##.#");
+	private final Client client;
+	private final DecimalFormat d = new DecimalFormat("##.#");
 
 	@Inject
-	public LootAssistOverlay(Client client)
+	public LootAssistOverlay(final Client client)
 	{
 		this.client = client;
 		setLayer(OverlayLayer.ABOVE_SCENE);
@@ -41,15 +43,17 @@ public class LootAssistOverlay extends Overlay
 			LootPile pile = entry.getValue();
 			int x;
 			int y;
-			try
+			LocalPoint lp = LocalPoint.fromWorld(client, pile.getLocation());
+			if (lp != null)
 			{
-				x = LocalPoint.fromWorld(client, pile.getLocation()).getSceneX();
-				y = LocalPoint.fromWorld(client, pile.getLocation()).getSceneY();
+				x = lp.getSceneX();
+				y = lp.getSceneY();
 			}
-			catch (NullPointerException e)
+			else
 			{
 				continue;
 			}
+
 			if (!localPoint.isInScene(client))
 			{
 				continue;
@@ -70,11 +74,9 @@ public class LootAssistOverlay extends Overlay
 					client.getScene().getTiles()[client.getPlane()][x][y].getLocalLocation());
 				if (poly != null)
 				{
-					Point textLoc = Perspective.getCanvasTextLocation(client, graphics,
-						LocalPoint.fromWorld(client, pile.getLocation()),
+					Point textLoc = Perspective.getCanvasTextLocation(client, graphics, lp,
 						nameOverlay, graphics.getFontMetrics().getHeight() * 7);
-					Point timeLoc = Perspective.getCanvasTextLocation(client, graphics,
-						LocalPoint.fromWorld(client, pile.getLocation()),
+					Point timeLoc = Perspective.getCanvasTextLocation(client, graphics, lp,
 						timeOverlay, graphics.getFontMetrics().getHeight());
 					OverlayUtil.renderPolygon(graphics, poly, Color.WHITE);
 					if (timeRemaining < 5)
@@ -84,8 +86,7 @@ public class LootAssistOverlay extends Overlay
 					}
 					if (timeRemaining < 2)
 					{
-						client.setHintArrow(WorldPoint.fromLocal(client,
-							LocalPoint.fromWorld(client, pile.getLocation())));
+						client.setHintArrow(WorldPoint.fromLocal(client, lp));
 					}
 					else
 					{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistPlugin.java
index 7087ec423f..b896912eec 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistPlugin.java
@@ -1,15 +1,14 @@
 package net.runelite.client.plugins.lootassist;
 
-import com.google.inject.Provides;
 import java.util.concurrent.ConcurrentHashMap;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Actor;
 import net.runelite.api.AnimationID;
 import net.runelite.api.Player;
 import net.runelite.api.coords.WorldPoint;
 import net.runelite.api.events.AnimationChanged;
 import net.runelite.api.events.GameStateChanged;
-import net.runelite.client.config.ConfigManager;
 import net.runelite.client.eventbus.Subscribe;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginDescriptor;
@@ -23,7 +22,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	type = PluginType.PVP,
 	enabledByDefault = false
 )
-
+@Singleton
 public class LootAssistPlugin extends Plugin
 {
 	@Inject
@@ -32,13 +31,7 @@ public class LootAssistPlugin extends Plugin
 	@Inject
 	LootAssistOverlay lootAssistOverlay;
 
-	static ConcurrentHashMap<WorldPoint, LootPile> lootPiles = new ConcurrentHashMap<>();
-
-	@Provides
-	LootAssitConfig getConfig(ConfigManager configManager)
-	{
-		return configManager.getConfig(LootAssitConfig.class);
-	}
+	static final ConcurrentHashMap<WorldPoint, LootPile> lootPiles = new ConcurrentHashMap<>();
 
 	@Override
 	protected void startUp() throws Exception
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssitConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssitConfig.java
deleted file mode 100644
index 8c4d5b1a10..0000000000
--- a/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssitConfig.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package net.runelite.client.plugins.lootassist;
-
-import java.awt.Color;
-import net.runelite.client.config.Config;
-import net.runelite.client.config.ConfigGroup;
-import net.runelite.client.config.ConfigItem;
-
-@ConfigGroup("lootassist")
-public interface LootAssitConfig extends Config
-{
-	@ConfigItem(
-		keyName = "color",
-		name = "Color",
-		description = "The Color of the tile and name overlay that indicates where loot will appear"
-	)
-	default Color color()
-	{
-		return Color.WHITE;
-	}
-}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootPile.java b/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootPile.java
index 32fa145088..f59e842730 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootPile.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootPile.java
@@ -1,5 +1,6 @@
 package net.runelite.client.plugins.lootassist;
 
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
 import net.runelite.api.coords.WorldPoint;
@@ -8,17 +9,17 @@ class LootPile
 {
 	private static final long TIME_UNTIL_VISIBLE = 60000;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final long timeAppearing;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final WorldPoint location;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final String playerName;
 
-	@Getter
-	@Setter
+	@Getter(AccessLevel.PACKAGE)
+	@Setter(AccessLevel.PACKAGE)
 	private boolean beingRendered = false;
 
 	LootPile(WorldPoint location, String playerName)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerOverlay.java
index ecfe3dc5da..c8353c0181 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerOverlay.java
@@ -30,6 +30,7 @@ import java.awt.Graphics2D;
 import java.awt.Point;
 import java.awt.image.BufferedImage;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.InventoryID;
 import net.runelite.api.Item;
@@ -41,6 +42,7 @@ import net.runelite.client.ui.overlay.components.ComponentOrientation;
 import net.runelite.client.ui.overlay.components.ImageComponent;
 import net.runelite.client.ui.overlay.components.PanelComponent;
 
+@Singleton
 public class LootingBagViewerOverlay extends Overlay
 {
 	private static final int INVENTORY_SIZE = 28;
@@ -57,7 +59,7 @@ public class LootingBagViewerOverlay extends Overlay
 	private Item[] items;
 
 	@Inject
-	private LootingBagViewerOverlay(Client client, ItemManager itemManager)
+	private LootingBagViewerOverlay(final Client client, final ItemManager itemManager)
 	{
 		setPosition(OverlayPosition.BOTTOM_RIGHT);
 		panelComponent.setWrapping(4);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerPlugin.java
index 69563ab2c4..a0e3591dbf 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerPlugin.java
@@ -29,6 +29,8 @@ package net.runelite.client.plugins.lootingbagviewer;
 import com.google.common.base.Strings;
 import com.google.inject.Provides;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
@@ -57,6 +59,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
  * TODO: Write something to capture adding items to a looting bag and add its price to the current looting bag value
  */
 @Slf4j
+@Singleton // WHY IS THIS PLUGIN EVEN MERGED IT'S AGES FROM BEING DONE!?!?!?!?
 public class LootingBagViewerPlugin extends Plugin
 {
 	@Inject
@@ -77,8 +80,8 @@ public class LootingBagViewerPlugin extends Plugin
 	@Inject
 	private LootingBagViewerConfig config;
 
-	@Getter
-	@Setter
+	@Getter(AccessLevel.PACKAGE)
+	@Setter(AccessLevel.PACKAGE)
 	private int valueToShow = -1;
 
 	@Provides
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerWidgetOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerWidgetOverlay.java
index 00c716f2fb..d3356155c4 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerWidgetOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerWidgetOverlay.java
@@ -27,22 +27,21 @@ package net.runelite.client.plugins.lootingbagviewer;
 import java.awt.Color;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
-import net.runelite.api.Client;
+import javax.inject.Singleton;
 import net.runelite.api.ItemID;
 import net.runelite.api.Point;
 import net.runelite.api.widgets.WidgetItem;
 import net.runelite.client.ui.overlay.OverlayUtil;
 import net.runelite.client.ui.overlay.WidgetItemOverlay;
 
+@Singleton
 public class LootingBagViewerWidgetOverlay extends WidgetItemOverlay
 {
-	private Client client;
 	private LootingBagViewerPlugin plugin;
 
 	@Inject
-	LootingBagViewerWidgetOverlay(Client client, LootingBagViewerPlugin plugin)
+	LootingBagViewerWidgetOverlay(final LootingBagViewerPlugin plugin)
 	{
-		this.client = client;
 		this.plugin = plugin;
 		showOnInventory();
 	}
@@ -72,9 +71,6 @@ public class LootingBagViewerWidgetOverlay extends WidgetItemOverlay
 	{
 		switch ((int) (Math.log10(lootingBagValue) + 1))
 		{
-			case 1:
-			case 2:
-				return 8;
 			case 3:
 			case 4:
 				return 6;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerBox.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerBox.java
index c6596ab2ff..82eeb405e9 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerBox.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerBox.java
@@ -65,7 +65,7 @@ class LootTrackerBox extends JPanel
 	@Getter(AccessLevel.PACKAGE)
 	private final String id;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final List<LootTrackerRecord> records = new ArrayList<>();
 
 	private long totalPrice;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerItem.java
index feb1504681..b676924c8e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerItem.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerItem.java
@@ -24,6 +24,7 @@
  */
 package net.runelite.client.plugins.loottracker;
 
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
@@ -31,15 +32,15 @@ import lombok.Setter;
 @AllArgsConstructor
 class LootTrackerItem
 {
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final int id;
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final String name;
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final int quantity;
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final long price;
-	@Getter
-	@Setter
+	@Getter(AccessLevel.PACKAGE)
+	@Setter(AccessLevel.PACKAGE)
 	private boolean ignored;
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPanel.java
index c12f095c01..cb4ce03bf2 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPanel.java
@@ -39,6 +39,7 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
 import java.util.Vector;
+import javax.inject.Singleton;
 import javax.swing.BorderFactory;
 import javax.swing.BoxLayout;
 import javax.swing.ImageIcon;
@@ -63,6 +64,7 @@ import net.runelite.client.util.StackFormatter;
 import net.runelite.http.api.loottracker.LootTrackerClient;
 
 @Slf4j
+@Singleton
 class LootTrackerPanel extends PluginPanel
 {
 	private static final int MAX_LOOT_BOXES = 500;
@@ -154,8 +156,6 @@ class LootTrackerPanel extends PluginPanel
 		INVISIBLE_ICON_HOVER = new ImageIcon(ImageUtil.alphaOffset(invisibleImg, -220));
 	}
 
-	private final JPanel displaySelector;
-
 	@Getter @Setter
 	private LootRecordSortType lootRecordSortType = LootRecordSortType.TIMESTAMP;
 
@@ -355,7 +355,7 @@ class LootTrackerPanel extends PluginPanel
 		overallPanel.add(overallIcon, BorderLayout.WEST);
 		overallPanel.add(overallInfo, BorderLayout.CENTER);
 
-		displaySelector = new JPanel();
+		JPanel displaySelector = new JPanel();
 		displaySelector.setLayout(new GridLayout(1, 1));
 		displaySelector.setBorder(new EmptyBorder(2, 10, 10, 10));
 		displaySelector.setBackground(ColorScheme.DARKER_GRAY_COLOR);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java
index bd27d3f981..c1bb032c55 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java
@@ -33,11 +33,9 @@ import com.google.common.collect.Multiset;
 import com.google.common.collect.Multisets;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.google.gson.JsonStreamParser;
 import com.google.gson.reflect.TypeToken;
 import com.google.inject.Provides;
 import java.awt.image.BufferedImage;
-import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -51,12 +49,14 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import javax.swing.SwingUtilities;
 import lombok.AccessLevel;
 import lombok.Getter;
@@ -117,6 +117,7 @@ import net.runelite.http.api.loottracker.LootTrackerClient;
 	enabledByDefault = false
 )
 @Slf4j
+@Singleton
 public class LootTrackerPlugin extends Plugin
 {
 	// Activity/Event loot handling
@@ -143,12 +144,10 @@ public class LootTrackerPlugin extends Plugin
 		12342, // Edgeville
 		11062 // Camelot
 	);
-	// Player deaths
-	public static HashSet<String> usernameSet = new HashSet<String>(Arrays.stream(new String[]{"All Records"}).collect(Collectors.toList()));
 	@Inject
 	public Client client;
 	@VisibleForTesting
-	public Collection<LootRecord> lootRecords = new ArrayList<>();
+	private Collection<LootRecord> lootRecords = new ArrayList<>();
 	private boolean pvpDeath = false;
 	@Inject
 	private ClientToolbar clientToolbar;
@@ -174,8 +173,6 @@ public class LootTrackerPlugin extends Plugin
 	private Multiset<Integer> inventorySnapshot;
 	@Getter(AccessLevel.PACKAGE)
 	private LootTrackerClient lootTrackerClient;
-	private BufferedReader bufferedReader;
-	private JsonStreamParser jsonStreamParser;
 
 	private static Collection<ItemStack> stack(Collection<ItemStack> items)
 	{
@@ -213,6 +210,18 @@ public class LootTrackerPlugin extends Plugin
 			.collect(Collectors.toList());
 	}
 
+	private String getIgnoredItems;
+	private boolean saveLoot;
+	private boolean chestLootChat;
+	private boolean syncPanel;
+	private boolean localPersistence;
+	private LootRecordSortType sortType;
+	private boolean whitelistEnabled;
+	private String getWhitelist;
+	private boolean blacklistEnabled;
+	private String getBlacklist;
+	private boolean sendLootValueMessages;
+
 	@Provides
 	LootTrackerConfig provideConfig(ConfigManager configManager)
 	{
@@ -254,9 +263,11 @@ public class LootTrackerPlugin extends Plugin
 	{
 		if (event.getGroup().equals("loottracker"))
 		{
+			updateConfig();
+
 			if (event.getKey().equals("ignoredItems"))
 			{
-				ignoredItems = Text.fromCSV(config.getIgnoredItems());
+				ignoredItems = Text.fromCSV(this.getIgnoredItems);
 				SwingUtilities.invokeLater(panel::updateIgnoredRecords);
 			}
 			if (event.getKey().equals("ignoredNPCs"))
@@ -266,7 +277,7 @@ public class LootTrackerPlugin extends Plugin
 			}
 			if (event.getKey().equals("sortType"))
 			{
-				panel.setLootRecordSortType(config.sortType());
+				panel.setLootRecordSortType(this.sortType);
 				SwingUtilities.invokeLater(panel::rebuild);
 			}
 		}
@@ -278,6 +289,7 @@ public class LootTrackerPlugin extends Plugin
 	{
 		ignoredItems = Text.fromCSV(config.getIgnoredItems());
 		ignoredNPCs = Text.fromCSV(config.getIgnoredNPCs());
+		updateConfig();
 		panel = new LootTrackerPanel(this, itemManager, config);
 		spriteManager.getSpriteAsync(SpriteID.TAB_INVENTORY, 0, panel::loadHeaderIcon);
 
@@ -294,8 +306,8 @@ public class LootTrackerPlugin extends Plugin
 
 		AccountSession accountSession = sessionManager.getAccountSession();
 		LOOT_RECORDS_FILE.createNewFile();
-		bufferedReader = Files.newBufferedReader(LOOT_RECORDS_FILE.toPath());
-		if (accountSession != null || config.localPersistence())
+		// BufferedReader bufferedReader = Files.newBufferedReader(LOOT_RECORDS_FILE.toPath());
+		if (accountSession != null || this.localPersistence)
 		{
 
 			clientThread.invokeLater(() ->
@@ -309,12 +321,25 @@ public class LootTrackerPlugin extends Plugin
 
 				executor.submit(() ->
 				{
-					if (config.syncPanel())
+					if (this.syncPanel && lootTrackerClient != null)
 					{
-						lootTrackerClient = new LootTrackerClient(accountSession.getUuid());
+						if (accountSession != null)
+						{
+							lootTrackerClient = new LootTrackerClient(accountSession.getUuid());
+						}
+						try
+						{
+							lootRecords = lootTrackerClient.get();
+						}
+						catch (IOException e)
+						{
+							log.debug("Unable to look up loot", e);
+							return;
+						}
+						log.debug("Loaded {} remote data entries", lootRecords.size());
 					}
 
-					if (config.localPersistence())
+					if (this.localPersistence)
 					{
 						try
 						{
@@ -350,7 +375,7 @@ public class LootTrackerPlugin extends Plugin
 	{
 		clientToolbar.removeNavigation(navButton);
 		lootTrackerClient = null;
-		lootRecords = new ArrayList<LootRecord>();
+		lootRecords = new ArrayList<>();
 	}
 
 	@Subscribe
@@ -363,18 +388,18 @@ public class LootTrackerPlugin extends Plugin
 		final LootTrackerItem[] entries = buildEntries(stack(items));
 		String localUsername = client.getLocalPlayer().getName();
 
-		if (config.whitelistEnabled())
+		if (this.whitelistEnabled)
 		{
-			final String configNpcs = config.getWhitelist().toLowerCase();
+			final String configNpcs = this.getWhitelist.toLowerCase();
 			List<String> whitelist = Text.fromCSV(configNpcs);
 			if (!whitelist.contains(name.toLowerCase()))
 			{
 				return;
 			}
 		}
-		else if (config.blacklistEnabled())
+		else if (this.blacklistEnabled)
 		{
-			final String configNpcs = config.getBlacklist().toLowerCase();
+			final String configNpcs = this.getBlacklist.toLowerCase();
 			List<String> blacklist = Text.fromCSV(configNpcs);
 			if (blacklist.contains(name.toLowerCase()))
 			{
@@ -390,7 +415,7 @@ public class LootTrackerPlugin extends Plugin
 		{
 			lootTrackerClient.submit(lootRecord);
 		}
-		if (config.localPersistence())
+		if (this.localPersistence)
 		{
 			saveLocalLootRecord(lootRecord);
 		}
@@ -408,7 +433,7 @@ public class LootTrackerPlugin extends Plugin
 	@Subscribe
 	public void onPlayerLootReceived(final PlayerLootReceived playerLootReceived)
 	{
-		if (config.sendLootValueMessages())
+		if (this.sendLootValueMessages)
 		{
 			if (WorldType.isDeadmanWorld(client.getWorldType()) || WorldType.isHighRiskWorld(client.getWorldType()) ||
 					WorldType.isPvpWorld(client.getWorldType()) || client.getVar(Varbits.IN_WILDERNESS) == 1)
@@ -430,7 +455,7 @@ public class LootTrackerPlugin extends Plugin
 		SwingUtilities.invokeLater(() -> panel.add(name, localUsername, combat, entries));
 		LootRecord lootRecord = new LootRecord(name, localUsername, LootRecordType.PLAYER,
 			toGameItems(items), Instant.now());
-		if (lootTrackerClient != null && config.saveLoot())
+		if (lootTrackerClient != null && this.saveLoot)
 		{
 			lootTrackerClient.submit(lootRecord);
 		}
@@ -477,7 +502,7 @@ public class LootTrackerPlugin extends Plugin
 			return;
 		}
 
-		if (!(event.getGroupId() == WidgetID.CLUE_SCROLL_REWARD_GROUP_ID) && config.chestLootChat())
+		if (!(event.getGroupId() == WidgetID.CLUE_SCROLL_REWARD_GROUP_ID) && this.chestLootChat)
 		{
 			Item[] items = container.getItems();
 			long chestPrice = 0;
@@ -523,7 +548,7 @@ public class LootTrackerPlugin extends Plugin
 		LootRecord lootRecord = new LootRecord(eventType, client.getLocalPlayer().getName(), LootRecordType.EVENT,
 			toGameItems(items), Instant.now());
 
-		if (lootTrackerClient != null && config.saveLoot())
+		if (lootTrackerClient != null && this.saveLoot)
 		{
 			lootTrackerClient.submit(lootRecord);
 		}
@@ -597,11 +622,9 @@ public class LootTrackerPlugin extends Plugin
 	@Subscribe
 	public void onItemContainerChanged(ItemContainerChanged event)
 	{
-		final ItemContainer itemContainer = event.getItemContainer();
-
 		if (pvpDeath && RESPAWN_REGIONS.contains(client.getLocalPlayer().getWorldLocation().getRegionID()))
 		{
-			Multiset snapshot = HashMultiset.create();
+			Multiset snapshot;
 			snapshot = inventorySnapshot;
 			deathInventorySnapshot();
 			if (inventorySnapshot != snapshot)
@@ -613,7 +636,7 @@ public class LootTrackerPlugin extends Plugin
 					Multiset<Integer> currentInventory = HashMultiset.create();
 					if (inventory != null)
 					{
-						Arrays.stream(client.getItemContainer(InventoryID.INVENTORY).getItems())
+						Arrays.stream(Objects.requireNonNull(client.getItemContainer(InventoryID.INVENTORY)).getItems())
 							.forEach(item -> currentInventory.add(item.getId(), item.getQuantity()));
 					}
 
@@ -629,11 +652,11 @@ public class LootTrackerPlugin extends Plugin
 						client.getLocalPlayer().getCombatLevel(), entries));
 					LootRecord lootRecord = new LootRecord(name, client.getLocalPlayer().getName(), LootRecordType.DEATH,
 						toGameItems(itemsLost), Instant.now());
-					if (lootTrackerClient != null && config.saveLoot())
+					if (lootTrackerClient != null && this.saveLoot)
 					{
 						lootTrackerClient.submit(lootRecord);
 					}
-					if (config.localPersistence() && lootTrackerClient == null)
+					if (this.localPersistence && lootTrackerClient == null)
 					{
 						saveLocalLootRecord(lootRecord);
 					}
@@ -780,6 +803,7 @@ public class LootTrackerPlugin extends Plugin
 		}
 
 		config.setIgnoredItems(Text.toCSV(ignoredItemSet));
+		this.getIgnoredItems = Text.toCSV(ignoredItemSet);
 		panel.updateIgnoredRecords();
 	}
 
@@ -851,7 +875,7 @@ public class LootTrackerPlugin extends Plugin
 			.toArray(LootTrackerItem[]::new);
 	}
 
-	public Collection<LootTrackerRecord> convertToLootTrackerRecord(final Collection<LootRecord> records)
+	private Collection<LootTrackerRecord> convertToLootTrackerRecord(final Collection<LootRecord> records)
 	{
 		Collection<LootTrackerRecord> trackerRecords = new ArrayList<>();
 		for (LootRecord record : records)
@@ -866,4 +890,19 @@ public class LootTrackerPlugin extends Plugin
 
 		return trackerRecords;
 	}
+
+	private void updateConfig()
+	{
+		this.getIgnoredItems = config.getIgnoredItems();
+		this.saveLoot = config.saveLoot();
+		this.chestLootChat = config.chestLootChat();
+		this.syncPanel = config.syncPanel();
+		this.localPersistence = config.localPersistence();
+		this.sortType = config.sortType();
+		this.whitelistEnabled = config.whitelistEnabled();
+		this.getWhitelist = config.getWhitelist();
+		this.blacklistEnabled = config.blacklistEnabled();
+		this.getBlacklist = config.getBlacklist();
+		this.sendLootValueMessages = config.sendLootValueMessages();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lowmemory/LowMemoryPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/lowmemory/LowMemoryPlugin.java
index 41caa93ebd..589ac4e202 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/lowmemory/LowMemoryPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/lowmemory/LowMemoryPlugin.java
@@ -25,6 +25,7 @@
 package net.runelite.client.plugins.lowmemory;
 
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.GameState;
 import net.runelite.api.events.GameStateChanged;
@@ -38,6 +39,7 @@ import net.runelite.client.plugins.PluginDescriptor;
 	tags = {"memory", "usage", "ground", "decorations"},
 	enabledByDefault = false
 )
+@Singleton
 public class LowMemoryPlugin extends Plugin
 {
 	@Inject
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/MaxHitPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/MaxHitPlugin.java
index 2315d2e2ca..b711aa37a5 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/MaxHitPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/MaxHitPlugin.java
@@ -25,6 +25,7 @@
 package net.runelite.client.plugins.maxhit;
 
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.InventoryID;
 import net.runelite.api.Item;
@@ -48,7 +49,7 @@ import net.runelite.client.plugins.maxhit.calculators.RangeMaxHitCalculator;
 	type = PluginType.UTILITY,
 	enabledByDefault = false
 )
-
+@Singleton
 public class MaxHitPlugin extends Plugin
 {
 
@@ -107,7 +108,7 @@ public class MaxHitPlugin extends Plugin
 		equipYourCharacter.setText(maxHitText);
 	}
 
-	private class MaxHit
+	private static class MaxHit
 	{
 		private final double maxMeleeHit;
 		private final double maxRangeHit;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/calculators/MaxHitCalculator.java b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/calculators/MaxHitCalculator.java
index c868d3b25a..ce0e468770 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/calculators/MaxHitCalculator.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/calculators/MaxHitCalculator.java
@@ -25,6 +25,7 @@
 package net.runelite.client.plugins.maxhit.calculators;
 
 import java.util.ArrayList;
+import java.util.List;
 import java.util.function.BiFunction;
 import net.runelite.api.Client;
 import net.runelite.api.Item;
@@ -97,9 +98,9 @@ public abstract class MaxHitCalculator
 	double applyEquipmentBonus(double maxhit, EquipmentBonusConfig.BonusType bonusType)
 	{
 		double bonus = 1;
-		ArrayList<Double> addList = new ArrayList<>();
+		List<Double> addList = new ArrayList<>();
 
-		ArrayList<EquipmentBonusConfig> equipmentBonuses = EquipmentBonusConfig.getBonusByType(bonusType);
+		List<EquipmentBonusConfig> equipmentBonuses = EquipmentBonusConfig.getBonusByType(bonusType);
 
 		for (EquipmentBonusConfig equipmentBonus : equipmentBonuses)
 		{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/config/CustomFormulaConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/config/CustomFormulaConfig.java
index 51ec9c6234..3e51821336 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/config/CustomFormulaConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/config/CustomFormulaConfig.java
@@ -27,6 +27,7 @@ package net.runelite.client.plugins.maxhit.config;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.List;
 import java.util.function.BiFunction;
 import net.runelite.api.Client;
 import net.runelite.api.EquipmentInventorySlot;
@@ -205,10 +206,10 @@ public enum CustomFormulaConfig
 	);
 
 	private final MaxHitCalculator.CombatMethod requiredCombatMethod;
-	private final ArrayList<Requirement> requirements;
+	private final List<Requirement> requirements;
 	private final BiFunction<Client, MaxHitCalculator, Double> customFormula;
 
-	CustomFormulaConfig(MaxHitCalculator.CombatMethod requiredCombatMethod, ArrayList<Requirement> requirements, BiFunction<Client, MaxHitCalculator, Double> customFormula)
+	CustomFormulaConfig(MaxHitCalculator.CombatMethod requiredCombatMethod, List<Requirement> requirements, BiFunction<Client, MaxHitCalculator, Double> customFormula)
 	{
 		this.requiredCombatMethod = requiredCombatMethod;
 		this.requirements = requirements;
@@ -225,7 +226,7 @@ public enum CustomFormulaConfig
 		return customFormula;
 	}
 
-	public ArrayList<Requirement> getRequirements()
+	public List<Requirement> getRequirements()
 	{
 		return this.requirements;
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/config/EquipmentBonusConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/config/EquipmentBonusConfig.java
index 86915c66a8..015566d5e0 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/config/EquipmentBonusConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/config/EquipmentBonusConfig.java
@@ -376,7 +376,7 @@ public enum EquipmentBonusConfig
 		this.operation = operation;
 	}
 
-	public static ArrayList<EquipmentBonusConfig> getBonusByType(BonusType bonusType)
+	public static List<EquipmentBonusConfig> getBonusByType(BonusType bonusType)
 	{
 		if (!bonusTypes.containsKey(bonusType))
 		{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/equipment/EquipmentSlotItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/equipment/EquipmentSlotItem.java
index 53833123cb..1bd3d6c861 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/equipment/EquipmentSlotItem.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/equipment/EquipmentSlotItem.java
@@ -24,26 +24,26 @@
  */
 package net.runelite.client.plugins.maxhit.equipment;
 
-import java.util.ArrayList;
+import java.util.List;
 import net.runelite.api.EquipmentInventorySlot;
 
 public class EquipmentSlotItem
 {
 	private final EquipmentInventorySlot equipmentSlot;
-	private final ArrayList<Integer> itemIds;
+	private final List<Integer> itemIds;
 
-	public EquipmentSlotItem(EquipmentInventorySlot equipmentSlot, ArrayList<Integer> itemIds)
+	public EquipmentSlotItem(EquipmentInventorySlot equipmentSlot, List<Integer> itemIds)
 	{
 		this.equipmentSlot = equipmentSlot;
 		this.itemIds = itemIds;
 	}
 
-	public ArrayList<Integer> getItems()
+	public List<Integer> getItems()
 	{
 		return this.itemIds;
 	}
 
-	public EquipmentInventorySlot getEquipmentSlot()
+	EquipmentInventorySlot getEquipmentSlot()
 	{
 		return this.equipmentSlot;
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/requirements/AutocastSpellRequirement.java b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/requirements/AutocastSpellRequirement.java
index e6e771281e..5e933a3e61 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/requirements/AutocastSpellRequirement.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/requirements/AutocastSpellRequirement.java
@@ -24,7 +24,7 @@
  */
 package net.runelite.client.plugins.maxhit.requirements;
 
-import java.util.ArrayList;
+import java.util.List;
 import net.runelite.api.Client;
 import net.runelite.api.Varbits;
 import net.runelite.client.plugins.maxhit.config.SpellBaseDamageConfig;
@@ -32,9 +32,9 @@ import net.runelite.client.plugins.maxhit.config.SpellBaseDamageConfig;
 public class AutocastSpellRequirement implements Requirement
 {
 
-	private final ArrayList<SpellBaseDamageConfig> autocastSpells;
+	private final List<SpellBaseDamageConfig> autocastSpells;
 
-	public AutocastSpellRequirement(ArrayList<SpellBaseDamageConfig> autocastSpells)
+	public AutocastSpellRequirement(List<SpellBaseDamageConfig> autocastSpells)
 	{
 		this.autocastSpells = autocastSpells;
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java
index 5e2ec78add..121b1f395c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java
@@ -1692,4 +1692,4 @@ default CharterOption charterOption()
 		{
 			return true;
 		}
-}
+}
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
index 4e8490a4c4..06dee1c828 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
@@ -40,6 +40,8 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
 import net.runelite.api.Client;
@@ -78,11 +80,25 @@ import net.runelite.client.menus.WidgetMenuOption;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginDescriptor;
 import net.runelite.client.plugins.PluginType;
+import net.runelite.client.plugins.menuentryswapper.util.BurningAmuletMode;
+import net.runelite.client.plugins.menuentryswapper.util.CombatBraceletMode;
+import net.runelite.client.plugins.menuentryswapper.util.DigsitePendantMode;
+import net.runelite.client.plugins.menuentryswapper.util.DuelingRingMode;
 import net.runelite.client.plugins.menuentryswapper.util.FairyRingMode;
+import net.runelite.client.plugins.menuentryswapper.util.GamesNecklaceMode;
+import net.runelite.client.plugins.menuentryswapper.util.GloryMode;
 import net.runelite.client.plugins.menuentryswapper.util.HouseMode;
+import net.runelite.client.plugins.menuentryswapper.util.MaxCapeMode;
+import net.runelite.client.plugins.menuentryswapper.util.NecklaceOfPassageMode;
 import net.runelite.client.plugins.menuentryswapper.util.ObeliskMode;
 import net.runelite.client.plugins.menuentryswapper.util.OccultAltarMode;
 import net.runelite.client.plugins.menuentryswapper.util.CharterOption;
+import net.runelite.client.plugins.menuentryswapper.util.QuestCapeMode;
+import net.runelite.client.plugins.menuentryswapper.util.RingOfWealthMode;
+import net.runelite.client.plugins.menuentryswapper.util.SkillsNecklaceMode;
+import net.runelite.client.plugins.menuentryswapper.util.SlayerRingMode;
+import net.runelite.client.plugins.menuentryswapper.util.XericsTalismanMode;
+import net.runelite.client.plugins.menuentryswapper.util.teleEquippedMode;
 import static net.runelite.client.util.MenuUtil.swap;
 import net.runelite.client.util.MiscUtils;
 import net.runelite.client.util.Text;
@@ -95,7 +111,7 @@ import org.apache.commons.lang3.ArrayUtils;
 	type = PluginType.UTILITY,
 	enabledByDefault = false
 )
-
+@Singleton
 public class MenuEntrySwapperPlugin extends Plugin
 {
 	private static final String CONFIGURE = "Configure";
@@ -106,14 +122,7 @@ public class MenuEntrySwapperPlugin extends Plugin
 	private static final String CONFIG_GROUP = "shiftclick";
 	private static final String ITEM_KEY_PREFIX = "item_";
 	private static final int PURO_PURO_REGION_ID = 10307;
-	private static final String WALK_HERE = "WALK HERE";
-	private static final String CANCEL = "CANCEL";
-	private static final String CAST_OPTIONS_ATTACK = "CAST";
-	public static final HashSet<String> CAST_OPTIONS_KEYWORDS = new HashSet<>();
-		static
-		{
-			CAST_OPTIONS_KEYWORDS.add(CAST_OPTIONS_ATTACK);
-		}
+
 
 	private MenuEntry[] entries;
 	private final Set<String> leftClickConstructionItems = new HashSet<>();
@@ -176,11 +185,135 @@ public class MenuEntrySwapperPlugin extends Plugin
 	@Inject
 	private ItemManager itemManager;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private boolean configuringShiftClick = false;
 
-	@Setter
+	@Setter(AccessLevel.PACKAGE)
 	private boolean shiftModifier = false;
+	
+	private boolean getWithdrawOne;
+	private String getWithdrawOneItems;
+	private boolean getWithdrawFive;
+	private String getWithdrawFiveItems;
+	private boolean getWithdrawTen;
+	private String getWithdrawTenItems;
+	private boolean getWithdrawX;
+	private String getWithdrawXAmount;
+	private String getWithdrawXItems;
+	private boolean getWithdrawAll;
+	private String getWithdrawAllItems;
+	private boolean swapMax;
+	private boolean teleEquippedCape;
+	private teleEquippedMode telecapeMode;
+	private MaxCapeMode maxMode;
+	private boolean getSwapArdougneCape;
+	private boolean getSwapConstructionCape;
+	private boolean getSwapCraftingCape;
+	private boolean getSwapMagicCape;
+	private boolean getSwapExplorersRing;
+	private boolean swapAdmire;
+	private boolean swapQuestCape;
+	private QuestCapeMode questCapeMode;
+	private String configCustomSwaps;
+	private boolean shiftClickCustomization;
+	private boolean swapCoalBag;
+	private boolean swapBirdhouseEmpty;
+	private boolean swapBones;
+	private boolean swapChase;
+	private boolean swapHarpoon;
+	private OccultAltarMode swapOccultMode;
+	private HouseMode swapHomePortalMode;
+	private boolean swapPrivate;
+	private boolean swapPick;
+	private boolean swapQuick;
+	private boolean swapBoxTrap;
+	private boolean rockCake;
+	private boolean swapRogueschests;
+	private boolean swapClimbUpDown;
+	private boolean swapStun;
+	private boolean swapSearch;
+	private boolean swapHardWoodGrove;
+	private boolean getRemoveObjects;
+	private String getRemovedObjects;
+	private boolean swapImps;
+	private CharterOption charterOption;
+	private boolean getSwapBuyOne;
+	private String getBuyOneItems;
+	private boolean getSwapBuyFive;
+	private String getBuyFiveItems;
+	private boolean getSwapBuyTen;
+	private String getBuyTenItems;
+	private boolean getSwapBuyFifty;
+	private String getBuyFiftyItems;
+	private boolean getSwapSellOne;
+	private String getSellOneItems;
+	private boolean getSwapSellFive;
+	private String getSellFiveItems;
+	private boolean getSwapSellTen;
+	private String getSellTenItems;
+	private boolean getSwapSellFifty;
+	private String getSellFiftyItems;
+	private boolean getEasyConstruction;
+	private String getEasyConstructionItems;
+	private boolean getSwapSmithing;
+	private boolean getSwapTanning;
+	private boolean getSwapSawmill;
+	private boolean getSwapSawmillPlanks;
+	private boolean getSwapPuro;
+	private boolean swapAssignment;
+	private boolean swapBankExchange;
+	private boolean swapContract;
+	private boolean swapInteract;
+	private boolean swapPickpocket;
+	private boolean swapPay;
+	private boolean swapAbyssTeleport;
+	private boolean swapTrade;
+	private boolean swapTravel;
+	private boolean swapMinigame;
+	private boolean swapPlank;
+	private boolean swapMetamorphosis;
+	private boolean swapEnchant;
+	private FairyRingMode swapFairyRingMode;
+	private ObeliskMode swapObeliskMode;
+	private boolean swapTeleportItem;
+	private boolean swapWildernessLever;
+	private boolean swapNexus;
+	private boolean getGamesNecklace;
+	private GamesNecklaceMode getGamesNecklaceMode;
+	private boolean getDuelingRing;
+	private DuelingRingMode getDuelingRingMode;
+	private boolean getGlory;
+	private GloryMode getGloryMode;
+	private boolean getSkillsNecklace;
+	private SkillsNecklaceMode getSkillsNecklaceMode;
+	private boolean getNecklaceofPassage;
+	private NecklaceOfPassageMode getNecklaceofPassageMode;
+	private boolean getDigsitePendant;
+	private DigsitePendantMode getDigsitePendantMode;
+	private boolean getCombatBracelet;
+	private CombatBraceletMode getCombatBraceletMode;
+	private boolean getBurningAmulet;
+	private BurningAmuletMode getBurningAmuletMode;
+	private boolean getXericsTalisman;
+	private XericsTalismanMode getXericsTalismanMode;
+	private boolean getRingofWealth;
+	private RingOfWealthMode getRingofWealthMode;
+	private boolean getSlayerRing;
+	private SlayerRingMode getSlayerRingMode;
+	private boolean hideExamine;
+	private boolean hideTradeWith;
+	private boolean hideReport;
+	private boolean hideLookup;
+	private boolean hideNet;
+	private boolean hideBait;
+	private boolean hideDestroyRunepouch;
+	private boolean hideDestroyCoalbag;
+	private boolean hideDestroyHerbsack;
+	private boolean hideDestroyBoltpouch;
+	private boolean hideDestroyGembag;
+	private boolean hideDropRunecraftingPouch;
+	private boolean getRemoveFreezePlayerToB;
+	private boolean getRemoveFreezePlayerCoX;
 
 	@Provides
 	MenuEntrySwapperConfig provideConfig(ConfigManager configManager)
@@ -191,8 +324,11 @@ public class MenuEntrySwapperPlugin extends Plugin
 	@Override
 	public void startUp()
 	{
+		updateConfig();
 		addSwaps();
 		loadConstructionItems(config.getEasyConstructionItems());
+		client.setHideFriendCastOptions(config.getRemoveFreezePlayerToB());
+		client.setHideFriendCastOptions(config.getRemoveFreezePlayerCoX());
 
 		if (config.shiftClickCustomization())
 		{
@@ -205,6 +341,7 @@ public class MenuEntrySwapperPlugin extends Plugin
 	@Override
 	public void shutDown()
 	{
+		client.setHideFriendCastOptions(false);
 		disableCustomization();
 		loadConstructionItems("");
 		loadCustomSwaps(""); // Removes all custom swaps
@@ -218,8 +355,10 @@ public class MenuEntrySwapperPlugin extends Plugin
 		{
 			return;
 		}
+		
+		updateConfig();
 
-		loadConstructionItems(config.getEasyConstructionItems());
+		loadConstructionItems(this.getEasyConstructionItems);
 		removeSwaps();
 		addSwaps();
 
@@ -227,7 +366,7 @@ public class MenuEntrySwapperPlugin extends Plugin
 		{
 			if (event.getKey().equals("customSwaps"))
 			{
-				loadCustomSwaps(config.customSwaps());
+				loadCustomSwaps(this.configCustomSwaps);
 			}
 
 			return;
@@ -235,7 +374,7 @@ public class MenuEntrySwapperPlugin extends Plugin
 
 		if (event.getKey().equals("shiftClickCustomization"))
 		{
-			if (config.shiftClickCustomization())
+			if (this.shiftClickCustomization)
 			{
 				enableCustomization();
 			}
@@ -248,6 +387,22 @@ public class MenuEntrySwapperPlugin extends Plugin
 		{
 			clientThread.invoke(this::resetItemDefinitionCache);
 		}
+
+		if (event.getKey().equals("removeFreezePlayerToB"))
+		{
+			if (this.getRemoveFreezePlayerToB && client.getVar(Varbits.THEATRE_OF_BLOOD) == 2)
+			{
+				client.setHideFriendCastOptions(config.getRemoveFreezePlayerToB());
+			}
+		}
+
+		if (event.getKey().equals("removeFreezePlayerCoX"))
+		{
+			if (this.getRemoveFreezePlayerCoX && client.getVar(Varbits.IN_RAID) == 1)
+			{
+				client.setHideFriendCastOptions(config.getRemoveFreezePlayerCoX());
+			}
+		}
 	}
 
 	private void resetItemDefinitionCache()
@@ -315,7 +470,7 @@ public class MenuEntrySwapperPlugin extends Plugin
 			return;
 		}
 
-		loadConstructionItems(config.getEasyConstructionItems());
+		loadConstructionItems(this.getEasyConstructionItems);
 	}
 
 	@Subscribe
@@ -345,55 +500,55 @@ public class MenuEntrySwapperPlugin extends Plugin
 		{
 			String option = Text.removeTags(entry.getOption()).toLowerCase();
 
-			if (option.contains("trade with") && config.hideTradeWith())
+			if (option.contains("trade with") && this.hideTradeWith)
 			{
 				continue;
 			}
 
-			if (option.contains("lookup") && config.hideLookup())
+			if (option.contains("lookup") && this.hideLookup)
 			{
 				continue;
 			}
 
-			if (option.contains("report") && config.hideReport())
+			if (option.contains("report") && this.hideReport)
 			{
 				continue;
 			}
 
-			if (option.contains("examine") && config.hideExamine())
+			if (option.contains("examine") && this.hideExamine)
 			{
 				continue;
 			}
 
-			if (option.contains("net") && config.hideNet())
+			if (option.contains("net") && this.hideNet)
 			{
 				continue;
 			}
 
-			if (option.contains("bait") && config.hideBait())
+			if (option.contains("bait") && this.hideBait)
 			{
 				continue;
 			}
 
 			if (option.contains("destroy"))
 			{
-				if (config.hideDestroyRunepouch() && entry.getTarget().contains("Rune pouch"))
+				if (this.hideDestroyRunepouch && entry.getTarget().contains("Rune pouch"))
 				{
 					continue;
 				}
-				if (config.hideDestroyCoalbag() && entry.getTarget().contains("Coal bag"))
+				if (this.hideDestroyCoalbag && entry.getTarget().contains("Coal bag"))
 				{
 					continue;
 				}
-				if (config.hideDestroyHerbsack() && entry.getTarget().contains("Herb sack"))
+				if (this.hideDestroyHerbsack && entry.getTarget().contains("Herb sack"))
 				{
 					continue;
 				}
-				if (config.hideDestroyBoltpouch() && entry.getTarget().contains("Bolt pouch"))
+				if (this.hideDestroyBoltpouch && entry.getTarget().contains("Bolt pouch"))
 				{
 					continue;
 				}
-				if (config.hideDestroyGembag() && entry.getTarget().contains("Gem bag"))
+				if (this.hideDestroyGembag && entry.getTarget().contains("Gem bag"))
 				{
 					continue;
 				}
@@ -401,8 +556,8 @@ public class MenuEntrySwapperPlugin extends Plugin
 
 			if (option.contains("drop"))
 			{
-				if (config.hideDropRunecraftingPouch() && (
-						entry.getTarget().contains("Small pouch")
+				if (this.hideDropRunecraftingPouch && (
+					entry.getTarget().contains("Small pouch")
 								|| entry.getTarget().contains("Medium pouch")
 								|| entry.getTarget().contains("Large pouch")
 								|| entry.getTarget().contains("Giant pouch")))
@@ -551,9 +706,9 @@ public class MenuEntrySwapperPlugin extends Plugin
 
 		if (option.contains("withdraw") || option.contains("deposit"))
 		{
-			if (config.getWithdrawOne())
+			if (this.getWithdrawOne)
 			{
-				for (String item : Text.fromCSV(config.getWithdrawOneItems()))
+				for (String item : Text.fromCSV(this.getWithdrawOneItems))
 				{
 					if (target.equals(Text.standardize(item)))
 					{
@@ -563,9 +718,9 @@ public class MenuEntrySwapperPlugin extends Plugin
 				}
 			}
 
-			if (config.getWithdrawFive())
+			if (this.getWithdrawFive)
 			{
-				for (String item : Text.fromCSV(config.getWithdrawFiveItems()))
+				for (String item : Text.fromCSV(this.getWithdrawFiveItems))
 				{
 					if (target.equals(Text.standardize(item)))
 					{
@@ -575,9 +730,9 @@ public class MenuEntrySwapperPlugin extends Plugin
 				}
 			}
 
-			if (config.getWithdrawTen())
+			if (this.getWithdrawTen)
 			{
-				for (String item : Text.fromCSV(config.getWithdrawTenItems()))
+				for (String item : Text.fromCSV(this.getWithdrawTenItems))
 				{
 					if (target.equals(Text.standardize(item)))
 					{
@@ -587,21 +742,21 @@ public class MenuEntrySwapperPlugin extends Plugin
 				}
 			}
 
-			if (config.getWithdrawX())
+			if (this.getWithdrawX)
 			{
-				for (String item : Text.fromCSV(config.getWithdrawXItems()))
+				for (String item : Text.fromCSV(this.getWithdrawXItems))
 				{
 					if (target.equals(Text.standardize(item)))
 					{
-						swap(client, "Withdraw-" + config.getWithdrawXAmount(), option, target);
-						swap(client, "Deposit-" + config.getWithdrawXAmount(), option, target);
+						swap(client, "Withdraw-" + this.getWithdrawXAmount, option, target);
+						swap(client, "Deposit-" + this.getWithdrawXAmount, option, target);
 					}
 				}
 			}
 
-			if (config.getWithdrawAll())
+			if (this.getWithdrawAll)
 			{
-				for (String item : Text.fromCSV(config.getWithdrawAllItems()))
+				for (String item : Text.fromCSV(this.getWithdrawAllItems))
 				{
 					if (target.equals(Text.standardize(item)))
 					{
@@ -613,13 +768,11 @@ public class MenuEntrySwapperPlugin extends Plugin
 		}
 
 		if ((option.contains("buy") || option.contains("value")) && Arrays.stream(entries).anyMatch(menuEntry ->
+			menuEntry.getOption().toLowerCase().contains("buy")))
 		{
-			return menuEntry.getOption().toLowerCase().contains("buy");
-		}))
-		{
-			if (config.getSwapBuyOne() && !config.getBuyOneItems().equals(""))
+			if (this.getSwapBuyOne && !this.getBuyOneItems.equals(""))
 			{
-				for (String item : Text.fromCSV(config.getBuyOneItems()))
+				for (String item : Text.fromCSV(this.getBuyOneItems))
 				{
 					if (target.equals(Text.standardize(item)))
 					{
@@ -628,9 +781,9 @@ public class MenuEntrySwapperPlugin extends Plugin
 				}
 			}
 
-			if (config.getSwapBuyFive() && !config.getBuyFiveItems().equals(""))
+			if (this.getSwapBuyFive && !this.getBuyFiveItems.equals(""))
 			{
-				for (String item : Text.fromCSV(config.getBuyFiveItems()))
+				for (String item : Text.fromCSV(this.getBuyFiveItems))
 				{
 					if (target.equals(Text.standardize(item)))
 					{
@@ -639,9 +792,9 @@ public class MenuEntrySwapperPlugin extends Plugin
 				}
 			}
 
-			if (config.getSwapBuyTen() && !config.getBuyTenItems().equals(""))
+			if (this.getSwapBuyTen && !this.getBuyTenItems.equals(""))
 			{
-				for (String item : Text.fromCSV(config.getBuyTenItems()))
+				for (String item : Text.fromCSV(this.getBuyTenItems))
 				{
 					if (target.equals(Text.standardize(item)))
 					{
@@ -650,9 +803,9 @@ public class MenuEntrySwapperPlugin extends Plugin
 				}
 			}
 
-			if (config.getSwapBuyFifty() && !config.getBuyFiftyItems().equals(""))
+			if (this.getSwapBuyFifty && !this.getBuyFiftyItems.equals(""))
 			{
-				for (String item : Text.fromCSV(config.getBuyFiftyItems()))
+				for (String item : Text.fromCSV(this.getBuyFiftyItems))
 				{
 					if (target.equals(Text.standardize(item)))
 					{
@@ -662,13 +815,11 @@ public class MenuEntrySwapperPlugin extends Plugin
 			}
 		}
 		else if ((option.contains("sell") || option.contains("value")) && Arrays.stream(entries).anyMatch(menuEntry ->
+			menuEntry.getOption().toLowerCase().contains("sell")))
 		{
-			return menuEntry.getOption().toLowerCase().contains("sell");
-		}))
-		{
-			if (config.getSwapSellOne() && !config.getSellOneItems().equals(""))
+			if (this.getSwapSellOne && !this.getSellOneItems.equals(""))
 			{
-				for (String item : Text.fromCSV(config.getSellOneItems()))
+				for (String item : Text.fromCSV(this.getSellOneItems))
 				{
 					if (target.equals(Text.standardize(item)))
 					{
@@ -677,9 +828,9 @@ public class MenuEntrySwapperPlugin extends Plugin
 				}
 			}
 
-			if (config.getSwapSellFive() && !Strings.isNullOrEmpty(config.getSellFiveItems()))
+			if (this.getSwapSellFive && !Strings.isNullOrEmpty(this.getSellFiveItems))
 			{
-				for (String item : Text.fromCSV(config.getSellFiveItems()))
+				for (String item : Text.fromCSV(this.getSellFiveItems))
 				{
 					if (target.equals(Text.standardize(item)))
 					{
@@ -688,9 +839,9 @@ public class MenuEntrySwapperPlugin extends Plugin
 				}
 			}
 
-			if (config.getSwapSellTen() && !Strings.isNullOrEmpty(config.getSellTenItems()))
+			if (this.getSwapSellTen && !Strings.isNullOrEmpty(this.getSellTenItems))
 			{
-				for (String item : Text.fromCSV(config.getSellTenItems()))
+				for (String item : Text.fromCSV(this.getSellTenItems))
 				{
 					if (target.equals(Text.standardize(item)))
 					{
@@ -699,9 +850,9 @@ public class MenuEntrySwapperPlugin extends Plugin
 				}
 			}
 
-			if (config.getSwapSellFifty() && !Strings.isNullOrEmpty(config.getSellFiftyItems()))
+			if (this.getSwapSellFifty && !Strings.isNullOrEmpty(this.getSellFiftyItems))
 			{
-				for (String item : Text.fromCSV(config.getSellFiftyItems()))
+				for (String item : Text.fromCSV(this.getSellFiftyItems))
 				{
 					if (target.equals(Text.standardize(item)))
 					{
@@ -711,9 +862,9 @@ public class MenuEntrySwapperPlugin extends Plugin
 			}
 		}
 
-		if (config.getRemoveObjects() && !config.getRemovedObjects().equals(""))
+		if (this.getRemoveObjects && !this.getRemovedObjects.equals(""))
 		{
-			for (String removed : Text.fromCSV(config.getRemovedObjects()))
+			for (String removed : Text.fromCSV(this.getRemovedObjects))
 			{
 				removed = Text.standardize(removed);
 				if (target.contains("(") && target.split(" \\(")[0].equals(removed))
@@ -737,7 +888,7 @@ public class MenuEntrySwapperPlugin extends Plugin
 			}
 		}
 
-		if (config.getSwapPuro() && isPuroPuro())
+		if (this.getSwapPuro && isPuroPuro())
 		{
 			if (event.getType() == WALK.getId())
 			{
@@ -756,7 +907,7 @@ public class MenuEntrySwapperPlugin extends Plugin
 			}
 		}
 
-		else if (config.getSwapSmithing() && option.contains("smith"))
+		else if (this.getSwapSmithing && option.contains("smith"))
 		{
 			if (option.equalsIgnoreCase("Smith 1"))
 			{
@@ -768,17 +919,17 @@ public class MenuEntrySwapperPlugin extends Plugin
 			}
 		}
 
-		else if (config.getSwapTanning() && option.equalsIgnoreCase("Tan 1"))
+		else if (this.getSwapTanning && option.equalsIgnoreCase("Tan 1"))
 		{
 			swap(client, "Tan All", option, target);
 		}
 
-		else if (config.getSwapSawmill() && target.equalsIgnoreCase("Sawmill operator"))
+		else if (this.getSwapSawmill && target.equalsIgnoreCase("Sawmill operator"))
 		{
 			swap(client, "Buy-plank", option, target);
 		}
 
-		else if (config.getSwapSawmillPlanks() && option.equalsIgnoreCase("Buy 1"))
+		else if (this.getSwapSawmillPlanks && option.equalsIgnoreCase("Buy 1"))
 		{
 			swap(client, "Buy All", option, target);
 		}
@@ -788,28 +939,28 @@ public class MenuEntrySwapperPlugin extends Plugin
 			swap(client, "Clear", option, target);
 		}
 
-		else if (target.contains("ardougne cloak") && config.getSwapArdougneCape())
+		else if (target.contains("ardougne cloak") && this.getSwapArdougneCape)
 		{
 			swap(client, "Kandarin Monastery", option, target);
 			swap(client, "Monastery Teleport", option, target);
 		}
 
-		else if (target.contains("crafting cape") && config.getSwapCraftingCape())
+		else if (target.contains("crafting cape") && this.getSwapCraftingCape)
 		{
 			swap(client, "Teleport", option, target);
 		}
 
-		else if (target.contains("construct. cape") && config.getSwapConstructionCape())
+		else if (target.contains("construct. cape") && this.getSwapConstructionCape)
 		{
 			swap(client, "Tele to poh", option, target);
 		}
 
-		else if (target.contains("magic cape") && config.getSwapMagicCape())
+		else if (target.contains("magic cape") && this.getSwapMagicCape)
 		{
 			swap(client, "Spellbook", option, target);
 		}
 
-		else if (target.contains("explorer's ring") && config.getSwapExplorersRing())
+		else if (target.contains("explorer's ring") && this.getSwapExplorersRing)
 		{
 			swap(client, "Teleport", option, target);
 		}
@@ -821,7 +972,7 @@ public class MenuEntrySwapperPlugin extends Plugin
 			return;
 		}
 
-		if (config.swapImps() && target.contains("impling"))
+		if (this.swapImps && target.contains("impling"))
 		{
 
 			if (client.getItemContainer(InventoryID.BANK) != null)
@@ -851,107 +1002,92 @@ public class MenuEntrySwapperPlugin extends Plugin
 					}
 				}
 			}
-			if (target.equals("eclectic impling jar"))
+			switch (target)
 			{
-				if (client.getItemContainer(InventoryID.INVENTORY) != null)
-				{
-					for (Item i : Objects.requireNonNull(client.getItemContainer(InventoryID.INVENTORY)).getItems())
+				case "eclectic impling jar":
+					if (client.getItemContainer(InventoryID.INVENTORY) != null)
 					{
-						invItemNames.add(client.getItemDefinition((i.getId())).getName());
+						for (Item i : Objects.requireNonNull(client.getItemContainer(InventoryID.INVENTORY)).getItems())
+						{
+							invItemNames.add(client.getItemDefinition((i.getId())).getName());
+						}
+						if ((invItemNames.contains("Clue scroll (medium)") || bankItemNames.contains("Clue scroll (medium)")))
+						{
+							menuManager.addSwap("loot", target, "use");
+						}
+						else
+						{
+							menuManager.removeSwaps(target);
+						}
 					}
-					if ((invItemNames.contains("Clue scroll (medium)") || bankItemNames.contains("Clue scroll (medium)")))
+					break;
+				case "magpie impling jar":
+				case "nature impling jar":
+				case "ninja impling jar":
+					if (client.getItemContainer(InventoryID.INVENTORY) != null)
 					{
-						menuManager.addSwap("loot", target, "use");
+						for (Item i : Objects.requireNonNull(client.getItemContainer(InventoryID.INVENTORY)).getItems())
+						{
+							invItemNames.add(client.getItemDefinition((i.getId())).getName());
+						}
+						if ((invItemNames.contains("Clue scroll (hard)") || bankItemNames.contains("Clue scroll (hard)")))
+						{
+							menuManager.addSwap("loot", target, "use");
+						}
+						else
+						{
+							menuManager.removeSwaps(target);
+						}
 					}
-					else
+					break;
+				case "dragon impling jar":
+					if (client.getItemContainer(InventoryID.INVENTORY) != null)
 					{
-						menuManager.removeSwaps(target);
+						for (Item i : Objects.requireNonNull(client.getItemContainer(InventoryID.INVENTORY)).getItems())
+						{
+							invItemNames.add(client.getItemDefinition((i.getId())).getName());
+						}
+						if ((invItemNames.contains("Clue scroll (elite)") || bankItemNames.contains("Clue scroll (elite)")))
+						{
+							menuManager.addSwap("loot", target, "use");
+						}
+						else
+						{
+							menuManager.removeSwaps(target);
+						}
 					}
-				}
-			}
-			else if (target.equals("magpie impling jar") || (target.equals("nature impling jar")) || (target.equals("ninja impling jar")))
-			{
-				if (client.getItemContainer(InventoryID.INVENTORY) != null)
-				{
-					for (Item i : Objects.requireNonNull(client.getItemContainer(InventoryID.INVENTORY)).getItems())
-					{
-						invItemNames.add(client.getItemDefinition((i.getId())).getName());
-					}
-					if ((invItemNames.contains("Clue scroll (hard)") || bankItemNames.contains("Clue scroll (hard)")))
-					{
-						menuManager.addSwap("loot", target, "use");
-					}
-					else
-					{
-						menuManager.removeSwaps(target);
-					}
-				}
-			}
-			else if (target.equals("dragon impling jar"))
-			{
-				if (client.getItemContainer(InventoryID.INVENTORY) != null)
-				{
-					for (Item i : Objects.requireNonNull(client.getItemContainer(InventoryID.INVENTORY)).getItems())
-					{
-						invItemNames.add(client.getItemDefinition((i.getId())).getName());
-					}
-					if ((invItemNames.contains("Clue scroll (elite)") || bankItemNames.contains("Clue scroll (elite)")))
-					{
-						menuManager.addSwap("loot", target, "use");
-					}
-					else
-					{
-						menuManager.removeSwaps(target);
-					}
-				}
+					break;
 			}
 		}
-
-		//If the option is already to walk there, or cancel we don't need to swap it with anything
-		if (!pOptionToReplace.equals(CANCEL) && !pOptionToReplace.equals(WALK_HERE))
+		
+		if (option.equals("talk-to") || option.equals("attack"))
 		{
-			Player[] players = client.getCachedPlayers();
-			int identifier = event.getIdentifier();
-
-			if (identifier >= 0 && identifier < players.length)
-			{
-				Player player = players[identifier];
-				if (player != null)
-				{
-					if (((config.getRemoveFreezePlayerCoX() &&  client.getVar(Varbits.IN_RAID) == 1)
-						|| (config.getRemoveFreezePlayerToB() &&  client.getVar(Varbits.THEATRE_OF_BLOOD) == 2))
-						&&  (player.isFriend() || player.isClanMember())
-						&& CAST_OPTIONS_KEYWORDS.contains(pOptionToReplace))
-					{
-						addswap(pOptionToReplace);
-					}
-				}
-			}
-		}
-
-		if (option.equals("talk-to"))
-		{
-			if (config.swapPickpocket())
+			if (this.swapPickpocket)
 			{
 				swap(client, "pickpocket", option, target, true);
 			}
 
-			if (config.swapHardWoodGrove() && target.contains("rionasta"))
+		}
+
+		if (option.equals("talk-to"))
+		{
+
+			if (this.swapHardWoodGrove && target.contains("rionasta"))
 			{
 				swap(client, "send-parcel", option, target, true);
 			}
-			if (config.swapBankExchange())
+			if (this.swapBankExchange)
 			{
 				swap(client, "bank", option, target, true);
 				swap(client, "exchange", option, target, true);
 			}
 
-			if (config.swapContract())
+			if (this.swapContract)
 			{
 				swap(client, "contract", option, target, true);
 			}
 
-			if (config.swapInteract())
+			if (this.swapInteract)
 			{
 				swap(client, "repairs", option, target, true);
 				swap(client, "claim-slime", option, target, true);
@@ -962,24 +1098,24 @@ public class MenuEntrySwapperPlugin extends Plugin
 			}
 
 			// make sure assignment swap is higher priority than trade swap for slayer masters
-			if (config.swapAssignment())
+			if (this.swapAssignment)
 			{
 				swap(client, "assignment", option, target, true);
 			}
 
-			if (config.swapPlank())
+			if (this.swapPlank)
 			{
 				swap(client, "buy-plank", option, target, true);
 			}
 
-			if (config.swapTrade() && (!(target.equals("trader crewmember") || target.equals("trader stan")) || config.charterOption().equals(CharterOption.TRADE)))
+			if (this.swapTrade && (!(target.equals("trader crewmember") || target.equals("trader stan")) || this.charterOption.equals(CharterOption.TRADE)))
 			{
 				swap(client, "trade", option, target, true);
 				swap(client, "trade-with", option, target, true);
 				swap(client, "shop", option, target, true);
 			}
 
-			if (config.swapMinigame())
+			if (this.swapMinigame)
 			{
 				swap(client, "story", option, target, true);
 				swap(client, "escort", option, target, true);
@@ -987,7 +1123,7 @@ public class MenuEntrySwapperPlugin extends Plugin
 				swap(client, "start-minigame", option, target, true);
 			}
 
-			if (config.swapTravel())
+			if (this.swapTravel)
 			{
 				swap(client, "travel", option, target, true);
 				swap(client, "pay-fare", option, target, true);
@@ -1000,83 +1136,83 @@ public class MenuEntrySwapperPlugin extends Plugin
 				swap(client, "follow", option, target, true);
 				swap(client, "transport", option, target, true);
 
-				if (config.swapAbyssTeleport() && target.contains("mage of zamorak"))
+				if (this.swapAbyssTeleport && target.contains("mage of zamorak"))
 				{
 					swap(client, "teleport", option, target, true);
 				}
 
-				if (!(target.equals("trader crewmember") || target.equals("trader stan")) || config.charterOption().equals(CharterOption.CHARTER))
+				if (!(target.equals("trader crewmember") || target.equals("trader stan")) || this.charterOption.equals(CharterOption.CHARTER))
 				{
 					swap(client, "charter", option, target, true);
 				}
 			}
 
-			if (config.swapPay())
+			if (this.swapPay)
 			{
 				swap(client, "pay", option, target, true);
 				swap(client, "pay (", option, target, false);
 			}
 
-			if (config.swapQuick())
+			if (this.swapQuick)
 			{
 				swap(client, "quick-travel", option, target, true);
 			}
 
-			if (config.swapEnchant())
+			if (this.swapEnchant)
 			{
 				swap(client, "enchant", option, target, true);
 			}
 
 		}
 
-		else if (config.swapWildernessLever() && target.equals("lever") && option.equals("ardougne"))
+		else if (this.swapWildernessLever && target.equals("lever") && option.equals("ardougne"))
 		{
 			swap(client, "edgeville", option, target, true);
 		}
 
-		else if (config.swapMetamorphosis() && target.contains("baby chinchompa"))
+		else if (this.swapMetamorphosis && target.contains("baby chinchompa"))
 		{
 			swap(client, "metamorphosis", option, target, true);
 		}
 
-		else if (config.swapStun() && target.contains("hoop snake"))
+		else if (this.swapStun && target.contains("hoop snake"))
 		{
 			swap(client, "stun", option, target, true);
 		}
 
-		else if (config.swapTravel() && option.equals("pass") && target.equals("energy barrier"))
+		else if (this.swapTravel && option.equals("pass") && target.equals("energy barrier"))
 		{
 			swap(client, "pay-toll(2-ecto)", option, target, true);
 		}
 
-		else if (config.swapTravel() && option.equals("open") && target.equals("gate"))
+		else if (this.swapTravel && option.equals("open") && target.equals("gate"))
 		{
 			swap(client, "pay-toll(10gp)", option, target, true);
 		}
 		
-		else if (config.swapHardWoodGrove() && option.equals("open") && target.equals("hardwood grove doors"))
+		else if (this.swapHardWoodGrove && option.equals("open") && target.equals("hardwood grove doors"))
 		{
 			swap(client, "quick-pay(100)", option, target, true);
 		}
 		
-		else if (config.swapTravel() && option.equals("inspect") && target.equals("trapdoor"))
+		else if (this.swapTravel && option.equals("inspect") && target.equals("trapdoor"))
 		{
 			swap(client, "travel", option, target, true);
 		}
 
-		else if (config.swapHarpoon() && option.equals("cage"))
+		else if (this.swapHarpoon && option.equals("cage"))
 		{
 			swap(client, "harpoon", option, target, true);
 		}
 
-		else if (config.swapHarpoon() && (option.equals("big net") || option.equals("net")))
+		else if (this.swapHarpoon && (option.equals("big net") || option.equals("net")))
 		{
 			swap(client, "harpoon", option, target, true);
 		}
 
-		else if (config.swapOccultMode() != OccultAltarMode.VENERATE && option.equals("venerate"))
+		else if (this.swapOccultMode != OccultAltarMode.VENERATE && option.equals("venerate"))
 		{
-			switch (config.swapOccultMode())
+			switch (this.swapOccultMode)
 			{
 				case VENERATE:
 					swap(client, "Venerate", option, target, true);
@@ -1093,9 +1229,9 @@ public class MenuEntrySwapperPlugin extends Plugin
 
 		}
 
-		else if (config.swapObeliskMode() != ObeliskMode.ACTIVATE && option.equals("activate"))
+		else if (this.swapObeliskMode != ObeliskMode.ACTIVATE && option.equals("activate"))
 		{
-			switch (config.swapObeliskMode())
+			switch (this.swapObeliskMode)
 			{
 				case ACTIVATE:
 					swap(client, "activate", option, target, true);
@@ -1109,9 +1245,9 @@ public class MenuEntrySwapperPlugin extends Plugin
 			}
 		}
 
-		else if (config.swapHomePortalMode() != HouseMode.ENTER && option.equals("enter"))
+		else if (this.swapHomePortalMode != HouseMode.ENTER && option.equals("enter"))
 		{
-			switch (config.swapHomePortalMode())
+			switch (this.swapHomePortalMode)
 			{
 				case HOME:
 					swap(client, "home", option, target, true);
@@ -1124,101 +1260,101 @@ public class MenuEntrySwapperPlugin extends Plugin
 					break;
 			}
 		}
-		else if (config.swapFairyRingMode() != FairyRingMode.OFF && config.swapFairyRingMode() != FairyRingMode.ZANARIS
+		else if (this.swapFairyRingMode != FairyRingMode.OFF && this.swapFairyRingMode != FairyRingMode.ZANARIS
 			&& (option.equals("zanaris") || option.equals("configure") || option.equals("tree")))
 		{
-			if (config.swapFairyRingMode() == FairyRingMode.LAST_DESTINATION)
+			if (this.swapFairyRingMode == FairyRingMode.LAST_DESTINATION)
 			{
 				swap(client, "last-destination", option, target, false);
 			}
-			else if (config.swapFairyRingMode() == FairyRingMode.CONFIGURE)
+			else if (this.swapFairyRingMode == FairyRingMode.CONFIGURE)
 			{
 				swap(client, "configure", option, target, false);
 			}
 		}
 
-		else if (config.swapFairyRingMode() == FairyRingMode.ZANARIS && option.equals("tree"))
+		else if (this.swapFairyRingMode == FairyRingMode.ZANARIS && option.equals("tree"))
 		{
 			swap(client, "zanaris", option, target, false);
 		}
 
-		else if (config.swapBoxTrap() && (option.equals("check") || option.equals("dismantle")))
+		else if (this.swapBoxTrap && (option.equals("check") || option.equals("dismantle")))
 		{
 			swap(client, "reset", option, target, true);
 		}
 
-		else if (config.swapBoxTrap() && option.equals("take"))
+		else if (this.swapBoxTrap && option.equals("take"))
 		{
 			swap(client, "lay", option, target, true);
 			swap(client, "activate", option, target, true);
 		}
 
-		else if (config.swapChase() && option.equals("pick-up"))
+		else if (this.swapChase && option.equals("pick-up"))
 		{
 			swap(client, "chase", option, target, true);
 		}
 
-		else if (config.swapBirdhouseEmpty() && option.equals("interact") && target.contains("birdhouse"))
+		else if (this.swapBirdhouseEmpty && option.equals("interact") && target.contains("birdhouse"))
 		{
 			swap(client, "empty", option, target, true);
 		}
 
-		else if (config.swapQuick() && option.equals("ring"))
+		else if (this.swapQuick && option.equals("ring"))
 		{
 			swap(client, "quick-start", option, target, true);
 		}
 
-		else if (config.swapQuick() && option.equals("pass"))
+		else if (this.swapQuick && option.equals("pass"))
 		{
 			swap(client, "quick-pass", option, target, true);
 		}
 
-		else if (config.swapQuick() && option.equals("open"))
+		else if (this.swapQuick && option.equals("open"))
 		{
 			swap(client, "quick-open", option, target, true);
 		}
-		else if (config.swapQuick() && option.equals("enter"))
+		else if (this.swapQuick && option.equals("enter"))
 		{
 			swap(client, "quick-enter", option, target, true);
 		}
-		else if (config.swapQuick() && option.equals("leave tomb"))
+		else if (this.swapQuick && option.equals("leave tomb"))
 		{
 			swap(client, "quick-leave", option, target, true);
 		}
-		else if (config.swapAdmire() && option.equals("admire"))
+		else if (this.swapAdmire && option.equals("admire"))
 		{
 			swap(client, "teleport", option, target, true);
 			swap(client, "spellbook", option, target, true);
 			swap(client, "perks", option, target, true);
 		}
 
-		else if (config.swapPrivate() && option.equals("shared"))
+		else if (this.swapPrivate && option.equals("shared"))
 		{
 			swap(client, "private", option, target, true);
 		}
 
-		else if (config.swapPick() && option.equals("pick"))
+		else if (this.swapPick && option.equals("pick"))
 		{
 			swap(client, "pick-lots", option, target, true);
 		}
 
-		else if (config.swapSearch() && (option.equals("close") || option.equals("shut")))
+		else if (this.swapSearch && (option.equals("close") || option.equals("shut")))
 		{
 			swap(client, "search", option, target, true);
 		}
 
-		else if (config.swapRogueschests() && target.contains("chest"))
+		else if (this.swapRogueschests && target.contains("chest"))
 		{
 			swap(client, "search for traps", option, target, true);
 		}
 
-		else if (config.rockCake() && option.equals("eat"))
+		else if (this.rockCake && option.equals("eat"))
 		{
 			swap(client, "guzzle", option, target, true);
 		}
 
 
-		else if (config.shiftClickCustomization() && shiftModifier && !option.equals("use"))
+		else if (this.shiftClickCustomization && shiftModifier && !option.equals("use"))
 		{
 			Integer customOption = getSwapConfig(eventId);
 
@@ -1229,20 +1365,20 @@ public class MenuEntrySwapperPlugin extends Plugin
 		}
 
 		// Put all item-related swapping after shift-click
-		else if (config.swapTeleportItem() && (option.equals("wear") || option.equals("wield")))
+		else if (this.swapTeleportItem && (option.equals("wear") || option.equals("wield")))
 		{
 			swap(client, "rub", option, target, true);
 			swap(client, "teleport", option, target, true);
 		}
-		else if (config.swapCoalBag() && option.contains("deposit") && target.equals("coal bag"))
+		else if (this.swapCoalBag && option.contains("deposit") && target.equals("coal bag"))
 		{
 			swap(client, "empty", option, target, true);
 		}
-		else if (config.swapBones() && option.equals("bury"))
+		else if (this.swapBones && option.equals("bury"))
 		{
 			swap(client, "use", option, target, true);
 		}
-		else if (config.swapNexus() && target.contains("portal nexus"))
+		else if (this.swapNexus && target.contains("portal nexus"))
 		{
 			swap(client, "teleport menu", option, target, true);
 		}
@@ -1308,7 +1444,7 @@ public class MenuEntrySwapperPlugin extends Plugin
 			{
 				if (!str.startsWith("//"))
 				{
-					sb.append(str + "\n");
+					sb.append(str).append("\n");
 				}
 			}
 
@@ -1370,76 +1506,76 @@ public class MenuEntrySwapperPlugin extends Plugin
 
 	private void addSwaps()
 	{
-		if (config.getBurningAmulet())
+		if (this.getBurningAmulet)
 		{
-			menuManager.addSwap("remove", "burning amulet", config.getBurningAmuletMode().toString());
+			menuManager.addSwap("remove", "burning amulet", this.getBurningAmuletMode.toString());
 		}
 
-		if (config.teleEquippedCape())
+		if (this.teleEquippedCape)
 		{
-			menuManager.addSwap("remove", "tele to poh", config.telecapeMode().toString());
-			menuManager.addSwap("remove", "teleport", config.telecapeMode().toString());
+			menuManager.addSwap("remove", "tele to poh", this.telecapeMode.toString());
+			menuManager.addSwap("remove", "teleport", this.telecapeMode.toString());
 		}
 
-		if (config.getCombatBracelet())
+		if (this.getCombatBracelet)
 		{
-			menuManager.addSwap("remove", "combat bracelet", config.getCombatBraceletMode().toString());
+			menuManager.addSwap("remove", "combat bracelet", this.getCombatBraceletMode.toString());
 		}
 
-		if (config.getGamesNecklace())
+		if (this.getGamesNecklace)
 		{
-			menuManager.addSwap("remove", "games necklace", config.getGamesNecklaceMode().toString());
+			menuManager.addSwap("remove", "games necklace", this.getGamesNecklaceMode.toString());
 		}
 
-		if (config.getDuelingRing())
+		if (this.getDuelingRing)
 		{
-			menuManager.addSwap("remove", "ring of dueling", config.getDuelingRingMode().toString());
+			menuManager.addSwap("remove", "ring of dueling", this.getDuelingRingMode.toString());
 		}
 
-		if (config.getGlory())
+		if (this.getGlory)
 		{
-			menuManager.addSwap("remove", "amulet of glory", config.getGloryMode().toString());
-			menuManager.addSwap("remove", "amulet of eternal glory", config.getGloryMode().toString());
+			menuManager.addSwap("remove", "amulet of glory", this.getGloryMode.toString());
+			menuManager.addSwap("remove", "amulet of eternal glory", this.getGloryMode.toString());
 		}
 
-		if (config.getSkillsNecklace())
+		if (this.getSkillsNecklace)
 		{
-			menuManager.addSwap("remove", "skills necklace", config.getSkillsNecklaceMode().toString());
+			menuManager.addSwap("remove", "skills necklace", this.getSkillsNecklaceMode.toString());
 		}
 
-		if (config.getNecklaceofPassage())
+		if (this.getNecklaceofPassage)
 		{
-			menuManager.addSwap("remove", "necklace of passage", config.getNecklaceofPassageMode().toString());
+			menuManager.addSwap("remove", "necklace of passage", this.getNecklaceofPassageMode.toString());
 		}
 
-		if (config.getDigsitePendant())
+		if (this.getDigsitePendant)
 		{
-			menuManager.addSwap("remove", "digsite pendant", config.getDigsitePendantMode().toString());
+			menuManager.addSwap("remove", "digsite pendant", this.getDigsitePendantMode.toString());
 		}
 
-		if (config.getSlayerRing())
+		if (this.getSlayerRing)
 		{
-			menuManager.addSwap("remove", "slayer ring", config.getSlayerRingMode().toString());
-			menuManager.addSwap("remove", "slayer ring (eternal)", config.getSlayerRingMode().toString());
+			menuManager.addSwap("remove", "slayer ring", this.getSlayerRingMode.toString());
+			menuManager.addSwap("remove", "slayer ring (eternal)", this.getSlayerRingMode.toString());
 		}
 
-		if (config.getXericsTalisman())
+		if (this.getXericsTalisman)
 		{
-			menuManager.addSwap("remove", "xeric's talisman", config.getXericsTalismanMode().toString());
+			menuManager.addSwap("remove", "xeric's talisman", this.getXericsTalismanMode.toString());
 		}
 
-		if (config.getRingofWealth())
+		if (this.getRingofWealth)
 		{
-			menuManager.addSwap("remove", "ring of wealth", config.getRingofWealthMode().toString());
+			menuManager.addSwap("remove", "ring of wealth", this.getRingofWealthMode.toString());
 		}
 
-		if (config.swapMax())
+		if (this.swapMax)
 		{
-			menuManager.addSwap("remove", "max cape", config.maxMode().toString());
+			menuManager.addSwap("remove", "max cape", this.maxMode.toString());
 		}
-		if (config.swapQuestCape())
+		if (this.swapQuestCape)
 		{
-			menuManager.addSwap("remove", "quest point cape", config.questCapeMode().toString());
+			menuManager.addSwap("remove", "quest point cape", this.questCapeMode.toString());
 		}
 	}
 
@@ -1509,7 +1645,7 @@ public class MenuEntrySwapperPlugin extends Plugin
 			leftClickConstructionItems.clear();
 		}
 
-		if (config.getEasyConstruction() &&
+		if (this.getEasyConstruction &&
 			!Strings.isNullOrEmpty(from) &&
 			buildingMode)
 		{
@@ -1530,7 +1666,7 @@ public class MenuEntrySwapperPlugin extends Plugin
 
 	void startShift()
 	{
-		if (!config.swapClimbUpDown())
+		if (!this.swapClimbUpDown)
 		{
 			return;
 		}
@@ -1545,7 +1681,7 @@ public class MenuEntrySwapperPlugin extends Plugin
 
 	void startControl()
 	{
-		if (!config.swapClimbUpDown())
+		if (!this.swapClimbUpDown)
 		{
 			return;
 		}
@@ -1558,46 +1694,130 @@ public class MenuEntrySwapperPlugin extends Plugin
 		menuManager.removePriorityEntry("climb-down");
 	}
 
-/**
- * Swaps menu entries if the entries could be found. This places Walk Here where the top level menu option was.
- * @param pOptionToReplace The String containing the Menu Option that needs to be replaced. IE: "Attack", "Chop Down".
- */
-	private void addswap(String pOptionToReplace)
+	private void updateConfig()
 	{
-		MenuEntry[] entries = client.getMenuEntries();
-		Integer walkHereEntry = searchIndex(entries, WALK_HERE);
-		Integer entryToReplace = searchIndex(entries, pOptionToReplace);
-
-		if (walkHereEntry != null
-				&& entryToReplace != null)
-			{
-			MenuEntry walkHereMenuEntry = entries[walkHereEntry];
-			entries[walkHereEntry] = entries[entryToReplace];
-			entries[entryToReplace] = walkHereMenuEntry;
-			client.setMenuEntries(entries);
-			}
-	}
-
-/**
- * Finds the index of the menu that contains the verbiage we are looking for.
- * @param pMenuEntries The list of {@link MenuEntry}s.
- * @param pMenuEntryToSearchFor The Option in the menu to search for.
- * @return The index location or null if it was not found.
- */
-	private Integer searchIndex(MenuEntry[] pMenuEntries, String pMenuEntryToSearchFor)
-	{
-		Integer indexLocation = 0;
-
-		for (MenuEntry menuEntry : pMenuEntries)
-			{
-			String entryOption = Text.removeTags(menuEntry.getOption()).toUpperCase();
-
-			if (entryOption.equals(pMenuEntryToSearchFor))
-				{
-				return indexLocation;
-				}
-			indexLocation++;
-			}
-		return null;
+		this.getWithdrawOne = config.getWithdrawOne();
+		this.getWithdrawOneItems = config.getWithdrawOneItems();
+		this.getWithdrawFive = config.getWithdrawFive();
+		this.getWithdrawFiveItems = config.getWithdrawFiveItems();
+		this.getWithdrawTen = config.getWithdrawTen();
+		this.getWithdrawTenItems = config.getWithdrawTenItems();
+		this.getWithdrawX = config.getWithdrawX();
+		this.getWithdrawXAmount = config.getWithdrawXAmount();
+		this.getWithdrawXItems = config.getWithdrawXItems();
+		this.getWithdrawAll = config.getWithdrawAll();
+		this.getWithdrawAllItems = config.getWithdrawAllItems();
+		this.swapMax = config.swapMax();
+		this.teleEquippedCape = config.teleEquippedCape();
+		this.telecapeMode = config.telecapeMode();
+		this.maxMode = config.maxMode();
+		this.getSwapArdougneCape = config.getSwapArdougneCape();
+		this.getSwapConstructionCape = config.getSwapConstructionCape();
+		this.getSwapCraftingCape = config.getSwapCraftingCape();
+		this.getSwapMagicCape = config.getSwapMagicCape();
+		this.getSwapExplorersRing = config.getSwapExplorersRing();
+		this.swapAdmire = config.swapAdmire();
+		this.swapQuestCape = config.swapQuestCape();
+		this.questCapeMode = config.questCapeMode();
+		this.configCustomSwaps = config.customSwaps();
+		this.shiftClickCustomization = config.shiftClickCustomization();
+		this.swapCoalBag = config.swapCoalBag();
+		this.swapBirdhouseEmpty = config.swapBirdhouseEmpty();
+		this.swapBones = config.swapBones();
+		this.swapChase = config.swapChase();
+		this.swapHarpoon = config.swapHarpoon();
+		this.swapOccultMode = config.swapOccultMode();
+		this.swapHomePortalMode = config.swapHomePortalMode();
+		this.swapPrivate = config.swapPrivate();
+		this.swapPick = config.swapPick();
+		this.swapQuick = config.swapQuick();
+		this.swapBoxTrap = config.swapBoxTrap();
+		this.rockCake = config.rockCake();
+		this.swapRogueschests = config.swapRogueschests();
+		this.swapClimbUpDown = config.swapClimbUpDown();
+		this.swapStun = config.swapStun();
+		this.swapSearch = config.swapSearch();
+		this.swapHardWoodGrove = config.swapHardWoodGrove();
+		this.getRemoveObjects = config.getRemoveObjects();
+		this.getRemovedObjects = config.getRemovedObjects();
+		this.swapImps = config.swapImps();
+		this.charterOption = config.charterOption();
+		this.getSwapBuyOne = config.getSwapBuyOne();
+		this.getBuyOneItems = config.getBuyOneItems();
+		this.getSwapBuyFive = config.getSwapBuyFive();
+		this.getBuyFiveItems = config.getBuyFiveItems();
+		this.getSwapBuyTen = config.getSwapBuyTen();
+		this.getBuyTenItems = config.getBuyTenItems();
+		this.getSwapBuyFifty = config.getSwapBuyFifty();
+		this.getBuyFiftyItems = config.getBuyFiftyItems();
+		this.getSwapSellOne = config.getSwapSellOne();
+		this.getSellOneItems = config.getSellOneItems();
+		this.getSwapSellFive = config.getSwapSellFive();
+		this.getSellFiveItems = config.getSellFiveItems();
+		this.getSwapSellTen = config.getSwapSellTen();
+		this.getSellTenItems = config.getSellTenItems();
+		this.getSwapSellFifty = config.getSwapSellFifty();
+		this.getSellFiftyItems = config.getSellFiftyItems();
+		this.getEasyConstruction = config.getEasyConstruction();
+		this.getEasyConstructionItems = config.getEasyConstructionItems();
+		this.getSwapSmithing = config.getSwapSmithing();
+		this.getSwapTanning = config.getSwapTanning();
+		this.getSwapSawmill = config.getSwapSawmill();
+		this.getSwapSawmillPlanks = config.getSwapSawmillPlanks();
+		this.getSwapPuro = config.getSwapPuro();
+		this.swapAssignment = config.swapAssignment();
+		this.swapBankExchange = config.swapBankExchange();
+		this.swapContract = config.swapContract();
+		this.swapInteract = config.swapInteract();
+		this.swapPickpocket = config.swapPickpocket();
+		this.swapPay = config.swapPay();
+		this.swapAbyssTeleport = config.swapAbyssTeleport();
+		this.swapTrade = config.swapTrade();
+		this.swapTravel = config.swapTravel();
+		this.swapMinigame = config.swapMinigame();
+		this.swapPlank = config.swapPlank();
+		this.swapMetamorphosis = config.swapMetamorphosis();
+		this.swapEnchant = config.swapEnchant();
+		this.swapFairyRingMode = config.swapFairyRingMode();
+		this.swapObeliskMode = config.swapObeliskMode();
+		this.swapTeleportItem = config.swapTeleportItem();
+		this.swapWildernessLever = config.swapWildernessLever();
+		this.swapNexus = config.swapNexus();
+		this.getGamesNecklace = config.getGamesNecklace();
+		this.getGamesNecklaceMode = config.getGamesNecklaceMode();
+		this.getDuelingRing = config.getDuelingRing();
+		this.getDuelingRingMode = config.getDuelingRingMode();
+		this.getGlory = config.getGlory();
+		this.getGloryMode = config.getGloryMode();
+		this.getSkillsNecklace = config.getSkillsNecklace();
+		this.getSkillsNecklaceMode = config.getSkillsNecklaceMode();
+		this.getNecklaceofPassage = config.getNecklaceofPassage();
+		this.getNecklaceofPassageMode = config.getNecklaceofPassageMode();
+		this.getDigsitePendant = config.getDigsitePendant();
+		this.getDigsitePendantMode = config.getDigsitePendantMode();
+		this.getCombatBracelet = config.getCombatBracelet();
+		this.getCombatBraceletMode = config.getCombatBraceletMode();
+		this.getBurningAmulet = config.getBurningAmulet();
+		this.getBurningAmuletMode = config.getBurningAmuletMode();
+		this.getXericsTalisman = config.getXericsTalisman();
+		this.getXericsTalismanMode = config.getXericsTalismanMode();
+		this.getRingofWealth = config.getRingofWealth();
+		this.getRingofWealthMode = config.getRingofWealthMode();
+		this.getSlayerRing = config.getSlayerRing();
+		this.getSlayerRingMode = config.getSlayerRingMode();
+		this.hideExamine = config.hideExamine();
+		this.hideTradeWith = config.hideTradeWith();
+		this.hideReport = config.hideReport();
+		this.hideLookup = config.hideLookup();
+		this.hideNet = config.hideNet();
+		this.hideBait = config.hideBait();
+		this.hideDestroyRunepouch = config.hideDestroyRunepouch();
+		this.hideDestroyCoalbag = config.hideDestroyCoalbag();
+		this.hideDestroyHerbsack = config.hideDestroyHerbsack();
+		this.hideDestroyBoltpouch = config.hideDestroyBoltpouch();
+		this.hideDestroyGembag = config.hideDestroyGembag();
+		this.hideDropRunecraftingPouch = config.hideDropRunecraftingPouch();
+		this.getRemoveFreezePlayerToB = config.getRemoveFreezePlayerToB();
+		this.getRemoveFreezePlayerCoX = config.getRemoveFreezePlayerCoX();
 	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/Parse.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/Parse.java
index d4e9785f5f..e063efa2a9 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/Parse.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/Parse.java
@@ -38,7 +38,7 @@ public class Parse
 			{
 				if (!str.startsWith("//"))
 				{
-					sb.append(str + "\n");
+					sb.append(str).append("\n");
 				}
 			}
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/ShiftClickInputListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/ShiftClickInputListener.java
index 5df37f45b2..6a44185c4f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/ShiftClickInputListener.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/ShiftClickInputListener.java
@@ -26,9 +26,11 @@ package net.runelite.client.plugins.menuentryswapper;
 
 import java.awt.event.KeyEvent;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.client.input.KeyListener;
 
-public class ShiftClickInputListener implements KeyListener
+@Singleton
+class ShiftClickInputListener implements KeyListener
 {
 	@Inject
 	private MenuEntrySwapperPlugin plugin;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java
index 148d7e4255..b0d9e42f3f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java
@@ -26,13 +26,16 @@
 package net.runelite.client.plugins.metronome;
 
 import com.google.inject.Provides;
+import java.io.IOException;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.sound.sampled.LineUnavailableException;
+import javax.sound.sampled.UnsupportedAudioFileException;
+import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.SoundEffectVolume;
 import javax.sound.sampled.AudioInputStream;
 import javax.sound.sampled.AudioSystem;
 import javax.sound.sampled.Clip;
-import javax.sound.sampled.DataLine;
-import javax.sound.sampled.AudioFormat;
 import javax.sound.sampled.FloatControl;
 import java.io.File;
 import net.runelite.api.Client;
@@ -50,6 +53,8 @@ import net.runelite.client.plugins.PluginDescriptor;
 	tags = {"skilling", "tick", "timers"},
 	enabledByDefault = false
 )
+@Slf4j
+@Singleton
 public class MetronomePlugin extends Plugin
 {
 	@Inject
@@ -63,6 +68,14 @@ public class MetronomePlugin extends Plugin
 	private Clip tickClip;
 	private Clip tockClip;
 
+	private int tickCount;
+	private boolean enableTock;
+	private int tockNumber;
+	private int tickOffset;
+	private String tickPath;
+	private String tockPath;
+	private int volume;
+
 	@Provides
 	MetronomePluginConfiguration provideConfig(ConfigManager configManager)
 	{
@@ -72,41 +85,35 @@ public class MetronomePlugin extends Plugin
 	private Clip GetAudioClip(String path)
 	{
 		File audioFile = new File(path);
-		if (audioFile.exists())
+		if (!audioFile.exists())
 		{
-			AudioInputStream audioStream = null;
-			try
-			{
-				audioStream = AudioSystem.getAudioInputStream(audioFile);
-			}
-			catch (Exception e)
-			{
-				return null;
-			}
-			AudioFormat audioFormat = audioStream.getFormat();
-			DataLine.Info audioInfo = new DataLine.Info(Clip.class, audioFormat);
-			try
-			{
-				Clip audioClip = AudioSystem.getClip();
-				audioClip.open(audioStream);
-				FloatControl gainControl = (FloatControl) audioClip.getControl(FloatControl.Type.MASTER_GAIN);
-				float gainValue = (((float) config.volume()) * 40f / 100f) - 35f;
-				gainControl.setValue(gainValue);
-				return audioClip;
-			}
-			catch (Exception e)
-			{
-				return null;
-			}
+			return null;
+		}
+
+		try (AudioInputStream audioStream = AudioSystem.getAudioInputStream(audioFile))
+		{
+			Clip audioClip = AudioSystem.getClip();
+			audioClip.open(audioStream);
+			FloatControl gainControl = (FloatControl) audioClip.getControl(FloatControl.Type.MASTER_GAIN);
+			float gainValue = (((float) this.volume) * 40f / 100f) - 35f;
+			gainControl.setValue(gainValue);
+
+			return audioClip;
+		}
+		catch (IOException | LineUnavailableException | UnsupportedAudioFileException e)
+		{
+			log.warn("Error opening audiostream from " + audioFile, e);
+			return null;
 		}
-		return null;
 	}
 
 	@Override
 	protected void startUp()
 	{
-		tickClip = GetAudioClip(config.tickPath());
-		tockClip = GetAudioClip(config.tockPath());
+		updateConfig();
+
+		tickClip = GetAudioClip(this.tickPath);
+		tockClip = GetAudioClip(this.tockPath);
 	}
 
 	@Override
@@ -125,11 +132,19 @@ public class MetronomePlugin extends Plugin
 	@Subscribe
 	public void onConfigChanged(ConfigChanged event)
 	{
+		if (!event.getGroup().equals("metronome"))
+		{
+			return;
+		}
+
+		updateConfig();
+
 		if (event.getKey().equals("volume"))
 		{
-			float gainValue = (((float) config.volume()) * 40f / 100f) - 35f;
+			float gainValue = (((float) this.volume) * 40f / 100f) - 35f;
 			FloatControl gainControlTick = (FloatControl) tickClip.getControl(FloatControl.Type.MASTER_GAIN);
 			gainControlTick.setValue(gainValue);
+
 			FloatControl gainControlTock = (FloatControl) tockClip.getControl(FloatControl.Type.MASTER_GAIN);
 			gainControlTock.setValue(gainValue);
 		}
@@ -139,7 +154,7 @@ public class MetronomePlugin extends Plugin
 			{
 				tickClip.close();
 			}
-			tickClip = GetAudioClip(config.tickPath());
+			tickClip = GetAudioClip(this.tickPath);
 		}
 		if (event.getKey().equals("tockSoundFilePath"))
 		{
@@ -147,21 +162,21 @@ public class MetronomePlugin extends Plugin
 			{
 				tockClip.close();
 			}
-			tockClip = GetAudioClip(config.tockPath());
+			tockClip = GetAudioClip(this.tockPath);
 		}
 	}
 
 	@Subscribe
 	public void onGameTick(GameTick tick)
 	{
-		if (config.tickCount() == 0)
+		if (this.tickCount == 0)
 		{
 			return;
 		}
 
-		if ((++tickCounter + config.tickOffset()) % config.tickCount() == 0)
+		if ((++tickCounter + this.tickOffset) % this.tickCount == 0)
 		{
-			if (++tockCounter % config.tockNumber() == 0 & config.enableTock())
+			if (++tockCounter % this.tockNumber == 0 & this.enableTock)
 			{
 				if (tockClip == null)
 				{
@@ -195,4 +210,15 @@ public class MetronomePlugin extends Plugin
 			}
 		}
 	}
+
+	private void updateConfig()
+	{
+		this.tickCount = config.tickCount();
+		this.enableTock = config.enableTock();
+		this.tockNumber = config.tockNumber();
+		this.tickOffset = config.tickOffset();
+		this.tickPath = config.tickPath();
+		this.tockPath = config.tockPath();
+		this.volume = config.volume();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/minimap/MinimapDot.java b/runelite-client/src/main/java/net/runelite/client/plugins/minimap/MinimapDot.java
index 33e15bb3bd..6de0afb579 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/minimap/MinimapDot.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/minimap/MinimapDot.java
@@ -28,7 +28,7 @@ import java.awt.Color;
 import net.runelite.api.Client;
 import net.runelite.api.Sprite;
 
-public class MinimapDot
+class MinimapDot
 {
 	private static final int MAP_DOT_WIDTH = 4;
 	private static final int MAP_DOT_HEIGHT = 5;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/minimap/MinimapPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/minimap/MinimapPlugin.java
index d68e6f56f4..205e67d03e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/minimap/MinimapPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/minimap/MinimapPlugin.java
@@ -28,6 +28,7 @@ import com.google.inject.Provides;
 import java.awt.Color;
 import java.util.Arrays;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.GameState;
 import net.runelite.api.Sprite;
@@ -46,6 +47,7 @@ import net.runelite.client.plugins.PluginDescriptor;
 	description = "Customize the color of minimap dots",
 	tags = {"items", "npcs", "players"}
 )
+@Singleton
 public class MinimapPlugin extends Plugin
 {
 	private static final int NUM_MAPDOTS = 6;
@@ -58,6 +60,14 @@ public class MinimapPlugin extends Plugin
 
 	private Sprite[] originalDotSprites;
 
+	private Color itemColor;
+	private Color npcColor;
+	private Color playerColor;
+	private Color friendColor;
+	private Color teamColor;
+	private Color clanColor;
+	private boolean hideMinimap;
+
 	@Provides
 	private MinimapConfig provideConfig(ConfigManager configManager)
 	{
@@ -67,7 +77,9 @@ public class MinimapPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
-		updateMinimapWidgetVisibility(config.hideMinimap());
+		updateConfig();
+
+		updateMinimapWidgetVisibility(this.hideMinimap);
 		storeOriginalDots();
 		replaceMapDots();
 	}
@@ -97,9 +109,11 @@ public class MinimapPlugin extends Plugin
 			return;
 		}
 
+		updateConfig();
+
 		if (event.getKey().equals("hideMinimap"))
 		{
-			updateMinimapWidgetVisibility(config.hideMinimap());
+			updateMinimapWidgetVisibility(this.hideMinimap);
 			return;
 		}
 
@@ -109,7 +123,7 @@ public class MinimapPlugin extends Plugin
 	@Subscribe
 	public void onWidgetHiddenChanged(WidgetHiddenChanged event)
 	{
-		updateMinimapWidgetVisibility(config.hideMinimap());
+		updateMinimapWidgetVisibility(this.hideMinimap);
 	}
 
 	private void updateMinimapWidgetVisibility(boolean enable)
@@ -155,12 +169,13 @@ public class MinimapPlugin extends Plugin
 	private Color[] getColors()
 	{
 		Color[] colors = new Color[NUM_MAPDOTS];
-		colors[0] = config.itemColor();
-		colors[1] = config.npcColor();
-		colors[2] = config.playerColor();
-		colors[3] = config.friendColor();
-		colors[4] = config.teamColor();
-		colors[5] = config.clanColor();
+		colors[0] = this.itemColor;
+		colors[1] = this.npcColor;
+		colors[2] = this.playerColor;
+		colors[3] = this.friendColor;
+		colors[4] = this.teamColor;
+		colors[5] = this.clanColor;
+
 		return colors;
 	}
 
@@ -187,4 +202,15 @@ public class MinimapPlugin extends Plugin
 
 		System.arraycopy(originalDotSprites, 0, mapDots, 0, mapDots.length);
 	}
+
+	private void updateConfig()
+	{
+		this.itemColor = config.itemColor();
+		this.npcColor = config.npcColor();
+		this.playerColor = config.playerColor();
+		this.friendColor = config.friendColor();
+		this.teamColor = config.teamColor();
+		this.clanColor = config.clanColor();
+		this.hideMinimap = config.hideMinimap();
+	}
 }
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningCoalBagOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningCoalBagOverlay.java
index 2acbf90aa8..cdcf2ad670 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningCoalBagOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningCoalBagOverlay.java
@@ -27,29 +27,29 @@ package net.runelite.client.plugins.mining;
 import java.awt.Color;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.ItemID;
 import net.runelite.api.Point;
 import net.runelite.api.widgets.WidgetItem;
 import net.runelite.client.ui.FontManager;
 import net.runelite.client.ui.overlay.WidgetItemOverlay;
 
+@Singleton
 public class MiningCoalBagOverlay extends WidgetItemOverlay
 {
 	private final MiningPlugin plugin;
-	private final MiningConfig config;
 
 	@Inject
-	MiningCoalBagOverlay(MiningPlugin plugin, MiningConfig config)
+	MiningCoalBagOverlay(final MiningPlugin plugin)
 	{
 		showOnInventory();
 		this.plugin = plugin;
-		this.config = config;
 	}
 
 	@Override
 	public void renderItemOverlay(Graphics2D graphics, int itemId, WidgetItem itemWidget)
 	{
-		if (!config.showCoalBagOverlay() || (itemId != ItemID.COAL_BAG && itemId != ItemID.COAL_BAG_12019))
+		if (!plugin.isShowCoalBagOverlay() || (itemId != ItemID.COAL_BAG && itemId != ItemID.COAL_BAG_12019))
 		{
 			return;
 		}
@@ -58,6 +58,6 @@ public class MiningCoalBagOverlay extends WidgetItemOverlay
 		graphics.setColor(Color.WHITE);
 		Point location = itemWidget.getCanvasLocation();
 
-		graphics.drawString(config.amountOfCoalInCoalBag() + "", location.getX(), location.getY() + 14);
+		graphics.drawString(plugin.getAmountOfCoalInCoalBag() + "", location.getX(), location.getY() + 14);
 	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningOverlay.java
index fc673f2784..f0ca9fea59 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningOverlay.java
@@ -31,6 +31,7 @@ import java.time.Instant;
 import java.util.Iterator;
 import java.util.List;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.Client;
@@ -43,6 +44,7 @@ import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.components.ProgressPieComponent;
 
+@Singleton
 class MiningOverlay extends Overlay
 {
 	// Range of Motherlode vein respawn time not 100% confirmed but based on observation
@@ -57,7 +59,7 @@ class MiningOverlay extends Overlay
 	private final MiningPlugin plugin;
 
 	@Inject
-	private MiningOverlay(Client client, MiningPlugin plugin)
+	private MiningOverlay(final Client client, final MiningPlugin plugin)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_SCENE);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java
index f8f4ae7bc7..c77ff5ce24 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java
@@ -34,6 +34,7 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
@@ -57,7 +58,13 @@ import static net.runelite.api.ObjectID.ORE_VEIN_26663;
 import static net.runelite.api.ObjectID.ORE_VEIN_26664;
 import net.runelite.api.WallObject;
 import net.runelite.api.coords.WorldPoint;
-import net.runelite.api.events.*;
+import net.runelite.api.events.ChatMessage;
+import net.runelite.api.events.ConfigChanged;
+import net.runelite.api.events.GameObjectDespawned;
+import net.runelite.api.events.GameStateChanged;
+import net.runelite.api.events.GameTick;
+import net.runelite.api.events.MenuOptionClicked;
+import net.runelite.api.events.WallObjectSpawned;
 import net.runelite.api.widgets.WidgetInfo;
 import net.runelite.client.config.ConfigManager;
 import net.runelite.client.eventbus.Subscribe;
@@ -72,9 +79,10 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	tags = {"overlay", "skilling", "timers", "coal", "coalbag", "coal bag"},
 	enabledByDefault = false
 )
+@Singleton
 public class MiningPlugin extends Plugin
 {
-	private static final int ROCK_DISTANCE = 14;
+	// private static final int ROCK_DISTANCE = 14;
 	private static final int MINING_GUILD_REGION = 12183;
 
 	private static final Pattern COAL_BAG_EMPTY_MESSAGE = Pattern.compile("^The coal bag is (now )?empty\\.$");
@@ -87,7 +95,6 @@ public class MiningPlugin extends Plugin
 	private static final String FILL_OPTION = "fill";
 	private static final String EMPTY_OPTION = "empty";
 
-
 	@Inject
 	private Client client;
 
@@ -107,9 +114,17 @@ public class MiningPlugin extends Plugin
 	private final List<RockRespawn> respawns = new ArrayList<>();
 	private boolean recentlyLoggedIn;
 
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showCoalBagOverlay;
+	@Getter(AccessLevel.PACKAGE)
+	private int amountOfCoalInCoalBag;
+
 	@Override
 	protected void startUp()
 	{
+		this.showCoalBagOverlay = config.showCoalBagOverlay();
+		this.amountOfCoalInCoalBag = config.amountOfCoalInCoalBag();
+
 		overlayManager.add(miningOverlay);
 		overlayManager.add(coalBagOverlay);
 	}
@@ -222,7 +237,11 @@ public class MiningPlugin extends Plugin
 		}
 
 		ItemContainer inventoryItemContainer = client.getItemContainer(InventoryID.INVENTORY);
-		Item[] inventoryItems = inventoryItemContainer.getItems();
+		Item[] inventoryItems = new Item[0];
+		if (inventoryItemContainer != null)
+		{
+			inventoryItems = inventoryItemContainer.getItems();
+		}
 
 		switch (event.getOption().toLowerCase())
 		{
@@ -261,7 +280,7 @@ public class MiningPlugin extends Plugin
 			Matcher matcher = COAL_BAG_AMOUNT_MESSAGE.matcher(chatMsg);
 			if (matcher.find())
 			{
-				updateAmountOfCoalInBag(Integer.parseInt(matcher.group(1)) - config.amountOfCoalInCoalBag());
+				updateAmountOfCoalInBag(Integer.parseInt(matcher.group(1)) - this.amountOfCoalInCoalBag);
 			}
 		}
 	}
@@ -272,15 +291,29 @@ public class MiningPlugin extends Plugin
 	 * @param delta How much to add/subtract from the amount.
 	 *              Supply a negative number to subtract, or positive number to add.
 	 */
-	protected void updateAmountOfCoalInBag(int delta)
+	private void updateAmountOfCoalInBag(int delta)
 	{
 		// check for upper/lower bounds of amount of coal in a bag
 		// 0 <= X <= 27
-		config.amountOfCoalInCoalBag(Math.max(0, Math.min(FULL_COAL_BAG_AMOUNT, config.amountOfCoalInCoalBag() + delta)));
+		int coalbagAmount = Math.max(0, Math.min(FULL_COAL_BAG_AMOUNT, this.amountOfCoalInCoalBag + delta));
+		config.amountOfCoalInCoalBag(coalbagAmount);
+		this.amountOfCoalInCoalBag = coalbagAmount;
 	}
 
 	private boolean inMiningGuild()
 	{
 		return client.getLocalPlayer().getWorldLocation().getRegionID() == MINING_GUILD_REGION;
 	}
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (!event.getGroup().equals("mining"))
+		{
+			return;
+		}
+
+		this.showCoalBagOverlay = config.showCoalBagOverlay();
+		this.amountOfCoalInCoalBag = config.amountOfCoalInCoalBag();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mining/RockRespawn.java b/runelite-client/src/main/java/net/runelite/client/plugins/mining/RockRespawn.java
index daedda8f34..6b00652af4 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/mining/RockRespawn.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/mining/RockRespawn.java
@@ -25,12 +25,13 @@
 package net.runelite.client.plugins.mining;
 
 import java.time.Instant;
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import net.runelite.api.coords.WorldPoint;
 
 @AllArgsConstructor
-@Getter
+@Getter(AccessLevel.PACKAGE)
 class RockRespawn
 {
 	private final Rock rock;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeConfig.java
index bc4f4269ec..3263a9c033 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeConfig.java
@@ -142,4 +142,14 @@ public interface MotherlodeConfig extends Config
 		return false;
 	}
 
+	@ConfigItem(
+		keyName = "payDirtMsg",
+		name = "Pay-dirt!",
+		description = "Send a public message saying \"Pay-dirt!\" every time a dwarf says \"Pay-dirt!\"",
+		position = 99
+	)
+	default boolean payDirtMsg()
+	{
+		return false;
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeGemOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeGemOverlay.java
index 7b95147aeb..c87469b6bc 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeGemOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeGemOverlay.java
@@ -29,6 +29,7 @@ import java.awt.Graphics2D;
 import java.time.Duration;
 import java.time.Instant;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.client.ui.overlay.Overlay;
 import static net.runelite.client.ui.overlay.OverlayManager.OPTION_CONFIGURE;
@@ -38,22 +39,20 @@ import net.runelite.client.ui.overlay.components.PanelComponent;
 import net.runelite.client.ui.overlay.components.TitleComponent;
 import net.runelite.client.ui.overlay.components.table.TableAlignment;
 import net.runelite.client.ui.overlay.components.table.TableComponent;
-
+@Singleton
 public class MotherlodeGemOverlay extends Overlay
 {
 	private final MotherlodePlugin plugin;
 	private final MotherlodeSession motherlodeSession;
-	private final MotherlodeConfig config;
 	private final PanelComponent panelComponent = new PanelComponent();
 
 	@Inject
-	MotherlodeGemOverlay(MotherlodePlugin plugin, MotherlodeSession motherlodeSession, MotherlodeConfig config)
+	MotherlodeGemOverlay(final MotherlodePlugin plugin, final MotherlodeSession motherlodeSession)
 	{
 		super(plugin);
 		setPosition(OverlayPosition.TOP_LEFT);
 		this.plugin = plugin;
 		this.motherlodeSession = motherlodeSession;
-		this.config = config;
 		getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY_CONFIG, OPTION_CONFIGURE, "Gem overlay"));
 	}
 
@@ -62,12 +61,12 @@ public class MotherlodeGemOverlay extends Overlay
 	{
 		MotherlodeSession session = motherlodeSession;
 
-		if (session.getLastGemFound() == null || !plugin.isInMlm() || !config.showGemsFound())
+		if (session.getLastGemFound() == null || !plugin.isInMlm() || !plugin.isShowGemsFound())
 		{
 			return null;
 		}
 
-		Duration statTimeout = Duration.ofMinutes(config.statTimeout());
+		Duration statTimeout = Duration.ofMinutes(plugin.getStatTimeout());
 		Duration sinceCut = Duration.between(session.getLastGemFound(), Instant.now());
 
 		if (sinceCut.compareTo(statTimeout) >= 0)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeOreOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeOreOverlay.java
index 3533537987..65888c0f74 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeOreOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeOreOverlay.java
@@ -27,33 +27,32 @@ package net.runelite.client.plugins.motherlode;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.components.PanelComponent;
 import net.runelite.client.ui.overlay.components.TitleComponent;
 import net.runelite.client.ui.overlay.components.table.TableAlignment;
 import net.runelite.client.ui.overlay.components.table.TableComponent;
-
+@Singleton
 public class MotherlodeOreOverlay extends Overlay
 {
 	private final MotherlodePlugin plugin;
 	private final MotherlodeSession motherlodeSession;
-	private final MotherlodeConfig config;
 	private final PanelComponent panelComponent = new PanelComponent();
 
 	@Inject
-	MotherlodeOreOverlay(MotherlodePlugin plugin, MotherlodeSession motherlodeSession, MotherlodeConfig config)
+	MotherlodeOreOverlay(final MotherlodePlugin plugin, final MotherlodeSession motherlodeSession)
 	{
 		setPosition(OverlayPosition.TOP_LEFT);
 		this.plugin = plugin;
 		this.motherlodeSession = motherlodeSession;
-		this.config = config;
 	}
 
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (!plugin.isInMlm() || !config.showOresFound())
+		if (!plugin.isInMlm() || !plugin.isShowOresFound())
 		{
 			return null;
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeOverlay.java
index c43e012bfb..7bd10dd62c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeOverlay.java
@@ -30,7 +30,7 @@ import java.awt.Graphics2D;
 import java.time.Duration;
 import java.time.Instant;
 import javax.inject.Inject;
-import net.runelite.api.Client;
+import javax.inject.Singleton;
 import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.components.PanelComponent;
@@ -38,29 +38,26 @@ import net.runelite.client.ui.overlay.components.TitleComponent;
 import net.runelite.client.ui.overlay.components.table.TableAlignment;
 import net.runelite.client.ui.overlay.components.table.TableComponent;
 
+@Singleton
 class MotherlodeOverlay extends Overlay
 {
-	private final Client client;
 	private final MotherlodePlugin plugin;
 	private final MotherlodeSession motherlodeSession;
-	private final MotherlodeConfig config;
 	private final PanelComponent panelComponent = new PanelComponent();
 
 	@Inject
-	MotherlodeOverlay(Client client, MotherlodePlugin plugin, MotherlodeSession motherlodeSession, MotherlodeConfig config)
+	MotherlodeOverlay(final MotherlodePlugin plugin, final MotherlodeSession motherlodeSession)
 	{
 		super(plugin);
 		setPosition(OverlayPosition.TOP_LEFT);
-		this.client = client;
 		this.plugin = plugin;
 		this.motherlodeSession = motherlodeSession;
-		this.config = config;
 	}
 
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (!plugin.isInMlm() || !config.showMiningStats())
+		if (!plugin.isInMlm() || !plugin.isShowMiningStats())
 		{
 			return null;
 		}
@@ -72,7 +69,7 @@ class MotherlodeOverlay extends Overlay
 			return null;
 		}
 
-		Duration statTimeout = Duration.ofMinutes(config.statTimeout());
+		Duration statTimeout = Duration.ofMinutes(plugin.getStatTimeout());
 		Duration sinceCut = Duration.between(session.getLastPayDirtMined(), Instant.now());
 
 		if (sinceCut.compareTo(statTimeout) >= 0)
@@ -82,7 +79,7 @@ class MotherlodeOverlay extends Overlay
 
 		panelComponent.getChildren().clear();
 
-		if (config.showMiningState())
+		if (plugin.isShowMiningState())
 		{
 			if (plugin.isMining())
 			{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java
index 0e23e85a19..68c1dce8ca 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java
@@ -26,6 +26,7 @@
  */
 package net.runelite.client.plugins.motherlode;
 
+import com.google.common.base.Strings;
 import com.google.common.collect.HashMultiset;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Multiset;
@@ -38,6 +39,7 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.AnimationID;
@@ -62,6 +64,8 @@ import net.runelite.api.Item;
 import net.runelite.api.ItemContainer;
 import net.runelite.api.ItemID;
 import net.runelite.api.MenuAction;
+import net.runelite.api.NPC;
+import net.runelite.api.NpcID;
 import static net.runelite.api.ObjectID.DEPLETED_VEIN_26665;
 import static net.runelite.api.ObjectID.DEPLETED_VEIN_26666;
 import static net.runelite.api.ObjectID.DEPLETED_VEIN_26667;
@@ -74,12 +78,14 @@ import static net.runelite.api.ObjectID.ROCKFALL;
 import static net.runelite.api.ObjectID.ROCKFALL_26680;
 import net.runelite.api.Perspective;
 import net.runelite.api.Player;
+import net.runelite.api.ScriptID;
 import net.runelite.api.Varbits;
 import net.runelite.api.WallObject;
 import net.runelite.api.coords.LocalPoint;
 import net.runelite.api.coords.WorldPoint;
 import net.runelite.api.events.AnimationChanged;
 import net.runelite.api.events.ChatMessage;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.GameObjectChanged;
 import net.runelite.api.events.GameObjectDespawned;
 import net.runelite.api.events.GameObjectSpawned;
@@ -87,6 +93,7 @@ import net.runelite.api.events.GameStateChanged;
 import net.runelite.api.events.ItemContainerChanged;
 import net.runelite.api.events.GameTick;
 import net.runelite.api.events.MenuOptionClicked;
+import net.runelite.api.events.OverheadTextChanged;
 import net.runelite.api.events.VarbitChanged;
 import net.runelite.api.events.WallObjectChanged;
 import net.runelite.api.events.WallObjectDespawned;
@@ -103,6 +110,7 @@ import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginDescriptor;
 import net.runelite.client.task.Schedule;
 import net.runelite.client.ui.overlay.OverlayManager;
+import net.runelite.client.util.Text;
 
 @PluginDescriptor(
 	name = "Motherlode Mine",
@@ -110,6 +118,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	tags = {"pay", "dirt", "mining", "mlm", "skilling", "overlay"},
 	enabledByDefault = false
 )
+@Singleton
 public class MotherlodePlugin extends Plugin
 {
 	private static final Set<Integer> MOTHERLODE_MAP_REGIONS = ImmutableSet.of(14679, 14680, 14681, 14935, 14936, 14937, 15191, 15192, 15193);
@@ -188,6 +197,29 @@ public class MotherlodePlugin extends Plugin
 	private int lastAnimation = AnimationID.IDLE;
 	private Instant lastAnimating;
 
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showVeins;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showRockFalls;
+	@Getter(AccessLevel.PACKAGE)
+	private int statTimeout;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showSack;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showMiningStats;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showDepositsLeft;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showMiningState;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showGemsFound;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showOresFound;
+	private boolean notifyOnIdle;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showTargetVein;
+	private boolean payDirtMsg;
+
 	@Provides
 	MotherlodeConfig getConfig(ConfigManager configManager)
 	{
@@ -197,6 +229,8 @@ public class MotherlodePlugin extends Plugin
 	@Override
 	protected void startUp()
 	{
+		updateConfig();
+
 		overlayManager.add(overlay);
 		overlayManager.add(rocksOverlay);
 		overlayManager.add(motherlodeGemOverlay);
@@ -294,7 +328,7 @@ public class MotherlodePlugin extends Plugin
 		period = 1,
 		unit = ChronoUnit.SECONDS
 	)
-	public void checkMining()
+	void checkMining()
 	{
 		if (!inMlm)
 		{
@@ -311,7 +345,7 @@ public class MotherlodePlugin extends Plugin
 		}
 
 		// reset recentPayDirtMined if you haven't mined anything recently
-		Duration statTimeout = Duration.ofMinutes(config.statTimeout());
+		Duration statTimeout = Duration.ofMinutes(this.statTimeout);
 		Duration sinceMined = Duration.between(lastPayDirtMined, Instant.now());
 
 		if (sinceMined.compareTo(statTimeout) >= 0)
@@ -467,7 +501,7 @@ public class MotherlodePlugin extends Plugin
 
 	private void sendIdleNotification()
 	{
-		if (!config.notifyOnIdle())
+		if (!this.notifyOnIdle)
 		{
 			return;
 		}
@@ -695,12 +729,68 @@ public class MotherlodePlugin extends Plugin
 	/**
 	 * Checks if the given point is "upstairs" in the mlm.
 	 * The upper floor is actually on z=0.
-	 *
-	 * @param localPoint
-	 * @return
 	 */
 	boolean isUpstairs(LocalPoint localPoint)
 	{
 		return Perspective.getTileHeight(client, localPoint, 0) < UPPER_FLOOR_HEIGHT;
 	}
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (!event.getGroup().equals("motherlode"))
+		{
+			return;
+		}
+
+		updateConfig();
+	}
+
+	private void updateConfig()
+	{
+		this.showVeins = config.showVeins();
+		this.showRockFalls = config.showRockFalls();
+		this.statTimeout = config.statTimeout();
+		this.showSack = config.showSack();
+		this.showMiningStats = config.showMiningStats();
+		this.showDepositsLeft = config.showDepositsLeft();
+		this.showMiningState = config.showMiningState();
+		this.showGemsFound = config.showGemsFound();
+		this.showOresFound = config.showOresFound();
+		this.notifyOnIdle = config.notifyOnIdle();
+		this.showTargetVein = config.showTargetVein();
+		this.payDirtMsg = config.payDirtMsg();
+	}
+
+	@Subscribe
+	private void onOverheadTextChanged(OverheadTextChanged event)
+	{
+		if (!payDirtMsg || Strings.isNullOrEmpty(event.getOverheadText()) || !(event.getActor() instanceof NPC))
+		{
+			return;
+		}
+
+		switch (((NPC) event.getActor()).getId())
+		{
+			case NpcID.MINER_5606:
+			case NpcID.MINER_5813:
+			case NpcID.MINER_5814:
+			case NpcID.MINER_6565:
+			case NpcID.MINER_6567:
+			case NpcID.MINER_6568:
+			case NpcID.MINER_6569:
+			case NpcID.MINER_6570:
+			case NpcID.MINER_6571:
+			case NpcID.MINER_6572:
+			case NpcID.MINER_6645:
+				break;
+			default:
+				return;
+		}
+
+		if ("pay-dirt!".equals(Text.standardize(event.getOverheadText())))
+		{
+			client.runScript(ScriptID.PUBLICMSG, "Pay-dirt!");
+		}
+	}
 }
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeRocksOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeRocksOverlay.java
index bcd4d2946e..6b672967dc 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeRocksOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeRocksOverlay.java
@@ -32,6 +32,7 @@ import java.awt.Graphics2D;
 import java.awt.Polygon;
 import java.awt.image.BufferedImage;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.GameObject;
 import net.runelite.api.Perspective;
@@ -48,13 +49,13 @@ import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayUtil;
 import net.runelite.client.util.ImageUtil;
 
+@Singleton
 class MotherlodeRocksOverlay extends Overlay
 {
 	private static final int MAX_DISTANCE = 2350;
 
 	private final Client client;
 	private final MotherlodePlugin plugin;
-	private final MotherlodeConfig config;
 
 	private final BufferedImage miningIcon;
 	private final BufferedImage targetMiningIcon;
@@ -62,13 +63,12 @@ class MotherlodeRocksOverlay extends Overlay
 	private static final Color miningIconNewColor = new Color(0, 150, 0);
 
 	@Inject
-	MotherlodeRocksOverlay(Client client, MotherlodePlugin plugin, MotherlodeConfig config, SkillIconManager iconManager)
+	MotherlodeRocksOverlay(final Client client, final MotherlodePlugin plugin, final SkillIconManager iconManager)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_SCENE);
 		this.client = client;
 		this.plugin = plugin;
-		this.config = config;
 
 		miningIcon = iconManager.getSkillImage(Skill.MINING);
 		targetMiningIcon = ImageUtil.recolorImage(miningIcon, miningIconNewColor, Color -> Color.getRGB() == miningIconOldColor.getRGB());
@@ -77,7 +77,7 @@ class MotherlodeRocksOverlay extends Overlay
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if ((!config.showVeins() && !config.showRockFalls()) || !plugin.isInMlm())
+		if ((!plugin.isShowVeins() && !plugin.isShowRockFalls()) || !plugin.isInMlm())
 		{
 			return null;
 		}
@@ -92,32 +92,28 @@ class MotherlodeRocksOverlay extends Overlay
 	private void renderTiles(Graphics2D graphics, Player local)
 	{
 		LocalPoint localLocation = local.getLocalLocation();
-		if (config.showVeins())
+		if (plugin.isShowVeins())
 		{
 			for (WallObject vein : plugin.getVeins())
 			{
 				LocalPoint location = vein.getLocalLocation();
-				if (localLocation.distanceTo(location) <= MAX_DISTANCE)
+				if (localLocation.distanceTo(location) <= MAX_DISTANCE && plugin.isUpstairs(localLocation) == plugin.isUpstairs(vein.getLocalLocation()))
 				{
-					// Only draw veins on the same level
-					if (plugin.isUpstairs(localLocation) == plugin.isUpstairs(vein.getLocalLocation()))
+					if (WorldPoint.fromLocal(client, location).equals(plugin.getTargetVeinLocation())
+						&& plugin.isMining()
+						&& plugin.isShowTargetVein())
 					{
-						if (WorldPoint.fromLocal(client, location).equals(plugin.getTargetVeinLocation())
-							&& plugin.isMining()
-							&& config.showTargetVein())
-						{
-							renderVein(graphics, vein, true);
-						}
-						else
-						{
-							renderVein(graphics, vein, false);
-						}
+						renderVein(graphics, vein, true);
+					}
+					else
+					{
+						renderVein(graphics, vein, false);
 					}
 				}
 			}
 		}
 
-		if (config.showRockFalls())
+		if (plugin.isShowRockFalls())
 		{
 			for (GameObject rock : plugin.getRocks())
 			{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeSackOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeSackOverlay.java
index 2b53ff5bee..bf8e1d31a3 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeSackOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeSackOverlay.java
@@ -30,6 +30,7 @@ import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.api.Varbits;
@@ -45,22 +46,21 @@ import net.runelite.client.ui.overlay.components.table.TableAlignment;
 import net.runelite.client.ui.overlay.components.table.TableComponent;
 import net.runelite.client.util.ColorUtil;
 
+@Singleton
 class MotherlodeSackOverlay extends Overlay
 {
 	private static final Color DANGER = new Color(150, 0, 0, 150);
 	private final Client client;
-	private final MotherlodeConfig config;
 	private final MotherlodePlugin plugin;
 
 	private final PanelComponent panelComponent = new PanelComponent();
 
 	@Inject
-	MotherlodeSackOverlay(Client client, MotherlodeConfig config, MotherlodePlugin plugin)
+	MotherlodeSackOverlay(final Client client, final MotherlodePlugin plugin)
 	{
 		super(plugin);
 		setPosition(OverlayPosition.TOP_LEFT);
 		this.client = client;
-		this.config = config;
 		this.plugin = plugin;
 		getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY_CONFIG, OPTION_CONFIGURE, "Sack overlay"));
 	}
@@ -85,7 +85,7 @@ class MotherlodeSackOverlay extends Overlay
 		{
 			sack.setHidden(true);
 
-			if (config.showSack())
+			if (plugin.isShowSack())
 			{
 				if (plugin.getCurSackSize() >= plugin.getMaxSackSize())
 				{
@@ -95,7 +95,7 @@ class MotherlodeSackOverlay extends Overlay
 				tableComponent.addRow("Pay-dirt in sack:", String.valueOf(client.getVar(Varbits.SACK_NUMBER)));
 			}
 
-			if (config.showDepositsLeft())
+			if (plugin.isShowDepositsLeft())
 			{
 				final Integer depositsLeft = plugin.getDepositsLeft();
 				Color color = Color.WHITE;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeSession.java b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeSession.java
index e4d00cfda6..6a9c97d4b4 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeSession.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeSession.java
@@ -133,7 +133,7 @@ public class MotherlodeSession
 		}
 	}
 
-	public void incrementPayDirtMined()
+	void incrementPayDirtMined()
 	{
 		Instant now = Instant.now();
 
@@ -153,33 +153,28 @@ public class MotherlodeSession
 		}
 	}
 
-	public void resetRecent()
+	void resetRecent()
 	{
 		recentPayDirtMined = null;
 		recentMined = 0;
 	}
 
-	public int getPerHour()
+	int getPerHour()
 	{
 		return perHour;
 	}
 
-	public Instant getLastPayDirtMined()
+	Instant getLastPayDirtMined()
 	{
 		return lastPayDirtMined;
 	}
 
-	public int getTotalMined()
+	int getTotalMined()
 	{
 		return totalMined;
 	}
 
-	public Instant getRecentPayDirtMined()
-	{
-		return recentPayDirtMined;
-	}
-
-	public int getRecentMined()
+	int getRecentMined()
 	{
 		return recentMined;
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightOverlay.java
index 79700ce096..34cae5980f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightOverlay.java
@@ -28,6 +28,7 @@ import com.google.common.base.Strings;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.MenuAction;
 import net.runelite.api.MenuEntry;
@@ -39,19 +40,20 @@ import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.tooltip.Tooltip;
 import net.runelite.client.ui.overlay.tooltip.TooltipManager;
 
+@Singleton
 class MouseHighlightOverlay extends Overlay
 {
 	private final TooltipManager tooltipManager;
 	private final Client client;
-	private final MouseHighlightConfig config;
+	private final MouseHighlightPlugin plugin;
 
 	@Inject
-	MouseHighlightOverlay(Client client, TooltipManager tooltipManager, MouseHighlightConfig config)
+	MouseHighlightOverlay(final Client client, final TooltipManager tooltipManager, final MouseHighlightPlugin plugin)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		this.client = client;
 		this.tooltipManager = tooltipManager;
-		this.config = config;
+		this.plugin = plugin;
 	}
 
 	@Override
@@ -105,12 +107,12 @@ class MouseHighlightOverlay extends Overlay
 		final int childId = WidgetInfo.TO_CHILD(widgetId);
 		final Widget widget = client.getWidget(groupId, childId);
 
-		if (!config.uiTooltip() && widget != null)
+		if (!plugin.isUiTooltip() && widget != null)
 		{
 			return null;
 		}
 
-		if (!config.chatboxTooltip() && groupId == WidgetInfo.CHATBOX.getGroupId())
+		if (!plugin.isChatboxTooltip() && groupId == WidgetInfo.CHATBOX.getGroupId())
 		{
 			return null;
 		}
@@ -125,7 +127,7 @@ class MouseHighlightOverlay extends Overlay
 			}
 		}
 
-		if (widget == null && !config.mainTooltip())
+		if (widget == null && !plugin.isMainTooltip())
 		{
 			return null;
 		}
@@ -144,7 +146,7 @@ class MouseHighlightOverlay extends Overlay
 	private boolean shouldNotRenderMenuAction(int type)
 	{
 		return type == MenuAction.RUNELITE_OVERLAY.getId()
-				|| (!config.isRightClickTooltipEnabled() && isMenuActionRightClickOnly(type));
+				|| (!plugin.isRightClickTooltipEnabled() && isMenuActionRightClickOnly(type));
 	}
 
 	private boolean isMenuActionRightClickOnly(int type)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightPlugin.java
index 85f95aa6bd..ded370e957 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightPlugin.java
@@ -26,8 +26,12 @@ package net.runelite.client.plugins.mousehighlight;
 
 import com.google.inject.Provides;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
+import lombok.Getter;
 import net.runelite.api.Client;
 import net.runelite.api.GameState;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.GameStateChanged;
 import net.runelite.api.events.GameTick;
 import net.runelite.api.events.WidgetLoaded;
@@ -45,6 +49,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	description = "Render default actions as a tooltip",
 	tags = {"actions", "overlay", "tooltip", "hide"}
 )
+@Singleton
 public class MouseHighlightPlugin extends Plugin
 {
 	@Inject
@@ -58,6 +63,17 @@ public class MouseHighlightPlugin extends Plugin
 	@Inject
 	private MouseHighlightOverlay overlay;
 
+	@Getter(AccessLevel.PACKAGE)
+	private boolean mainTooltip;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean uiTooltip;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean chatboxTooltip;
+	private boolean shouldHideSpells;
+	private boolean shouldHideCombat;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean isRightClickTooltipEnabled;
+
 	@Provides
 	MouseHighlightConfig provideConfig(ConfigManager configManager)
 	{
@@ -67,6 +83,8 @@ public class MouseHighlightPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
+
 		adjustTips();
 		overlayManager.add(overlay);
 	}
@@ -111,15 +129,13 @@ public class MouseHighlightPlugin extends Plugin
 
 		try
 		{
-			setTipHidden(WidgetInfo.SPELL_TOOLTIP, config.shouldHideSpells());
-			setTipHidden(WidgetInfo.COMBAT_TOOLTIP, config.shouldHideCombat());
+			setTipHidden(WidgetInfo.SPELL_TOOLTIP, this.shouldHideSpells);
+			setTipHidden(WidgetInfo.COMBAT_TOOLTIP, this.shouldHideCombat);
 		}
 		catch (Exception e)
 		{
 			//swallow
 		}
-
-
 	}
 
 	private void resetTips()
@@ -152,4 +168,24 @@ public class MouseHighlightPlugin extends Plugin
 		widget.setHidden(hidden);
 	}
 
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (!event.getGroup().equals("motherlode"))
+		{
+			return;
+		}
+
+		updateConfig();
+	}
+
+	private void updateConfig()
+	{
+		this.mainTooltip = config.mainTooltip();
+		this.uiTooltip = config.uiTooltip();
+		this.chatboxTooltip = config.chatboxTooltip();
+		this.shouldHideSpells = config.shouldHideSpells();
+		this.shouldHideCombat = config.shouldHideCombat();
+		this.isRightClickTooltipEnabled = config.isRightClickTooltipEnabled();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTAInventoryOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTAInventoryOverlay.java
index ea99cf7f00..928522a48a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTAInventoryOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTAInventoryOverlay.java
@@ -27,17 +27,19 @@ package net.runelite.client.plugins.mta;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.client.ui.FontManager;
 import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 
+@Singleton
 public class MTAInventoryOverlay extends Overlay
 {
 	private final MTAPlugin plugin;
 
 	@Inject
-	public MTAInventoryOverlay(MTAPlugin plugin)
+	public MTAInventoryOverlay(final MTAPlugin plugin)
 	{
 		this.plugin = plugin;
 		setPosition(OverlayPosition.DYNAMIC);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTAPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTAPlugin.java
index 5b7d6bffa1..907f66f03d 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTAPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTAPlugin.java
@@ -26,9 +26,9 @@ package net.runelite.client.plugins.mta;
 
 import com.google.inject.Provides;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Getter;
-import net.runelite.api.Client;
 import net.runelite.client.config.ConfigManager;
 import net.runelite.client.eventbus.EventBus;
 import net.runelite.client.plugins.Plugin;
@@ -44,11 +44,9 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	description = "Show helpful information for the Mage Training Arena minigame",
 	tags = {"mta", "magic", "minigame", "overlay"}
 )
+@Singleton
 public class MTAPlugin extends Plugin
 {
-	@Inject
-	private Client client;
-
 	@Inject
 	private OverlayManager overlayManager;
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTARoom.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTARoom.java
index a77f8170d8..6df7c96c37 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTARoom.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTARoom.java
@@ -35,7 +35,7 @@ public abstract class MTARoom
 	protected final MTAConfig config;
 
 	@Inject
-	protected MTARoom(MTAConfig config)
+	protected MTARoom(final MTAConfig config)
 	{
 		this.config = config;
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTASceneOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTASceneOverlay.java
index 5ed9a7e6b1..c9c405aa75 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTASceneOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTASceneOverlay.java
@@ -27,17 +27,19 @@ package net.runelite.client.plugins.mta;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.client.ui.FontManager;
 import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 
+@Singleton
 public class MTASceneOverlay extends Overlay
 {
 	private final MTAPlugin plugin;
 
 	@Inject
-	public MTASceneOverlay(MTAPlugin plugin)
+	public MTASceneOverlay(final MTAPlugin plugin)
 	{
 		this.plugin = plugin;
 		setPosition(OverlayPosition.DYNAMIC);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyItem.java
index d690b7f16b..c7f45bfc50 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyItem.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyItem.java
@@ -43,7 +43,7 @@ public enum AlchemyItem
 	@Getter
 	private final String name;
 
-	AlchemyItem(String name, int id)
+	AlchemyItem(final String name, final int id)
 	{
 		this.id = id;
 		this.name = name;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoom.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoom.java
index ff8224238f..186497182f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoom.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoom.java
@@ -37,27 +37,13 @@ import net.runelite.api.ChatMessageType;
 import net.runelite.api.Client;
 import net.runelite.api.GameObject;
 import net.runelite.api.GameState;
-import static net.runelite.api.ObjectID.CUPBOARD_23678;
-import static net.runelite.api.ObjectID.CUPBOARD_23679;
-import static net.runelite.api.ObjectID.CUPBOARD_23680;
-import static net.runelite.api.ObjectID.CUPBOARD_23681;
-import static net.runelite.api.ObjectID.CUPBOARD_23682;
-import static net.runelite.api.ObjectID.CUPBOARD_23683;
-import static net.runelite.api.ObjectID.CUPBOARD_23684;
-import static net.runelite.api.ObjectID.CUPBOARD_23685;
-import static net.runelite.api.ObjectID.CUPBOARD_23686;
-import static net.runelite.api.ObjectID.CUPBOARD_23687;
-import static net.runelite.api.ObjectID.CUPBOARD_23688;
-import static net.runelite.api.ObjectID.CUPBOARD_23689;
-import static net.runelite.api.ObjectID.CUPBOARD_23690;
-import static net.runelite.api.ObjectID.CUPBOARD_23691;
-import static net.runelite.api.ObjectID.CUPBOARD_23692;
-import static net.runelite.api.ObjectID.CUPBOARD_23693;
+import static net.runelite.api.ObjectID.*;
 import net.runelite.api.Perspective;
 import net.runelite.api.Player;
 import net.runelite.api.Point;
 import net.runelite.api.coords.WorldPoint;
 import net.runelite.api.events.ChatMessage;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.GameObjectSpawned;
 import net.runelite.api.events.GameStateChanged;
 import net.runelite.api.events.GameTick;
@@ -97,26 +83,30 @@ public class AlchemyRoom extends MTARoom
 	private AlchemyItem best;
 	private Cupboard suggestion;
 
+	private boolean alchemy;
+
 	@Inject
-	private AlchemyRoom(Client client, MTAConfig config, MTAPlugin plugin, ItemManager itemManager, InfoBoxManager infoBoxManager)
+	private AlchemyRoom(final Client client, final MTAConfig config, final MTAPlugin plugin, final ItemManager itemManager, final InfoBoxManager infoBoxManager)
 	{
 		super(config);
 		this.client = client;
 		this.plugin = plugin;
 		this.itemManager = itemManager;
 		this.infoBoxManager = infoBoxManager;
+
+		this.alchemy = config.alchemy();
 	}
 
 	@Subscribe
 	public void onGameTick(GameTick event)
 	{
-		if (!inside() || !config.alchemy())
+		if (!inside() || !this.alchemy)
 		{
 			return;
 		}
 
 		AlchemyItem bestItem = getBest();
-		if (best == null || best != bestItem)
+		if (best == null || !best.equals(bestItem))
 		{
 			if (best != null)
 			{
@@ -235,41 +225,49 @@ public class AlchemyRoom extends MTARoom
 
 		String message = wrapper.getMessage();
 
-		if (wrapper.getType() == ChatMessageType.GAMEMESSAGE)
+		if (wrapper.getType() == ChatMessageType.GAMEMESSAGE && message.contains(YOU_FOUND))
 		{
-			if (message.contains(YOU_FOUND))
+			String item = message.replace(YOU_FOUND, "").trim();
+			AlchemyItem alchemyItem = AlchemyItem.find(item);
+			Cupboard clicked = getClicked();
+			if (clicked.alchemyItem != alchemyItem && alchemyItem != null)
 			{
-				String item = message.replace(YOU_FOUND, "").trim();
-				AlchemyItem alchemyItem = AlchemyItem.find(item);
-				Cupboard clicked = getClicked();
-				if (clicked.alchemyItem != alchemyItem)
-				{
-					fill(clicked, alchemyItem);
-				}
-			}
-			else if (message.equals(EMPTY))
-			{
-				Cupboard clicked = getClicked();
-
-				int idx = Arrays.asList(cupboards).indexOf(clicked);
-				for (int i = -2; i <= 2; ++i)
-				{
-					int j = (idx + i) % 8;
-					if (j < 0)
-					{
-						j = 8 + j;
-					}
-
-					Cupboard cupboard = cupboards[j];
-					if (cupboard != null && cupboard.alchemyItem == AlchemyItem.UNKNOWN)
-					{
-						cupboard.alchemyItem = AlchemyItem.POSSIBLY_EMPTY;
-					}
-				}
-
-				clicked.alchemyItem = AlchemyItem.EMPTY;
+				fill(clicked, alchemyItem);
 			}
 		}
+		else if (message.equals(EMPTY))
+		{
+			Cupboard clicked = getClicked();
+
+			int idx = Arrays.asList(cupboards).indexOf(clicked);
+			for (int i = -2; i <= 2; ++i)
+			{
+				int j = (idx + i) % 8;
+				if (j < 0)
+				{
+					j = 8 + j;
+				}
+
+				Cupboard cupboard = cupboards[j];
+				if (cupboard != null && cupboard.alchemyItem == AlchemyItem.UNKNOWN)
+				{
+					cupboard.alchemyItem = AlchemyItem.POSSIBLY_EMPTY;
+				}
+			}
+
+			clicked.alchemyItem = AlchemyItem.EMPTY;
+		}
+	}
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (!event.getGroup().equals("mta") || !event.getKey().equals("alchemy"))
+		{
+			return;
+		}
+
+		this.alchemy = config.alchemy();
 	}
 
 
@@ -377,7 +375,7 @@ public class AlchemyRoom extends MTARoom
 				continue;
 			}
 
-			if (alchemyItem == best)
+			if (alchemyItem.equals(best))
 			{
 				client.setHintArrow(object.getWorldLocation());
 				found = true;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoomTimer.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoomTimer.java
index 693e0517c9..d5b23a07e9 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoomTimer.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoomTimer.java
@@ -30,12 +30,12 @@ import net.runelite.client.plugins.Plugin;
 import net.runelite.client.ui.overlay.infobox.Timer;
 import net.runelite.client.util.ImageUtil;
 
-public class AlchemyRoomTimer extends Timer
+class AlchemyRoomTimer extends Timer
 {
 	private static final int RESET_PERIOD = 42;
 	private static BufferedImage image;
 
-	public AlchemyRoomTimer(Plugin plugin)
+	AlchemyRoomTimer(final Plugin plugin)
 	{
 		super(RESET_PERIOD, ChronoUnit.SECONDS, getResetImage(), plugin);
 		this.setTooltip("Time until items swap");
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/enchantment/EnchantmentRoom.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/enchantment/EnchantmentRoom.java
index ce82dc00cc..40a46c332d 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/enchantment/EnchantmentRoom.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/enchantment/EnchantmentRoom.java
@@ -35,6 +35,7 @@ import net.runelite.api.ItemID;
 import net.runelite.api.Player;
 import net.runelite.api.Tile;
 import net.runelite.api.coords.WorldPoint;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.GameStateChanged;
 import net.runelite.api.events.GameTick;
 import net.runelite.api.events.ItemDespawned;
@@ -51,11 +52,15 @@ public class EnchantmentRoom extends MTARoom
 	private final Client client;
 	private final List<WorldPoint> dragonstones = new ArrayList<>();
 
+	private boolean enchantment;
+
 	@Inject
-	private EnchantmentRoom(MTAConfig config, Client client)
+	private EnchantmentRoom(final MTAConfig config, final Client client)
 	{
 		super(config);
 		this.client = client;
+
+		this.enchantment = config.enchantment();
 	}
 
 	@Subscribe
@@ -70,7 +75,7 @@ public class EnchantmentRoom extends MTARoom
 	@Subscribe
 	public void onGameTick(GameTick event)
 	{
-		if (!inside() || !config.enchantment())
+		if (!inside() || !this.enchantment)
 		{
 			return;
 		}
@@ -131,6 +136,17 @@ public class EnchantmentRoom extends MTARoom
 		}
 	}
 
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (!event.getGroup().equals("mta") || !event.getKey().equals("enchantment"))
+		{
+			return;
+		}
+
+		this.enchantment = config.enchantment();
+	}
+
 	@Override
 	public boolean inside()
 	{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardCounter.java
index 59f78785c8..c3be2bc51f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardCounter.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardCounter.java
@@ -29,9 +29,9 @@ import java.awt.image.BufferedImage;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.ui.overlay.infobox.Counter;
 
-public class GraveyardCounter extends Counter
+class GraveyardCounter extends Counter
 {
-	GraveyardCounter(BufferedImage image, Plugin plugin)
+	GraveyardCounter(final BufferedImage image, final Plugin plugin)
 	{
 		super(image, plugin, 0);
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardRoom.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardRoom.java
index 6661b141ff..5cfe0f16fa 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardRoom.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardRoom.java
@@ -35,6 +35,7 @@ import static net.runelite.api.ItemID.ANIMALS_BONES_6905;
 import static net.runelite.api.ItemID.ANIMALS_BONES_6906;
 import static net.runelite.api.ItemID.ANIMALS_BONES_6907;
 import net.runelite.api.Player;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.GameTick;
 import net.runelite.api.events.ItemContainerChanged;
 import net.runelite.client.eventbus.Subscribe;
@@ -57,15 +58,18 @@ public class GraveyardRoom extends MTARoom
 
 	private GraveyardCounter counter;
 
+	private boolean graveyard;
+
 	@Inject
-	private GraveyardRoom(MTAConfig config, Client client, MTAPlugin plugin,
-						ItemManager itemManager, InfoBoxManager infoBoxManager)
+	private GraveyardRoom(final MTAConfig config, final Client client, final MTAPlugin plugin, final ItemManager itemManager, final InfoBoxManager infoBoxManager)
 	{
 		super(config);
 		this.client = client;
 		this.plugin = plugin;
 		this.itemManager = itemManager;
 		this.infoBoxManager = infoBoxManager;
+
+		this.graveyard = config.graveyard();
 	}
 
 	@Override
@@ -79,13 +83,10 @@ public class GraveyardRoom extends MTARoom
 	@Subscribe
 	public void onGameTick(GameTick tick)
 	{
-		if (!inside() || !config.graveyard())
+		if ((!inside() || !this.graveyard) && this.counter != null)
 		{
-			if (this.counter != null)
-			{
-				infoBoxManager.removeIf(e -> e instanceof GraveyardCounter);
-				this.counter = null;
-			}
+			infoBoxManager.removeIf(e -> e instanceof GraveyardCounter);
+			this.counter = null;
 		}
 	}
 
@@ -113,6 +114,17 @@ public class GraveyardRoom extends MTARoom
 		}
 	}
 
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (!event.getGroup().equals("mta") || !event.getKey().equals("graveyard"))
+		{
+			return;
+		}
+
+		this.graveyard = config.graveyard();
+	}
+
 	private int score(Item[] items)
 	{
 		int score = 0;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/Maze.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/Maze.java
index bef5c1d201..77871deb92 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/Maze.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/Maze.java
@@ -42,7 +42,7 @@ public enum Maze
 	private final int walls;
 	private final LocalPoint start;
 
-	Maze(int walls, LocalPoint start)
+	Maze(final int walls, final LocalPoint start)
 	{
 		this.walls = walls;
 		this.start = start;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/TelekineticRoom.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/TelekineticRoom.java
index ae797b74cd..2023ff3166 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/TelekineticRoom.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/TelekineticRoom.java
@@ -54,6 +54,7 @@ import net.runelite.api.coords.Direction;
 import net.runelite.api.coords.LocalPoint;
 import net.runelite.api.coords.WorldArea;
 import net.runelite.api.coords.WorldPoint;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.GameStateChanged;
 import net.runelite.api.events.GameTick;
 import net.runelite.api.events.GroundObjectSpawned;
@@ -84,11 +85,15 @@ public class TelekineticRoom extends MTARoom
 	private NPC guardian;
 	private Maze maze;
 
+	private boolean telekinetic;
+
 	@Inject
-	private TelekineticRoom(MTAConfig config, Client client)
+	private TelekineticRoom(final MTAConfig config, final Client client)
 	{
 		super(config);
 		this.client = client;
+
+		this.telekinetic = config.telekinetic();
 	}
 
 	public void resetRoom()
@@ -133,7 +138,7 @@ public class TelekineticRoom extends MTARoom
 	@Subscribe
 	public void onGameTick(GameTick event)
 	{
-		if (!config.telekinetic()
+		if (!this.telekinetic
 			|| !inside()
 			|| client.getGameState() != GameState.LOGGED_IN)
 		{
@@ -214,12 +219,23 @@ public class TelekineticRoom extends MTARoom
 	{
 		NPC npc = event.getNpc();
 
-		if (npc == guardian)
+		if (npc.equals(guardian))
 		{
 			guardian = null;
 		}
 	}
 
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (!event.getGroup().equals("mta") || !event.getKey().equals("telekinetic"))
+		{
+			return;
+		}
+
+		this.telekinetic = config.telekinetic();
+	}
+
 	@Override
 	public boolean inside()
 	{
@@ -270,7 +286,11 @@ public class TelekineticRoom extends MTARoom
 
 		Direction next = moves.pop();
 		WorldArea areaNext = getIndicatorLine(next);
-		WorldPoint nearestNext = nearest(areaNext, current);
+		WorldPoint nearestNext = null;
+		if (areaNext != null)
+		{
+			nearestNext = nearest(areaNext, current);
+		}
 
 		if (moves.isEmpty())
 		{
@@ -282,9 +302,20 @@ public class TelekineticRoom extends MTARoom
 		Direction after = moves.peek();
 		moves.push(next);
 		WorldArea areaAfter = getIndicatorLine(after);
-		WorldPoint nearestAfter = nearest(areaAfter, nearestNext);
+		WorldPoint nearestAfter = null;
+		if (areaAfter != null)
+		{
+			nearestAfter = nearest(areaAfter, nearestNext);
+		}
 
-		return nearest(areaNext, nearestAfter);
+		if (areaNext != null)
+		{
+			return nearest(areaNext, nearestAfter);
+		}
+		else
+		{
+			return nearestAfter;
+		}
 	}
 
 	private static int manhattan(WorldPoint point1, WorldPoint point2)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MapLocations.java b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MapLocations.java
index 044e9bdb36..7bf5da3df2 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MapLocations.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MapLocations.java
@@ -33,14 +33,14 @@ import java.util.ArrayList;
 import java.util.List;
 import net.runelite.api.Constants;
 
-public class MapLocations
+class MapLocations
 {
-	private static final List<Shape>[] MULTICOMBAT            = new List[Constants.MAX_Z];
-	private static final List<Shape>[] NOT_MULTICOMBAT        = new List[Constants.MAX_Z];
-	private static final List<Shape>[] ROUGH_WILDERNESS       = new List[Constants.MAX_Z];
+	private static final List<Shape>[] MULTICOMBAT = new List[Constants.MAX_Z];
+	private static final List<Shape>[] NOT_MULTICOMBAT = new List[Constants.MAX_Z];
+	private static final List<Shape>[] ROUGH_WILDERNESS = new List[Constants.MAX_Z];
 	private static final List<Shape>[] WILDERNESS_LEVEL_LINES = new List[Constants.MAX_Z];
-	private static final List<Shape>[] DEADMAN_SAFE_ZONES     = new List[Constants.MAX_Z];
-	private static final List<Shape>[] PVP_WORLD_SAFE_ZONES   = new List[Constants.MAX_Z];
+	private static final List<Shape>[] DEADMAN_SAFE_ZONES = new List[Constants.MAX_Z];
+	private static final List<Shape>[] PVP_WORLD_SAFE_ZONES = new List[Constants.MAX_Z];
 
 	private static Area getArea(List<Shape> shapes)
 	{
@@ -3453,7 +3453,6 @@ public class MapLocations
 		int wildyLeftX = 2944;
 		int wildyRightX = 3392;
 		int wildyBottomY = 3525;
-		int wildyTopY = 3971;
 
 		// define wilderness level lines at ground level
 		int accumulatedY = 0;
@@ -3482,9 +3481,9 @@ public class MapLocations
 		{
 			poly.addPoint(coords[i], coords[i + 1]);
 		}
-		for (int i = 0; i < shapes.length; i++)
+		for (List<Shape> shape : shapes)
 		{
-			shapes[i].add(poly);
+			shape.add(poly);
 		}
 	}
 
@@ -3497,17 +3496,4 @@ public class MapLocations
 		}
 		shapes[plane].add(poly);
 	}
-
-	private static void addPolygonOnPlanes(List<Shape>[] shapes, int minPlane, int maxPlane, int... coords)
-	{
-		Polygon poly = new Polygon();
-		for (int i = 0; i < coords.length; i += 2)
-		{
-			poly.addPoint(coords[i], coords[i + 1]);
-		}
-		for (int i = minPlane; i <= maxPlane; i++)
-		{
-			shapes[i].add(poly);
-		}
-	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsMinimapOverlay.java
index b0c1187745..5ea7f57b24 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsMinimapOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsMinimapOverlay.java
@@ -32,6 +32,7 @@ import java.awt.Rectangle;
 import java.awt.geom.GeneralPath;
 import javax.inject.Inject;
 
+import javax.inject.Singleton;
 import net.runelite.api.geometry.Geometry;
 import net.runelite.api.Client;
 import net.runelite.api.Perspective;
@@ -42,6 +43,7 @@ import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayPriority;
 
+@Singleton
 public class MultiIndicatorsMinimapOverlay extends Overlay
 {
 	private final static int MAX_LOCAL_DRAW_LENGTH = 20 * Perspective.LOCAL_TILE_SIZE;
@@ -52,9 +54,6 @@ public class MultiIndicatorsMinimapOverlay extends Overlay
 	@Inject
 	private MultiIndicatorsPlugin plugin;
 
-	@Inject
-	private MultiIndicatorsConfig config;
-
 	@Inject
 	public MultiIndicatorsMinimapOverlay()
 	{
@@ -86,8 +85,11 @@ public class MultiIndicatorsMinimapOverlay extends Overlay
 		path = Geometry.transformPath(path, coords ->
 		{
 			Point point = Perspective.localToMinimap(client, new LocalPoint((int) coords[0], (int) coords[1]));
-			coords[0] = point.getX();
-			coords[1] = point.getY();
+			if (point != null)
+			{
+				coords[0] = point.getX();
+				coords[1] = point.getY();
+			}
 		});
 
 		graphics.draw(path);
@@ -96,7 +98,7 @@ public class MultiIndicatorsMinimapOverlay extends Overlay
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (!config.showMinimapLines())
+		if (!plugin.isShowMinimapLines())
 		{
 			return null;
 		}
@@ -105,17 +107,17 @@ public class MultiIndicatorsMinimapOverlay extends Overlay
 		GeneralPath pvpPath = plugin.getPvpPathToDisplay()[client.getPlane()];
 		GeneralPath wildernessLevelLinesPath = plugin.getWildernessLevelLinesPathToDisplay()[client.getPlane()];
 
-		if (config.multicombatZoneVisibility() != ZoneVisibility.HIDE && multicombatPath != null)
+		if (plugin.getMulticombatZoneVisibility() != ZoneVisibility.HIDE && multicombatPath != null)
 		{
-			renderPath(graphics, multicombatPath, getTransparentColorVersion(config.multicombatColor()));
+			renderPath(graphics, multicombatPath, getTransparentColorVersion(plugin.getMulticombatColor()));
 		}
-		if ((config.showPvpSafeZones() || config.showDeadmanSafeZones()) && pvpPath != null)
+		if ((plugin.isShowPvpSafeZones() || plugin.isShowDeadmanSafeZones()) && pvpPath != null)
 		{
-			renderPath(graphics, pvpPath, getTransparentColorVersion(config.safeZoneColor()));
+			renderPath(graphics, pvpPath, getTransparentColorVersion(plugin.getSafeZoneColor()));
 		}
-		if (config.showWildernessLevelLines() && wildernessLevelLinesPath != null)
+		if (plugin.isShowWildernessLevelLines() && wildernessLevelLinesPath != null)
 		{
-			renderPath(graphics, wildernessLevelLinesPath, getTransparentColorVersion(config.wildernessLevelLinesColor()));
+			renderPath(graphics, wildernessLevelLinesPath, getTransparentColorVersion(plugin.getWildernessLevelLinesColor()));
 		}
 
 		return null;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsOverlay.java
index d9268121f0..74573f97a4 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsOverlay.java
@@ -32,6 +32,7 @@ import java.awt.Graphics2D;
 import java.awt.Rectangle;
 import java.awt.geom.GeneralPath;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.geometry.Geometry;
 import net.runelite.api.Client;
 import net.runelite.api.Perspective;
@@ -42,6 +43,7 @@ import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayPriority;
 
+@Singleton
 public class MultiIndicatorsOverlay extends Overlay
 {
 	private final static int MAX_LOCAL_DRAW_LENGTH = 20 * Perspective.LOCAL_TILE_SIZE;
@@ -52,9 +54,6 @@ public class MultiIndicatorsOverlay extends Overlay
 	@Inject
 	private MultiIndicatorsPlugin plugin;
 
-	@Inject
-	private MultiIndicatorsConfig config;
-
 	@Inject
 	public MultiIndicatorsOverlay()
 	{
@@ -87,8 +86,11 @@ public class MultiIndicatorsOverlay extends Overlay
 		path = Geometry.transformPath(path, coords ->
 		{
 			Point point = Perspective.localToCanvas(client, new LocalPoint((int) coords[0], (int) coords[1]), client.getPlane());
-			coords[0] = point.getX();
-			coords[1] = point.getY();
+			if (point != null)
+			{
+				coords[0] = point.getX();
+				coords[1] = point.getY();
+			}
 		});
 
 		graphics.draw(path);
@@ -101,17 +103,17 @@ public class MultiIndicatorsOverlay extends Overlay
 		GeneralPath pvpPath = plugin.getPvpPathToDisplay()[client.getPlane()];
 		GeneralPath wildernessLevelLinesPath = plugin.getWildernessLevelLinesPathToDisplay()[client.getPlane()];
 
-		if (config.multicombatZoneVisibility() != ZoneVisibility.HIDE && multicombatPath != null)
+		if (plugin.getMulticombatZoneVisibility() != ZoneVisibility.HIDE && multicombatPath != null)
 		{
-			renderPath(graphics, multicombatPath, getTransparentColorVersion(config.multicombatColor()));
+			renderPath(graphics, multicombatPath, getTransparentColorVersion(plugin.getMulticombatColor()));
 		}
-		if ((config.showPvpSafeZones() || config.showDeadmanSafeZones()) && pvpPath != null)
+		if ((plugin.isShowPvpSafeZones() || plugin.isShowDeadmanSafeZones()) && pvpPath != null)
 		{
-			renderPath(graphics, pvpPath, getTransparentColorVersion(config.safeZoneColor()));
+			renderPath(graphics, pvpPath, getTransparentColorVersion(plugin.getSafeZoneColor()));
 		}
-		if (config.showWildernessLevelLines() && wildernessLevelLinesPath != null)
+		if (plugin.isShowWildernessLevelLines() && wildernessLevelLinesPath != null)
 		{
-			renderPath(graphics, wildernessLevelLinesPath, getTransparentColorVersion(config.wildernessLevelLinesColor()));
+			renderPath(graphics, wildernessLevelLinesPath, getTransparentColorVersion(plugin.getWildernessLevelLinesColor()));
 		}
 
 		return null;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsPlugin.java
index c20fa25810..9f6fb91f2b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsPlugin.java
@@ -26,11 +26,14 @@
 package net.runelite.client.plugins.multiindicators;
 
 import com.google.inject.Provides;
+import java.awt.Color;
 import java.awt.Rectangle;
 import java.awt.geom.GeneralPath;
 import java.time.temporal.ChronoUnit;
 import java.util.Arrays;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.Client;
 import net.runelite.api.Constants;
@@ -62,7 +65,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	type = PluginType.PVP,
 	enabledByDefault = false
 )
-
+@Singleton
 public class MultiIndicatorsPlugin extends Plugin
 {
 	@Inject
@@ -83,23 +86,40 @@ public class MultiIndicatorsPlugin extends Plugin
 	@Inject
 	private OverlayManager overlayManager;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private GeneralPath[] multicombatPathToDisplay;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private GeneralPath[] pvpPathToDisplay;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private GeneralPath[] wildernessLevelLinesPathToDisplay;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private boolean inPvp;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private boolean inDeadman;
 
 	private int currentPlane;
 
+	@Getter(AccessLevel.PACKAGE)
+	private ZoneVisibility multicombatZoneVisibility;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showPvpSafeZones;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showDeadmanSafeZones;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showWildernessLevelLines;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showMinimapLines;
+	@Getter(AccessLevel.PACKAGE)
+	private Color multicombatColor;
+	@Getter(AccessLevel.PACKAGE)
+	private Color safeZoneColor;
+	@Getter(AccessLevel.PACKAGE)
+	private Color wildernessLevelLinesColor;
+
 	@Provides
 	MultiIndicatorsConfig getConfig(ConfigManager configManager)
 	{
@@ -109,6 +129,8 @@ public class MultiIndicatorsPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
+
 		overlayManager.add(overlay);
 		overlayManager.add(minimapOverlay);
 
@@ -165,9 +187,13 @@ public class MultiIndicatorsPlugin extends Plugin
 	private void transformWorldToLocal(float[] coords)
 	{
 		LocalPoint lp = LocalPoint.fromWorld(client, (int) coords[0], (int) coords[1]);
-		coords[0] = lp.getX() - Perspective.LOCAL_TILE_SIZE / 2;
-		coords[1] = lp.getY() - Perspective.LOCAL_TILE_SIZE / 2;
+		if (lp != null)
+		{
+			coords[0] = lp.getX() - Perspective.LOCAL_TILE_SIZE / 2;
+			coords[1] = lp.getY() - Perspective.LOCAL_TILE_SIZE / 2;
+		}
 	}
+
 	private boolean isOpenableAt(WorldPoint wp)
 	{
 		int sceneX = wp.getX() - client.getBaseX();
@@ -253,7 +279,7 @@ public class MultiIndicatorsPlugin extends Plugin
 			Constants.SCENE_SIZE - 2, Constants.SCENE_SIZE - 2);
 
 		// Generate lines for multicombat zones
-		if (config.multicombatZoneVisibility() == ZoneVisibility.HIDE)
+		if (this.multicombatZoneVisibility == ZoneVisibility.HIDE)
 		{
 			for (int i = 0; i < multicombatPathToDisplay.length; i++)
 			{
@@ -268,7 +294,7 @@ public class MultiIndicatorsPlugin extends Plugin
 
 				GeneralPath lines = new GeneralPath(MapLocations.getMulticombat(sceneRect, i));
 				lines = Geometry.clipPath(lines, sceneRect);
-				if (config.multicombatZoneVisibility() == ZoneVisibility.SHOW_IN_PVP &&
+				if (this.multicombatZoneVisibility == ZoneVisibility.SHOW_IN_PVP &&
 					!isInDeadman() && !isInPvp())
 				{
 					lines = Geometry.clipPath(lines, MapLocations.getRoughWilderness(i));
@@ -289,11 +315,11 @@ public class MultiIndicatorsPlugin extends Plugin
 			currentPlane = i;
 
 			GeneralPath safeZonePath = null;
-			if (config.showDeadmanSafeZones() && isInDeadman())
+			if (this.showDeadmanSafeZones && isInDeadman())
 			{
 				safeZonePath = new GeneralPath(MapLocations.getDeadmanSafeZones(sceneRect, i));
 			}
-			else if (config.showPvpSafeZones() && isInPvp())
+			else if (this.showPvpSafeZones && isInPvp())
 			{
 				safeZonePath = new GeneralPath(MapLocations.getPvpSafeZones(sceneRect, i));
 			}
@@ -316,7 +342,7 @@ public class MultiIndicatorsPlugin extends Plugin
 			currentPlane = i;
 
 			GeneralPath wildernessLevelLinesPath = null;
-			if (config.showWildernessLevelLines())
+			if (this.showWildernessLevelLines)
 			{
 				wildernessLevelLinesPath = new GeneralPath(MapLocations.getWildernessLevelLines(sceneRect, i));
 			}
@@ -343,6 +369,13 @@ public class MultiIndicatorsPlugin extends Plugin
 	@Subscribe
 	public void onConfigChanged(ConfigChanged event)
 	{
+		if (!event.getGroup().equals("multiindicators"))
+		{
+			return;
+		}
+
+		updateConfig();
+
 		if (event.getKey().equals("collisionDetection") ||
 			event.getKey().equals("multicombatZoneVisibility") ||
 			event.getKey().equals("deadmanSafeZones") ||
@@ -361,4 +394,16 @@ public class MultiIndicatorsPlugin extends Plugin
 			findLinesInScene();
 		}
 	}
+
+	private void updateConfig()
+	{
+		this.multicombatZoneVisibility = config.multicombatZoneVisibility();
+		this.showPvpSafeZones = config.showPvpSafeZones();
+		this.showDeadmanSafeZones = config.showDeadmanSafeZones();
+		this.showWildernessLevelLines = config.showWildernessLevelLines();
+		this.showMinimapLines = config.showMinimapLines();
+		this.multicombatColor = config.multicombatColor();
+		this.safeZoneColor = config.safeZoneColor();
+		this.wildernessLevelLinesColor = config.wildernessLevelLinesColor();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/musicindicator/MusicIndicatorPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/musicindicator/MusicIndicatorPlugin.java
index 694fc83698..1974109215 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/musicindicator/MusicIndicatorPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/musicindicator/MusicIndicatorPlugin.java
@@ -32,6 +32,7 @@ import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.ChatMessageType;
 import net.runelite.api.Client;
 import net.runelite.api.EnumDefinition;
@@ -55,7 +56,7 @@ import net.runelite.client.plugins.PluginType;
 	type = PluginType.UTILITY,
 	enabledByDefault = false
 )
-
+@Singleton
 public class MusicIndicatorPlugin extends Plugin
 {
 	private static final List<VarPlayer> MUSIC_TRACK_VARPS = ImmutableList.of(
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/musiclist/MusicListPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/musiclist/MusicListPlugin.java
index ab38b515f9..683666c2bc 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/musiclist/MusicListPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/musiclist/MusicListPlugin.java
@@ -29,6 +29,7 @@ import java.util.Collection;
 import java.util.Comparator;
 import java.util.stream.Collectors;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import net.runelite.api.Client;
@@ -57,6 +58,7 @@ import net.runelite.client.plugins.PluginDescriptor;
 	name = "Music List",
 	description = "Adds search and filter for the music list"
 )
+@Singleton
 public class MusicListPlugin extends Plugin
 {
 	@Inject
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/AbsorptionCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/AbsorptionCounter.java
index 3f91d8ee15..e6491a6205 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/AbsorptionCounter.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/AbsorptionCounter.java
@@ -26,11 +26,12 @@ package net.runelite.client.plugins.nightmarezone;
 
 import java.awt.Color;
 import java.awt.image.BufferedImage;
+import lombok.AccessLevel;
 import lombok.Setter;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.ui.overlay.infobox.Counter;
 
-@Setter
+@Setter(AccessLevel.PACKAGE)
 public class AbsorptionCounter extends Counter
 {
 	private int threshold;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZoneOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZoneOverlay.java
index 5a0a58e9da..247b2f97ab 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZoneOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZoneOverlay.java
@@ -27,6 +27,7 @@ package net.runelite.client.plugins.nightmarezone;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.ItemID;
 import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
@@ -46,10 +47,10 @@ import net.runelite.client.ui.overlay.components.table.TableComponent;
 import net.runelite.client.ui.overlay.infobox.InfoBoxManager;
 import net.runelite.client.util.StackFormatter;
 
+@Singleton
 class NightmareZoneOverlay extends Overlay
 {
 	private final Client client;
-	private final NightmareZoneConfig config;
 	private final NightmareZonePlugin plugin;
 	private final InfoBoxManager infoBoxManager;
 	private final ItemManager itemManager;
@@ -59,17 +60,15 @@ class NightmareZoneOverlay extends Overlay
 
 	@Inject
 	NightmareZoneOverlay(
-		Client client,
-		NightmareZoneConfig config,
-		NightmareZonePlugin plugin,
-		InfoBoxManager infoBoxManager,
-		ItemManager itemManager)
+		final Client client,
+		final NightmareZonePlugin plugin,
+		final InfoBoxManager infoBoxManager,
+		final ItemManager itemManager)
 	{
 		super(plugin);
 		setPosition(OverlayPosition.TOP_LEFT);
 		setPriority(OverlayPriority.LOW);
 		this.client = client;
-		this.config = config;
 		this.plugin = plugin;
 		this.infoBoxManager = infoBoxManager;
 		this.itemManager = itemManager;
@@ -79,7 +78,7 @@ class NightmareZoneOverlay extends Overlay
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (!plugin.isInNightmareZone() || !config.moveOverlay())
+		if (plugin.isNotInNightmareZone() || !plugin.isMoveOverlay())
 		{
 			if (absorptionCounter != null)
 			{
@@ -108,7 +107,7 @@ class NightmareZoneOverlay extends Overlay
 		tableComponent.setColumnAlignments(TableAlignment.LEFT, TableAlignment.RIGHT);
 		tableComponent.addRow("Points:", StackFormatter.formatNumber(client.getVar(Varbits.NMZ_POINTS)));
 		
-		if (config.showtotalpoints())
+		if (plugin.isShowtotalpoints())
 		{
 			tableComponent.addRow("Total:", StackFormatter.formatNumber(client.getVar(VarPlayer.NMZ_REWARD_POINTS) + client.getVar(Varbits.NMZ_POINTS)));
 		}
@@ -129,7 +128,7 @@ class NightmareZoneOverlay extends Overlay
 				absorptionCounter = null;
 			}
 		}
-		else if (config.moveOverlay())
+		else if (plugin.isMoveOverlay())
 		{
 			if (absorptionCounter == null)
 			{
@@ -144,9 +143,9 @@ class NightmareZoneOverlay extends Overlay
 
 	private void addAbsorptionCounter(int startValue)
 	{
-		absorptionCounter = new AbsorptionCounter(itemManager.getImage(ItemID.ABSORPTION_4), plugin, startValue, config.absorptionThreshold());
-		absorptionCounter.setAboveThresholdColor(config.absorptionColorAboveThreshold());
-		absorptionCounter.setBelowThresholdColor(config.absorptionColorBelowThreshold());
+		absorptionCounter = new AbsorptionCounter(itemManager.getImage(ItemID.ABSORPTION_4), plugin, startValue, plugin.getAbsorptionThreshold());
+		absorptionCounter.setAboveThresholdColor(plugin.getAbsorptionColorAboveThreshold());
+		absorptionCounter.setBelowThresholdColor(plugin.getAbsorptionColorBelowThreshold());
 		infoBoxManager.addInfoBox(absorptionCounter);
 	}
 
@@ -160,9 +159,9 @@ class NightmareZoneOverlay extends Overlay
 	{
 		if (absorptionCounter != null)
 		{
-			absorptionCounter.setAboveThresholdColor(config.absorptionColorAboveThreshold());
-			absorptionCounter.setBelowThresholdColor(config.absorptionColorBelowThreshold());
-			absorptionCounter.setThreshold(config.absorptionThreshold());
+			absorptionCounter.setAboveThresholdColor(plugin.getAbsorptionColorAboveThreshold());
+			absorptionCounter.setBelowThresholdColor(plugin.getAbsorptionColorBelowThreshold());
+			absorptionCounter.setThreshold(plugin.getAbsorptionThreshold());
 		}
 	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZonePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZonePlugin.java
index 3d038163d7..63fffe5396 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZonePlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZonePlugin.java
@@ -25,8 +25,12 @@
 package net.runelite.client.plugins.nightmarezone;
 
 import com.google.inject.Provides;
+import java.awt.Color;
 import java.util.Arrays;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
+import lombok.Getter;
 import net.runelite.api.ChatMessageType;
 import net.runelite.api.Client;
 import net.runelite.api.Varbits;
@@ -48,6 +52,7 @@ import net.runelite.client.util.Text;
 	description = "Show NMZ points/absorption and/or notify about expiring potions",
 	tags = {"combat", "nmz", "minigame", "notifications"}
 )
+@Singleton
 public class NightmareZonePlugin extends Plugin
 {
 	private static final int[] NMZ_MAP_REGION = {9033};
@@ -71,9 +76,28 @@ public class NightmareZonePlugin extends Plugin
 	// above the threshold before sending notifications
 	private boolean absorptionNotificationSend = true;
 
+	@Getter(AccessLevel.PACKAGE)
+	private boolean moveOverlay;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showtotalpoints;
+	private boolean powerSurgeNotification;
+	private boolean recurrentDamageNotification;
+	private boolean zapperNotification;
+	private boolean ultimateForceNotification;
+	private boolean overloadNotification;
+	private boolean absorptionNotification;
+	@Getter(AccessLevel.PACKAGE)
+	private int absorptionThreshold;
+	@Getter(AccessLevel.PACKAGE)
+	private Color absorptionColorAboveThreshold;
+	@Getter(AccessLevel.PACKAGE)
+	private Color absorptionColorBelowThreshold;
+
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
+
 		overlayManager.add(overlay);
 		overlay.removeAbsorptionCounter();
 	}
@@ -95,6 +119,12 @@ public class NightmareZonePlugin extends Plugin
 	@Subscribe
 	public void onConfigChanged(ConfigChanged event)
 	{
+		if (!event.getGroup().equals("nightmareZone"))
+		{
+			return;
+		}
+
+		updateConfig();
 		overlay.updateConfig();
 	}
 
@@ -107,7 +137,7 @@ public class NightmareZonePlugin extends Plugin
 	@Subscribe
 	public void onGameTick(GameTick event)
 	{
-		if (!isInNightmareZone())
+		if (isNotInNightmareZone())
 		{
 			if (!absorptionNotificationSend)
 			{
@@ -116,7 +146,8 @@ public class NightmareZonePlugin extends Plugin
 
 			return;
 		}
-		if (config.absorptionNotification())
+
+		if (this.absorptionNotification)
 		{
 			checkAbsorption();
 		}
@@ -126,7 +157,7 @@ public class NightmareZonePlugin extends Plugin
 	public void onChatMessage(ChatMessage event)
 	{
 		if (event.getType() != ChatMessageType.GAMEMESSAGE
-			|| !isInNightmareZone())
+			|| isNotInNightmareZone())
 		{
 			return;
 		}
@@ -134,7 +165,7 @@ public class NightmareZonePlugin extends Plugin
 		String msg = Text.removeTags(event.getMessage()); //remove color
 		if (msg.contains("The effects of overload have worn off, and you feel normal again."))
 		{
-			if (config.overloadNotification())
+			if (this.overloadNotification)
 			{
 				notifier.notify("Your overload has worn off");
 			}
@@ -143,28 +174,28 @@ public class NightmareZonePlugin extends Plugin
 		{
 			if (msg.contains("Power surge"))
 			{
-				if (config.powerSurgeNotification())
+				if (this.powerSurgeNotification)
 				{
 					notifier.notify(msg);
 				}
 			}
 			else if (msg.contains("Recurrent damage"))
 			{
-				if (config.recurrentDamageNotification())
+				if (this.recurrentDamageNotification)
 				{
 					notifier.notify(msg);
 				}
 			}
 			else if (msg.contains("Zapper"))
 			{
-				if (config.zapperNotification())
+				if (this.zapperNotification)
 				{
 					notifier.notify(msg);
 				}
 			}
 			else if (msg.contains("Ultimate force"))
 			{
-				if (config.ultimateForceNotification())
+				if (this.ultimateForceNotification)
 				{
 					notifier.notify(msg);
 				}
@@ -178,23 +209,38 @@ public class NightmareZonePlugin extends Plugin
 
 		if (!absorptionNotificationSend)
 		{
-			if (absorptionPoints < config.absorptionThreshold())
+			if (absorptionPoints < this.absorptionThreshold)
 			{
-				notifier.notify("Absorption points below: " + config.absorptionThreshold());
+				notifier.notify("Absorption points below: " + this.absorptionThreshold);
 				absorptionNotificationSend = true;
 			}
 		}
 		else
 		{
-			if (absorptionPoints > config.absorptionThreshold())
+			if (absorptionPoints > this.absorptionThreshold)
 			{
 				absorptionNotificationSend = false;
 			}
 		}
 	}
 
-	public boolean isInNightmareZone()
+	boolean isNotInNightmareZone()
 	{
-		return Arrays.equals(client.getMapRegions(), NMZ_MAP_REGION);
+		return !Arrays.equals(client.getMapRegions(), NMZ_MAP_REGION);
+	}
+
+	private void updateConfig()
+	{
+		this.moveOverlay = config.moveOverlay();
+		this.showtotalpoints = config.showtotalpoints();
+		this.powerSurgeNotification = config.powerSurgeNotification();
+		this.recurrentDamageNotification = config.recurrentDamageNotification();
+		this.zapperNotification = config.zapperNotification();
+		this.ultimateForceNotification = config.ultimateForceNotification();
+		this.overloadNotification = config.overloadNotification();
+		this.absorptionNotification = config.absorptionNotification();
+		this.absorptionThreshold = config.absorptionThreshold();
+		this.absorptionColorAboveThreshold = config.absorptionColorAboveThreshold();
+		this.absorptionColorBelowThreshold = config.absorptionColorBelowThreshold();
 	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesPanel.java
index b051cf0e5e..4092f2c15b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesPanel.java
@@ -29,6 +29,7 @@ import java.awt.BorderLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
+import javax.inject.Singleton;
 import javax.swing.AbstractAction;
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
@@ -44,12 +45,13 @@ import net.runelite.client.ui.ColorScheme;
 import net.runelite.client.ui.PluginPanel;
 
 @Slf4j
+@Singleton
 class NotesPanel extends PluginPanel
 {
 	private final JTextArea notesEditor = new JTextArea();
 	private final UndoManager undoRedo = new UndoManager();
 
-	void init(NotesConfig config)
+	void init(final NotesConfig config)
 	{
 		// this may or may not qualify as a hack
 		// but this lets the editor pane expand to fill the whole parent panel
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesPlugin.java
index c923a0eefe..e765944fbd 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesPlugin.java
@@ -27,6 +27,7 @@ package net.runelite.client.plugins.notes;
 import com.google.inject.Provides;
 import java.awt.image.BufferedImage;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.client.config.ConfigManager;
 import net.runelite.client.eventbus.Subscribe;
 import net.runelite.client.events.SessionOpen;
@@ -42,6 +43,7 @@ import net.runelite.client.util.ImageUtil;
 	tags = {"panel"},
 	loadWhenOutdated = true
 )
+@Singleton
 public class NotesPlugin extends Plugin
 {
 	@Inject
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/MemorizedNpc.java b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/MemorizedNpc.java
index 404748db74..8bc34e7738 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/MemorizedNpc.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/MemorizedNpc.java
@@ -28,6 +28,7 @@ import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
 import net.runelite.api.NPC;
@@ -36,34 +37,34 @@ import net.runelite.api.coords.WorldPoint;
 
 class MemorizedNpc
 {
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private int npcIndex;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private Set<String> npcNames;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private int npcSize;
 
 	/**
 	 * The time the npc died at, in game ticks, relative to the tick counter
 	 */
-	@Getter
-	@Setter
+	@Getter(AccessLevel.PACKAGE)
+	@Setter(AccessLevel.PACKAGE)
 	private int diedOnTick;
 
 	/**
 	 * The time it takes for the npc to respawn, in game ticks
 	 */
-	@Getter
-	@Setter
+	@Getter(AccessLevel.PACKAGE)
+	@Setter(AccessLevel.PACKAGE)
 	private int respawnTime;
 
-	@Getter
-	@Setter
+	@Getter(AccessLevel.PACKAGE)
+	@Setter(AccessLevel.PACKAGE)
 	private List<WorldPoint> possibleRespawnLocations;
 
-	MemorizedNpc(NPC npc)
+	MemorizedNpc(final NPC npc)
 	{
 		this.npcNames = new HashSet<>();
 		this.npcNames.add(npc.getName());
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java
index 2e1d0cdfa4..a65fbf0b4c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java
@@ -28,6 +28,7 @@ package net.runelite.client.plugins.npchighlight;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableSet;
 import com.google.inject.Provides;
+import java.awt.Color;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -39,6 +40,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
@@ -78,6 +80,7 @@ import net.runelite.client.util.WildcardMatcher;
 	tags = {"highlight", "minimap", "npcs", "overlay", "respawn", "tags"}
 )
 @Slf4j
+@Singleton
 public class NpcIndicatorsPlugin extends Plugin
 {
 	private static final int MAX_ACTOR_VIEW_RANGE = 15;
@@ -179,6 +182,21 @@ public class NpcIndicatorsPlugin extends Plugin
 	 */
 	private boolean skipNextSpawnCheck = false;
 
+	@Getter(AccessLevel.PACKAGE)
+	private RenderStyle renderStyle;
+	@Setter(AccessLevel.PACKAGE)
+	private String getNpcToHighlight;
+	@Getter(AccessLevel.PACKAGE)
+	private Color getHighlightColor;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean drawNames;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean drawMinimapNames;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean highlightMenuNames;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showRespawnTimer;
+
 	@Provides
 	NpcIndicatorsConfig provideConfig(ConfigManager configManager)
 	{
@@ -188,6 +206,8 @@ public class NpcIndicatorsPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
+
 		overlayManager.add(npcSceneOverlay);
 		overlayManager.add(npcMinimapOverlay);
 		keyManager.registerKeyListener(inputListener);
@@ -236,6 +256,8 @@ public class NpcIndicatorsPlugin extends Plugin
 			return;
 		}
 
+		updateConfig();
+
 		highlights = getHighlights();
 		rebuildAllNpcs();
 	}
@@ -261,7 +283,7 @@ public class NpcIndicatorsPlugin extends Plugin
 			type -= MENU_ACTION_DEPRIORITIZE_OFFSET;
 		}
 
-		if (config.highlightMenuNames() &&
+		if (this.highlightMenuNames &&
 			NPC_MENU_ACTIONS.contains(MenuAction.of(type)) &&
 			highlightedNpcs.stream().anyMatch(npc -> npc.getIndex() == event.getIdentifier()))
 		{
@@ -490,7 +512,7 @@ public class NpcIndicatorsPlugin extends Plugin
 	@VisibleForTesting
 	List<String> getHighlights()
 	{
-		final String configNpcs = config.getNpcToHighlight().toLowerCase();
+		final String configNpcs = this.getNpcToHighlight.toLowerCase();
 
 		if (configNpcs.isEmpty())
 		{
@@ -540,13 +562,10 @@ public class NpcIndicatorsPlugin extends Plugin
 		{
 			for (NPC npc : despawnedNpcsThisTick)
 			{
-				if (!teleportGraphicsObjectSpawnedThisTick.isEmpty())
+				if (!teleportGraphicsObjectSpawnedThisTick.isEmpty() && teleportGraphicsObjectSpawnedThisTick.contains(npc.getWorldLocation()))
 				{
-					if (teleportGraphicsObjectSpawnedThisTick.contains(npc.getWorldLocation()))
-					{
-						// NPC teleported away, so we don't want to add the respawn timer
-						continue;
-					}
+					// NPC teleported away, so we don't want to add the respawn timer
+					continue;
 				}
 
 				if (isInViewRange(client.getLocalPlayer().getWorldLocation(), npc.getWorldLocation()))
@@ -568,14 +587,12 @@ public class NpcIndicatorsPlugin extends Plugin
 
 			for (NPC npc : spawnedNpcsThisTick)
 			{
-				if (!teleportGraphicsObjectSpawnedThisTick.isEmpty())
+				if (!teleportGraphicsObjectSpawnedThisTick.isEmpty() &&
+					(teleportGraphicsObjectSpawnedThisTick.contains(npc.getWorldLocation()) ||
+						teleportGraphicsObjectSpawnedThisTick.contains(getWorldLocationBehind(npc))))
 				{
-					if (teleportGraphicsObjectSpawnedThisTick.contains(npc.getWorldLocation()) ||
-						teleportGraphicsObjectSpawnedThisTick.contains(getWorldLocationBehind(npc)))
-					{
-						// NPC teleported here, so we don't want to update the respawn timer
-						continue;
-					}
+					// NPC teleported here, so we don't want to update the respawn timer
+					continue;
 				}
 
 				if (lastPlayerLocation != null && isInViewRange(lastPlayerLocation, npc.getWorldLocation()))
@@ -619,4 +636,15 @@ public class NpcIndicatorsPlugin extends Plugin
 		despawnedNpcsThisTick.clear();
 		teleportGraphicsObjectSpawnedThisTick.clear();
 	}
+
+	private void updateConfig()
+	{
+		this.renderStyle = config.renderStyle();
+		this.getNpcToHighlight = config.getNpcToHighlight();
+		this.getHighlightColor = config.getHighlightColor();
+		this.drawNames = config.drawNames();
+		this.drawMinimapNames = config.drawMinimapNames();
+		this.highlightMenuNames = config.highlightMenuNames();
+		this.showRespawnTimer = config.showRespawnTimer();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcMinimapOverlay.java
index 2e46b11bd7..bb5519202c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcMinimapOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcMinimapOverlay.java
@@ -29,7 +29,7 @@ import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
-import net.runelite.api.Client;
+import javax.inject.Singleton;
 import net.runelite.api.NPC;
 import net.runelite.api.Point;
 import net.runelite.client.ui.overlay.Overlay;
@@ -37,17 +37,14 @@ import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayUtil;
 
+@Singleton
 public class NpcMinimapOverlay extends Overlay
 {
-	private final Client client;
-	private final NpcIndicatorsConfig config;
 	private final NpcIndicatorsPlugin plugin;
 
 	@Inject
-	NpcMinimapOverlay(Client client, NpcIndicatorsConfig config, NpcIndicatorsPlugin plugin)
+	NpcMinimapOverlay(final NpcIndicatorsPlugin plugin)
 	{
-		this.client = client;
-		this.config = config;
 		this.plugin = plugin;
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_WIDGETS);
@@ -58,7 +55,7 @@ public class NpcMinimapOverlay extends Overlay
 	{
 		for (NPC npc : plugin.getHighlightedNpcs())
 		{
-			renderNpcOverlay(graphics, npc, npc.getName(), config.getHighlightColor());
+			renderNpcOverlay(graphics, npc, npc.getName(), plugin.getGetHighlightColor());
 		}
 
 		return null;
@@ -71,7 +68,7 @@ public class NpcMinimapOverlay extends Overlay
 		{
 			OverlayUtil.renderMinimapLocation(graphics, minimapLocation, color.darker());
 
-			if (config.drawMinimapNames())
+			if (plugin.isDrawMinimapNames())
 			{
 				OverlayUtil.renderTextLocation(graphics, minimapLocation, name, color);
 			}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcSceneOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcSceneOverlay.java
index 7fd4cff995..5f0d3100a2 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcSceneOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcSceneOverlay.java
@@ -35,6 +35,7 @@ import java.text.NumberFormat;
 import java.time.Instant;
 import java.util.Locale;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.Constants;
 import net.runelite.api.NPC;
@@ -50,6 +51,7 @@ import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayUtil;
 import net.runelite.client.util.Text;
 
+@Singleton
 public class NpcSceneOverlay extends Overlay
 {
 	private static final Color TRANSPARENT = new Color(0, 0, 0, 0);
@@ -66,15 +68,13 @@ public class NpcSceneOverlay extends Overlay
 	}
 
 	private final Client client;
-	private final NpcIndicatorsConfig config;
 	private final NpcIndicatorsPlugin plugin;
 	private final ModelOutlineRenderer modelOutliner;
 
 	@Inject
-	NpcSceneOverlay(Client client, NpcIndicatorsConfig config, NpcIndicatorsPlugin plugin, ModelOutlineRenderer modelOutliner)
+	NpcSceneOverlay(final Client client, final NpcIndicatorsPlugin plugin, final ModelOutlineRenderer modelOutliner)
 	{
 		this.client = client;
-		this.config = config;
 		this.plugin = plugin;
 		this.modelOutliner = modelOutliner;
 		setPosition(OverlayPosition.DYNAMIC);
@@ -84,14 +84,14 @@ public class NpcSceneOverlay extends Overlay
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (config.showRespawnTimer())
+		if (plugin.isShowRespawnTimer())
 		{
 			plugin.getDeadNpcsToDisplay().forEach((id, npc) -> renderNpcRespawn(npc, graphics));
 		}
 
 		for (NPC npc : plugin.getHighlightedNpcs())
 		{
-			renderNpcOverlay(graphics, npc, config.getHighlightColor());
+			renderNpcOverlay(graphics, npc, plugin.getGetHighlightColor());
 		}
 
 		return null;
@@ -112,7 +112,7 @@ public class NpcSceneOverlay extends Overlay
 			return;
 		}
 
-		final Color color = config.getHighlightColor();
+		final Color color = plugin.getGetHighlightColor();
 
 		final LocalPoint centerLp = new LocalPoint(
 			lp.getX() + Perspective.LOCAL_TILE_SIZE * (npc.getNpcSize() - 1) / 2,
@@ -149,11 +149,15 @@ public class NpcSceneOverlay extends Overlay
 
 	private void renderNpcOverlay(Graphics2D graphics, NPC actor, Color color)
 	{
-		switch (config.renderStyle())
+		switch (plugin.getRenderStyle())
 		{
 			case SOUTH_WEST_TILE:
 				LocalPoint lp1 = LocalPoint.fromWorld(client, actor.getWorldLocation());
-				Polygon tilePoly1 = Perspective.getCanvasTilePoly(client, lp1);
+				Polygon tilePoly1 = null;
+				if (lp1 != null)
+				{
+					tilePoly1 = Perspective.getCanvasTilePoly(client, lp1);
+				}
 
 				renderPoly(graphics, color, tilePoly1);
 				break;
@@ -194,7 +198,7 @@ public class NpcSceneOverlay extends Overlay
 				break;
 		}
 
-		if (config.drawNames() && actor.getName() != null)
+		if (plugin.isDrawNames() && actor.getName() != null)
 		{
 			String npcName = Text.removeTags(actor.getName());
 			Point textLocation = actor.getCanvasTextLocation(graphics, npcName, actor.getLogicalHeight() + 40);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/MemorizedNPC.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/MemorizedNPC.java
index 4a746e63db..01d44c8379 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/MemorizedNPC.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/MemorizedNPC.java
@@ -25,6 +25,7 @@
 package net.runelite.client.plugins.npcstatus;
 
 import java.awt.Color;
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
@@ -39,22 +40,22 @@ class MemorizedNPC
 	private int npcIndex;
 	private String npcName;
 	private int attackSpeed;
-	@Setter
+	@Setter(AccessLevel.PACKAGE)
 	private int combatTimerEnd;
-	@Setter
+	@Setter(AccessLevel.PACKAGE)
 	private int timeLeft;
-	@Setter
+	@Setter(AccessLevel.PACKAGE)
 	private int flinchTimerEnd;
-	@Setter
+	@Setter(AccessLevel.PACKAGE)
 	private Status status;
-	@Setter
+	@Setter(AccessLevel.PACKAGE)
 	private WorldArea lastnpcarea;
-	@Setter
+	@Setter(AccessLevel.PACKAGE)
 	private Actor lastinteracted;
-	@Setter
+	@Setter(AccessLevel.PACKAGE)
 	private int lastspotanimation;
 
-	MemorizedNPC(NPC npc, int attackSpeed, WorldArea worldArea)
+	MemorizedNPC(final NPC npc, final int attackSpeed, final WorldArea worldArea)
 	{
 		this.npc = npc;
 		this.npcIndex = npc.getIndex();
@@ -69,7 +70,7 @@ class MemorizedNPC
 		this.lastspotanimation = -1;
 	}
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	@AllArgsConstructor
 	enum Status
 	{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusConfig.java
index bf0495fae5..5b0b0c97e7 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusConfig.java
@@ -32,9 +32,9 @@ import net.runelite.client.config.ConfigItem;
 public interface NpcStatusConfig extends Config
 {
 	@ConfigItem(
-			keyName = "AttackRange",
-			name = "NPC Attack range",
-			description = "The attack range of the NPC"
+		keyName = "AttackRange",
+		name = "NPC Attack range",
+		description = "The attack range of the NPC"
 	)
 	default int getRange()
 	{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusOverlay.java
index 7b948f24c0..8814b6769a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusOverlay.java
@@ -27,6 +27,7 @@ package net.runelite.client.plugins.npcstatus;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.Point;
 import net.runelite.client.ui.overlay.Overlay;
@@ -34,13 +35,14 @@ import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayUtil;
 
+@Singleton
 public class NpcStatusOverlay extends Overlay
 {
 	private final Client client;
 	private final NpcStatusPlugin plugin;
 
 	@Inject
-	NpcStatusOverlay(Client client, NpcStatusPlugin plugin)
+	NpcStatusOverlay(final Client client, final NpcStatusPlugin plugin)
 	{
 		this.client = client;
 		this.plugin = plugin;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusPlugin.java
index 0f1a59a17a..2c7b4e438f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusPlugin.java
@@ -30,6 +30,7 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
@@ -39,6 +40,7 @@ import net.runelite.api.GraphicID;
 import net.runelite.api.Hitsplat;
 import net.runelite.api.NPC;
 import net.runelite.api.coords.WorldArea;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.GameStateChanged;
 import net.runelite.api.events.GameTick;
 import net.runelite.api.events.HitsplatApplied;
@@ -46,10 +48,10 @@ import net.runelite.api.events.NpcDespawned;
 import net.runelite.api.events.NpcSpawned;
 import net.runelite.client.config.ConfigManager;
 import net.runelite.client.eventbus.Subscribe;
-import net.runelite.client.game.ItemManager;
 import net.runelite.client.game.NPCManager;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginDescriptor;
+import net.runelite.client.plugins.PluginType;
 import net.runelite.client.ui.overlay.OverlayManager;
 
 @Slf4j
@@ -57,28 +59,37 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	name = "NPC Status Timer",
 	description = "Adds a timer on NPC's for their attacks and flinching.",
 	tags = {"flinch", "npc"},
+	type = PluginType.PVM,
 	enabledByDefault = false
 )
+@Singleton
 public class NpcStatusPlugin extends Plugin
 {
 	@Getter(AccessLevel.PACKAGE)
 	private final Set<MemorizedNPC> memorizedNPCs = new HashSet<>();
+
 	@Inject
 	private Client client;
+
 	@Inject
 	private OverlayManager overlayManager;
-	@Inject
-	private ItemManager itemManager;
+
 	@Inject
 	private NPCManager npcManager;
+
 	@Inject
 	private NpcStatusConfig config;
+
 	@Inject
 	private NpcStatusOverlay npcStatusOverlay;
+
 	@Getter(AccessLevel.PACKAGE)
 	private Instant lastTickUpdate;
+
 	private WorldArea lastPlayerLocation;
 
+	private int getRange;
+
 	@Provides
 	NpcStatusConfig provideConfig(ConfigManager configManager)
 	{
@@ -88,6 +99,7 @@ public class NpcStatusPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		this.getRange = config.getRange();
 		overlayManager.add(npcStatusOverlay);
 	}
 
@@ -136,21 +148,19 @@ public class NpcStatusPlugin extends Plugin
 			return;
 		}
 		final Hitsplat hitsplat = event.getHitsplat();
-		if (hitsplat.getHitsplatType() == Hitsplat.HitsplatType.DAMAGE || hitsplat.getHitsplatType() == Hitsplat.HitsplatType.BLOCK)
+		if ((hitsplat.getHitsplatType() == Hitsplat.HitsplatType.DAMAGE || hitsplat.getHitsplatType() == Hitsplat.HitsplatType.BLOCK) && event.getActor() instanceof NPC)
 		{
-			if (event.getActor() instanceof NPC)
+			for (MemorizedNPC mn : memorizedNPCs)
 			{
-				for (MemorizedNPC mn : memorizedNPCs)
+				if (mn.getStatus() == MemorizedNPC.Status.OUT_OF_COMBAT || (mn.getStatus() == MemorizedNPC.Status.IN_COMBAT && mn.getCombatTimerEnd() - client.getTickCount() < 1) || mn.getLastinteracted() == null)
 				{
-					if (mn.getStatus() == MemorizedNPC.Status.OUT_OF_COMBAT || (mn.getStatus() == MemorizedNPC.Status.IN_COMBAT && mn.getCombatTimerEnd() - client.getTickCount() < 1) || mn.getLastinteracted() == null)
-					{
-						mn.setStatus(MemorizedNPC.Status.FLINCHING);
-						mn.setCombatTimerEnd(-1);
-						mn.setFlinchTimerEnd(client.getTickCount() + mn.getAttackSpeed() / 2 + 1);
-					}
+					mn.setStatus(MemorizedNPC.Status.FLINCHING);
+					mn.setCombatTimerEnd(-1);
+					mn.setFlinchTimerEnd(client.getTickCount() + mn.getAttackSpeed() / 2 + 1);
 				}
 			}
 		}
+
 	}
 
 	private void checkStatus()
@@ -169,7 +179,7 @@ public class NpcStatusPlugin extends Plugin
 				if (npc.getLastspotanimation() == GraphicID.SPLASH && npc.getNpc().getSpotAnimation() == GraphicID.SPLASH) //For splash flinching
 				{
 					npc.setLastspotanimation(-1);
-					if ((npc.getStatus() == MemorizedNPC.Status.OUT_OF_COMBAT ) || npc.getLastinteracted() == null)
+					if ((npc.getStatus() == MemorizedNPC.Status.OUT_OF_COMBAT) || npc.getLastinteracted() == null)
 					{
 						npc.setStatus(MemorizedNPC.Status.FLINCHING);
 						npc.setCombatTimerEnd(-1);
@@ -180,8 +190,8 @@ public class NpcStatusPlugin extends Plugin
 					}
 				}
 				//Checks: will the NPC attack this tick?
-				if (((npc.getNpc().getWorldArea().canMelee(client, lastPlayerLocation) && config.getRange() == 1) //Separate mechanics for meleerange-only NPC's because they have extra collisiondata checks (fences etc.) and can't attack diagonally
-					|| (lastPlayerLocation.hasLineOfSightTo(client, npc.getNpc().getWorldArea()) && npc.getNpc().getWorldArea().distanceTo(lastPlayerLocation) <= config.getRange() && config.getRange() > 1))
+				if (((npc.getNpc().getWorldArea().canMelee(client, lastPlayerLocation) && this.getRange == 1) //Separate mechanics for meleerange-only NPC's because they have extra collisiondata checks (fences etc.) and can't attack diagonally
+					|| (lastPlayerLocation.hasLineOfSightTo(client, npc.getNpc().getWorldArea()) && npc.getNpc().getWorldArea().distanceTo(lastPlayerLocation) <= this.getRange && this.getRange > 1))
 					&& ((npc.getStatus() != MemorizedNPC.Status.FLINCHING && CombatTime < 9) || (npc.getStatus() == MemorizedNPC.Status.FLINCHING && FlinchTime < 2))
 					&& npc.getNpc().getAnimation() != -1 //Failsafe, attacking NPC's always have an animation.
 					&& !(npc.getLastnpcarea().distanceTo(lastPlayerLocation) == 0 && npc.getLastnpcarea() != npc.getNpc().getWorldArea())) //Weird mechanic: NPC's can't attack on the tick they do a random move
@@ -228,4 +238,15 @@ public class NpcStatusPlugin extends Plugin
 		checkStatus();
 		lastPlayerLocation = client.getLocalPlayer().getWorldArea();
 	}
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged configChanged)
+	{
+		if (!configChanged.getGroup().equals("npcstatus"))
+		{
+			return;
+		}
+
+		this.getRange = config.getRange();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/AggressionTimer.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/AggressionTimer.java
index 7194d2ddd6..5a091eaabd 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/AggressionTimer.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/AggressionTimer.java
@@ -29,6 +29,7 @@ import java.awt.image.BufferedImage;
 import java.time.Duration;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
 import net.runelite.client.plugins.Plugin;
@@ -36,11 +37,11 @@ import net.runelite.client.ui.overlay.infobox.Timer;
 
 class AggressionTimer extends Timer
 {
-	@Getter
-	@Setter
+	@Getter(AccessLevel.PACKAGE)
+	@Setter(AccessLevel.PACKAGE)
 	private boolean visible;
 
-	AggressionTimer(Duration duration, BufferedImage image, Plugin plugin, boolean visible)
+	AggressionTimer(final Duration duration, final BufferedImage image, final Plugin plugin, final boolean visible)
 	{
 		super(duration.toMillis(), ChronoUnit.MILLIS, image, plugin);
 		setTooltip("Time until NPCs become unaggressive");
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaConfig.java
index 38cb016c63..46593c4d32 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaConfig.java
@@ -115,4 +115,15 @@ public interface NpcAggroAreaConfig extends Config
 	{
 		return false;
 	}
+
+	@ConfigItem(
+		keyName = "sendNotification",
+		name = "Send notification",
+		description = "Send a notification when the timer runs out",
+		position = 7
+	)
+	default boolean sendNotification()
+	{
+		return false;
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaNotWorkingOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaNotWorkingOverlay.java
index 3d238cce85..533d4ae93b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaNotWorkingOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaNotWorkingOverlay.java
@@ -25,6 +25,7 @@
 package net.runelite.client.plugins.npcunaggroarea;
 
 import com.google.inject.Inject;
+import com.google.inject.Singleton;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import net.runelite.client.ui.overlay.Overlay;
@@ -33,17 +34,16 @@ import net.runelite.client.ui.overlay.OverlayPriority;
 import net.runelite.client.ui.overlay.components.LineComponent;
 import net.runelite.client.ui.overlay.components.PanelComponent;
 
+@Singleton
 class NpcAggroAreaNotWorkingOverlay extends Overlay
 {
 	private final NpcAggroAreaPlugin plugin;
-	private final NpcAggroAreaConfig config;
 	private final PanelComponent panelComponent;
 
 	@Inject
-	private NpcAggroAreaNotWorkingOverlay(NpcAggroAreaPlugin plugin, NpcAggroAreaConfig config)
+	private NpcAggroAreaNotWorkingOverlay(final NpcAggroAreaPlugin plugin)
 	{
 		this.plugin = plugin;
-		this.config = config;
 
 		panelComponent = new PanelComponent();
 		panelComponent.setPreferredSize(new Dimension(150, 0));
@@ -58,7 +58,7 @@ class NpcAggroAreaNotWorkingOverlay extends Overlay
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (!plugin.isActive() || plugin.getSafeCenters()[1] != null || config.hideOverlayHint())
+		if (!plugin.isActive() || plugin.getSafeCenters()[1] != null || plugin.isHideOverlayHint())
 		{
 			return null;
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaOverlay.java
index 2090fca5c2..916b74450a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaOverlay.java
@@ -24,6 +24,7 @@
  */
 package net.runelite.client.plugins.npcunaggroarea;
 
+import javax.inject.Singleton;
 import net.runelite.api.geometry.Geometry;
 import java.awt.BasicStroke;
 import java.awt.Color;
@@ -42,19 +43,18 @@ import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayPriority;
 
+@Singleton
 class NpcAggroAreaOverlay extends Overlay
 {
 	private static final int MAX_LOCAL_DRAW_LENGTH = 20 * Perspective.LOCAL_TILE_SIZE;
 
 	private final Client client;
-	private final NpcAggroAreaConfig config;
 	private final NpcAggroAreaPlugin plugin;
 
 	@Inject
-	private NpcAggroAreaOverlay(Client client, NpcAggroAreaConfig config, NpcAggroAreaPlugin plugin)
+	private NpcAggroAreaOverlay(final Client client, final NpcAggroAreaPlugin plugin)
 	{
 		this.client = client;
-		this.config = config;
 		this.plugin = plugin;
 
 		setLayer(OverlayLayer.ABOVE_SCENE);
@@ -76,7 +76,7 @@ class NpcAggroAreaOverlay extends Overlay
 			return null;
 		}
 
-		Color outlineColor = config.aggroAreaColor();
+		Color outlineColor = plugin.getAggroAreaColor();
 		AggressionTimer timer = plugin.getCurrentTimer();
 		if (timer == null || Instant.now().compareTo(timer.getEndTime()) < 0)
 		{
@@ -86,6 +86,10 @@ class NpcAggroAreaOverlay extends Overlay
 				outlineColor.getBlue(),
 				100);
 		}
+		else
+		{
+			plugin.doNotification();
+		}
 
 		renderPath(graphics, lines, outlineColor);
 		return null;
@@ -110,8 +114,11 @@ class NpcAggroAreaOverlay extends Overlay
 		path = Geometry.transformPath(path, coords ->
 		{
 			Point point = Perspective.localToCanvas(client, new LocalPoint((int) coords[0], (int) coords[1]), client.getPlane());
-			coords[0] = point.getX();
-			coords[1] = point.getY();
+			if (point != null)
+			{
+				coords[0] = point.getX();
+				coords[1] = point.getY();
+			}
 		});
 
 		graphics.draw(path);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java
index d7aede1a4f..75335426cb 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java
@@ -24,10 +24,10 @@
  */
 package net.runelite.client.plugins.npcunaggroarea;
 
-import net.runelite.api.geometry.Geometry;
 import com.google.common.base.Splitter;
 import com.google.common.base.Strings;
 import com.google.inject.Provides;
+import java.awt.Color;
 import java.awt.Polygon;
 import java.awt.Rectangle;
 import java.awt.geom.Area;
@@ -38,6 +38,8 @@ import java.time.Instant;
 import java.util.Arrays;
 import java.util.List;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
@@ -46,6 +48,7 @@ import net.runelite.api.ItemID;
 import net.runelite.api.NPC;
 import net.runelite.api.NPCDefinition;
 import net.runelite.api.Perspective;
+import net.runelite.api.Player;
 import net.runelite.api.coords.LocalPoint;
 import net.runelite.api.coords.WorldArea;
 import net.runelite.api.coords.WorldPoint;
@@ -53,6 +56,8 @@ import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.GameStateChanged;
 import net.runelite.api.events.GameTick;
 import net.runelite.api.events.NpcSpawned;
+import net.runelite.api.geometry.Geometry;
+import net.runelite.client.Notifier;
 import net.runelite.client.config.ConfigManager;
 import net.runelite.client.eventbus.Subscribe;
 import net.runelite.client.game.ItemManager;
@@ -69,6 +74,7 @@ import net.runelite.client.util.WildcardMatcher;
 	tags = {"highlight", "lines", "unaggro", "aggro", "aggressive", "npcs", "area", "slayer"},
 	enabledByDefault = false
 )
+@Singleton
 public class NpcAggroAreaPlugin extends Plugin
 {
 	/*
@@ -112,23 +118,39 @@ public class NpcAggroAreaPlugin extends Plugin
 	@Inject
 	private ConfigManager configManager;
 
-	@Getter
+	@Inject
+	private Notifier notifier;
+
+	@Getter(AccessLevel.PACKAGE)
 	private final WorldPoint[] safeCenters = new WorldPoint[2];
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final GeneralPath[] linesToDisplay = new GeneralPath[Constants.MAX_Z];
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private boolean active;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private AggressionTimer currentTimer;
 
+	private boolean alwaysActive;
+	private String configNpcNamePatterns;
+	private boolean showTimer;
+	private boolean showAreaLines;
+	@Getter(AccessLevel.PACKAGE)
+	private Color aggroAreaColor;
+	private boolean showNotWorkingOverlay;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean hideOverlayHint;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean sendNotification;
+
 	private WorldPoint lastPlayerLocation;
 	private WorldPoint previousUnknownCenter;
 	private boolean loggingIn;
 	private List<String> npcNamePatterns;
 	private boolean notWorkingOverlayShown = false;
+	private boolean hasSentNotification = false;
 
 	@Provides
 	NpcAggroAreaConfig provideConfig(ConfigManager configManager)
@@ -139,14 +161,16 @@ public class NpcAggroAreaPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
+
 		overlayManager.add(overlay);
-		if (config.showNotWorkingOverlay())
+		if (this.showNotWorkingOverlay)
 		{
 			overlayManager.add(notWorkingOverlay);
 			notWorkingOverlayShown = true;
 		}
 
-		npcNamePatterns = NAME_SPLITTER.splitToList(config.npcNamePatterns());
+		npcNamePatterns = NAME_SPLITTER.splitToList(this.configNpcNamePatterns);
 		recheckActive();
 	}
 
@@ -203,7 +227,7 @@ public class NpcAggroAreaPlugin extends Plugin
 	{
 		if (currentTimer != null)
 		{
-			currentTimer.setVisible(active && config.showTimer());
+			currentTimer.setVisible(active && this.showTimer);
 		}
 
 		calculateLinesToDisplay();
@@ -211,7 +235,7 @@ public class NpcAggroAreaPlugin extends Plugin
 
 	private void calculateLinesToDisplay()
 	{
-		if (!active || !config.showAreaLines())
+		if (!active || !this.showAreaLines)
 		{
 			Arrays.fill(linesToDisplay, null);
 			return;
@@ -241,8 +265,9 @@ public class NpcAggroAreaPlugin extends Plugin
 	{
 		removeTimer();
 		BufferedImage image = itemManager.getImage(ItemID.ENSOULED_DEMON_HEAD);
-		currentTimer = new AggressionTimer(duration, image, this, active && config.showTimer());
+		currentTimer = new AggressionTimer(duration, image, this, active && this.showTimer);
 		infoBoxManager.addInfoBox(currentTimer);
+		hasSentNotification = false;
 	}
 
 	private void resetTimer()
@@ -310,14 +335,14 @@ public class NpcAggroAreaPlugin extends Plugin
 
 	private void recheckActive()
 	{
-		active = config.alwaysActive();
+		active = this.alwaysActive;
 		checkAreaNpcs(client.getCachedNPCs());
 	}
 
 	@Subscribe
 	public void onNpcSpawned(NpcSpawned event)
 	{
-		if (config.alwaysActive())
+		if (this.alwaysActive)
 		{
 			return;
 		}
@@ -329,20 +354,17 @@ public class NpcAggroAreaPlugin extends Plugin
 	public void onGameTick(GameTick event)
 	{
 		WorldPoint newLocation = client.getLocalPlayer().getWorldLocation();
-		if (lastPlayerLocation != null)
+		if (lastPlayerLocation != null && safeCenters[1] == null && newLocation.distanceTo2D(lastPlayerLocation) > SAFE_AREA_RADIUS * 4)
 		{
-			if (safeCenters[1] == null && newLocation.distanceTo2D(lastPlayerLocation) > SAFE_AREA_RADIUS * 4)
-			{
-				safeCenters[0] = null;
-				safeCenters[1] = newLocation;
-				resetTimer();
-				calculateLinesToDisplay();
+			safeCenters[0] = null;
+			safeCenters[1] = newLocation;
+			resetTimer();
+			calculateLinesToDisplay();
 
-				// We don't know where the previous area was, so if the player e.g.
-				// entered a dungeon and then goes back out, he/she may enter the previous
-				// area which is unknown and would make the plugin inaccurate
-				previousUnknownCenter = lastPlayerLocation;
-			}
+			// We don't know where the previous area was, so if the player e.g.
+			// entered a dungeon and then goes back out, he/she may enter the previous
+			// area which is unknown and would make the plugin inaccurate
+			previousUnknownCenter = lastPlayerLocation;
 		}
 
 		if (safeCenters[0] == null && previousUnknownCenter != null &&
@@ -355,17 +377,14 @@ public class NpcAggroAreaPlugin extends Plugin
 			calculateLinesToDisplay();
 		}
 
-		if (safeCenters[1] != null)
+		if (safeCenters[1] != null && Arrays.stream(safeCenters).noneMatch(
+			x -> x != null && x.distanceTo2D(newLocation) <= SAFE_AREA_RADIUS))
 		{
-			if (Arrays.stream(safeCenters).noneMatch(
-				x -> x != null && x.distanceTo2D(newLocation) <= SAFE_AREA_RADIUS))
-			{
-				safeCenters[0] = safeCenters[1];
-				safeCenters[1] = newLocation;
-				resetTimer();
-				calculateLinesToDisplay();
-				previousUnknownCenter = null;
-			}
+			safeCenters[0] = safeCenters[1];
+			safeCenters[1] = newLocation;
+			resetTimer();
+			calculateLinesToDisplay();
+			previousUnknownCenter = null;
 		}
 
 		lastPlayerLocation = newLocation;
@@ -374,6 +393,13 @@ public class NpcAggroAreaPlugin extends Plugin
 	@Subscribe
 	public void onConfigChanged(ConfigChanged event)
 	{
+		if (!event.getGroup().equals("npcUnaggroArea"))
+		{
+			return;
+		}
+
+		updateConfig();
+
 		String key = event.getKey();
 		switch (key)
 		{
@@ -383,7 +409,7 @@ public class NpcAggroAreaPlugin extends Plugin
 			case "npcUnaggroShowTimer":
 				if (currentTimer != null)
 				{
-					currentTimer.setVisible(active && config.showTimer());
+					currentTimer.setVisible(active && this.showTimer);
 				}
 				break;
 			case "npcUnaggroCollisionDetection":
@@ -391,9 +417,12 @@ public class NpcAggroAreaPlugin extends Plugin
 				calculateLinesToDisplay();
 				break;
 			case "npcUnaggroNames":
-				npcNamePatterns = NAME_SPLITTER.splitToList(config.npcNamePatterns());
+				npcNamePatterns = NAME_SPLITTER.splitToList(this.configNpcNamePatterns);
 				recheckActive();
 				break;
+			case "sendNotification":
+				hasSentNotification = false;
+				break;
 		}
 	}
 
@@ -483,4 +512,33 @@ public class NpcAggroAreaPlugin extends Plugin
 				break;
 		}
 	}
+
+	void doNotification()
+	{
+		if (!this.sendNotification)
+		{
+			return;
+		}
+
+		if (hasSentNotification)
+		{
+			return;
+		}
+
+		final Player local = client.getLocalPlayer();
+		hasSentNotification = true;
+		notifier.notify("[" + local.getName() + "]'s aggression timer has run out!");
+	}
+
+	private void updateConfig()
+	{
+		this.alwaysActive = config.alwaysActive();
+		this.configNpcNamePatterns = config.npcNamePatterns();
+		this.showTimer = config.showTimer();
+		this.showAreaLines = config.showAreaLines();
+		this.aggroAreaColor = config.aggroAreaColor();
+		this.showNotWorkingOverlay = config.showNotWorkingOverlay();
+		this.hideOverlayHint = config.hideOverlayHint();
+		this.sendNotification = config.sendNotification();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsOverlay.java
index a4e9aee7e9..e9ac6d354a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsOverlay.java
@@ -32,6 +32,7 @@ import java.awt.Polygon;
 import java.awt.geom.Area;
 import static java.lang.Math.floor;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.DecorativeObject;
 import net.runelite.api.GameObject;
@@ -43,20 +44,19 @@ import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayPriority;
 import net.runelite.client.ui.overlay.OverlayUtil;
 
+@Singleton
 class ObjectIndicatorsOverlay extends Overlay
 {
 	private static final Color TRANSPARENT = new Color(0, 0, 0, 0);
 
 	private final Client client;
-	private final ObjectIndicatorsConfig config;
 	private final ObjectIndicatorsPlugin plugin;
 	private final ModelOutlineRenderer modelOutliner;
 
 	@Inject
-	private ObjectIndicatorsOverlay(Client client, ObjectIndicatorsConfig config, ObjectIndicatorsPlugin plugin, ModelOutlineRenderer modelOutliner)
+	private ObjectIndicatorsOverlay(final Client client, final ObjectIndicatorsPlugin plugin, final ModelOutlineRenderer modelOutliner)
 	{
 		this.client = client;
-		this.config = config;
 		this.plugin = plugin;
 		this.modelOutliner = modelOutliner;
 		setPosition(OverlayPosition.DYNAMIC);
@@ -74,14 +74,14 @@ class ObjectIndicatorsOverlay extends Overlay
 				continue;
 			}
 
-			Color color = config.objectMarkerColor();
-			int opacity = (int) floor(config.objectMarkerAlpha() * 2.55);
+			Color color = plugin.getObjectMarkerColor();
+			int opacity = (int) floor(plugin.getObjectMarkerAlpha() * 2.55);
 			Color objectColor = new Color(color.getRed(), color.getGreen(), color.getBlue(), opacity);
 
-			switch (config.objectMarkerRenderStyle())
+			switch (plugin.getObjectMarkerRenderStyle())
 			{
 				case OUTLINE:
-					switch (config.objectMarkerOutlineRenderStyle())
+					switch (plugin.getObjectMarkerOutlineRenderStyle())
 					{
 						case THIN_OUTLINE:
 							modelOutliner.drawOutline(object, 1, objectColor);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java
index adb0cb4bc5..0f20e4c8df 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java
@@ -29,6 +29,7 @@ import com.google.common.base.Strings;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.google.inject.Provides;
+import java.awt.Color;
 import java.awt.event.KeyEvent;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -38,6 +39,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
@@ -53,6 +55,7 @@ import net.runelite.api.Scene;
 import net.runelite.api.Tile;
 import net.runelite.api.TileObject;
 import net.runelite.api.coords.WorldPoint;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.DecorativeObjectDespawned;
 import net.runelite.api.events.DecorativeObjectSpawned;
 import net.runelite.api.events.FocusChanged;
@@ -76,6 +79,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	tags = {"overlay", "objects", "mark", "marker"},
 	enabledByDefault = false
 )
+@Singleton
 public class ObjectIndicatorsPlugin extends Plugin implements KeyListener
 {
 	private static final String CONFIG_GROUP = "objectindicators";
@@ -100,9 +104,21 @@ public class ObjectIndicatorsPlugin extends Plugin implements KeyListener
 	@Inject
 	private ObjectIndicatorsOverlay overlay;
 
+	@Inject
+	private ObjectIndicatorsConfig config;
+
 	@Inject
 	private KeyManager keyManager;
 
+	@Getter(AccessLevel.PACKAGE)
+	private RenderStyle objectMarkerRenderStyle;
+	@Getter(AccessLevel.PACKAGE)
+	private OutlineRenderStyle objectMarkerOutlineRenderStyle;
+	@Getter(AccessLevel.PACKAGE)
+	private Color objectMarkerColor;
+	@Getter(AccessLevel.PACKAGE)
+	private int objectMarkerAlpha;
+
 	@Provides
 	ObjectIndicatorsConfig provideConfig(ConfigManager configManager)
 	{
@@ -112,6 +128,8 @@ public class ObjectIndicatorsPlugin extends Plugin implements KeyListener
 	@Override
 	protected void startUp()
 	{
+		updateConfig();
+
 		overlayManager.add(overlay);
 		keyManager.registerKeyListener(this);
 	}
@@ -314,13 +332,11 @@ public class ObjectIndicatorsPlugin extends Plugin implements KeyListener
 		for (ObjectPoint objectPoint : objectPoints)
 		{
 			if ((worldPoint.getX() & (REGION_SIZE - 1)) == objectPoint.getRegionX()
-				&& (worldPoint.getY() & (REGION_SIZE - 1)) == objectPoint.getRegionY())
+				&& (worldPoint.getY() & (REGION_SIZE - 1)) == objectPoint.getRegionY()
+				&& objectPoint.getName().equals(client.getObjectDefinition(object.getId()).getName()))
 			{
-				if (objectPoint.getName().equals(client.getObjectDefinition(object.getId()).getName()))
-				{
-					objects.add(object);
-					break;
-				}
+				objects.add(object);
+				break;
 			}
 		}
 	}
@@ -428,4 +444,23 @@ public class ObjectIndicatorsPlugin extends Plugin implements KeyListener
 		{
 		}.getType());
 	}
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (!event.getGroup().equals("objectindicators"))
+		{
+			return;
+		}
+
+		updateConfig();
+	}
+
+	private void updateConfig()
+	{
+		this.objectMarkerRenderStyle = config.objectMarkerRenderStyle();
+		this.objectMarkerOutlineRenderStyle = config.objectMarkerOutlineRenderStyle();
+		this.objectMarkerColor = config.objectMarkerColor();
+		this.objectMarkerAlpha = config.objectMarkerAlpha();
+	}
 }
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoOverlay.java
index 9ca6337427..2913384345 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoOverlay.java
@@ -32,6 +32,7 @@ import java.awt.Graphics2D;
 import java.awt.Point;
 import java.awt.Rectangle;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Actor;
 import net.runelite.api.Client;
 import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
@@ -52,6 +53,7 @@ import net.runelite.client.ui.overlay.components.TitleComponent;
 import net.runelite.client.util.Text;
 import net.runelite.http.api.hiscore.HiscoreResult;
 
+@Singleton
 class OpponentInfoOverlay extends Overlay
 {
 	private static final Color HP_GREEN = new Color(0, 146, 54, 230);
@@ -59,7 +61,6 @@ class OpponentInfoOverlay extends Overlay
 
 	private final Client client;
 	private final OpponentInfoPlugin opponentInfoPlugin;
-	private final OpponentInfoConfig opponentInfoConfig;
 	private final HiscoreManager hiscoreManager;
 	private final NPCManager npcManager;
 
@@ -73,16 +74,14 @@ class OpponentInfoOverlay extends Overlay
 
 	@Inject
 	private OpponentInfoOverlay(
-		Client client,
-		OpponentInfoPlugin opponentInfoPlugin,
-		OpponentInfoConfig opponentInfoConfig,
-		HiscoreManager hiscoreManager,
-		NPCManager npcManager)
+		final Client client,
+		final OpponentInfoPlugin opponentInfoPlugin,
+		final HiscoreManager hiscoreManager,
+		final NPCManager npcManager)
 	{
 		super(opponentInfoPlugin);
 		this.client = client;
 		this.opponentInfoPlugin = opponentInfoPlugin;
-		this.opponentInfoConfig = opponentInfoConfig;
 		this.hiscoreManager = hiscoreManager;
 		this.npcManager = npcManager;
 
@@ -164,7 +163,7 @@ class OpponentInfoOverlay extends Overlay
 			progressBarComponent.setBackgroundColor(HP_RED);
 			progressBarComponent.setForegroundColor(HP_GREEN);
 
-			final HitpointsDisplayStyle displayStyle = opponentInfoConfig.hitpointsDisplayStyle();
+			final HitpointsDisplayStyle displayStyle = opponentInfoPlugin.getHitpointsDisplayStyle();
 
 			if ((displayStyle == HitpointsDisplayStyle.HITPOINTS || displayStyle == HitpointsDisplayStyle.BOTH)
 				&& lastMaxHealth != -1)
@@ -219,7 +218,7 @@ class OpponentInfoOverlay extends Overlay
 		}
 
 		// Opponents opponent
-		if (opponentsOpponentName != null && opponentInfoConfig.showOpponentsOpponent())
+		if (opponentsOpponentName != null && opponentInfoPlugin.isShowOpponentsOpponent())
 		{
 			textWidth = Math.max(textWidth, fontMetrics.stringWidth(opponentsOpponentName));
 			panelComponent.setPreferredSize(new Dimension(textWidth, 0));
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java
index 6e36665a8b..e65b070674 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java
@@ -30,12 +30,14 @@ import java.time.Duration;
 import java.time.Instant;
 import java.util.EnumSet;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.Actor;
 import net.runelite.api.Client;
 import net.runelite.api.GameState;
 import net.runelite.api.WorldType;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.GameStateChanged;
 import net.runelite.api.events.GameTick;
 import net.runelite.api.events.InteractingChanged;
@@ -51,6 +53,7 @@ import net.runelite.http.api.hiscore.HiscoreEndpoint;
 	description = "Show name and hitpoints information about the NPC you are fighting",
 	tags = {"combat", "health", "hitpoints", "npcs", "overlay"}
 )
+@Singleton
 public class OpponentInfoPlugin extends Plugin
 {
 	private static final Duration WAIT = Duration.ofSeconds(5);
@@ -78,6 +81,13 @@ public class OpponentInfoPlugin extends Plugin
 
 	private Instant lastTime;
 
+	@Getter(AccessLevel.PACKAGE)
+	private boolean lookupOnInteraction;
+	@Getter(AccessLevel.PACKAGE)
+	private HitpointsDisplayStyle hitpointsDisplayStyle;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showOpponentsOpponent;
+
 	@Provides
 	OpponentInfoConfig provideConfig(ConfigManager configManager)
 	{
@@ -87,6 +97,8 @@ public class OpponentInfoPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
+
 		overlayManager.add(opponentInfoOverlay);
 		overlayManager.add(playerComparisonOverlay);
 	}
@@ -151,12 +163,29 @@ public class OpponentInfoPlugin extends Plugin
 	{
 		if (lastOpponent != null
 			&& lastTime != null
-			&& client.getLocalPlayer().getInteracting() == null)
+			&& client.getLocalPlayer().getInteracting() == null
+			&& Duration.between(lastTime, Instant.now()).compareTo(WAIT) > 0)
 		{
-			if (Duration.between(lastTime, Instant.now()).compareTo(WAIT) > 0)
-			{
-				lastOpponent = null;
-			}
+			lastOpponent = null;
 		}
+
+	}
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (!event.getGroup().equals("opponentinfo"))
+		{
+			return;
+		}
+
+		updateConfig();
+	}
+
+	private void updateConfig()
+	{
+		this.lookupOnInteraction = config.lookupOnInteraction();
+		this.hitpointsDisplayStyle = config.hitpointsDisplayStyle();
+		this.showOpponentsOpponent = config.showOpponentsOpponent();
 	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/PlayerComparisonOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/PlayerComparisonOverlay.java
index 867e0e6004..c89603364f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/PlayerComparisonOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/PlayerComparisonOverlay.java
@@ -29,6 +29,7 @@ import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Actor;
 import net.runelite.api.Client;
 import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
@@ -49,6 +50,7 @@ import net.runelite.client.util.Text;
 import net.runelite.http.api.hiscore.HiscoreResult;
 import net.runelite.http.api.hiscore.HiscoreSkill;
 
+@Singleton
 class PlayerComparisonOverlay extends Overlay
 {
 	private static final Color HIGHER_STAT_TEXT_COLOR = Color.GREEN;
@@ -82,17 +84,15 @@ class PlayerComparisonOverlay extends Overlay
 
 	private final Client client;
 	private final OpponentInfoPlugin opponentInfoPlugin;
-	private final OpponentInfoConfig config;
 	private final HiscoreManager hiscoreManager;
 	private final PanelComponent panelComponent = new PanelComponent();
 
 	@Inject
-	private PlayerComparisonOverlay(Client client, OpponentInfoPlugin opponentInfoPlugin, OpponentInfoConfig config, HiscoreManager hiscoreManager)
+	private PlayerComparisonOverlay(final Client client, final OpponentInfoPlugin opponentInfoPlugin, final HiscoreManager hiscoreManager)
 	{
 		super(opponentInfoPlugin);
 		this.client = client;
 		this.opponentInfoPlugin = opponentInfoPlugin;
-		this.config = config;
 		this.hiscoreManager = hiscoreManager;
 
 		setPosition(OverlayPosition.BOTTOM_LEFT);
@@ -103,7 +103,7 @@ class PlayerComparisonOverlay extends Overlay
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (!config.lookupOnInteraction())
+		if (!opponentInfoPlugin.isLookupOnInteraction())
 		{
 			return null;
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPingOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPingOverlay.java
index 9134c1f8d1..f7811806dd 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPingOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPingOverlay.java
@@ -30,6 +30,7 @@ import java.awt.Graphics2D;
 import java.awt.Polygon;
 import java.util.Iterator;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.Perspective;
 import net.runelite.api.coords.LocalPoint;
@@ -38,6 +39,7 @@ import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayUtil;
 
+@Singleton
 class PartyPingOverlay extends Overlay
 {
 	private final Client client;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java
index 2d7bddc3a6..ac83ef69e1 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java
@@ -38,6 +38,8 @@ import java.util.UUID;
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 import javax.inject.Named;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.ChatMessageType;
@@ -50,6 +52,7 @@ import net.runelite.api.SoundEffectID;
 import net.runelite.api.Tile;
 import net.runelite.api.coords.WorldPoint;
 import net.runelite.api.events.CommandExecuted;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.FocusChanged;
 import net.runelite.api.events.GameTick;
 import net.runelite.api.events.MenuOptionClicked;
@@ -87,6 +90,7 @@ import net.runelite.http.api.ws.messages.party.UserSync;
 	description = "Shows useful information about current party"
 )
 @Slf4j
+@Singleton
 public class PartyPlugin extends Plugin implements KeyListener
 {
 	@Inject
@@ -126,16 +130,24 @@ public class PartyPlugin extends Plugin implements KeyListener
 	@Named("developerMode")
 	boolean developerMode;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final Map<UUID, PartyData> partyDataMap = Collections.synchronizedMap(new HashMap<>());
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final List<PartyTilePingData> pendingTilePings = Collections.synchronizedList(new ArrayList<>());
 
 	private int lastHp, lastPray;
 	private boolean hotkeyDown, doSync;
 	private boolean sendAlert;
 
+	@Getter(AccessLevel.PACKAGE)
+	private boolean stats;
+	private boolean pings;
+	private boolean sounds;
+	private boolean messages;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean recolorNames;
+
 	@Override
 	public void configure(Binder binder)
 	{
@@ -145,6 +157,8 @@ public class PartyPlugin extends Plugin implements KeyListener
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
+
 		overlayManager.add(partyStatsOverlay);
 		overlayManager.add(partyPingOverlay);
 		wsClient.registerMessage(SkillUpdate.class);
@@ -186,7 +200,7 @@ public class PartyPlugin extends Plugin implements KeyListener
 		{
 			party.changeParty(null);
 
-			if (!config.messages())
+			if (!this.messages)
 			{
 				return;
 			}
@@ -206,7 +220,7 @@ public class PartyPlugin extends Plugin implements KeyListener
 	@Subscribe
 	public void onMenuOptionClicked(MenuOptionClicked event)
 	{
-		if (!hotkeyDown || client.isMenuOpen() || party.getMembers().isEmpty() || !config.pings())
+		if (!hotkeyDown || client.isMenuOpen() || party.getMembers().isEmpty() || !this.pings)
 		{
 			return;
 		}
@@ -246,14 +260,14 @@ public class PartyPlugin extends Plugin implements KeyListener
 	@Subscribe
 	public void onTilePing(TilePing event)
 	{
-		if (config.pings())
+		if (this.pings)
 		{
 			final PartyData partyData = getPartyData(event.getMemberId());
 			final Color color = partyData != null ? partyData.getColor() : Color.RED;
 			pendingTilePings.add(new PartyTilePingData(event.getPoint(), color));
 		}
 
-		if (config.sounds())
+		if (this.sounds)
 		{
 			WorldPoint point = event.getPoint();
 
@@ -375,7 +389,7 @@ public class PartyPlugin extends Plugin implements KeyListener
 	{
 		final PartyData partyData = getPartyData(event.getMemberId());
 
-		if (partyData == null || !config.messages())
+		if (partyData == null || !this.messages)
 		{
 			return;
 		}
@@ -427,7 +441,7 @@ public class PartyPlugin extends Plugin implements KeyListener
 
 		if (removed != null)
 		{
-			if (config.messages())
+			if (this.messages)
 			{
 				final String joinMessage = new ChatMessageBuilder()
 					.append(ChatColorType.HIGHLIGHT)
@@ -546,4 +560,24 @@ public class PartyPlugin extends Plugin implements KeyListener
 			.runeLiteFormattedMessage(helpMessage)
 			.build());
 	}
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (!event.getGroup().equals("party"))
+		{
+			return;
+		}
+
+		updateConfig();
+	}
+
+	private void updateConfig()
+	{
+		this.stats = config.stats();
+		this.pings = config.pings();
+		this.sounds = config.sounds();
+		this.messages = config.messages();
+		this.recolorNames = config.recolorNames();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPluginService.java b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPluginService.java
index c0548dadbf..bc9b22b1eb 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPluginService.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPluginService.java
@@ -28,7 +28,7 @@ import java.util.UUID;
 import javax.annotation.Nullable;
 import net.runelite.client.plugins.party.data.PartyData;
 
-public interface PartyPluginService
+interface PartyPluginService
 {
 	/**
 	 * Get the party data for a party member
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyStatsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyStatsOverlay.java
index 693b23cb89..17c791cf19 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyStatsOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyStatsOverlay.java
@@ -32,6 +32,7 @@ import java.awt.Rectangle;
 import java.util.Map;
 import java.util.UUID;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.MenuAction;
 import net.runelite.client.plugins.party.data.PartyData;
 import net.runelite.client.ui.overlay.Overlay;
@@ -42,6 +43,7 @@ import net.runelite.client.ui.overlay.components.ProgressBarComponent;
 import net.runelite.client.ui.overlay.components.TitleComponent;
 import net.runelite.client.ws.PartyService;
 
+@Singleton
 public class PartyStatsOverlay extends Overlay
 {
 	private static final Color HP_FG = new Color(0, 146, 54, 230);
@@ -51,7 +53,6 @@ public class PartyStatsOverlay extends Overlay
 
 	private final PartyPlugin plugin;
 	private final PartyService party;
-	private final PartyConfig config;
 	private final PanelComponent body = new PanelComponent();
 
 	@Inject
@@ -60,7 +61,6 @@ public class PartyStatsOverlay extends Overlay
 		super(plugin);
 		this.plugin = plugin;
 		this.party = party;
-		this.config = config;
 		body.setBorder(new Rectangle());
 		body.setGap(new Point(0, ComponentConstants.STANDARD_BORDER / 2));
 		getMenuEntries().add(new OverlayMenuEntry(MenuAction.RUNELITE_OVERLAY, "Leave", "Party"));
@@ -69,7 +69,7 @@ public class PartyStatsOverlay extends Overlay
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (!config.stats())
+		if (!plugin.isStats())
 		{
 			return null;
 		}
@@ -107,7 +107,7 @@ public class PartyStatsOverlay extends Overlay
 
 				final TitleComponent name = TitleComponent.builder()
 					.text(v.getName())
-					.color(config.recolorNames() ? v.getColor() : Color.WHITE)
+					.color(plugin.isRecolorNames() ? v.getColor() : Color.WHITE)
 					.build();
 
 				panel.getChildren().add(name);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyWorldMapPoint.java b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyWorldMapPoint.java
index a2ae27835b..a81979c779 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyWorldMapPoint.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyWorldMapPoint.java
@@ -37,9 +37,9 @@ class PartyWorldMapPoint extends WorldMapPoint
 	private static final BufferedImage ARROW = ImageUtil.getResourceStreamFromClass(PartyWorldMapPoint.class, "/util/clue_arrow.png");
 
 	private BufferedImage partyImage;
-	private PartyMember member;
+	private final PartyMember member;
 
-	PartyWorldMapPoint(WorldPoint worldPoint, PartyMember member)
+	PartyWorldMapPoint(final WorldPoint worldPoint, final PartyMember member)
 	{
 		super(worldPoint, null);
 		this.member = member;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/Performance.java b/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/Performance.java
index cc81fa1bfb..25336dbb38 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/Performance.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/Performance.java
@@ -24,16 +24,17 @@
  */
 package net.runelite.client.plugins.performancestats;
 
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
 import net.runelite.http.api.ws.messages.party.PartyMemberMessage;
 
-@Getter
+@Getter(AccessLevel.PACKAGE)
 class Performance extends PartyMemberMessage
 {
 	private static final double TICK_LENGTH = 0.6;
 
-	@Setter
+	@Setter(AccessLevel.PACKAGE)
 	String username;
 
 	double damageDealt = 0;
@@ -43,7 +44,7 @@ class Performance extends PartyMemberMessage
 	double highestHitTaken = 0;
 
 	int lastActivityTick = -1;
-	@Setter
+	@Setter(AccessLevel.PACKAGE)
 	double ticksSpent = 0;
 
 	void addDamageDealt(double a, int currentTick)
@@ -83,7 +84,7 @@ class Performance extends PartyMemberMessage
 		ticksSpent = 0;
 	}
 
-	double getSecondsSpent()
+	private double getSecondsSpent()
 	{
 		return Math.round(this.ticksSpent * TICK_LENGTH);
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/PerformanceStatsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/PerformanceStatsOverlay.java
index c2d2961034..d4a6c6634b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/PerformanceStatsOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/PerformanceStatsOverlay.java
@@ -28,6 +28,7 @@ import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.MenuAction;
 import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayMenuEntry;
@@ -38,6 +39,7 @@ import net.runelite.client.ui.overlay.components.PanelComponent;
 import net.runelite.client.ui.overlay.components.table.TableAlignment;
 import net.runelite.client.ui.overlay.components.table.TableComponent;
 
+@Singleton
 public class PerformanceStatsOverlay extends Overlay
 {
 	private static final String TARGET = "Performance Stats";
@@ -50,7 +52,7 @@ public class PerformanceStatsOverlay extends Overlay
 	private final TableComponent tableComponent = new TableComponent();
 
 	@Inject
-	PerformanceStatsOverlay(PerformanceStatsPlugin tracker)
+	PerformanceStatsOverlay(final PerformanceStatsPlugin tracker)
 	{
 		super(tracker);
 		setPosition(OverlayPosition.TOP_RIGHT);
@@ -111,8 +113,8 @@ public class PerformanceStatsOverlay extends Overlay
 		return new String[]
 		{
 			performance.getUsername(),
-			String.valueOf((int) Math.round(performance.getDamageDealt())) + " | " + String.valueOf((int) Math.round(performance.getHighestHitDealt())),
-			String.valueOf((int) Math.round(performance.getDamageTaken())) + " | " + String.valueOf((int) Math.round(performance.getHighestHitTaken())),
+			(int) Math.round(performance.getDamageDealt()) + " | " + (int) Math.round(performance.getHighestHitDealt()),
+			(int) Math.round(performance.getDamageTaken()) + " | " + (int) Math.round(performance.getHighestHitTaken()),
 			String.valueOf(performance.getDPS()),
 			performance.getHumanReadableSecondsSpent()
 		};
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/PerformanceStatsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/PerformanceStatsPlugin.java
index fa3e7fd530..41fdfedfc6 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/PerformanceStatsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/PerformanceStatsPlugin.java
@@ -31,6 +31,8 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Actor;
@@ -39,6 +41,7 @@ import net.runelite.api.Client;
 import net.runelite.api.NPC;
 import net.runelite.api.Skill;
 import net.runelite.api.WorldType;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.ExperienceChanged;
 import net.runelite.api.events.GameStateChanged;
 import net.runelite.api.events.GameTick;
@@ -72,6 +75,7 @@ import net.runelite.http.api.ws.messages.party.UserSync;
 	enabledByDefault = false
 )
 @Slf4j
+@Singleton
 public class PerformanceStatsPlugin extends Plugin
 {
 	// For every damage point dealt 1.33 experience is given to the player's hitpoints (base rate)
@@ -105,11 +109,11 @@ public class PerformanceStatsPlugin extends Plugin
 	@Inject
 	private WSClient wsClient;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private boolean enabled = false;
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private boolean paused = false;
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final Performance performance = new Performance();
 
 	// Keep track of actor last tick as sometimes getInteracting can return null when hp xp event is triggered
@@ -119,8 +123,10 @@ public class PerformanceStatsPlugin extends Plugin
 	private boolean hopping;
 	private int pausedTicks = 0;
 
+	private int submitTimeout;
+
 	// Party System
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final Map<UUID, Performance> partyDataMap = Collections.synchronizedMap(new HashMap<>());
 
 	@Provides
@@ -132,6 +138,8 @@ public class PerformanceStatsPlugin extends Plugin
 	@Override
 	protected void startUp()
 	{
+		this.submitTimeout = config.submitTimeout();
+
 		overlayManager.add(performanceTrackerOverlay);
 		wsClient.registerMessage(Performance.class);
 	}
@@ -266,7 +274,7 @@ public class PerformanceStatsPlugin extends Plugin
 		performance.incrementTicksSpent();
 		hopping = false;
 
-		final int timeout = config.submitTimeout();
+		final int timeout = this.submitTimeout;
 		if (timeout > 0)
 		{
 			final double tickTimeout = timeout / GAME_TICK_SECONDS;
@@ -449,4 +457,14 @@ public class PerformanceStatsPlugin extends Plugin
 		partyDataMap.clear();
 	}
 
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (!event.getGroup().equals("performancestats"))
+		{
+			return;
+		}
+
+		this.submitTimeout = config.submitTimeout();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/Game.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/Game.java
index 6e9e4274bd..64deb7876d 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/Game.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/Game.java
@@ -30,6 +30,7 @@ import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
@@ -40,23 +41,23 @@ import net.runelite.api.events.GameTick;
 @Slf4j
 public class Game
 {
-	private Client client;
+	private final Client client;
 
-	private PestControlPlugin plugin;
+	private final PestControlPlugin plugin;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private Portal bluePortal = new Portal(PortalColor.BLUE, WidgetPortal.BLUE);
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private Portal purplePortal = new Portal(PortalColor.PURPLE, WidgetPortal.PURPLE);
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private Portal yellowPortal = new Portal(PortalColor.YELLOW, WidgetPortal.YELLOW);
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private Portal redPortal = new Portal(PortalColor.RED, WidgetPortal.RED);
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private int shieldsDropped = 0;
 
 	// Game starts with all possible rotations
@@ -65,7 +66,7 @@ public class Game
 	private boolean portalLocationsSet = false;
 
 
-	private Instant startTime = Instant.now();
+	private final Instant startTime = Instant.now();
 
 	public Game(Client client, PestControlPlugin plugin)
 	{
@@ -103,7 +104,7 @@ public class Game
 		}
 	}
 
-	public void lowerPortalShield(String portalColor)
+	void lowerPortalShield(String portalColor)
 	{
 		switch (portalColor.toLowerCase())
 		{
@@ -124,7 +125,7 @@ public class Game
 
 	private void lowerPortalShield(Portal portal)
 	{
-		if (!portal.isShielded())
+		if (portal.isNotShielded())
 		{
 			return;
 		}
@@ -146,10 +147,10 @@ public class Game
 			}
 		}
 
-		possibleRotations = rotations.toArray(new PortalRotation[rotations.size()]);
+		possibleRotations = rotations.toArray(new PortalRotation[0]);
 	}
 
-	public void killPortal(Portal portal)
+	private void killPortal(Portal portal)
 	{
 		if (portal.isDead())
 		{
@@ -161,7 +162,7 @@ public class Game
 		portal.setPortalState(PortalState.DEAD);
 	}
 
-	private boolean loadPortalLocations()
+	private void loadPortalLocations()
 	{
 		NPC squire = null;
 
@@ -179,13 +180,11 @@ public class Game
 			log.debug("In-game Squire found: {}", squire);
 			setPortalLocations(squire.getWorldLocation());
 
-			return true;
 		}
 
-		return false;
 	}
 
-	public void setPortalLocations(WorldPoint squireLocation)
+	private void setPortalLocations(WorldPoint squireLocation)
 	{
 		int x = squireLocation.getX();
 		int y = squireLocation.getY();
@@ -198,9 +197,9 @@ public class Game
 		portalLocationsSet = true;
 	}
 
-	public List<Portal> getPortals()
+	List<Portal> getPortals()
 	{
-		List<Portal> portalList = new ArrayList<Portal>();
+		List<Portal> portalList = new ArrayList<>();
 
 		portalList.add(getPurplePortal());
 		portalList.add(getBluePortal());
@@ -210,7 +209,7 @@ public class Game
 		return portalList;
 	}
 
-	public Portal getPortal(PortalColor portalColor)
+	Portal getPortal(PortalColor portalColor)
 	{
 		if (bluePortal.getColor() == portalColor)
 		{
@@ -232,7 +231,7 @@ public class Game
 		return null;
 	}
 
-	public Collection<Portal> getNextPortals()
+	Collection<Portal> getNextPortals()
 	{
 		List<Portal> portals = new ArrayList<>();
 
@@ -249,7 +248,7 @@ public class Game
 		return portals;
 	}
 
-	public Collection<Portal> getActivePortals()
+	Collection<Portal> getActivePortals()
 	{
 		List<Portal> portals = new ArrayList<>();
 
@@ -264,7 +263,7 @@ public class Game
 		return portals;
 	}
 
-	public Duration getTimeTillNextPortal()
+	Duration getTimeTillNextPortal()
 	{
 		Instant nextShieldDrop;
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/GangplankOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/GangplankOverlay.java
index db8abe87b7..31191088bd 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/GangplankOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/GangplankOverlay.java
@@ -25,6 +25,7 @@
 package net.runelite.client.plugins.pestcontrol;
 
 import com.google.inject.Inject;
+import com.google.inject.Singleton;
 import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Dimension;
@@ -43,17 +44,16 @@ import net.runelite.client.ui.overlay.tooltip.TooltipManager;
 import net.runelite.client.util.ColorUtil;
 
 @Slf4j
+@Singleton
 public class GangplankOverlay extends Overlay
 {
 	private final Client client;
-	private final PestControlConfig config;
 	private final PestControlPlugin plugin;
 	private final TooltipManager tooltipManager;
 
 	@Inject
-	GangplankOverlay(Client client, PestControlConfig config, PestControlPlugin plugin, TooltipManager toolTipManager)
+	GangplankOverlay(final Client client, final PestControlPlugin plugin, final TooltipManager toolTipManager)
 	{
-		this.config = config;
 		this.plugin = plugin;
 		this.client = client;
 		this.tooltipManager = toolTipManager;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/HintArrowOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/HintArrowOverlay.java
index 90c81228a1..b22798f57e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/HintArrowOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/HintArrowOverlay.java
@@ -30,6 +30,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.NPC;
 import net.runelite.api.coords.WorldPoint;
@@ -37,16 +38,15 @@ import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 
+@Singleton
 public class HintArrowOverlay extends Overlay
 {
-	private final PestControlConfig config;
 	private final PestControlPlugin plugin;
 	private final Client client;
 
 	@Inject
-	HintArrowOverlay(PestControlConfig config, PestControlPlugin plugin, Client client)
+	HintArrowOverlay(final PestControlPlugin plugin, final Client client)
 	{
-		this.config = config;
 		this.plugin = plugin;
 		this.client = client;
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/NpcHighlightContext.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/NpcHighlightContext.java
index 56c51fdd8d..049f649de0 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/NpcHighlightContext.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/NpcHighlightContext.java
@@ -25,17 +25,18 @@
 package net.runelite.client.plugins.pestcontrol;
 
 import java.awt.Color;
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
 import net.runelite.client.plugins.pestcontrol.config.NpcHighlightStyle;
 
 @AllArgsConstructor
-@Getter
-@Setter
-public class NpcHighlightContext
+@Getter(AccessLevel.PACKAGE)
+@Setter(AccessLevel.PACKAGE)
+class NpcHighlightContext
 {
 	private NpcHighlightStyle npcRenderStyle;
 	private Color color;
-	private boolean showNpcName = false;
+	private boolean showNpcName;
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/NpcHighlightOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/NpcHighlightOverlay.java
index bb8e94c175..540134714b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/NpcHighlightOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/NpcHighlightOverlay.java
@@ -25,6 +25,7 @@
 package net.runelite.client.plugins.pestcontrol;
 
 import com.google.inject.Inject;
+import com.google.inject.Singleton;
 import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Dimension;
@@ -43,16 +44,15 @@ import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayUtil;
 
 @Slf4j
+@Singleton
 public class NpcHighlightOverlay extends Overlay
 {
-	private final PestControlConfig config;
 	private final PestControlPlugin plugin;
 	private final Client client;
 
 	@Inject
-	NpcHighlightOverlay(PestControlConfig config, PestControlPlugin plugin, Client client)
+	NpcHighlightOverlay(final PestControlPlugin plugin, final Client client)
 	{
-		this.config = config;
 		this.plugin = plugin;
 		this.client = client;
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlNpc.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlNpc.java
index e1b9ef143e..50ca737592 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlNpc.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlNpc.java
@@ -26,13 +26,14 @@ package net.runelite.client.plugins.pestcontrol;
 
 import com.google.common.collect.ImmutableSet;
 import java.util.Set;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.NpcID;
 
-@Getter
+@Getter(AccessLevel.PACKAGE)
 public class PestControlNpc
 {
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private static final Set<Integer> splatterIdSet = ImmutableSet.of(
 		NpcID.SPLATTER,
 		NpcID.SPLATTER_1690,
@@ -41,7 +42,7 @@ public class PestControlNpc
 		NpcID.SPLATTER_1693
 	);
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	public static final Set<Integer> shifterIdSet = ImmutableSet.of(
 		NpcID.SHIFTER,
 		NpcID.SHIFTER_1695,
@@ -55,7 +56,7 @@ public class PestControlNpc
 		NpcID.SHIFTER_1703
 	);
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private static final Set<Integer> spinnerIdSet = ImmutableSet.of(
 		NpcID.SPINNER,
 		NpcID.SPINNER_1710,
@@ -64,7 +65,7 @@ public class PestControlNpc
 		NpcID.SPINNER_1713
 	);
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private static final Set<Integer> torcherIdSet = ImmutableSet.of(
 		NpcID.TORCHER,
 		NpcID.TORCHER_1715,
@@ -78,7 +79,7 @@ public class PestControlNpc
 		NpcID.TORCHER_1723
 	);
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private static final Set<Integer> defilerIdSet = ImmutableSet.of(
 		NpcID.DEFILER,
 		NpcID.DEFILER_1725,
@@ -92,7 +93,7 @@ public class PestControlNpc
 		NpcID.DEFILER_1733
 	);
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private static final Set<Integer> brawlerIdSet = ImmutableSet.of(
 		NpcID.BRAWLER,
 		NpcID.BRAWLER_1735,
@@ -101,7 +102,7 @@ public class PestControlNpc
 		NpcID.BRAWLER_1738
 	);
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private static final Set<Integer> ravagerIdSet = ImmutableSet.of(
 		NpcID.RAVAGER,
 		NpcID.RAVAGER_1705,
@@ -110,7 +111,7 @@ public class PestControlNpc
 		NpcID.RAVAGER_1708
 	);
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private static final Set<Integer> activePortalIdSet = ImmutableSet.of(
 		NpcID.PORTAL_1747, // Novice Purple Active
 		NpcID.PORTAL_1748, // Novice Blue Active
@@ -122,7 +123,7 @@ public class PestControlNpc
 		NpcID.PORTAL_1742 // Intermediate Red Active
 	);
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private static final Set<Integer> shieldedPortalIdSet = ImmutableSet.of(
 		NpcID.PORTAL_1751, // Novice Purple Shielded
 		NpcID.PORTAL_1752, // Novice Blue Shielded
@@ -134,7 +135,7 @@ public class PestControlNpc
 		NpcID.PORTAL_1746 // Intermediate Red Shielded
 	);
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private static final Set<Integer> purplePortalIdSet = ImmutableSet.of(
 		NpcID.PORTAL_1747, // Novice Purple Active
 		NpcID.PORTAL_1751, // Novice Purple Shielded
@@ -142,7 +143,7 @@ public class PestControlNpc
 		NpcID.PORTAL_1743 // Intermediate Purple Shielded
 	);
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private static final Set<Integer> bluePortalIdSet = ImmutableSet.of(
 		NpcID.PORTAL_1748, // Novice Blue Active
 		NpcID.PORTAL_1752, // Novice Blue Shielded
@@ -150,7 +151,7 @@ public class PestControlNpc
 		NpcID.PORTAL_1744 // Intermediate Blue Shielded
 	);
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private static final Set<Integer> yellowPortalIdSet = ImmutableSet.of(
 		NpcID.PORTAL_1749, // Novice Yellow Active
 		NpcID.PORTAL_1753, // Novice Yellow Shielded
@@ -158,7 +159,7 @@ public class PestControlNpc
 		NpcID.PORTAL_1745 // Intermediate Yellow Shielded
 	);
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private static final Set<Integer> redPortalIdSet = ImmutableSet.of(
 		NpcID.PORTAL_1750, // Novice Red Active
 		NpcID.PORTAL_1754, // Novice Red Shielded
@@ -166,7 +167,7 @@ public class PestControlNpc
 		NpcID.PORTAL_1746 // Intermediate Red Shielded
 	);
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private static final Set<Integer> ingameVoidKnightIdSet = ImmutableSet.of(
 		NpcID.VOID_KNIGHT_2950,
 		NpcID.VOID_KNIGHT_2951,
@@ -174,85 +175,85 @@ public class PestControlNpc
 		NpcID.VOID_KNIGHT_2953
 	);
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private static final Integer ingameSquireId = NpcID.SQUIRE_2949;
 
-	public static boolean isSplatterId(int npcId)
+	static boolean isSplatterId(int npcId)
 	{
 		return splatterIdSet.contains(npcId);
 	}
 
-	public static boolean isShifterId(int npcId)
+	static boolean isShifterId(int npcId)
 	{
 		return shifterIdSet.contains(npcId);
 	}
 
-	public static boolean isSpinnerId(int npcId)
+	static boolean isSpinnerId(int npcId)
 	{
 		return brawlerIdSet.contains(npcId);
 	}
 
-	public static boolean isTorcherId(int npcId)
+	static boolean isTorcherId(int npcId)
 	{
 		return torcherIdSet.contains(npcId);
 	}
 
-	public static boolean isDefilerId(int npcId)
+	static boolean isDefilerId(int npcId)
 	{
 		return defilerIdSet.contains(npcId);
 	}
 
-	public static boolean isBrawlerId(int npcId)
+	static boolean isBrawlerId(int npcId)
 	{
 		return brawlerIdSet.contains(npcId);
 	}
 
-	public static boolean isRavagerId(int npcId)
+	static boolean isRavagerId(int npcId)
 	{
 		return ravagerIdSet.contains(npcId);
 	}
 
-	public static boolean isIngameVoidKnightId(int npcId)
+	static boolean isIngameVoidKnightId(int npcId)
 	{
 		return ingameVoidKnightIdSet.contains(npcId);
 	}
 
-	public static boolean isIngameSquireId(int npcId)
+	static boolean isIngameSquireId(int npcId)
 	{
 		return ingameSquireId == npcId;
 	}
 
-	public static boolean isPortalId(int npcId)
+	static boolean isPortalId(int npcId)
 	{
 		return (isActivePortalId(npcId) || isShieldedPortalId(npcId));
 	}
 
-	public static boolean isActivePortalId(int npcId)
+	static boolean isActivePortalId(int npcId)
 	{
 		return activePortalIdSet.contains(npcId);
 	}
 
-	public static boolean isShieldedPortalId(int npcId)
+	private static boolean isShieldedPortalId(int npcId)
 	{
 		return shieldedPortalIdSet.contains(npcId);
 	}
 
-	public static boolean isPurplePortalId(int npcId)
+	static boolean isPurplePortalId(int npcId)
 	{
 		return purplePortalIdSet.contains(npcId);
 	}
 
-	public static boolean isBluePortalId(int npcId)
+	static boolean isBluePortalId(int npcId)
 	{
 		return bluePortalIdSet.contains(npcId);
 	}
 
-	public static boolean isYellowPortalId(int npcId)
+	static boolean isYellowPortalId(int npcId)
 	{
 		return yellowPortalIdSet.contains(npcId);
 	}
 
-	public static boolean isRedPortalId(int npcId)
+	static boolean isRedPortalId(int npcId)
 	{
 		return redPortalIdSet.contains(npcId);
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlPlugin.java
index d3095afd5a..3329f6f520 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlPlugin.java
@@ -27,12 +27,15 @@ package net.runelite.client.plugins.pestcontrol;
 
 import com.google.inject.Inject;
 import com.google.inject.Provides;
+import com.google.inject.Singleton;
+import java.awt.Color;
 import java.awt.image.BufferedImage;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.ChatMessageType;
@@ -71,6 +74,7 @@ import net.runelite.client.util.Text;
 	description = "Show helpful information for the Pest Control minigame",
 	tags = {"minigame", "overlay"}
 )
+@Singleton
 public class PestControlPlugin extends Plugin
 {
 	private static final int VOID_KNIGHTS_OUTPOST = 10537;
@@ -86,7 +90,7 @@ public class PestControlPlugin extends Plugin
 	private final Pattern PURCHASE_PATTERN = Pattern.compile("Remaining Void Knight Commendation Points: ([0-9]+)");
 
 	@Inject
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private Client client;
 
 	@Inject
@@ -99,15 +103,15 @@ public class PestControlPlugin extends Plugin
 	private InfoBoxManager infoBoxManager;
 
 	@Inject
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private ItemManager itemManager;
 
 	@Inject
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private PestControlConfig config;
 
 	@Inject
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private WidgetOverlay widgetOverlay;
 
 	@Inject
@@ -128,25 +132,25 @@ public class PestControlPlugin extends Plugin
 	@Inject
 	private PortalWeaknessOverlay portalWeaknessOverlay;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private Game game;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private HashMap<Integer, NpcHighlightContext> highlightedNpcList = new HashMap<>();
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private List<TileObject> highlightedRepairList = new ArrayList<>();
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private Tile noviceGangplankTile;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private Tile intermediateGangplankTile;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private Tile veteranGangplankTile;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private Integer commendationPoints;
 
 	private String userConfigKey;
@@ -155,6 +159,21 @@ public class PestControlPlugin extends Plugin
 
 	private PointsInfoboxCounter pointsInfoboxCounter;
 
+	private boolean showHintArrow;
+	private boolean showPortalWeakness;
+	private boolean highlightGangplanks;
+	private HighlightPortalOption portalHighlight;
+	private Color activePortalColor;
+	private Color shieldedPortalColor;
+	private NpcHighlightStyle highlightSpinners;
+	private Color spinnerColor;
+	private NpcHighlightStyle highlightBrawlers;
+	private Color brawlerColor;
+	private boolean highlightRepairables;
+	@Getter(AccessLevel.PACKAGE)
+	private Color repairableColor;
+	private boolean showPoints;
+	private boolean showTimeTillNextPortal;
 
 	@Provides
 	PestControlConfig provideConfig(ConfigManager configManager)
@@ -165,6 +184,7 @@ public class PestControlPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
 		loadPlugin();
 	}
 
@@ -179,6 +199,7 @@ public class PestControlPlugin extends Plugin
 	{
 		if (configEvent.getGroup().equals("pestcontrol"))
 		{
+			updateConfig();
 			unloadPlugin();
 			loadPlugin();
 		}
@@ -210,53 +231,53 @@ public class PestControlPlugin extends Plugin
 
 		overlayManager.add(widgetOverlay);
 
-		if (config.highlightSpinners() != NpcHighlightStyle.OFF)
+		if (this.highlightSpinners != NpcHighlightStyle.OFF)
 		{
 			for (Integer npcId : PestControlNpc.getSpinnerIdSet())
 			{
 				highlightedNpcList.put(npcId, new NpcHighlightContext(
-					config.highlightSpinners(),
-					config.spinnerColor(),
+					this.highlightSpinners,
+					this.spinnerColor,
 					true
 				));
 			}
 		}
 
-		if (config.highlightBrawlers() != NpcHighlightStyle.OFF)
+		if (this.highlightBrawlers != NpcHighlightStyle.OFF)
 		{
 			for (Integer npcId : PestControlNpc.getBrawlerIdSet())
 			{
 				highlightedNpcList.put(npcId, new NpcHighlightContext(
-					config.highlightBrawlers(),
-					config.brawlerColor(),
+					this.highlightBrawlers,
+					this.brawlerColor,
 					false
 				));
 			}
 		}
 
-		if (config.portalHighlight() != HighlightPortalOption.OFF)
+		if (this.portalHighlight != HighlightPortalOption.OFF)
 		{
-			if (config.portalHighlight() == HighlightPortalOption.ACTIVE ||
-				config.portalHighlight() == HighlightPortalOption.ALL)
+			if (this.portalHighlight == HighlightPortalOption.ACTIVE ||
+				this.portalHighlight == HighlightPortalOption.ALL)
 			{
 				for (Integer portalNpcId : PestControlNpc.getActivePortalIdSet())
 				{
 					highlightedNpcList.put(portalNpcId, new NpcHighlightContext(
 						NpcHighlightStyle.HULL,
-						config.activePortalColor(),
+						this.activePortalColor,
 						false
 					));
 				}
 			}
 
-			if (config.portalHighlight() == HighlightPortalOption.SHIELDED ||
-				config.portalHighlight() == HighlightPortalOption.ALL)
+			if (this.portalHighlight == HighlightPortalOption.SHIELDED ||
+				this.portalHighlight == HighlightPortalOption.ALL)
 			{
 				for (Integer portalNpcId : PestControlNpc.getShieldedPortalIdSet())
 				{
 					highlightedNpcList.put(portalNpcId, new NpcHighlightContext(
 						NpcHighlightStyle.HULL,
-						config.shieldedPortalColor(),
+						this.shieldedPortalColor,
 						false
 					));
 				}
@@ -268,12 +289,12 @@ public class PestControlPlugin extends Plugin
 			overlayManager.add(npcHighlightOverlay);
 		}
 
-		if (config.highlightRepairables())
+		if (this.highlightRepairables)
 		{
 			overlayManager.add(repairOverlay);
 		}
 
-		if (config.showHintArrow())
+		if (this.showHintArrow)
 		{
 			overlayManager.add(hintArrowOverlay);
 
@@ -283,17 +304,17 @@ public class PestControlPlugin extends Plugin
 			}
 		}
 
-		if (config.highlightGangplanks())
+		if (this.highlightGangplanks)
 		{
 			overlayManager.add(gangplankOverlay);
 		}
 
-		if (config.showTimeTillNextPortal())
+		if (this.showTimeTillNextPortal)
 		{
 			overlayManager.add(timerOverlay);
 		}
 
-		if (config.showPortalWeakness())
+		if (this.showPortalWeakness)
 		{
 			overlayManager.add(portalWeaknessOverlay);
 		}
@@ -314,7 +335,7 @@ public class PestControlPlugin extends Plugin
 
 		highlightedNpcList.clear();
 
-		if (game != null && config.showHintArrow() && client.hasHintArrow())
+		if (game != null && this.showHintArrow && client.hasHintArrow())
 		{
 			client.clearHintArrow();
 		}
@@ -332,7 +353,7 @@ public class PestControlPlugin extends Plugin
 
 	private void handlePointsInfoboxCounter()
 	{
-		if (!config.showPoints())
+		if (!this.showPoints)
 		{
 			return;
 		}
@@ -670,4 +691,22 @@ public class PestControlPlugin extends Plugin
 		}
 		return false;
 	}
+
+	private void updateConfig()
+	{
+		this.showHintArrow = config.showHintArrow();
+		this.showPortalWeakness = config.showPortalWeakness();
+		this.highlightGangplanks = config.highlightGangplanks();
+		this.portalHighlight = config.portalHighlight();
+		this.activePortalColor = config.activePortalColor();
+		this.shieldedPortalColor = config.shieldedPortalColor();
+		this.highlightSpinners = config.highlightSpinners();
+		this.spinnerColor = config.spinnerColor();
+		this.highlightBrawlers = config.highlightBrawlers();
+		this.brawlerColor = config.brawlerColor();
+		this.highlightRepairables = config.highlightRepairables();
+		this.repairableColor = config.repairableColor();
+		this.showPoints = config.showPoints();
+		this.showTimeTillNextPortal = config.showTimeTillNextPortal();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlRepairObject.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlRepairObject.java
index f3a8d457dd..a3b56e009d 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlRepairObject.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlRepairObject.java
@@ -26,13 +26,14 @@ package net.runelite.client.plugins.pestcontrol;
 
 import com.google.common.collect.ImmutableSet;
 import java.util.Set;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.ObjectID;
 
-@Getter
-public class PestControlRepairObject
+@Getter(AccessLevel.PACKAGE)
+class PestControlRepairObject
 {
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private static final Set<Integer> repairableBarricades = ImmutableSet.of(
 		//ObjectID.BARRICADE_14224,
 		ObjectID.BARRICADE_14227,
@@ -43,7 +44,7 @@ public class PestControlRepairObject
 		ObjectID.BARRICADE_14232
 	);
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private static final Set<Integer> repairableGates = ImmutableSet.of(
 		ObjectID.GATE_14238,
 		ObjectID.GATE_14239,
@@ -58,17 +59,17 @@ public class PestControlRepairObject
 		ObjectID.GATE_14248
 	);
 
-	public static boolean isRepairableBarricadeId(int objectId)
+	static boolean isRepairableBarricadeId(int objectId)
 	{
 		return repairableBarricades.contains(objectId);
 	}
 
-	public static boolean isRepairableGateId(int objectId)
+	static boolean isRepairableGateId(int objectId)
 	{
 		return repairableGates.contains(objectId);
 	}
 
-	public static boolean isRepairableId(int objectId)
+	static boolean isRepairableId(int objectId)
 	{
 		return isRepairableBarricadeId(objectId) || isRepairableGateId(objectId);
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PointsInfoboxCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PointsInfoboxCounter.java
index 1fa3155625..8555abf745 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PointsInfoboxCounter.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PointsInfoboxCounter.java
@@ -27,13 +27,10 @@ package net.runelite.client.plugins.pestcontrol;
 import java.awt.image.BufferedImage;
 import net.runelite.client.ui.overlay.infobox.Counter;
 
-public class PointsInfoboxCounter extends Counter
+class PointsInfoboxCounter extends Counter
 {
-	private final PestControlPlugin plugin;
-
-	PointsInfoboxCounter(BufferedImage image, PestControlPlugin plugin, int count)
+	PointsInfoboxCounter(final BufferedImage image, final PestControlPlugin plugin, final int count)
 	{
 		super(image, plugin, count);
-		this.plugin = plugin;
 	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/Portal.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/Portal.java
index 2ad85a24ea..466c125002 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/Portal.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/Portal.java
@@ -25,12 +25,13 @@
  */
 package net.runelite.client.plugins.pestcontrol;
 
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
 import net.runelite.api.coords.WorldPoint;
 
-@Getter
-@Setter
+@Getter(AccessLevel.PACKAGE)
+@Setter(AccessLevel.PACKAGE)
 class Portal
 {
 	private PortalColor color;
@@ -39,15 +40,15 @@ class Portal
 
 	private PortalState portalState = PortalState.SHIELDED;
 
-	public Portal(PortalColor color, WidgetPortal widget)
+	Portal(final PortalColor color, final WidgetPortal widget)
 	{
 		this.color = color;
 		this.widget = widget;
 	}
 
-	public boolean isShielded()
+	boolean isNotShielded()
 	{
-		return portalState == PortalState.SHIELDED;
+		return portalState != PortalState.SHIELDED;
 	}
 
 	public boolean isDead()
@@ -57,6 +58,6 @@ class Portal
 
 	public boolean isActive()
 	{
-		return (!isShielded() && !isDead());
+		return (isNotShielded() && !isDead());
 	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PortalColor.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PortalColor.java
index 07e7336c0b..8eecadbe0e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PortalColor.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PortalColor.java
@@ -24,9 +24,10 @@
  */
 package net.runelite.client.plugins.pestcontrol;
 
+import lombok.AccessLevel;
 import lombok.Getter;
 
-@Getter
+@Getter(AccessLevel.PACKAGE)
 public enum PortalColor
 {
 	BLUE,
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PortalRotation.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PortalRotation.java
index b49d536bb8..d74846c551 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PortalRotation.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PortalRotation.java
@@ -41,7 +41,7 @@ enum PortalRotation
 
 	private final PortalColor[] portals;
 
-	PortalRotation(PortalColor first, PortalColor second, PortalColor third, PortalColor fourth)
+	PortalRotation(final PortalColor first, final PortalColor second, final PortalColor third, final PortalColor fourth)
 	{
 		portals = new PortalColor[]
 			{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PortalWeaknessOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PortalWeaknessOverlay.java
index e24363ec28..941f851b6c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PortalWeaknessOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PortalWeaknessOverlay.java
@@ -25,6 +25,7 @@
 package net.runelite.client.plugins.pestcontrol;
 
 import com.google.inject.Inject;
+import com.google.inject.Singleton;
 import java.awt.AlphaComposite;
 import java.awt.Composite;
 import java.awt.Dimension;
@@ -46,30 +47,26 @@ import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayUtil;
 
 @Slf4j
+@Singleton
 public class PortalWeaknessOverlay extends Overlay
 {
-	private int zOffset = 100;
-
-	private final PestControlConfig config;
 	private final PestControlPlugin plugin;
 	private final Client client;
 
-	private BufferedImage magicImage;
-	private BufferedImage rangedImage;
-	private BufferedImage stabImage;
-	private BufferedImage slashImage;
-	private BufferedImage crushImage;
+	private final BufferedImage magicImage;
+	private final BufferedImage rangedImage;
+	private final BufferedImage stabImage;
+	private final BufferedImage slashImage;
+	private final BufferedImage crushImage;
 
 	@Inject
 	PortalWeaknessOverlay(
-		PestControlConfig config,
-		PestControlPlugin plugin,
-		Client client,
-		ItemManager itemManager,
-		SkillIconManager skillIconManager
+		final PestControlPlugin plugin,
+		final Client client,
+		final ItemManager itemManager,
+		final SkillIconManager skillIconManager
 	)
 	{
-		this.config = config;
 		this.plugin = plugin;
 		this.client = client;
 
@@ -96,6 +93,7 @@ public class PortalWeaknessOverlay extends Overlay
 
 		// We can use any image here as it's only needed to calculate the position
 
+		int zOffset = 100;
 		return Perspective.getCanvasImageLocation(client, localLocation, magicImage, zOffset);
 
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/RepairOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/RepairOverlay.java
index a0ee3bf09f..458337fb33 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/RepairOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/RepairOverlay.java
@@ -25,6 +25,7 @@
 package net.runelite.client.plugins.pestcontrol;
 
 import com.google.inject.Inject;
+import com.google.inject.Singleton;
 import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Dimension;
@@ -43,18 +44,17 @@ import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 
+@Singleton
 public class RepairOverlay extends Overlay
 {
-	private final PestControlConfig config;
 	private final PestControlPlugin plugin;
 	private final Client client;
 
 	private static final int MAX_DISTANCE = 2400;
 
 	@Inject
-	RepairOverlay(PestControlConfig config, PestControlPlugin plugin, Client client)
+	RepairOverlay(final PestControlPlugin plugin, final Client client)
 	{
-		this.config = config;
 		this.plugin = plugin;
 		this.client = client;
 
@@ -72,7 +72,7 @@ public class RepairOverlay extends Overlay
 
 		Point mousePosition = client.getMouseCanvasPosition();
 		Scene scene = client.getScene();
-		Color color = config.repairableColor();
+		Color color = plugin.getRepairableColor();
 		Tile[][][] tiles = scene.getTiles();
 		int z = client.getPlane();
 
@@ -119,11 +119,6 @@ public class RepairOverlay extends Overlay
 				GroundObject groundObject = tile.getGroundObject();
 				if (groundObject != null)
 				{
-					if (groundObject == null)
-					{
-						continue;
-					}
-
 					if (PestControlRepairObject.isRepairableId(groundObject.getId()))
 					{
 
@@ -138,11 +133,6 @@ public class RepairOverlay extends Overlay
 				WallObject wallObject = tile.getWallObject();
 				if (wallObject != null)
 				{
-					if (wallObject == null)
-					{
-						continue;
-					}
-
 					if (PestControlRepairObject.isRepairableId(wallObject.getId()))
 					{
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/TimerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/TimerOverlay.java
index be45fc728e..3c118c1763 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/TimerOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/TimerOverlay.java
@@ -25,6 +25,7 @@
 package net.runelite.client.plugins.pestcontrol;
 
 import com.google.inject.Inject;
+import com.google.inject.Singleton;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
@@ -38,16 +39,15 @@ import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayUtil;
 
+@Singleton
 public class TimerOverlay extends Overlay
 {
-	private final PestControlConfig config;
 	private final PestControlPlugin plugin;
 	private final Client client;
 
 	@Inject
-	TimerOverlay(PestControlConfig config, PestControlPlugin plugin, Client client)
+	TimerOverlay(final PestControlPlugin plugin, final Client client)
 	{
-		this.config = config;
 		this.plugin = plugin;
 		this.client = client;
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/WidgetOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/WidgetOverlay.java
index 38c1582e32..b2cf073201 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/WidgetOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/WidgetOverlay.java
@@ -32,6 +32,7 @@ import java.awt.FontMetrics;
 import java.awt.Graphics2D;
 import java.awt.geom.Rectangle2D;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
 import net.runelite.api.widgets.Widget;
@@ -41,6 +42,7 @@ import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 
 @Slf4j
+@Singleton
 public class WidgetOverlay extends Overlay
 {
 	private final Client client;
@@ -48,7 +50,7 @@ public class WidgetOverlay extends Overlay
 	private final PestControlPlugin plugin;
 
 	@Inject
-	public WidgetOverlay(Client client, PestControlPlugin plugin)
+	public WidgetOverlay(final Client client, final PestControlPlugin plugin)
 	{
 		this.plugin = plugin;
 		this.client = client;
@@ -57,7 +59,7 @@ public class WidgetOverlay extends Overlay
 		setLayer(OverlayLayer.ABOVE_SCENE);
 	}
 
-	public Integer getPortalHitpoints(PortalColor color)
+	Integer getPortalHitpoints(PortalColor color)
 	{
 		if (plugin.getGame() == null)
 		{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/WidgetPortal.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/WidgetPortal.java
index 7570cfb87f..f219a2425f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/WidgetPortal.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/WidgetPortal.java
@@ -24,13 +24,14 @@
  */
 package net.runelite.client.plugins.pestcontrol;
 
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.ToString;
 import net.runelite.api.widgets.WidgetInfo;
 
 @AllArgsConstructor
-@Getter
+@Getter(AccessLevel.PACKAGE)
 @ToString
 enum WidgetPortal
 {
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsConfig.java
index 44da3efac0..af35be900e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsConfig.java
@@ -35,10 +35,10 @@ import net.runelite.client.config.Stub;
 public interface PileIndicatorsConfig extends Config
 {
 	@ConfigItem(
-			keyName = "playerPilesStub",
-			name = "Player Piles",
-			description = "",
-			position = 0
+		keyName = "playerPilesStub",
+		name = "Player Piles",
+		description = "",
+		position = 0
 	)
 	default Stub playerPilesStub()
 	{
@@ -46,11 +46,11 @@ public interface PileIndicatorsConfig extends Config
 	}
 
 	@ConfigItem(
-			position = 1,
-			keyName = "enablePlayers",
-			name = "Enable Player Piling",
-			description = "Enable the option to highlight players when they pile.",
-			parent = "playerPilesStub"
+		position = 1,
+		keyName = "enablePlayers",
+		name = "Enable Player Piling",
+		description = "Enable the option to highlight players when they pile.",
+		parent = "playerPilesStub"
 	)
 	default boolean enablePlayers()
 	{
@@ -58,11 +58,11 @@ public interface PileIndicatorsConfig extends Config
 	}
 
 	@ConfigItem(
-			position = 2,
-			keyName = "wildyOnlyPlayer",
-			name = "Wilderness Only",
-			description = "Show player piling only when in the Wilderness.",
-			parent = "playerPilesStub"
+		position = 2,
+		keyName = "wildyOnlyPlayer",
+		name = "Wilderness Only",
+		description = "Show player piling only when in the Wilderness.",
+		parent = "playerPilesStub"
 	)
 	default boolean wildyOnlyPlayer()
 	{
@@ -70,11 +70,11 @@ public interface PileIndicatorsConfig extends Config
 	}
 
 	@ConfigItem(
-			position = 3,
-			keyName = "playerPileColor",
-			name = "Player Pile Color",
-			description = "Color used for player piles.",
-			parent = "playerPilesStub"
+		position = 3,
+		keyName = "playerPileColor",
+		name = "Player Pile Color",
+		description = "Color used for player piles.",
+		parent = "playerPilesStub"
 	)
 	default Color playerPileColor()
 	{
@@ -82,10 +82,10 @@ public interface PileIndicatorsConfig extends Config
 	}
 
 	@ConfigItem(
-			keyName = "npcPilesStub",
-			name = "NPC Piles",
-			description = "",
-			position = 4
+		keyName = "npcPilesStub",
+		name = "NPC Piles",
+		description = "",
+		position = 4
 	)
 	default Stub npcPilesStub()
 	{
@@ -93,11 +93,11 @@ public interface PileIndicatorsConfig extends Config
 	}
 
 	@ConfigItem(
-			position = 5,
-			keyName = "enableNPCS",
-			name = "Enable NPC Piling",
-			description = "Enable the option to highlight NPCs when they pile.",
-			parent = "npcPilesStub"
+		position = 5,
+		keyName = "enableNPCS",
+		name = "Enable NPC Piling",
+		description = "Enable the option to highlight NPCs when they pile.",
+		parent = "npcPilesStub"
 	)
 	default boolean enableNPCS()
 	{
@@ -105,11 +105,11 @@ public interface PileIndicatorsConfig extends Config
 	}
 
 	@ConfigItem(
-			position = 6,
-			keyName = "npcPileColor",
-			name = "NPC Pile Color",
-			description = "Color used for NPC piles.",
-			parent = "npcPilesStub"
+		position = 6,
+		keyName = "npcPileColor",
+		name = "NPC Pile Color",
+		description = "Color used for NPC piles.",
+		parent = "npcPilesStub"
 	)
 	default Color npcPileColor()
 	{
@@ -117,10 +117,10 @@ public interface PileIndicatorsConfig extends Config
 	}
 
 	@ConfigItem(
-			keyName = "mixedPilesStub",
-			name = "Mixed Piles",
-			description = "",
-			position = 7
+		keyName = "mixedPilesStub",
+		name = "Mixed Piles",
+		description = "",
+		position = 7
 	)
 	default Stub mixedPilesStub()
 	{
@@ -128,11 +128,11 @@ public interface PileIndicatorsConfig extends Config
 	}
 
 	@ConfigItem(
-			position = 8,
-			keyName = "mixedPileColor",
-			name = "Mixed Pile Color",
-			description = "Color used for mixed piles.",
-			parent = "mixedPilesStub"
+		position = 8,
+		keyName = "mixedPileColor",
+		name = "Mixed Pile Color",
+		description = "Color used for mixed piles.",
+		parent = "mixedPilesStub"
 	)
 	default Color mixedPileColor()
 	{
@@ -140,10 +140,10 @@ public interface PileIndicatorsConfig extends Config
 	}
 
 	@ConfigItem(
-			keyName = "pilesSizeStub",
-			name = "Pile size",
-			description = "",
-			position = 9
+		keyName = "pilesSizeStub",
+		name = "Pile size",
+		description = "",
+		position = 9
 	)
 	default Stub pilesSizeStub()
 	{
@@ -151,14 +151,14 @@ public interface PileIndicatorsConfig extends Config
 	}
 
 	@Range(
-			min = 2
+		min = 2
 	)
 	@ConfigItem(
-			position = 10,
-			keyName = "minimumPileSize",
-			name = "Minimum Pile Size",
-			description = "Any pile under this size will not show up. (Minimum: 2)",
-			parent = "pilesSizeStub"
+		position = 10,
+		keyName = "minimumPileSize",
+		name = "Minimum Pile Size",
+		description = "Any pile under this size will not show up. (Minimum: 2)",
+		parent = "pilesSizeStub"
 	)
 	default int minimumPileSize()
 	{
@@ -166,10 +166,10 @@ public interface PileIndicatorsConfig extends Config
 	}
 
 	@ConfigItem(
-			keyName = "miscellaneousStub",
-			name = "Miscellaneous",
-			description = "",
-			position = 11
+		keyName = "miscellaneousStub",
+		name = "Miscellaneous",
+		description = "",
+		position = 11
 	)
 	default Stub miscellaneousStub()
 	{
@@ -177,11 +177,11 @@ public interface PileIndicatorsConfig extends Config
 	}
 
 	@ConfigItem(
-			position = 12,
-			keyName = "numberOnly",
-			name = "Display Number Only",
-			description = "Shorten \"PILE SIZE: 1\" to \"1\"",
-			parent = "miscellaneousStub"
+		position = 12,
+		keyName = "numberOnly",
+		name = "Display Number Only",
+		description = "Shorten \"PILE SIZE: 1\" to \"1\"",
+		parent = "miscellaneousStub"
 	)
 	default boolean numberOnly()
 	{
@@ -189,11 +189,11 @@ public interface PileIndicatorsConfig extends Config
 	}
 
 	@ConfigItem(
-			position = 13,
-			keyName = "drawPileTile",
-			name = "Draw Pile Tile",
-			description = "Draws the tile of the pile for best visibility.",
-			parent = "miscellaneousStub"
+		position = 13,
+		keyName = "drawPileTile",
+		name = "Draw Pile Tile",
+		description = "Draws the tile of the pile for best visibility.",
+		parent = "miscellaneousStub"
 	)
 	default boolean drawPileTile()
 	{
@@ -201,11 +201,11 @@ public interface PileIndicatorsConfig extends Config
 	}
 
 	@ConfigItem(
-			position = 14,
-			keyName = "drawPileHull",
-			name = "Draw Pile Convex Hull",
-			description = "Draws the hull of the pile for best visibility.",
-			parent = "miscellaneousStub"
+		position = 14,
+		keyName = "drawPileHull",
+		name = "Draw Pile Convex Hull",
+		description = "Draws the hull of the pile for best visibility.",
+		parent = "miscellaneousStub"
 	)
 	default boolean drawPileHull()
 	{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsOverlay.java
index 1479c1f2fa..1fe970e620 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsOverlay.java
@@ -24,47 +24,43 @@
 
 package net.runelite.client.plugins.pileindicators;
 
-import net.runelite.api.Actor;
-import net.runelite.api.Client;
-
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics2D;
+import java.util.List;
 import javax.inject.Inject;
-import java.awt.*;
-import java.util.ArrayList;
+import javax.inject.Singleton;
+import net.runelite.api.Actor;
 import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayPriority;
 import net.runelite.client.ui.overlay.OverlayUtil;
 
+@Singleton
 public class PileIndicatorsOverlay extends Overlay
 {
-
-	private final Client client;
 	private final PileIndicatorsPlugin plugin;
-	private final PileIndicatorsConfig config;
 
 	@Inject
-	PileIndicatorsOverlay(final Client client, final PileIndicatorsPlugin plugin, final PileIndicatorsConfig config)
+	PileIndicatorsOverlay(final PileIndicatorsPlugin plugin)
 	{
 		super(plugin);
-		this.client = client;
 		this.plugin = plugin;
-		this.config = config;
 
 		setLayer(OverlayLayer.ABOVE_SCENE);
 		setPosition(OverlayPosition.DYNAMIC);
 		setPriority(OverlayPriority.HIGH);
 	}
 
-
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		ArrayList<ArrayList<Actor>> stackList = plugin.getStacks();
+		List<List<Actor>> stackList = plugin.getStacks();
 
 		if (stackList != null)
 		{
-			for (ArrayList<Actor> actorArrayList : stackList)
+			for (List<Actor> actorArrayList : stackList)
 			{
 				PileType pileType = plugin.getPileType(actorArrayList);
 				Color pileColor = plugin.getColorByPileType(pileType);
@@ -73,12 +69,12 @@ public class PileIndicatorsOverlay extends Overlay
 				{
 					Actor actorToRender = actorArrayList.get(0); //guaranteed to have at least two players
 					final String pileTypeStr = pileType == PileType.PLAYER_PILE ? "PLAYER" : pileType == PileType.NPC_PILE ? "NPC" : pileType == PileType.MIXED_PILE ? "MIXED" : "";
-					final String text = config.numberOnly() ? "" + actorArrayList.size() : (pileTypeStr + " PILE SIZE: " + actorArrayList.size());
-					if (config.drawPileTile())
+					final String text = plugin.isNumberOnly() ? "" + actorArrayList.size() : (pileTypeStr + " PILE SIZE: " + actorArrayList.size());
+					if (plugin.isDrawPileTile())
 					{
 						OverlayUtil.renderPolygon(graphics, actorToRender.getCanvasTilePoly(), pileColor);
 					}
-					if (config.drawPileHull())
+					if (plugin.isDrawPileHull())
 					{
 						OverlayUtil.renderPolygon(graphics, actorToRender.getConvexHull(), pileColor);
 					}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsPlugin.java
index 2afa035caa..50e04c26ee 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsPlugin.java
@@ -24,31 +24,34 @@
 
 package net.runelite.client.plugins.pileindicators;
 
-import com.google.inject.Binder;
 import com.google.inject.Provides;
+import java.awt.Color;
+import java.util.ArrayList;
+import java.util.List;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Actor;
 import net.runelite.api.Client;
 import net.runelite.api.NPC;
 import net.runelite.api.Player;
 import net.runelite.api.Varbits;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.client.config.ConfigManager;
+import net.runelite.client.eventbus.Subscribe;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginDescriptor;
 import net.runelite.client.plugins.PluginType;
 import net.runelite.client.ui.overlay.OverlayManager;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import java.awt.*;
-import java.util.ArrayList;
-
 @PluginDescriptor(
-		name = "Pile Indicators",
-		description = "Highlight and count how many npcs/players are stacked on each other.",
-		tags = {"overlay", "pile", "stack", "pvp", "pvm", "pve"},
-		type = PluginType.UTILITY,
-		enabledByDefault = false
+	name = "Pile Indicators",
+	description = "Highlight and count how many npcs/players are stacked on each other.",
+	tags = {"overlay", "pile", "stack", "pvp", "pvm", "pve"},
+	type = PluginType.UTILITY,
+	enabledByDefault = false
 )
 
 @Singleton
@@ -68,20 +71,30 @@ public class PileIndicatorsPlugin extends Plugin
 	@Inject
 	private PileIndicatorsOverlay overlay;
 
+	private boolean enablePlayers;
+	private boolean wildyOnlyPlayer;
+	private Color playerPileColor;
+	private boolean enableNPCS;
+	private Color npcPileColor;
+	private Color mixedPileColor;
+	private int minimumPileSize;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean numberOnly;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean drawPileTile;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean drawPileHull;
+
 	@Provides
 	PileIndicatorsConfig provideConfig(ConfigManager configManager)
 	{
 		return configManager.getConfig(PileIndicatorsConfig.class);
 	}
 
-	@Override
-	public void configure(Binder binder)
-	{
-	}
-
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
 		overlayManager.add(overlay);
 	}
 
@@ -91,13 +104,13 @@ public class PileIndicatorsPlugin extends Plugin
 		overlayManager.remove(overlay);
 	}
 
-	protected ArrayList<ArrayList<Actor>> getStacks()
+	List<List<Actor>> getStacks()
 	{
-		ArrayList<ArrayList<Actor>> outerArrayList = new ArrayList<>();
+		List<List<Actor>> outerArrayList = new ArrayList<>();
 
-		ArrayList<Actor> pileList = new ArrayList<>();
+		List<Actor> pileList = new ArrayList<>();
 
-		if (config.enableNPCS())
+		if (this.enableNPCS)
 		{
 			for (NPC npc : client.getNpcs())
 			{
@@ -108,16 +121,13 @@ public class PileIndicatorsPlugin extends Plugin
 			}
 		}
 
-		if (config.enablePlayers())
+		if (this.enablePlayers && (client.getVar(Varbits.IN_WILDERNESS) > 0 && this.wildyOnlyPlayer) ^ (!this.wildyOnlyPlayer))
 		{
-			if ((client.getVar(Varbits.IN_WILDERNESS) > 0 && config.wildyOnlyPlayer()) ^ (!config.wildyOnlyPlayer()))
+			for (Player player : client.getPlayers())
 			{
-				for (Player player : client.getPlayers())
+				if (player != null)
 				{
-					if (player != null)
-					{
-						pileList.add(player);
-					}
+					pileList.add(player);
 				}
 			}
 		}
@@ -132,15 +142,12 @@ public class PileIndicatorsPlugin extends Plugin
 			ArrayList<Actor> potentialStackArrayList = new ArrayList<>();
 			for (Actor actorToCompareTo : pileList)
 			{
-				if (!potentialStackArrayList.contains(actorToCompareTo))
+				if (!potentialStackArrayList.contains(actorToCompareTo) && actor.getWorldLocation().distanceTo(actorToCompareTo.getWorldLocation()) == 0)
 				{
-					if (actor.getWorldLocation().distanceTo(actorToCompareTo.getWorldLocation()) == 0)
-					{
-						potentialStackArrayList.add(actorToCompareTo);
-					}
+					potentialStackArrayList.add(actorToCompareTo);
 				}
 			}
-			if (potentialStackArrayList.size() >= config.minimumPileSize())
+			if (potentialStackArrayList.size() >= this.minimumPileSize)
 			{
 				outerArrayList.add(potentialStackArrayList);
 			}
@@ -149,21 +156,21 @@ public class PileIndicatorsPlugin extends Plugin
 		return outerArrayList.size() != 0 ? outerArrayList : null;
 	}
 
-	protected Color getColorByPileType(PileType pileType)
+	Color getColorByPileType(PileType pileType)
 	{
 		switch (pileType)
 		{
 			case PLAYER_PILE:
-				return config.playerPileColor();
+				return this.playerPileColor;
 			case NPC_PILE:
-				return config.npcPileColor();
+				return this.npcPileColor;
 			case MIXED_PILE:
-				return config.mixedPileColor();
+				return this.mixedPileColor;
 		}
 		return null;
 	}
 
-	protected PileType getPileType(ArrayList<Actor> pile)
+	PileType getPileType(List<Actor> pile)
 	{
 		PileType pileType = null;
 
@@ -188,4 +195,29 @@ public class PileIndicatorsPlugin extends Plugin
 		}
 		return pileType;
 	}
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (!event.getGroup().equals("pileindicators"))
+		{
+			return;
+		}
+
+		updateConfig();
+	}
+
+	private void updateConfig()
+	{
+		this.enablePlayers = config.enablePlayers();
+		this.wildyOnlyPlayer = config.wildyOnlyPlayer();
+		this.playerPileColor = config.playerPileColor();
+		this.enableNPCS = config.enableNPCS();
+		this.npcPileColor = config.npcPileColor();
+		this.mixedPileColor = config.mixedPileColor();
+		this.minimumPileSize = config.minimumPileSize();
+		this.numberOnly = config.numberOnly();
+		this.drawPileTile = config.drawPileTile();
+		this.drawPileHull = config.drawPileHull();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsConfig.java
index 47ce1fd775..754fa73414 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsConfig.java
@@ -210,17 +210,17 @@ public interface PlayerIndicatorsConfig extends Config
 		return false;
 	}
 
-	@ConfigItem(
-		position = 16,
-		keyName = "highlightOverheadTargets",
-		name = "Highlights attackable players over their head",
-		description = "Highlights players over their head that the current player can attack based on combat/wilderness levels",
-		group = "Target Indicator"
-	)
-	default boolean highlightOverheadTargets()
-	{
-		return false;
-	}
+//	@ConfigItem(
+//		position = 16,
+//		keyName = "highlightOverheadTargets",
+//		name = "Highlights attackable players over their head",
+//		description = "Highlights players over their head that the current player can attack based on combat/wilderness levels",
+//		group = "Target Indicator"
+//	)
+//	default boolean highlightOverheadTargets()
+//	{
+//		return false;
+//	}
 
 	@ConfigItem(
 		position = 17,
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsMinimapOverlay.java
index e356d9b5f2..b8be4f674d 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsMinimapOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsMinimapOverlay.java
@@ -45,14 +45,14 @@ import net.runelite.client.util.ImageUtil;
 public class PlayerIndicatorsMinimapOverlay extends Overlay
 {
 	private final PlayerIndicatorsService playerIndicatorsService;
-	private final PlayerIndicatorsConfig config;
+	private final PlayerIndicatorsPlugin plugin;
 	private final BufferedImage skullIcon = ImageUtil.getResourceStreamFromClass(PlayerIndicatorsPlugin.class,
 		"skull.png");
 
 	@Inject
-	private PlayerIndicatorsMinimapOverlay(PlayerIndicatorsConfig config, PlayerIndicatorsService playerIndicatorsService)
+	private PlayerIndicatorsMinimapOverlay(final PlayerIndicatorsPlugin plugin, final PlayerIndicatorsService playerIndicatorsService)
 	{
-		this.config = config;
+		this.plugin = plugin;
 		this.playerIndicatorsService = playerIndicatorsService;
 		setLayer(OverlayLayer.ABOVE_WIDGETS);
 		setPosition(OverlayPosition.DYNAMIC);
@@ -68,7 +68,7 @@ public class PlayerIndicatorsMinimapOverlay extends Overlay
 
 	private void renderPlayerOverlay(Graphics2D graphics, Player actor, Color color)
 	{
-		if (config.drawMinimapNames())
+		if (plugin.isDrawMinimapNames())
 		{
 			String name = actor.getName().replace('\u00A0', ' ');
 			String tag = "";
@@ -84,20 +84,17 @@ public class PlayerIndicatorsMinimapOverlay extends Overlay
 
 			if (minimapLocation != null)
 			{
-				if (config.showCombatLevel())
+				if (plugin.isShowCombatLevel())
 				{
-					if (config.showCombatLevel())
-					{
-						name += "-(" + actor.getCombatLevel() + ")";
-					}
+					name += "-(" + actor.getCombatLevel() + ")";
 				}
-				if (config.drawMinimapNames())
+				if (plugin.isDrawMinimapNames())
 				{
-					if (actor.getSkullIcon() != null && config.playerSkull() && actor.getSkullIcon() == SkullIcon.SKULL)
+					if (actor.getSkullIcon() != null && plugin.isPlayerSkull() && actor.getSkullIcon() == SkullIcon.SKULL)
 					{
 						int width = graphics.getFontMetrics().stringWidth(name);
 						int height = graphics.getFontMetrics().getHeight();
-						if (config.skullLocation().equals(PlayerIndicatorsPlugin.MinimapSkullLocations.AFTER_NAME))
+						if (plugin.getSkullLocation().equals(PlayerIndicatorsPlugin.MinimapSkullLocations.AFTER_NAME))
 						{
 							OverlayUtil.renderImageLocation(graphics, new Point(minimapLocation.getX()
 									+ width, minimapLocation.getY() - height),
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsOverlay.java
index bd9d0bed03..8e4bc9aa9f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsOverlay.java
@@ -57,8 +57,8 @@ public class PlayerIndicatorsOverlay extends Overlay
 	private static final int ACTOR_HORIZONTAL_TEXT_MARGIN = 10;
 
 	private final PlayerIndicatorsService playerIndicatorsService;
-	private final PlayerIndicatorsConfig config;
 	private final ClanManager clanManager;
+	private final PlayerIndicatorsPlugin plugin;
 	private final BufferedImage skullIcon = ImageUtil.getResourceStreamFromClass(PlayerIndicatorsPlugin.class,
 		"skull.png");
 	@Inject
@@ -69,10 +69,10 @@ public class PlayerIndicatorsOverlay extends Overlay
 	private ItemManager itemManager;
 
 	@Inject
-	private PlayerIndicatorsOverlay(PlayerIndicatorsConfig config, PlayerIndicatorsService playerIndicatorsService,
-									ClanManager clanManager)
+	private PlayerIndicatorsOverlay(final PlayerIndicatorsPlugin plugin, final PlayerIndicatorsService playerIndicatorsService,
+									final ClanManager clanManager)
 	{
-		this.config = config;
+		this.plugin = plugin;
 		this.playerIndicatorsService = playerIndicatorsService;
 		this.clanManager = clanManager;
 		setPosition(OverlayPosition.DYNAMIC);
@@ -88,7 +88,7 @@ public class PlayerIndicatorsOverlay extends Overlay
 
 	private void renderPlayerOverlay(Graphics2D graphics, Player actor, Color color)
 	{
-		final PlayerNameLocation drawPlayerNamesConfig = config.playerNamePosition();
+		final PlayerNameLocation drawPlayerNamesConfig = plugin.getPlayerNamePosition();
 		if (drawPlayerNamesConfig == PlayerNameLocation.DISABLED)
 		{
 			return;
@@ -125,7 +125,7 @@ public class PlayerIndicatorsOverlay extends Overlay
 			return;
 		}
 
-		if (config.showClanRanks() && actor.isClanMember())
+		if (plugin.isShowClanRanks() && actor.isClanMember())
 		{
 			final ClanMemberRank rank = clanManager.getRank(name);
 
@@ -168,18 +168,18 @@ public class PlayerIndicatorsOverlay extends Overlay
 			name += tag;
 		}
 
-		if (config.highlightCallers() && playerIndicatorsPlugin.isCaller(actor))
+		if (plugin.isHighlightCallers() && playerIndicatorsPlugin.isCaller(actor))
 		{
 			name = "[C] " + name;
 		}
-		if (config.showCombatLevel())
+		if (plugin.isShowCombatLevel())
 		{
 
 			OverlayUtil.renderTextLocation(graphics, textLocation, name + " (" + actor.getCombatLevel() + ")",
 				color);
 
 		}
-		if (config.targetRisk() && PvPUtil.isAttackable(client, actor) && actor.getPlayerAppearance() != null)
+		if (plugin.isTargetRisk() && PvPUtil.isAttackable(client, actor) && actor.getPlayerAppearance() != null)
 		{
 			long totalValue = 0;
 			int newValue;
@@ -200,7 +200,7 @@ public class PlayerIndicatorsOverlay extends Overlay
 				name = name + stringBuilder;
 			}
 		}
-		if (config.unchargedGlory() && actor.getPlayerAppearance() != null)
+		if (plugin.isUnchargedGlory() && actor.getPlayerAppearance() != null)
 		{
 			ItemDefinition itemComposition = itemManager.getItemDefinition(actor.getPlayerAppearance().getEquipmentId(KitType.AMULET));
 			if (itemComposition != null && itemComposition.getId() == 1704) //1704 is uncharged glory, to be certain
@@ -209,11 +209,11 @@ public class PlayerIndicatorsOverlay extends Overlay
 			}
 		}
 
-		if (actor.getSkullIcon() != null && config.playerSkull() && actor.getSkullIcon() == SkullIcon.SKULL)
+		if (actor.getSkullIcon() != null && plugin.isPlayerSkull() && actor.getSkullIcon() == SkullIcon.SKULL)
 		{
 			int width = graphics.getFontMetrics().stringWidth(name);
 			int height = graphics.getFontMetrics().getHeight();
-			if (config.skullLocation().equals(PlayerIndicatorsPlugin.MinimapSkullLocations.AFTER_NAME))
+			if (plugin.getSkullLocation().equals(PlayerIndicatorsPlugin.MinimapSkullLocations.AFTER_NAME))
 			{
 				OverlayUtil.renderImageLocation(graphics, new Point(textLocation.getX()
 						+ width, textLocation.getY() - height),
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java
index 12358a2273..8bbdf54fa8 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java
@@ -30,6 +30,9 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
+import lombok.Getter;
 import net.runelite.api.ClanMember;
 import net.runelite.api.ClanMemberRank;
 import static net.runelite.api.ClanMemberRank.UNRANKED;
@@ -67,6 +70,7 @@ import net.runelite.client.util.PvPUtil;
 	description = "Highlight players on-screen and/or on the minimap",
 	tags = {"highlight", "minimap", "overlay", "players", "pklite"}
 )
+@Singleton
 public class PlayerIndicatorsPlugin extends Plugin
 {
 	@Inject
@@ -90,6 +94,60 @@ public class PlayerIndicatorsPlugin extends Plugin
 	@Inject
 	private ClanManager clanManager;
 
+	@Getter(AccessLevel.PACKAGE)
+	private boolean highlightOwnPlayer;
+	@Getter(AccessLevel.PACKAGE)
+	private Color getOwnPlayerColor;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean highlightFriends;
+	@Getter(AccessLevel.PACKAGE)
+	private Color getFriendColor;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean drawClanMemberNames;
+	@Getter(AccessLevel.PACKAGE)
+	private Color getClanMemberColor;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean highlightTeamMembers;
+	@Getter(AccessLevel.PACKAGE)
+	private Color getTeamMemberColor;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean highlightNonClanMembers;
+	@Getter(AccessLevel.PACKAGE)
+	private Color getNonClanMemberColor;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean drawTiles;
+	@Getter(AccessLevel.PACKAGE)
+	private PlayerNameLocation playerNamePosition;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean drawMinimapNames;
+	private boolean colorPlayerMenu;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showClanRanks;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean highlightTargets;
+	@Getter(AccessLevel.PACKAGE)
+	private Color getTargetColor;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showCombatLevel;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean playerSkull;
+	@Getter(AccessLevel.PACKAGE)
+	private PlayerIndicatorsPlugin.MinimapSkullLocations skullLocation;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean skulledTargetsOnly;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean targetRisk;
+	private boolean useClanchatRanks;
+	private ClanMemberRank callerRank;
+	@Getter(AccessLevel.PACKAGE)
+	private String configCallers;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean highlightCallers;
+	@Getter(AccessLevel.PACKAGE)
+	private Color callerColor;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean unchargedGlory;
+
 	@Provides
 	PlayerIndicatorsConfig provideConfig(ConfigManager configManager)
 	{
@@ -99,6 +157,8 @@ public class PlayerIndicatorsPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
+		
 		overlayManager.add(playerIndicatorsOverlay);
 		overlayManager.add(playerIndicatorsTileOverlay);
 		overlayManager.add(playerIndicatorsMinimapOverlay);
@@ -113,13 +173,19 @@ public class PlayerIndicatorsPlugin extends Plugin
 		overlayManager.remove(playerIndicatorsMinimapOverlay);
 	}
 
-	private ArrayList<String> callers = new ArrayList<>();
-	private List<String> pileList;
+	private List<String> callers = new ArrayList<>();
 
 	@Subscribe
-	public void onConfigChanged(ConfigChanged e)
+	public void onConfigChanged(ConfigChanged event)
 	{
-		if (config.callers() != null && !config.callers().trim().equals(""))
+		if (!event.getGroup().equals("playerindicators"))
+		{
+			return;
+		}
+
+		updateConfig();
+		
+		if (this.configCallers != null && !this.configCallers.trim().equals(""))
 		{
 			getCallerList();
 		}
@@ -140,28 +206,27 @@ public class PlayerIndicatorsPlugin extends Plugin
 	private void getCallerList()
 	{
 		callers.clear();
-		if (config.useClanchatRanks() && client.getClanMembers() != null)
+		if (this.useClanchatRanks && client.getClanMembers() != null)
 		{
 			for (ClanMember clanMember : client.getClanMembers())
 			{
-				if (clanMember.getRank().getValue() > config.callerRank().getValue())
+				if (clanMember.getRank().getValue() > this.callerRank.getValue())
 				{
 					callers.add(clanMember.getUsername());
 				}
 			}
 		}
-		if (config.callers().contains(","))
+		if (this.configCallers.contains(","))
 		{
-			callers.addAll(Arrays.asList(config.callers().split(",")));
+			callers.addAll(Arrays.asList(this.configCallers.split(",")));
 		}
 		else
 		{
-			if (!config.callers().equals("") || config.callers().length() > 1)
+			if (!this.configCallers.equals(""))
 			{
-				callers.add(config.callers());
+				callers.add(this.configCallers);
 			}
 		}
-		pileList = Arrays.asList(new String[callers.size()]);
 	}
 
 	boolean isCaller(Player player)
@@ -223,13 +288,13 @@ public class PlayerIndicatorsPlugin extends Plugin
 			int image2 = -1;
 			Color color = null;
 
-			if (config.colorPlayerMenu() && client.isFriended(player.getName(), false))
+			if (this.colorPlayerMenu && client.isFriended(player.getName(), false))
 			{
-				color = config.getFriendColor();
+				color = this.getFriendColor;
 			}
-			else if (config.colorPlayerMenu() && player.isClanMember())
+			else if (this.colorPlayerMenu && player.isClanMember())
 			{
-				color = config.getClanMemberColor();
+				color = this.getClanMemberColor;
 
 				ClanMemberRank rank = clanManager.getRank(player.getName());
 				if (rank != UNRANKED)
@@ -237,21 +302,21 @@ public class PlayerIndicatorsPlugin extends Plugin
 					image = clanManager.getIconNumber(rank);
 				}
 			}
-			else if (config.colorPlayerMenu() && player.getTeam() > 0 && localPlayer.getTeam() == player.getTeam())
+			else if (this.colorPlayerMenu && player.getTeam() > 0 && localPlayer.getTeam() == player.getTeam())
 			{
-				color = config.getTeamMemberColor();
+				color = this.getTeamMemberColor;
 			}
-			else if (config.highlightNonClanMembers() && !player.isClanMember() && !player.isFriend() && !PvPUtil.isAttackable(client, player))
+			else if (this.highlightNonClanMembers && !player.isClanMember() && !player.isFriend() && !PvPUtil.isAttackable(client, player))
 			{
-				color = config.getNonClanMemberColor();
+				color = this.getNonClanMemberColor;
 			}
-			else if (config.colorPlayerMenu() && !player.isClanMember() && client.isFriended(player.getName(), false) && PvPUtil.isAttackable(client, player))
+			else if (this.colorPlayerMenu && !player.isClanMember() && client.isFriended(player.getName(), false) && PvPUtil.isAttackable(client, player))
 			{
-				color = config.getTargetColor();
+				color = this.getTargetColor;
 			}
-			else if (config.colorPlayerMenu() && PvPUtil.isAttackable(client, player) && !player.isClanMember() && !player.isFriend())
+			else if (this.colorPlayerMenu && PvPUtil.isAttackable(client, player) && !player.isClanMember() && !player.isFriend())
 			{
-				color = config.getTargetColor();
+				color = this.getTargetColor;
 			}
 /*			if (config.rightClickOverhead() && !player.isClanMember() && player.getOverheadIcon() != null)
 			{
@@ -280,13 +345,13 @@ public class PlayerIndicatorsPlugin extends Plugin
 					image = 34;
 				}
 			}*/
-			if (config.playerSkull() && !player.isClanMember() && player.getSkullIcon() != null)
+			if (this.playerSkull && !player.isClanMember() && player.getSkullIcon() != null)
 			{
 				image2 = 35;
 			}
-			if (config.colorPlayerMenu() && config.highlightCallers() && this.isCaller(player))
+			if (this.colorPlayerMenu && this.highlightCallers && this.isCaller(player))
 			{
-				color = config.callerColor();
+				color = this.callerColor;
 			}
 			if (image != -1 || color != null)
 			{
@@ -294,7 +359,7 @@ public class PlayerIndicatorsPlugin extends Plugin
 				MenuEntry lastEntry = menuEntries[menuEntries.length - 1];
 
 
-				if (color != null && config.colorPlayerMenu())
+				if (color != null && this.colorPlayerMenu)
 				{
 					// strip out existing <col...
 					String target = lastEntry.getTarget();
@@ -311,7 +376,7 @@ public class PlayerIndicatorsPlugin extends Plugin
 				{
 					lastEntry.setTarget(lastEntry.getTarget() + "<img=" + image + ">");
 				}*/
-				if (image2 != -1 && config.playerSkull())
+				if (image2 != -1 && this.playerSkull)
 				{
 					lastEntry.setTarget("<img=" + image2 + ">" + lastEntry.getTarget());
 				}
@@ -326,4 +391,36 @@ public class PlayerIndicatorsPlugin extends Plugin
 		BEFORE_NAME,
 		AFTER_NAME
 	}
+	
+	private void updateConfig()
+	{
+		this.highlightOwnPlayer = config.highlightOwnPlayer();
+		this.getOwnPlayerColor = config.getOwnPlayerColor();
+		this.highlightFriends = config.highlightFriends();
+		this.getFriendColor = config.getFriendColor();
+		this.drawClanMemberNames = config.drawClanMemberNames();
+		this.getClanMemberColor = config.getClanMemberColor();
+		this.highlightTeamMembers = config.highlightTeamMembers();
+		this.getTeamMemberColor = config.getTeamMemberColor();
+		this.highlightNonClanMembers = config.highlightNonClanMembers();
+		this.getNonClanMemberColor = config.getNonClanMemberColor();
+		this.drawTiles = config.drawTiles();
+		this.playerNamePosition = config.playerNamePosition();
+		this.drawMinimapNames = config.drawMinimapNames();
+		this.colorPlayerMenu = config.colorPlayerMenu();
+		this.showClanRanks = config.showClanRanks();
+		this.highlightTargets = config.highlightTargets();
+		this.getTargetColor = config.getTargetColor();
+		this.showCombatLevel = config.showCombatLevel();
+		this.playerSkull = config.playerSkull();
+		this.skullLocation = config.skullLocation();
+		this.skulledTargetsOnly = config.skulledTargetsOnly();
+		this.targetRisk = config.targetRisk();
+		this.useClanchatRanks = config.useClanchatRanks();
+		this.callerRank = config.callerRank();
+		this.configCallers = config.callers();
+		this.highlightCallers = config.highlightCallers();
+		this.callerColor = config.callerColor();
+		this.unchargedGlory = config.unchargedGlory();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsService.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsService.java
index 51717af33f..54a2589782 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsService.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsService.java
@@ -36,21 +36,19 @@ import net.runelite.client.util.PvPUtil;
 public class PlayerIndicatorsService
 {
 	private final Client client;
-	private final PlayerIndicatorsConfig config;
-	private final PlayerIndicatorsPlugin playerIndicatorsPlugin;
+	private final PlayerIndicatorsPlugin plugin;
 
 	@Inject
-	private PlayerIndicatorsService(Client client, PlayerIndicatorsConfig config, PlayerIndicatorsPlugin plugin)
+	private PlayerIndicatorsService(final Client client, final PlayerIndicatorsPlugin plugin)
 	{
-		this.config = config;
 		this.client = client;
-		this.playerIndicatorsPlugin = plugin;
+		this.plugin = plugin;
 	}
 
 	public void forEachPlayer(final BiConsumer<Player, Color> consumer)
 	{
-		if (!config.highlightOwnPlayer() && !config.drawClanMemberNames()
-			&& !config.highlightFriends() && !config.highlightNonClanMembers() && !config.highlightTargets() && !config.highlightCallers() && !config.highlightTeamMembers())
+		if (!plugin.isHighlightOwnPlayer() && !plugin.isDrawClanMemberNames()
+			&& !plugin.isHighlightFriends() && !plugin.isHighlightNonClanMembers() && !plugin.isHighlightTargets() && !plugin.isHighlightCallers() && !plugin.isHighlightTeamMembers())
 		{
 			return;
 		}
@@ -66,45 +64,45 @@ public class PlayerIndicatorsService
 
 			boolean isClanMember = player.isClanMember();
 
-			if (player == localPlayer)
+			if (player.equals(localPlayer))
 			{
-				if (config.highlightOwnPlayer())
+				if (plugin.isHighlightOwnPlayer())
 				{
-					consumer.accept(player, config.getOwnPlayerColor());
+					consumer.accept(player, plugin.getGetOwnPlayerColor());
 				}
 			}
-			else if (config.highlightFriends() && client.isFriended(player.getName(), false))
+			else if (plugin.isHighlightFriends() && client.isFriended(player.getName(), false))
 			{
-				consumer.accept(player, config.getFriendColor());
+				consumer.accept(player, plugin.getGetFriendColor());
 			}
-			else if (config.drawClanMemberNames() && isClanMember)
+			else if (plugin.isDrawClanMemberNames() && isClanMember)
 			{
-				consumer.accept(player, config.getClanMemberColor());
+				consumer.accept(player, plugin.getGetClanMemberColor());
 			}
-			else if (config.highlightTeamMembers() && localPlayer.getTeam() > 0 &&
+			else if (plugin.isHighlightTeamMembers() && localPlayer.getTeam() > 0 &&
 				localPlayer.getTeam() == player.getTeam())
 			{
-				consumer.accept(player, config.getTeamMemberColor());
+				consumer.accept(player, plugin.getGetTeamMemberColor());
 			}
-			else if (config.highlightNonClanMembers() && !isClanMember)
+			else if (plugin.isHighlightNonClanMembers() && !isClanMember)
 			{
-				consumer.accept(player, config.getNonClanMemberColor());
+				consumer.accept(player, plugin.getGetNonClanMemberColor());
 			}
-			else if (config.highlightTargets() && PvPUtil.isAttackable(client, player) &&
+			else if (plugin.isHighlightTargets() && PvPUtil.isAttackable(client, player) &&
 				!client.isFriended(player.getName(), false) && !player.isClanMember())
 			{
-				if (config.skulledTargetsOnly() && player.getSkullIcon() != null)
+				if (plugin.isSkulledTargetsOnly() && player.getSkullIcon() != null)
 				{
-					consumer.accept(player, config.getTargetColor());
+					consumer.accept(player, plugin.getGetTargetColor());
 				}
-				else if (!config.skulledTargetsOnly())
+				else if (!plugin.isSkulledTargetsOnly())
 				{
-					consumer.accept(player, config.getTargetColor());
+					consumer.accept(player, plugin.getGetTargetColor());
 				}
 			}
-			if (config.highlightCallers() && config.callers() != null && playerIndicatorsPlugin.isCaller(player))
+			if (plugin.isHighlightCallers() && plugin.getConfigCallers() != null && plugin.isCaller(player))
 			{
-				consumer.accept(player, config.callerColor());
+				consumer.accept(player, plugin.getCallerColor());
 			}
 		}
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsTileOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsTileOverlay.java
index 5ae7299db6..c3b35626bf 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsTileOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsTileOverlay.java
@@ -29,23 +29,22 @@ import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.awt.Polygon;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayPriority;
 import net.runelite.client.ui.overlay.OverlayUtil;
 
+@Singleton
 public class PlayerIndicatorsTileOverlay extends Overlay
 {
 	private final PlayerIndicatorsService playerIndicatorsService;
-	private final PlayerIndicatorsConfig config;
 	private final PlayerIndicatorsPlugin playerIndicatorsPlugin;
 
 	@Inject
-	private PlayerIndicatorsTileOverlay(PlayerIndicatorsConfig config,
-										PlayerIndicatorsService playerIndicatorsService, PlayerIndicatorsPlugin plugin)
+	private PlayerIndicatorsTileOverlay(final PlayerIndicatorsService playerIndicatorsService, final PlayerIndicatorsPlugin plugin)
 	{
-		this.config = config;
 		this.playerIndicatorsService = playerIndicatorsService;
 		this.playerIndicatorsPlugin = plugin;
 		setLayer(OverlayLayer.ABOVE_SCENE);
@@ -56,11 +55,11 @@ public class PlayerIndicatorsTileOverlay extends Overlay
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (!config.drawTiles() /*&& !config.drawPlayerHull()*/)
+		if (!playerIndicatorsPlugin.isDrawTiles() /*&& !config.drawPlayerHull()*/)
 		{
 			return null;
 		}
-		else if (config.drawTiles())
+		else
 		{
 			playerIndicatorsService.forEachPlayer((player, color) ->
 			{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerinfo/PlayerInfoCustomIndicator.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerinfo/PlayerInfoCustomIndicator.java
index bcb25d5577..906cd981fb 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/playerinfo/PlayerInfoCustomIndicator.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerinfo/PlayerInfoCustomIndicator.java
@@ -26,6 +26,7 @@ package net.runelite.client.plugins.playerinfo;
 
 import java.awt.Color;
 import java.awt.Image;
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import net.runelite.api.Client;
@@ -37,7 +38,7 @@ import net.runelite.client.util.ColorUtil;
 public class PlayerInfoCustomIndicator extends InfoBox
 {
 	@AllArgsConstructor
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	enum IndicatorType
 	{
 		HEALTH("Current Hitpoints"),
@@ -49,14 +50,14 @@ public class PlayerInfoCustomIndicator extends InfoBox
 		private final String description;
 	}
 
-	private final PlayerInfoConfig config;
+	private final PlayerInfoPlugin plugin;
 	private final Client client;
 	private final IndicatorType type;
 
-	PlayerInfoCustomIndicator(Image image, PlayerInfoPlugin plugin, PlayerInfoConfig config, Client client, IndicatorType type)
+	PlayerInfoCustomIndicator(final Image image, final PlayerInfoPlugin plugin, final Client client, final IndicatorType type)
 	{
 		super(image, plugin);
-		this.config = config;
+		this.plugin = plugin;
 		this.client = client;
 		this.type = type;
 
@@ -107,15 +108,15 @@ public class PlayerInfoCustomIndicator extends InfoBox
 
 		if (currLvl > 1.0)
 		{
-			return config.colorHigh();
+			return plugin.getColorHigh();
 		}
 		else if (currLvl > 0.5)
 		{
-			return ColorUtil.colorLerp(config.colorMed(), config.colorHigh(), (currLvl * 2) - 1.0F);
+			return ColorUtil.colorLerp(plugin.getColorMed(), plugin.getColorHigh(), (currLvl * 2) - 1.0F);
 		}
 		else
 		{
-			return ColorUtil.colorLerp(config.colorLow(), config.colorMed(), (currLvl * 2));
+			return ColorUtil.colorLerp(plugin.getColorLow(), plugin.getColorMed(), (currLvl * 2));
 		}
 	}
 
@@ -125,15 +126,15 @@ public class PlayerInfoCustomIndicator extends InfoBox
 		switch (type)
 		{
 			case HEALTH:
-				return config.enableHealth();
+				return plugin.isEnableHealth();
 			case PRAYER:
-				return config.enablePrayer();
+				return plugin.isEnablePrayer();
 			case ENERGY:
-				return config.enableEnergy();
+				return plugin.isEnableEnergy();
 			case SPECIAL:
-				return config.enableSpec();
+				return plugin.isEnableSpec();
 			case WORLD:
-				return config.enableWorld();
+				return plugin.isEnableWorld();
 		}
 
 		return false;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerinfo/PlayerInfoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerinfo/PlayerInfoPlugin.java
index 2f414f22d0..285cac241c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/playerinfo/PlayerInfoPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerinfo/PlayerInfoPlugin.java
@@ -25,15 +25,17 @@
 package net.runelite.client.plugins.playerinfo;
 
 import com.google.inject.Provides;
+import java.awt.Color;
 import java.awt.image.BufferedImage;
 import javax.inject.Inject;
 import javax.inject.Singleton;
+import lombok.AccessLevel;
+import lombok.Getter;
 import net.runelite.api.Client;
 import net.runelite.api.GameState;
 import net.runelite.api.SpriteID;
 import net.runelite.client.callback.ClientThread;
 import net.runelite.client.config.ConfigManager;
-import net.runelite.client.game.SkillIconManager;
 import net.runelite.client.game.SpriteManager;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginDescriptor;
@@ -48,7 +50,6 @@ import net.runelite.client.ui.overlay.infobox.InfoBoxManager;
 	type = PluginType.UTILITY,
 	enabledByDefault = false
 )
-
 @Singleton
 public class PlayerInfoPlugin extends Plugin
 {
@@ -67,8 +68,22 @@ public class PlayerInfoPlugin extends Plugin
 	@Inject
 	private SpriteManager spriteManager;
 
-	@Inject
-	private SkillIconManager skillIconManager;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean enableHealth;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean enablePrayer;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean enableEnergy;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean enableSpec;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean enableWorld;
+	@Getter(AccessLevel.PACKAGE)
+	private Color colorHigh;
+	@Getter(AccessLevel.PACKAGE)
+	private Color colorMed;
+	@Getter(AccessLevel.PACKAGE)
+	private Color colorLow;
 
 	@Provides
 	PlayerInfoConfig provideConfig(ConfigManager configManager)
@@ -79,6 +94,8 @@ public class PlayerInfoPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
+
 		clientThread.invoke(() ->
 		{
 			if (client.getGameState().ordinal() < GameState.LOGIN_SCREEN.ordinal())
@@ -92,11 +109,11 @@ public class PlayerInfoPlugin extends Plugin
 			BufferedImage combatImg = spriteManager.getSprite(SpriteID.MINIMAP_ORB_SPECIAL_ICON, 0);
 			BufferedImage worldImg = spriteManager.getSprite(SpriteID.MINIMAP_ORB_WORLD_MAP_PLANET, 0);
 
-			infoBoxManager.addInfoBox(new PlayerInfoCustomIndicator(healthImg, this, config, client, IndicatorType.HEALTH));
-			infoBoxManager.addInfoBox(new PlayerInfoCustomIndicator(prayerImg, this, config, client, IndicatorType.PRAYER));
-			infoBoxManager.addInfoBox(new PlayerInfoCustomIndicator(energyImg, this, config, client, IndicatorType.ENERGY));
-			infoBoxManager.addInfoBox(new PlayerInfoCustomIndicator(combatImg, this, config, client, IndicatorType.SPECIAL));
-			infoBoxManager.addInfoBox(new PlayerInfoCustomIndicator(worldImg, this, config, client, IndicatorType.WORLD));
+			infoBoxManager.addInfoBox(new PlayerInfoCustomIndicator(healthImg, this, client, IndicatorType.HEALTH));
+			infoBoxManager.addInfoBox(new PlayerInfoCustomIndicator(prayerImg, this, client, IndicatorType.PRAYER));
+			infoBoxManager.addInfoBox(new PlayerInfoCustomIndicator(energyImg, this, client, IndicatorType.ENERGY));
+			infoBoxManager.addInfoBox(new PlayerInfoCustomIndicator(combatImg, this, client, IndicatorType.SPECIAL));
+			infoBoxManager.addInfoBox(new PlayerInfoCustomIndicator(worldImg, this, client, IndicatorType.WORLD));
 
 			return true;
 		});
@@ -107,4 +124,16 @@ public class PlayerInfoPlugin extends Plugin
 	{
 		infoBoxManager.removeIf(i -> i instanceof PlayerInfoCustomIndicator);
 	}
+
+	private void updateConfig()
+	{
+		this.enableHealth = config.enableHealth();
+		this.enablePrayer = config.enablePrayer();
+		this.enableEnergy = config.enableEnergy();
+		this.enableSpec = config.enableSpec();
+		this.enableWorld = config.enableWorld();
+		this.colorHigh = config.colorHigh();
+		this.colorMed = config.colorMed();
+		this.colorLow = config.colorLow();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java
index 9d742a5280..c2f09c8371 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java
@@ -30,11 +30,11 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import javax.inject.Inject;
-import net.runelite.api.GameState;
+import javax.inject.Singleton;
 import net.runelite.api.events.ConfigChanged;
-import net.runelite.api.events.GameStateChanged;
 import net.runelite.client.config.ConfigManager;
 import net.runelite.client.eventbus.Subscribe;
+import net.runelite.client.events.PluginChanged;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginDescriptor;
 import net.runelite.client.plugins.PluginType;
@@ -47,14 +47,22 @@ import net.runelite.client.plugins.config.PluginListItem;
 	tags = {"plugins", "organizer"},
 	type = PluginType.PLUGIN_ORGANIZER
 )
+@Singleton
 public class PluginSorterPlugin extends Plugin
 {
 	//Cache the hidden plugins
-	private static List<PluginListItem> removedPlugins = new ArrayList<>();
+	private static final List<PluginListItem> removedPlugins = new ArrayList<>();
 
 	@Inject
 	private PluginSorterConfig config;
 
+	private boolean hidePlugins;
+	private Color externalColor;
+	private Color pvmColor;
+	private Color pvpColor;
+	private Color skillingColor;
+	private Color utilityColor;
+
 	@Provides
 	PluginSorterConfig provideConfig(ConfigManager configManager)
 	{
@@ -64,6 +72,7 @@ public class PluginSorterPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
 		updateColors();
 	}
 
@@ -74,33 +83,39 @@ public class PluginSorterPlugin extends Plugin
 	}
 
 	@Subscribe
-	public void onGameStateChanged(GameStateChanged gameStateChanged)
+	public void onPluginChanged(PluginChanged pluginChanged)
 	{
-		if (gameStateChanged.getGameState() == GameState.LOGIN_SCREEN)
+		validatePlugins();
+	}
+
+	private void validatePlugins()
+	{
+		if (this.hidePlugins)
 		{
-			if (config.hidePlugins())
-			{
-				hidePlugins();
-			}
-			updateColors();
+			hidePlugins();
 		}
+		else
+		{
+			showPlugins();
+		}
+
+		updateColors();
 	}
 
 	@Subscribe
 	public void onConfigChanged(ConfigChanged configChanged)
 	{
+		if (!configChanged.getGroup().equals("pluginsorter"))
+		{
+			return;
+		}
+
+		updateConfig();
+
 		if (configChanged.getKey().equals("hidePlugins"))
 		{
-			if (config.hidePlugins())
-			{
-				hidePlugins();
-			}
-			else
-			{
-				showPlugins();
-			}
+			validatePlugins();
 		}
-		updateColors();
 	}
 
 	private void updateColors()
@@ -112,19 +127,19 @@ public class PluginSorterPlugin extends Plugin
 				switch (pli.getPlugin().getClass().getAnnotation(PluginDescriptor.class).type())
 				{
 					case EXTERNAL:
-						pli.nameLabel.setForeground(config.externalColor());
+						pli.nameLabel.setForeground(this.externalColor);
 						break;
 					case PVM:
-						pli.nameLabel.setForeground(config.pvmColor());
+						pli.nameLabel.setForeground(this.pvmColor);
 						break;
 					case PVP:
-						pli.nameLabel.setForeground(config.pvpColor());
+						pli.nameLabel.setForeground(this.pvpColor);
 						break;
 					case SKILLING:
-						pli.nameLabel.setForeground(config.skillingColor());
+						pli.nameLabel.setForeground(this.skillingColor);
 						break;
 					case UTILITY:
-						pli.nameLabel.setForeground(config.utilityColor());
+						pli.nameLabel.setForeground(this.utilityColor);
 						break;
 					default:
 						pli.nameLabel.setForeground(Color.WHITE);
@@ -162,9 +177,25 @@ public class PluginSorterPlugin extends Plugin
 
 	private void showPlugins()
 	{
-		List<PluginListItem> tempList = new ArrayList<>();
-		tempList.addAll(removedPlugins);
-		tempList.addAll(ConfigPanel.pluginList);
+		List<PluginListItem> tempList = new ArrayList<>(ConfigPanel.pluginList);
+		if (tempList.size() > 0)
+		{
+			tempList.addAll(1, removedPlugins);
+		}
+		else
+		{
+			tempList.addAll(removedPlugins);
+		}
 		ConfigPanel.pluginList = tempList;
 	}
+
+	private void updateConfig()
+	{
+		this.hidePlugins = config.hidePlugins();
+		this.externalColor = config.externalColor();
+		this.pvmColor = config.pvmColor();
+		this.pvpColor = config.pvpColor();
+		this.skillingColor = config.skillingColor();
+		this.utilityColor = config.utilityColor();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/poh/BurnerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/poh/BurnerOverlay.java
index 16c8d4edc3..45d38e4e8c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/poh/BurnerOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/poh/BurnerOverlay.java
@@ -30,6 +30,7 @@ import java.awt.Graphics2D;
 import java.time.Duration;
 import java.time.Instant;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.Perspective;
 import net.runelite.api.Point;
@@ -38,26 +39,25 @@ import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.components.ProgressPieComponent;
 
+@Singleton
 class BurnerOverlay extends Overlay
 {
 	private final Client client;
-	private final PohConfig config;
 	private final PohPlugin plugin;
 
 	@Inject
-	private BurnerOverlay(Client client, PohConfig config, PohPlugin plugin)
+	private BurnerOverlay(final Client client, final PohPlugin plugin)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_SCENE);
 		this.client = client;
-		this.config = config;
 		this.plugin = plugin;
 	}
 
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (!config.showBurner())
+		if (!plugin.isShowBurner())
 		{
 			return null;
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/poh/IncenseBurner.java b/runelite-client/src/main/java/net/runelite/client/plugins/poh/IncenseBurner.java
index c47f9bfe14..3d6acd175b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/poh/IncenseBurner.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/poh/IncenseBurner.java
@@ -25,13 +25,14 @@
 package net.runelite.client.plugins.poh;
 
 import java.time.Instant;
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 
-@Getter
-@Setter
+@Getter(AccessLevel.PACKAGE)
+@Setter(AccessLevel.PACKAGE)
 @RequiredArgsConstructor
 @AllArgsConstructor
 class IncenseBurner
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/poh/PohOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/poh/PohOverlay.java
index 9d048e584e..6ecb5392a4 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/poh/PohOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/poh/PohOverlay.java
@@ -30,6 +30,8 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.Client;
 import net.runelite.api.Perspective;
@@ -38,6 +40,7 @@ import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 
+@Singleton
 public class PohOverlay extends Overlay
 {
 	private static final PohIcons[] PORTALS = new PohIcons[]
@@ -50,20 +53,18 @@ public class PohOverlay extends Overlay
 
 	private static final int MAX_DISTANCE = 2350;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final List<PohIcons> iconList = new ArrayList<>();
 
 	private final Client client;
-	private final PohConfig config;
 	private final PohPlugin plugin;
 
 	@Inject
-	public PohOverlay(Client client, PohConfig config, PohPlugin plugin)
+	public PohOverlay(final Client client, final PohPlugin plugin)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_WIDGETS);
 		this.client = client;
-		this.config = config;
 		this.plugin = plugin;
 	}
 
@@ -96,51 +97,51 @@ public class PohOverlay extends Overlay
 	public void updateConfig()
 	{
 		iconList.clear();
-		if (config.showPortals())
+		if (plugin.isShowPortals())
 		{
 			Collections.addAll(iconList, PORTALS);
 		}
-		if (config.showAltar())
+		if (plugin.isShowAltar())
 		{
 			iconList.add(PohIcons.ALTAR);
 		}
-		if (config.showGlory())
+		if (plugin.isShowGlory())
 		{
 			iconList.add(PohIcons.GLORY);
 		}
-		if (config.showRepairStand())
+		if (plugin.isShowRepairStand())
 		{
 			iconList.add(PohIcons.REPAIR);
 		}
-		if (config.showPools())
+		if (plugin.isShowPools())
 		{
 			iconList.add(PohIcons.POOLS);
 		}
-		if (config.showExitPortal())
+		if (plugin.isShowExitPortal())
 		{
 			iconList.add(PohIcons.EXITPORTAL);
 		}
-		if (config.showSpellbook())
+		if (plugin.isShowSpellbook())
 		{
 			iconList.add(PohIcons.SPELLBOOKALTAR);
 		}
-		if (config.showJewelleryBox())
+		if (plugin.isShowJewelleryBox())
 		{
 			iconList.add(PohIcons.JEWELLERYBOX);
 		}
-		if (config.showMagicTravel())
+		if (plugin.isShowMagicTravel())
 		{
 			iconList.add(PohIcons.MAGICTRAVEL);
 		}
-		if (config.showPortalNexus())
+		if (plugin.isShowPortalNexus())
 		{
 			iconList.add(PohIcons.PORTALNEXUS);
 		}
-		if (config.showDigsitePendant())
+		if (plugin.isShowDigsitePendant())
 		{
 			iconList.add(PohIcons.DIGSITEPENDANT);
 		}
-		if (config.showXericsTalisman())
+		if (plugin.isShowXericsTalisman())
 		{
 			iconList.add(PohIcons.XERICSTALISMAN);
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/poh/PohPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/poh/PohPlugin.java
index be70c9689d..c71bfad61e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/poh/PohPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/poh/PohPlugin.java
@@ -33,6 +33,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ScheduledExecutorService;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
@@ -71,6 +72,7 @@ import net.runelite.http.api.hiscore.Skill;
 	tags = {"construction", "poh", "minimap", "overlay"}
 )
 @Slf4j
+@Singleton
 public class PohPlugin extends Plugin
 {
 	static final Set<Integer> BURNER_UNLIT = Sets.newHashSet(ObjectID.INCENSE_BURNER, ObjectID.INCENSE_BURNER_13210, ObjectID.INCENSE_BURNER_13212);
@@ -88,6 +90,9 @@ public class PohPlugin extends Plugin
 	@Inject
 	private PohOverlay overlay;
 
+	@Inject
+	private PohConfig config;
+
 	@Inject
 	private Client client;
 
@@ -100,6 +105,33 @@ public class PohPlugin extends Plugin
 	@Inject
 	private BurnerOverlay burnerOverlay;
 
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showPortals;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showAltar;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showGlory;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showPools;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showRepairStand;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showExitPortal;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showBurner;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showSpellbook;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showJewelleryBox;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showMagicTravel;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showPortalNexus;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showDigsitePendant;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showXericsTalisman;
+
 	@Provides
 	PohConfig getConfig(ConfigManager configManager)
 	{
@@ -109,6 +141,8 @@ public class PohPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
+
 		overlayManager.add(overlay);
 		overlayManager.add(burnerOverlay);
 		overlay.updateConfig();
@@ -126,6 +160,13 @@ public class PohPlugin extends Plugin
 	@Subscribe
 	public void onConfigChanged(ConfigChanged event)
 	{
+		if (!event.getGroup().equals("poh"))
+		{
+			return;
+		}
+
+		updateConfig();
+
 		overlay.updateConfig();
 	}
 
@@ -247,4 +288,21 @@ public class PohPlugin extends Plugin
 		incenseBurner.setCountdownTimer((200 + fmLevel) * tickLengthSeconds);
 		incenseBurner.setRandomTimer(fmLevel * tickLengthSeconds);
 	}
+
+	private void updateConfig()
+	{
+		this.showPortals = config.showPortals();
+		this.showAltar = config.showAltar();
+		this.showGlory = config.showGlory();
+		this.showPools = config.showPools();
+		this.showRepairStand = config.showRepairStand();
+		this.showExitPortal = config.showExitPortal();
+		this.showBurner = config.showBurner();
+		this.showSpellbook = config.showSpellbook();
+		this.showJewelleryBox = config.showJewelleryBox();
+		this.showMagicTravel = config.showMagicTravel();
+		this.showPortalNexus = config.showPortalNexus();
+		this.showDigsitePendant = config.showDigsitePendant();
+		this.showXericsTalisman = config.showXericsTalisman();
+	}
 }
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonActorOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonActorOverlay.java
index 020cf2e869..50fa729a60 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonActorOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonActorOverlay.java
@@ -7,6 +7,7 @@ import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
 import java.util.Map;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Actor;
 import net.runelite.api.Client;
 import net.runelite.api.Constants;
@@ -22,6 +23,7 @@ import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayUtil;
 
+@Singleton
 public class PoisonActorOverlay extends Overlay
 {
 	private final PoisonPlugin plugin;
@@ -30,7 +32,7 @@ public class PoisonActorOverlay extends Overlay
 	private Font font;
 
 	@Inject
-	PoisonActorOverlay(PoisonPlugin plugin, Client client)
+	PoisonActorOverlay(final PoisonPlugin plugin, final Client client)
 	{
 		this.plugin = plugin;
 		this.client = client;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonInfobox.java b/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonInfobox.java
index d7a3527a51..0810be80a9 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonInfobox.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonInfobox.java
@@ -35,7 +35,7 @@ class PoisonInfobox extends Timer
 {
 	private final PoisonPlugin plugin;
 
-	PoisonInfobox(int duration, BufferedImage image, PoisonPlugin plugin)
+	PoisonInfobox(final int duration, final BufferedImage image, final PoisonPlugin plugin)
 	{
 		super(duration, ChronoUnit.MILLIS, image, plugin);
 		this.plugin = plugin;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonOverlay.java
index 758811f292..e709e4473a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonOverlay.java
@@ -28,6 +28,7 @@ import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.awt.Rectangle;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.Point;
 import net.runelite.api.widgets.Widget;
@@ -38,6 +39,7 @@ import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.tooltip.Tooltip;
 import net.runelite.client.ui.overlay.tooltip.TooltipManager;
 
+@Singleton
 class PoisonOverlay extends Overlay
 {
 	private final PoisonPlugin plugin;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonPlugin.java
index ff39332758..ef0a03b5e8 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonPlugin.java
@@ -37,6 +37,7 @@ import java.time.temporal.ChronoUnit;
 import java.util.HashMap;
 import java.util.Map;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.Getter;
 import net.runelite.api.Actor;
 import net.runelite.api.Client;
@@ -69,6 +70,7 @@ import net.runelite.client.util.ImageUtil;
 	description = "Tracks current damage values for Poison and Venom",
 	tags = {"combat", "poison", "venom", "heart", "hp"}
 )
+@Singleton
 public class PoisonPlugin extends Plugin
 {
 	private static final int POISON_TICK_MILLIS = 18000;
@@ -126,6 +128,12 @@ public class PoisonPlugin extends Plugin
 	@Getter
 	private Map<Actor, ActorPoisonInfo> poisonedActors = new HashMap<>();
 
+	private boolean showInfoboxes;
+	private boolean changeHealthIcon;
+	private boolean showForPlayers;
+	private boolean showForNpcs;
+	private int fontSize;
+
 	@Provides
 	PoisonConfig getConfig(ConfigManager configManager)
 	{
@@ -135,10 +143,12 @@ public class PoisonPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
-		actorOverlay.setFontSize(config.fontSize());
+		updateConfig();
+
+		actorOverlay.setFontSize(this.fontSize);
 		overlayManager.add(poisonOverlay);
 
-		if (config.showForNpcs() || config.showForPlayers())
+		if (this.showForNpcs || this.showForPlayers)
 		{
 			overlayManager.add(actorOverlay);
 		}
@@ -188,7 +198,7 @@ public class PoisonPlugin extends Plugin
 			final int damage = nextDamage(poisonValue);
 			this.lastDamage = damage;
 
-			if (config.showInfoboxes())
+			if (this.showInfoboxes)
 			{
 				if (infobox != null)
 				{
@@ -232,8 +242,8 @@ public class PoisonPlugin extends Plugin
 		Actor actor = event.getActor();
 
 		if (actor == client.getLocalPlayer() ||
-			actor instanceof NPC && !config.showForNpcs() ||
-			actor instanceof Player && !config.showForPlayers())
+			actor instanceof NPC && !this.showForNpcs ||
+			actor instanceof Player && !this.showForPlayers)
 		{
 			return;
 		}
@@ -313,13 +323,15 @@ public class PoisonPlugin extends Plugin
 			return;
 		}
 
-		if (!config.showInfoboxes() && infobox != null)
+		updateConfig();
+
+		if (!this.showInfoboxes && infobox != null)
 		{
 			infoBoxManager.removeInfoBox(infobox);
 			infobox = null;
 		}
 
-		if (config.changeHealthIcon())
+		if (this.changeHealthIcon)
 		{
 			clientThread.invoke(this::checkHealthIcon);
 		}
@@ -332,18 +344,18 @@ public class PoisonPlugin extends Plugin
 		{
 			overlayManager.remove(actorOverlay);
 
-			if (!config.showForPlayers() && !config.showForNpcs())
+			if (!this.showForPlayers && !this.showForNpcs)
 			{
 				poisonedActors.clear();
 			}
 			else
 			{
-				if (!config.showForNpcs())
+				if (!this.showForNpcs)
 				{
 					poisonedActors.entrySet().removeIf(a -> a instanceof NPC);
 				}
 
-				if (!config.showForPlayers())
+				if (!this.showForPlayers)
 				{
 					poisonedActors.entrySet().removeIf(a -> a instanceof Player);
 				}
@@ -354,7 +366,7 @@ public class PoisonPlugin extends Plugin
 
 		if (event.getKey().equals("fontsize"))
 		{
-			actorOverlay.setFontSize(config.fontSize());
+			actorOverlay.setFontSize(this.fontSize);
 		}
 	}
 
@@ -449,7 +461,7 @@ public class PoisonPlugin extends Plugin
 
 	private void checkHealthIcon()
 	{
-		if (!config.changeHealthIcon())
+		if (!this.changeHealthIcon)
 		{
 			return;
 		}
@@ -476,7 +488,7 @@ public class PoisonPlugin extends Plugin
 		}
 
 		// Only update sprites when the heart icon actually changes
-		if (newHeart != heart)
+		if (newHeart != null && !newHeart.equals(heart))
 		{
 			heart = newHeart;
 			client.getWidgetSpriteCache().reset();
@@ -495,4 +507,13 @@ public class PoisonPlugin extends Plugin
 		client.getSpriteOverrides().remove(SpriteID.MINIMAP_ORB_HITPOINTS_ICON);
 		heart = null;
 	}
+
+	private void updateConfig()
+	{
+		this.showInfoboxes = config.showInfoboxes();
+		this.changeHealthIcon = config.changeHealthIcon();
+		this.showForPlayers = config.showForPlayers();
+		this.showForNpcs = config.showForNpcs();
+		this.fontSize = config.fontSize();
+	}
 }
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PlayerContainer.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PlayerContainer.java
index 68f78ab065..338fcd4357 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PlayerContainer.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PlayerContainer.java
@@ -34,11 +34,11 @@ import net.runelite.api.Player;
 public class PlayerContainer
 {
 
-	private Player player;
-	private long whenTheyAttackedMe;
-	private int millisToExpireHighlight;
+	private final Player player;
+	private final long whenTheyAttackedMe;
+	private final int millisToExpireHighlight;
 
-	PlayerContainer(Player player, long whenTheyAttackedMe, int millisToExpireHighlight)
+	PlayerContainer(final Player player, final long whenTheyAttackedMe, final int millisToExpireHighlight)
 	{
 		this.player = player;
 		this.whenTheyAttackedMe = whenTheyAttackedMe;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlay.java
index a0ba2445cc..07ec30fec7 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlay.java
@@ -31,6 +31,7 @@ import java.awt.Polygon;
 import java.awt.image.BufferedImage;
 import java.util.ConcurrentModificationException;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.ItemDefinition;
 import net.runelite.api.Player;
@@ -43,19 +44,18 @@ import net.runelite.client.ui.overlay.OverlayPriority;
 import net.runelite.client.ui.overlay.OverlayUtil;
 import net.runelite.client.util.Text;
 
+@Singleton
 class PrayAgainstPlayerOverlay extends Overlay
 {
 
 	private final PrayAgainstPlayerPlugin plugin;
-	private final PrayAgainstPlayerConfig config;
 	private final Client client;
 
 	@Inject
-	private PrayAgainstPlayerOverlay(PrayAgainstPlayerPlugin plugin, PrayAgainstPlayerConfig config, Client client)
+	private PrayAgainstPlayerOverlay(final PrayAgainstPlayerPlugin plugin, final Client client)
 	{
 		super(plugin);
 		this.plugin = plugin;
-		this.config = config;
 		this.client = client;
 
 		setLayer(OverlayLayer.ABOVE_SCENE);
@@ -86,21 +86,21 @@ class PrayAgainstPlayerOverlay extends Overlay
 						{
 							plugin.removePlayerFromPotentialContainer(container);
 						}
-						if (config.drawPotentialTargetsName())
+						if (plugin.isDrawPotentialTargetsName())
 						{
-							renderNameAboveHead(graphics, container.getPlayer(), config.potentialPlayerColor());
+							renderNameAboveHead(graphics, container.getPlayer(), plugin.getPotentialPlayerColor());
 						}
-						if (config.drawPotentialTargetHighlight())
+						if (plugin.isDrawPotentialTargetHighlight())
 						{
-							renderHighlightedPlayer(graphics, container.getPlayer(), config.potentialPlayerColor());
+							renderHighlightedPlayer(graphics, container.getPlayer(), plugin.getPotentialPlayerColor());
 						}
-						if (config.drawPotentialTargetTile())
+						if (plugin.isDrawPotentialTargetTile())
 						{
-							renderTileUnderPlayer(graphics, container.getPlayer(), config.potentialPlayerColor());
+							renderTileUnderPlayer(graphics, container.getPlayer(), plugin.getPotentialPlayerColor());
 						}
-						if (config.drawPotentialTargetPrayAgainst())
+						if (plugin.isDrawPotentialTargetPrayAgainst())
 						{
-							renderPrayAgainstOnPlayer(graphics, container.getPlayer(), config.potentialPlayerColor());
+							renderPrayAgainstOnPlayer(graphics, container.getPlayer(), plugin.getPotentialPlayerColor());
 						}
 					}
 				}
@@ -126,21 +126,21 @@ class PrayAgainstPlayerOverlay extends Overlay
 							plugin.removePlayerFromAttackerContainer(container);
 						}
 
-						if (config.drawTargetsName())
+						if (plugin.isDrawTargetsName())
 						{
-							renderNameAboveHead(graphics, container.getPlayer(), config.attackerPlayerColor());
+							renderNameAboveHead(graphics, container.getPlayer(), plugin.getAttackerPlayerColor());
 						}
-						if (config.drawTargetHighlight())
+						if (plugin.isDrawTargetHighlight())
 						{
-							renderHighlightedPlayer(graphics, container.getPlayer(), config.attackerPlayerColor());
+							renderHighlightedPlayer(graphics, container.getPlayer(), plugin.getAttackerPlayerColor());
 						}
-						if (config.drawTargetTile())
+						if (plugin.isDrawTargetTile())
 						{
-							renderTileUnderPlayer(graphics, container.getPlayer(), config.attackerPlayerColor());
+							renderTileUnderPlayer(graphics, container.getPlayer(), plugin.getAttackerPlayerColor());
 						}
-						if (config.drawTargetPrayAgainst())
+						if (plugin.isDrawTargetPrayAgainst())
 						{
-							renderPrayAgainstOnPlayer(graphics, container.getPlayer(), config.attackerPlayerColor());
+							renderPrayAgainstOnPlayer(graphics, container.getPlayer(), plugin.getAttackerPlayerColor());
 						}
 					}
 				}
@@ -208,7 +208,7 @@ class PrayAgainstPlayerOverlay extends Overlay
 			}
 			else
 			{
-				if (config.drawUnknownWeapons())
+				if (plugin.isDrawUnknownWeapons())
 				{
 					int itemId = player.getPlayerAppearance().getEquipmentId(KitType.WEAPON);
 					ItemDefinition itemComposition = client.getItemDefinition(itemId);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlayPrayerTab.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlayPrayerTab.java
index 885bdd2e7d..c4380983f3 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlayPrayerTab.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerOverlayPrayerTab.java
@@ -31,6 +31,7 @@ import java.awt.Polygon;
 import java.awt.Rectangle;
 import java.util.ConcurrentModificationException;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.Player;
 import net.runelite.api.widgets.Widget;
@@ -41,19 +42,18 @@ import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayPriority;
 import net.runelite.client.ui.overlay.OverlayUtil;
 
+@Singleton
 class PrayAgainstPlayerOverlayPrayerTab extends Overlay
 {
 
 	private final PrayAgainstPlayerPlugin plugin;
-	private final PrayAgainstPlayerConfig config;
 	private final Client client;
 
 	@Inject
-	private PrayAgainstPlayerOverlayPrayerTab(PrayAgainstPlayerPlugin plugin, PrayAgainstPlayerConfig config, Client client)
+	private PrayAgainstPlayerOverlayPrayerTab(final PrayAgainstPlayerPlugin plugin, final Client client)
 	{
 		super(plugin);
 		this.plugin = plugin;
-		this.config = config;
 		this.client = client;
 
 		setPosition(OverlayPosition.DETACHED);
@@ -73,13 +73,10 @@ class PrayAgainstPlayerOverlayPrayerTab extends Overlay
 				{
 					for (PlayerContainer container : plugin.getPlayersAttackingMe())
 					{
-						if (plugin.getPlayersAttackingMe() != null && plugin.getPlayersAttackingMe().size() > 0)
+						if (plugin.getPlayersAttackingMe() != null && plugin.getPlayersAttackingMe().size() == 1 &&
+							plugin.isDrawTargetPrayAgainstPrayerTab())
 						{
-							// no reason to show you what prayers to pray in your prayer tab if multiple people are attacking you
-							if ((plugin.getPlayersAttackingMe().size() == 1) && (config.drawTargetPrayAgainstPrayerTab()))
-							{
-								renderPrayerToClick(graphics, container.getPlayer());
-							}
+							renderPrayerToClick(graphics, container.getPlayer());
 						}
 					}
 				}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerPlugin.java
index bc0598a4c9..6e40c5ebe9 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerPlugin.java
@@ -32,13 +32,18 @@ import java.awt.image.ColorModel;
 import java.awt.image.IndexColorModel;
 import java.awt.image.WritableRaster;
 import java.util.ArrayList;
+import java.util.List;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
+import lombok.Getter;
 import net.runelite.api.AnimationID;
 import net.runelite.api.Client;
 import net.runelite.api.GameState;
 import net.runelite.api.Player;
 import net.runelite.api.SpriteID;
 import net.runelite.api.events.AnimationChanged;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.GameStateChanged;
 import net.runelite.api.events.InteractingChanged;
 import net.runelite.api.events.PlayerDespawned;
@@ -64,6 +69,7 @@ import net.runelite.client.util.ImageUtil;
  * I am fully aware that there is plenty of overhead and is a MESS!
  * If you'd like to contribute please do!
  */
+@Singleton
 public class PrayAgainstPlayerPlugin extends Plugin
 {
 
@@ -76,8 +82,8 @@ public class PrayAgainstPlayerPlugin extends Plugin
 	private static final Color PROTECTION_ICON_OUTLINE_COLOR = new Color(33, 33, 33);
 	private final BufferedImage[] ProtectionIcons = new BufferedImage[PROTECTION_ICONS.length];
 
-	private ArrayList<PlayerContainer> potentialPlayersAttackingMe;
-	private ArrayList<PlayerContainer> playersAttackingMe;
+	private List<PlayerContainer> potentialPlayersAttackingMe;
+	private List<PlayerContainer> playersAttackingMe;
 
 	@Inject
 	private Client client;
@@ -97,6 +103,37 @@ public class PrayAgainstPlayerPlugin extends Plugin
 	@Inject
 	private PrayAgainstPlayerConfig config;
 
+	@Getter(AccessLevel.PACKAGE)
+	private Color attackerPlayerColor;
+	@Getter(AccessLevel.PACKAGE)
+	private Color potentialPlayerColor;
+	private int attackerTargetTimeout;
+	private int potentialTargetTimeout;
+	private int newSpawnTimeout;
+	private boolean ignoreFriends;
+	private boolean ignoreClanMates;
+	private boolean markNewPlayer;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean drawTargetPrayAgainst;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean drawPotentialTargetPrayAgainst;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean drawTargetPrayAgainstPrayerTab;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean drawTargetsName;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean drawPotentialTargetsName;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean drawTargetHighlight;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean drawPotentialTargetHighlight;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean drawTargetTile;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean drawPotentialTargetTile;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean drawUnknownWeapons;
+
 	@Provides
 	PrayAgainstPlayerConfig provideConfig(ConfigManager configManager)
 	{
@@ -115,6 +152,8 @@ public class PrayAgainstPlayerPlugin extends Plugin
 	@Override
 	protected void startUp()
 	{
+		updateConfig();
+
 		potentialPlayersAttackingMe = new ArrayList<>();
 		playersAttackingMe = new ArrayList<>();
 		overlayManager.add(overlay);
@@ -136,11 +175,11 @@ public class PrayAgainstPlayerPlugin extends Plugin
 			Player sourcePlayer = (Player) animationChanged.getActor();
 
 			// is the client is a friend/clan and the config is set to ignore friends/clan dont add them to list
-			if (client.isFriended(sourcePlayer.getName(), true) && config.ignoreFriends())
+			if (client.isFriended(sourcePlayer.getName(), true) && this.ignoreFriends)
 			{
 				return;
 			}
-			if (client.isClanMember(sourcePlayer.getName()) && config.ignoreClanMates())
+			if (client.isClanMember(sourcePlayer.getName()) && this.ignoreClanMates)
 			{
 				return;
 			}
@@ -160,7 +199,7 @@ public class PrayAgainstPlayerPlugin extends Plugin
 				// if he's not in the attackers list, add him
 				if (findPlayerInAttackerList(sourcePlayer) == null)
 				{
-					PlayerContainer container = new PlayerContainer(sourcePlayer, System.currentTimeMillis(), (config.attackerTargetTimeout() * 1000));
+					PlayerContainer container = new PlayerContainer(sourcePlayer, System.currentTimeMillis(), (this.attackerTargetTimeout * 1000));
 					playersAttackingMe.add(container);
 				}
 			}
@@ -179,16 +218,16 @@ public class PrayAgainstPlayerPlugin extends Plugin
 			{ //we're being interacted with
 
 				// is the client is a friend/clan and the config is set to ignore friends/clan dont add them to list
-				if (client.isFriended(sourcePlayer.getName(), true) && config.ignoreFriends())
+				if (client.isFriended(sourcePlayer.getName(), true) && this.ignoreFriends)
 				{
 					return;
 				}
-				if (client.isClanMember(sourcePlayer.getName()) && config.ignoreClanMates())
+				if (client.isClanMember(sourcePlayer.getName()) && this.ignoreClanMates)
 				{
 					return;
 				}
 
-				PlayerContainer container = new PlayerContainer(sourcePlayer, System.currentTimeMillis(), (config.potentialTargetTimeout() * 1000));
+				PlayerContainer container = new PlayerContainer(sourcePlayer, System.currentTimeMillis(), (this.potentialTargetTimeout * 1000));
 				potentialPlayersAttackingMe.add(container);
 			}
 		}
@@ -212,15 +251,15 @@ public class PrayAgainstPlayerPlugin extends Plugin
 	@Subscribe
 	protected void onPlayerSpawned(PlayerSpawned playerSpawned)
 	{
-		if (config.markNewPlayer())
+		if (this.markNewPlayer)
 		{
 			Player p = playerSpawned.getPlayer();
 
-			if (client.isFriended(p.getName(), true) && config.ignoreFriends())
+			if (client.isFriended(p.getName(), true) && this.ignoreFriends)
 			{
 				return;
 			}
-			if (client.isClanMember(p.getName()) && config.ignoreClanMates())
+			if (client.isClanMember(p.getName()) && this.ignoreClanMates)
 			{
 				return;
 			}
@@ -228,7 +267,7 @@ public class PrayAgainstPlayerPlugin extends Plugin
 			PlayerContainer container = findPlayerInPotentialList(p);
 			if (container == null)
 			{
-				container = new PlayerContainer(p, System.currentTimeMillis(), (config.newSpawnTimeout() * 1000));
+				container = new PlayerContainer(p, System.currentTimeMillis(), (this.newSpawnTimeout * 1000));
 				potentialPlayersAttackingMe.add(container);
 			}
 		}
@@ -274,7 +313,7 @@ public class PrayAgainstPlayerPlugin extends Plugin
 	private void resetPlayerFromAttackerContainerTimer(PlayerContainer container)
 	{
 		removePlayerFromAttackerContainer(container);
-		PlayerContainer newContainer = new PlayerContainer(container.getPlayer(), System.currentTimeMillis(), (config.attackerTargetTimeout() * 1000));
+		PlayerContainer newContainer = new PlayerContainer(container.getPlayer(), System.currentTimeMillis(), (this.attackerTargetTimeout * 1000));
 		playersAttackingMe.add(newContainer);
 	}
 
@@ -309,12 +348,12 @@ public class PrayAgainstPlayerPlugin extends Plugin
 		}
 	}
 
-	ArrayList<PlayerContainer> getPotentialPlayersAttackingMe()
+	List<PlayerContainer> getPotentialPlayersAttackingMe()
 	{
 		return potentialPlayersAttackingMe;
 	}
 
-	ArrayList<PlayerContainer> getPlayersAttackingMe()
+	List<PlayerContainer> getPlayersAttackingMe()
 	{
 		return playersAttackingMe;
 	}
@@ -322,9 +361,7 @@ public class PrayAgainstPlayerPlugin extends Plugin
 	//All of the methods below are from the Zulrah plugin!!! Credits to it's respective owner
 	private void loadProtectionIcons()
 	{
-		int curPosition = 0;
-
-		for (int i = 0; i < PROTECTION_ICONS.length; i++, curPosition++)
+		for (int i = 0; i < PROTECTION_ICONS.length; i++)
 		{
 			final int resource = PROTECTION_ICONS[i];
 			ProtectionIcons[i] = rgbaToIndexedBufferedImage(ProtectionIconFromSprite(spriteManager.getSprite(resource, 0)));
@@ -377,4 +414,36 @@ public class PrayAgainstPlayerPlugin extends Plugin
 		return null;
 	}
 
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (!event.getGroup().equals("prayagainstplayer"))
+		{
+			return;
+		}
+
+		updateConfig();
+	}
+
+	private void updateConfig()
+	{
+		this.attackerPlayerColor = config.attackerPlayerColor();
+		this.potentialPlayerColor = config.potentialPlayerColor();
+		this.attackerTargetTimeout = config.attackerTargetTimeout();
+		this.potentialTargetTimeout = config.potentialTargetTimeout();
+		this.newSpawnTimeout = config.newSpawnTimeout();
+		this.ignoreFriends = config.ignoreFriends();
+		this.ignoreClanMates = config.ignoreClanMates();
+		this.markNewPlayer = config.markNewPlayer();
+		this.drawTargetPrayAgainst = config.drawTargetPrayAgainst();
+		this.drawPotentialTargetPrayAgainst = config.drawPotentialTargetPrayAgainst();
+		this.drawTargetPrayAgainstPrayerTab = config.drawTargetPrayAgainstPrayerTab();
+		this.drawTargetsName = config.drawTargetsName();
+		this.drawPotentialTargetsName = config.drawPotentialTargetsName();
+		this.drawTargetHighlight = config.drawTargetHighlight();
+		this.drawPotentialTargetHighlight = config.drawPotentialTargetHighlight();
+		this.drawTargetTile = config.drawTargetTile();
+		this.drawPotentialTargetTile = config.drawPotentialTargetTile();
+		this.drawUnknownWeapons = config.drawUnknownWeapons();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/WeaponType.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/WeaponType.java
index d312a0ee8c..d6078e556e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/WeaponType.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/WeaponType.java
@@ -54,7 +54,7 @@ enum WeaponType
 		{
 			return WEAPON_MELEE;
 		}
-		if (weaponNameGivenLowerCase == null || weaponNameGivenLowerCase.toLowerCase().contains("null"))
+		if (weaponNameGivenLowerCase.toLowerCase().contains("null"))
 		{
 			return WEAPON_MELEE;
 		}
@@ -87,7 +87,7 @@ enum WeaponType
 
 	}
 
-	private static String[] meleeWeaponNames = {
+	private static final String[] meleeWeaponNames = {
 		"sword",
 		"scimitar",
 		"dagger",
@@ -119,7 +119,7 @@ enum WeaponType
 		"bulwark"
 	};
 
-	private static String[] rangedWeaponNames = {
+	private static final String[] rangedWeaponNames = {
 		"bow",
 		"blowpipe",
 		"xil-ul",
@@ -130,7 +130,7 @@ enum WeaponType
 		"ballista"
 	};
 
-	private static String[] magicWeaponNames = {
+	private static final String[] magicWeaponNames = {
 		"staff",
 		"trident",
 		"wand",
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerBarOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerBarOverlay.java
index 5798698621..11abc01fc9 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerBarOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerBarOverlay.java
@@ -56,16 +56,14 @@ class PrayerBarOverlay extends Overlay
 	private static final BufferedImage HD_BACK_BAR = ImageUtil.getResourceStreamFromClass(PrayerPlugin.class, "back.png");
 
 	private final Client client;
-	private final PrayerConfig config;
 	private final PrayerPlugin plugin;
 
 	private boolean showingPrayerBar;
 
 	@Inject
-	private PrayerBarOverlay(final Client client, final PrayerConfig config, final PrayerPlugin plugin)
+	private PrayerBarOverlay(final Client client, final PrayerPlugin plugin)
 	{
 		this.client = client;
-		this.config = config;
 		this.plugin = plugin;
 
 		setPosition(OverlayPosition.DYNAMIC);
@@ -76,7 +74,7 @@ class PrayerBarOverlay extends Overlay
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (!config.showPrayerBar() || !showingPrayerBar)
+		if (!plugin.isShowPrayerBar() || !showingPrayerBar)
 		{
 			return null;
 		}
@@ -102,17 +100,18 @@ class PrayerBarOverlay extends Overlay
 			// Use a sub-image to create the same effect the HD Health Bar has
 			graphics.drawImage(HD_FRONT_BAR.getSubimage(0, 0, progressFill, barHeight), barX, barY, progressFill, barHeight, null);
 
-			if ((plugin.isPrayersActive() || config.prayerFlickAlwaysOn())
-				&& (config.prayerFlickLocation().equals(PrayerFlickLocation.PRAYER_BAR)
-				|| config.prayerFlickLocation().equals(PrayerFlickLocation.BOTH)))
+			if ((plugin.isPrayersActive() || plugin.isPrayerFlickAlwaysOn())
+				&& (plugin.getPrayerFlickLocation().equals(PrayerFlickLocation.PRAYER_BAR)
+				|| plugin.getPrayerFlickLocation().equals(PrayerFlickLocation.BOTH)))
 			{
 				final double t = plugin.getTickProgress();
 				final int halfBarWidth = (barWidth / 2) - HD_PRAYER_BAR_PADDING;
 
-				final int xOffset = (int) (-Math.cos(t) * halfBarWidth) + ((barWidth / 2) - halfBarWidth);
+				final int xOffset = (int) (-Math.cos(t) * halfBarWidth) + halfBarWidth;
 
 				graphics.setColor(FLICK_HELP_COLOR);
-				graphics.fillRect(barX + xOffset + HD_PRAYER_BAR_PADDING, barY + HD_PRAYER_BAR_PADDING, 1, barHeight - HD_PRAYER_BAR_PADDING * 2);
+				// Padding is accounted for in the offset calculation
+				graphics.fillRect(barX + xOffset, barY + HD_PRAYER_BAR_PADDING, 1, barHeight - HD_PRAYER_BAR_PADDING * 2);
 			}
 
 			return new Dimension(barWidth, barHeight);
@@ -132,9 +131,9 @@ class PrayerBarOverlay extends Overlay
 		graphics.setColor(BAR_FILL_COLOR);
 		graphics.fillRect(barX, barY, progressFill, barHeight);
 
-		if ((plugin.isPrayersActive() || config.prayerFlickAlwaysOn())
-			&& (config.prayerFlickLocation().equals(PrayerFlickLocation.PRAYER_BAR)
-			|| config.prayerFlickLocation().equals(PrayerFlickLocation.BOTH)))
+		if ((plugin.isPrayersActive() || plugin.isPrayerFlickAlwaysOn())
+			&& (plugin.getPrayerFlickLocation().equals(PrayerFlickLocation.PRAYER_BAR)
+			|| plugin.getPrayerFlickLocation().equals(PrayerFlickLocation.BOTH)))
 		{
 			double t = plugin.getTickProgress();
 
@@ -158,13 +157,13 @@ class PrayerBarOverlay extends Overlay
 			return;
 		}
 
-		if (config.hideIfNotPraying() && !plugin.isPrayersActive())
+		if (plugin.isHideIfNotPraying() && !plugin.isPrayersActive())
 		{
 			showingPrayerBar = false;
 			return;
 		}
 
-		if (config.hideIfOutOfCombat() && localPlayer.getHealth() == -1)
+		if (plugin.isHideIfOutOfCombat() && localPlayer.getHealth() == -1)
 		{
 			showingPrayerBar = false;
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerCounter.java
index c510dab82e..68f36872ce 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerCounter.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerCounter.java
@@ -25,16 +25,17 @@
 package net.runelite.client.plugins.prayer;
 
 import java.awt.Color;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.ui.overlay.infobox.InfoBox;
 
 class PrayerCounter extends InfoBox
 {
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final PrayerType prayerType;
 
-	PrayerCounter(Plugin plugin, PrayerType prayerType)
+	PrayerCounter(final Plugin plugin, final PrayerType prayerType)
 	{
 		super(null, plugin);
 		this.prayerType = prayerType;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerDoseOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerDoseOverlay.java
index c9b590a4d2..549d4d6d2e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerDoseOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerDoseOverlay.java
@@ -32,6 +32,7 @@ import java.awt.Rectangle;
 import java.time.Duration;
 import java.time.Instant;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Setter;
 import net.runelite.api.Client;
@@ -49,6 +50,7 @@ import net.runelite.client.ui.overlay.tooltip.TooltipManager;
 import net.runelite.client.util.ColorUtil;
 import org.apache.commons.lang3.StringUtils;
 
+@Singleton
 class PrayerDoseOverlay extends Overlay
 {
 	private static final float PULSE_TIME = 2f * Constants.GAME_TICK_LENGTH;
@@ -57,7 +59,7 @@ class PrayerDoseOverlay extends Overlay
 	private static final Color END_COLOR = new Color(0, 92, 92);
 
 	private final Client client;
-	private final PrayerConfig config;
+	private final PrayerPlugin plugin;
 	private final TooltipManager tooltipManager;
 	private Instant startOfLastTick = Instant.now();
 	private boolean trackTick = true;
@@ -72,11 +74,11 @@ class PrayerDoseOverlay extends Overlay
 	private boolean hasHolyWrench;
 
 	@Inject
-	private PrayerDoseOverlay(final Client client, final TooltipManager tooltipManager, final PrayerConfig config)
+	private PrayerDoseOverlay(final Client client, final TooltipManager tooltipManager, final PrayerPlugin plugin)
 	{
 		this.client = client;
 		this.tooltipManager = tooltipManager;
-		this.config = config;
+		this.plugin = plugin;
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_WIDGETS);
 	}
@@ -112,7 +114,7 @@ class PrayerDoseOverlay extends Overlay
 
 		final Point mousePosition = client.getMouseCanvasPosition();
 
-		if (config.showPrayerStatistics() && bounds.contains(mousePosition.getX(), mousePosition.getY()))
+		if (plugin.isShowPrayerStatistics() && bounds.contains(mousePosition.getX(), mousePosition.getY()))
 		{
 			final String tooltip = "Time Remaining: " + getEstimatedTimeRemaining() +
 				"</br>" +
@@ -121,7 +123,7 @@ class PrayerDoseOverlay extends Overlay
 			tooltipManager.add(new Tooltip(tooltip));
 		}
 
-		if (!config.showPrayerDoseIndicator() || !hasPrayerRestore)
+		if (!plugin.isShowPrayerDoseIndicator() || !hasPrayerRestore)
 		{
 			return null;
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerFlickOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerFlickOverlay.java
index 6a9bfbfd61..56e4dc1660 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerFlickOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerFlickOverlay.java
@@ -29,6 +29,7 @@ import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.awt.geom.Rectangle2D;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.widgets.Widget;
 import net.runelite.api.widgets.WidgetInfo;
@@ -36,19 +37,18 @@ import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 
+@Singleton
 class PrayerFlickOverlay extends Overlay
 {
 	private final Client client;
-	private final PrayerConfig config;
 	private final PrayerPlugin plugin;
 
 	@Inject
-	private PrayerFlickOverlay(Client client, PrayerConfig config, PrayerPlugin plugin)
+	private PrayerFlickOverlay(Client client, PrayerPlugin plugin)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_WIDGETS);
 		this.client = client;
-		this.config = config;
 		this.plugin = plugin;
 	}
 
@@ -56,9 +56,9 @@ class PrayerFlickOverlay extends Overlay
 	public Dimension render(Graphics2D graphics)
 	{
 		// If there are no prayers active or flick location is set to the prayer bar we don't require the flick helper
-		if ((!plugin.isPrayersActive() && !config.prayerFlickAlwaysOn())
-			|| config.prayerFlickLocation().equals(PrayerFlickLocation.NONE)
-			|| config.prayerFlickLocation().equals(PrayerFlickLocation.PRAYER_BAR))
+		if ((!plugin.isPrayersActive() && !plugin.isPrayerFlickAlwaysOn())
+			|| plugin.getPrayerFlickLocation().equals(PrayerFlickLocation.NONE)
+			|| plugin.getPrayerFlickLocation().equals(PrayerFlickLocation.PRAYER_BAR))
 		{
 			return null;
 		}
@@ -77,14 +77,13 @@ class PrayerFlickOverlay extends Overlay
 
 		//Purposefully using height twice here as the bounds of the prayer orb includes the number sticking out the side
 		int orbInnerHeight = (int) bounds.getHeight();
-		int orbInnerWidth = orbInnerHeight;
 
 		int orbInnerX = (int) (bounds.getX() + 24);//x pos of the inside of the prayer orb
 		int orbInnerY = (int) (bounds.getY() - 1);//y pos of the inside of the prayer orb
 
 		double t = plugin.getTickProgress();
 
-		int xOffset = (int) (-Math.cos(t) * orbInnerWidth / 2) + orbInnerWidth / 2;
+		int xOffset = (int) (-Math.cos(t) * orbInnerHeight / 2) + orbInnerHeight / 2;
 		int indicatorHeight = (int) (Math.sin(t) * orbInnerHeight);
 
 		int yOffset = (orbInnerHeight / 2) - (indicatorHeight / 2);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerItems.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerItems.java
index 6037701014..023dd8383f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerItems.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerItems.java
@@ -26,12 +26,13 @@ package net.runelite.client.plugins.prayer;
 
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import net.runelite.api.ItemID;
 
 @AllArgsConstructor
-@Getter
+@Getter(AccessLevel.PACKAGE)
 enum PrayerItems
 {
 	// Blessings
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerPlugin.java
index 2755703f8f..1dae89f203 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerPlugin.java
@@ -29,6 +29,7 @@ import com.google.inject.Provides;
 import java.time.Duration;
 import java.time.Instant;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.Client;
@@ -53,6 +54,7 @@ import net.runelite.client.ui.overlay.infobox.InfoBoxManager;
 	description = "Show various information related to prayer",
 	tags = {"combat", "flicking", "overlay"}
 )
+@Singleton
 public class PrayerPlugin extends Plugin
 {
 	private final PrayerCounter[] prayerCounter = new PrayerCounter[PrayerType.values().length];
@@ -86,6 +88,23 @@ public class PrayerPlugin extends Plugin
 	@Inject
 	private PrayerConfig config;
 
+	@Getter(AccessLevel.PACKAGE)
+	private PrayerFlickLocation prayerFlickLocation;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean prayerFlickAlwaysOn;
+	private boolean prayerIndicator;
+	private boolean prayerIndicatorOverheads;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showPrayerDoseIndicator;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showPrayerStatistics;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showPrayerBar;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean hideIfNotPraying;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean hideIfOutOfCombat;
+
 	@Provides
 	PrayerConfig provideConfig(ConfigManager configManager)
 	{
@@ -95,6 +114,7 @@ public class PrayerPlugin extends Plugin
 	@Override
 	protected void startUp()
 	{
+		updateConfig();
 		overlayManager.add(flickOverlay);
 		overlayManager.add(doseOverlay);
 		overlayManager.add(barOverlay);
@@ -114,11 +134,12 @@ public class PrayerPlugin extends Plugin
 	{
 		if (event.getGroup().equals("prayer"))
 		{
-			if (!config.prayerIndicator())
+			updateConfig();
+			if (!this.prayerIndicator)
 			{
 				removeIndicators();
 			}
-			else if (!config.prayerIndicatorOverheads())
+			else if (!this.prayerIndicatorOverheads)
 			{
 				removeOverheadsIndicators();
 			}
@@ -132,7 +153,7 @@ public class PrayerPlugin extends Plugin
 		final ItemContainer inventory = client.getItemContainer(InventoryID.INVENTORY);
 		final ItemContainer equipment = client.getItemContainer(InventoryID.EQUIPMENT);
 
-		if (container == inventory || container == equipment)
+		if (container != null && (container.equals(inventory) || container.equals(equipment)))
 		{
 			doseOverlay.setHasHolyWrench(false);
 			doseOverlay.setHasPrayerRestore(false);
@@ -156,22 +177,22 @@ public class PrayerPlugin extends Plugin
 	{
 		prayersActive = isAnyPrayerActive();
 
-		if (!config.prayerFlickLocation().equals(PrayerFlickLocation.NONE))
+		if (!this.prayerFlickLocation.equals(PrayerFlickLocation.NONE))
 		{
 			startOfLastTick = Instant.now();
 		}
 
-		if (config.showPrayerDoseIndicator())
+		if (this.showPrayerDoseIndicator)
 		{
 			doseOverlay.onTick();
 		}
 
-		if (config.showPrayerBar())
+		if (this.showPrayerBar)
 		{
 			barOverlay.onTick();
 		}
 
-		if (!config.prayerIndicator())
+		if (!this.prayerIndicator)
 		{
 			return;
 		}
@@ -183,7 +204,7 @@ public class PrayerPlugin extends Plugin
 
 			if (client.isPrayerActive(prayer))
 			{
-				if (prayerType.isOverhead() && !config.prayerIndicatorOverheads())
+				if (prayerType.isOverhead() && !this.prayerIndicatorOverheads)
 				{
 					continue;
 				}
@@ -296,4 +317,17 @@ public class PrayerPlugin extends Plugin
 		infoBoxManager.removeIf(entry -> entry instanceof PrayerCounter
 			&& ((PrayerCounter) entry).getPrayerType().isOverhead());
 	}
+
+	private void updateConfig()
+	{
+		this.prayerFlickLocation = config.prayerFlickLocation();
+		this.prayerFlickAlwaysOn = config.prayerFlickAlwaysOn();
+		this.prayerIndicator = config.prayerIndicator();
+		this.prayerIndicatorOverheads = config.prayerIndicatorOverheads();
+		this.showPrayerDoseIndicator = config.showPrayerDoseIndicator();
+		this.showPrayerStatistics = config.showPrayerStatistics();
+		this.showPrayerBar = config.showPrayerBar();
+		this.hideIfNotPraying = config.hideIfNotPraying();
+		this.hideIfOutOfCombat = config.hideIfOutOfCombat();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerRestoreType.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerRestoreType.java
index d30b790a9e..426eacf782 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerRestoreType.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerRestoreType.java
@@ -40,7 +40,7 @@ enum PrayerRestoreType
 
 	private final int[] items;
 
-	PrayerRestoreType(int... items)
+	PrayerRestoreType(final int... items)
 	{
 		this.items = items;
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerType.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerType.java
index 6ef41a7676..9431f81566 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerType.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerType.java
@@ -24,13 +24,14 @@
  */
 package net.runelite.client.plugins.prayer;
 
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import net.runelite.api.Prayer;
 import net.runelite.api.SpriteID;
 
 @AllArgsConstructor
-@Getter
+@Getter(AccessLevel.PACKAGE)
 enum PrayerType
 {
 	THICK_SKIN("Thick Skin", Prayer.THICK_SKIN, "+5% Defence", SpriteID.PRAYER_THICK_SKIN, false),
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayeralert/PrayerAlertOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayeralert/PrayerAlertOverlay.java
index 617cd3e611..d96f1161e6 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/prayeralert/PrayerAlertOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayeralert/PrayerAlertOverlay.java
@@ -21,6 +21,7 @@ import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.InventoryID;
 import net.runelite.api.Item;
@@ -37,22 +38,23 @@ import net.runelite.client.ui.overlay.components.ImageComponent;
 import net.runelite.client.ui.overlay.components.PanelComponent;
 import net.runelite.client.ui.overlay.components.TitleComponent;
 
+@Singleton
 class PrayerAlertOverlay extends Overlay
 {
 	private final Client client;
-	private final PrayerAlertConfig config;
+	private final PrayerAlertPlugin plugin;
 	private final PanelComponent panelComponent = new PanelComponent();
 	private final ItemManager itemManager;
 
 	private final Stat prayer = Stats.PRAYER;
 
 	@Inject
-	private PrayerAlertOverlay(Client client, PrayerAlertConfig config, ItemManager itemManager)
+	private PrayerAlertOverlay(final Client client, final PrayerAlertPlugin plugin, final ItemManager itemManager)
 	{
 		setPosition(OverlayPosition.TOP_RIGHT);
 		setLayer(OverlayLayer.ABOVE_WIDGETS);
 		this.client = client;
-		this.config = config;
+		this.plugin = plugin;
 		this.itemManager = itemManager;
 	}
 
@@ -62,9 +64,9 @@ class PrayerAlertOverlay extends Overlay
 		panelComponent.getChildren().clear();
 		int prayerLevel = getPrayerLevel();
 		int prayerPoints = getPrayerPoints();
-		if (config.oldRenderMode())
+		if (plugin.isOldRenderMode())
 		{
-			if (config.alwaysShowAlert())
+			if (plugin.isAlwaysShowAlert())
 			{
 				boolean drink = drinkPrayerPotion(prayerLevel, prayerPoints);
 				if (drink)
@@ -84,7 +86,7 @@ class PrayerAlertOverlay extends Overlay
 		}
 		else
 		{
-			if (config.alwaysShowAlert())
+			if (plugin.isAlwaysShowAlert())
 			{
 				boolean drink = drinkPrayerPotion(prayerLevel, prayerPoints);
 				if (drink)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayeralert/PrayerAlertPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayeralert/PrayerAlertPlugin.java
index abeaef0e54..edba3b0550 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/prayeralert/PrayerAlertPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayeralert/PrayerAlertPlugin.java
@@ -18,7 +18,12 @@ package net.runelite.client.plugins.prayeralert;
 
 import com.google.inject.Provides;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
+import lombok.Getter;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.client.config.ConfigManager;
+import net.runelite.client.eventbus.Subscribe;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginDescriptor;
 import net.runelite.client.plugins.PluginType;
@@ -31,7 +36,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	type = PluginType.UTILITY,
 	enabledByDefault = false
 )
-
+@Singleton
 public class PrayerAlertPlugin extends Plugin
 {
 	@Inject
@@ -40,6 +45,14 @@ public class PrayerAlertPlugin extends Plugin
 	@Inject
 	private PrayerAlertOverlay overlay;
 
+	@Inject
+	private PrayerAlertConfig config;
+
+	@Getter(AccessLevel.PACKAGE)
+	private boolean alwaysShowAlert;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean oldRenderMode;
+
 	@Provides
 	PrayerAlertConfig provideConfig(ConfigManager configManager)
 	{
@@ -49,6 +62,9 @@ public class PrayerAlertPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		this.alwaysShowAlert = config.alwaysShowAlert();
+		this.oldRenderMode = config.oldRenderMode();
+
 		overlayManager.add(overlay);
 	}
 
@@ -57,4 +73,14 @@ public class PrayerAlertPlugin extends Plugin
 	{
 		overlayManager.remove(overlay);
 	}
+
+	@Subscribe
+	private void onConfigChanged(ConfigChanged event)
+	{
+		if (event.getGroup().equals("prayeralert"))
+		{
+			this.alwaysShowAlert = config.alwaysShowAlert();
+			this.oldRenderMode = config.oldRenderMode();
+		}
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilePanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilePanel.java
index eb43d74f59..352ee7677f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilePanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilePanel.java
@@ -32,6 +32,7 @@ import java.awt.event.MouseEvent;
 import java.awt.image.BufferedImage;
 import java.security.NoSuchAlgorithmException;
 import java.security.spec.InvalidKeySpecException;
+import javax.inject.Singleton;
 import javax.swing.BorderFactory;
 import javax.swing.ImageIcon;
 import javax.swing.JLabel;
@@ -46,6 +47,7 @@ import net.runelite.client.ui.ColorScheme;
 import net.runelite.client.util.ImageUtil;
 
 @Slf4j
+@Singleton
 class ProfilePanel extends JPanel
 {
 	private static final ImageIcon DELETE_ICON;
@@ -61,7 +63,7 @@ class ProfilePanel extends JPanel
 	private final String loginText;
 	private String password = null;
 
-	ProfilePanel(final Client client, String data, ProfilesConfig config, ProfilesPanel parent)
+	ProfilePanel(final Client client, final String data, final ProfilesConfig config, final ProfilesPanel parent)
 	{
 		String[] parts = data.split(":");
 		this.loginText = parts[1];
@@ -101,7 +103,7 @@ class ProfilePanel extends JPanel
 				}
 				catch (InvalidKeySpecException | NoSuchAlgorithmException ex)
 				{
-					ex.printStackTrace();
+					log.error(e.toString());
 				}
 			}
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPanel.java
index dd420dcadb..28b554e6f2 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPanel.java
@@ -51,6 +51,7 @@ import javax.crypto.SecretKeyFactory;
 import javax.crypto.spec.PBEKeySpec;
 import javax.crypto.spec.SecretKeySpec;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import javax.swing.JButton;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
@@ -66,6 +67,7 @@ import net.runelite.client.ui.FontManager;
 import net.runelite.client.ui.PluginPanel;
 
 @Slf4j
+@Singleton
 class ProfilesPanel extends PluginPanel
 {
 	private static final int iterations = 100000;
@@ -75,8 +77,8 @@ class ProfilesPanel extends PluginPanel
 	private static final String ACCOUNT_LABEL = "Account Label";
 	private static final String PASSWORD_LABEL = "Account Password";
 	private static final String HELP = "To add and load accounts, first enter a password into the Encryption Password " +
-		"field then press Load Accounts. You can now add as many accounts as you would like. The next time you restart" +
-		"Runelite, enter your encryption password and click load accounts to see the accounts you entered";
+		"field then press Load Accounts. You can now add as many accounts as you would like. The next time you restart " +
+		"RunelitePlus, enter your encryption password and click load accounts to see the accounts you entered";
 	private static final Dimension PREFERRED_SIZE = new Dimension(PluginPanel.PANEL_WIDTH - 20, 30);
 	private static final Dimension HELP_PREFERRED_SIZE = new Dimension(PluginPanel.PANEL_WIDTH - 20, 130);
 
@@ -90,10 +92,10 @@ class ProfilesPanel extends PluginPanel
 	private final JPasswordField txtAccountLogin = new JPasswordField(ACCOUNT_USERNAME);
 	private final JPasswordField txtPasswordLogin = new JPasswordField(PASSWORD_LABEL);
 	private final JPanel profilesPanel = new JPanel();
-	private GridBagConstraints c;
+	private final GridBagConstraints c;
 
 	@Inject
-	public ProfilesPanel(Client client, ProfilesConfig config)
+	public ProfilesPanel(final Client client, final ProfilesConfig config)
 	{
 		super();
 		this.client = client;
@@ -114,7 +116,7 @@ class ProfilesPanel extends PluginPanel
 		JPanel helpPanel = new JPanel(new BorderLayout());
 		helpPanel.setBackground(ColorScheme.DARKER_GRAY_COLOR);
 		JLabel helpLabel = new JLabel("<html> <p>" + HELP + "</p></html>");
-		helpLabel.setFont(FontManager.getRunescapeSmallFont());
+		helpLabel.setFont(FontManager.getSmallFont(getFont()));
 		helpPanel.setPreferredSize(HELP_PREFERRED_SIZE);
 		// helpPanel.setSize(MINIMUM_SIZE);
 		helpPanel.add(helpLabel, BorderLayout.NORTH);
@@ -344,7 +346,7 @@ class ProfilesPanel extends PluginPanel
 			}
 			catch (InvalidKeySpecException | NoSuchAlgorithmException ex)
 			{
-				ex.printStackTrace();
+				log.error(e.toString());
 			}
 
 			this.addAccount(data);
@@ -550,7 +552,7 @@ class ProfilesPanel extends PluginPanel
 		}
 		catch (NoSuchAlgorithmException | IllegalBlockSizeException | InvalidKeyException | BadPaddingException | NoSuchPaddingException e)
 		{
-			e.printStackTrace();
+			log.error(e.toString());
 		}
 		return new byte[0];
 	}
@@ -566,7 +568,7 @@ class ProfilesPanel extends PluginPanel
 		}
 		catch (NoSuchAlgorithmException | IllegalBlockSizeException | InvalidKeyException | BadPaddingException | NoSuchPaddingException e)
 		{
-			e.printStackTrace();
+			log.error(e.toString());
 		}
 		return "";
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPlugin.java
index 3eb6f00bfc..b79187fa6a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPlugin.java
@@ -27,6 +27,7 @@ package net.runelite.client.plugins.profiles;
 import com.google.inject.Provides;
 import java.awt.image.BufferedImage;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.events.ConfigChanged;
 import net.runelite.client.config.ConfigManager;
 import net.runelite.client.eventbus.Subscribe;
@@ -44,7 +45,7 @@ import net.runelite.client.util.ImageUtil;
 	type = PluginType.UTILITY,
 	enabledByDefault = false
 )
-
+@Singleton
 public class ProfilesPlugin extends Plugin
 {
 	@Inject
@@ -86,14 +87,11 @@ public class ProfilesPlugin extends Plugin
 	@Subscribe
 	private void onConfigChanged(ConfigChanged event) throws Exception
 	{
-		if (event.getGroup().equals("profiles"))
+		if (event.getGroup().equals("profiles") && event.getKey().equals("rememberPassword"))
 		{
-			if (event.getKey().equals("rememberPassword"))
-			{
-				panel = injector.getInstance(ProfilesPanel.class);
-				this.shutDown();
-				this.startUp();
-			}
+			panel = injector.getInstance(ProfilesPanel.class);
+			this.shutDown();
+			this.startUp();
 		}
 	}
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/PuzzleSolverOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/PuzzleSolverOverlay.java
index 2308a9adc9..55eaede2bb 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/PuzzleSolverOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/PuzzleSolverOverlay.java
@@ -37,6 +37,7 @@ import java.util.Arrays;
 import java.util.concurrent.Future;
 import java.util.concurrent.ScheduledExecutorService;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.GameState;
 import net.runelite.api.InventoryID;
@@ -62,6 +63,7 @@ import net.runelite.client.ui.overlay.components.BackgroundComponent;
 import net.runelite.client.ui.overlay.components.TextComponent;
 import net.runelite.client.util.ImageUtil;
 
+@Singleton
 public class PuzzleSolverOverlay extends Overlay
 {
 	private static final int INFO_BOX_WIDTH = 100;
@@ -73,7 +75,7 @@ public class PuzzleSolverOverlay extends Overlay
 	private static final int DOT_MARKER_SIZE = 16;
 
 	private final Client client;
-	private final PuzzleSolverConfig config;
+	private final PuzzleSolverPlugin plugin;
 	private final ScheduledExecutorService executorService;
 	private final SpriteManager spriteManager;
 
@@ -86,13 +88,13 @@ public class PuzzleSolverOverlay extends Overlay
 	private BufferedImage rightArrow;
 
 	@Inject
-	public PuzzleSolverOverlay(Client client, PuzzleSolverConfig config, ScheduledExecutorService executorService, SpriteManager spriteManager)
+	public PuzzleSolverOverlay(final Client client, final PuzzleSolverPlugin plugin, final ScheduledExecutorService executorService, final SpriteManager spriteManager)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		setPriority(OverlayPriority.HIGH);
 		setLayer(OverlayLayer.ABOVE_WIDGETS);
 		this.client = client;
-		this.config = config;
+		this.plugin = plugin;
 		this.executorService = executorService;
 		this.spriteManager = spriteManager;
 	}
@@ -100,7 +102,7 @@ public class PuzzleSolverOverlay extends Overlay
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if ((!config.displaySolution() && !config.displayRemainingMoves())
+		if ((!plugin.isDisplaySolution() && !plugin.isDisplayRemainingMoves())
 			|| client.getGameState() != GameState.LOGGED_IN)
 		{
 			return null;
@@ -204,7 +206,7 @@ public class PuzzleSolverOverlay extends Overlay
 						{
 							infoString = "Solved!";
 						}
-						else if (config.displayRemainingMoves())
+						else if (plugin.isDisplayRemainingMoves())
 						{
 							infoString = "Moves left: " + stepsLeft;
 						}
@@ -213,9 +215,9 @@ public class PuzzleSolverOverlay extends Overlay
 							infoString = null;
 						}
 
-						if (config.displaySolution())
+						if (plugin.isDisplaySolution())
 						{
-							if (config.drawDots())
+							if (plugin.isDrawDots())
 							{
 								graphics.setColor(Color.YELLOW);
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/PuzzleSolverPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/PuzzleSolverPlugin.java
index d0d194cf1f..331a7a6205 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/PuzzleSolverPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/PuzzleSolverPlugin.java
@@ -29,8 +29,12 @@ import com.google.inject.Provides;
 import java.awt.Color;
 import java.util.Arrays;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.GameTick;
 import net.runelite.api.events.MenuOptionClicked;
 import net.runelite.api.events.WidgetLoaded;
@@ -65,6 +69,7 @@ import net.runelite.client.util.Text;
 	tags = {"clues", "scrolls", "overlay"}
 )
 @Slf4j
+@Singleton
 public class PuzzleSolverPlugin extends Plugin
 {
 	private static final Color CORRECT_MUSEUM_PUZZLE_ANSWER_COLOR = new Color(0, 248, 128);
@@ -78,14 +83,25 @@ public class PuzzleSolverPlugin extends Plugin
 	@Inject
 	private Client client;
 
+	@Inject
+	private PuzzleSolverConfig config;
+
 	private LightboxState lightbox;
-	private LightboxState[] changes = new LightboxState[LightBox.COMBINATIONS_POWER];
+	private final LightboxState[] changes = new LightboxState[LightBox.COMBINATIONS_POWER];
 	private Combination lastClick;
 	private boolean lastClickInvalid;
 
+	@Getter(AccessLevel.PACKAGE)
+	private boolean displaySolution;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean displayRemainingMoves;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean drawDots;
+
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
 		overlayManager.add(overlay);
 	}
 
@@ -280,4 +296,20 @@ public class PuzzleSolverPlugin extends Plugin
 			}
 		}
 	}
+
+	@Subscribe
+	private void onConfigChanged(ConfigChanged event)
+	{
+		if (event.getGroup().equals("puzzlesolver"))
+		{
+			updateConfig();
+		}
+	}
+
+	private void updateConfig()
+	{
+		this.displaySolution = config.displaySolution();
+		this.displayRemainingMoves = config.displayRemainingMoves();
+		this.drawDots = config.drawDots();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/VarrockMuseumAnswer.java b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/VarrockMuseumAnswer.java
index 0e4307d550..985b3a6b4e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/VarrockMuseumAnswer.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/VarrockMuseumAnswer.java
@@ -27,13 +27,14 @@ package net.runelite.client.plugins.puzzlesolver;
 
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import net.runelite.api.Client;
 import net.runelite.api.widgets.Widget;
 import net.runelite.api.widgets.WidgetInfo;
 
-@Getter
+@Getter(AccessLevel.PACKAGE)
 @RequiredArgsConstructor
 enum VarrockMuseumAnswer
 {
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/lightbox/LightboxSolver.java b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/lightbox/LightboxSolver.java
index e7aae71dcc..9dcf6b4a7a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/lightbox/LightboxSolver.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/lightbox/LightboxSolver.java
@@ -29,7 +29,7 @@ public class LightboxSolver
 	private LightboxState initial;
 	private final LightboxState[] switches = new LightboxState[LightBox.COMBINATIONS_POWER];
 
-	static boolean isBitSet(int num, int bit)
+	private static boolean isBitSet(int num, int bit)
 	{
 		return ((num >>> bit) & 1) != 0;
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/PuzzleSolver.java b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/PuzzleSolver.java
index 6e156a62ce..5270bcd452 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/PuzzleSolver.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/PuzzleSolver.java
@@ -37,8 +37,8 @@ public class PuzzleSolver implements Runnable
 
 	private static final Duration MAX_WAIT_DURATION = Duration.ofMillis(1500);
 
-	private Pathfinder pathfinder;
-	private PuzzleState startState;
+	private final Pathfinder pathfinder;
+	private final PuzzleState startState;
 
 	private List<PuzzleState> solution;
 	private int position;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/PuzzleState.java b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/PuzzleState.java
index 74d346cd29..0946c504ab 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/PuzzleState.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/PuzzleState.java
@@ -84,67 +84,55 @@ public class PuzzleState
 		int emptyPieceY = emptyPiece / DIMENSION;
 
 		// Move left if there is space to the left
-		if (emptyPieceX > 0)
+		if (emptyPieceX > 0 && (parent == null || parent.emptyPiece != emptyPiece - 1))
 		{
-			if (parent == null || parent.emptyPiece != emptyPiece - 1)
-			{
-				PuzzleState state = new PuzzleState(this);
-				state.parent = this;
+			PuzzleState state = new PuzzleState(this);
+			state.parent = this;
 
-				state.pieces[emptyPiece - 1] = BLANK_TILE_VALUE;
-				state.pieces[emptyPiece] = pieces[emptyPiece - 1];
-				state.emptyPiece--;
+			state.pieces[emptyPiece - 1] = BLANK_TILE_VALUE;
+			state.pieces[emptyPiece] = pieces[emptyPiece - 1];
+			state.emptyPiece--;
 
-				moves.add(state);
-			}
+			moves.add(state);
 		}
 
 		// Move right if there is space to the right
-		if (emptyPieceX < DIMENSION - 1)
+		if (emptyPieceX < DIMENSION - 1 && (parent == null || parent.emptyPiece != emptyPiece + 1))
 		{
-			if (parent == null || parent.emptyPiece != emptyPiece + 1)
-			{
-				PuzzleState state = new PuzzleState(this);
-				state.parent = this;
+			PuzzleState state = new PuzzleState(this);
+			state.parent = this;
 
-				state.pieces[emptyPiece + 1] = BLANK_TILE_VALUE;
-				state.pieces[emptyPiece] = pieces[emptyPiece + 1];
-				state.emptyPiece++;
+			state.pieces[emptyPiece + 1] = BLANK_TILE_VALUE;
+			state.pieces[emptyPiece] = pieces[emptyPiece + 1];
+			state.emptyPiece++;
 
-				moves.add(state);
-			}
+			moves.add(state);
 		}
 
 		// Move up if there is space upwards
-		if (emptyPieceY > 0)
+		if (emptyPieceY > 0 && (parent == null || parent.emptyPiece != emptyPiece - DIMENSION))
 		{
-			if (parent == null || parent.emptyPiece != emptyPiece - DIMENSION)
-			{
-				PuzzleState state = new PuzzleState(this);
-				state.parent = this;
+			PuzzleState state = new PuzzleState(this);
+			state.parent = this;
 
-				state.pieces[emptyPiece - DIMENSION] = BLANK_TILE_VALUE;
-				state.pieces[emptyPiece] = pieces[emptyPiece - DIMENSION];
-				state.emptyPiece -= DIMENSION;
+			state.pieces[emptyPiece - DIMENSION] = BLANK_TILE_VALUE;
+			state.pieces[emptyPiece] = pieces[emptyPiece - DIMENSION];
+			state.emptyPiece -= DIMENSION;
 
-				moves.add(state);
-			}
+			moves.add(state);
 		}
 
 		// Move down if there is space downwards
-		if (emptyPieceY < DIMENSION - 1)
+		if (emptyPieceY < DIMENSION - 1 && (parent == null || parent.emptyPiece != emptyPiece + DIMENSION))
 		{
-			if (parent == null || parent.emptyPiece != emptyPiece + DIMENSION)
-			{
-				PuzzleState state = new PuzzleState(this);
-				state.parent = this;
+			PuzzleState state = new PuzzleState(this);
+			state.parent = this;
 
-				state.pieces[emptyPiece + DIMENSION] = BLANK_TILE_VALUE;
-				state.pieces[emptyPiece] = pieces[emptyPiece + DIMENSION];
-				state.emptyPiece += DIMENSION;
+			state.pieces[emptyPiece + DIMENSION] = BLANK_TILE_VALUE;
+			state.pieces[emptyPiece] = pieces[emptyPiece + DIMENSION];
+			state.emptyPiece += DIMENSION;
 
-				moves.add(state);
-			}
+			moves.add(state);
 		}
 
 		return moves;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/pathfinding/IDAStarMM.java b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/pathfinding/IDAStarMM.java
index 331c883a18..86877c2327 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/pathfinding/IDAStarMM.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/pathfinding/IDAStarMM.java
@@ -51,9 +51,9 @@ import net.runelite.client.plugins.puzzlesolver.solver.heuristics.Heuristic;
 public class IDAStarMM extends IDAStar
 {
 	private PuzzleState currentState;
-	private List<PuzzleState> stateList = new ArrayList<>();
-	private List<List<Integer>> validRowNumbers = new ArrayList<>();
-	private List<List<Integer>> validColumnNumbers = new ArrayList<>();
+	private final List<PuzzleState> stateList = new ArrayList<>();
+	private final List<List<Integer>> validRowNumbers = new ArrayList<>();
+	private final List<List<Integer>> validColumnNumbers = new ArrayList<>();
 
 	public IDAStarMM(Heuristic heuristic)
 	{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/pathfinding/Pathfinder.java b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/pathfinding/Pathfinder.java
index c8715253f9..d742f327cb 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/pathfinding/Pathfinder.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/solver/pathfinding/Pathfinder.java
@@ -31,7 +31,7 @@ import net.runelite.client.plugins.puzzlesolver.solver.heuristics.Heuristic;
 
 public abstract class Pathfinder
 {
-	private Heuristic heuristic;
+	private final Heuristic heuristic;
 
 	Pathfinder(Heuristic heuristic)
 	{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/AttackMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/AttackMode.java
index 95ac199470..0f5cde0c19 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/AttackMode.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/AttackMode.java
@@ -32,7 +32,7 @@ public enum AttackMode
 
 	private final String name;
 
-	AttackMode(String name)
+	AttackMode(final String name)
 	{
 		this.name = name;
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/CurrentPlayersJFrame.java b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/CurrentPlayersJFrame.java
index 19daf25e0f..dba8be11bd 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/CurrentPlayersJFrame.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/CurrentPlayersJFrame.java
@@ -16,6 +16,7 @@ import java.awt.datatransfer.Clipboard;
 import java.awt.datatransfer.StringSelection;
 import java.awt.event.ActionListener;
 import java.util.List;
+import javax.inject.Singleton;
 import javax.swing.JButton;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
@@ -25,12 +26,11 @@ import javax.swing.JScrollPane;
 import net.runelite.api.Client;
 import net.runelite.client.ui.FontManager;
 
-public class CurrentPlayersJFrame extends JFrame
+@Singleton
+class CurrentPlayersJFrame extends JFrame
 {
 
-	public JList<Object> currentPlayersJList;
-
-	CurrentPlayersJFrame(Client client, PvpToolsPlugin pvpToolsPlugin, List<String> list)
+	CurrentPlayersJFrame(final Client client, final PvpToolsPlugin pvpToolsPlugin, final List<String> list)
 	{
 		super();
 		int x = client.getCanvas().getLocationOnScreen().x + client.getCanvas().getWidth();
@@ -41,7 +41,7 @@ public class CurrentPlayersJFrame extends JFrame
 		JButton refreshJButton = new JButton("Refresh");
 		refreshJButton.addActionListener(pvpToolsPlugin.currentPlayersActionListener);
 		JButton copyJButton = new JButton("Copy List");
-		currentPlayersJList = new JList<>(list.toArray());
+		JList<Object> currentPlayersJList = new JList<>(list.toArray());
 		ActionListener copyButtonActionListener = e ->
 		{
 			StringSelection stringSelection;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/MissingPlayersJFrame.java b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/MissingPlayersJFrame.java
index 08831d0fca..15b34e9f25 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/MissingPlayersJFrame.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/MissingPlayersJFrame.java
@@ -16,6 +16,7 @@ import java.awt.datatransfer.Clipboard;
 import java.awt.datatransfer.StringSelection;
 import java.awt.event.ActionListener;
 import java.util.List;
+import javax.inject.Singleton;
 import javax.swing.JButton;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
@@ -25,12 +26,11 @@ import javax.swing.JScrollPane;
 import net.runelite.api.Client;
 import net.runelite.client.ui.FontManager;
 
-public class MissingPlayersJFrame extends JFrame
+@Singleton
+class MissingPlayersJFrame extends JFrame
 {
 
-	public JList<Object> missingPlayersJList;
-
-	MissingPlayersJFrame(Client client, PvpToolsPlugin pvpToolsPlugin, List<String> list)
+	MissingPlayersJFrame(final Client client, final PvpToolsPlugin pvpToolsPlugin, final List<String> list)
 	{
 		super();
 		int x = client.getCanvas().getLocationOnScreen().x + client.getCanvas().getWidth();
@@ -41,7 +41,7 @@ public class MissingPlayersJFrame extends JFrame
 		JButton refreshJButton = new JButton("Refresh");
 		refreshJButton.addActionListener(pvpToolsPlugin.playersButtonActionListener);
 		JButton copyJButton = new JButton("Copy List");
-		missingPlayersJList = new JList<>(list.toArray());
+		JList<Object> missingPlayersJList = new JList<>(list.toArray());
 		ActionListener copyButtonActionListener = e ->
 		{
 			StringSelection stringSelection;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PlayerCountOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PlayerCountOverlay.java
index 1952838914..8924e5e9df 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PlayerCountOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PlayerCountOverlay.java
@@ -16,6 +16,7 @@ import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.util.Arrays;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.Varbits;
 import net.runelite.api.WorldType;
@@ -28,20 +29,19 @@ import net.runelite.client.ui.overlay.components.table.TableElement;
 import net.runelite.client.ui.overlay.components.table.TableRow;
 import org.apache.commons.lang3.ArrayUtils;
 
+@Singleton
 public class PlayerCountOverlay extends Overlay
 {
-	private static int[] CLAN_WARS_REGIONS = {9520, 13135, 13134, 13133, 13131, 13130, 13387, 13386};
+	private static final int[] CLAN_WARS_REGIONS = {9520, 13135, 13134, 13133, 13131, 13130, 13387, 13386};
 
 	private final PvpToolsPlugin pvpToolsPlugin;
-	private final PvpToolsConfig config;
 	private final Client client;
 
 
 	@Inject
-	public PlayerCountOverlay(PvpToolsPlugin pvpToolsPlugin, PvpToolsConfig pvpToolsConfig, Client client)
+	public PlayerCountOverlay(final PvpToolsPlugin pvpToolsPlugin, final Client client)
 	{
 		this.pvpToolsPlugin = pvpToolsPlugin;
-		this.config = pvpToolsConfig;
 		this.client = client;
 		setLayer(OverlayLayer.ABOVE_WIDGETS);
 		setPriority(OverlayPriority.HIGHEST);
@@ -52,25 +52,23 @@ public class PlayerCountOverlay extends Overlay
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (config.countPlayers())
-		{
-			if ((client.getVar(Varbits.IN_WILDERNESS) == 1) || WorldType.isPvpWorld(client.getWorldType())
+		if (pvpToolsPlugin.isCountPlayers() &&
+			(client.getVar(Varbits.IN_WILDERNESS) == 1 || WorldType.isPvpWorld(client.getWorldType())
 				|| ArrayUtils.contains(CLAN_WARS_REGIONS, client.getMapRegions()[0]) ||
-				WorldType.isDeadmanWorld(client.getWorldType()))
-			{
-				// Make this stop showing up when its not relevant
-				TableComponent tableComponent = new TableComponent();
-				TableElement[] firstRowElements = {
-					TableElement.builder().content("Friendly").color(Color.GREEN).build(),
-					TableElement.builder().content(String.valueOf(pvpToolsPlugin.getFriendlyPlayerCount())).build()};
-				TableRow firstRow = TableRow.builder().elements(Arrays.asList(firstRowElements)).build();
-				TableElement[] secondRowElements = {
-					TableElement.builder().content("Enemy").color(Color.RED).build(),
-					TableElement.builder().content(String.valueOf(pvpToolsPlugin.getEnemyPlayerCount())).build()};
-				TableRow secondRow = TableRow.builder().elements(Arrays.asList(secondRowElements)).build();
-				tableComponent.addRows(firstRow, secondRow);
-				return tableComponent.render(graphics);
-			}
+				WorldType.isDeadmanWorld(client.getWorldType())))
+		{
+			// Make this stop showing up when its not relevant
+			TableComponent tableComponent = new TableComponent();
+			TableElement[] firstRowElements = {
+				TableElement.builder().content("Friendly").color(Color.GREEN).build(),
+				TableElement.builder().content(String.valueOf(pvpToolsPlugin.getFriendlyPlayerCount())).build()};
+			TableRow firstRow = TableRow.builder().elements(Arrays.asList(firstRowElements)).build();
+			TableElement[] secondRowElements = {
+				TableElement.builder().content("Enemy").color(Color.RED).build(),
+				TableElement.builder().content(String.valueOf(pvpToolsPlugin.getEnemyPlayerCount())).build()};
+			TableRow secondRow = TableRow.builder().elements(Arrays.asList(secondRowElements)).build();
+			tableComponent.addRows(firstRow, secondRow);
+			return tableComponent.render(graphics);
 		}
 		return null;
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsConfig.java
index c5d5d8c383..bd0b9e17e3 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsConfig.java
@@ -84,20 +84,6 @@ public interface PvpToolsConfig extends Config
 		return false;
 	}
 
-	@ConfigItem(
-		keyName = "hideAttackMode",
-		name = "Mode",
-		description = "",
-		position = 6,
-		group = "Right-Click Attack Options",
-		hidden = true,
-		unhide = "hideAttack"
-	)
-	default AttackMode hideAttackMode()
-	{
-		return AttackMode.FRIENDS;
-	}
-
 	@ConfigItem(
 		keyName = "hideCast",
 		name = "Hide cast",
@@ -110,70 +96,6 @@ public interface PvpToolsConfig extends Config
 		return false;
 	}
 
-	@ConfigItem(
-		keyName = "hideCastMode",
-		name = "Mode",
-		description = "",
-		position = 8,
-		group = "Right-Click Attack Options",
-		hidden = true,
-		unhide = "hideCast"
-	)
-	default AttackMode hideCastMode()
-	{
-		return AttackMode.FRIENDS;
-	}
-
-	@ConfigItem(
-		keyName = "hideCastIgnored",
-		name = "Ignored spells",
-		description = "Spells that should not be hidden from being cast, separated by a comma",
-		position = 9,
-		group = "Right-Click Attack Options",
-		hidden = true,
-		unhide = "hideCast"
-	)
-	default String hideCastIgnored()
-	{
-		return "cure other, energy transfer, heal other, vengeance other";
-	}
-
-	@ConfigItem(
-		keyName = "attackOptionsClan",
-		name = "Move CC Attack Option",
-		description = "Moves the attack option for people in the same CC",
-		position = 10,
-		group = "Right-Click Attack Options"
-	)
-	default boolean attackOptionsClan()
-	{
-		return false;
-	}
-
-	@ConfigItem(
-		keyName = "attackOptionsFriend",
-		name = "Move Friend Attack Options",
-		description = "Moves the attack option for people on your friends list",
-		position = 11,
-		group = "Right-Click Attack Options"
-	)
-	default boolean attackOptionsFriend()
-	{
-		return false;
-	}
-
-	@ConfigItem(
-		keyName = "levelRangeAttackOptions",
-		name = "Moves Other Attack Options",
-		description = "Moves the attack option for people that are outside your level range",
-		position = 12,
-		group = "Right-Click Attack Options"
-	)
-	default boolean levelRangeAttackOptions()
-	{
-		return false;
-	}
-
 	@ConfigItem(
 		keyName = "riskCalculator",
 		name = "Risk Calculator",
@@ -206,5 +128,4 @@ public interface PvpToolsConfig extends Config
 	{
 		return true;
 	}
-
-}
+}
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsOverlay.java
index 7d042374ac..5aceb68fa7 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsOverlay.java
@@ -9,13 +9,11 @@
 
 package net.runelite.client.plugins.pvptools;
 
-import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
-import java.awt.Polygon;
 import javax.inject.Inject;
-import net.runelite.api.Client;
+import javax.inject.Singleton;
 import net.runelite.api.Point;
 import net.runelite.client.ui.FontManager;
 import net.runelite.client.ui.overlay.Overlay;
@@ -24,18 +22,15 @@ import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayPriority;
 import net.runelite.client.ui.overlay.OverlayUtil;
 
+@Singleton
 public class PvpToolsOverlay extends Overlay
 {
-	private PvpToolsPlugin pvpToolsPlugin;
-	private PvpToolsConfig pvpToolsConfig;
-	private Client client;
+	private final PvpToolsPlugin pvpToolsPlugin;
 
 	@Inject
-	private PvpToolsOverlay(PvpToolsConfig pvpToolsConfig, PvpToolsPlugin pvpToolsPlugin, Client client)
+	private PvpToolsOverlay(final PvpToolsPlugin pvpToolsPlugin)
 	{
 		this.pvpToolsPlugin = pvpToolsPlugin;
-		this.pvpToolsConfig = pvpToolsConfig;
-		this.client = client;
 		setLayer(OverlayLayer.ABOVE_WIDGETS);
 		setPriority(OverlayPriority.HIGH);
 		setPosition(OverlayPosition.DYNAMIC);
@@ -45,26 +40,11 @@ public class PvpToolsOverlay extends Overlay
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (pvpToolsConfig.fallInHelper())
+		if (pvpToolsPlugin.isFallInHelper() && pvpToolsPlugin.fallinHelperEnabled)
 		{
-			if (pvpToolsPlugin.fallinHelperEnabled)
-			{
-				graphics.setFont(FontManager.getRunescapeFont().deriveFont(28));
-				OverlayUtil.renderTextLocation(graphics, new Point(200, 80), "FALL IN HELPER ENABLED", Color.YELLOW);
-			}
+			graphics.setFont(FontManager.getRunescapeFont().deriveFont(28));
+			OverlayUtil.renderTextLocation(graphics, new Point(200, 80), "FALL IN HELPER ENABLED", Color.YELLOW);
 		}
 		return null;
 	}
-
-	private void renderPoly(Graphics2D graphics, Color color, Polygon polygon)
-	{
-		if (polygon != null)
-		{
-			graphics.setColor(color);
-			graphics.setStroke(new BasicStroke(2));
-			graphics.draw(polygon);
-			graphics.setColor(new Color(color.getRed(), color.getGreen(), color.getBlue(), 20));
-			graphics.fill(polygon);
-		}
-	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPanel.java
index 3156f8061c..c64dacff12 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPanel.java
@@ -14,6 +14,7 @@ import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Font;
 import java.awt.GridLayout;
+import javax.inject.Singleton;
 import javax.swing.Box;
 import javax.swing.JButton;
 import javax.swing.JLabel;
@@ -27,23 +28,24 @@ import net.runelite.client.ui.FontManager;
 import net.runelite.client.ui.PluginPanel;
 
 @Slf4j
-public class PvpToolsPanel extends PluginPanel
+@Singleton
+class PvpToolsPanel extends PluginPanel
 {
 
 	private final JLabel loggedLabel = new JLabel();
 	private final JRichTextPane emailLabel = new JRichTextPane();
-	JLabel numCC = new JLabel();
-	JLabel numOther = new JLabel();
-	JLabel numMageJLabel = new JLabel(" ");
-	JLabel numRangeJLabel = new JLabel(" ");
-	JLabel numMeleeJLabel = new JLabel(" ");
-	JLabel totalRiskLabel = new JLabel(" ");
-	JLabel riskProtectingItem = new JLabel(" ");
-	JLabel biggestItemLabel = new JLabel("Protected Item: ");
-	JButton missingPlayers = new JButton("Show missing CC members");
-	JButton currentPlayers = new JButton("Show current CC members");
-	private JLabel numBrews = new JLabel();
-	private JPanel missingPlayersPanel = new JPanel();
+	final JLabel numCC = new JLabel();
+	final JLabel numOther = new JLabel();
+	final JLabel numMageJLabel = new JLabel(" ");
+	final JLabel numRangeJLabel = new JLabel(" ");
+	final JLabel numMeleeJLabel = new JLabel(" ");
+	final JLabel totalRiskLabel = new JLabel(" ");
+	final JLabel riskProtectingItem = new JLabel(" ");
+	final JLabel biggestItemLabel = new JLabel("Protected Item: ");
+	final JButton missingPlayers = new JButton("Show missing CC members");
+	final JButton currentPlayers = new JButton("Show current CC members");
+	private final JLabel numBrews = new JLabel();
+	private final JPanel missingPlayersPanel = new JPanel();
 
 
 	public static String htmlLabel(String key, String value)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java
index 4a7c393f31..b0b7d100f4 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java
@@ -15,10 +15,8 @@ import com.google.inject.Provides;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.image.BufferedImage;
-import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.Comparator;
-import java.util.HashSet;
 import java.util.List;
 import java.util.NavigableMap;
 import java.util.Objects;
@@ -26,6 +24,7 @@ import java.util.TreeMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.stream.Collectors;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
@@ -35,19 +34,15 @@ import net.runelite.api.GameState;
 import net.runelite.api.InventoryID;
 import net.runelite.api.Item;
 import net.runelite.api.ItemDefinition;
-import net.runelite.api.MenuEntry;
 import net.runelite.api.Player;
 import net.runelite.api.SkullIcon;
 import net.runelite.api.events.ConfigChanged;
-import net.runelite.api.events.FocusChanged;
 import net.runelite.api.events.GameStateChanged;
 import net.runelite.api.events.ItemContainerChanged;
-import net.runelite.api.events.MenuEntryAdded;
-import net.runelite.api.events.MenuOpened;
 import net.runelite.api.events.PlayerDespawned;
 import net.runelite.api.events.PlayerSpawned;
-import net.runelite.client.chat.ChatMessageManager;
 import net.runelite.client.config.ConfigManager;
+import net.runelite.client.config.Keybind;
 import net.runelite.client.eventbus.Subscribe;
 import net.runelite.client.game.AsyncBufferedImage;
 import net.runelite.client.game.ItemManager;
@@ -66,7 +61,6 @@ import net.runelite.client.util.PvPUtil;
 import static net.runelite.client.util.StackFormatter.quantityToRSDecimalStack;
 import net.runelite.client.util.Text;
 import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.StringUtils;
 
 @PluginDescriptor(
 	name = "PvP Tools",
@@ -75,7 +69,7 @@ import org.apache.commons.lang3.StringUtils;
 	type = PluginType.PVP,
 	enabledByDefault = false
 )
-
+@Singleton
 public class PvpToolsPlugin extends Plugin
 {
 	@Inject
@@ -90,10 +84,6 @@ public class PvpToolsPlugin extends Plugin
 	private CurrentPlayersJFrame currentPlayersJFrame;
 	private NavigationButton navButton;
 
-	@Getter(AccessLevel.PACKAGE)
-	@Setter(AccessLevel.PACKAGE)
-	private boolean attackHotKeyPressed;
-
 	@Getter(AccessLevel.PACKAGE)
 	@Setter(AccessLevel.PACKAGE)
 	private boolean hideAll;
@@ -107,21 +97,7 @@ public class PvpToolsPlugin extends Plugin
 	@Inject
 	private ItemManager itemManager;
 
-	@Inject
-	private ChatMessageManager chatMessageManager;
-
-	private PvpToolsPlugin uhPvpToolsPlugin = this;
-
-	private static final String WALK_HERE = "WALK HERE";
-	private static final String CANCEL = "CANCEL";
-	private static final String CAST = "CAST";
-	private static final String ATTACK_OPTIONS_ATTACK = "ATTACK";
-	public static final HashSet<String> ATTACK_OPTIONS_KEYWORDS = new HashSet<>();
-		static
-		{
-			ATTACK_OPTIONS_KEYWORDS.add(CAST);
-			ATTACK_OPTIONS_KEYWORDS.add(ATTACK_OPTIONS_ATTACK);
-		}
+	private final PvpToolsPlugin uhPvpToolsPlugin = this;
 
 	/**
 	 * ActionListener for the missing cc members and refresh buttons
@@ -162,6 +138,18 @@ public class PvpToolsPlugin extends Plugin
 		}
 	};
 
+	@Getter(AccessLevel.PACKAGE)
+	private boolean countPlayers;
+	private boolean countOverHeads;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean fallInHelper;
+	private Keybind hotkey;
+	private Keybind renderSelf;
+	private boolean riskCalculatorEnabled;
+	private boolean missingPlayersEnabled;
+	private boolean currentPlayersEnabled;
+	private boolean hideAttack;
+	private boolean hideCast;
 
 	@Inject
 	private ClientToolbar clientToolbar;
@@ -175,7 +163,7 @@ public class PvpToolsPlugin extends Plugin
 	/**
 	 * The HotKeyListener for the hot key assigned in the config that triggers the Fall In Helper feature
 	 */
-	private final HotkeyListener fallinHotkeyListener = new HotkeyListener(() -> config.hotkey())
+	private final HotkeyListener fallinHotkeyListener = new HotkeyListener(() -> this.hotkey)
 	{
 		public void hotkeyPressed()
 		{
@@ -183,7 +171,7 @@ public class PvpToolsPlugin extends Plugin
 		}
 	};
 
-	private final HotkeyListener renderselfHotkeyListener = new HotkeyListener(() -> config.renderSelf())
+	private final HotkeyListener renderselfHotkeyListener = new HotkeyListener(() -> this.renderSelf)
 	{
 		public void hotkeyPressed()
 		{
@@ -193,7 +181,6 @@ public class PvpToolsPlugin extends Plugin
 
 	private int[] overheadCount = new int[]{0, 0, 0};
 
-	private List ignoredSpells = new ArrayList();
 	@Getter
 	private int enemyPlayerCount = 0;
 	@Getter
@@ -208,12 +195,9 @@ public class PvpToolsPlugin extends Plugin
 			if (!Objects.isNull(clanMember))
 			{
 				List<String> arrayList = ccMembers.stream().map(player -> Text.removeTags(Text.standardize(player.getName()))).collect(Collectors.toList());
-				if (!arrayList.contains(Text.removeTags(Text.standardize(clanMember.getUsername()))))
+				if (!arrayList.contains(Text.removeTags(Text.standardize(clanMember.getUsername()))) && !missingMembers.contains(clanMember.getUsername()))
 				{
-					if (!missingMembers.contains(clanMember.getUsername()))
-					{
-						missingMembers.add("[W" + clanMember.getWorld() + "] - " + clanMember.getUsername());
-					}
+					missingMembers.add("[W" + clanMember.getWorld() + "] - " + clanMember.getUsername());
 				}
 			}
 		}
@@ -230,12 +214,9 @@ public class PvpToolsPlugin extends Plugin
 			if (!Objects.isNull(clanMember))
 			{
 				List<String> arrayList = ccMembers.stream().map(player -> Text.removeTags(Text.standardize(player.getName()))).collect(Collectors.toList());
-				if (arrayList.contains(Text.removeTags(Text.standardize(clanMember.getUsername()))))
+				if (arrayList.contains(Text.removeTags(Text.standardize(clanMember.getUsername()))) && !currentMembers.contains(clanMember.getUsername()))
 				{
-					if (!currentMembers.contains(clanMember.getUsername()))
-					{
-						currentMembers.add(clanMember.getUsername());
-					}
+					currentMembers.add(clanMember.getUsername());
 				}
 			}
 		}
@@ -253,9 +234,12 @@ public class PvpToolsPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
+
 		overlayManager.add(pvpToolsOverlay);
 		overlayManager.add(playerCountOverlay);
-
+		client.setHideFriendAttackOptions(this.hideAttack);
+		client.setHideFriendCastOptions(this.hideCast);
 		keyManager.registerKeyListener(fallinHotkeyListener);
 		keyManager.registerKeyListener(renderselfHotkeyListener);
 		final BufferedImage icon = ImageUtil.getResourceStreamFromClass(getClass(), "skull.png");
@@ -275,17 +259,16 @@ public class PvpToolsPlugin extends Plugin
 		clientToolbar.addNavigation(navButton);
 
 
-		if (config.missingPlayersEnabled())
+		if (this.missingPlayersEnabled)
 		{
 			panel.missingPlayers.setVisible(true);
 		}
 
-		if (config.currentPlayersEnabled())
+		if (this.currentPlayersEnabled)
 		{
 			panel.currentPlayers.setVisible(true);
 		}
 
-		ignoredSpells = Arrays.asList(config.hideCastIgnored().toLowerCase().split("\\s*,\\s*"));
 	}
 
 	@Override
@@ -296,60 +279,68 @@ public class PvpToolsPlugin extends Plugin
 		keyManager.unregisterKeyListener(fallinHotkeyListener);
 		keyManager.unregisterKeyListener(renderselfHotkeyListener);
 		clientToolbar.removeNavigation(navButton);
+		client.setHideFriendAttackOptions(false);
+		client.setHideFriendCastOptions(false);
 	}
 
 	@Subscribe
 	public void onConfigChanged(ConfigChanged configChanged)
 	{
+		if (!"pvptools".equals(configChanged.getGroup()))
+		{
+			return;
+		}
+		client.setHideFriendAttackOptions(this.hideAttack);
+		client.setHideFriendCastOptions(this.hideCast);
+
 		if (configChanged.getGroup().equals("pvptools"))
 		{
+			updateConfig();
+
 			switch (configChanged.getKey())
 			{
 				case "countPlayers":
-					if (config.countPlayers())
+					if (this.countPlayers)
 					{
 						updatePlayers();
 					}
-					if (!config.countPlayers())
+					if (!this.countPlayers)
 					{
 						panel.disablePlayerCount();
 					}
 					break;
 				case "countOverHeads":
-					if (config.countOverHeads())
+					if (this.countOverHeads)
 					{
 						countOverHeads();
 					}
-					if (!config.countOverHeads())
+					if (!this.countOverHeads)
 					{
 						panel.disablePrayerCount();
 					}
 					break;
 				case "riskCalculator":
-					if (config.riskCalculatorEnabled())
+					if (this.riskCalculatorEnabled)
 					{
 						getCarriedWealth();
 					}
-					if (!config.riskCalculatorEnabled())
+					if (!this.riskCalculatorEnabled)
 					{
 						panel.disableRiskCalculator();
 					}
 					break;
 				case "missingPlayers":
-					if (config.missingPlayersEnabled())
+					if (this.missingPlayersEnabled)
 					{
 						panel.missingPlayers.setVisible(true);
 					}
 					break;
 				case "currentPlayers":
-					if (config.currentPlayersEnabled())
+					if (this.currentPlayersEnabled)
 					{
 						panel.currentPlayers.setVisible(true);
 					}
 					break;
-				case "hideCastIgnored":
-					ignoredSpells = Arrays.asList(config.hideCastIgnored().toLowerCase().split("\\s*,\\s*"));
-					break;
 				default:
 					break;
 			}
@@ -360,7 +351,7 @@ public class PvpToolsPlugin extends Plugin
 	public void onItemContainerChanged(ItemContainerChanged event)
 	{
 		if (event.getItemContainer().equals(client.getItemContainer(InventoryID.INVENTORY)) &&
-			config.riskCalculatorEnabled())
+			this.riskCalculatorEnabled)
 		{
 			getCarriedWealth();
 		}
@@ -369,27 +360,24 @@ public class PvpToolsPlugin extends Plugin
 	@Subscribe
 	public void onGameStateChanged(GameStateChanged event)
 	{
-		if (event.getGameState().equals(GameState.LOGGED_IN) && config.riskCalculatorEnabled())
+		if (event.getGameState().equals(GameState.LOGGED_IN) && this.riskCalculatorEnabled)
 		{
 			getCarriedWealth();
 		}
-		if (event.getGameState().equals(GameState.LOGGED_IN))
+		if (event.getGameState().equals(GameState.LOGGED_IN) && this.countPlayers)
 		{
-			if (config.countPlayers())
-			{
-				updatePlayers();
-			}
+			updatePlayers();
 		}
 	}
 
 	@Subscribe
 	public void onPlayerSpawned(PlayerSpawned event)
 	{
-		if (config.countPlayers() && PvPUtil.isAttackable(client, event.getPlayer()))
+		if (this.countPlayers && PvPUtil.isAttackable(client, event.getPlayer()))
 		{
 			updatePlayers();
 		}
-		if (config.countOverHeads())
+		if (this.countOverHeads)
 		{
 			countOverHeads();
 		}
@@ -398,125 +386,16 @@ public class PvpToolsPlugin extends Plugin
 	@Subscribe
 	public void onPlayerDespawned(PlayerDespawned event)
 	{
-		if (config.countPlayers() && PvPUtil.isAttackable(client, event.getPlayer()))
+		if (this.countPlayers && PvPUtil.isAttackable(client, event.getPlayer()))
 		{
 			updatePlayers();
 		}
-		if (config.countOverHeads())
+		if (this.countOverHeads)
 		{
 			countOverHeads();
 		}
 	}
 
-	@Subscribe
-	public void onMenuEntryAdded(MenuEntryAdded menuEntryAdded)
-	{
-		if (config.attackOptionsFriend() || config.attackOptionsClan() || config.levelRangeAttackOptions())
-		{
-			final String pOptionToReplace = Text.removeTags(menuEntryAdded.getOption()).toUpperCase();
-
-			if (client.getGameState() != GameState.LOGGED_IN)
-			{
-				return;
-			}
-
-			if (pOptionToReplace.equals(CANCEL) || pOptionToReplace.equals(WALK_HERE))
-			{
-				return;
-			}
-
-			Player[] players = client.getCachedPlayers();
-			Player player = null;
-			int identifier = menuEntryAdded.getIdentifier();
-			if (identifier >= 0 && identifier < players.length)
-			{
-				player = players[identifier];
-			}
-			if (player == null)
-			{
-				return;
-			}
-
-
-			if (attackHotKeyPressed && config.attackOptionsClan() || config.attackOptionsFriend() ||
-				config.levelRangeAttackOptions())
-			{
-				if (config.attackOptionsFriend() && player.isFriend())
-				{
-					swap(pOptionToReplace);
-				}
-				else if (config.attackOptionsClan() && player.isClanMember())
-				{
-					swap(pOptionToReplace);
-				}
-				else if (config.levelRangeAttackOptions() && !PvPUtil.isAttackable(client, player))
-				{
-					swap(pOptionToReplace);
-				}
-			}
-		}
-	}
-
-	@Subscribe
-	public void onMenuOpened(MenuOpened event)
-	{
-		Player localPlayer = client.getLocalPlayer();
-
-		if (localPlayer == null)
-		{
-			return;
-		}
-
-		List<MenuEntry> menu = new ArrayList<>();
-
-		for (MenuEntry entry : event.getMenuEntries())
-		{
-			String option = Text.removeTags(entry.getOption()).toLowerCase();
-			String target = Text.removeTags(entry.getTarget()).toLowerCase();
-
-			int identifier = entry.getIdentifier();
-
-			Player[] players = client.getCachedPlayers();
-			Player player = null;
-
-			if (identifier >= 0 && identifier < players.length)
-			{
-				player = players[identifier];
-			}
-
-			if (player == null)
-			{
-				menu.add(entry);
-				continue;
-			}
-
-			if (option.contains("attack") && config.hideAttack() && shouldHide(config.hideAttackMode(), player))
-			{
-				continue;
-			}
-
-			else if (option.contains("cast") && config.hideCast() && shouldHide(config.hideCastMode(), player)
-					&& !ignoredSpells.contains(StringUtils.substringBefore(target, " ->")))
-			{
-				continue;
-			}
-
-			menu.add(entry);
-		}
-
-		client.setMenuEntries(menu.toArray(new MenuEntry[0]));
-	}
-
-	@Subscribe
-	public void onFocusChanged(FocusChanged focusChanged)
-	{
-		if (!focusChanged.isFocused())
-		{
-			setAttackHotKeyPressed(false);
-		}
-	}
-
-
 	/**
 	 * Enables or disables the fall in helper feature
 	 */
@@ -550,12 +429,11 @@ public class PvpToolsPlugin extends Plugin
 		panel.numMeleeJLabel.repaint();
 	}
 
-
 	private void updatePlayers()
 	{
 		friendlyPlayerCount = 0;
 		enemyPlayerCount = 0;
-		if (config.countPlayers())
+		if (this.countPlayers)
 		{
 			for (Player p : client.getPlayers())
 			{
@@ -591,25 +469,20 @@ public class PvpToolsPlugin extends Plugin
 		overheadCount = new int[]{0, 0, 0};
 		for (Player p : client.getPlayers())
 		{
-			if (Objects.nonNull(p))
+			if (Objects.nonNull(p) && PvPUtil.isAttackable(client, p) &&
+				!p.isClanMember() && !(p.getOverheadIcon() == null))
 			{
-				if (PvPUtil.isAttackable(client, p))
+				switch (p.getOverheadIcon())
 				{
-					if (!p.isClanMember() && !(p.getOverheadIcon() == null))
-					{
-						switch (p.getOverheadIcon())
-						{
-							case MAGIC:
-								overheadCount[0]++;
-								break;
-							case RANGED:
-								overheadCount[1]++;
-								break;
-							case MELEE:
-								overheadCount[2]++;
-								break;
-						}
-					}
+					case MAGIC:
+						overheadCount[0]++;
+						break;
+					case RANGED:
+						overheadCount[1]++;
+						break;
+					case MELEE:
+						overheadCount[2]++;
+						break;
 				}
 			}
 		}
@@ -621,7 +494,7 @@ public class PvpToolsPlugin extends Plugin
 	 */
 	private void getCarriedWealth()
 	{
-		if (!config.riskCalculatorEnabled())
+		if (!this.riskCalculatorEnabled)
 		{
 			return;
 		}
@@ -661,12 +534,9 @@ public class PvpToolsPlugin extends Plugin
 		panel.totalRiskLabel.repaint();
 
 		int itemLimit = 0;
-		if (client.getLocalPlayer().getSkullIcon() != null)
+		if (client.getLocalPlayer().getSkullIcon() != null && client.getLocalPlayer().getSkullIcon() == SkullIcon.SKULL)
 		{
-			if (client.getLocalPlayer().getSkullIcon() == SkullIcon.SKULL)
-			{
-				itemLimit = 1;
-			}
+			itemLimit = 1;
 		}
 		if (client.getLocalPlayer().getSkullIcon() == null)
 		{
@@ -707,80 +577,18 @@ public class PvpToolsPlugin extends Plugin
 		panel.biggestItemLabel.repaint();
 	}
 
-	/**
-	 * Swaps menu entries if the entries could be found. This places Walk Here where the top level menu option was.
-	 * @param pOptionToReplace The String containing the Menu Option that needs to be replaced. IE: "Attack", "Chop Down".
-	 */
-	private void swap(String pOptionToReplace)
+
+	private void updateConfig()
 	{
-		MenuEntry[] entries = client.getMenuEntries();
-		Integer walkHereEntry = searchIndex(entries, WALK_HERE);
-		Integer entryToReplace = searchIndex(entries, pOptionToReplace);
-
-		if (walkHereEntry != null
-				&& entryToReplace != null)
-		{
-			MenuEntry walkHereMenuEntry = entries[walkHereEntry];
-			entries[walkHereEntry] = entries[entryToReplace];
-			entries[entryToReplace] = walkHereMenuEntry;
-			client.setMenuEntries(entries);
-		}
+		this.countPlayers = config.countPlayers();
+		this.countOverHeads = config.countOverHeads();
+		this.fallInHelper = config.fallInHelper();
+		this.hotkey = config.hotkey();
+		this.renderSelf = config.renderSelf();
+		this.riskCalculatorEnabled = config.riskCalculatorEnabled();
+		this.missingPlayersEnabled = config.missingPlayersEnabled();
+		this.currentPlayersEnabled = config.currentPlayersEnabled();
+		this.hideAttack = config.hideAttack();
+		this.hideCast = config.hideCast();
 	}
-
-	/**
-	 * Finds the index of the menu that contains the verbiage we are looking for.
-	 * @param pMenuEntries The list of {@link MenuEntry}s.
-	 * @param pMenuEntryToSearchFor The Option in the menu to search for.
-	 * @return The index location or null if it was not found.
-	 */
-	private Integer searchIndex(MenuEntry[] pMenuEntries, String pMenuEntryToSearchFor)
-	{
-		Integer indexLocation = 0;
-
-		for (MenuEntry menuEntry : pMenuEntries)
-		{
-			String entryOption = Text.removeTags(menuEntry.getOption()).toUpperCase();
-
-			if (entryOption.equals(pMenuEntryToSearchFor))
-			{
-				return indexLocation;
-			}
-			indexLocation++;
-		}
-		return null;
-	}
-
-	/**
-	 * Given an AttackMode, checks whether or not a player should be hidden.
-	 * @param mode The {@link AttackMode} the player should be checked against.
-	 * @param player The player that should be checked.
-	 * @return True if the player should be hidden, false otherwise.
-	 */
-	private boolean shouldHide(AttackMode mode, Player player)
-	{
-		switch (mode)
-		{
-			case CLAN:
-				if (player.isClanMember())
-				{
-					return true;
-				}
-				break;
-			case FRIENDS:
-				if (player.isFriend())
-				{
-					return true;
-				}
-				break;
-			case BOTH:
-				if (player.isClanMember() || player.isFriend())
-				{
-					return true;
-				}
-				break;
-		}
-
-		return false;
-	}
-
-}
+}
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/skull.png b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/skull.png
deleted file mode 100644
index 09869ea0e1..0000000000
Binary files a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/skull.png and /dev/null differ
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderConfig.java
index 19204ca5e1..35a11a7a54 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderConfig.java
@@ -33,10 +33,10 @@ public interface PyramidPlunderConfig extends Config
 {
 
 	@ConfigItem(
-			position = 1,
-			keyName = "showPlunderStatus",
-			name = "Show session stats",
-			description = "Configures whether to display pyramid plunder session stats"
+		position = 1,
+		keyName = "showPlunderStatus",
+		name = "Show session stats",
+		description = "Configures whether to display pyramid plunder session stats"
 	)
 	default boolean showPlunderStatus()
 	{
@@ -77,10 +77,10 @@ public interface PyramidPlunderConfig extends Config
 	}
 
 	@ConfigItem(
-			position = 5,
-			keyName = "hideWidget",
-			name = "Hide default widget",
-			description = "Hide the default widget"
+		position = 5,
+		keyName = "hideWidget",
+		name = "Hide default widget",
+		description = "Hide the default widget"
 	)
 	default boolean hideWidget()
 	{
@@ -88,10 +88,10 @@ public interface PyramidPlunderConfig extends Config
 	}
 
 	@ConfigItem(
-			position = 6,
-			keyName = "firstWarningTime",
-			name = "First warning time",
-			description = "Recolor time left(s)"
+		position = 6,
+		keyName = "firstWarningTime",
+		name = "First warning time",
+		description = "Recolor time left(s)"
 	)
 	default int firstWarningTime()
 	{
@@ -99,10 +99,10 @@ public interface PyramidPlunderConfig extends Config
 	}
 
 	@ConfigItem(
-			position = 7,
-			keyName = "secondWarningTime",
-			name = "Second warning time",
-			description = "Recolor time left(s)"
+		position = 7,
+		keyName = "secondWarningTime",
+		name = "Second warning time",
+		description = "Recolor time left(s)"
 	)
 	default int secondWarningTime()
 	{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderOverlay.java
index 7db6dcca33..9032bcc500 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderOverlay.java
@@ -34,6 +34,7 @@ import java.util.Locale;
 import java.util.Map;
 import javax.inject.Inject;
 
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.ObjectDefinition;
 import net.runelite.api.Point;
@@ -56,6 +57,7 @@ import net.runelite.client.ui.overlay.components.PanelComponent;
 import net.runelite.client.ui.overlay.components.TitleComponent;
 import net.runelite.client.util.ColorUtil;
 
+@Singleton
 public class PyramidPlunderOverlay extends Overlay
 {
 	private static final int MAX_DISTANCE = 2400;
@@ -63,7 +65,6 @@ public class PyramidPlunderOverlay extends Overlay
 	private static final Color COLOR_SPEAR_TRAP = Color.ORANGE;
 
 	private final Client client;
-	private final PyramidPlunderConfig config;
 	private final PyramidPlunderPlugin plugin;
 	private final PanelComponent panelComponent = new PanelComponent();
 
@@ -78,11 +79,10 @@ public class PyramidPlunderOverlay extends Overlay
 	}
 
 	@Inject
-	private PyramidPlunderOverlay(Client client, PyramidPlunderConfig config, PyramidPlunderPlugin plugin)
+	private PyramidPlunderOverlay(final Client client, final PyramidPlunderPlugin plugin)
 	{
 		this.client = client;
 		this.plugin = plugin;
-		this.config = config;
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_SCENE);
 	}
@@ -104,7 +104,7 @@ public class PyramidPlunderOverlay extends Overlay
 			Tile tile = entry.getValue();
 
 			if (tile.getPlane() == client.getPlane() &&
-					object.getLocalLocation().distanceTo(playerLocation) < MAX_DISTANCE)
+				object.getLocalLocation().distanceTo(playerLocation) < MAX_DISTANCE)
 			{
 				int objectID = object.getId();
 				if (object.getId() == CLOSED_DOOR || object.getId() == OPENED_DOOR)
@@ -154,39 +154,39 @@ public class PyramidPlunderOverlay extends Overlay
 		TableComponent tableComponent = new TableComponent();
 		tableComponent.setColumnAlignments(TableAlignment.LEFT, TableAlignment.RIGHT);
 
-		if (config.showPlunderStatus())
+		if (plugin.isShowPlunderStatus())
 		{
-				final Widget widget = client.getWidget(WidgetInfo.PYRAMID_PLUNDER_DATA);
-				if (widget == null)
-				{
-					return null;
-				}
-
-				toggleDefaultWidget(config.hideWidget());
-
-				panelComponent.getChildren().clear();
-
-				panelComponent.getChildren().add(TitleComponent.builder()
-						.text("Pyramid Plunder")
-						.build());
-
-				//Calculate time based on current pp timer tick
-				final int currentTick = client.getVar(Varbits.PYRAMID_PLUNDER_TIMER);
-				final double baseTick = (MAX_TICK_COUNT - currentTick) * TICK_LENGTH;
-				final double timeLeft = Math.max(0.0, baseTick);
-				final String timeLeftStr = TIME_LEFT_FORMATTER.format(timeLeft);
-
-				tableComponent.addRow("Time left:", ColorUtil.prependColorTag(timeLeftStr, getColor(currentTick)));
-				tableComponent.addRow("Room:", client.getVar(Varbits.PYRAMID_PLUNDER_ROOM) + "/8");
-
-				panelComponent.getChildren().add(tableComponent);
-
-				return panelComponent.render(graphics);
+			final Widget widget = client.getWidget(WidgetInfo.PYRAMID_PLUNDER_DATA);
+			if (widget == null)
+			{
+				return null;
 			}
+
+			toggleDefaultWidget(plugin.isHideWidget());
+
+			panelComponent.getChildren().clear();
+
+			panelComponent.getChildren().add(TitleComponent.builder()
+				.text("Pyramid Plunder")
+				.build());
+
+			//Calculate time based on current pp timer tick
+			final int currentTick = client.getVar(Varbits.PYRAMID_PLUNDER_TIMER);
+			final double baseTick = (MAX_TICK_COUNT - currentTick) * TICK_LENGTH;
+			final double timeLeft = Math.max(0.0, baseTick);
+			final String timeLeftStr = TIME_LEFT_FORMATTER.format(timeLeft);
+
+			tableComponent.addRow("Time left:", ColorUtil.prependColorTag(timeLeftStr, getColor(currentTick)));
+			tableComponent.addRow("Room:", client.getVar(Varbits.PYRAMID_PLUNDER_ROOM) + "/8");
+
+			panelComponent.getChildren().add(tableComponent);
+
+			return panelComponent.render(graphics);
+		}
 		return null;
 	}
 
-	void toggleDefaultWidget(boolean hide)
+	private void toggleDefaultWidget(boolean hide)
 	{
 		final Widget widget = client.getWidget(WidgetInfo.PYRAMID_PLUNDER_DATA);
 
@@ -200,11 +200,11 @@ public class PyramidPlunderOverlay extends Overlay
 
 	private Color getColor(int timeLeft)
 	{
-		if (timeLeft < config.secondWarningTime())
+		if (timeLeft < plugin.getSecondWarningTime())
 		{
 			return Color.RED;
 		}
-		else if (timeLeft < config.firstWarningTime())
+		else if (timeLeft < plugin.getFirstWarningTime())
 		{
 			return Color.YELLOW;
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderPlugin.java
index 37534fc80a..f12911344c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderPlugin.java
@@ -32,23 +32,15 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.Client;
 import static net.runelite.api.Constants.GAME_TICK_LENGTH;
 import static net.runelite.api.ItemID.PHARAOHS_SCEPTRE;
-import static net.runelite.api.ObjectID.GRAND_GOLD_CHEST;
-import static net.runelite.api.ObjectID.OPENED_GOLD_CHEST;
-import static net.runelite.api.ObjectID.SARCOPHAGUS_21255;
-import static net.runelite.api.ObjectID.SARCOPHAGUS_21256;
 import static net.runelite.api.ObjectID.SPEARTRAP_21280;
 import static net.runelite.api.ObjectID.TOMB_DOOR_20948;
 import static net.runelite.api.ObjectID.TOMB_DOOR_20949;
-import static net.runelite.api.ObjectID.URN_21261;
-import static net.runelite.api.ObjectID.URN_21262;
-import static net.runelite.api.ObjectID.URN_21263;
-import static net.runelite.api.ObjectID.URN_21265;
-import static net.runelite.api.ObjectID.URN_21266;
-import static net.runelite.api.ObjectID.URN_21267;
 import net.runelite.api.Player;
 import net.runelite.api.Tile;
 import net.runelite.api.TileObject;
@@ -79,7 +71,7 @@ import net.runelite.client.ui.overlay.infobox.InfoBoxManager;
 	type = PluginType.UTILITY,
 	enabledByDefault = false
 )
-
+@Singleton
 public class PyramidPlunderPlugin extends Plugin
 {
 	private static final int PYRAMID_PLUNDER_REGION_ID = 7749;
@@ -88,21 +80,21 @@ public class PyramidPlunderPlugin extends Plugin
 	static final int CLOSED_DOOR = TOMB_DOOR_20948;
 	static final int OPENED_DOOR = TOMB_DOOR_20949;
 
-	// Next 2 are in here for anyone who wants to spend more time on this
-	private static final Set<Integer> LOOTABLE = ImmutableSet.of(
-		GRAND_GOLD_CHEST,
-		SARCOPHAGUS_21255,
-		URN_21261,
-		URN_21262,
-		URN_21263
-	);
-	private static final Set<Integer> LOOTED = ImmutableSet.of(
-		OPENED_GOLD_CHEST,
-		SARCOPHAGUS_21256,
-		URN_21265,
-		URN_21266,
-		URN_21267
-	);
+//	// Next 2 are in here for anyone who wants to spend more time on this
+//	private static final Set<Integer> LOOTABLE = ImmutableSet.of(
+//		GRAND_GOLD_CHEST,
+//		SARCOPHAGUS_21255,
+//		URN_21261,
+//		URN_21262,
+//		URN_21263
+//	);
+//	private static final Set<Integer> LOOTED = ImmutableSet.of(
+//		OPENED_GOLD_CHEST,
+//		SARCOPHAGUS_21256,
+//		URN_21265,
+//		URN_21266,
+//		URN_21267
+//	);
 	private static final Set<Integer> DOOR_WALL_IDS = ImmutableSet.of(
 		26618, 26619, 26620, 26621
 	);
@@ -133,6 +125,18 @@ public class PyramidPlunderPlugin extends Plugin
 
 	private int pyramidTimer;
 
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showPlunderStatus;
+	private boolean highlightDoors;
+	private boolean highlightSpearTrap;
+	private boolean showTimer;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean hideWidget;
+	@Getter(AccessLevel.PACKAGE)
+	private int firstWarningTime;
+	@Getter(AccessLevel.PACKAGE)
+	private int secondWarningTime;
+
 	@Provides
 	PyramidPlunderConfig getConfig(ConfigManager configManager)
 	{
@@ -142,6 +146,7 @@ public class PyramidPlunderPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
 	}
 
 	@Override
@@ -160,12 +165,14 @@ public class PyramidPlunderPlugin extends Plugin
 			return;
 		}
 
-		if (!config.showTimer())
+		updateConfig();
+
+		if (!this.showTimer)
 		{
 			removeTimer();
 		}
 
-		if (config.showTimer() && isInGame)
+		if (this.showTimer && isInGame)
 		{
 			int remainingTime = GAME_TICK_LENGTH * (PYRAMID_PLUNDER_TIMER_MAX - pyramidTimer);
 
@@ -255,7 +262,7 @@ public class PyramidPlunderPlugin extends Plugin
 		{
 			overlayManager.add(pyramidPlunderOverlay);
 			isInGame = true;
-			if (config.showTimer())
+			if (this.showTimer)
 			{
 				showTimer();
 			}
@@ -315,10 +322,21 @@ public class PyramidPlunderPlugin extends Plugin
 		}
 
 		int id = newObject.getId();
-		if (id == TRAP && config.highlightSpearTrap() ||
-			(DOOR_WALL_IDS.contains(id) || id == OPENED_DOOR || id == CLOSED_DOOR) && config.highlightDoors())
+		if (id == TRAP && this.highlightSpearTrap ||
+			(DOOR_WALL_IDS.contains(id) || id == OPENED_DOOR || id == CLOSED_DOOR) && this.highlightDoors)
 		{
 			highlighted.put(newObject, tile);
 		}
 	}
+
+	private void updateConfig()
+	{
+		this.showPlunderStatus = config.showPlunderStatus();
+		this.highlightDoors = config.highlightDoors();
+		this.highlightSpearTrap = config.highlightSpearTrap();
+		this.showTimer = config.showTimer();
+		this.hideWidget = config.hideWidget();
+		this.firstWarningTime = config.firstWarningTime();
+		this.secondWarningTime = config.secondWarningTime();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderTimer.java b/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderTimer.java
index a9f73cf8c3..1cdda8a503 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderTimer.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderTimer.java
@@ -29,9 +29,9 @@ import java.time.temporal.ChronoUnit;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.ui.overlay.infobox.Timer;
 
-public class PyramidPlunderTimer extends Timer
+class PyramidPlunderTimer extends Timer
 {
-	PyramidPlunderTimer(Plugin plugin, BufferedImage image, int period, ChronoUnit chronoUnit)
+	PyramidPlunderTimer(final Plugin plugin, final BufferedImage image, final int period, final ChronoUnit chronoUnit)
 	{
 		super(period, chronoUnit, image, plugin);
 		setTooltip("Time left until minigame ends");
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/questlist/QuestListPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/questlist/QuestListPlugin.java
index 62583460bb..2f0fb9b415 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/questlist/QuestListPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/questlist/QuestListPlugin.java
@@ -32,6 +32,7 @@ import java.util.EnumMap;
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.Getter;
@@ -63,6 +64,7 @@ import net.runelite.client.util.Text;
 	name = "Quest List",
 	description = "Adds searching and filtering to the quest list"
 )
+@Singleton
 public class QuestListPlugin extends Plugin
 {
 	private static final int ENTRY_PADDING = 8;
@@ -171,7 +173,7 @@ public class QuestListPlugin extends Plugin
 	@Subscribe
 	public void onVarbitChanged(VarbitChanged varbitChanged)
 	{
-		if (isChatboxOpen() && !isOnQuestTab())
+		if (isChatboxOpen() && isNotOnQuestTab())
 		{
 			chatboxPanelManager.close();
 		}
@@ -180,12 +182,9 @@ public class QuestListPlugin extends Plugin
 	@Subscribe
 	public void onVarClientIntChanged(VarClientIntChanged varClientIntChanged)
 	{
-		if (varClientIntChanged.getIndex() == VarClientInt.INVENTORY_TAB.getIndex())
+		if (varClientIntChanged.getIndex() == VarClientInt.INVENTORY_TAB.getIndex() && isChatboxOpen() && isNotOnQuestTab())
 		{
-			if (isChatboxOpen() && !isOnQuestTab())
-			{
-				chatboxPanelManager.close();
-			}
+			chatboxPanelManager.close();
 		}
 	}
 
@@ -207,9 +206,9 @@ public class QuestListPlugin extends Plugin
 		questHideButton.setName(MENU_SHOW + " " + currentFilterState.getName());
 	}
 
-	private boolean isOnQuestTab()
+	private boolean isNotOnQuestTab()
 	{
-		return client.getVar(Varbits.QUEST_TAB) == 0 && client.getVar(VarClientInt.INVENTORY_TAB) == 2;
+		return client.getVar(Varbits.QUEST_TAB) != 0 || client.getVar(VarClientInt.INVENTORY_TAB) != 2;
 	}
 
 	private boolean isChatboxOpen()
@@ -312,11 +311,10 @@ public class QuestListPlugin extends Plugin
 
 		Collection<QuestWidget> quests = questSet.get(questContainer);
 
-		if (quests != null)
-		{
+		if (quests != null &&
 			// Check to make sure the list hasn't been rebuild since we were last her
 			// Do this by making sure the list's dynamic children are the same as when we last saw them
-			if (quests.stream().noneMatch(w ->
+			quests.stream().noneMatch(w ->
 			{
 				Widget codeWidget = w.getQuest();
 				if (codeWidget == null)
@@ -325,9 +323,8 @@ public class QuestListPlugin extends Plugin
 				}
 				return list.getChild(codeWidget.getIndex()) == codeWidget;
 			}))
-			{
-				quests = null;
-			}
+		{
+			quests = null;
 		}
 
 		if (quests == null)
@@ -357,7 +354,7 @@ public class QuestListPlugin extends Plugin
 			else
 			{
 				// Otherwise hide if it doesn't match the filter state
-				hidden = currentFilterState != QuestState.ALL && questState != currentFilterState;
+				hidden = currentFilterState != QuestState.ALL && questState != null && !questState.equals(currentFilterState);
 			}
 
 			quest.setHidden(hidden);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/Raid.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/Raid.java
index 69feb04fca..33e4ebbd24 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/Raid.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/Raid.java
@@ -28,16 +28,17 @@ import com.google.common.base.Joiner;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.client.plugins.raids.solver.Layout;
 import net.runelite.client.plugins.raids.solver.Room;
 
 public class Raid
 {
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final RaidRoom[] rooms = new RaidRoom[16];
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private Layout layout;
 
 	void updateLayout(Layout layout)
@@ -108,7 +109,7 @@ public class Raid
 			}
 		}
 
-		return combatRooms.toArray(new RaidRoom[combatRooms.size()]);
+		return combatRooms.toArray(new RaidRoom[0]);
 	}
 
 	String getRotationString()
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidRoom.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidRoom.java
index aa2fd9e162..00401d9991 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidRoom.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidRoom.java
@@ -24,6 +24,7 @@
  */
 package net.runelite.client.plugins.raids;
 
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
@@ -32,25 +33,25 @@ import net.runelite.api.Tile;
 public class RaidRoom
 {
 	static final int ROOM_MAX_SIZE = 32;
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final Tile base;
-	@Getter
-	@Setter
+	@Getter(AccessLevel.PACKAGE)
+	@Setter(AccessLevel.PACKAGE)
 	private Type type;
-	@Getter
-	@Setter
+	@Getter(AccessLevel.PUBLIC)
+	@Setter(AccessLevel.PUBLIC)
 	private Boss boss;
-	@Getter
-	@Setter
+	@Getter(AccessLevel.PACKAGE)
+	@Setter(AccessLevel.PACKAGE)
 	private Puzzle puzzle;
-	@Getter
-	@Setter
+	@Getter(AccessLevel.PACKAGE)
+	@Setter(AccessLevel.PACKAGE)
 	private RaidRoom previousRoom;
-	@Getter
-	@Setter
+	@Getter(AccessLevel.PACKAGE)
+	@Setter(AccessLevel.PACKAGE)
 	private RaidRoom nextRoom;
 
-	RaidRoom(Tile base, Type type)
+	RaidRoom(final Tile base, final Type type)
 	{
 		this.base = base;
 		this.type = type;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java
index 2bfa3e41be..4ccbc18ee8 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java
@@ -33,8 +33,11 @@ import java.awt.image.BufferedImage;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
 import net.runelite.api.Client;
@@ -60,6 +63,7 @@ import net.runelite.client.util.ColorUtil;
 import net.runelite.client.util.ImageUtil;
 import net.runelite.client.util.Text;
 
+@Singleton
 public class RaidsOverlay extends Overlay
 {
 	private static final int OLM_PLANE = 0;
@@ -72,30 +76,28 @@ public class RaidsOverlay extends Overlay
 	private final ItemManager itemManager;
 	private final SpriteManager spriteManager;
 	private final PanelComponent panelImages = new PanelComponent();
-	private Client client;
-	private RaidsPlugin plugin;
-	private RaidsConfig config;
-	@Setter
+	private final Client client;
+	private final RaidsPlugin plugin;
+	@Setter(AccessLevel.PACKAGE)
 	private boolean sharable = false;
-	@Getter
-	@Setter
+	@Getter(AccessLevel.PACKAGE)
+	@Setter(AccessLevel.PACKAGE)
 	private boolean scoutOverlayShown = false;
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private boolean scouterActive = false;
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private int width;
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private int height;
 
 	@Inject
-	private RaidsOverlay(Client client, RaidsPlugin plugin, RaidsConfig config, ItemManager itemManager, SpriteManager spriteManager)
+	private RaidsOverlay(final Client client, final RaidsPlugin plugin, final ItemManager itemManager, final SpriteManager spriteManager)
 	{
 		super(plugin);
 		setPosition(OverlayPosition.TOP_LEFT);
 		setPriority(OverlayPriority.LOW);
 		this.client = client;
 		this.plugin = plugin;
-		this.config = config;
 		this.itemManager = itemManager;
 		this.spriteManager = spriteManager;
 		getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY_CONFIG, OPTION_CONFIGURE, "Raids overlay"));
@@ -104,7 +106,7 @@ public class RaidsOverlay extends Overlay
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (!config.scoutOverlay() || !scoutOverlayShown || plugin.isInRaidChambers() && client.getPlane() == OLM_PLANE)
+		if (!plugin.isScoutOverlay() || !scoutOverlayShown || plugin.isInRaidChambers() && client.getPlane() == OLM_PLANE)
 		{
 			return null;
 		}
@@ -112,7 +114,7 @@ public class RaidsOverlay extends Overlay
 		scouterActive = false;
 		panelComponent.getChildren().clear();
 
-		if (config.hideBackground())
+		if (plugin.isHideBackground())
 		{
 			panelComponent.setBackgroundColor(null);
 		}
@@ -134,7 +136,7 @@ public class RaidsOverlay extends Overlay
 		Color color = Color.WHITE;
 		String layout = plugin.getRaid().getLayout().toCodeString();
 		String displayLayout;
-		if (config.displayFloorBreak())
+		if (plugin.isDisplayFloorBreak())
 		{
 			displayLayout = plugin.getRaid().getLayout().toCode();
 			displayLayout = displayLayout.substring(0, displayLayout.length() - 1).replaceAll("#", "").replaceFirst("¤", " | ");
@@ -144,7 +146,7 @@ public class RaidsOverlay extends Overlay
 			displayLayout = layout;
 		}
 
-		if (config.enableLayoutWhitelist() && !plugin.getLayoutWhitelist().contains(layout.toLowerCase()))
+		if (plugin.isEnableLayoutWhitelist() && !plugin.getLayoutWhitelist().contains(layout.toLowerCase()))
 		{
 			color = Color.RED;
 		}
@@ -160,7 +162,7 @@ public class RaidsOverlay extends Overlay
 		boolean vanguards = false;
 		boolean unknownCombat = false;
 		String puzzles = "";
-		String roomName = "";
+		String roomName;
 		for (Room layoutRoom : plugin.getRaid().getLayout().getRooms())
 		{
 			int position = layoutRoom.getPosition();
@@ -176,7 +178,7 @@ public class RaidsOverlay extends Overlay
 				case COMBAT:
 					combatCount++;
 					roomName = room.getBoss().getName();
-					switch (RaidRoom.Boss.fromString(roomName))
+					switch (Objects.requireNonNull(RaidRoom.Boss.fromString(roomName)))
 					{
 						case VANGUARDS:
 							vanguards = true;
@@ -188,7 +190,7 @@ public class RaidsOverlay extends Overlay
 					break;
 				case PUZZLE:
 					roomName = room.getPuzzle().getName();
-					switch (RaidRoom.Puzzle.fromString(roomName))
+					switch (Objects.requireNonNull(RaidRoom.Puzzle.fromString(roomName)))
 					{
 						case CRABS:
 							crabs = true;
@@ -216,7 +218,7 @@ public class RaidsOverlay extends Overlay
 			puzzles = crabs ? "cr" : iceDemon ? "ri" : thieving ? "tr" : "?r";
 		}
 
-		if ((config.hideVanguards() && vanguards) || (config.hideRopeless() && !tightrope) || (config.hideUnknownCombat() && unknownCombat))
+		if ((plugin.isHideVanguards() && vanguards) || (plugin.isHideRopeless() && !tightrope) || (plugin.isHideUnknownCombat() && unknownCombat))
 		{
 			panelComponent.getChildren().add(TitleComponent.builder()
 				.text("Bad Raid!")
@@ -227,7 +229,7 @@ public class RaidsOverlay extends Overlay
 		}
 
 		scouterActive = true;
-		displayLayout = (config.enhanceScouterTitle() ? "" + combatCount + "c " + puzzles + " " : "") + displayLayout;
+		displayLayout = (plugin.isEnhanceScouterTitle() ? "" + combatCount + "c " + puzzles + " " : "") + displayLayout;
 
 		for (Integer i : iceRooms)
 		{
@@ -259,7 +261,7 @@ public class RaidsOverlay extends Overlay
 		}
 		else
 		{
-			if (config.hideBackground())
+			if (plugin.isHideBackground())
 			{
 				panelComponent.setBackgroundColor(null);
 			}
@@ -273,7 +275,7 @@ public class RaidsOverlay extends Overlay
 		tableComponent.setColumnAlignments(TableAlignment.LEFT, TableAlignment.RIGHT);
 
 		color = Color.ORANGE;
-		if (sharable || config.alwaysShowWorldAndCC())
+		if (sharable || plugin.isAlwaysShowWorldAndCC())
 		{
 			String clanOwner = Text.removeTags(client.getWidget(WidgetInfo.CLAN_CHAT_OWNER).getText());
 			if (clanOwner.equals("None"))
@@ -289,7 +291,7 @@ public class RaidsOverlay extends Overlay
 		int bossCount = 0;
 		roomCount = 0;
 
-		if (config.enableRotationWhitelist())
+		if (plugin.isEnableRotationWhitelist())
 		{
 			bossMatches = plugin.getRotationMatches();
 		}
@@ -316,22 +318,19 @@ public class RaidsOverlay extends Overlay
 						color = Color.GREEN;
 					}
 					else if (plugin.getRoomBlacklist().contains(room.getBoss().getName().toLowerCase())
-						|| config.enableRotationWhitelist() && bossCount > bossMatches)
+						|| plugin.isEnableRotationWhitelist() && bossCount > bossMatches)
 					{
 						color = Color.RED;
 					}
 
 					String bossName = room.getBoss().getName();
 					String bossNameLC = bossName.toLowerCase();
-					if (config.showRecommendedItems())
+					if (plugin.isShowRecommendedItems() && plugin.getRecommendedItemsList().get(bossNameLC) != null)
 					{
-						if (plugin.getRecommendedItemsList().get(bossNameLC) != null)
-						{
-							imageIds.addAll(plugin.getRecommendedItemsList().get(bossNameLC));
-						}
+						imageIds.addAll(plugin.getRecommendedItemsList().get(bossNameLC));
 					}
 
-					tableComponent.addRow(config.showRecommendedItems() ? "" : room.getType().getName(), ColorUtil.prependColorTag(bossName, color));
+					tableComponent.addRow(plugin.isShowRecommendedItems() ? "" : room.getType().getName(), ColorUtil.prependColorTag(bossName, color));
 
 					break;
 
@@ -350,11 +349,11 @@ public class RaidsOverlay extends Overlay
 					{
 						color = Color.RED;
 					}
-					if (config.colorTightrope() && puzzleNameLC.equals("tightrope"))
+					if (plugin.isColorTightrope() && puzzleNameLC.equals("tightrope"))
 					{
-						color = config.tightropeColor();
+						color = plugin.getTightropeColor();
 					}
-					if (config.crabHandler() && puzzleNameLC.equals("crabs"))
+					if (plugin.isCrabHandler() && puzzleNameLC.equals("crabs"))
 					{
 						if (plugin.getGoodCrabs() == null)
 						{
@@ -365,33 +364,33 @@ public class RaidsOverlay extends Overlay
 							switch (plugin.getGoodCrabs())
 							{
 								case "Good Crabs":
-									color = config.goodCrabColor();
+									color = plugin.getGoodCrabColor();
 									break;
 								case "Rare Crabs":
-									color = config.rareCrabColor();
+									color = plugin.getRareCrabColor();
 									break;
 							}
 						}
 					}
 
-					tableComponent.addRow(config.showRecommendedItems() ? "" : room.getType().getName(), ColorUtil.prependColorTag(puzzleName, color));
+					tableComponent.addRow(plugin.isShowRecommendedItems() ? "" : room.getType().getName(), ColorUtil.prependColorTag(puzzleName, color));
 					break;
 				case FARMING:
-					if (config.showScavsFarms())
+					if (plugin.isShowScavsFarms())
 					{
 						tableComponent.addRow("", ColorUtil.prependColorTag(room.getType().getName(), new Color(181, 230, 29)));
 					}
 					break;
 				case SCAVENGERS:
-					if (config.scavsBeforeOlm() && roomCount == lastScavs)
+					if (plugin.isScavsBeforeOlm() && roomCount == lastScavs)
 					{
-						tableComponent.addRow(config.showRecommendedItems() ? "" : "OlmPrep", ColorUtil.prependColorTag("Scavs", config.scavPrepColor()));
+						tableComponent.addRow(plugin.isShowRecommendedItems() ? "" : "OlmPrep", ColorUtil.prependColorTag("Scavs", plugin.getScavPrepColor()));
 					}
-					else if (config.scavsBeforeIce() && scavsBeforeIceRooms.contains(roomCount))
+					else if (plugin.isScavsBeforeIce() && scavsBeforeIceRooms.contains(roomCount))
 					{
-						tableComponent.addRow(config.showRecommendedItems() ? "" : "IcePrep", ColorUtil.prependColorTag("Scavs", config.scavPrepColor()));
+						tableComponent.addRow(plugin.isShowRecommendedItems() ? "" : "IcePrep", ColorUtil.prependColorTag("Scavs", plugin.getScavPrepColor()));
 					}
-					else if (config.showScavsFarms())
+					else if (plugin.isShowScavsFarms())
 					{
 						tableComponent.addRow("", ColorUtil.prependColorTag("Scavs", new Color(181, 230, 29)));
 					}
@@ -407,12 +406,12 @@ public class RaidsOverlay extends Overlay
 		height = (int) panelDims.getHeight();
 
 		//add recommended items
-		if (config.showRecommendedItems() && imageIds.size() > 0)
+		if (plugin.isShowRecommendedItems() && imageIds.size() > 0)
 		{
 			panelImages.getChildren().clear();
 			Integer[] idArray = imageIds.toArray(new Integer[0]);
-			int imagesVerticalOffset = TITLE_COMPONENT_HEIGHT + (sharable || config.alwaysShowWorldAndCC() ? LINE_COMPONENT_HEIGHT : 0) - BORDER_OFFSET;
-			int imagesMaxHeight = height - 2 * BORDER_OFFSET - TITLE_COMPONENT_HEIGHT - (sharable || config.alwaysShowWorldAndCC() ? LINE_COMPONENT_HEIGHT : 0);
+			int imagesVerticalOffset = TITLE_COMPONENT_HEIGHT + (sharable || plugin.isAlwaysShowWorldAndCC() ? LINE_COMPONENT_HEIGHT : 0) - BORDER_OFFSET;
+			int imagesMaxHeight = height - 2 * BORDER_OFFSET - TITLE_COMPONENT_HEIGHT - (sharable || plugin.isAlwaysShowWorldAndCC() ? LINE_COMPONENT_HEIGHT : 0);
 			boolean smallImages = false;
 
 			panelImages.setPreferredLocation(new Point(0, imagesVerticalOffset));
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPanel.java
index 0f4e8c916b..a053396af6 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPanel.java
@@ -28,16 +28,17 @@ import java.awt.BorderLayout;
 import java.awt.FlowLayout;
 import java.awt.event.ActionEvent;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import javax.swing.BorderFactory;
 import javax.swing.JButton;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import net.runelite.api.Client;
 import net.runelite.api.GameState;
-import net.runelite.client.callback.ClientThread;
 import net.runelite.client.ui.ColorScheme;
 import net.runelite.client.ui.PluginPanel;
 
+@Singleton
 class RaidsPanel extends PluginPanel
 {
 	@Inject
@@ -45,13 +46,11 @@ class RaidsPanel extends PluginPanel
 	@Inject
 	private RaidsPlugin raidsPlugin;
 
-	@Inject
-	private ClientThread clientThread;
-	private JButton reloadButton = new JButton("Reload Instance");
-	private JButton reloadScouter = new JButton("Reload Raid Overlay");
-	private JLabel reloadMessage = new JLabel("<html><center><h3>Instance Reload Helper </h3>Reloading an instance will cause your client to disconnect temporarily.<br></center></html>");
+	private final JButton reloadButton = new JButton("Reload Instance");
+	private final JButton reloadScouter = new JButton("Reload Raid Overlay");
+	private final JLabel reloadMessage = new JLabel("<html><center><h3>Instance Reload Helper </h3>Reloading an instance will cause your client to disconnect temporarily.<br></center></html>");
 
-	void init(RaidsConfig config)
+	void init()
 	{
 
 		// this may or may not qualify as a hack
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPartyOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPartyOverlay.java
index 85295b7083..330902c22e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPartyOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPartyOverlay.java
@@ -29,6 +29,7 @@ import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.util.Set;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.ClanMember;
 import net.runelite.api.Client;
 import net.runelite.api.MenuAction;
@@ -44,6 +45,7 @@ import net.runelite.client.ui.overlay.components.table.TableAlignment;
 import net.runelite.client.ui.overlay.components.table.TableComponent;
 import net.runelite.client.util.ColorUtil;
 
+@Singleton
 public class RaidsPartyOverlay extends Overlay
 {
 	static final String PARTY_OVERLAY_RESET = "Reset missing";
@@ -56,7 +58,7 @@ public class RaidsPartyOverlay extends Overlay
 	private RaidsPlugin plugin;
 
 	@Inject
-	private RaidsPartyOverlay(RaidsPlugin plugin)
+	private RaidsPartyOverlay(final RaidsPlugin plugin)
 	{
 		super(plugin);
 		setPosition(OverlayPosition.TOP_RIGHT);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java
index 4ea46f01cd..64ae7c8661 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java
@@ -29,6 +29,7 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
 import com.google.inject.Binder;
 import com.google.inject.Provides;
+import java.awt.Color;
 import java.awt.image.BufferedImage;
 import java.text.DecimalFormat;
 import java.time.Instant;
@@ -42,6 +43,8 @@ import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.ChatMessageType;
@@ -93,6 +96,7 @@ import net.runelite.client.ui.overlay.tooltip.TooltipManager;
 import net.runelite.client.util.ImageUtil;
 import net.runelite.client.util.Text;
 import org.apache.commons.lang3.StringUtils;
+import static org.apache.commons.lang3.StringUtils.containsIgnoreCase;
 
 @PluginDescriptor(
 	name = "CoX Scouter",
@@ -101,7 +105,7 @@ import org.apache.commons.lang3.StringUtils;
 	type = PluginType.PVM,
 	enabledByDefault = false
 )
-
+@Singleton
 @Slf4j
 public class RaidsPlugin extends Plugin
 {
@@ -123,6 +127,10 @@ public class RaidsPlugin extends Plugin
 		"SCFPC.CSPCF - #WSWWNE#WSEENE" //good crabs first rare crabs second
 	);
 	private static final ImmutableSet<String> GOOD_CRABS_SECOND = ImmutableSet.of(
+		"FSCCP.PCSCF - #WNWSWN#ESEENW", //both good crabs
+		"SCSPF.CCSPF - #ESWWNW#ESENES", //both good crabs
+		"SPCFC.CSPCF - #WWNEEE#WSWNWS", //both good crabs
+		"SCPFC.CSPCF - #NEEESW#WWNEEE", //rare crabs first good crabs second
 		"SCFCP.CCSPF - #ESEENW#ESWWNW", //bad crabs first good crabs second
 		"SCPFC.CSPSF - #WWSEEE#NWSWWN", //bad crabs first good crabs second
 		"SFCCS.PCPSF - #ENWWSW#ENESEN", //bad crabs first good crabs second
@@ -136,6 +144,7 @@ public class RaidsPlugin extends Plugin
 		"SCPFC.CCPSF - #NWWWSE#WNEESE" //both rare crabs
 	);
 	private static final ImmutableSet<String> RARE_CRABS_SECOND = ImmutableSet.of(
+		"SCPFC.CCPSF - #NWWWSE#WNEESE", //both rare crabs
 		"FSCPC.CSCPF - #WNWWSE#EENWWW", //bad crabs first rare crabs second
 		"SCFPC.PCCSF - #WSEENE#WWWSEE", //bad crabs first rare crabs second
 		"SCFPC.SCPCF - #NESENE#WSWWNE", //bad crabs first rare crabs second
@@ -144,15 +153,15 @@ public class RaidsPlugin extends Plugin
 	);
 	private static final String TRIPLE_PUZZLE = "SFCCPC.PCSCPF - #WSEENES#WWWNEEE"; //good crabs first rare crabs second rare crabs third
 	private static final Pattern PUZZLES = Pattern.compile("Puzzle - (\\w+)");
-	@Getter
-	private final ArrayList<String> roomWhitelist = new ArrayList<>();
-	@Getter
-	private final ArrayList<String> roomBlacklist = new ArrayList<>();
-	@Getter
-	private final ArrayList<String> rotationWhitelist = new ArrayList<>();
-	@Getter
-	private final ArrayList<String> layoutWhitelist = new ArrayList<>();
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
+	private final List<String> roomWhitelist = new ArrayList<>();
+	@Getter(AccessLevel.PACKAGE)
+	private final List<String> roomBlacklist = new ArrayList<>();
+	@Getter(AccessLevel.PACKAGE)
+	private final List<String> rotationWhitelist = new ArrayList<>();
+	@Getter(AccessLevel.PACKAGE)
+	private final List<String> layoutWhitelist = new ArrayList<>();
+	@Getter(AccessLevel.PACKAGE)
 	private final Map<String, List<Integer>> recommendedItemsList = new HashMap<>();
 	@Inject
 	private ChatMessageManager chatMessageManager;
@@ -182,23 +191,23 @@ public class RaidsPlugin extends Plugin
 	private ClientToolbar clientToolbar;
 	@Inject
 	private ItemManager itemManager;
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private Raid raid;
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private boolean inRaidChambers;
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private String goodCrabs;
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private int startPlayerCount;
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private List<String> partyMembers = new ArrayList<>();
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private List<String> startingPartyMembers = new ArrayList<>();
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private Set<String> missingPartyMembers = new HashSet<>();
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private String layoutFullCode;
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private boolean raidStarted;
 	private int upperTime = -1;
 	private int middleTime = -1;
@@ -209,6 +218,59 @@ public class RaidsPlugin extends Plugin
 	private NavigationButton navButton;
 	private RaidsTimer timer;
 
+	@Getter(AccessLevel.PACKAGE)
+	private boolean enhanceScouterTitle;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean hideBackground;
+	private boolean raidsTimer;
+	private boolean pointsMessage;
+	private boolean ptsHr;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean scoutOverlay;
+	private boolean scoutOverlayAtBank;
+	private boolean scoutOverlayInRaid;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean displayFloorBreak;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showRecommendedItems;
+	private String recommendedItems;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean alwaysShowWorldAndCC;
+	private boolean layoutMessage;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean colorTightrope;
+	@Getter(AccessLevel.PACKAGE)
+	private Color tightropeColor;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean crabHandler;
+	@Getter(AccessLevel.PACKAGE)
+	private Color goodCrabColor;
+	@Getter(AccessLevel.PACKAGE)
+	private Color rareCrabColor;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean enableRotationWhitelist;
+	private String whitelistedRotations;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean enableLayoutWhitelist;
+	private String whitelistedLayouts;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showScavsFarms;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean scavsBeforeIce;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean scavsBeforeOlm;
+	@Getter(AccessLevel.PACKAGE)
+	private Color scavPrepColor;
+	private String whitelistedRooms;
+	private String blacklistedRooms;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean hideRopeless;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean hideVanguards;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean hideUnknownCombat;
+	private boolean partyDisplay;
+
 	@Provides
 	RaidsConfig provideConfig(ConfigManager configManager)
 	{
@@ -224,9 +286,11 @@ public class RaidsPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
+		
 		overlayManager.add(overlay);
 		overlayManager.add(pointsOverlay);
-		if (config.partyDisplay())
+		if (this.partyDisplay)
 		{
 			overlayManager.add(partyOverlay);
 		}
@@ -234,7 +298,7 @@ public class RaidsPlugin extends Plugin
 		clientThread.invokeLater(() -> checkRaidPresence(true));
 		widgetOverlay = overlayManager.getWidgetOverlay(WidgetInfo.RAIDS_POINTS_INFOBOX);
 		RaidsPanel panel = injector.getInstance(RaidsPanel.class);
-		panel.init(config);
+		panel.init();
 		final BufferedImage icon = ImageUtil.getResourceStreamFromClass(this.getClass(), "instancereloadhelper.png");
 		navButton = NavigationButton.builder()
 			.tooltip("Raids Reload")
@@ -251,7 +315,7 @@ public class RaidsPlugin extends Plugin
 		overlayManager.remove(overlay);
 		overlayManager.remove(pointsOverlay);
 		clientToolbar.removeNavigation(navButton);
-		if (config.partyDisplay())
+		if (this.partyDisplay)
 		{
 			overlayManager.remove(partyOverlay);
 		}
@@ -271,6 +335,8 @@ public class RaidsPlugin extends Plugin
 		{
 			return;
 		}
+		
+		updateConfig();
 
 		if (event.getKey().equals("raidsTimer"))
 		{
@@ -280,7 +346,7 @@ public class RaidsPlugin extends Plugin
 
 		if (event.getKey().equals("partyDisplay"))
 		{
-			if (config.partyDisplay())
+			if (this.partyDisplay)
 			{
 				overlayManager.add(partyOverlay);
 			}
@@ -314,7 +380,7 @@ public class RaidsPlugin extends Plugin
 	public void onVarbitChanged(VarbitChanged event)
 	{
 		checkRaidPresence(false);
-		if (config.partyDisplay())
+		if (this.partyDisplay)
 		{
 			updatePartyMembers(false);
 		}
@@ -330,13 +396,13 @@ public class RaidsPlugin extends Plugin
 
 			if (message.startsWith(RAID_START_MESSAGE))
 			{
-				if (config.raidsTimer())
+				if (this.raidsTimer)
 				{
 					timer = new RaidsTimer(spriteManager.getSprite(TAB_QUESTS_BROWN_RAIDING_PARTY, 0), this, Instant.now());
 					infoBoxManager.addInfoBox(timer);
 					raidStarted = true;
 				}
-				if (config.partyDisplay())
+				if (this.partyDisplay)
 				{
 					// Base this on visible players since party size shows people outside the lobby
 					// and they did not get to come on the raid
@@ -373,7 +439,7 @@ public class RaidsPlugin extends Plugin
 				int timesec = timeToSeconds(matcher.group(1));
 				updateTooltip();
 
-				if (config.pointsMessage())
+				if (this.pointsMessage)
 				{
 					int totalPoints = client.getVar(Varbits.TOTAL_POINTS);
 					int personalPoints = client.getVar(Varbits.PERSONAL_POINTS);
@@ -402,7 +468,7 @@ public class RaidsPlugin extends Plugin
 						.type(ChatMessageType.FRIENDSCHATNOTIFICATION)
 						.runeLiteFormattedMessage(chatMessage)
 						.build());
-					if (config.ptsHr())
+					if (this.ptsHr)
 					{
 						String ptssolo;
 						{
@@ -456,7 +522,7 @@ public class RaidsPlugin extends Plugin
 	@Subscribe
 	public void onClientTick(ClientTick event)
 	{
-		if (!config.raidsTimer()
+		if (!this.raidsTimer
 			|| !client.getGameState().equals(GameState.LOGGED_IN)
 			|| tooltip == null)
 		{
@@ -617,14 +683,14 @@ public class RaidsPlugin extends Plugin
 					}
 				}
 			}
-			else if (!config.scoutOverlayAtBank())
+			else if (!this.scoutOverlayAtBank)
 			{
 				setOverlayStatus(false);
 			}
 		}
 
 		// If we left party raid was started or we left raid
-		if (client.getVar(VarPlayer.IN_RAID_PARTY) == -1 && (!inRaidChambers || !config.scoutOverlayInRaid()))
+		if (client.getVar(VarPlayer.IN_RAID_PARTY) == -1 && (!inRaidChambers || !this.scoutOverlayInRaid))
 		{
 			setOverlayStatus(false);
 			raidStarted = false;
@@ -633,7 +699,7 @@ public class RaidsPlugin extends Plugin
 
 	private void sendRaidLayoutMessage()
 	{
-		if (!config.layoutMessage())
+		if (!this.layoutMessage)
 		{
 			return;
 		}
@@ -679,7 +745,7 @@ public class RaidsPlugin extends Plugin
 			return;
 		}
 
-		if (inRaidChambers && config.raidsTimer())
+		if (inRaidChambers && this.raidsTimer)
 		{
 			if (!infoBoxManager.getInfoBoxes().contains(timer))
 			{
@@ -699,11 +765,11 @@ public class RaidsPlugin extends Plugin
 
 	private void updateLists()
 	{
-		updateList(roomWhitelist, config.whitelistedRooms());
-		updateList(roomBlacklist, config.blacklistedRooms());
-		updateList(rotationWhitelist, config.whitelistedRotations());
-		updateList(layoutWhitelist, config.whitelistedLayouts());
-		updateMap(recommendedItemsList, config.recommendedItems());
+		updateList(roomWhitelist, this.whitelistedRooms);
+		updateList(roomBlacklist, this.blacklistedRooms);
+		updateList(rotationWhitelist, this.whitelistedRotations);
+		updateList(layoutWhitelist, this.whitelistedLayouts);
+		updateMap(recommendedItemsList, this.recommendedItems);
 	}
 
 	private void updateMap(Map<String, List<Integer>> map, String input)
@@ -754,11 +820,11 @@ public class RaidsPlugin extends Plugin
 		}
 	}
 
-	private void updateList(ArrayList<String> list, String input)
+	private void updateList(List<String> list, String input)
 	{
 		list.clear();
 
-		if (list == rotationWhitelist)
+		if (list.equals(rotationWhitelist))
 		{
 			Matcher m = ROTATION_REGEX.matcher(input);
 			while (m.find())
@@ -1043,10 +1109,10 @@ public class RaidsPlugin extends Plugin
 		StringBuilder builder = new StringBuilder();
 		if (seconds >= 3600)
 		{
-			builder.append((int) Math.floor(seconds / 3600) + ";");
+			builder.append((int) Math.floor(seconds / 3600)).append(";");
 		}
 		seconds %= 3600;
-		if (builder.toString().equals(""))
+		if (builder.length() == 0)
 		{
 			builder.append((int) Math.floor(seconds / 60));
 		}
@@ -1156,14 +1222,12 @@ public class RaidsPlugin extends Plugin
 
 	String recordRaid()
 	{
-		if (raid.getRotationString().toLowerCase().equals("vasa,tekton,vespula")
-			&& raid.getFullRotationString().toLowerCase().contains("crabs")
-			&& raid.getFullRotationString().toLowerCase().contains("tightrope"))
+		if (raid.getRotationString().equalsIgnoreCase("vasa,tekton,vespula")
+			&& containsIgnoreCase(raid.getFullRotationString(), "crabs")
+			&& containsIgnoreCase(raid.getFullRotationString(), "tightrope")
+			&& goodCrabs != null)
 		{
-			if (goodCrabs != null)
-			{
-				return goodCrabs;
-			}
+			return goodCrabs;
 		}
 		return null;
 	}
@@ -1172,4 +1236,40 @@ public class RaidsPlugin extends Plugin
 	{
 		overlay.setScoutOverlayShown(bool);
 	}
+	
+	private void updateConfig()
+	{
+		this.enhanceScouterTitle = config.enhanceScouterTitle();
+		this.hideBackground = config.hideBackground();
+		this.raidsTimer = config.raidsTimer();
+		this.pointsMessage = config.pointsMessage();
+		this.ptsHr = config.ptsHr();
+		this.scoutOverlay = config.scoutOverlay();
+		this.scoutOverlayAtBank = config.scoutOverlayAtBank();
+		this.scoutOverlayInRaid = config.scoutOverlayInRaid();
+		this.displayFloorBreak = config.displayFloorBreak();
+		this.showRecommendedItems = config.showRecommendedItems();
+		this.recommendedItems = config.recommendedItems();
+		this.alwaysShowWorldAndCC = config.alwaysShowWorldAndCC();
+		this.layoutMessage = config.layoutMessage();
+		this.colorTightrope = config.colorTightrope();
+		this.tightropeColor = config.tightropeColor();
+		this.crabHandler = config.crabHandler();
+		this.goodCrabColor = config.goodCrabColor();
+		this.rareCrabColor = config.rareCrabColor();
+		this.enableRotationWhitelist = config.enableRotationWhitelist();
+		this.whitelistedRotations = config.whitelistedRotations();
+		this.enableLayoutWhitelist = config.enableLayoutWhitelist();
+		this.whitelistedLayouts = config.whitelistedLayouts();
+		this.showScavsFarms = config.showScavsFarms();
+		this.scavsBeforeIce = config.scavsBeforeIce();
+		this.scavsBeforeOlm = config.scavsBeforeOlm();
+		this.scavPrepColor = config.scavPrepColor();
+		this.whitelistedRooms = config.whitelistedRooms();
+		this.blacklistedRooms = config.blacklistedRooms();
+		this.hideRopeless = config.hideRopeless();
+		this.hideVanguards = config.hideVanguards();
+		this.hideUnknownCombat = config.hideUnknownCombat();
+		this.partyDisplay = config.partyDisplay();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPointsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPointsOverlay.java
index baedb561d7..7d75264915 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPointsOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPointsOverlay.java
@@ -29,6 +29,7 @@ import java.awt.Graphics2D;
 import java.text.NumberFormat;
 import java.util.Locale;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.api.Varbits;
@@ -42,6 +43,7 @@ import net.runelite.client.ui.overlay.components.PanelComponent;
 import net.runelite.client.ui.overlay.components.table.TableAlignment;
 import net.runelite.client.ui.overlay.components.table.TableComponent;
 
+@Singleton
 public class RaidsPointsOverlay extends Overlay
 {
 	private static final NumberFormat UNIQUE_FORMAT = NumberFormat.getPercentInstance(Locale.ENGLISH);
@@ -59,7 +61,7 @@ public class RaidsPointsOverlay extends Overlay
 	private RaidsPlugin plugin;
 
 	@Inject
-	private RaidsPointsOverlay(RaidsPlugin plugin)
+	private RaidsPointsOverlay(final RaidsPlugin plugin)
 	{
 		super(plugin);
 		setPosition(OverlayPosition.TOP_RIGHT);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsTimer.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsTimer.java
index 8e7dec1309..b1cf6600ef 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsTimer.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsTimer.java
@@ -30,6 +30,7 @@ import java.time.Duration;
 import java.time.Instant;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
+import lombok.AccessLevel;
 import lombok.Setter;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.ui.overlay.infobox.InfoBox;
@@ -44,10 +45,10 @@ public class RaidsTimer extends InfoBox
 	private LocalTime thirdFloorTime;
 	private LocalTime olmTime;
 
-	@Setter
+	@Setter(AccessLevel.PACKAGE)
 	private boolean stopped;
 
-	RaidsTimer(BufferedImage image, Plugin plugin, Instant startTime)
+	RaidsTimer(final BufferedImage image, final Plugin plugin, final Instant startTime)
 	{
 		super(image, plugin);
 		this.startTime = startTime;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/shortcuts/ShortcutOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/shortcuts/ShortcutOverlay.java
index 30762daf39..2ba5cd8d1b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/shortcuts/ShortcutOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/shortcuts/ShortcutOverlay.java
@@ -5,6 +5,7 @@ import java.awt.Graphics2D;
 import java.awt.Polygon;
 import java.awt.image.BufferedImage;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.GameObject;
 import net.runelite.api.Perspective;
@@ -17,20 +18,19 @@ import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayPriority;
 
+@Singleton
 public class ShortcutOverlay extends Overlay
 {
 	private final Client client;
-	private final ShortcutConfig config;
 	private final ShortcutPlugin plugin;
 	private final BufferedImage treeIcon;
 	private final BufferedImage strengthIcon;
 	private final BufferedImage miningIcon;
 
 	@Inject
-	ShortcutOverlay(Client client, ShortcutConfig config, ShortcutPlugin plugin, SkillIconManager iconManager)
+	ShortcutOverlay(final Client client, final ShortcutPlugin plugin, final SkillIconManager iconManager)
 	{
 		this.client = client;
-		this.config = config;
 		this.plugin = plugin;
 		setPosition(OverlayPosition.DYNAMIC);
 		setPriority(OverlayPriority.LOW);
@@ -76,7 +76,7 @@ public class ShortcutOverlay extends Overlay
 						default:
 							name = "null";
 					}
-					if (config.highlightShortcuts())
+					if (plugin.isHighlightShortcuts())
 					{
 						if (name.equals("Tree"))
 						{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/shortcuts/ShortcutPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/shortcuts/ShortcutPlugin.java
index 422c85225f..b8bb023e98 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/shortcuts/ShortcutPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/shortcuts/ShortcutPlugin.java
@@ -2,13 +2,16 @@ package net.runelite.client.plugins.raids.shortcuts;
 
 import com.google.inject.Provides;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
 import net.runelite.api.TileObject;
 import net.runelite.api.coords.WorldPoint;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.GameObjectDespawned;
 import net.runelite.api.events.GameObjectSpawned;
 import net.runelite.api.events.GameTick;
@@ -24,6 +27,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	tags = {"boulder", "cox", "raids", "highlight"}
 )
 @Slf4j
+@Singleton
 public class ShortcutPlugin extends Plugin
 {
 	private final List<TileObject> shortcut = new ArrayList<>();
@@ -33,6 +37,11 @@ public class ShortcutPlugin extends Plugin
 	private OverlayManager overlayManager;
 	@Inject
 	private ShortcutOverlay overlay;
+	@Inject
+	private ShortcutConfig config;
+
+	@Getter(AccessLevel.PACKAGE)
+	private boolean highlightShortcuts;
 
 	List<TileObject> getShortcut()
 	{
@@ -48,6 +57,7 @@ public class ShortcutPlugin extends Plugin
 	@Override
 	protected void startUp()
 	{
+		this.highlightShortcuts = config.highlightShortcuts();
 		overlayManager.add(overlay);
 	}
 
@@ -80,18 +90,17 @@ public class ShortcutPlugin extends Plugin
 	@Subscribe
 	public void onGameTick(GameTick tick)
 	{
-		if (shortcut == null)
+		shortcut.removeIf(object -> object.getCanvasLocation() == null);
+	}
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (!event.getGroup().equals("shortcut"))
 		{
 			return;
 		}
-		Iterator<TileObject> it = shortcut.iterator();
-		while (it.hasNext())
-		{
-			TileObject object = it.next();
-			if (object.getCanvasLocation() == null)
-			{
-				it.remove();
-			}
-		}
+
+		this.highlightShortcuts = config.highlightShortcuts();
 	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/solver/Layout.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/solver/Layout.java
index 09357f7774..5694b2333c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/solver/Layout.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/solver/Layout.java
@@ -26,16 +26,17 @@ package net.runelite.client.plugins.raids.solver;
 
 import java.util.ArrayList;
 import java.util.List;
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
 
 public class Layout
 {
-	@Getter
+	@Getter(AccessLevel.PUBLIC)
 	private final List<Room> rooms = new ArrayList<>();
 
-	@Getter
-	@Setter
+	@Getter(AccessLevel.PUBLIC)
+	@Setter(AccessLevel.PACKAGE)
 	private String code;
 
 	public void add(Room room)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/solver/LayoutSolver.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/solver/LayoutSolver.java
index f53de67596..a189d78ca7 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/solver/LayoutSolver.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/solver/LayoutSolver.java
@@ -29,6 +29,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 
@@ -50,7 +51,7 @@ import lombok.extern.slf4j.Slf4j;
 @Singleton
 public class LayoutSolver
 {
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private static final List<Layout> layouts = new ArrayList<>();
 	private static final Pattern regex = Pattern.compile("^([A-Z]*)\\.([A-Z]*) - #([A-Z]*)#([A-Z]*)$");
 	private static final String[] codes =
@@ -211,7 +212,10 @@ public class LayoutSolver
 
 				room = new Room(position, '¤');
 				room.setPrevious(lastRoom);
-				lastRoom.setNext(room);
+				if (lastRoom != null)
+				{
+					lastRoom.setNext(room);
+				}
 				layout.add(room);
 				layout.setCode(code);
 				position += 8;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/solver/Room.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/solver/Room.java
index 4ffa7efb60..ab231774ed 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/solver/Room.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/solver/Room.java
@@ -24,26 +24,27 @@
  */
 package net.runelite.client.plugins.raids.solver;
 
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
 
 public class Room
 {
-	@Getter
+	@Getter(AccessLevel.PUBLIC)
 	private final int position;
 
-	@Getter
+	@Getter(AccessLevel.PUBLIC)
 	private final char symbol;
 
-	@Getter
-	@Setter
+	@Getter(AccessLevel.PACKAGE)
+	@Setter(AccessLevel.PACKAGE)
 	private Room next;
 
-	@Getter
-	@Setter
+	@Getter(AccessLevel.PACKAGE)
+	@Setter(AccessLevel.PACKAGE)
 	private Room previous;
 
-	Room(int position, char symbol)
+	Room(final int position, final char symbol)
 	{
 		this.position = position;
 		this.symbol = symbol;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/solver/RotationSolver.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/solver/RotationSolver.java
index 04e0323a5c..e53a7326c0 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/solver/RotationSolver.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/solver/RotationSolver.java
@@ -40,14 +40,14 @@ public class RotationSolver
 			new Rotation<>(Arrays.asList(Boss.MYSTICS, Boss.VANGUARDS, Boss.VASA, Boss.SHAMANS, Boss.VESPULA, Boss.GUARDIANS, Boss.MUTTADILES, Boss.TEKTON))
 		};
 
-	public static boolean solve(RaidRoom[] rooms)
+	public static void solve(RaidRoom[] rooms)
 	{
 		if (rooms == null)
 		{
-			return false;
+			return;
 		}
 
-		Rotation<Boss> match = null;
+		Rotation match = null;
 		Integer start = null;
 		Integer index = null;
 		int known = 0;
@@ -69,12 +69,12 @@ public class RotationSolver
 
 		if (known < 2)
 		{
-			return false;
+			return;
 		}
 
 		if (known == rooms.length)
 		{
-			return true;
+			return;
 		}
 
 		for (Rotation rotation : ROTATIONS)
@@ -97,9 +97,9 @@ public class RotationSolver
 						}
 					}
 
-					if (match != null && match != rotation)
+					if (match != null && match.equals(rotation))
 					{
-						return false;
+						return;
 					}
 
 					index = i - start;
@@ -110,7 +110,7 @@ public class RotationSolver
 
 		if (match == null)
 		{
-			return false;
+			return;
 		}
 
 		for (int i = 0; i < rooms.length; i++)
@@ -122,16 +122,15 @@ public class RotationSolver
 
 			if (rooms[i].getBoss() == null || rooms[i].getBoss() == Boss.UNKNOWN)
 			{
-				rooms[i].setBoss(match.get(index + i));
+				rooms[i].setBoss((Boss) match.get(index + i));
 			}
 		}
 
-		return true;
 	}
 
 	private static class Rotation<E> extends ArrayList<E>
 	{
-		Rotation(Collection<? extends E> bosses)
+		Rotation(final Collection<? extends E> bosses)
 		{
 			super(bosses);
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/BatSolver.java b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/BatSolver.java
index e937633dc8..efef1cb773 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/BatSolver.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/BatSolver.java
@@ -29,6 +29,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.TreeSet;
 import static net.runelite.client.plugins.raidsthieving.BatSolver.SolutionSet.SOLUTION_SETS;
 
@@ -37,9 +38,9 @@ public class BatSolver
 	private Map<Integer, Integer> numberOfSolutionsWithPoison;
 	private final SolutionSet solution;
 
-	private final HashSet<Integer> grubsChests;
+	private final Set<Integer> grubsChests;
 
-	public BatSolver(ThievingRoomType roomType)
+	public BatSolver(final ThievingRoomType roomType)
 	{
 		solution = new SolutionSet(roomType);
 		grubsChests = new HashSet<>();
@@ -59,9 +60,9 @@ public class BatSolver
 		calculateChanceOfPoison();
 	}
 
-	public TreeSet<Integer> matchSolutions()
+	public Set<Integer> matchSolutions()
 	{
-		TreeSet<Integer> possibleEmptyChests = new TreeSet<>();
+		Set<Integer> possibleEmptyChests = new TreeSet<>();
 		for (SolutionSet knownSolution : SolutionSet.SOLUTION_SETS)
 		{
 			if (knownSolution.getType() == solution.getType() && matchSolution(knownSolution))
@@ -100,7 +101,7 @@ public class BatSolver
 		return matchesAll && everMatched;
 	}
 
-	public ThievingRoomType getType()
+	private ThievingRoomType getType()
 	{
 		return solution.getType();
 	}
@@ -185,9 +186,4 @@ public class BatSolver
 		double chestChance = (double) (timesFound) / (double) (mostFrequentPoison);
 		return 1. / (1 + Math.exp(5 - 10 * chestChance));
 	}
-
-	public int getNumberOfEmptyChests()
-	{
-		return solution.getEmptyChests().size();
-	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/ChestIdentifier.java b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/ChestIdentifier.java
index 8e9bce1dc4..9e25a8b5d0 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/ChestIdentifier.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/ChestIdentifier.java
@@ -31,7 +31,7 @@ import net.runelite.client.plugins.raidsthieving.ThievingChest;
 
 public class ChestIdentifier
 {
-	public ChestIdentifier(ThievingRoomType roomType)
+	public ChestIdentifier(final ThievingRoomType roomType)
 	{
 		chestIds = new HashMap<>();
 		switch (roomType)
@@ -250,12 +250,11 @@ public class ChestIdentifier
 
 	}
 
-	public int indentifyChest(ThievingChest chest)
+	public void indentifyChest(ThievingChest chest)
 	{
 		int id = chestIds.get(chest.getInstancePoint());
 		chest.setChestId(id);
-		return id;
 	}
 
-	private Map<InstancePoint, Integer> chestIds;
+	private final Map<InstancePoint, Integer> chestIds;
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/SolutionSet.java b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/SolutionSet.java
index 82c36163e4..9b0df5be86 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/SolutionSet.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/SolutionSet.java
@@ -27,6 +27,7 @@ package net.runelite.client.plugins.raidsthieving.BatSolver;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
+import lombok.AccessLevel;
 import lombok.Getter;
 
 // Each Thieving room has 4 empty chests
@@ -135,7 +136,7 @@ class SolutionSet
 			new SolutionSet(ThievingRoomType.STRAIGHT, 51, 53, 56, 59)
 		};
 
-	SolutionSet(ThievingRoomType type)
+	SolutionSet(final ThievingRoomType type)
 	{
 		this.type = type;
 		emptyChests = new HashSet<>();
@@ -157,9 +158,9 @@ class SolutionSet
 		return emptyChests.contains(chestId);
 	}
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private ThievingRoomType type;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private Set<Integer> emptyChests;
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/ThievingRoomType.java b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/ThievingRoomType.java
index 26fabe5a8c..66581b5314 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/ThievingRoomType.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/BatSolver/ThievingRoomType.java
@@ -38,7 +38,7 @@ public enum ThievingRoomType
 	private final int x;
 	private final int y;
 
-	ThievingRoomType(int x, int y)
+	ThievingRoomType(final int x, final int y)
 	{
 		this.x = x;
 		this.y = y;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/ChestOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/ChestOverlay.java
index 077132dc61..4ac35ebf47 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/ChestOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/ChestOverlay.java
@@ -28,8 +28,9 @@ import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.util.Map;
-import java.util.TreeSet;
+import java.util.Set;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.Perspective;
 import net.runelite.api.Point;
@@ -40,25 +41,25 @@ import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.components.ProgressPieComponent;
+import static net.runelite.client.util.ColorUtil.setAlphaComponent;
 
 /**
  * Represents the overlay that shows timers on traps that are placed by the
  * player.
  */
+@Singleton
 public class ChestOverlay extends Overlay
 {
 
 	private final Client client;
 	private final RaidsThievingPlugin plugin;
-	private final RaidsThievingConfig config;
 
 	@Inject
-	ChestOverlay(Client client, RaidsThievingPlugin plugin, RaidsThievingConfig config)
+	ChestOverlay(final Client client, final RaidsThievingPlugin plugin)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_SCENE);
 		this.plugin = plugin;
-		this.config = config;
 		this.client = client;
 	}
 
@@ -93,20 +94,14 @@ public class ChestOverlay extends Overlay
 
 			if (chest != null)
 			{
-				if (!plugin.isBatsFound() && !chest.isEverOpened())
+				if (!plugin.isBatsFound() && !chest.isEverOpened() && shouldDrawChest(pos))
 				{
-					if (shouldDrawChest(pos))
-					{
-						Color drawColor = new Color(config.getPotentialBatColor().getRed(),
-							config.getPotentialBatColor().getGreen(),
-							config.getPotentialBatColor().getBlue(),
-							getChestOpacity(pos));
-						drawCircleOnTrap(graphics, chest, drawColor);
-					}
+					Color drawColor = new Color(setAlphaComponent(plugin.getGetPotentialBatColor().getRGB(), getChestOpacity(pos)));
+					drawCircleOnTrap(graphics, chest, drawColor);
 				}
 				if (chest.isPoison())
 				{
-					drawCircleOnTrap(graphics, chest, config.getPoisonTrapColor());
+					drawCircleOnTrap(graphics, chest, plugin.getGetPoisonTrapColor());
 				}
 			}
 		}
@@ -122,7 +117,7 @@ public class ChestOverlay extends Overlay
 		BatSolver solver = plugin.getSolver();
 		if (solver != null && chestId != -1)
 		{
-			TreeSet<Integer> matches = solver.matchSolutions();
+			Set<Integer> matches = solver.matchSolutions();
 			return matches.contains(chestId) || matches.size() == 0;
 		}
 		return true;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/InstancePoint.java b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/InstancePoint.java
index b1ba3e0102..7b6da0a445 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/InstancePoint.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/InstancePoint.java
@@ -1,6 +1,7 @@
 package net.runelite.client.plugins.raidsthieving;
 
 import java.util.Objects;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.Client;
 import net.runelite.api.Point;
@@ -9,20 +10,20 @@ import net.runelite.api.coords.WorldPoint;
 /**
  * Represents a point in the instance chunk, invariant of rotation.
  */
-@Getter
+@Getter(AccessLevel.PACKAGE)
 public class InstancePoint
 {
 	private static final int CHUNK_SIZE = 8;
 	private static final double CHUNK_OFFSET = 3.5;
 
-	private InstancePoint(int x, int y, int rot)
+	private InstancePoint(final int x, final int y, final int rot)
 	{
 		this.x = x;
 		this.y = y;
 		this.rot = rot;
 	}
 
-	public InstancePoint(int x, int y)
+	public InstancePoint(final int x, final int y)
 	{
 		this.x = x;
 		this.y = y;
@@ -97,7 +98,9 @@ public class InstancePoint
 		return Objects.hash(x, y);
 	}
 
+	@Getter(AccessLevel.PUBLIC)
 	private int x;
+	@Getter(AccessLevel.PUBLIC)
 	private int y;
 	private int rot;
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/RaidsThievingConstants.java b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/RaidsThievingConstants.java
index 8ab527ebe8..a898ef4df0 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/RaidsThievingConstants.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/RaidsThievingConstants.java
@@ -24,7 +24,7 @@
  */
 package net.runelite.client.plugins.raidsthieving;
 
-public class RaidsThievingConstants
+class RaidsThievingConstants
 {
 	static final int CLOSED_CHEST_ID = 29742;
 	static final int OPEN_EMPTY_CHEST = 29743;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/RaidsThievingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/RaidsThievingPlugin.java
index a7679b985a..5df929535f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/RaidsThievingPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/RaidsThievingPlugin.java
@@ -25,11 +25,14 @@
 package net.runelite.client.plugins.raidsthieving;
 
 import com.google.inject.Provides;
+import java.awt.Color;
 import java.text.MessageFormat;
 import java.time.Instant;
 import java.util.HashMap;
 import java.util.Map;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
@@ -60,7 +63,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	type = PluginType.PVM,
 	enabledByDefault = false
 )
-
+@Singleton
 public class RaidsThievingPlugin extends Plugin
 {
 	@Inject
@@ -78,23 +81,29 @@ public class RaidsThievingPlugin extends Plugin
 	@Inject
 	private RaidsThievingConfig config;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final Map<WorldPoint, ThievingChest> chests = new HashMap<>();
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private Instant lastActionTime = Instant.ofEpochMilli(0);
 
 	private boolean inRaidChambers;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private boolean batsFound;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private BatSolver solver;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private ChestIdentifier mapper;
 
+	@Getter(AccessLevel.PACKAGE)
+	private Color getPotentialBatColor;
+	@Getter(AccessLevel.PACKAGE)
+	private Color getPoisonTrapColor;
+	private boolean batFoundNotify;
+
 
 	@Provides
 	RaidsThievingConfig provideConfig(ConfigManager configManager)
@@ -105,6 +114,8 @@ public class RaidsThievingPlugin extends Plugin
 	@Override
 	protected void startUp()
 	{
+		updateConfig();
+
 		overlayManager.add(overlay);
 		overlay.updateConfig();
 		reset();
@@ -229,6 +240,7 @@ public class RaidsThievingPlugin extends Plugin
 	{
 		if (event.getGroup().equals("raidsthievingplugin"))
 		{
+			updateConfig();
 			overlay.updateConfig();
 		}
 	}
@@ -261,7 +273,7 @@ public class RaidsThievingPlugin extends Plugin
 			if (chest.isEmpty() && !chest.isPoison())
 			{
 				batsFound = true;
-				if (config.batFoundNotify())
+				if (this.batFoundNotify)
 				{
 					notifier.notify("Bats have been found!");
 				}
@@ -275,5 +287,12 @@ public class RaidsThievingPlugin extends Plugin
 	{
 		return chests.get(worldPoint).getChestId();
 	}
+
+	private void updateConfig()
+	{
+		this.getPotentialBatColor = config.getPotentialBatColor();
+		this.getPoisonTrapColor = config.getPoisonTrapColor();
+		this.batFoundNotify = config.batFoundNotify();
+	}
 }
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/ThievingChest.java b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/ThievingChest.java
index 05a58d554e..f508fc42cc 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/ThievingChest.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/ThievingChest.java
@@ -24,6 +24,7 @@
  */
 package net.runelite.client.plugins.raidsthieving;
 
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
 import net.runelite.api.GameObject;
@@ -32,32 +33,33 @@ import net.runelite.api.coords.WorldPoint;
 /**
  * Wrapper class for a GameObject that represents a chest in the thieving room of Chambers of Xeric.
  */
-@Getter
+@Getter(AccessLevel.PACKAGE)
 public class ThievingChest
 {
 	/**
 	 * If the chest has never been opened, it could have bats.
 	 */
-	@Setter
+	@Setter(AccessLevel.PACKAGE)
 	private boolean everOpened;
 
 	/**
 	 * If the chest is empty, it could have bats.
 	 */
-	@Setter
+	@Setter(AccessLevel.PACKAGE)
 	private boolean empty;
 
 	/**
 	 * If the chest contains a poison trap instead.
 	 */
-	@Setter
+	@Setter(AccessLevel.PACKAGE)
 	private boolean poison;
 
 
-	@Setter
+	@Setter(AccessLevel.PUBLIC)
 	private int chestId;
 
 	private final WorldPoint localPoint;
+	@Getter(AccessLevel.PUBLIC)
 	private final InstancePoint instancePoint;
 
 	/**
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/regenmeter/RegenMeterOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/regenmeter/RegenMeterOverlay.java
index bff5f7c398..f95edccb1b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/regenmeter/RegenMeterOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/regenmeter/RegenMeterOverlay.java
@@ -33,6 +33,7 @@ import java.awt.RenderingHints;
 import java.awt.Stroke;
 import java.awt.geom.Arc2D;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.VarPlayer;
 import net.runelite.api.widgets.Widget;
@@ -41,6 +42,7 @@ import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 
+@Singleton
 public class RegenMeterOverlay extends Overlay
 {
 	private static final Color HITPOINTS_COLOR = brighter(0x9B0703);
@@ -48,10 +50,20 @@ public class RegenMeterOverlay extends Overlay
 	private static final Color OVERLAY_COLOR = new Color(255, 255, 255, 60);
 	private static final double DIAMETER = 26D;
 	private static final int OFFSET = 27;
+	private static final Stroke STROKE = new BasicStroke(2f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER);
 
 	private final Client client;
-	private RegenMeterPlugin plugin;
-	private RegenMeterConfig config;
+	private final RegenMeterPlugin plugin;
+
+	private Rectangle getBounds(WidgetInfo widgetInfo)
+	{
+		Widget widget = client.getWidget(widgetInfo);
+		if (widget == null || widget.isHidden())
+		{
+			return null;
+		}
+		return widget.getBounds();
+	}
 
 	private static Color brighter(int color)
 	{
@@ -61,13 +73,12 @@ public class RegenMeterOverlay extends Overlay
 	}
 
 	@Inject
-	public RegenMeterOverlay(Client client, RegenMeterPlugin plugin, RegenMeterConfig config)
+	public RegenMeterOverlay(final Client client, final RegenMeterPlugin plugin)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_WIDGETS);
 		this.client = client;
 		this.plugin = plugin;
-		this.config = config;
 	}
 
 	@Override
@@ -75,20 +86,18 @@ public class RegenMeterOverlay extends Overlay
 	{
 		g.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_PURE);
 
-		if (config.showHitpoints())
+		if (plugin.isShowHitpoints())
 		{
 			renderRegen(g, WidgetInfo.MINIMAP_HEALTH_ORB, plugin.getHitpointsPercentage(), HITPOINTS_COLOR);
 		}
 
-		if (config.showSpecial())
+		if (plugin.isShowSpecial())
 		{
 			if (client.getVar(VarPlayer.SPECIAL_ATTACK_ENABLED) == 1)
 			{
-				final Widget widget = client.getWidget(WidgetInfo.MINIMAP_SPEC_ORB);
-
-				if (widget != null && !widget.isHidden())
+				final Rectangle bounds = getBounds(WidgetInfo.MINIMAP_SPEC_ORB);
+				if (bounds != null)
 				{
-					final Rectangle bounds = widget.getBounds();
 					g.setColor(RegenMeterOverlay.OVERLAY_COLOR);
 					g.fillOval(
 						bounds.x + OFFSET,
@@ -105,17 +114,13 @@ public class RegenMeterOverlay extends Overlay
 
 	private void renderRegen(Graphics2D g, WidgetInfo widgetInfo, double percent, Color color)
 	{
-		Widget widget = client.getWidget(widgetInfo);
-		if (widget == null || widget.isHidden())
+		final Rectangle bounds = getBounds(widgetInfo);
+		if (bounds != null)
 		{
-			return;
+			Arc2D.Double arc = new Arc2D.Double(bounds.x + OFFSET, bounds.y + (bounds.height / 2 - DIAMETER / 2), DIAMETER, DIAMETER, 90.d, -360.d * percent, Arc2D.OPEN);
+			g.setStroke(STROKE);
+			g.setColor(color);
+			g.draw(arc);
 		}
-		Rectangle bounds = widget.getBounds();
-
-		Arc2D.Double arc = new Arc2D.Double(bounds.x + OFFSET, bounds.y + (bounds.height / 2D - DIAMETER / 2D), DIAMETER, DIAMETER, 90.d, -360.d * percent, Arc2D.OPEN);
-		final Stroke STROKE = new BasicStroke(2f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER);
-		g.setStroke(STROKE);
-		g.setColor(color);
-		g.draw(arc);
 	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/regenmeter/RegenMeterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/regenmeter/RegenMeterPlugin.java
index 004441b6e3..cc5b57e8ed 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/regenmeter/RegenMeterPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/regenmeter/RegenMeterPlugin.java
@@ -29,6 +29,8 @@ package net.runelite.client.plugins.regenmeter;
 
 import com.google.inject.Provides;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.Client;
 import net.runelite.api.Constants;
@@ -36,6 +38,7 @@ import net.runelite.api.GameState;
 import net.runelite.api.Prayer;
 import net.runelite.api.Skill;
 import net.runelite.api.VarPlayer;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.GameStateChanged;
 import net.runelite.api.events.GameTick;
 import net.runelite.api.events.VarbitChanged;
@@ -51,6 +54,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	description = "Track and show the hitpoints and special attack regeneration timers",
 	tags = {"combat", "health", "hitpoints", "special", "attack", "overlay", "notifications"}
 )
+@Singleton
 public class RegenMeterPlugin extends Plugin
 {
 	private static final int SPEC_REGEN_TICKS = 50;
@@ -71,16 +75,23 @@ public class RegenMeterPlugin extends Plugin
 	@Inject
 	private RegenMeterConfig config;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private double hitpointsPercentage;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private double specialPercentage;
 
 	private int ticksSinceSpecRegen;
 	private int ticksSinceHPRegen;
 	private boolean wasRapidHeal;
 
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showHitpoints;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showSpecial;
+	private boolean showWhenNoChange;
+	private int getNotifyBeforeHpRegenSeconds;
+
 	@Provides
 	RegenMeterConfig provideConfig(ConfigManager configManager)
 	{
@@ -90,6 +101,7 @@ public class RegenMeterPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
 		overlayManager.add(overlay);
 	}
 
@@ -146,7 +158,7 @@ public class RegenMeterPlugin extends Plugin
 
 		int currentHP = client.getBoostedSkillLevel(Skill.HITPOINTS);
 		int maxHP = client.getRealSkillLevel(Skill.HITPOINTS);
-		if (currentHP == maxHP && !config.showWhenNoChange())
+		if (currentHP == maxHP && !this.showWhenNoChange)
 		{
 			hitpointsPercentage = 0;
 		}
@@ -156,7 +168,7 @@ public class RegenMeterPlugin extends Plugin
 			hitpointsPercentage = 1 - hitpointsPercentage;
 		}
 
-		if (config.getNotifyBeforeHpRegenSeconds() > 0 && currentHP < maxHP && shouldNotifyHpRegenThisTick(ticksPerHPRegen))
+		if (this.getNotifyBeforeHpRegenSeconds > 0 && currentHP < maxHP && shouldNotifyHpRegenThisTick(ticksPerHPRegen))
 		{
 			notifier.notify("[" + client.getLocalPlayer().getName() + "] regenerates their next hitpoint soon!");
 		}
@@ -166,7 +178,24 @@ public class RegenMeterPlugin extends Plugin
 	{
 		// if the configured duration lies between two ticks, choose the earlier tick
 		final int ticksBeforeHPRegen = ticksPerHPRegen - ticksSinceHPRegen;
-		final int notifyTick = (int) Math.ceil(config.getNotifyBeforeHpRegenSeconds() * 1000d / Constants.GAME_TICK_LENGTH);
+		final int notifyTick = (int) Math.ceil(this.getNotifyBeforeHpRegenSeconds * 1000d / Constants.GAME_TICK_LENGTH);
 		return ticksBeforeHPRegen == notifyTick;
 	}
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (event.getGroup().equals("regenmeter"))
+		{
+			updateConfig();
+		}
+	}
+
+	private void updateConfig()
+	{
+		this.showHitpoints = config.showHitpoints();
+		this.showSpecial = config.showSpecial();
+		this.showWhenNoChange = config.showWhenNoChange();
+		this.getNotifyBeforeHpRegenSeconds = config.getNotifyBeforeHpRegenSeconds();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/reorderprayers/ReorderPrayersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/reorderprayers/ReorderPrayersPlugin.java
index 2d95269eb5..deec5d3ec6 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/reorderprayers/ReorderPrayersPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/reorderprayers/ReorderPrayersPlugin.java
@@ -31,6 +31,7 @@ import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.GameState;
 import net.runelite.api.HashTable;
@@ -57,6 +58,7 @@ import net.runelite.client.plugins.PluginDescriptor;
 	name = "Reorder Prayers",
 	description = "Reorder the prayers displayed on the Prayer panel"
 )
+@Singleton
 public class ReorderPrayersPlugin extends Plugin
 {
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/reportbutton/ReportButtonPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/reportbutton/ReportButtonPlugin.java
index b633a89b10..8a0f91e692 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/reportbutton/ReportButtonPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/reportbutton/ReportButtonPlugin.java
@@ -36,8 +36,10 @@ import java.time.format.FormatStyle;
 import java.time.temporal.ChronoUnit;
 import java.util.Date;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.GameState;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.GameStateChanged;
 import net.runelite.api.widgets.Widget;
 import net.runelite.api.widgets.WidgetInfo;
@@ -53,6 +55,7 @@ import net.runelite.client.task.Schedule;
 	description = "Replace the text on the Report button with the current time",
 	tags = {"time", "utc"}
 )
+@Singleton
 public class ReportButtonPlugin extends Plugin
 {
 	private static final ZoneId UTC = ZoneId.of("UTC");
@@ -73,6 +76,8 @@ public class ReportButtonPlugin extends Plugin
 	@Inject
 	private ReportButtonConfig config;
 
+	private TimeStyle timeStyle;
+
 	@Provides
 	ReportButtonConfig provideConfig(ConfigManager configManager)
 	{
@@ -82,6 +87,7 @@ public class ReportButtonPlugin extends Plugin
 	@Override
 	public void startUp()
 	{
+		this.timeStyle = config.time();
 		clientThread.invoke(this::updateReportButtonTime);
 	}
 
@@ -142,7 +148,7 @@ public class ReportButtonPlugin extends Plugin
 			return;
 		}
 
-		switch (config.time())
+		switch (this.timeStyle)
 		{
 			case UTC:
 				reportButton.setText(getUTCTime());
@@ -198,4 +204,13 @@ public class ReportButtonPlugin extends Plugin
 	{
 		return DATE_FORMAT.format(new Date());
 	}
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (event.getGroup().equals("regenmeter"))
+		{
+			this.timeStyle = config.time();
+		}
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/reportbutton/TimeStyle.java b/runelite-client/src/main/java/net/runelite/client/plugins/reportbutton/TimeStyle.java
index 40095b9a4f..b67549faf8 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/reportbutton/TimeStyle.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/reportbutton/TimeStyle.java
@@ -35,7 +35,7 @@ public enum TimeStyle
 
 	private final String name;
 
-	TimeStyle(String name)
+	TimeStyle(final String name)
 	{
 		this.name = name;
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/Obstacles.java b/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/Obstacles.java
index e518f4814b..59c2c9428e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/Obstacles.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/Obstacles.java
@@ -42,7 +42,7 @@ import static net.runelite.api.ObjectID.WALL_7249;
 
 class Obstacles
 {
-	public static final Set<Integer> OBSTACLE_IDS_HULL = Sets.newHashSet(
+	static final Set<Integer> OBSTACLE_IDS_HULL = Sets.newHashSet(
 		SPINNING_BLADES_7224,
 		CONTORTION_BARS,
 		PENDULUM,
@@ -52,7 +52,7 @@ class Obstacles
 		NULL_7235    /*Wall safe*/
 	);
 
-	public static final Set<Integer> OBSTACLE_IDS_TILE = Sets.newHashSet(
+	static final Set<Integer> OBSTACLE_IDS_TILE = Sets.newHashSet(
 		FLOOR,        /*Floor spikes*/
 		WALL_7228,    /*Wall spikes*/
 		WALL_7229,    /*Wall spears*/
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/RoguesDenOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/RoguesDenOverlay.java
index 4b5cc234e1..e76f6c4f70 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/RoguesDenOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/RoguesDenOverlay.java
@@ -29,12 +29,14 @@ import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.awt.Polygon;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.coords.LocalPoint;
 import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 
+@Singleton
 public class RoguesDenOverlay extends Overlay
 {
 	private static final int MAX_DISTANCE = 2350;
@@ -43,7 +45,7 @@ public class RoguesDenOverlay extends Overlay
 	private final RoguesDenPlugin plugin;
 
 	@Inject
-	public RoguesDenOverlay(Client client, RoguesDenPlugin plugin)
+	public RoguesDenOverlay(final Client client, final RoguesDenPlugin plugin)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_SCENE);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/RoguesDenPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/RoguesDenPlugin.java
index 138ee3d9ac..163682223b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/RoguesDenPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/RoguesDenPlugin.java
@@ -25,7 +25,9 @@
 package net.runelite.client.plugins.roguesden;
 
 import java.util.HashMap;
+import java.util.Map;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.Client;
@@ -53,13 +55,14 @@ import net.runelite.client.ui.overlay.OverlayManager;
 		description = "Mark tiles and clickboxes to help traverse the maze",
 		tags = {"agility", "maze", "minigame", "overlay", "thieving"}
 )
+@Singleton
 public class RoguesDenPlugin extends Plugin
 {
 	@Getter(AccessLevel.PACKAGE)
-	private final HashMap<TileObject, Tile> obstaclesHull = new HashMap<>();
+	private final Map<TileObject, Tile> obstaclesHull = new HashMap<>();
 
 	@Getter(AccessLevel.PACKAGE)
-	private final HashMap<TileObject, Tile> obstaclesTile = new HashMap<>();
+	private final Map<TileObject, Tile> obstaclesTile = new HashMap<>();
 
 	@Getter(AccessLevel.PACKAGE)
 	private boolean hasGem;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/AbyssOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/AbyssOverlay.java
index b0e2bb0b99..aafce938f3 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/AbyssOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/AbyssOverlay.java
@@ -25,6 +25,7 @@
 package net.runelite.client.plugins.runecraft;
 
 import com.google.inject.Inject;
+import com.google.inject.Singleton;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
@@ -59,6 +60,7 @@ import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayUtil;
 
+@Singleton
 class AbyssOverlay extends Overlay
 {
 	private static final Dimension IMAGE_SIZE = new Dimension(15, 14);
@@ -68,25 +70,23 @@ class AbyssOverlay extends Overlay
 
 	private final Client client;
 	private final RunecraftPlugin plugin;
-	private final RunecraftConfig config;
 
 	@Inject
 	private ItemManager itemManager;
 
 	@Inject
-	AbyssOverlay(Client client, RunecraftPlugin plugin, RunecraftConfig config)
+	AbyssOverlay(final Client client, final RunecraftPlugin plugin)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_WIDGETS);
 		this.client = client;
 		this.plugin = plugin;
-		this.config = config;
 	}
 
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (config.showRifts())
+		if (plugin.isShowRifts())
 		{
 			for (DecorativeObject object : plugin.getAbyssObjects())
 			{
@@ -94,7 +94,7 @@ class AbyssOverlay extends Overlay
 			}
 		}
 
-		if (config.hightlightDarkMage())
+		if (plugin.isHightlightDarkMage())
 		{
 			highlightDarkMage(graphics);
 		}
@@ -132,7 +132,7 @@ class AbyssOverlay extends Overlay
 			return;
 		}
 
-		if (config.showClickBox())
+		if (plugin.isShowClickBox())
 		{
 			//Draw clickbox
 			Point mousePosition = client.getMouseCanvasPosition();
@@ -163,7 +163,7 @@ class AbyssOverlay extends Overlay
 		}
 	}
 
-	public BufferedImage getImage(AbyssRifts rift)
+	private BufferedImage getImage(AbyssRifts rift)
 	{
 		BufferedImage image = abyssIcons.get(rift);
 		if (image != null)
@@ -185,55 +185,55 @@ class AbyssOverlay extends Overlay
 	public void updateConfig()
 	{
 		rifts.clear();
-		if (config.showAir())
+		if (plugin.isShowAir())
 		{
 			rifts.add(AIR_RIFT);
 		}
-		if (config.showBlood())
+		if (plugin.isShowBlood())
 		{
 			rifts.add(BLOOD_RIFT);
 		}
-		if (config.showBody())
+		if (plugin.isShowBody())
 		{
 			rifts.add(BODY_RIFT);
 		}
-		if (config.showChaos())
+		if (plugin.isShowChaos())
 		{
 			rifts.add(CHAOS_RIFT);
 		}
-		if (config.showCosmic())
+		if (plugin.isShowCosmic())
 		{
 			rifts.add(COSMIC_RIFT);
 		}
-		if (config.showDeath())
+		if (plugin.isShowDeath())
 		{
 			rifts.add(DEATH_RIFT);
 		}
-		if (config.showEarth())
+		if (plugin.isShowEarth())
 		{
 			rifts.add(EARTH_RIFT);
 		}
-		if (config.showFire())
+		if (plugin.isShowFire())
 		{
 			rifts.add(FIRE_RIFT);
 		}
-		if (config.showLaw())
+		if (plugin.isShowLaw())
 		{
 			rifts.add(LAW_RIFT);
 		}
-		if (config.showMind())
+		if (plugin.isShowMind())
 		{
 			rifts.add(MIND_RIFT);
 		}
-		if (config.showNature())
+		if (plugin.isShowNature())
 		{
 			rifts.add(NATURE_RIFT);
 		}
-		if (config.showSoul())
+		if (plugin.isShowSoul())
 		{
 			rifts.add(SOUL_RIFT);
 		}
-		if (config.showWater())
+		if (plugin.isShowWater())
 		{
 			rifts.add(WATER_RIFT);
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/AbyssRifts.java b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/AbyssRifts.java
index e9546e3cee..20bc229b32 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/AbyssRifts.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/AbyssRifts.java
@@ -26,6 +26,7 @@ package net.runelite.client.plugins.runecraft;
 
 import java.util.HashMap;
 import java.util.Map;
+import lombok.AccessLevel;
 import lombok.Getter;
 import static net.runelite.api.ItemID.*;
 import net.runelite.api.ObjectID;
@@ -46,10 +47,10 @@ public enum AbyssRifts
 	SOUL_RIFT(ObjectID.SOUL_RIFT, SOUL_RUNE),
 	WATER_RIFT(ObjectID.WATER_RIFT, WATER_RUNE);
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final int objectId;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final int itemId;
 
 	private static final Map<Integer, AbyssRifts> rifts = new HashMap<>();
@@ -62,7 +63,7 @@ public enum AbyssRifts
 		}
 	}
 
-	AbyssRifts(int objectId, int itemId)
+	AbyssRifts(final int objectId, final int itemId)
 	{
 		this.objectId = objectId;
 		this.itemId = itemId;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftOverlay.java
index 91a95bb885..f78880bc84 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftOverlay.java
@@ -4,24 +4,23 @@ import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
-import net.runelite.api.Client;
+import javax.inject.Singleton;
 import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.components.ComponentOrientation;
 import net.runelite.client.ui.overlay.components.PanelComponent;
 import net.runelite.client.ui.overlay.components.TitleComponent;
 
+@Singleton
 public class RunecraftOverlay extends Overlay
 {
 	private final RunecraftPlugin plugin;
-	private final Client client;
 	private final PanelComponent panel = new PanelComponent();
 
 	@Inject
-	RunecraftOverlay(RunecraftPlugin plugin, Client client)
+	RunecraftOverlay(final RunecraftPlugin plugin)
 	{
 		this.plugin = plugin;
-		this.client = client;
 		setPosition(OverlayPosition.CANVAS_TOP_RIGHT);
 		panel.setOrientation(ComponentOrientation.VERTICAL);
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftPlugin.java
index b653a56fb2..29f3ae2523 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftPlugin.java
@@ -31,6 +31,7 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Stream;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.ChatMessageType;
@@ -69,6 +70,7 @@ import net.runelite.client.util.Text;
 	description = "Show minimap icons and clickboxes for abyssal rifts",
 	tags = {"abyssal", "minimap", "overlay", "rifts", "rc", "runecrafting"}
 )
+@Singleton
 public class RunecraftPlugin extends Plugin
 {
 	private static final int FIRE_ALTAR = 10315;
@@ -113,6 +115,43 @@ public class RunecraftPlugin extends Plugin
 	@Inject
 	private MenuManager menuManager;
 
+	private boolean Lavas;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean essPouch;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean hightlightDarkMage;
+	private boolean degradingNotification;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showRifts;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showAir;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showBlood;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showBody;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showChaos;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showCosmic;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showDeath;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showEarth;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showFire;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showLaw;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showMind;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showNature;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showSoul;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showWater;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showClickBox;
+
 	@Provides
 	RunecraftConfig getConfig(ConfigManager configManager)
 	{
@@ -122,6 +161,8 @@ public class RunecraftPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
+
 		overlayManager.add(abyssOverlay);
 		abyssOverlay.updateConfig();
 		overlayManager.add(runecraftOverlay);
@@ -147,6 +188,8 @@ public class RunecraftPlugin extends Plugin
 			return;
 		}
 
+		updateConfig();
+
 		if (event.getKey().equals("essPouch"))
 		{
 			addSwaps();
@@ -163,12 +206,9 @@ public class RunecraftPlugin extends Plugin
 			return;
 		}
 
-		if (config.degradingNotification())
+		if (this.degradingNotification && event.getMessage().contains(POUCH_DECAYED_MESSAGE))
 		{
-			if (event.getMessage().contains(POUCH_DECAYED_MESSAGE))
-			{
-				notifier.notify(POUCH_DECAYED_NOTIFICATION_MESSAGE);
-			}
+			notifier.notify(POUCH_DECAYED_NOTIFICATION_MESSAGE);
 		}
 	}
 
@@ -294,8 +334,8 @@ public class RunecraftPlugin extends Plugin
 		else if (event.getItemContainer() == client.getItemContainer(InventoryID.EQUIPMENT))
 		{
 			final Item[] items = event.getItemContainer().getItems();
-			wearingTiara = config.Lavas() && items[EquipmentInventorySlot.HEAD.getSlotIdx()].getId() == ItemID.FIRE_TIARA;
-			wearingCape = config.Lavas() && items[EquipmentInventorySlot.CAPE.getSlotIdx()].getId() == ItemID.RUNECRAFT_CAPE || config.Lavas() && items[EquipmentInventorySlot.CAPE.getSlotIdx()].getId() == ItemID.RUNECRAFT_CAPET || config.Lavas() && items[EquipmentInventorySlot.CAPE.getSlotIdx()].getId() == ItemID.MAX_CAPE_13342;
+			wearingTiara = this.Lavas && items[EquipmentInventorySlot.HEAD.getSlotIdx()].getId() == ItemID.FIRE_TIARA;
+			wearingCape = this.Lavas && items[EquipmentInventorySlot.CAPE.getSlotIdx()].getId() == ItemID.RUNECRAFT_CAPE || config.Lavas() && items[EquipmentInventorySlot.CAPE.getSlotIdx()].getId() == ItemID.RUNECRAFT_CAPET || config.Lavas() && items[EquipmentInventorySlot.CAPE.getSlotIdx()].getId() == ItemID.MAX_CAPE_13342;
 		}
 	}
 
@@ -313,7 +353,7 @@ public class RunecraftPlugin extends Plugin
 	public void onNpcDespawned(NpcDespawned event)
 	{
 		final NPC npc = event.getNpc();
-		if (npc == darkMage)
+		if (npc != null && npc.equals(darkMage))
 		{
 			darkMage = null;
 		}
@@ -338,4 +378,27 @@ public class RunecraftPlugin extends Plugin
 		menuManager.removeSwap("deposit", "pouch", 2, 57, "fill", "pouch", 9, 1007);
 		menuManager.removeSwap("fill", "pouch", "empty", "pouch", true, false);
 	}
+
+	private void updateConfig()
+	{
+		this.Lavas = config.Lavas();
+		this.essPouch = config.essPouch();
+		this.hightlightDarkMage = config.hightlightDarkMage();
+		this.degradingNotification = config.degradingNotification();
+		this.showRifts = config.showRifts();
+		this.showAir = config.showAir();
+		this.showBlood = config.showBlood();
+		this.showBody = config.showBody();
+		this.showChaos = config.showChaos();
+		this.showCosmic = config.showCosmic();
+		this.showDeath = config.showDeath();
+		this.showEarth = config.showEarth();
+		this.showFire = config.showFire();
+		this.showLaw = config.showLaw();
+		this.showMind = config.showMind();
+		this.showNature = config.showNature();
+		this.showSoul = config.showSoul();
+		this.showWater = config.showWater();
+		this.showClickBox = config.showClickBox();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuConfig.java
index 0e44decfa0..ab4face95a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuConfig.java
@@ -35,10 +35,10 @@ public interface RunedokuConfig extends Config
 {
 
 	@ConfigItem(
-			position = 0,
-			keyName = "colorStub",
-			name = "Colors",
-			description = "" //stubs don't show descriptions when hovered over
+		position = 0,
+		keyName = "colorStub",
+		name = "Colors",
+		description = "" //stubs don't show descriptions when hovered over
 	)
 	default Stub colorStub()
 	{
@@ -46,11 +46,11 @@ public interface RunedokuConfig extends Config
 	}
 
 	@ConfigItem(
-			position = 1,
-			keyName = "mindRuneColor",
-			name = "Mind Rune Color",
-			description = "Color used to highlight Mind runes.",
-			parent = "colorStub"
+		position = 1,
+		keyName = "mindRuneColor",
+		name = "Mind Rune Color",
+		description = "Color used to highlight Mind runes.",
+		parent = "colorStub"
 	)
 	default Color mindRuneColor()
 	{
@@ -58,11 +58,11 @@ public interface RunedokuConfig extends Config
 	}
 
 	@ConfigItem(
-			position = 2,
-			keyName = "fireRuneColor",
-			name = "Fire Rune Color",
-			description = "Color used to highlight Fire runes.",
-			parent = "colorStub"
+		position = 2,
+		keyName = "fireRuneColor",
+		name = "Fire Rune Color",
+		description = "Color used to highlight Fire runes.",
+		parent = "colorStub"
 	)
 	default Color fireRuneColor()
 	{
@@ -70,11 +70,11 @@ public interface RunedokuConfig extends Config
 	}
 
 	@ConfigItem(
-			position = 3,
-			keyName = "bodyRuneColor",
-			name = "Body Rune Color",
-			description = "Color used to highlight Body runes.",
-			parent = "colorStub"
+		position = 3,
+		keyName = "bodyRuneColor",
+		name = "Body Rune Color",
+		description = "Color used to highlight Body runes.",
+		parent = "colorStub"
 	)
 	default Color bodyRuneColor()
 	{
@@ -82,11 +82,11 @@ public interface RunedokuConfig extends Config
 	}
 
 	@ConfigItem(
-			position = 4,
-			keyName = "airRuneColor",
-			name = "Air Rune Color",
-			description = "Color used to highlight Air runes.",
-			parent = "colorStub"
+		position = 4,
+		keyName = "airRuneColor",
+		name = "Air Rune Color",
+		description = "Color used to highlight Air runes.",
+		parent = "colorStub"
 	)
 	default Color airRuneColor()
 	{
@@ -94,11 +94,11 @@ public interface RunedokuConfig extends Config
 	}
 
 	@ConfigItem(
-			position = 5,
-			keyName = "deathRuneColor",
-			name = "Death Rune Color",
-			description = "Color used to highlight Death runes.",
-			parent = "colorStub"
+		position = 5,
+		keyName = "deathRuneColor",
+		name = "Death Rune Color",
+		description = "Color used to highlight Death runes.",
+		parent = "colorStub"
 	)
 	default Color deathRuneColor()
 	{
@@ -106,11 +106,11 @@ public interface RunedokuConfig extends Config
 	}
 
 	@ConfigItem(
-			position = 6,
-			keyName = "waterRuneColor",
-			name = "Water Rune Color",
-			description = "Color used to highlight Water runes.",
-			parent = "colorStub"
+		position = 6,
+		keyName = "waterRuneColor",
+		name = "Water Rune Color",
+		description = "Color used to highlight Water runes.",
+		parent = "colorStub"
 	)
 	default Color waterRuneColor()
 	{
@@ -118,11 +118,11 @@ public interface RunedokuConfig extends Config
 	}
 
 	@ConfigItem(
-			position = 7,
-			keyName = "chaosRuneColor",
-			name = "Chaos Rune Color",
-			description = "Color used to highlight Chaos runes.",
-			parent = "colorStub"
+		position = 7,
+		keyName = "chaosRuneColor",
+		name = "Chaos Rune Color",
+		description = "Color used to highlight Chaos runes.",
+		parent = "colorStub"
 	)
 	default Color chaosRuneColor()
 	{
@@ -130,11 +130,11 @@ public interface RunedokuConfig extends Config
 	}
 
 	@ConfigItem(
-			position = 8,
-			keyName = "earthRuneColor",
-			name = "Earth Rune Color",
-			description = "Color used to highlight Earth runes.",
-			parent = "colorStub"
+		position = 8,
+		keyName = "earthRuneColor",
+		name = "Earth Rune Color",
+		description = "Color used to highlight Earth runes.",
+		parent = "colorStub"
 	)
 	default Color earthRuneColor()
 	{
@@ -142,11 +142,11 @@ public interface RunedokuConfig extends Config
 	}
 
 	@ConfigItem(
-			position = 9,
-			keyName = "lawRuneColor",
-			name = "Law Rune Color",
-			description = "Color used to highlight Law runes.",
-			parent = "colorStub"
+		position = 9,
+		keyName = "lawRuneColor",
+		name = "Law Rune Color",
+		description = "Color used to highlight Law runes.",
+		parent = "colorStub"
 	)
 	default Color lawRuneColor()
 	{
@@ -154,10 +154,10 @@ public interface RunedokuConfig extends Config
 	}
 
 	@ConfigItem(
-			position = 10,
-			keyName = "miscFeature",
-			name = "Miscellaneous Features",
-			description = ""
+		position = 10,
+		keyName = "miscFeature",
+		name = "Miscellaneous Features",
+		description = ""
 	)
 	default Stub miscFeature()
 	{
@@ -165,10 +165,10 @@ public interface RunedokuConfig extends Config
 	}
 
 	@ConfigItem(
-			position = 11,
-			keyName = "onlyHighlightSelectedPiece",
-			name = "Only Highlight Selected Piece",
-			description = "Instead of showing all, this option only show what rune you have selected."
+		position = 11,
+		keyName = "onlyHighlightSelectedPiece",
+		name = "Only Highlight Selected Piece",
+		description = "Instead of showing all, this option only show what rune you have selected."
 	)
 	default boolean onlyHighlightSelectedPiece()
 	{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuOverlay.java
index 5e44e55bee..593151484a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuOverlay.java
@@ -28,8 +28,9 @@ import java.awt.Color;
 import static java.awt.Color.RED;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
-import java.util.ArrayList;
+import java.util.List;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.widgets.Widget;
 import net.runelite.client.ui.overlay.Overlay;
@@ -41,23 +42,22 @@ import net.runelite.client.ui.overlay.OverlayUtil;
 /**
  * @author gazivodag
  */
+@Singleton
 class RunedokuOverlay extends Overlay
 {
 
 	private final RunedokuPlugin plugin;
 	private final Client client;
 	private final RunedokuUtil util;
-	private final RunedokuConfig config;
 
 
 	@Inject
-	private RunedokuOverlay(final RunedokuPlugin plugin, final Client client, final RunedokuUtil util, final RunedokuConfig config)
+	private RunedokuOverlay(final RunedokuPlugin plugin, final Client client, final RunedokuUtil util)
 	{
 		super(plugin);
 		this.plugin = plugin;
 		this.client = client;
 		this.util = util;
-		this.config = config;
 
 		setPosition(OverlayPosition.DETACHED);
 		setLayer(OverlayLayer.ALWAYS_ON_TOP);
@@ -70,17 +70,13 @@ class RunedokuOverlay extends Overlay
 
 		final Widget sudokuScreen = client.getWidget(288, 131);
 
-		if (sudokuScreen != null)
+		if (sudokuScreen != null && !sudokuScreen.isHidden())
 		{
-			if (!sudokuScreen.isHidden())
-			{
-				Sudoku sudoku = new Sudoku(util.createTable(client));
-				boolean solved = sudoku.solve();
-
-				renderReferenceRunes(graphics, solved);
-				renderSolvedPuzzle(graphics, sudoku, solved);
-			}
+			Sudoku sudoku = new Sudoku(util.createTable(client));
+			boolean solved = sudoku.solve();
 
+			renderReferenceRunes(graphics, solved);
+			renderSolvedPuzzle(graphics, sudoku, solved);
 		}
 
 		return null;
@@ -126,7 +122,7 @@ class RunedokuOverlay extends Overlay
 	 */
 	private void renderSolvedPuzzle(Graphics2D graphics, Sudoku sudoku, boolean solved)
 	{
-		ArrayList<Integer> simpleArr = util.makeSimple(sudoku.getBoard());
+		List<Integer> simpleArr = util.makeSimple(sudoku.getBoard());
 		//highlight each cell to tell you which piece to place
 		int iteration = 0;
 		for (int i = 10; i < 91; i++)
@@ -140,7 +136,7 @@ class RunedokuOverlay extends Overlay
 				}
 				else
 				{
-					if (!config.onlyHighlightSelectedPiece() ^ (config.onlyHighlightSelectedPiece() && util.getSelectedPiece(client) == simpleArr.get(iteration)))
+					if (!plugin.isOnlyHighlightSelectedPiece() ^ (plugin.isOnlyHighlightSelectedPiece() && util.getSelectedPiece(client) == simpleArr.get(iteration)))
 					{
 						OverlayUtil.renderPolygon(graphics, RunedokuUtil.rectangleToPolygon(squareToHighlight.getBounds()), util.sudokuPieceToColor(simpleArr.get(iteration)));
 					}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuPiece.java b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuPiece.java
index 7a6f50ab08..d19b5845b1 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuPiece.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuPiece.java
@@ -51,13 +51,13 @@ public enum RunedokuPiece
 	private final int pieceID;
 	private final int pieceForSudoku;
 
-	RunedokuPiece(int pieceID, int pieceForSudoku)
+	RunedokuPiece(final int pieceID, final int pieceForSudoku)
 	{
 		this.pieceID = pieceID;
 		this.pieceForSudoku = pieceForSudoku;
 	}
 
-	int getId()
+	private int getId()
 	{
 		return pieceID;
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuPlugin.java
index e441779a7a..3fa8214b50 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuPlugin.java
@@ -25,11 +25,15 @@
 package net.runelite.client.plugins.runedoku;
 
 import com.google.inject.Provides;
+import java.awt.Color;
 import javax.inject.Inject;
 import javax.inject.Singleton;
+import lombok.AccessLevel;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
-import net.runelite.api.Client;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.client.config.ConfigManager;
+import net.runelite.client.eventbus.Subscribe;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginDescriptor;
 import net.runelite.client.plugins.PluginType;
@@ -47,13 +51,6 @@ import net.runelite.client.ui.overlay.OverlayManager;
 @Singleton
 public class RunedokuPlugin extends Plugin
 {
-
-	@Inject
-	private Client client;
-
-	@Inject
-	RunedokuUtil util;
-
 	@Inject
 	private OverlayManager overlayManager;
 
@@ -63,6 +60,27 @@ public class RunedokuPlugin extends Plugin
 	@Inject
 	private RunedokuConfig config;
 
+	@Getter(AccessLevel.PACKAGE)
+	private Color mindRuneColor;
+	@Getter(AccessLevel.PACKAGE)
+	private Color fireRuneColor;
+	@Getter(AccessLevel.PACKAGE)
+	private Color bodyRuneColor;
+	@Getter(AccessLevel.PACKAGE)
+	private Color airRuneColor;
+	@Getter(AccessLevel.PACKAGE)
+	private Color deathRuneColor;
+	@Getter(AccessLevel.PACKAGE)
+	private Color waterRuneColor;
+	@Getter(AccessLevel.PACKAGE)
+	private Color chaosRuneColor;
+	@Getter(AccessLevel.PACKAGE)
+	private Color earthRuneColor;
+	@Getter(AccessLevel.PACKAGE)
+	private Color lawRuneColor;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean onlyHighlightSelectedPiece;
+
 	@Provides
 	RunedokuConfig provideConfig(ConfigManager configManager)
 	{
@@ -72,6 +90,7 @@ public class RunedokuPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
 		overlayManager.add(runedokuOverlay);
 	}
 
@@ -81,4 +100,28 @@ public class RunedokuPlugin extends Plugin
 		overlayManager.remove(runedokuOverlay);
 	}
 
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (!event.getGroup().equals("runedoku"))
+		{
+			return;
+		}
+
+		updateConfig();
+	}
+
+	private void updateConfig()
+	{
+		this.mindRuneColor = config.mindRuneColor();
+		this.fireRuneColor = config.fireRuneColor();
+		this.bodyRuneColor = config.bodyRuneColor();
+		this.airRuneColor = config.airRuneColor();
+		this.deathRuneColor = config.deathRuneColor();
+		this.waterRuneColor = config.waterRuneColor();
+		this.chaosRuneColor = config.chaosRuneColor();
+		this.earthRuneColor = config.earthRuneColor();
+		this.lawRuneColor = config.lawRuneColor();
+		this.onlyHighlightSelectedPiece = config.onlyHighlightSelectedPiece();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuUtil.java b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuUtil.java
index 36c5ac5662..1687eb5a05 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuUtil.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuUtil.java
@@ -28,6 +28,8 @@ import java.awt.Color;
 import java.awt.Polygon;
 import java.awt.Rectangle;
 import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 import javax.inject.Inject;
 import net.runelite.api.Client;
 import net.runelite.api.widgets.Widget;
@@ -36,12 +38,12 @@ import net.runelite.api.widgets.WidgetItem;
 class RunedokuUtil
 {
 
-	private final RunedokuConfig config;
+	private final RunedokuPlugin plugin;
 
 	@Inject
-	RunedokuUtil(final RunedokuConfig config)
+	RunedokuUtil(final RunedokuPlugin plugin)
 	{
-		this.config = config;
+		this.plugin = plugin;
 	}
 
 	Color sudokuPieceToColor(int i)
@@ -49,23 +51,23 @@ class RunedokuUtil
 		switch (i)
 		{
 			case 1:
-				return config.mindRuneColor();
+				return plugin.getMindRuneColor();
 			case 2:
-				return config.fireRuneColor();
+				return plugin.getFireRuneColor();
 			case 3:
-				return config.bodyRuneColor();
+				return plugin.getBodyRuneColor();
 			case 4:
-				return config.airRuneColor();
+				return plugin.getAirRuneColor();
 			case 5:
-				return config.deathRuneColor();
+				return plugin.getDeathRuneColor();
 			case 6:
-				return config.waterRuneColor();
+				return plugin.getWaterRuneColor();
 			case 7:
-				return config.chaosRuneColor();
+				return plugin.getChaosRuneColor();
 			case 8:
-				return config.earthRuneColor();
+				return plugin.getEarthRuneColor();
 			case 9:
-				return config.lawRuneColor();
+				return plugin.getLawRuneColor();
 			default:
 				return Color.RED;
 		}
@@ -76,23 +78,23 @@ class RunedokuUtil
 		switch (i)
 		{
 			case 121: //earth
-				return config.earthRuneColor();
+				return plugin.getEarthRuneColor();
 			case 122: //water
-				return config.waterRuneColor();
+				return plugin.getWaterRuneColor();
 			case 123: //air
-				return config.airRuneColor();
+				return plugin.getAirRuneColor();
 			case 124: //mind
-				return config.mindRuneColor();
+				return plugin.getMindRuneColor();
 			case 125: //fire
-				return config.fireRuneColor();
+				return plugin.getFireRuneColor();
 			case 126: //body
-				return config.bodyRuneColor();
+				return plugin.getBodyRuneColor();
 			case 127: //death
-				return config.deathRuneColor();
+				return plugin.getDeathRuneColor();
 			case 128: //chaos
-				return config.chaosRuneColor();
-			case 129: //law
-				return config.lawRuneColor();
+				return plugin.getChaosRuneColor();
+			case 129: //plugin
+				return plugin.getLawRuneColor();
 			default:
 				return Color.RED;
 		}
@@ -104,9 +106,9 @@ class RunedokuUtil
 	 * @param board
 	 * @return
 	 */
-	ArrayList<Integer> makeSimple(int[][] board)
+	List<Integer> makeSimple(int[][] board)
 	{
-		ArrayList<Integer> list = new ArrayList<>();
+		List<Integer> list = new ArrayList<>();
 		for (int i = 0; i < 9; i++)
 		{
 			for (int ii = 0; ii < 9; ii++)
@@ -123,7 +125,7 @@ class RunedokuUtil
 	 * @param rect
 	 * @return
 	 */
-	public static Polygon rectangleToPolygon(Rectangle rect)
+	static Polygon rectangleToPolygon(Rectangle rect)
 	{
 		int[] xpoints = {rect.x, rect.x + rect.width, rect.x + rect.width, rect.x};
 		int[] ypoints = {rect.y, rect.y, rect.y + rect.height, rect.y + rect.height};
@@ -164,7 +166,7 @@ class RunedokuUtil
 				{
 					if (item.getId() != -1)
 					{
-						myArr[i][ii] = RunedokuPiece.getById(item.getId()).getPieceForSudoku();
+						myArr[i][ii] = Objects.requireNonNull(RunedokuPiece.getById(item.getId())).getPieceForSudoku();
 					}
 					else
 					{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/Sudoku.java b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/Sudoku.java
index a6b2f339de..53711c8dc4 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/Sudoku.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/Sudoku.java
@@ -5,22 +5,19 @@ package net.runelite.client.plugins.runedoku;
  *
  * @author ?
  */
-public class Sudoku
+class Sudoku
 {
 
-	private int[][] board;
-	public static final int EMPTY = 0;
-	public static final int SIZE = 9;
+	private final int[][] board;
+	private static final int EMPTY = 0;
+	private static final int SIZE = 9;
 
-	Sudoku(int[][] board)
+	Sudoku(final int[][] board)
 	{
 		this.board = new int[SIZE][SIZE];
 		for (int i = 0; i < SIZE; i++)
 		{
-			for (int j = 0; j < SIZE; j++)
-			{
-				this.board[i][j] = board[i][j];
-			}
+			System.arraycopy(board[i], 0, this.board[i], 0, SIZE);
 		}
 	}
 
@@ -74,7 +71,7 @@ public class Sudoku
 		return !isInRow(row, number) && !isInCol(col, number) && !isInBox(row, col, number);
 	}
 
-	public boolean solve()
+	boolean solve()
 	{
 		for (int row = 0; row < SIZE; row++)
 		{
@@ -105,18 +102,7 @@ public class Sudoku
 		return true;
 	}
 
-	public void display()
-	{
-		for (int i = 0; i < SIZE; i++)
-		{
-			for (int j = 0; j < SIZE; j++)
-			{
-				System.out.print(" " + board[i][j]);
-			}
-		}
-	}
-
-	public int[][] getBoard()
+	int[][] getBoard()
 	{
 		return board;
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java
index 289940cb8f..0b7ffb8271 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java
@@ -26,37 +26,32 @@
  */
 package net.runelite.client.plugins.runeliteplus;
 
-import com.google.inject.Provides;
-
 import java.awt.event.KeyEvent;
 import javax.inject.Inject;
-
+import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
+import static net.runelite.api.ScriptID.BANK_PIN_OP;
 import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.ScriptCallbackEvent;
 import net.runelite.api.widgets.WidgetID;
-import net.runelite.api.widgets.WidgetInfo;
-import net.runelite.client.RuneLiteProperties;
+import static net.runelite.api.widgets.WidgetInfo.*;
 import net.runelite.client.callback.ClientThread;
-import net.runelite.client.config.ConfigManager;
+import net.runelite.client.config.RuneLitePlusConfig;
 import net.runelite.client.discord.DiscordService;
 import net.runelite.client.eventbus.Subscribe;
 import net.runelite.client.input.KeyListener;
 import net.runelite.client.input.KeyManager;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginDescriptor;
-import net.runelite.client.plugins.PluginType;
 import net.runelite.client.ui.ClientUI;
 
 @PluginDescriptor(
-		loadWhenOutdated = true, // prevent users from disabling
-		hidden = true, // prevent users from disabling
-		name = "RuneLitePlus",
-		description = "Configures various aspects of RuneLitePlus",
-		type = PluginType.EXTERNAL
+	loadWhenOutdated = true, // prevent users from disabling
+	hidden = true, // prevent users from disabling
+	name = "RunelitePlus"
 )
-
+@Singleton
 @Slf4j
 public class RuneLitePlusPlugin extends Plugin
 {
@@ -95,41 +90,11 @@ public class RuneLitePlusPlugin extends Plugin
 		}
 	}
 
-	/* Can't feed this as args to runscript?
-	private static final int[] widgetArgs = new int[]
-		{
-			WidgetInfo.BANK_PIN_EXIT_BUTTON.getId(),
-			WidgetInfo.BANK_PIN_FORGOT_BUTTON.getId(),
-			WidgetInfo.BANK_PIN_1.getId(),
-			WidgetInfo.BANK_PIN_2.getId(),
-			WidgetInfo.BANK_PIN_3.getId(),
-			WidgetInfo.BANK_PIN_4.getId(),
-			WidgetInfo.BANK_PIN_5.getId(),
-			WidgetInfo.BANK_PIN_6.getId(),
-			WidgetInfo.BANK_PIN_7.getId(),
-			WidgetInfo.BANK_PIN_8.getId(),
-			WidgetInfo.BANK_PIN_9.getId(),
-			WidgetInfo.BANK_PIN_0.getId(),
-			WidgetInfo.BANK_PIN_EXIT_BUTTON.getId(),
-			WidgetInfo.BANK_PIN_FORGOT_BUTTON.getId(),
-			WidgetInfo.BANK_PIN_FIRST_ENTERED.getId(),
-			WidgetInfo.BANK_PIN_SECOND_ENTERED.getId(),
-			WidgetInfo.BANK_PIN_THIRD_ENTERED.getId(),
-			WidgetInfo.BANK_PIN_FOURTH_ENTERED.getId(),
-			WidgetInfo.BANK_PIN_INSTRUCTION_TEXT.getId()
-		};*/
-	public static boolean customPresenceEnabled = false;
-	public static final String rlPlusDiscordApp = "560644885250572289";
-	public static final String rlDiscordApp = "409416265891971072";
+	@Inject
+	private RuneLitePlusConfig config;
 
 	@Inject
-	public RuneLitePlusConfig config;
-
-	@Inject
-	private ConfigManager configManager;
-
-	@Inject
-	public DiscordService discordService;
+	private DiscordService discordService;
 
 	@Inject
 	private KeyManager keyManager;
@@ -140,13 +105,7 @@ public class RuneLitePlusPlugin extends Plugin
 	@Inject
 	private ClientThread clientThread;
 
-	@Provides
-	RuneLitePlusConfig getConfig(ConfigManager configManager)
-	{
-		return configManager.getConfig(RuneLitePlusConfig.class);
-	}
-
-	private RuneLitePlusKeyListener keyListener = new RuneLitePlusKeyListener();
+	private final RuneLitePlusKeyListener keyListener = new RuneLitePlusKeyListener();
 	private int entered = -1;
 	private int enterIdx;
 	private boolean expectInput;
@@ -158,11 +117,11 @@ public class RuneLitePlusPlugin extends Plugin
 		{
 			ClientUI.currentPresenceName = ("RuneLitePlus");
 			ClientUI.frame.setTitle(ClientUI.currentPresenceName);
-			RuneLiteProperties.discordAppID = rlPlusDiscordApp;
-			discordService.close();
-			discordService.init();
 		}
 
+		discordService.close();
+		discordService.init();
+
 		entered = -1;
 		enterIdx = 0;
 		expectInput = false;
@@ -182,7 +141,6 @@ public class RuneLitePlusPlugin extends Plugin
 			{
 				ClientUI.currentPresenceName = ("RuneLitePlus");
 				ClientUI.frame.setTitle(ClientUI.currentPresenceName);
-				RuneLiteProperties.discordAppID = rlPlusDiscordApp;
 				discordService.close();
 				discordService.init();
 			}
@@ -190,7 +148,6 @@ public class RuneLitePlusPlugin extends Plugin
 			{
 				ClientUI.currentPresenceName = ("RuneLite");
 				ClientUI.frame.setTitle(ClientUI.currentPresenceName);
-				RuneLiteProperties.discordAppID = rlDiscordApp;
 				discordService.close();
 				discordService.init();
 			}
@@ -252,13 +209,11 @@ public class RuneLitePlusPlugin extends Plugin
 
 	private void handleKey(char c)
 	{
-		if (client.getWidget(WidgetID.BANK_PIN_GROUP_ID, 0) == null
-				|| !client.getWidget(WidgetInfo.BANK_PIN_TOP_LEFT_TEXT).getText().equals("Bank of Gielinor")
-				&& !client.getWidget(WidgetInfo.BANK_PIN_TOP_LEFT_TEXT).getText().equals("Chambers of Xeric")
-				&& !client.getWidget(WidgetInfo.BANK_PIN_TOP_LEFT_TEXT).getText().equals("Grand Exchange")
-				&& !client.getWidget(WidgetInfo.BANK_PIN_TOP_LEFT_TEXT).getText().equals("Housing Security System")
-				&& !client.getWidget(WidgetInfo.BANK_PIN_TOP_LEFT_TEXT).getText().equals("Dominic's Coffer")
-				&& !client.getWidget(WidgetInfo.BANK_PIN_TOP_LEFT_TEXT).getText().equals("Dominic's Reward Shop"))
+		if (client.getWidget(WidgetID.BANK_PIN_GROUP_ID, BANK_PIN_INSTRUCTION_TEXT.getChildId()) == null
+				|| !client.getWidget(BANK_PIN_INSTRUCTION_TEXT).getText().equals("First click the FIRST digit.")
+				&& !client.getWidget(BANK_PIN_INSTRUCTION_TEXT).getText().equals("Now click the SECOND digit.")
+				&& !client.getWidget(BANK_PIN_INSTRUCTION_TEXT).getText().equals("Time for the THIRD digit.")
+				&& !client.getWidget(BANK_PIN_INSTRUCTION_TEXT).getText().equals("Finally, the FOURTH digit."))
 
 		{
 			entered = 0;
@@ -280,7 +235,7 @@ public class RuneLitePlusPlugin extends Plugin
 
 		// Script 685 will call 653, which in turn will set expectInput to true
 		expectInput = false;
-		client.runScript(685, num, enterIdx, entered, 13959181, 13959183, 13959184, 13959186, 13959188, 13959190, 13959192, 13959194, 13959196, 13959198, 13959200, 13959202, 13959171, 13959172, 13959173, 13959174, 13959178);
+		client.runScript(BANK_PIN_OP, num, enterIdx, entered, BANK_PIN_EXIT_BUTTON.getId(), BANK_PIN_FORGOT_BUTTON.getId(), BANK_PIN_1.getId(), BANK_PIN_2.getId(), BANK_PIN_3.getId(), BANK_PIN_4.getId(), BANK_PIN_5.getId(), BANK_PIN_6.getId(), BANK_PIN_7.getId(), BANK_PIN_8.getId(), BANK_PIN_9.getId(), BANK_PIN_0.getId(), BANK_PIN_FIRST_ENTERED.getId(), BANK_PIN_SECOND_ENTERED.getId(), BANK_PIN_THIRD_ENTERED.getId(), BANK_PIN_FOURTH_ENTERED.getId(), BANK_PIN_INSTRUCTION_TEXT.getId());
 
 		if (oldEnterIdx == 0)
 		{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runenergy/RunEnergyOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/runenergy/RunEnergyOverlay.java
index 9ca4c40d6b..258fc98211 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/runenergy/RunEnergyOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/runenergy/RunEnergyOverlay.java
@@ -28,6 +28,7 @@ import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.awt.Rectangle;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.Point;
 import net.runelite.api.widgets.Widget;
@@ -39,6 +40,7 @@ import net.runelite.client.ui.overlay.tooltip.Tooltip;
 import net.runelite.client.ui.overlay.tooltip.TooltipManager;
 import org.apache.commons.lang3.StringUtils;
 
+@Singleton
 class RunEnergyOverlay extends Overlay
 {
 	private final RunEnergyPlugin plugin;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runenergy/RunEnergyPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/runenergy/RunEnergyPlugin.java
index 52170baa4e..8ef9debda1 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/runenergy/RunEnergyPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/runenergy/RunEnergyPlugin.java
@@ -27,6 +27,7 @@ package net.runelite.client.plugins.runenergy;
 import com.google.common.collect.ImmutableSet;
 import com.google.inject.Provides;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.Constants;
 import net.runelite.api.EquipmentInventorySlot;
@@ -145,6 +146,7 @@ import org.apache.commons.lang3.StringUtils;
 	description = "Show various information related to run energy",
 	tags = {"overlay", "stamina"}
 )
+@Singleton
 public class RunEnergyPlugin extends Plugin
 {
 	// TODO It would be nice if we have the IDs for just the equipped variants of the Graceful set items.
@@ -333,7 +335,6 @@ public class RunEnergyPlugin extends Plugin
 		}
 
 		// Calculate the number of seconds left
-		final double secondsLeft = (100 - client.getEnergy()) / recoverRate;
-		return (int) secondsLeft;
+		return (int) ((100 - client.getEnergy()) / recoverRate);
 	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java
index deec35072a..f587c38818 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchOverlay.java
@@ -29,6 +29,7 @@ import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.ItemID;
 import net.runelite.api.Point;
@@ -44,6 +45,7 @@ import net.runelite.client.ui.overlay.tooltip.Tooltip;
 import net.runelite.client.ui.overlay.tooltip.TooltipManager;
 import net.runelite.client.util.ColorUtil;
 
+@Singleton
 public class RunepouchOverlay extends WidgetItemOverlay
 {
 	private static final Varbits[] AMOUNT_VARBITS =
@@ -57,18 +59,18 @@ public class RunepouchOverlay extends WidgetItemOverlay
 	private static final Dimension IMAGE_SIZE = new Dimension(11, 11);
 
 	private final Client client;
-	private final RunepouchConfig config;
+	private final RunepouchPlugin plugin;
 	private final TooltipManager tooltipManager;
 
 	@Inject
 	private ItemManager itemManager;
 
 	@Inject
-	RunepouchOverlay(Client client, RunepouchConfig config, TooltipManager tooltipManager)
+	RunepouchOverlay(final Client client, final RunepouchPlugin plugin, final TooltipManager tooltipManager)
 	{
 		this.tooltipManager = tooltipManager;
 		this.client = client;
-		this.config = config;
+		this.plugin = plugin;
 		showOnInventory();
 		showOnBank();
 	}
@@ -116,7 +118,7 @@ public class RunepouchOverlay extends WidgetItemOverlay
 				.append(ColorUtil.wrapWithColorTag(rune.getName(), Color.YELLOW))
 				.append("</br>");
 
-			if (config.runePouchOverlayMode() == MOUSE_HOVER)
+			if (plugin.getRunePouchOverlayMode() == MOUSE_HOVER)
 			{
 				continue;
 			}
@@ -127,18 +129,18 @@ public class RunepouchOverlay extends WidgetItemOverlay
 			int yOffset = (1 + (graphics.getFontMetrics().getMaxAscent()) * i);
 
 			graphics.setColor(Color.black);
-			graphics.drawString("" + formatNumber(amount), location.getX() + (config.showIcons() ? 13 : 6),
+			graphics.drawString("" + formatNumber(amount), location.getX() + (plugin.isShowIcons() ? 13 : 6),
 				yLocation + yOffset);
 
-			graphics.setColor(config.fontColor());
-			graphics.drawString("" + formatNumber(amount), location.getX() + (config.showIcons() ? 12 : 5),
+			graphics.setColor(plugin.getFontColor());
+			graphics.drawString("" + formatNumber(amount), location.getX() + (plugin.isShowIcons() ? 12 : 5),
 				yLocation + yOffset);
 
-			graphics.setColor(config.fontColor());
-			graphics.drawString("" + formatNumber(amount), location.getX() + (config.showIcons() ? 11 : 4),
+			graphics.setColor(plugin.getFontColor());
+			graphics.drawString("" + formatNumber(amount), location.getX() + (plugin.isShowIcons() ? 11 : 4),
 				location.getY() + 12 + (graphics.getFontMetrics().getHeight() - 1) * i);
 
-			if (!config.showIcons())
+			if (!plugin.isShowIcons())
 			{
 				continue;
 			}
@@ -162,7 +164,7 @@ public class RunepouchOverlay extends WidgetItemOverlay
 
 		if (!tooltip.isEmpty()
 			&& itemWidget.getCanvasBounds().contains(client.getMouseCanvasPosition().getX(), client.getMouseCanvasPosition().getY())
-			&& (config.runePouchOverlayMode() == MOUSE_HOVER || config.runePouchOverlayMode() == BOTH))
+			&& (plugin.getRunePouchOverlayMode() == MOUSE_HOVER || plugin.getRunePouchOverlayMode() == BOTH))
 		{
 			tooltipManager.add(new Tooltip(tooltip));
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchPlugin.java
index 031f0900e1..88a897d9ef 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchPlugin.java
@@ -25,10 +25,17 @@
 package net.runelite.client.plugins.runepouch;
 
 import com.google.inject.Provides;
+import java.awt.Color;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
+import lombok.Getter;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.client.config.ConfigManager;
+import net.runelite.client.eventbus.Subscribe;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginDescriptor;
+import net.runelite.client.plugins.runepouch.config.RunePouchOverlayMode;
 import net.runelite.client.ui.overlay.OverlayManager;
 
 @PluginDescriptor(
@@ -36,6 +43,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	description = "Show the contents of your rune pouch",
 	tags = {"combat", "magic", "overlay"}
 )
+@Singleton
 public class RunepouchPlugin extends Plugin
 {
 	@Inject
@@ -44,6 +52,16 @@ public class RunepouchPlugin extends Plugin
 	@Inject
 	private RunepouchOverlay overlay;
 
+	@Inject
+	private RunepouchConfig config;
+
+	@Getter(AccessLevel.PACKAGE)
+	private Color fontColor;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showIcons;
+	@Getter(AccessLevel.PACKAGE)
+	private RunePouchOverlayMode runePouchOverlayMode;
+
 	@Provides
 	RunepouchConfig getConfig(ConfigManager configManager)
 	{
@@ -53,6 +71,7 @@ public class RunepouchPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
 		overlayManager.add(overlay);
 	}
 
@@ -61,4 +80,22 @@ public class RunepouchPlugin extends Plugin
 	{
 		overlayManager.remove(overlay);
 	}
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (!event.getGroup().equals("runepouch"))
+		{
+			return;
+		}
+
+		updateConfig();
+	}
+
+	private void updateConfig()
+	{
+		this.fontColor = config.fontColor();
+		this.showIcons = config.showIcons();
+		this.runePouchOverlayMode = config.runePouchOverlayMode();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/Runes.java b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/Runes.java
index 3031aa7b97..3185ac2741 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/Runes.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/Runes.java
@@ -28,6 +28,7 @@ package net.runelite.client.plugins.runepouch;
 import com.google.common.collect.ImmutableMap;
 import java.awt.image.BufferedImage;
 import java.util.Map;
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
 import static net.runelite.api.ItemID.AIR_RUNE;
@@ -76,13 +77,13 @@ public enum Runes
 	SMOKE(20, SMOKE_RUNE),
 	WRATH(21, WRATH_RUNE);
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final int id;
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final int itemId;
 
-	@Getter
-	@Setter
+	@Getter(AccessLevel.PACKAGE)
+	@Setter(AccessLevel.PACKAGE)
 	private BufferedImage image;
 
 	private static final Map<Integer, Runes> runes;
@@ -97,7 +98,7 @@ public enum Runes
 		runes = builder.build();
 	}
 
-	Runes(int id, int itemId)
+	Runes(final int id, final int itemId)
 	{
 		this.id = id;
 		this.itemId = itemId;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotOverlay.java
index a208f59dc2..2eedef5440 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotOverlay.java
@@ -13,6 +13,7 @@ import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.awt.Polygon;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.Perspective;
 import net.runelite.client.ui.overlay.Overlay;
@@ -21,19 +22,18 @@ import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayPriority;
 import net.runelite.client.ui.overlay.OverlayUtil;
 
+@Singleton
 public class SafeSpotOverlay extends Overlay
 {
 
 	private final Client client;
 	private final SafeSpotPlugin safeSpotPlugin;
-	private final SafeSpotConfig config;
 
 	@Inject
-	public SafeSpotOverlay(Client client, SafeSpotPlugin safeSpotPlugin, SafeSpotConfig config)
+	public SafeSpotOverlay(final Client client, final SafeSpotPlugin safeSpotPlugin)
 	{
 		this.client = client;
 		this.safeSpotPlugin = safeSpotPlugin;
-		this.config = config;
 		setPosition(OverlayPosition.DYNAMIC);
 		setPriority(OverlayPriority.LOW);
 		setLayer(OverlayLayer.ABOVE_SCENE);
@@ -42,25 +42,19 @@ public class SafeSpotOverlay extends Overlay
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (safeSpotPlugin.isSafeSpotsRenderable())
+		if (safeSpotPlugin.isSafeSpotsRenderable() && safeSpotPlugin.getSafeSpotList() != null && safeSpotPlugin.getSafeSpotList().size() > 0)
 		{
-			if (safeSpotPlugin.getSafeSpotList() != null)
+			safeSpotPlugin.getSafeSpotList().forEach(tile ->
 			{
-				if (safeSpotPlugin.getSafeSpotList().size() > 0)
+				if (tile != null && tile.getLocalLocation() != null)
 				{
-					safeSpotPlugin.getSafeSpotList().forEach(tile ->
+					final Polygon poly = Perspective.getCanvasTilePoly(client, tile.getLocalLocation());
+					if (poly != null)
 					{
-						if (tile != null && tile.getLocalLocation() != null)
-						{
-							final Polygon poly = Perspective.getCanvasTilePoly(client, tile.getLocalLocation());
-							if (poly != null)
-							{
-								OverlayUtil.renderPolygon(graphics, poly, config.tileColor());
-							}
-						}
-					});
+						OverlayUtil.renderPolygon(graphics, poly, safeSpotPlugin.getTileColor());
+					}
 				}
-			}
+			});
 		}
 		return null;
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotPlugin.java
index 5d0a6df8a3..bc2ea6d984 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/safespot/SafeSpotPlugin.java
@@ -9,9 +9,13 @@
 package net.runelite.client.plugins.safespot;
 
 import com.google.inject.Provides;
+import java.awt.Color;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.Actor;
 import net.runelite.api.Client;
@@ -22,6 +26,7 @@ import net.runelite.api.Tile;
 import net.runelite.api.coords.LocalPoint;
 import net.runelite.api.coords.WorldArea;
 import net.runelite.api.coords.WorldPoint;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.GameTick;
 import net.runelite.api.events.InteractingChanged;
 import net.runelite.client.config.ConfigManager;
@@ -38,7 +43,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	type = PluginType.UTILITY,
 	enabledByDefault = false
 )
-
+@Singleton
 public class SafeSpotPlugin extends Plugin
 {
 	@Inject
@@ -50,15 +55,20 @@ public class SafeSpotPlugin extends Plugin
 	@Inject
 	private SafeSpotConfig config;
 
-	@Getter
-	private ArrayList<Tile> safeSpotList;
+	@Getter(AccessLevel.PACKAGE)
+	private List<Tile> safeSpotList;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private boolean safeSpotsRenderable = false;
 
 	private SafeSpotOverlay safeSpotOverlay;
 	private int tickCount = 0;
 
+	private boolean playerSafeSpots;
+	private boolean npcSafeSpots;
+	@Getter(AccessLevel.PACKAGE)
+	private Color tileColor;
+
 	@Provides
 	SafeSpotConfig config(ConfigManager configManager)
 	{
@@ -68,7 +78,9 @@ public class SafeSpotPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
-		safeSpotOverlay = new SafeSpotOverlay(client, this, config);
+		updateConfig();
+
+		safeSpotOverlay = new SafeSpotOverlay(client, this);
 		overlayManager.add(safeSpotOverlay);
 	}
 
@@ -85,7 +97,7 @@ public class SafeSpotPlugin extends Plugin
 		{
 			return;
 		}
-		if (event.getTarget() == null && (config.npcSafeSpots() || config.playerSafeSpots()))
+		if (event.getTarget() == null && (this.npcSafeSpots || this.playerSafeSpots))
 		{
 			tickCount = 10;
 		}
@@ -96,26 +108,25 @@ public class SafeSpotPlugin extends Plugin
 	{
 		if (client.getLocalPlayer().getInteracting() != null)
 		{
-			if (client.getLocalPlayer().getInteracting() instanceof Player && config.playerSafeSpots())
+			if (client.getLocalPlayer().getInteracting() instanceof Player && this.playerSafeSpots)
 			{
 				safeSpotsRenderable = true;
 				updateSafeSpots();
 			}
-			if (client.getLocalPlayer().getInteracting() instanceof NPC && config.npcSafeSpots())
+			if (client.getLocalPlayer().getInteracting() instanceof NPC && this.npcSafeSpots)
 			{
 				safeSpotsRenderable = true;
 				updateSafeSpots();
 			}
 		}
+		else if (tickCount > 0)
+		{
+			tickCount--;
+		}
 		else
 		{
 			safeSpotsRenderable = false;
 		}
-		if (tickCount > 0)
-		{
-			tickCount--;
-			safeSpotsRenderable = true;
-		}
 	}
 
 	/**
@@ -140,31 +151,55 @@ public class SafeSpotPlugin extends Plugin
 	 * @param worldPoints - Worldpoints in the current scene
 	 * @return an ArrayList of Tiles where current player can attack actor but actor cannot attack local player
 	 */
-	private ArrayList<Tile> getSafeSpotList(Actor actor, List<WorldPoint> worldPoints)
+	private List<Tile> getSafeSpotList(Actor actor, List<WorldPoint> worldPoints)
 	{
-		ArrayList<Tile> safeSpotList = new ArrayList<>();
+		List<Tile> safeSpotList = new ArrayList<>();
 		Tile[][][] tiles = client.getScene().getTiles();
 		for (WorldPoint w : worldPoints)
 		{
 			LocalPoint toPoint = LocalPoint.fromWorld(client, w);
 			Tile fromTile = tiles[client.getPlane()][actor.getLocalLocation().getSceneX()]
 				[actor.getLocalLocation().getSceneY()];
-			Tile toTile = tiles[client.getPlane()][toPoint.getSceneX()]
-				[toPoint.getSceneY()];
-			final int plane = client.getLocalPlayer().getWorldArea().getPlane();
-			int bit = client.getCollisionMaps()[plane].getFlags()[toPoint.getSceneX()][toPoint.getSceneY()];
-			if (toTile.hasLineOfSightTo(fromTile) && !fromTile.hasLineOfSightTo(toTile))
+			Tile toTile = null;
+			if (toPoint != null)
 			{
-				if (!((bit & CollisionDataFlag.BLOCK_MOVEMENT_OBJECT) == CollisionDataFlag.BLOCK_MOVEMENT_OBJECT ||
+				toTile = tiles[client.getPlane()][toPoint.getSceneX()]
+					[toPoint.getSceneY()];
+			}
+			final int plane = client.getLocalPlayer().getWorldArea().getPlane();
+			int bit = 0;
+			if (toPoint != null)
+			{
+				bit = Objects.requireNonNull(client.getCollisionMaps())[plane].getFlags()[toPoint.getSceneX()][toPoint.getSceneY()];
+			}
+			if (toTile != null && toTile.hasLineOfSightTo(fromTile) && !fromTile.hasLineOfSightTo(toTile) &&
+				(!((bit & CollisionDataFlag.BLOCK_MOVEMENT_OBJECT) == CollisionDataFlag.BLOCK_MOVEMENT_OBJECT ||
 					(bit & CollisionDataFlag.BLOCK_MOVEMENT_FLOOR_DECORATION)
 						== CollisionDataFlag.BLOCK_MOVEMENT_FLOOR_DECORATION ||
 					(bit & CollisionDataFlag.BLOCK_MOVEMENT_FLOOR) == CollisionDataFlag.BLOCK_MOVEMENT_FLOOR ||
-					(bit & CollisionDataFlag.BLOCK_MOVEMENT_FULL) == CollisionDataFlag.BLOCK_MOVEMENT_FULL))
-				{
-					safeSpotList.add(toTile);
-				}
+					(bit & CollisionDataFlag.BLOCK_MOVEMENT_FULL) == CollisionDataFlag.BLOCK_MOVEMENT_FULL)))
+			{
+				safeSpotList.add(toTile);
 			}
 		}
 		return safeSpotList;
 	}
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (!event.getGroup().equals("safespot"))
+		{
+			return;
+		}
+
+		updateConfig();
+	}
+
+	private void updateConfig()
+	{
+		this.playerSafeSpots = config.playerSafeSpots();
+		this.npcSafeSpots = config.npcSafeSpots();
+		this.tileColor = config.tileColor();
+	}
 }
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerCreationOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerCreationOverlay.java
index f1e0c60bde..4bb242a575 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerCreationOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerCreationOverlay.java
@@ -29,14 +29,16 @@ import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.awt.Stroke;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayPriority;
 
+@Singleton
 public class ScreenMarkerCreationOverlay extends Overlay
 {
-	private ScreenMarkerPlugin plugin;
+	private final ScreenMarkerPlugin plugin;
 
 	@Inject
 	private ScreenMarkerCreationOverlay(final ScreenMarkerPlugin plugin)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerMouseListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerMouseListener.java
index e00114041d..3bb1d8e28e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerMouseListener.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerMouseListener.java
@@ -25,14 +25,16 @@
 package net.runelite.client.plugins.screenmarkers;
 
 import java.awt.event.MouseEvent;
+import javax.inject.Singleton;
 import javax.swing.SwingUtilities;
 import net.runelite.client.input.MouseAdapter;
 
-public class ScreenMarkerMouseListener extends MouseAdapter
+@Singleton
+class ScreenMarkerMouseListener extends MouseAdapter
 {
 	private final ScreenMarkerPlugin plugin;
 
-	ScreenMarkerMouseListener(ScreenMarkerPlugin plugin)
+	ScreenMarkerMouseListener(final ScreenMarkerPlugin plugin)
 	{
 		this.plugin = plugin;
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerOverlay.java
index 08857c532e..408ded39f3 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerOverlay.java
@@ -28,19 +28,22 @@ package net.runelite.client.plugins.screenmarkers;
 import java.awt.BasicStroke;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayPriority;
 
+@Singleton
 public class ScreenMarkerOverlay extends Overlay
 {
-	@Getter
+	@Getter(AccessLevel.PUBLIC)
 	private final ScreenMarker marker;
 	private final ScreenMarkerRenderable screenMarkerRenderable;
 
-	ScreenMarkerOverlay(ScreenMarker marker)
+	ScreenMarkerOverlay(final ScreenMarker marker)
 	{
 		this.marker = marker;
 		this.screenMarkerRenderable = new ScreenMarkerRenderable();
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerPlugin.java
index ff8dcf0057..ce6a8d67fa 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerPlugin.java
@@ -39,6 +39,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.events.ConfigChanged;
@@ -58,6 +59,7 @@ import net.runelite.client.util.ImageUtil;
 	description = "Enable drawing of screen markers on top of the client",
 	tags = {"boxes", "overlay", "panel"}
 )
+@Singleton
 public class ScreenMarkerPlugin extends Plugin
 {
 	private static final String PLUGIN_NAME = "Screen Markers";
@@ -159,7 +161,7 @@ public class ScreenMarkerPlugin extends Plugin
 		}
 	}
 
-	public void startCreation(Point location)
+	void startCreation(Point location)
 	{
 		currentMarker = new ScreenMarker(
 			Instant.now().toEpochMilli(),
@@ -201,7 +203,7 @@ public class ScreenMarkerPlugin extends Plugin
 	}
 
 	/* The marker area has been drawn, inform the user and unlock the confirm button */
-	public void completeSelection()
+	void completeSelection()
 	{
 		pluginPanel.getCreationPanel().unlockConfirm();
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerRenderable.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerRenderable.java
index 95b2da1207..6182765aa4 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerRenderable.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerRenderable.java
@@ -38,10 +38,10 @@ import net.runelite.client.ui.overlay.components.LayoutableRenderableEntity;
 public class ScreenMarkerRenderable implements LayoutableRenderableEntity
 {
 	@Getter(AccessLevel.PACKAGE)
-	@Setter
+	@Setter(AccessLevel.PUBLIC)
 	private Point preferredLocation;
 	@Getter(AccessLevel.PACKAGE)
-	@Setter
+	@Setter(AccessLevel.PUBLIC)
 	private Dimension preferredSize;
 	@Getter(AccessLevel.PACKAGE)
 	@Setter(AccessLevel.PACKAGE)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerCreationPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerCreationPanel.java
index 0ad6b73d4e..82197c6160 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerCreationPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerCreationPanel.java
@@ -30,6 +30,7 @@ import java.awt.GridLayout;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.image.BufferedImage;
+import javax.inject.Singleton;
 import javax.swing.ImageIcon;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -40,6 +41,7 @@ import net.runelite.client.ui.FontManager;
 import net.runelite.client.ui.components.shadowlabel.JShadowedLabel;
 import net.runelite.client.util.ImageUtil;
 
+@Singleton
 public class ScreenMarkerCreationPanel extends JPanel
 {
 	private static final ImageIcon CONFIRM_ICON;
@@ -63,7 +65,7 @@ public class ScreenMarkerCreationPanel extends JPanel
 		CANCEL_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(ImageUtil.bufferedImageFromImage(CANCEL_ICON.getImage()), 0.6f));
 	}
 
-	ScreenMarkerCreationPanel(ScreenMarkerPlugin plugin)
+	ScreenMarkerCreationPanel(final ScreenMarkerPlugin plugin)
 	{
 		setBackground(ColorScheme.DARKER_GRAY_COLOR);
 		setBorder(new EmptyBorder(8, 8, 8, 8));
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerPanel.java
index e934bff8b8..217922790e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerPanel.java
@@ -34,6 +34,7 @@ import java.awt.event.MouseEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.awt.image.BufferedImage;
+import javax.inject.Singleton;
 import javax.swing.BorderFactory;
 import javax.swing.ImageIcon;
 import javax.swing.JLabel;
@@ -55,6 +56,7 @@ import net.runelite.client.ui.components.FlatTextField;
 import net.runelite.client.ui.components.colorpicker.RuneliteColorPicker;
 import net.runelite.client.util.ImageUtil;
 
+@Singleton
 class ScreenMarkerPanel extends JPanel
 {
 	private static final int DEFAULT_FILL_OPACITY = 75;
@@ -144,7 +146,7 @@ class ScreenMarkerPanel extends JPanel
 		DELETE_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(deleteImg, -100));
 	}
 
-	ScreenMarkerPanel(ScreenMarkerPlugin plugin, ScreenMarkerOverlay marker)
+	ScreenMarkerPanel(final ScreenMarkerPlugin plugin, final ScreenMarkerOverlay marker)
 	{
 		this.plugin = plugin;
 		this.marker = marker;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerPluginPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerPluginPanel.java
index 3e43abaa4d..5be2693d28 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerPluginPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerPluginPanel.java
@@ -40,6 +40,7 @@ import javax.swing.ImageIcon;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.border.EmptyBorder;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.client.plugins.screenmarkers.ScreenMarkerOverlay;
 import net.runelite.client.plugins.screenmarkers.ScreenMarkerPlugin;
@@ -66,16 +67,16 @@ public class ScreenMarkerPluginPanel extends PluginPanel
 	@Inject
 	private ScreenMarkerPlugin plugin;
 
-	@Getter
+	@Getter(AccessLevel.PUBLIC)
 	private Color selectedColor = DEFAULT_BORDER_COLOR;
 
-	@Getter
+	@Getter(AccessLevel.PUBLIC)
 	private Color selectedFillColor = DEFAULT_FILL_COLOR;
 
-	@Getter
+	@Getter(AccessLevel.PUBLIC)
 	private int selectedBorderThickness = DEFAULT_BORDER_THICKNESS;
 
-	@Getter
+	@Getter(AccessLevel.PUBLIC)
 	private ScreenMarkerCreationPanel creationPanel;
 
 	static
@@ -85,7 +86,7 @@ public class ScreenMarkerPluginPanel extends PluginPanel
 		ADD_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(addIcon, 0.53f));
 	}
 
-	public void init()
+	private void init()
 	{
 		setLayout(new BorderLayout());
 		setBorder(new EmptyBorder(10, 10, 10, 10));
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotOverlay.java
index a5fd92a862..27b4d9b392 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotOverlay.java
@@ -38,6 +38,7 @@ import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.function.Consumer;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.MainBufferProvider;
 import net.runelite.client.ui.DrawManager;
@@ -47,6 +48,7 @@ import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayPriority;
 
+@Singleton
 class ScreenshotOverlay extends Overlay
 {
 	private static final DateFormat DATE_FORMAT = new SimpleDateFormat("MMM. dd, yyyy");
@@ -59,7 +61,7 @@ class ScreenshotOverlay extends Overlay
 	private final Queue<Consumer<Image>> consumers = new ConcurrentLinkedQueue<>();
 
 	@Inject
-	private ScreenshotOverlay(Client client, DrawManager drawManager, ScreenshotPlugin plugin)
+	private ScreenshotOverlay(final Client client, final DrawManager drawManager, final ScreenshotPlugin plugin)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		setPriority(OverlayPriority.HIGH);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java
index 9e4a5dcfaf..453c7f4597 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java
@@ -56,10 +56,12 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.imageio.ImageIO;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import javax.swing.SwingUtilities;
 
 import lombok.AccessLevel;
 import lombok.Getter;
+import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.ChatMessageType;
 import net.runelite.api.Client;
@@ -71,6 +73,7 @@ import net.runelite.api.Varbits;
 import net.runelite.api.WorldType;
 import net.runelite.api.events.AnimationChanged;
 import net.runelite.api.events.ChatMessage;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.GameStateChanged;
 import net.runelite.api.events.GameTick;
 import net.runelite.api.events.WidgetLoaded;
@@ -87,6 +90,7 @@ import net.runelite.api.widgets.WidgetInfo;
 import net.runelite.client.Notifier;
 import static net.runelite.client.RuneLite.SCREENSHOT_DIR;
 import net.runelite.client.config.ConfigManager;
+import net.runelite.client.config.Keybind;
 import net.runelite.client.eventbus.Subscribe;
 import net.runelite.client.events.PlayerLootReceived;
 import net.runelite.client.game.SpriteManager;
@@ -119,6 +123,7 @@ import org.jetbrains.annotations.Nullable;
 		tags = {"external", "images", "imgur", "integration", "notifications"}
 )
 @Slf4j
+@Singleton
 public class ScreenshotPlugin extends Plugin
 {
 	private static final String IMGUR_CLIENT_ID = "30d71e5f6860809";
@@ -137,7 +142,7 @@ public class ScreenshotPlugin extends Plugin
 			"You feel something weird sneaking into your backpack",
 			"You have a funny feeling like you would have been followed");
 
-	static String format(Date date)
+	private static String format(Date date)
 	{
 		synchronized (TIME_FORMAT)
 		{
@@ -194,11 +199,11 @@ public class ScreenshotPlugin extends Plugin
 	@Getter(AccessLevel.PACKAGE)
 	private BufferedImage reportButton;
 
-	private Map<Player, Integer> dying = new HashMap<Player, Integer>();
+	private final Map<Player, Integer> dying = new HashMap<>();
 
 	private NavigationButton titleBarButton;
 
-	private final HotkeyListener hotkeyListener = new HotkeyListener(() -> config.hotkey())
+	private final HotkeyListener hotkeyListener = new HotkeyListener(() -> this.hotkey)
 	{
 		@Override
 		public void hotkeyPressed()
@@ -207,6 +212,28 @@ public class ScreenshotPlugin extends Plugin
 		}
 	};
 
+	private boolean includeFrame;
+	@Setter(AccessLevel.PACKAGE)
+	private boolean displayDate;
+	private boolean notifyWhenTaken;
+	@Setter(AccessLevel.PACKAGE)
+	private boolean screenshotRewards;
+	@Setter(AccessLevel.PACKAGE)
+	private boolean screenshotLevels;
+	private boolean screenshotKingdom;
+	private boolean screenshotPet;
+	private boolean uploadScreenshot;
+	private boolean screenshotKills;
+	private boolean screenshotBossKills;
+	private boolean screenshotFriendDeath;
+	private boolean screenshotPlayerDeath;
+	private boolean screenshotDuels;
+	@Setter(AccessLevel.PACKAGE)
+	private boolean screenshotValuableDrop;
+	@Setter(AccessLevel.PACKAGE)
+	private boolean screenshotUntradeableDrop;
+	private Keybind hotkey;
+
 	@Provides
 	ScreenshotConfig getConfig(ConfigManager configManager)
 	{
@@ -216,6 +243,8 @@ public class ScreenshotPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
+		
 		overlayManager.add(screenshotOverlay);
 		SCREENSHOT_DIR.mkdirs();
 		keyManager.registerKeyListener(hotkeyListener);
@@ -267,7 +296,7 @@ public class ScreenshotPlugin extends Plugin
 	@Subscribe
 	public void onGameTick(GameTick event)
 	{
-		if (config.screenshotFriendDeath())
+		if (this.screenshotFriendDeath)
 		{
 			for (Iterator<Player> it = dying.keySet().iterator(); it.hasNext();)
 			{
@@ -317,7 +346,7 @@ public class ScreenshotPlugin extends Plugin
 	public void onAnimationChanged(AnimationChanged e)
 	{
 		//this got refactored somewhere, but some things were missing
-		if (!config.screenshotFriendDeath() || !config.screenshotPlayerDeath())
+		if (!this.screenshotFriendDeath || !this.screenshotPlayerDeath)
 			return;
 
 		if (!(e.getActor() instanceof Player))
@@ -332,7 +361,7 @@ public class ScreenshotPlugin extends Plugin
 		if (p.getName().equals(client.getLocalPlayer().getName()))
 		{
 
-			if (config.screenshotPlayerDeath())
+			if (this.screenshotPlayerDeath)
 			{
 				dying.put(p, 3);
 				return;
@@ -342,7 +371,7 @@ public class ScreenshotPlugin extends Plugin
 				return;
 			}
 		}
-		if (config.screenshotFriendDeath())
+		if (this.screenshotFriendDeath)
 		{
 			int tob = client.getVar(Varbits.THEATRE_OF_BLOOD);
 
@@ -357,7 +386,7 @@ public class ScreenshotPlugin extends Plugin
 	@Subscribe
 	public void onPlayerLootReceived(final PlayerLootReceived playerLootReceived)
 	{
-		if (config.screenshotKills())
+		if (this.screenshotKills)
 		{
 			final Player player = playerLootReceived.getPlayer();
 			final String name = player.getName();
@@ -427,13 +456,13 @@ public class ScreenshotPlugin extends Plugin
 			}
 		}
 
-		if (config.screenshotPet() && PET_MESSAGES.stream().anyMatch(chatMessage::contains))
+		if (this.screenshotPet && PET_MESSAGES.stream().anyMatch(chatMessage::contains))
 		{
 			String fileName = "Pet " + format(new Date());
 			takeScreenshot(fileName);
 		}
 
-		if (config.screenshotBossKills() )
+		if (this.screenshotBossKills )
 		{
 			Matcher m = BOSSKILL_MESSAGE_PATTERN.matcher(chatMessage);
 			if (m.matches())
@@ -445,7 +474,7 @@ public class ScreenshotPlugin extends Plugin
 			}
 		}
 
-		if (config.screenshotValuableDrop())
+		if (this.screenshotValuableDrop)
 		{
 			Matcher m = VALUABLE_DROP_PATTERN.matcher(chatMessage);
 			if (m.matches())
@@ -456,7 +485,7 @@ public class ScreenshotPlugin extends Plugin
 			}
 		}
 
-		if (config.screenshotUntradeableDrop())
+		if (this.screenshotUntradeableDrop)
 		{
 			Matcher m = UNTRADEABLE_DROP_PATTERN.matcher(chatMessage);
 			if (m.matches())
@@ -467,7 +496,7 @@ public class ScreenshotPlugin extends Plugin
 			}
 		}
 
-		if (config.screenshotDuels())
+		if (this.screenshotDuels)
 		{
 			Matcher m = DUEL_END_PATTERN.matcher(chatMessage);
 			if (m.find())
@@ -493,20 +522,20 @@ public class ScreenshotPlugin extends Plugin
 			case CHAMBERS_OF_XERIC_REWARD_GROUP_ID:
 			case THEATRE_OF_BLOOD_REWARD_GROUP_ID:
 			case BARROWS_REWARD_GROUP_ID:
-				if (!config.screenshotRewards())
+				if (!this.screenshotRewards)
 				{
 					return;
 				}
 				break;
 			case LEVEL_UP_GROUP_ID:
 			case DIALOG_SPRITE_GROUP_ID:
-				if (!config.screenshotLevels())
+				if (!this.screenshotLevels)
 				{
 					return;
 				}
 				break;
 			case KINGDOM_GROUP_ID:
-				if (!config.screenshotKingdom())
+				if (!this.screenshotKingdom)
 				{
 					return;
 				}
@@ -637,7 +666,7 @@ public class ScreenshotPlugin extends Plugin
 			executor.submit(() -> takeScreenshot(fileName, img, null));
 		};
 
-		if (config.displayDate())
+		if (this.displayDate)
 		{
 			screenshotOverlay.queueForTimestamp(imageCallback);
 		}
@@ -670,7 +699,7 @@ public class ScreenshotPlugin extends Plugin
 
 		};
 
-		if (config.displayDate())
+		if (this.displayDate)
 		{
 			screenshotOverlay.queueForTimestamp(imageCallback);
 		}
@@ -681,7 +710,7 @@ public class ScreenshotPlugin extends Plugin
 	}
 	private void takeScreenshot(String fileName, Image image, @Nullable String subdirectory)
 	{
-		BufferedImage screenshot = config.includeFrame()
+		BufferedImage screenshot = this.includeFrame
 				? new BufferedImage(clientUi.getWidth(), clientUi.getHeight(), BufferedImage.TYPE_INT_ARGB)
 				: new BufferedImage(image.getWidth(null), image.getHeight(null), BufferedImage.TYPE_INT_ARGB);
 
@@ -690,7 +719,7 @@ public class ScreenshotPlugin extends Plugin
 		int gameOffsetX = 0;
 		int gameOffsetY = 0;
 
-		if (config.includeFrame())
+		if (this.includeFrame)
 		{
 			// Draw the client frame onto the screenshot
 			try
@@ -748,11 +777,11 @@ public class ScreenshotPlugin extends Plugin
 
 			ImageIO.write(screenshot, "PNG", screenshotFile);
 
-			if (config.uploadScreenshot())
+			if (this.uploadScreenshot)
 			{
 				uploadScreenshot(screenshotFile);
 			}
-			else if (config.notifyWhenTaken())
+			else if (this.notifyWhenTaken)
 			{
 				notifier.notify("A screenshot was saved to " + screenshotFile, TrayIcon.MessageType.INFO);
 			}
@@ -774,44 +803,51 @@ public class ScreenshotPlugin extends Plugin
 	{
 		String json = RuneLiteAPI.GSON.toJson(new ImageUploadRequest(screenshotFile));
 
-		Request request = new Request.Builder()
-				.url(IMGUR_IMAGE_UPLOAD_URL)
-				.addHeader("Authorization", "Client-ID " + IMGUR_CLIENT_ID)
-				.post(RequestBody.create(JSON, json))
-				.build();
-
-		RuneLiteAPI.CLIENT.newCall(request).enqueue(new Callback()
+		Request request = null;
+		if (IMGUR_IMAGE_UPLOAD_URL != null)
 		{
-			@Override
-			public void onFailure(Call call, IOException ex)
-			{
-				log.warn("error uploading screenshot", ex);
-			}
+			request = new Request.Builder()
+					.url(IMGUR_IMAGE_UPLOAD_URL)
+					.addHeader("Authorization", "Client-ID " + IMGUR_CLIENT_ID)
+					.post(RequestBody.create(JSON, json))
+					.build();
+		}
 
-			@Override
-			public void onResponse(Call call, Response response) throws IOException
+		if (request != null)
+		{
+			RuneLiteAPI.CLIENT.newCall(request).enqueue(new Callback()
 			{
-				try (InputStream in = response.body().byteStream())
+				@Override
+				public void onFailure(Call call, IOException ex)
 				{
-					ImageUploadResponse imageUploadResponse = RuneLiteAPI.GSON
-							.fromJson(new InputStreamReader(in), ImageUploadResponse.class);
+					log.warn("error uploading screenshot", ex);
+				}
 
-					if (imageUploadResponse.isSuccess())
+				@Override
+				public void onResponse(Call call, Response response) throws IOException
+				{
+					try (InputStream in = response.body().byteStream())
 					{
-						String link = imageUploadResponse.getData().getLink();
+						ImageUploadResponse imageUploadResponse = RuneLiteAPI.GSON
+								.fromJson(new InputStreamReader(in), ImageUploadResponse.class);
 
-						StringSelection selection = new StringSelection(link);
-						Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
-						clipboard.setContents(selection, selection);
-
-						if (config.notifyWhenTaken())
+						if (imageUploadResponse.isSuccess())
 						{
-							notifier.notify("A screenshot was uploaded and inserted into your clipboard!", TrayIcon.MessageType.INFO);
+							String link = imageUploadResponse.getData().getLink();
+
+							StringSelection selection = new StringSelection(link);
+							Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
+							clipboard.setContents(selection, selection);
+
+							if (notifyWhenTaken)
+							{
+								notifier.notify("A screenshot was uploaded and inserted into your clipboard!", TrayIcon.MessageType.INFO);
+							}
 						}
 					}
 				}
-			}
-		});
+			});
+		}
 	}
 
 	@VisibleForTesting
@@ -849,4 +885,35 @@ public class ScreenshotPlugin extends Plugin
 	{
 		return theatreOfBloodNumber;
 	}
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (!event.getGroup().equals("screenshot"))
+		{
+			return;
+		}
+
+		updateConfig();
+	}
+	
+	private void updateConfig()
+	{
+		this.includeFrame = config.includeFrame();
+		this.displayDate = config.displayDate();
+		this.notifyWhenTaken = config.notifyWhenTaken();
+		this.screenshotRewards = config.screenshotRewards();
+		this.screenshotLevels = config.screenshotLevels();
+		this.screenshotKingdom = config.screenshotKingdom();
+		this.screenshotPet = config.screenshotPet();
+		this.uploadScreenshot = config.uploadScreenshot();
+		this.screenshotKills = config.screenshotKills();
+		this.screenshotBossKills = config.screenshotBossKills();
+		this.screenshotFriendDeath = config.screenshotFriendDeath();
+		this.screenshotPlayerDeath = config.screenshotPlayerDeath();
+		this.screenshotDuels = config.screenshotDuels();
+		this.screenshotValuableDrop = config.screenshotValuableDrop();
+		this.screenshotUntradeableDrop = config.screenshotUntradeableDrop();
+		this.hotkey = config.hotkey();
+	}
 }
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/shayzieninfirmary/ShayzienInfirmaryOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/shayzieninfirmary/ShayzienInfirmaryOverlay.java
index a7b0ab1bcf..6e09eef0d4 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/shayzieninfirmary/ShayzienInfirmaryOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/shayzieninfirmary/ShayzienInfirmaryOverlay.java
@@ -32,6 +32,7 @@ import java.awt.Graphics2D;
 import java.awt.Polygon;
 import java.awt.image.BufferedImage;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.ItemID;
 import net.runelite.api.NPC;
 import net.runelite.api.Point;
@@ -40,6 +41,7 @@ import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayUtil;
 
+@Singleton
 public class ShayzienInfirmaryOverlay extends Overlay
 {
 	private final ShayzienInfirmaryPlugin plugin;
@@ -47,7 +49,7 @@ public class ShayzienInfirmaryOverlay extends Overlay
 	private BufferedImage medPackImage;
 
 	@Inject
-	public ShayzienInfirmaryOverlay(ShayzienInfirmaryPlugin plugin, ItemManager itemManager)
+	public ShayzienInfirmaryOverlay(final ShayzienInfirmaryPlugin plugin, final ItemManager itemManager)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		this.plugin = plugin;
@@ -58,7 +60,7 @@ public class ShayzienInfirmaryOverlay extends Overlay
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (!plugin.isAtInfirmary())
+		if (plugin.isNotAtInfirmary())
 		{
 			return null;
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/shayzieninfirmary/ShayzienInfirmaryPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/shayzieninfirmary/ShayzienInfirmaryPlugin.java
index d5f38d8172..e74b268575 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/shayzieninfirmary/ShayzienInfirmaryPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/shayzieninfirmary/ShayzienInfirmaryPlugin.java
@@ -27,6 +27,7 @@ package net.runelite.client.plugins.shayzieninfirmary;
 import java.util.ArrayList;
 import java.util.List;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
@@ -47,11 +48,11 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	type = PluginType.UTILITY,
 	enabledByDefault = false
 )
-
+@Singleton
 public class ShayzienInfirmaryPlugin extends Plugin
 {
 	@Getter(AccessLevel.PACKAGE)
-	private List<NPC> unhealedSoldiers = new ArrayList<NPC>();
+	private List<NPC> unhealedSoldiers = new ArrayList<>();
 
 	@Inject
 	private OverlayManager overlayManager;
@@ -87,7 +88,7 @@ public class ShayzienInfirmaryPlugin extends Plugin
 	@Subscribe
 	public void onGameTick(GameTick event)
 	{
-		if (!isAtInfirmary())
+		if (isNotAtInfirmary())
 		{
 			return;
 		}
@@ -113,8 +114,8 @@ public class ShayzienInfirmaryPlugin extends Plugin
 		return (isSoldierId(npcId) && npcId % 2 == 0);
 	}
 
-	boolean isAtInfirmary()
+	boolean isNotAtInfirmary()
 	{
-		return client.getLocalPlayer().getWorldLocation().getRegionID() == 6200;
+		return client.getLocalPlayer().getWorldLocation().getRegionID() != 6200;
 	}
 }
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerGroups.java b/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerGroups.java
deleted file mode 100644
index c417f413b8..0000000000
--- a/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerGroups.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package net.runelite.client.plugins.shiftwalker;
-
-// import java.util.HashSet;
-
-public final class ShiftWalkerGroups
-{
-	/*//Specific Targets to limit the walking to
-	private static final String BOX_TRAP = "BOX TRAP";
-	private static final String BOX_TRAP_SHAKING = "SHAKING BOX";
-
-	//Specific menu options to replace
-	private static final String BOX_TRAP_DISMANTLE = "DISMANTLE";
-	private static final String BOX_TRAP_CHECK = "CHECK";
-
-	private static final String ATTACK_OPTIONS_ATTACK = "ATTACK";
-
-	public static final HashSet<String> BOX_TRAP_TARGETS = new HashSet<>();
-	public static final HashSet<String> BOX_TRAP_KEYWORDS = new HashSet<>();
-	public static final HashSet<String> ATTACK_OPTIONS_KEYWORDS = new HashSet<>();
-
-	static
-	{
-		BOX_TRAP_TARGETS.add(BOX_TRAP);
-		BOX_TRAP_TARGETS.add(BOX_TRAP_SHAKING);
-
-		BOX_TRAP_KEYWORDS.add(BOX_TRAP_DISMANTLE);
-		BOX_TRAP_KEYWORDS.add(BOX_TRAP_CHECK);
-
-		ATTACK_OPTIONS_KEYWORDS.add(ATTACK_OPTIONS_ATTACK);
-	}*/
-
-}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerInputListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerInputListener.java
index 1195966d6a..b48841dc16 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerInputListener.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerInputListener.java
@@ -26,9 +26,11 @@ package net.runelite.client.plugins.shiftwalker;
 
 import java.awt.event.KeyEvent;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.client.input.KeyListener;
 
-public class ShiftWalkerInputListener implements KeyListener
+@Singleton
+class ShiftWalkerInputListener implements KeyListener
 {
 
 	@Inject
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerPlugin.java
index 7197de9eaa..d9464b1dd6 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerPlugin.java
@@ -26,6 +26,8 @@ package net.runelite.client.plugins.shiftwalker;
 
 import com.google.inject.Provides;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.FocusChanged;
 import net.runelite.client.config.ConfigManager;
 import net.runelite.client.eventbus.Subscribe;
@@ -45,7 +47,7 @@ import net.runelite.client.plugins.PluginType;
 	type = PluginType.UTILITY,
 	enabledByDefault = false
 )
-
+@Singleton
 public class ShiftWalkerPlugin extends Plugin
 {
 
@@ -63,6 +65,9 @@ public class ShiftWalkerPlugin extends Plugin
 	@Inject
 	private KeyManager keyManager;
 
+	private boolean shiftWalk;
+	private boolean shiftLoot;
+
 	@Provides
 	ShiftWalkerConfig provideConfig(ConfigManager configManager)
 	{
@@ -72,6 +77,9 @@ public class ShiftWalkerPlugin extends Plugin
 	@Override
 	public void startUp()
 	{
+		this.shiftWalk = config.shiftWalk();
+		this.shiftLoot = config.shiftLoot();
+
 		keyManager.registerKeyListener(inputListener);
 	}
 
@@ -92,14 +100,14 @@ public class ShiftWalkerPlugin extends Plugin
 
 	void startPrioritizing()
 	{
-		if (config.shiftLoot())
+		if (this.shiftLoot)
 		{
-			menuManager.addPriorityEntry(TAKE);
+			menuManager.addPriorityEntry(TAKE).setPriority(100);
 		}
 		
-		if (config.shiftWalk())
+		if (this.shiftWalk)
 		{
-			menuManager.addPriorityEntry(WALK_HERE);
+			menuManager.addPriorityEntry(WALK_HERE).setPriority(90);
 		}	
 	}
 
@@ -108,4 +116,16 @@ public class ShiftWalkerPlugin extends Plugin
 		menuManager.removePriorityEntry(TAKE);
 		menuManager.removePriorityEntry(WALK_HERE);
 	}
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (!event.getGroup().equals("shiftwalkhere"))
+		{
+			return;
+		}
+
+		this.shiftWalk = config.shiftWalk();
+		this.shiftLoot = config.shiftLoot();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/BankedCalculator.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/BankedCalculator.java
index b4f6785a96..ac7d985013 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/BankedCalculator.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/BankedCalculator.java
@@ -34,6 +34,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import javax.inject.Singleton;
 import javax.swing.BorderFactory;
 import javax.swing.Box;
 import javax.swing.BoxLayout;
@@ -56,6 +57,7 @@ import net.runelite.client.ui.DynamicGridLayout;
 import net.runelite.client.ui.FontManager;
 
 @Slf4j
+@Singleton
 public class BankedCalculator extends JPanel
 {
 	private static final DecimalFormat XP_FORMAT_COMMA = new DecimalFormat("#,###.#");
@@ -75,24 +77,24 @@ public class BankedCalculator extends JPanel
 	private Skill currentSkill;
 
 	private double totalBankedXp = 0.0f;
-	private JLabel totalLabel = new JLabel();
-	private JPanel detailConfigContainer;
-	private JPanel detailContainer;
+	private final JLabel totalLabel = new JLabel();
+	private final JPanel detailConfigContainer;
+	private final JPanel detailContainer;
 
 	// Banked Experience magic
 	private Map<Integer, Integer> bankMap = new HashMap<>();
-	private Map<String, Boolean> categoryMap = new HashMap<>();            // Check if CriticalItem Category is enabled
-	private Map<CriticalItem, CriticalItemPanel> panelMap = new HashMap<>();
-	private Map<CriticalItem, Integer> criticalMap = new HashMap<>();    // Quantity of CriticalItem inside bankMap
-	private Map<CriticalItem, Activity> activityMap = new HashMap<>();    // Selected Activity used for calculating xp
-	private Map<CriticalItem, Integer> linkedMap = new HashMap<>();        // ItemID of item that links to the CriticalItem
+	private final Map<String, Boolean> categoryMap = new HashMap<>();            // Check if CriticalItem Category is enabled
+	private final Map<CriticalItem, CriticalItemPanel> panelMap = new HashMap<>();
+	private final Map<CriticalItem, Integer> criticalMap = new HashMap<>();    // Quantity of CriticalItem inside bankMap
+	private final Map<CriticalItem, Activity> activityMap = new HashMap<>();    // Selected Activity used for calculating xp
+	private final Map<CriticalItem, Integer> linkedMap = new HashMap<>();        // ItemID of item that links to the CriticalItem
 
 	BankedCalculator(
-		SkillCalculatorPanel parent,
-		Client client,
-		UICalculatorInputArea uiInput,
-		SkillCalculatorConfig config,
-		ItemManager itemManager)
+		final SkillCalculatorPanel parent,
+		final Client client,
+		final UICalculatorInputArea uiInput,
+		final SkillCalculatorConfig config,
+		final ItemManager itemManager)
 	{
 		this.parent = parent;
 		this.client = client;
@@ -254,7 +256,7 @@ public class BankedCalculator extends JPanel
 	private void calculatedBankedMaps()
 	{
 		// Grab all CriticalItems for this skill
-		ArrayList<CriticalItem> items = CriticalItem.getBySkillName(currentSkill);
+		List<CriticalItem> items = CriticalItem.getBySkillName(currentSkill);
 
 		// Loop over all Critical Items for this skill and determine how many are in the bank
 		for (CriticalItem item : items)
@@ -329,12 +331,9 @@ public class BankedCalculator extends JPanel
 				}
 
 				// One activity and rewards no xp ignore.
-				if (activities.size() == 1)
+				if (activities.size() == 1 && activities.get(0).getXp() <= 0)
 				{
-					if (activities.get(0).getXp() <= 0)
-					{
-						return;
-					}
+					return;
 				}
 			}
 
@@ -412,7 +411,7 @@ public class BankedCalculator extends JPanel
 
 		for (String category : CriticalItem.getSkillCategories(currentSkill))
 		{
-			ArrayList<CriticalItem> items = CriticalItem.getItemsForSkillCategories(currentSkill, category);
+			List<CriticalItem> items = CriticalItem.getItemsForSkillCategories(currentSkill, category);
 			for (CriticalItem item : items)
 			{
 				Integer amount = bankMap.get(item.getItemID());
@@ -436,7 +435,7 @@ public class BankedCalculator extends JPanel
 	{
 		// This is triggered on every click so don't update if activity didn't actually change
 		Activity cur = activityMap.get(i);
-		if (cur == a)
+		if (cur != null && cur.equals(a))
 		{
 			return;
 		}
@@ -446,19 +445,16 @@ public class BankedCalculator extends JPanel
 
 		// If had a previous selection and this item links to another check for item prevention change.
 		// If there are changes adjust the Linked panel quantity as well
-		if (cur != null && i.getLinkedItemId() != -1)
+		if (cur != null && i.getLinkedItemId() != -1 && cur.isPreventLinked() != a.isPreventLinked())
 		{
-			if (cur.isPreventLinked() != a.isPreventLinked())
+			CriticalItem linked = CriticalItem.getByItemId(i.getLinkedItemId());
+			CriticalItemPanel l = panelMap.get(linked);
+			if (l != null)
 			{
-				CriticalItem linked = CriticalItem.getByItemId(i.getLinkedItemId());
-				CriticalItemPanel l = panelMap.get(linked);
-				if (l != null)
-				{
-					l.updateLinkedMap(getLinkedTotalMap(linked));
-					int amount = config.limitedBankedSecondaries() ? limitToActivitySecondaries(a, l.getAmount()) : l.getAmount();
-					l.updateAmount(amount, false);
-					l.recalculate();
-				}
+				l.updateLinkedMap(getLinkedTotalMap(linked));
+				int amount = config.limitedBankedSecondaries() ? limitToActivitySecondaries(a, l.getAmount()) : l.getAmount();
+				l.updateAmount(amount, false);
+				l.recalculate();
 			}
 		}
 
@@ -498,13 +494,11 @@ public class BankedCalculator extends JPanel
 
 		// This item has an activity selected and its preventing linked functionality?
 		Activity selected = activityMap.get(i);
-		if (selected != null && selected.isPreventLinked())
-		{
+		if (selected != null && selected.isPreventLinked()
 			// If initial request is for this item
-			if (!first)
-			{
-				return map;
-			}
+			&& !first)
+		{
+			return map;
 		}
 
 		// Add self to map
@@ -545,7 +539,13 @@ public class BankedCalculator extends JPanel
 		if (oldMapFlag)
 		{
 			CalculatorType calc = CalculatorType.getBySkill(currentSkill);
-			SwingUtilities.invokeLater(() -> openBanked(calc));
+			SwingUtilities.invokeLater(() ->
+			{
+				if (calc != null)
+				{
+					openBanked(calc);
+				}
+			});
 			return;
 		}
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/CacheSkillData.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/CacheSkillData.java
index f4f54e0f52..a427b602ac 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/CacheSkillData.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/CacheSkillData.java
@@ -35,7 +35,7 @@ class CacheSkillData
 {
 	private final Map<String, SkillData> cache = new HashMap<>();
 
-	SkillData getSkillData(String dataFile)
+	SkillData getSkillData(final String dataFile)
 	{
 		if (cache.containsKey(dataFile))
 		{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/CalculatorType.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/CalculatorType.java
index 1b3cbf818b..8874563113 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/CalculatorType.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/CalculatorType.java
@@ -25,12 +25,13 @@
  */
 package net.runelite.client.plugins.skillcalculator;
 
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import net.runelite.api.Skill;
 
 @AllArgsConstructor
-@Getter
+@Getter(AccessLevel.PACKAGE)
 public enum CalculatorType
 {
 	AGILITY(Skill.AGILITY, "skill_agility.json", false),
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java
index 709fdff390..e0b614a95a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java
@@ -35,6 +35,7 @@ import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+import javax.inject.Singleton;
 import javax.swing.BorderFactory;
 import javax.swing.Box;
 import javax.swing.JCheckBox;
@@ -58,6 +59,7 @@ import net.runelite.client.ui.components.IconTextField;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 
+@Singleton
 class SkillCalculator extends JPanel
 {
 	private static final int MAX_XP = 200_000_000;
@@ -72,7 +74,7 @@ class SkillCalculator extends JPanel
 	@Getter(AccessLevel.PACKAGE)
 	private final UICombinedActionSlot combinedActionSlot;
 	@Getter(AccessLevel.PACKAGE)
-	private final ArrayList<UIActionSlot> combinedActionSlots = new ArrayList<>();
+	private final List<UIActionSlot> combinedActionSlots = new ArrayList<>();
 	private final List<JCheckBox> bonusCheckBoxes = new ArrayList<>();
 	private final IconTextField searchBar = new IconTextField();
 
@@ -85,7 +87,7 @@ class SkillCalculator extends JPanel
 	private float lastBonus = 0.0f;
 	private CalculatorType calculatorType;
 
-	SkillCalculator(Client client, UICalculatorInputArea uiInput, SpriteManager spriteManager, ItemManager itemManager)
+	SkillCalculator(final Client client, final UICalculatorInputArea uiInput, final SpriteManager spriteManager, final ItemManager itemManager)
 	{
 		this.client = client;
 		this.uiInput = uiInput;
@@ -268,7 +270,7 @@ class SkillCalculator extends JPanel
 
 				for (JCheckBox checkBox : uiCheckBoxList)
 				{
-					if (checkBox != uiCheckBox)
+					if (checkBox != null && !checkBox.equals(uiCheckBox))
 					{
 						checkBox.setSelected(false);
 					}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPanel.java
index d7f14a0492..79684db069 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPanel.java
@@ -32,8 +32,10 @@ import java.awt.GridBagLayout;
 import java.awt.GridLayout;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import javax.inject.Singleton;
 import javax.swing.ImageIcon;
 import javax.swing.JScrollPane;
 import javax.swing.SwingUtilities;
@@ -51,6 +53,7 @@ import net.runelite.client.ui.components.materialtabs.MaterialTab;
 import net.runelite.client.ui.components.materialtabs.MaterialTabGroup;
 
 @Slf4j
+@Singleton
 class SkillCalculatorPanel extends PluginPanel
 {
 	private final SkillCalculator uiCalculator;
@@ -62,12 +65,12 @@ class SkillCalculatorPanel extends PluginPanel
 	private final MaterialTabGroup skillGroup;
 	private final MaterialTabGroup tabGroup;
 	private String currentTab;
-	private ArrayList<String> tabs = new ArrayList<>();
+	private final List<String> tabs = new ArrayList<>();
 	@Getter
 	private Map<Integer, Integer> bankMap = new HashMap<>();
-	private GridBagConstraints c;
+	private final GridBagConstraints c;
 
-	SkillCalculatorPanel(SkillIconManager iconManager, Client client, SkillCalculatorConfig config, SpriteManager spriteManager, ItemManager itemManager)
+	SkillCalculatorPanel(final SkillIconManager iconManager, final Client client, final SkillCalculatorConfig config, final SpriteManager spriteManager, final ItemManager itemManager)
 	{
 		super();
 		getScrollPane().setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS);
@@ -121,7 +124,7 @@ class SkillCalculatorPanel extends PluginPanel
 			MaterialTab tab = new MaterialTab(icon, skillGroup, null);
 			tab.setOnSelectEvent(() ->
 			{
-				if (currentCalc == calculatorType)
+				if (currentCalc != null && currentCalc.equals(calculatorType))
 				{
 					return true;
 				}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPlugin.java
index 8cb7fbc713..e6a5316cf3 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPlugin.java
@@ -31,6 +31,7 @@ import java.awt.image.BufferedImage;
 import java.util.HashMap;
 import java.util.Map;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import javax.swing.SwingUtilities;
 import lombok.Getter;
 import net.runelite.api.Client;
@@ -60,6 +61,7 @@ import net.runelite.client.util.ImageUtil;
 	description = "Enable the Skill Calculator panel",
 	tags = {"panel", "skilling"}
 )
+@Singleton
 public class SkillCalculatorPlugin extends Plugin
 {
 	@Inject
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UIActionSlot.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UIActionSlot.java
index 696fa2dfdc..819e75ad4b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UIActionSlot.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UIActionSlot.java
@@ -33,6 +33,7 @@ import java.awt.GridLayout;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
+import javax.inject.Singleton;
 import javax.swing.BorderFactory;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -47,6 +48,7 @@ import net.runelite.client.ui.ColorScheme;
 import net.runelite.client.ui.FontManager;
 import net.runelite.client.ui.components.shadowlabel.JShadowedLabel;
 
+@Singleton
 class UIActionSlot extends JPanel
 {
 	private static final Border GREEN_BORDER = new CompoundBorder(
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UICalculatorInputArea.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UICalculatorInputArea.java
index b1d9af5665..515b3997d0 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UICalculatorInputArea.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UICalculatorInputArea.java
@@ -28,16 +28,19 @@ package net.runelite.client.plugins.skillcalculator;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.GridLayout;
+import javax.inject.Singleton;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JTextField;
 import javax.swing.border.EmptyBorder;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.client.ui.ColorScheme;
 import net.runelite.client.ui.FontManager;
 import net.runelite.client.ui.components.FlatTextField;
 
-@Getter
+@Getter(AccessLevel.PACKAGE)
+@Singleton
 class UICalculatorInputArea extends JPanel
 {
 	private final JTextField uiFieldCurrentLevel;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UICombinedActionSlot.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UICombinedActionSlot.java
index a6bc9c0d52..f84cdecb23 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UICombinedActionSlot.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UICombinedActionSlot.java
@@ -30,6 +30,7 @@ import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.GridLayout;
+import javax.inject.Singleton;
 import javax.swing.BorderFactory;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -39,13 +40,14 @@ import net.runelite.client.ui.ColorScheme;
 import net.runelite.client.ui.FontManager;
 import net.runelite.client.ui.components.shadowlabel.JShadowedLabel;
 
+@Singleton
 class UICombinedActionSlot extends JPanel
 {
 	private static final Dimension ICON_SIZE = new Dimension(32, 32);
 	private final JShadowedLabel uiLabelActions;
 	private final JShadowedLabel uiLabelTitle;
 
-	UICombinedActionSlot(SpriteManager spriteManager)
+	UICombinedActionSlot(final SpriteManager spriteManager)
 	{
 		setLayout(new BorderLayout());
 		setBackground(ColorScheme.DARKER_GRAY_COLOR);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/CriticalItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/CriticalItem.java
index 688a00d3c6..983526c59a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/CriticalItem.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/CriticalItem.java
@@ -27,6 +27,7 @@ package net.runelite.client.plugins.skillcalculator.banked;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import lombok.Getter;
@@ -320,9 +321,9 @@ public enum CriticalItem
 	}
 
 	// Builds a Map to reduce looping frequency
-	private static Map<Skill, ArrayList<CriticalItem>> buildSkillItemMap()
+	private static Map<Skill, List<CriticalItem>> buildSkillItemMap()
 	{
-		Map<Skill, ArrayList<CriticalItem>> map = new HashMap<>();
+		Map<Skill, List<CriticalItem>> map = new HashMap<>();
 		for (CriticalItem item : values())
 		{
 			map.computeIfAbsent(item.getSkill(), e -> new ArrayList<>()).add(item);
@@ -331,9 +332,9 @@ public enum CriticalItem
 		return map;
 	}
 
-	private static final Map<Skill, ArrayList<CriticalItem>> bySkillName = buildSkillItemMap();
+	private static final Map<Skill, List<CriticalItem>> bySkillName = buildSkillItemMap();
 
-	public static ArrayList<CriticalItem> getBySkillName(Skill skill)
+	public static List<CriticalItem> getBySkillName(Skill skill)
 	{
 		return bySkillName.get(skill);
 	}
@@ -358,9 +359,9 @@ public enum CriticalItem
 	}
 
 	// Builds a Map to reduce looping frequency
-	private static Map<String, ArrayList<CriticalItem>> buildItemSkillCategoryMap()
+	private static Map<String, List<CriticalItem>> buildItemSkillCategoryMap()
 	{
-		Map<String, ArrayList<CriticalItem>> map = new HashMap<>();
+		Map<String, List<CriticalItem>> map = new HashMap<>();
 		for (CriticalItem item : values())
 		{
 			String key = item.getCategory() + item.skill.getName();
@@ -370,9 +371,9 @@ public enum CriticalItem
 		return map;
 	}
 
-	private static final Map<String, ArrayList<CriticalItem>> itemsBySkillCategory = buildItemSkillCategoryMap();
+	private static final Map<String, List<CriticalItem>> itemsBySkillCategory = buildItemSkillCategoryMap();
 
-	public static ArrayList<CriticalItem> getItemsForSkillCategories(Skill skill, String category)
+	public static List<CriticalItem> getItemsForSkillCategories(Skill skill, String category)
 	{
 		return itemsBySkillCategory.get(category + skill.getName());
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/Activity.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/Activity.java
index d3109c15e6..080dad9cb9 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/Activity.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/Activity.java
@@ -26,13 +26,15 @@ package net.runelite.client.plugins.skillcalculator.banked.beans;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.ItemID;
 import net.runelite.api.Skill;
 import net.runelite.client.plugins.skillcalculator.banked.CriticalItem;
 
-@Getter
+@Getter(AccessLevel.PUBLIC)
 public enum Activity
 {
 	/**
@@ -350,7 +352,7 @@ public enum Activity
 		this.preventLinked = false;
 	}
 
-	Activity(int Icon, String name, Skill skill, int level, double xp, CriticalItem criticalItem, ActivitySecondaries secondaries, boolean preventLinked)
+	Activity(final int Icon, final String name, final Skill skill, final int level, final double xp, final CriticalItem criticalItem, final ActivitySecondaries secondaries, final boolean preventLinked)
 	{
 		this.icon = Icon;
 		this.name = name;
@@ -368,7 +370,7 @@ public enum Activity
 		Map<CriticalItem, ArrayList<Activity>> map = new HashMap<>();
 		for (Activity item : values())
 		{
-			map.computeIfAbsent(item.getCriticalItem(), e -> new ArrayList<Activity>()).add(item);
+			map.computeIfAbsent(item.getCriticalItem(), e -> new ArrayList<>()).add(item);
 		}
 
 		return map;
@@ -376,7 +378,7 @@ public enum Activity
 
 	private static final Map<CriticalItem, ArrayList<Activity>> byCriticalItem = buildItemMap();
 
-	public static ArrayList<Activity> getByCriticalItem(CriticalItem item)
+	public static List<Activity> getByCriticalItem(CriticalItem item)
 	{
 
 		return byCriticalItem.getOrDefault(item, new ArrayList<>());
@@ -389,10 +391,10 @@ public enum Activity
 	 * @param limitLevel Level to check Activitiy requirements against. -1 or 0 value disables limits
 	 * @return an empty list if no activities
 	 */
-	public static ArrayList<Activity> getByCriticalItem(CriticalItem item, int limitLevel)
+	public static List<Activity> getByCriticalItem(CriticalItem item, int limitLevel)
 	{
-		ArrayList<Activity> activities = getByCriticalItem(item);
-		ArrayList<Activity> l = new ArrayList<>();
+		List<Activity> activities = getByCriticalItem(item);
+		List<Activity> l = new ArrayList<>();
 		if (limitLevel <= 0)
 		{
 			return l;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/ActivitySecondaries.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/ActivitySecondaries.java
index 94a74bd6fd..0afb3cf033 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/ActivitySecondaries.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/ActivitySecondaries.java
@@ -24,10 +24,11 @@
  */
 package net.runelite.client.plugins.skillcalculator.banked.beans;
 
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.ItemID;
 
-@Getter
+@Getter(AccessLevel.PUBLIC)
 public enum ActivitySecondaries
 {
 	/**
@@ -104,7 +105,7 @@ public enum ActivitySecondaries
 	;
 	private final SecondaryItem[] items;
 
-	ActivitySecondaries(SecondaryItem... items)
+	ActivitySecondaries(final SecondaryItem... items)
 	{
 		this.items = items;
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/SecondaryItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/SecondaryItem.java
index 68f0042fbf..0cc728d0f9 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/SecondaryItem.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/SecondaryItem.java
@@ -24,21 +24,22 @@
  */
 package net.runelite.client.plugins.skillcalculator.banked.beans;
 
+import lombok.AccessLevel;
 import lombok.Getter;
 
-@Getter
+@Getter(AccessLevel.PUBLIC)
 public class SecondaryItem
 {
 	private final int id;
 	private final int qty;
 
-	public SecondaryItem(int id, int qty)
+	SecondaryItem(int id, int qty)
 	{
 		this.id = id;
 		this.qty = qty;
 	}
 
-	public SecondaryItem(int id)
+	SecondaryItem(int id)
 	{
 		this(id, 1);
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/ui/CriticalItemPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/ui/CriticalItemPanel.java
index 5de2acfee0..1b12419ec0 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/ui/CriticalItemPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/ui/CriticalItemPanel.java
@@ -36,10 +36,10 @@ import java.awt.event.MouseEvent;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.text.DecimalFormat;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import javax.imageio.ImageIO;
+import javax.inject.Singleton;
 import javax.swing.ImageIcon;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -48,6 +48,7 @@ import javax.swing.SwingUtilities;
 import javax.swing.border.Border;
 import javax.swing.border.EmptyBorder;
 import javax.swing.border.MatteBorder;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.client.game.AsyncBufferedImage;
 import net.runelite.client.game.ItemManager;
@@ -61,6 +62,7 @@ import net.runelite.client.ui.components.materialtabs.MaterialTabGroup;
 import net.runelite.client.ui.components.shadowlabel.JShadowedLabel;
 import net.runelite.client.util.StackFormatter;
 
+@Singleton
 public class CriticalItemPanel extends JPanel
 {
 	private static final Dimension ICON_SIZE = new Dimension(36, 36);
@@ -93,9 +95,9 @@ public class CriticalItemPanel extends JPanel
 	private final CriticalItem item;
 	private final ItemManager itemManager;
 	private double xp;
-	@Getter
+	@Getter(AccessLevel.PUBLIC)
 	private int amount;
-	@Getter
+	@Getter(AccessLevel.PUBLIC)
 	private double total;
 	private Map<CriticalItem, Integer> linkedMap;
 	private JShadowedLabel labelValue;
@@ -295,7 +297,7 @@ public class CriticalItemPanel extends JPanel
 
 	private JPanel createActivitiesPanel()
 	{
-		ArrayList<Activity> activities = Activity.getByCriticalItem(item);
+		List<Activity> activities = Activity.getByCriticalItem(item);
 		if (activities == null || activities.size() == 1)
 		{
 			return null;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/beans/SkillData.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/beans/SkillData.java
index 4c2d36aa68..0d5b1cad40 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/beans/SkillData.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/beans/SkillData.java
@@ -24,9 +24,10 @@
  */
 package net.runelite.client.plugins.skillcalculator.beans;
 
+import lombok.AccessLevel;
 import lombok.Getter;
 
-@Getter
+@Getter(AccessLevel.PUBLIC)
 public class SkillData
 {
 	private SkillDataEntry[] actions;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/beans/SkillDataBonus.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/beans/SkillDataBonus.java
index 675fcb51db..6cce75a62e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/beans/SkillDataBonus.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/beans/SkillDataBonus.java
@@ -24,9 +24,10 @@
  */
 package net.runelite.client.plugins.skillcalculator.beans;
 
+import lombok.AccessLevel;
 import lombok.Getter;
 
-@Getter
+@Getter(AccessLevel.PUBLIC)
 public class SkillDataBonus
 {
 	private String name;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/beans/SkillDataEntry.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/beans/SkillDataEntry.java
index b21188d913..05ec9c878a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/beans/SkillDataEntry.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/beans/SkillDataEntry.java
@@ -24,9 +24,10 @@
  */
 package net.runelite.client.plugins.skillcalculator.beans;
 
+import lombok.AccessLevel;
 import lombok.Getter;
 
-@Getter
+@Getter(AccessLevel.PUBLIC)
 public class SkillDataEntry
 {
 	private String name;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skybox/SkyboxPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/skybox/SkyboxPlugin.java
index 55b1a37017..d91597749b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/skybox/SkyboxPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/skybox/SkyboxPlugin.java
@@ -25,6 +25,7 @@
 package net.runelite.client.plugins.skybox;
 
 import com.google.inject.Inject;
+import com.google.inject.Singleton;
 import java.io.IOException;
 import net.runelite.api.Client;
 import net.runelite.api.GameState;
@@ -42,6 +43,7 @@ import net.runelite.client.plugins.PluginDescriptor;
 	enabledByDefault = false,
 	tags = {"sky"}
 )
+@Singleton
 public class SkyboxPlugin extends Plugin
 {
 	@Inject
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/KnapsackSolver.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/KnapsackSolver.java
index dc2afab56c..5cd41a1132 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/KnapsackSolver.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/KnapsackSolver.java
@@ -26,7 +26,9 @@ package net.runelite.client.plugins.slayer;
 
 import java.util.ArrayList;
 import java.util.List;
+import javax.inject.Singleton;
 
+@Singleton
 class KnapsackSolver
 {
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/NPCPresence.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/NPCPresence.java
index cc28df5393..2877a4ad8f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/NPCPresence.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/NPCPresence.java
@@ -1,5 +1,6 @@
 package net.runelite.client.plugins.slayer;
 
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.NPC;
 
@@ -8,15 +9,15 @@ public class NPCPresence
 
 	private static final int FADE_TIMER_START = 20;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private String name;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private int combatLevel;
 
 	private int fadeTimer;
 
-	private NPCPresence(String name, int combatLevel)
+	private NPCPresence(final String name, final int combatLevel)
 	{
 		this.name = name;
 		this.combatLevel = combatLevel;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/RenderStyle.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/RenderStyle.java
index 409f4c2729..c3c0f372a2 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/RenderStyle.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/RenderStyle.java
@@ -13,7 +13,7 @@ public enum RenderStyle
 
 	private final String name;
 
-	RenderStyle(String name)
+	RenderStyle(final String name)
 	{
 		this.name = name;
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerOverlay.java
index b27925fade..52ee0770aa 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerOverlay.java
@@ -30,12 +30,14 @@ import java.awt.Point;
 import java.awt.Rectangle;
 import java.util.Set;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.ItemID;
 import net.runelite.api.widgets.WidgetItem;
 import net.runelite.client.ui.FontManager;
 import net.runelite.client.ui.overlay.WidgetItemOverlay;
 import net.runelite.client.ui.overlay.components.TextComponent;
 
+@Singleton
 class SlayerOverlay extends WidgetItemOverlay
 {
 	private final static Set<Integer> SLAYER_JEWELRY = ImmutableSet.of(
@@ -81,14 +83,12 @@ class SlayerOverlay extends WidgetItemOverlay
 		ItemID.SLAYER_RING_8
 	);
 
-	private final SlayerConfig config;
 	private final SlayerPlugin plugin;
 
 	@Inject
-	private SlayerOverlay(SlayerPlugin plugin, SlayerConfig config)
+	private SlayerOverlay(final SlayerPlugin plugin)
 	{
 		this.plugin = plugin;
-		this.config = config;
 		showOnInventory();
 		showOnEquipment();
 	}
@@ -101,7 +101,7 @@ class SlayerOverlay extends WidgetItemOverlay
 			return;
 		}
 
-		if (!config.showItemOverlay())
+		if (!plugin.isShowItemOverlay())
 		{
 			return;
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java
index b805edd030..2c9e181905 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java
@@ -45,6 +45,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import joptsimple.internal.Strings;
 import lombok.AccessLevel;
 import lombok.Getter;
@@ -107,6 +108,7 @@ import net.runelite.http.api.chat.ChatClient;
 )
 @PluginDependency(XpTrackerPlugin.class)
 @Slf4j
+@Singleton
 public class SlayerPlugin extends Plugin
 {
 	//Chat messages
@@ -140,7 +142,7 @@ public class SlayerPlugin extends Plugin
 
 	// Superiors
 	@VisibleForTesting
-	static List<String> SUPERIOR_SLAYER_MONSTERS = Arrays.asList(
+	static final List<String> SUPERIOR_SLAYER_MONSTERS = Arrays.asList(
 		"crushing hand",
 		"chasm crawler",
 		"screaming banshee",
@@ -237,10 +239,10 @@ public class SlayerPlugin extends Plugin
 	private int cachedPoints;
 	private Instant infoTimer;
 	private List<String> targetNames = new ArrayList<>();
-	private List<Integer> targetIds = new ArrayList<>();
+	private final List<Integer> targetIds = new ArrayList<>();
 	private boolean checkAsTokens = true;
 
-	private List<NPCPresence> lingeringPresences = new ArrayList<>();
+	private final List<NPCPresence> lingeringPresences = new ArrayList<>();
 	private SlayerXpDropLookup slayerXpDropLookup = null;
 
 	private SlayerTaskPanel panel;
@@ -254,9 +256,39 @@ public class SlayerPlugin extends Plugin
 		lingeringPresences.clear();
 	}
 
+	private boolean showInfobox;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showItemOverlay;
+	@Setter(AccessLevel.PACKAGE)
+	private boolean showSuperiorNotification;
+	private int statTimeout;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean highlightTargets;
+	@Getter(AccessLevel.PACKAGE)
+	private RenderStyle renderStyle;
+	@Getter(AccessLevel.PACKAGE)
+	private Color getTargetColor;
+	@Getter(AccessLevel.PACKAGE)
+	private Color getSuperiorColor;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean drawNames;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean drawMinimapNames;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean weaknessPrompt;
+	@Setter(AccessLevel.PACKAGE)
+	private boolean taskCommand;
+	private String taskName;
+	private String taskLocation;
+	private int amount;
+	private int initialAmount;
+	private int lastCertainAmount;
+
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
+
 		overlayManager.add(overlay);
 		overlayManager.add(targetClickboxOverlay);
 		overlayManager.add(targetWeaknessOverlay);
@@ -321,11 +353,10 @@ public class SlayerPlugin extends Plugin
 				currentTask.setPaused(true);
 				break;
 			case LOGGED_IN:
-				if (loginTick && config.amount() != -1
-					&& !config.taskName().isEmpty())
+				if (loginTick && this.amount != -1
+					&& !this.taskName.isEmpty())
 				{
-					streak = config.streak();
-					setTask(config.taskName(), config.amount(), config.initialAmount(), true, config.taskLocation(), config.lastCertainAmount());
+					setTask(this.taskName, this.amount, this.initialAmount, true, this.taskLocation, this.lastCertainAmount);
 				}
 		}
 	}
@@ -333,10 +364,20 @@ public class SlayerPlugin extends Plugin
 	private void save()
 	{
 		config.amount(currentTask.getAmount());
+		this.amount = currentTask.getAmount();
+
 		config.initialAmount(currentTask.getInitialAmount());
+		this.initialAmount = currentTask.getInitialAmount();
+
 		config.taskName(currentTask.getTaskName());
+		this.taskName = currentTask.getTaskName();
+
 		config.taskLocation(currentTask.getTaskLocation());
+		this.taskLocation = currentTask.getTaskLocation();
+
 		config.lastCertainAmount(currentTask.getLastCertainAmount());
+		this.lastCertainAmount = currentTask.getLastCertainAmount();
+
 		config.streak(streak);
 	}
 
@@ -383,7 +424,7 @@ public class SlayerPlugin extends Plugin
 
 		setPoints(client.getVar(Varbits.SLAYER_REWARD_POINTS));
 
-		if (!config.showInfobox())
+		if (!this.showInfobox)
 		{
 			return;
 		}
@@ -554,7 +595,7 @@ public class SlayerPlugin extends Plugin
 		if (infoTimer != null)
 		{
 			Duration timeSinceInfobox = Duration.between(infoTimer, Instant.now());
-			Duration statTimeout = Duration.ofMinutes(config.statTimeout());
+			Duration statTimeout = Duration.ofMinutes(this.statTimeout);
 
 			if (timeSinceInfobox.compareTo(statTimeout) >= 0)
 			{
@@ -610,7 +651,7 @@ public class SlayerPlugin extends Plugin
 			return;
 		}
 
-		if (config.showSuperiorNotification() && chatMsg.equals(CHAT_SUPERIOR_MESSAGE))
+		if (this.showSuperiorNotification && chatMsg.equals(CHAT_SUPERIOR_MESSAGE))
 		{
 			notifier.notify(CHAT_SUPERIOR_MESSAGE);
 			return;
@@ -728,7 +769,9 @@ public class SlayerPlugin extends Plugin
 			return;
 		}
 
-		if (config.showInfobox())
+		updateConfig();
+
+		if (this.showInfobox)
 		{
 			clientThread.invoke(this::addCounter);
 		}
@@ -758,7 +801,7 @@ public class SlayerPlugin extends Plugin
 		currentTask.setPaused(false); // no longer paused since xp is gained
 		panel.updateCurrentTask(true, currentTask.isPaused(), currentTask, false);
 
-		if (!config.showInfobox())
+		if (!this.showInfobox)
 		{
 			return;
 		}
@@ -961,7 +1004,7 @@ public class SlayerPlugin extends Plugin
 
 	private void addCounter()
 	{
-		if (!config.showInfobox() || counter != null || currentTask == null || Strings.isNullOrEmpty(currentTask.getTaskName()))
+		if (!this.showInfobox || counter != null || currentTask == null || Strings.isNullOrEmpty(currentTask.getTaskName()))
 		{
 			return;
 		}
@@ -1006,7 +1049,7 @@ public class SlayerPlugin extends Plugin
 
 	void taskLookup(ChatMessage chatMessage, String message)
 	{
-		if (!config.taskCommand())
+		if (!this.taskCommand)
 		{
 			return;
 		}
@@ -1150,4 +1193,25 @@ public class SlayerPlugin extends Plugin
 		this.points = points;
 		this.cachedPoints = points;
 	}
+
+	private void updateConfig()
+	{
+		this.showInfobox = config.showInfobox();
+		this.showItemOverlay = config.showItemOverlay();
+		this.showSuperiorNotification = config.showSuperiorNotification();
+		this.statTimeout = config.statTimeout();
+		this.highlightTargets = config.highlightTargets();
+		this.renderStyle = config.renderStyle();
+		this.getTargetColor = config.getTargetColor();
+		this.getSuperiorColor = config.getSuperiorColor();
+		this.drawNames = config.drawNames();
+		this.drawMinimapNames = config.drawMinimapNames();
+		this.weaknessPrompt = config.weaknessPrompt();
+		this.taskCommand = config.taskCommand();
+		this.taskName = config.taskName();
+		this.amount = config.amount();
+		this.initialAmount = config.initialAmount();
+		this.lastCertainAmount = config.lastCertainAmount();
+		this.taskLocation = config.taskLocation();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerTaskPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerTaskPanel.java
index 0cd238a6d3..d9eb0d0065 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerTaskPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerTaskPanel.java
@@ -8,6 +8,7 @@ import java.awt.event.MouseEvent;
 import java.awt.image.BufferedImage;
 import java.util.ArrayList;
 import java.util.List;
+import javax.inject.Singleton;
 import javax.swing.Box;
 import javax.swing.BoxLayout;
 import javax.swing.ImageIcon;
@@ -23,6 +24,7 @@ import net.runelite.client.util.ColorUtil;
 import net.runelite.client.util.ImageUtil;
 import net.runelite.client.util.StackFormatter;
 
+@Singleton
 public class SlayerTaskPanel extends PluginPanel
 {
 	private static final long MILLIS_PER_SECOND = 1000;
@@ -193,8 +195,8 @@ public class SlayerTaskPanel extends PluginPanel
 		overallInfo.setBackground(ColorScheme.DARKER_GRAY_COLOR);
 		overallInfo.setLayout(new GridLayout(2, 1));
 		overallInfo.setBorder(new EmptyBorder(2, 10, 2, 0));
-		overallKillsLabel.setFont(FontManager.getRunescapeSmallFont());
-		overallTimeLabel.setFont(FontManager.getRunescapeSmallFont());
+		overallKillsLabel.setFont(FontManager.getSmallFont(getFont()));
+		overallTimeLabel.setFont(FontManager.getSmallFont(getFont()));
 		overallInfo.add(overallKillsLabel);
 		overallInfo.add(overallTimeLabel);
 		overallPanel.add(overallIcon, BorderLayout.WEST);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TargetClickboxOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TargetClickboxOverlay.java
index 12eeac7ead..b939fbdc2a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TargetClickboxOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TargetClickboxOverlay.java
@@ -32,6 +32,7 @@ import java.awt.Graphics2D;
 import java.awt.Polygon;
 import java.util.Set;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.NPC;
 import net.runelite.api.NPCDefinition;
@@ -46,20 +47,19 @@ import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayUtil;
 import net.runelite.client.util.Text;
 
+@Singleton
 public class TargetClickboxOverlay extends Overlay
 {
 	private static final Color TRANSPARENT = new Color(0, 0, 0, 0);
 
 	private final Client client;
-	private final SlayerConfig config;
 	private final SlayerPlugin plugin;
 	private final ModelOutlineRenderer modelOutliner;
 
 	@Inject
-	TargetClickboxOverlay(Client client, SlayerConfig config, SlayerPlugin plugin, ModelOutlineRenderer modelOutlineRenderer)
+	TargetClickboxOverlay(final Client client, final SlayerPlugin plugin, final ModelOutlineRenderer modelOutlineRenderer)
 	{
 		this.client = client;
-		this.config = config;
 		this.plugin = plugin;
 		this.modelOutliner = modelOutlineRenderer;
 		setPosition(OverlayPosition.DYNAMIC);
@@ -69,7 +69,7 @@ public class TargetClickboxOverlay extends Overlay
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (config.highlightTargets())
+		if (plugin.isHighlightTargets())
 		{
 			Set<NPC> targets = plugin.getHighlightedTargets();
 			for (NPC target : targets)
@@ -79,11 +79,11 @@ public class TargetClickboxOverlay extends Overlay
 					continue;
 				}
 
-				Color coloration = config.getTargetColor();
+				Color coloration = plugin.getGetTargetColor();
 
 				if (plugin.isSuperior(target.getName()))
 				{
-					coloration = config.getSuperiorColor();
+					coloration = plugin.getGetSuperiorColor();
 				}
 
 				renderNpcOverlay(graphics, target, coloration);
@@ -95,7 +95,7 @@ public class TargetClickboxOverlay extends Overlay
 
 	private void renderNpcOverlay(Graphics2D graphics, NPC actor, Color color)
 	{
-		switch (config.renderStyle())
+		switch (plugin.getRenderStyle())
 		{
 			case SOUTH_WEST_TILE:
 				LocalPoint lp1 = LocalPoint.fromWorld(client, actor.getWorldLocation());
@@ -168,7 +168,7 @@ public class TargetClickboxOverlay extends Overlay
 				break;
 		}
 
-		if (config.drawNames())
+		if (plugin.isDrawNames())
 		{
 			String npcName = Text.removeTags(actor.getName());
 			Point textLocation = actor.getCanvasTextLocation(graphics, npcName, actor.getLogicalHeight() + 40);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TargetMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TargetMinimapOverlay.java
index ceb81e6cd2..6799c49674 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TargetMinimapOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TargetMinimapOverlay.java
@@ -31,6 +31,7 @@ import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.util.Set;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.NPC;
 import net.runelite.api.Point;
 import net.runelite.client.ui.overlay.Overlay;
@@ -38,15 +39,14 @@ import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayUtil;
 
+@Singleton
 public class TargetMinimapOverlay extends Overlay
 {
-	private final SlayerConfig config;
 	private final SlayerPlugin plugin;
 
 	@Inject
-	TargetMinimapOverlay(SlayerConfig config, SlayerPlugin plugin)
+	TargetMinimapOverlay(final SlayerPlugin plugin)
 	{
-		this.config = config;
 		this.plugin = plugin;
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_WIDGETS);
@@ -55,7 +55,7 @@ public class TargetMinimapOverlay extends Overlay
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (!config.highlightTargets())
+		if (!plugin.isHighlightTargets())
 		{
 			return null;
 		}
@@ -68,11 +68,11 @@ public class TargetMinimapOverlay extends Overlay
 				continue;
 			}
 
-			Color coloration = config.getTargetColor();
+			Color coloration = plugin.getGetTargetColor();
 
 			if (plugin.isSuperior(target.getName()))
 			{
-				coloration = config.getSuperiorColor();
+				coloration = plugin.getGetSuperiorColor();
 			}
 
 			renderTargetOverlay(graphics, target, target.getName(), coloration);
@@ -88,7 +88,7 @@ public class TargetMinimapOverlay extends Overlay
 		{
 			OverlayUtil.renderMinimapLocation(graphics, minimapLocation, color);
 
-			if (config.drawMinimapNames())
+			if (plugin.isDrawMinimapNames())
 			{
 				OverlayUtil.renderTextLocation(graphics, minimapLocation, name, color);
 			}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TargetWeaknessOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TargetWeaknessOverlay.java
index 7a113607ee..cdc86c6992 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TargetWeaknessOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TargetWeaknessOverlay.java
@@ -28,6 +28,7 @@ import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.NPC;
 import net.runelite.api.Perspective;
@@ -40,19 +41,18 @@ import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayUtil;
 
+@Singleton
 class TargetWeaknessOverlay extends Overlay
 {
 	private final Client client;
-	private final SlayerConfig config;
 	private final SlayerPlugin plugin;
 	private final ItemManager itemManager;
 	private final NPCManager npcManager;
 
 	@Inject
-	private TargetWeaknessOverlay(Client client, SlayerConfig config, SlayerPlugin plugin, ItemManager itemManager, NPCManager npcManager)
+	private TargetWeaknessOverlay(final Client client, final SlayerPlugin plugin, final ItemManager itemManager, final NPCManager npcManager)
 	{
 		this.client = client;
-		this.config = config;
 		this.plugin = plugin;
 		this.itemManager = itemManager;
 		this.npcManager = npcManager;
@@ -63,7 +63,7 @@ class TargetWeaknessOverlay extends Overlay
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (!config.weaknessPrompt())
+		if (!plugin.isWeaknessPrompt())
 		{
 			return null;
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/Task.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/Task.java
index 5c32ba6e73..538c5326bc 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/Task.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/Task.java
@@ -32,11 +32,12 @@ import static java.util.Arrays.asList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.ItemID;
 import net.runelite.api.NpcID;
 
-@Getter
+@Getter(AccessLevel.PACKAGE)
 enum Task
 {
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TaskBox.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TaskBox.java
index ff3b509898..75e7c8327a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TaskBox.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TaskBox.java
@@ -6,6 +6,7 @@ import java.awt.Dimension;
 import java.awt.image.BufferedImage;
 import java.text.DecimalFormat;
 import java.util.Collections;
+import javax.inject.Singleton;
 import javax.swing.ImageIcon;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -20,6 +21,7 @@ import net.runelite.client.ui.FontManager;
 import net.runelite.client.ui.components.ProgressBar;
 import net.runelite.client.util.StackFormatter;
 
+@Singleton
 class TaskBox extends JPanel
 {
 	private static final long MILLIS_PER_SECOND = 1000;
@@ -275,8 +277,8 @@ class TaskBox extends JPanel
 			return Long.MAX_VALUE;
 		}
 		double timePerKill = ((double) taskData.getElapsedTime()) / ((double) killsInElapsedTime);
-		double remainingTime = timePerKill * taskData.getAmount();
-		return (long) remainingTime;
+
+		return (long) timePerKill * taskData.getAmount();
 	}
 
 	private static String htmlLabel(long timeMillis)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TaskCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TaskCounter.java
index 01f9b03890..ae7c2c67e4 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TaskCounter.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/TaskCounter.java
@@ -30,7 +30,7 @@ import net.runelite.client.ui.overlay.infobox.Counter;
 
 class TaskCounter extends Counter
 {
-	TaskCounter(BufferedImage img, Plugin plugin, int amount)
+	TaskCounter(final BufferedImage img, final Plugin plugin, final int amount)
 	{
 		super(img, plugin, amount);
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayermusiq/QuestGuideLinks.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayermusiq/QuestGuideLinks.java
index 59b1b31e8c..e14b883286 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/slayermusiq/QuestGuideLinks.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayermusiq/QuestGuideLinks.java
@@ -159,8 +159,8 @@ class QuestGuideLinks
 	private static class Link
 	{
 
-		private String questName;
-		private String url;
+		private final String questName;
+		private final String url;
 
 		Link(String questName, String url)
 		{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayermusiq/SlayermusiqPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayermusiq/SlayermusiqPlugin.java
index 9584d17c34..682f39ba2f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/slayermusiq/SlayermusiqPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayermusiq/SlayermusiqPlugin.java
@@ -54,6 +54,7 @@ package net.runelite.client.plugins.slayermusiq;
 import com.google.common.primitives.Ints;
 import java.util.Arrays;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
 import net.runelite.api.MenuAction;
@@ -75,7 +76,7 @@ import net.runelite.client.util.Text;
 	type = PluginType.UTILITY,
 	enabledByDefault = false
 )
-
+@Singleton
 @Slf4j
 public class SlayermusiqPlugin extends Plugin
 {
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingOverlay.java
index 3e9cad459d..017aef6ddd 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingOverlay.java
@@ -30,6 +30,7 @@ import java.awt.Graphics2D;
 import java.time.Duration;
 import java.time.Instant;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import static net.runelite.api.AnimationID.SMITHING_CANNONBALL;
 import static net.runelite.api.AnimationID.SMITHING_SMELTING;
 import net.runelite.api.Client;
@@ -45,6 +46,7 @@ import net.runelite.client.ui.overlay.components.TitleComponent;
 import net.runelite.client.ui.overlay.components.table.TableAlignment;
 import net.runelite.client.ui.overlay.components.table.TableComponent;
 
+@Singleton
 class SmeltingOverlay extends Overlay
 {
 	private static final int SMELT_TIMEOUT = 5;
@@ -56,7 +58,7 @@ class SmeltingOverlay extends Overlay
 	private final PanelComponent panelComponent = new PanelComponent();
 
 	@Inject
-	SmeltingOverlay(Client client, SmeltingPlugin plugin, XpTrackerService xpTrackerService)
+	SmeltingOverlay(final Client client, final SmeltingPlugin plugin, final XpTrackerService xpTrackerService)
 	{
 		super(plugin);
 		this.client = client;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingPlugin.java
index 21a3b5440b..9d821ad6ab 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingPlugin.java
@@ -28,10 +28,12 @@ import com.google.inject.Provides;
 import java.time.Duration;
 import java.time.Instant;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.ChatMessageType;
 import net.runelite.api.events.ChatMessage;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.GameTick;
 import net.runelite.client.config.ConfigManager;
 import net.runelite.client.eventbus.Subscribe;
@@ -46,6 +48,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	description = "Show Smelting stats",
 	tags = {"overlay", "skilling"}
 )
+@Singleton
 @PluginDependency(XpTrackerPlugin.class)
 public class SmeltingPlugin extends Plugin
 {
@@ -61,6 +64,8 @@ public class SmeltingPlugin extends Plugin
 	@Getter(AccessLevel.PACKAGE)
 	private SmeltingSession session;
 
+	private int statTimeout;
+
 	@Provides
 	SmeltingConfig getConfig(ConfigManager configManager)
 	{
@@ -70,6 +75,7 @@ public class SmeltingPlugin extends Plugin
 	@Override
 	protected void startUp()
 	{
+		this.statTimeout = config.statTimeout();
 		session = null;
 		overlayManager.add(overlay);
 	}
@@ -112,7 +118,7 @@ public class SmeltingPlugin extends Plugin
 	{
 		if (session != null)
 		{
-			final Duration statTimeout = Duration.ofMinutes(config.statTimeout());
+			final Duration statTimeout = Duration.ofMinutes(this.statTimeout);
 			final Duration sinceCaught = Duration.between(session.getLastItemSmelted(), Instant.now());
 
 			if (sinceCaught.compareTo(statTimeout) >= 0)
@@ -121,5 +127,16 @@ public class SmeltingPlugin extends Plugin
 			}
 		}
 	}
+
+	@Subscribe
+	private void onConfigChanged(ConfigChanged event)
+	{
+		if (!event.getGroup().equals("smelting"))
+		{
+			return;
+		}
+
+		this.statTimeout = config.statTimeout();
+	}
 }
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/SpawnTimerConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/SpawnTimerConfig.java
index 299122edf5..9b14734ebd 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/SpawnTimerConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/SpawnTimerConfig.java
@@ -1,11 +1,10 @@
 package net.runelite.client.plugins.spawntimer;
 
+import java.awt.Color;
 import net.runelite.client.config.Config;
 import net.runelite.client.config.ConfigGroup;
 import net.runelite.client.config.ConfigItem;
 
-import java.awt.*;
-
 @ConfigGroup("spawntimer")
 public interface SpawnTimerConfig extends Config 
 {
@@ -19,6 +18,7 @@ public interface SpawnTimerConfig extends Config
 	{
 		return "";
 	}
+
 	@ConfigItem(
 		position = 2,
 		keyName = "npcColor",
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/SpawnTimerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/SpawnTimerOverlay.java
index f823cf3308..fe00ea22af 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/SpawnTimerOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/SpawnTimerOverlay.java
@@ -1,40 +1,36 @@
 package net.runelite.client.plugins.spawntimer;
 
-import net.runelite.api.*;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics2D;
+import java.util.List;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import net.runelite.api.NPC;
 import net.runelite.api.Point;
-import net.runelite.client.plugins.spawntimer.SpawnTimerPlugin;
-import net.runelite.client.plugins.spawntimer.SpawnTimerConfig;
 import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayUtil;
 import net.runelite.client.util.WildcardMatcher;
 
-import javax.inject.Inject;
-import java.awt.*;
-import java.util.ArrayList;
-import java.util.List;
-
+@Singleton
 public class SpawnTimerOverlay extends Overlay
 {
-	private final Client client;
-	private final SpawnTimerConfig config;
 	private final SpawnTimerPlugin plugin;
-	private List<String> highlights = new ArrayList<>();
+
 	@Inject
-	SpawnTimerOverlay(Client client, SpawnTimerConfig config, SpawnTimerPlugin plugin)
+	SpawnTimerOverlay(final SpawnTimerPlugin plugin)
 	{
-		this.client = client;
-		this.config = config;
 		this.plugin = plugin;
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_SCENE);
 	}
 
 	@Override
-	public Dimension render(Graphics2D graphics) 
+	public Dimension render(Graphics2D graphics)
 	{
-		highlights = plugin.getHighlights();
+		List<String> highlights = plugin.getHighlights();
 		for (thing npc : plugin.getTicks())
 		{
 			if (npc == null)
@@ -56,13 +52,13 @@ public class SpawnTimerOverlay extends Overlay
 				{
 					int tick = plugin.getCurrentTick() - npc.getTick();
 					String tickString = "" + tick;
-					renderNpcOverlay(graphics, npc.getNpc(), tickString, config.getHighlightColor());
+					renderNpcOverlay(graphics, npc.getNpc(), tickString, plugin.getGetHighlightColor());
 				}
 			}
 		}
 		return null;
 	}
-	
+
 	private void renderNpcOverlay(Graphics2D graphics, NPC actor, String name, Color color)
 	{
 		Point textLocation = actor.getCanvasTextLocation(graphics, name, actor.getLogicalHeight() - 40);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/SpawnTimerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/SpawnTimerPlugin.java
index b98a2a2541..aa1e66efd0 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/SpawnTimerPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/SpawnTimerPlugin.java
@@ -2,11 +2,18 @@ package net.runelite.client.plugins.spawntimer;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.inject.Provides;
+import java.awt.Color;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Getter;
-import net.runelite.api.Client;
 import net.runelite.api.GameState;
 import net.runelite.api.NPC;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.GameStateChanged;
 import net.runelite.api.events.GameTick;
 import net.runelite.api.events.NpcDespawned;
@@ -19,24 +26,20 @@ import net.runelite.client.plugins.PluginType;
 import net.runelite.client.ui.overlay.OverlayManager;
 import net.runelite.client.util.Text;
 
-import javax.inject.Inject;
-import java.util.*;
-
 @PluginDescriptor(
-		name = "Spawn Timer",
-		description = "Shows NPC'S time since spawned",
-		tags = {"highlight", "minimap", "npcs", "overlay", "spawn", "tags", "lyzrd"},
-		type = PluginType.PVM,
-		enabledByDefault = false
+	name = "Spawn Timer",
+	description = "Shows NPC'S time since spawned",
+	tags = {"highlight", "minimap", "npcs", "overlay", "spawn", "tags", "lyzrd"},
+	type = PluginType.PVM,
+	enabledByDefault = false
 )
-
-public class SpawnTimerPlugin extends Plugin 
+@Singleton
+public class SpawnTimerPlugin extends Plugin
 {
 	@Inject
 	private OverlayManager overlayManager;
 
 
-
 	@Getter(AccessLevel.PACKAGE)
 	private final Set<NPC> highlightedNpcs = new HashSet<>();
 
@@ -46,9 +49,6 @@ public class SpawnTimerPlugin extends Plugin
 	@Inject
 	private SpawnTimerOverlay SpawnTimerOverlay;
 
-	@Inject
-	private Client client;
-
 	@Inject
 	private SpawnTimerConfig config;
 
@@ -60,9 +60,17 @@ public class SpawnTimerPlugin extends Plugin
 
 	@Getter(AccessLevel.PACKAGE)
 	public int currentTick;
+
+	private String getNpcToHighlight;
+	@Getter(AccessLevel.PACKAGE)
+	private Color getHighlightColor;
+
 	@Override
 	protected void startUp() throws Exception
 	{
+		this.getNpcToHighlight = config.getNpcToHighlight();
+		this.getHighlightColor = config.getHighlightColor();
+
 		currentTick = 0;
 		overlayManager.add(SpawnTimerOverlay);
 	}
@@ -86,7 +94,7 @@ public class SpawnTimerPlugin extends Plugin
 	public void onGameStateChanged(GameStateChanged event)
 	{
 		if (event.getGameState() == GameState.LOGIN_SCREEN ||
-				event.getGameState() == GameState.HOPPING)
+			event.getGameState() == GameState.HOPPING)
 		{
 			highlightedNpcs.clear();
 			ticks.clear();
@@ -114,21 +122,15 @@ public class SpawnTimerPlugin extends Plugin
 		if (highlightedNpcs.contains(npc))
 		{
 			highlightedNpcs.remove(npc);
-			for (Iterator<thing> iterator = ticks.iterator(); iterator.hasNext();)
-			{
-				thing t =  iterator.next();
-				if (t.getNpc() == npc) 
-				{
-					iterator.remove();
-				}
-				//currentTick = 0;
-			}
+			//currentTick = 0;
+			ticks.removeIf(t -> t.getNpc() == npc);
 		}
 	}
+
 	@VisibleForTesting
 	public List<String> getHighlights()
 	{
-		final String configNpcs = config.getNpcToHighlight().toLowerCase();
+		final String configNpcs = this.getNpcToHighlight.toLowerCase();
 
 		if (configNpcs.isEmpty())
 		{
@@ -137,4 +139,16 @@ public class SpawnTimerPlugin extends Plugin
 
 		return Text.fromCSV(configNpcs);
 	}
+
+	@Subscribe
+	private void onConfigChanged(ConfigChanged event)
+	{
+		if (!event.getGroup().equals("spawntimer"))
+		{
+			return;
+		}
+
+		this.getNpcToHighlight = config.getNpcToHighlight();
+		this.getHighlightColor = config.getHighlightColor();
+	}
 }
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/thing.java b/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/thing.java
index 45095c18f7..f90e7b271e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/thing.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/thing.java
@@ -2,7 +2,7 @@ package net.runelite.client.plugins.spawntimer;
 
 import net.runelite.api.NPC;
 
-public class thing 
+class thing
 {
 	private NPC npc;
 	private int tick;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/specbar/SpecBarPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/specbar/SpecBarPlugin.java
index 086d3d397d..d58467d9f1 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/specbar/SpecBarPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/specbar/SpecBarPlugin.java
@@ -25,6 +25,7 @@
 package net.runelite.client.plugins.specbar;
 
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.events.ScriptCallbackEvent;
 import net.runelite.client.eventbus.Subscribe;
@@ -39,7 +40,7 @@ import net.runelite.client.plugins.PluginType;
 	type = PluginType.PVP,
 	enabledByDefault = false
 )
-
+@Singleton
 public class SpecBarPlugin extends Plugin
 {
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/Boss.java b/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/Boss.java
index a9b4434797..d609ed9d9b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/Boss.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/Boss.java
@@ -26,11 +26,12 @@ package net.runelite.client.plugins.specialcounter;
 
 import com.google.common.collect.Sets;
 import java.util.Set;
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.ToString;
 import net.runelite.api.NpcID;
 
-@Getter
+@Getter(AccessLevel.PACKAGE)
 @ToString
 enum Boss
 {
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounter.java
index 482fb45089..b752cea058 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounter.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounter.java
@@ -33,15 +33,13 @@ import net.runelite.client.ui.overlay.infobox.Counter;
 
 class SpecialCounter extends Counter
 {
-	private final SpecialCounterPlugin plugin;
 	private SpecialWeapon weapon;
 	@Getter(AccessLevel.PACKAGE)
 	private final Map<String, Integer> partySpecs = new HashMap<>();
 
-	SpecialCounter(BufferedImage image, SpecialCounterPlugin plugin, int hitValue, SpecialWeapon weapon)
+	SpecialCounter(final BufferedImage image, final SpecialCounterPlugin plugin, final int hitValue, final SpecialWeapon weapon)
 	{
 		super(image, plugin, hitValue);
-		this.plugin = plugin;
 		this.weapon = weapon;
 	}
 
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 1f056ad234..3f164f87b0 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
@@ -28,6 +28,7 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Actor;
 import net.runelite.api.Client;
 import net.runelite.api.EquipmentInventorySlot;
@@ -60,6 +61,7 @@ import org.apache.commons.lang3.ArrayUtils;
 	tags = {"combat", "npcs", "overlay"},
 	enabledByDefault = false
 )
+@Singleton
 public class SpecialCounterPlugin extends Plugin
 {
 	private int currentWorld = -1;
@@ -157,20 +159,17 @@ public class SpecialCounterPlugin extends Plugin
 			int deltaExperience = hpXp - specialHitpointsExperience;
 			specialHitpointsExperience = -1;
 
-			if (deltaExperience > 0)
+			if (deltaExperience > 0 && specialWeapon != null)
 			{
-				if (specialWeapon != null)
+				int hit = getHit(specialWeapon, deltaExperience);
+
+				updateCounter(specialWeapon, null, hit);
+
+				if (!party.getMembers().isEmpty())
 				{
-					int hit = getHit(specialWeapon, deltaExperience);
-
-					updateCounter(specialWeapon, null, hit);
-
-					if (!party.getMembers().isEmpty())
-					{
-						final SpecialCounterUpdate specialCounterUpdate = new SpecialCounterUpdate(interactingId, specialWeapon, hit);
-						specialCounterUpdate.setMemberId(party.getLocalMember().getMemberId());
-						wsClient.send(specialCounterUpdate);
-					}
+					final SpecialCounterUpdate specialCounterUpdate = new SpecialCounterUpdate(interactingId, specialWeapon, hit);
+					specialCounterUpdate.setMemberId(party.getLocalMember().getMemberId());
+					wsClient.send(specialCounterUpdate);
 				}
 			}
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterUpdate.java b/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterUpdate.java
index 16eff1af25..efb8b308a8 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterUpdate.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterUpdate.java
@@ -30,7 +30,7 @@ import net.runelite.http.api.ws.messages.party.PartyMemberMessage;
 
 @Value
 @EqualsAndHashCode(callSuper = true)
-public class SpecialCounterUpdate extends PartyMemberMessage
+class SpecialCounterUpdate extends PartyMemberMessage
 {
 	private final int npcId;
 	private final SpecialWeapon weapon;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialWeapon.java b/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialWeapon.java
index 69d8d68193..ec581fe9e3 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialWeapon.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialWeapon.java
@@ -24,12 +24,13 @@
  */
 package net.runelite.client.plugins.specialcounter;
 
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import net.runelite.api.ItemID;
 
 @AllArgsConstructor
-@Getter
+@Getter(AccessLevel.PACKAGE)
 enum SpecialWeapon
 {
 	DRAGON_WARHAMMER("Dragon Warhammer", ItemID.DRAGON_WARHAMMER, false),
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/Spellbook.java b/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/Spellbook.java
index a0b292ca3c..eebfff8426 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/Spellbook.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/Spellbook.java
@@ -25,6 +25,7 @@
 package net.runelite.client.plugins.spellbook;
 
 import com.google.common.collect.ImmutableMap;
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -36,10 +37,10 @@ public enum Spellbook
 	LUNAR(2, "lunar"),
 	ARCEUUS(3, "arceuus");
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final int id;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final String configKey;
 
 	private static final ImmutableMap<Integer, Spellbook> map;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookConfig.java
index 9bc8e243f9..cb8a187300 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookConfig.java
@@ -85,51 +85,6 @@ public interface SpellbookConfig extends Config
 		return "";
 	}
 
-	@ConfigItem(
-		keyName = "standard",
-		name = "",
-		description = "",
-		hidden = true
-	)
-	default String standard()
-	{
-		return "";
-	}
-
-
-	@ConfigItem(
-		keyName = "ancient",
-		name = "",
-		description = "",
-		hidden = true
-	)
-	default String ancient()
-	{
-		return "";
-	}
-
-	@ConfigItem(
-		keyName = "lunar",
-		name = "",
-		description = "",
-		hidden = true
-	)
-	default String lunar()
-	{
-		return "";
-	}
-
-	@ConfigItem(
-		keyName = "arceuus",
-		name = "",
-		description = "",
-		hidden = true
-	)
-	default String arceuus()
-	{
-		return "";
-	}
-
 	@ConfigItem(
 		keyName = "canDrag",
 		name = "",
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookDragOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookDragOverlay.java
index 0066f841fe..4bb3a8cacc 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookDragOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookDragOverlay.java
@@ -41,12 +41,12 @@ import net.runelite.client.ui.overlay.OverlayPriority;
 @Singleton
 public class SpellbookDragOverlay extends Overlay
 {
-	private SpellbookPlugin plugin;
-	private Client client;
-	private SpriteManager spriteManager;
+	private final SpellbookPlugin plugin;
+	private final Client client;
+	private final SpriteManager spriteManager;
 
 	@Inject
-	private SpellbookDragOverlay(SpellbookPlugin plugin, Client client, SpriteManager spriteManager)
+	private SpellbookDragOverlay(final SpellbookPlugin plugin, final Client client, final SpriteManager spriteManager)
 	{
 		this.plugin = plugin;
 		this.client = client;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookMouseListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookMouseListener.java
index b4416161b3..562bf74679 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookMouseListener.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookMouseListener.java
@@ -26,15 +26,17 @@ package net.runelite.client.plugins.spellbook;
 
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseWheelEvent;
+import javax.inject.Singleton;
 import javax.swing.SwingUtilities;
 import net.runelite.client.input.MouseAdapter;
 import net.runelite.client.input.MouseWheelListener;
 
-public class SpellbookMouseListener extends MouseAdapter implements MouseWheelListener
+@Singleton
+class SpellbookMouseListener extends MouseAdapter implements MouseWheelListener
 {
 	private final SpellbookPlugin plugin;
 
-	SpellbookMouseListener(SpellbookPlugin plugin)
+	SpellbookMouseListener(final SpellbookPlugin plugin)
 	{
 		this.plugin = plugin;
 	}
@@ -42,7 +44,7 @@ public class SpellbookMouseListener extends MouseAdapter implements MouseWheelLi
 	@Override
 	public MouseEvent mouseClicked(MouseEvent event)
 	{
-		if (!plugin.isOnSpellWidget(event.getPoint()))
+		if (plugin.isNotOnSpellWidget(event.getPoint()))
 		{
 			return event;
 		}
@@ -59,7 +61,7 @@ public class SpellbookMouseListener extends MouseAdapter implements MouseWheelLi
 	@Override
 	public MouseEvent mousePressed(MouseEvent event)
 	{
-		if (!SwingUtilities.isLeftMouseButton(event) || !plugin.isOnSpellWidget(event.getPoint()) || plugin.isDragging())
+		if (!SwingUtilities.isLeftMouseButton(event) || plugin.isNotOnSpellWidget(event.getPoint()) || plugin.isDragging())
 		{
 			return event;
 		}
@@ -87,7 +89,7 @@ public class SpellbookMouseListener extends MouseAdapter implements MouseWheelLi
 	@Override
 	public MouseWheelEvent mouseWheelMoved(MouseWheelEvent event)
 	{
-		if (!plugin.isOnSpellWidget(event.getPoint()))
+		if (plugin.isNotOnSpellWidget(event.getPoint()))
 		{
 			return event;
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookPlugin.java
index 5f739ab8b5..0502330b79 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookPlugin.java
@@ -36,6 +36,7 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
@@ -70,7 +71,7 @@ import net.runelite.client.util.Text;
 	type = PluginType.UTILITY,
 	enabledByDefault = false
 )
-
+@Singleton
 @Slf4j
 public class SpellbookPlugin extends Plugin
 {
@@ -128,12 +129,17 @@ public class SpellbookPlugin extends Plugin
 	@Getter
 	private Point draggingLocation;
 
-	private Map<Integer, Spell> spells = new HashMap<>();
+	private final Map<Integer, Spell> spells = new HashMap<>();
 	private Map<Integer, Spell> tmp = null;
 	private ImmutableSet<String> notFilteredSpells;
 	private Spellbook spellbook;
 	private SpellbookMouseListener mouseListener;
 
+	private boolean enableMobile;
+	private boolean dragSpells;
+	private boolean scroll;
+	private int size;
+	private String filter;
 
 	@Provides
 	SpellbookConfig getConfig(ConfigManager configManager)
@@ -144,6 +150,8 @@ public class SpellbookPlugin extends Plugin
 	@Override
 	protected void startUp()
 	{
+		updateConfig();
+
 		refreshMagicTabOption();
 		loadFilter();
 		mouseListener = new SpellbookMouseListener(this);
@@ -177,6 +185,8 @@ public class SpellbookPlugin extends Plugin
 			return;
 		}
 
+		updateConfig();
+
 		String key = event.getKey();
 
 		if ("filter".equals(key))
@@ -260,7 +270,7 @@ public class SpellbookPlugin extends Plugin
 			mouseManager.registerMouseListener(mouseListener);
 			tmp = new HashMap<>();
 
-			if (config.scroll())
+			if (this.scroll)
 			{
 				mouseManager.registerMouseWheelListener(mouseListener);
 			}
@@ -289,7 +299,7 @@ public class SpellbookPlugin extends Plugin
 	private void refreshMagicTabOption()
 	{
 		clearMagicTabMenus();
-		if (client.getGameState() != GameState.LOGGED_IN || !config.dragSpells())
+		if (client.getGameState() != GameState.LOGGED_IN || !this.dragSpells)
 		{
 			return;
 		}
@@ -312,7 +322,7 @@ public class SpellbookPlugin extends Plugin
 	public void onScriptCallbackEvent(ScriptCallbackEvent event)
 	{
 		if (client.getVar(Varbits.FILTER_SPELLBOOK) != 0
-			|| !config.enableMobile()
+			|| !this.enableMobile
 			|| !event.getEventName().toLowerCase().contains("spell"))
 		{
 			return;
@@ -367,7 +377,7 @@ public class SpellbookPlugin extends Plugin
 		}
 		else if ("resizeSpell".equals(event.getEventName()))
 		{
-			int size = config.size();
+			int size = this.size;
 			int columns = clamp(FULL_WIDTH / size, 2, 3);
 
 			iStack[iStackSize - 2] = size;
@@ -375,7 +385,7 @@ public class SpellbookPlugin extends Plugin
 		}
 		else if ("setSpellAreaSize".equals(event.getEventName()))
 		{
-			if (!config.dragSpells())
+			if (!this.dragSpells)
 			{
 				return;
 			}
@@ -411,7 +421,7 @@ public class SpellbookPlugin extends Plugin
 		}
 		else if ("setSpellPosition".equals(event.getEventName()))
 		{
-			if (!config.dragSpells())
+			if (!this.dragSpells)
 			{
 				return;
 			}
@@ -509,7 +519,7 @@ public class SpellbookPlugin extends Plugin
 		return WordFilterMode.CONTAINS; // but probably null soz
 	}
 
-	boolean isOnSpellWidget(java.awt.Point point)
+	boolean isNotOnSpellWidget(java.awt.Point point)
 	{
 		Widget boundsWidget = client.getWidget(WidgetInfo.SPELLBOOK_FILTERED_BOUNDS);
 		if (client.getVar(VarClientInt.INVENTORY_TAB) != 6
@@ -517,15 +527,15 @@ public class SpellbookPlugin extends Plugin
 			|| boundsWidget == null
 			|| !boundsWidget.getBounds().contains(point))
 		{
-			return false;
+			return true;
 		}
 
-		return currentWidget(point) != null;
+		return currentWidget(point) == null;
 	}
 
 	private void loadFilter()
 	{
-		notFilteredSpells = ImmutableSet.copyOf(Text.fromCSV(config.filter().toLowerCase()));
+		notFilteredSpells = ImmutableSet.copyOf(Text.fromCSV(this.filter.toLowerCase()));
 	}
 
 	void startDragging(java.awt.Point point)
@@ -576,11 +586,11 @@ public class SpellbookPlugin extends Plugin
 	{
 		ImmutableSet<String> tmp = ImmutableSet.copyOf(notFilteredSpells);
 
-		for (int id : spells.keySet())
+		for (Map.Entry<Integer, Spell> spell : spells.entrySet())
 		{
-			Widget w = client.getWidget(WidgetInfo.TO_GROUP(id), WidgetInfo.TO_CHILD(id)); // y tho let me just plop in id
+			Widget w = client.getWidget(WidgetInfo.TO_GROUP(spell.getKey()), WidgetInfo.TO_CHILD(spell.getKey())); // y tho let me just plop in id
 
-			if (w == null || !w.getBounds().contains(point) || !isUnfiltered(spells.get(id).getName(), tmp))
+			if (w == null || !w.getBounds().contains(point) || !isUnfiltered(spell.getValue().getName(), tmp))
 			{
 				continue;
 			}
@@ -630,7 +640,7 @@ public class SpellbookPlugin extends Plugin
 	{
 		Widget clickedWidget = currentWidget(point);
 
-		if (clickedWidget == null || dragging || !config.scroll())
+		if (clickedWidget == null || dragging || !this.scroll)
 		{
 			return;
 		}
@@ -701,6 +711,15 @@ public class SpellbookPlugin extends Plugin
 
 	private int trueSize(Spell s)
 	{
-		return s.getSize() * 2 + config.size();
+		return s.getSize() * 2 + this.size;
+	}
+
+	private void updateConfig()
+	{
+		this.enableMobile = config.enableMobile();
+		this.dragSpells = config.dragSpells();
+		this.scroll = config.scroll();
+		this.size = config.size();
+		this.filter = config.filter();
 	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsOverlay.java
index bf2dce7138..014a1a1fdb 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsOverlay.java
@@ -26,6 +26,7 @@ package net.runelite.client.plugins.statusbars;
 
 import com.google.common.base.Strings;
 import com.google.common.primitives.Ints;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.MenuEntry;
 import net.runelite.api.Point;
@@ -44,6 +45,7 @@ import javax.inject.Inject;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 
+@Singleton
 public class StatusBarsOverlay extends Overlay
 {
 	private static final int HEIGHT = 252;
@@ -53,17 +55,15 @@ public class StatusBarsOverlay extends Overlay
 
 	private final Client client;
 	private final StatusBarsPlugin plugin;
-	private final StatusBarsConfig config;
 	private final ItemStatChangesService itemStatService;
 
 	@Inject
-	private StatusBarsOverlay(Client client, StatusBarsPlugin plugin, StatusBarsConfig config, ItemStatChangesService itemstatservice)
+	private StatusBarsOverlay(final Client client, final StatusBarsPlugin plugin, final ItemStatChangesService itemstatservice)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_WIDGETS);
 		this.client = client;
 		this.plugin = plugin;
-		this.config = config;
 		this.itemStatService = itemstatservice;
 	}
 
@@ -90,10 +90,14 @@ public class StatusBarsOverlay extends Overlay
 			}
 		}
 
-		if (curViewport == null || curWidget.isHidden())
+		if (curViewport == null)
 		{
 			return null;
 		}
+		else
+		{
+			curWidget.isHidden();
+		}
 
 		final Point offsetLeft = curViewport.getOffsetLeft();
 		final Point offsetRight = curViewport.getOffsetRight();
@@ -117,8 +121,8 @@ public class StatusBarsOverlay extends Overlay
 			offsetRightBarY = (location.getY() - offsetRight.getY());
 		}
 
-		BarRenderer left = plugin.getBarRenderers().get(config.leftBarMode());
-		BarRenderer right = plugin.getBarRenderers().get(config.rightBarMode());
+		BarRenderer left = plugin.getBarRenderers().get(plugin.getLeftBarMode());
+		BarRenderer right = plugin.getBarRenderers().get(plugin.getRightBarMode());
 
 		if (left != null)
 		{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsPlugin.java
index 93d6f94163..1936f87664 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsPlugin.java
@@ -28,6 +28,7 @@ import javax.inject.Inject;
 
 import com.google.common.collect.Maps;
 import com.google.inject.Provides;
+import javax.inject.Singleton;
 import lombok.Getter;
 import java.time.Duration;
 import java.time.Instant;
@@ -38,6 +39,7 @@ import net.runelite.api.Actor;
 import net.runelite.api.Client;
 import net.runelite.api.NPC;
 import net.runelite.api.NPCDefinition;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.GameTick;
 import net.runelite.client.config.ConfigManager;
 import net.runelite.client.eventbus.Subscribe;
@@ -61,6 +63,7 @@ import java.util.Map;
 	description = "Draws status bars next to players inventory showing currentValue and restore amounts",
 	enabledByDefault = false
 )
+@Singleton
 @PluginDependency(ItemStatPlugin.class)
 public class StatusBarsPlugin extends Plugin
 {
@@ -94,9 +97,24 @@ public class StatusBarsPlugin extends Plugin
 	@Getter(AccessLevel.PACKAGE)
 	private Instant lastCombatAction;
 
+	@Getter(AccessLevel.PUBLIC)
+	private boolean enableCounter;
+	@Getter(AccessLevel.PUBLIC)
+	private boolean enableSkillIcon;
+	@Getter(AccessLevel.PUBLIC)
+	private boolean enableRestorationBars;
+	@Getter(AccessLevel.PACKAGE)
+	private BarMode leftBarMode;
+	@Getter(AccessLevel.PACKAGE)
+	private BarMode rightBarMode;
+	private boolean toggleRestorationBars;
+	private int hideStatusBarDelay;
+
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
+
 		overlayManager.add(overlay);
 		barRenderers.put(BarMode.DISABLED, null);
 		barRenderers.put(BarMode.HITPOINTS, hitPointsRenderer);
@@ -105,7 +123,7 @@ public class StatusBarsPlugin extends Plugin
 		barRenderers.put(BarMode.SPECIAL_ATTACK, specialAttackRenderer);
 	}
 
-	void updateLastCombatAction()
+	private void updateLastCombatAction()
 	{
 		this.lastCombatAction = Instant.now();
 	}
@@ -113,10 +131,9 @@ public class StatusBarsPlugin extends Plugin
 	@Subscribe
 	public void onGameTick(GameTick gameTick)
 	{
-		if (!config.toggleRestorationBars())
+		if (!this.toggleRestorationBars)
 		{
 			overlayManager.add(overlay);
-			return;
 		}
 		else
 		{
@@ -128,25 +145,22 @@ public class StatusBarsPlugin extends Plugin
 	{
 		final Actor interacting = client.getLocalPlayer().getInteracting();
 		final boolean isNpc = interacting instanceof NPC;
-		final int combatTimeout = config.hideStatusBarDelay();
+		final int combatTimeout = this.hideStatusBarDelay;
 
 		if (isNpc)
 		{
 			final NPC npc = (NPC) interacting;
 			final NPCDefinition npcComposition = npc.getDefinition();
 			final List<String> npcMenuActions = Arrays.asList(npcComposition.getActions());
-			if (npcMenuActions.contains("Attack") && config.toggleRestorationBars())
+			if (npcMenuActions.contains("Attack") && this.toggleRestorationBars)
 			{
 				updateLastCombatAction();
 				overlayManager.add(overlay);
 			}
 		}
-		else if (lastCombatAction != null)
+		else if (lastCombatAction != null && Duration.between(getLastCombatAction(), Instant.now()).getSeconds() > combatTimeout)
 		{
-			if (Duration.between(getLastCombatAction(), Instant.now()).getSeconds() > combatTimeout)
-			{
-				overlayManager.remove(overlay);
-			}
+			overlayManager.remove(overlay);
 		}
 	}
 
@@ -162,4 +176,26 @@ public class StatusBarsPlugin extends Plugin
 	{
 		return configManager.getConfig(StatusBarsConfig.class);
 	}
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (!"statusbars".equals(event.getGroup()))
+		{
+			return;
+		}
+
+		updateConfig();
+	}
+
+	private void updateConfig()
+	{
+		this.enableCounter = config.enableCounter();
+		this.enableSkillIcon = config.enableSkillIcon();
+		this.enableRestorationBars = config.enableRestorationBars();
+		this.leftBarMode = config.leftBarMode();
+		this.rightBarMode = config.rightBarMode();
+		this.toggleRestorationBars = config.toggleRestorationBars();
+		this.hideStatusBarDelay = config.hideStatusBarDelay();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/Viewport.java b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/Viewport.java
index ce4c6e86b6..ff1703e93a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/Viewport.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/Viewport.java
@@ -24,12 +24,13 @@
  */
 package net.runelite.client.plugins.statusbars;
 
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import net.runelite.api.Point;
 import net.runelite.api.widgets.WidgetInfo;
 
-@Getter
+@Getter(AccessLevel.PACKAGE)
 @AllArgsConstructor
 enum Viewport
 {
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/config/BarMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/config/BarMode.java
index 7da3d0c308..0716177fe9 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/config/BarMode.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/config/BarMode.java
@@ -24,10 +24,11 @@
  */
 package net.runelite.client.plugins.statusbars.config;
 
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
-@Getter
+@Getter(AccessLevel.PACKAGE)
 @RequiredArgsConstructor
 public enum BarMode
 {
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/BarRenderer.java b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/BarRenderer.java
index 21ed8fd96b..7dc607c57b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/BarRenderer.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/BarRenderer.java
@@ -27,18 +27,17 @@
 
 package net.runelite.client.plugins.statusbars.renderer;
 
-import lombok.AccessLevel;
-import lombok.RequiredArgsConstructor;
-import net.runelite.api.Client;
-import net.runelite.client.plugins.statusbars.StatusBarsConfig;
-import net.runelite.client.plugins.statusbars.StatusBarsOverlay;
-import net.runelite.client.ui.FontManager;
-import net.runelite.client.ui.overlay.components.TextComponent;
-
 import java.awt.Color;
 import java.awt.Graphics2D;
 import java.awt.Image;
 import java.awt.Point;
+import lombok.AccessLevel;
+import lombok.RequiredArgsConstructor;
+import net.runelite.api.Client;
+import net.runelite.client.plugins.statusbars.StatusBarsOverlay;
+import net.runelite.client.plugins.statusbars.StatusBarsPlugin;
+import net.runelite.client.ui.FontManager;
+import net.runelite.client.ui.overlay.components.TextComponent;
 
 @RequiredArgsConstructor(access = AccessLevel.PROTECTED)
 public abstract class BarRenderer
@@ -56,13 +55,13 @@ public abstract class BarRenderer
 	private static final int ICON_AND_COUNTER_OFFSET_Y = 21;
 	private static final int OFFSET = 2;
 
-	protected final StatusBarsConfig config;
-	protected int maximumValue;
-	protected int currentValue;
-	protected int restore;
-	protected Color standardColor;
-	protected Color restoreColor;
-	protected Image icon;
+	protected final StatusBarsPlugin plugin;
+	int maximumValue;
+	int currentValue;
+	int restore;
+	Color standardColor;
+	Color restoreColor;
+	Image icon;
 
 	protected abstract void update(Client client, StatusBarsOverlay overlay);
 
@@ -75,9 +74,9 @@ public abstract class BarRenderer
 		final int filledHeight = getBarHeight(maximumValue, currentValue, height);
 		graphics.setColor(standardColor);
 		graphics.fillRect(x + PADDING,
-				y + PADDING + (height - filledHeight),
-				BAR_WIDTH - PADDING * OFFSET,
-				filledHeight - PADDING * OFFSET);
+			y + PADDING + (height - filledHeight),
+			BAR_WIDTH - PADDING * OFFSET,
+			filledHeight - PADDING * OFFSET);
 	}
 
 	private void renderIconsAndCounters(Graphics2D graphics, int x, int y)
@@ -86,7 +85,7 @@ public abstract class BarRenderer
 		final int widthOfCounter = graphics.getFontMetrics().stringWidth(counterText);
 		final int centerText = (BAR_WIDTH - PADDING) / 2 - (widthOfCounter / 2);
 
-		if (config.enableCounter())
+		if (plugin.isEnableCounter())
 		{
 			graphics.setFont(FontManager.getRunescapeSmallFont());
 			TEXT.setText(counterText);
@@ -97,7 +96,7 @@ public abstract class BarRenderer
 			TEXT.setText("");
 		}
 
-		if (config.enableSkillIcon())
+		if (plugin.isEnableSkillIcon())
 		{
 			graphics.drawImage(icon, x + ICON_AND_COUNTER_OFFSET_X + PADDING, y + ICON_AND_COUNTER_OFFSET_Y - icon.getWidth(null), null);
 			TEXT.setPosition(new Point(x + centerText + 1, y + SKILL_ICON_HEIGHT));
@@ -123,16 +122,16 @@ public abstract class BarRenderer
 			filledHeight = filledHeight - overHeal + OVERHEAL_OFFSET;
 			graphics.setColor(COLOR_OVERHEAL);
 			graphics.fillRect(x + PADDING,
-					y - filledCurrentHeight + (height - filledHeight) + HEAL_OFFSET,
-					BAR_WIDTH - PADDING * OVERHEAL_OFFSET,
-					filledHeight - PADDING * OVERHEAL_OFFSET);
+				y - filledCurrentHeight + (height - filledHeight) + HEAL_OFFSET,
+				BAR_WIDTH - PADDING * OVERHEAL_OFFSET,
+				filledHeight - PADDING * OVERHEAL_OFFSET);
 		}
 		else
 		{
 			graphics.fillRect(x + PADDING,
-					y - OVERHEAL_OFFSET - filledCurrentHeight + (height - filledHeight) + HEAL_OFFSET,
-					BAR_WIDTH - PADDING * OVERHEAL_OFFSET,
-					filledHeight + OVERHEAL_OFFSET - PADDING * OVERHEAL_OFFSET);
+				y - OVERHEAL_OFFSET - filledCurrentHeight + (height - filledHeight) + HEAL_OFFSET,
+				BAR_WIDTH - PADDING * OVERHEAL_OFFSET,
+				filledHeight + OVERHEAL_OFFSET - PADDING * OVERHEAL_OFFSET);
 		}
 	}
 
@@ -152,9 +151,13 @@ public abstract class BarRenderer
 	{
 		update(client, overlay);
 		renderBar(graphics, x, y, height);
-		if (config.enableRestorationBars())
+		if (plugin.isEnableRestorationBars())
+		{
 			renderRestore(graphics, x, y, height);
-		if (config.enableSkillIcon() || config.enableCounter())
+		}
+		if (plugin.isEnableSkillIcon() || plugin.isEnableCounter())
+		{
 			renderIconsAndCounters(graphics, x, y);
+		}
 	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/EnergyRenderer.java b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/EnergyRenderer.java
index 127aa6b601..b3a1cd5141 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/EnergyRenderer.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/EnergyRenderer.java
@@ -27,23 +27,24 @@
 
 package net.runelite.client.plugins.statusbars.renderer;
 
+import java.awt.Color;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.SpriteID;
 import net.runelite.client.game.SpriteManager;
-import net.runelite.client.plugins.statusbars.StatusBarsConfig;
 import net.runelite.client.plugins.statusbars.StatusBarsOverlay;
+import net.runelite.client.plugins.statusbars.StatusBarsPlugin;
 
-import javax.inject.Inject;
-import java.awt.Color;
-
+@Singleton
 public class EnergyRenderer extends BarRenderer
 {
 	private final SpriteManager spriteManager;
 
 	@Inject
-	public EnergyRenderer(StatusBarsConfig config, SpriteManager spriteManager)
+	public EnergyRenderer(final StatusBarsPlugin plugin, final SpriteManager spriteManager)
 	{
-		super(config);
+		super(plugin);
 		maximumValue = 100;
 		this.spriteManager = spriteManager;
 		standardColor = new Color(199, 174, 0, 220);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/HitPointsRenderer.java b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/HitPointsRenderer.java
index 68e1c29548..f9976ebe27 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/HitPointsRenderer.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/HitPointsRenderer.java
@@ -27,16 +27,17 @@
 
 package net.runelite.client.plugins.statusbars.renderer;
 
+import java.awt.Color;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.Skill;
 import net.runelite.api.VarPlayer;
 import net.runelite.client.game.SkillIconManager;
-import net.runelite.client.plugins.statusbars.StatusBarsConfig;
 import net.runelite.client.plugins.statusbars.StatusBarsOverlay;
+import net.runelite.client.plugins.statusbars.StatusBarsPlugin;
 
-import javax.inject.Inject;
-import java.awt.Color;
-
+@Singleton
 public class HitPointsRenderer extends BarRenderer
 {
 	private static final Color COLOR_STANDARD = new Color(225, 35, 0, 125);
@@ -44,9 +45,9 @@ public class HitPointsRenderer extends BarRenderer
 	private static final Color COLOR_VENOM = new Color(0, 65, 0, 150);
 
 	@Inject
-	public HitPointsRenderer(StatusBarsConfig config, SkillIconManager iconManager)
+	public HitPointsRenderer(final StatusBarsPlugin plugin, final SkillIconManager iconManager)
 	{
-		super(config);
+		super(plugin);
 		icon = iconManager.getSkillImage(Skill.HITPOINTS, true);
 		restoreColor = new Color(255, 112, 6, 150);
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/PrayerRenderer.java b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/PrayerRenderer.java
index 76ed6fadca..bf5eed9cf1 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/PrayerRenderer.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/PrayerRenderer.java
@@ -27,17 +27,18 @@
 
 package net.runelite.client.plugins.statusbars.renderer;
 
+import java.awt.Color;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.Skill;
 import net.runelite.api.Varbits;
 import net.runelite.client.game.SkillIconManager;
-import net.runelite.client.plugins.statusbars.StatusBarsConfig;
 import net.runelite.client.plugins.statusbars.StatusBarsOverlay;
+import net.runelite.client.plugins.statusbars.StatusBarsPlugin;
 import net.runelite.client.util.ImageUtil;
 
-import javax.inject.Inject;
-import java.awt.Color;
-
+@Singleton
 public class PrayerRenderer extends BarRenderer
 {
 	private static final Color COLOR_STANDARD = new Color(50, 200, 200, 175);
@@ -45,9 +46,9 @@ public class PrayerRenderer extends BarRenderer
 	private static final int SIZE = 17;
 
 	@Inject
-	public PrayerRenderer(StatusBarsConfig config, SkillIconManager iconManager)
+	public PrayerRenderer(final StatusBarsPlugin plugin, final SkillIconManager iconManager)
 	{
-		super(config);
+		super(plugin);
 		icon = ImageUtil.resizeImage(iconManager.getSkillImage(Skill.PRAYER, true), SIZE, SIZE);
 		restoreColor = new Color(57, 255, 186, 75);
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/SpecialAttackRenderer.java b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/SpecialAttackRenderer.java
index a2f43f1c2e..7ffeb06d2c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/SpecialAttackRenderer.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/renderer/SpecialAttackRenderer.java
@@ -27,24 +27,25 @@
 
 package net.runelite.client.plugins.statusbars.renderer;
 
+import java.awt.Color;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.SpriteID;
 import net.runelite.api.VarPlayer;
 import net.runelite.client.game.SpriteManager;
-import net.runelite.client.plugins.statusbars.StatusBarsConfig;
 import net.runelite.client.plugins.statusbars.StatusBarsOverlay;
+import net.runelite.client.plugins.statusbars.StatusBarsPlugin;
 
-import javax.inject.Inject;
-import java.awt.Color;
-
+@Singleton
 public class SpecialAttackRenderer extends BarRenderer
 {
 	private final SpriteManager spriteManager;
 
 	@Inject
-	public SpecialAttackRenderer(StatusBarsConfig config, SpriteManager spriteManager)
+	public SpecialAttackRenderer(final StatusBarsPlugin plugin, final SpriteManager spriteManager)
 	{
-		super(config);
+		super(plugin);
 		maximumValue = 100;
 		this.spriteManager = spriteManager;
 		standardColor = restoreColor = new Color(3, 153, 0, 195);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ItemSortTypes.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ItemSortTypes.java
index 80ae04b20d..11680b9456 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ItemSortTypes.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ItemSortTypes.java
@@ -1,9 +1,10 @@
 package net.runelite.client.plugins.stonedloottracker;
 
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
-@Getter
+@Getter(AccessLevel.PACKAGE)
 @RequiredArgsConstructor
 public enum ItemSortTypes
 {
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/StonedLootTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/StonedLootTrackerPlugin.java
index ceb85fe365..6ba61372c2 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/StonedLootTrackerPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/StonedLootTrackerPlugin.java
@@ -41,11 +41,13 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.TreeSet;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import javax.swing.SwingUtilities;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.ChatMessageType;
@@ -97,7 +99,7 @@ import net.runelite.client.util.Text;
 	type = PluginType.UTILITY,
 	enabledByDefault = false
 )
-
+@Singleton
 @Slf4j
 public class StonedLootTrackerPlugin extends Plugin
 {
@@ -160,9 +162,9 @@ public class StonedLootTrackerPlugin extends Plugin
 	private NavigationButton navButton;
 	private String eventType;
 
-	private Multimap<String, LootRecordCustom> lootRecordMultimap = ArrayListMultimap.create();
-	private Multimap<String, UniqueItemPrepared> uniques = ArrayListMultimap.create();
-	private Map<String, Integer> killCountMap = new HashMap<>();
+	private final Multimap<String, LootRecordCustom> lootRecordMultimap = ArrayListMultimap.create();
+	private final Multimap<String, UniqueItemPrepared> uniques = ArrayListMultimap.create();
+	private final Map<String, Integer> killCountMap = new HashMap<>();
 
 	// key = name, value=current killCount
 	private boolean loaded = false;
@@ -571,7 +573,7 @@ public class StonedLootTrackerPlugin extends Plugin
 		writer.deleteLootTrackerRecords(name);
 	}
 
-	public TreeSet<String> getNames()
+	public Set<String> getNames()
 	{
 		return new TreeSet<>(lootRecordMultimap.keySet());
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/BossTab.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/BossTab.java
index b59752f5f7..12179a35de 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/BossTab.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/BossTab.java
@@ -26,13 +26,15 @@ package net.runelite.client.plugins.stonedloottracker.data;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.ItemID;
 
-@Getter
+@Getter(AccessLevel.PUBLIC)
 public enum BossTab
 {
 	// Chest Rewards
@@ -119,14 +121,14 @@ public enum BossTab
 	}
 
 	// By Category Name
-	private static final Map<String, ArrayList<BossTab>> byCategoryName = buildCategoryMap();
-	public static ArrayList<BossTab> getByCategoryName(String name)
+	private static final Map<String, List<BossTab>> byCategoryName = buildCategoryMap();
+	public static List<BossTab> getByCategoryName(String name)
 	{
 		return byCategoryName.get(name.toUpperCase());
 	}
-	private static Map<String, ArrayList<BossTab>> buildCategoryMap()
+	private static Map<String, List<BossTab>> buildCategoryMap()
 	{
-		Map<String, ArrayList<BossTab>> map = new HashMap<>();
+		Map<String, List<BossTab>> map = new HashMap<>();
 		for (BossTab tab : values())
 		{
 			map.computeIfAbsent(tab.getCategory().toUpperCase(), e -> new ArrayList<>()).add(tab);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/LootRecord.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/LootRecord.java
index 5143e79591..3a8ae0a843 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/LootRecord.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/LootRecord.java
@@ -27,9 +27,10 @@ package net.runelite.client.plugins.stonedloottracker.data;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import lombok.AccessLevel;
 import lombok.Getter;
 
-@Getter
+@Getter(AccessLevel.PUBLIC)
 @Deprecated
 public class LootRecord
 {
@@ -39,7 +40,7 @@ public class LootRecord
 	private final int killCount;
 	final Collection<LootTrackerItemEntry> drops;
 
-	public LootRecord(int id, String name, int level, int kc, Collection<LootTrackerItemEntry> drops)
+	public LootRecord(final int id, final String name, final int level, final int kc, final Collection<LootTrackerItemEntry> drops)
 	{
 		this.id = id;
 		this.name = name;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/LootRecordCustom.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/LootRecordCustom.java
index ec208f8615..2d098b17f3 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/LootRecordCustom.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/LootRecordCustom.java
@@ -28,9 +28,10 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+import lombok.AccessLevel;
 import lombok.Getter;
 
-@Getter
+@Getter(AccessLevel.PUBLIC)
 public class LootRecordCustom
 {
 	private final int id;
@@ -39,7 +40,7 @@ public class LootRecordCustom
 	private final int killCount;
 	final Collection<LootTrackerItemEntry> drops;
 
-	public LootRecordCustom(int id, String name, int level, int kc, Collection<LootTrackerItemEntry> drops)
+	public LootRecordCustom(final int id, final String name, final int level, final int kc, final Collection<LootTrackerItemEntry> drops)
 	{
 		this.id = id;
 		this.name = name;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/LootRecordWriter.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/LootRecordWriter.java
index 3a03546606..13b001151c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/LootRecordWriter.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/LootRecordWriter.java
@@ -124,7 +124,7 @@ public class LootRecordWriter
 		return data;
 	}
 
-	public synchronized boolean addLootTrackerRecord(LootRecordCustom rec)
+	public synchronized void addLootTrackerRecord(LootRecordCustom rec)
 	{
 		// Grab file
 		String fileName = npcNameToFileName(rec.getName());
@@ -141,17 +141,15 @@ public class LootRecordWriter
 			file.newLine();
 			file.close();
 			bus.post(new LootTrackerRecordStored(rec));
-			return true;
 		}
 		catch (IOException ioe)
 		{
 			log.warn("Error writing loot data to file {}: {}", fileName, ioe.getMessage());
-			return false;
 		}
 	}
 
 	// Mostly used to adjust previous loot entries such as adding pet drops/abyssal sire drops
-	public synchronized boolean writeLootTrackerFile(String npcName, Collection<LootRecordCustom> loots)
+	public synchronized void writeLootTrackerFile(String npcName, Collection<LootRecordCustom> loots)
 	{
 		String fileName = npcNameToFileName(npcName);
 		File lootFile = new File(playerFolder, fileName);
@@ -168,16 +166,14 @@ public class LootRecordWriter
 			}
 			file.close();
 
-			return true;
 		}
 		catch (IOException ioe)
 		{
 			log.warn("Error rewriting loot data to file {}: {}", fileName, ioe.getMessage());
-			return false;
 		}
 	}
 
-	public synchronized boolean deleteLootTrackerRecords(String npcName)
+	public synchronized void deleteLootTrackerRecords(String npcName)
 	{
 		String fileName = npcNameToFileName(npcName);
 
@@ -186,12 +182,10 @@ public class LootRecordWriter
 		if (lootFile.delete())
 		{
 			log.debug("Deleted loot file: {}", fileName);
-			return true;
 		}
 		else
 		{
 			log.debug("Couldn't delete file: {}", fileName);
-			return false;
 		}
 	}
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/LootTrackerItemEntry.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/LootTrackerItemEntry.java
index c7215a4b5b..5d764ac750 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/LootTrackerItemEntry.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/LootTrackerItemEntry.java
@@ -25,9 +25,10 @@
  */
 package net.runelite.client.plugins.stonedloottracker.data;
 
+import lombok.AccessLevel;
 import lombok.Getter;
 
-@Getter
+@Getter(AccessLevel.PUBLIC)
 public class LootTrackerItemEntry
 {
 	private final String name;
@@ -39,7 +40,7 @@ public class LootTrackerItemEntry
 	private long haTotal;
 	private final boolean stackable;
 
-	public LootTrackerItemEntry(String name, int id, int quantity, long price, long haPrice, boolean stackable)
+	public LootTrackerItemEntry(final String name, final int id, final int quantity, final long price, final long haPrice, final boolean stackable)
 	{
 		this.name = name;
 		this.id = id;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/Pet.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/Pet.java
index 354ef2bd7c..35ff366e9c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/Pet.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/Pet.java
@@ -2,10 +2,11 @@ package net.runelite.client.plugins.stonedloottracker.data;
 
 import java.util.HashMap;
 import java.util.Map;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.ItemID;
 
-@Getter
+@Getter(AccessLevel.PUBLIC)
 public enum Pet
 {
 	// GWD Pets
@@ -46,7 +47,7 @@ public enum Pet
 	private final String[] bossNames;
 	private static final Map<String, Pet> byBossName = buildBossMap();
 
-	Pet(int id, String... bossNames)
+	Pet(final int id, final String... bossNames)
 	{
 		this.petID = id;
 		this.bossNames = bossNames;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/UniqueItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/UniqueItem.java
index 959327e293..7af2acf699 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/UniqueItem.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/data/UniqueItem.java
@@ -28,14 +28,16 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import net.runelite.api.ItemID;
 
 @RequiredArgsConstructor
-@Getter
+@Getter(AccessLevel.PUBLIC)
 public enum UniqueItem
 {
 	// Shared "Uniques" (Dropped by multiple activities)
@@ -828,7 +830,7 @@ public enum UniqueItem
 	HERBI("Herbi", ItemID.HERBI, "Herbiboar", "Pet", -1);
 
 	// Shared Unique Items
-	UniqueItem(String n, int id, String... activities)
+	UniqueItem(final String n, final int id, final String... activities)
 	{
 		this.name = n;
 		this.itemID = id;
@@ -838,7 +840,7 @@ public enum UniqueItem
 	}
 
 	// Non-Shared Unique Items
-	UniqueItem(String n, int id, String a, String set, int position)
+	UniqueItem(final String n, final int id, final String a, final String set, final int position)
 	{
 		this.name = n;
 		this.itemID = id;
@@ -873,20 +875,20 @@ public enum UniqueItem
 	}
 
 	// Returns an array of UniqueItems by an individual `activities` name
-	private static final Map<String, ArrayList<UniqueItem>> byActivityName = buildActivityMap();
-	public static ArrayList<UniqueItem> getByActivityName(String name)
+	private static final Map<String, List<UniqueItem>> byActivityName = buildActivityMap();
+	public static List<UniqueItem> getByActivityName(String name)
 	{
 		return byActivityName.get(name.toUpperCase());
 	}
-	private static Map<String, ArrayList<UniqueItem>> buildActivityMap()
+	private static Map<String, List<UniqueItem>> buildActivityMap()
 	{
-		Map<String, ArrayList<UniqueItem>> byName = new HashMap<>();
+		Map<String, List<UniqueItem>> byName = new HashMap<>();
 		for (UniqueItem item : values())
 		{
 			String[] activities = item.getActivities();
 			for (String activity : activities)
 			{
-				byName.computeIfAbsent(activity.toUpperCase(), e -> new ArrayList<UniqueItem>()).add(item);
+				byName.computeIfAbsent(activity.toUpperCase(), e -> new ArrayList<>()).add(item);
 			}
 
 		}
@@ -896,14 +898,14 @@ public enum UniqueItem
 
 	// Return an array of UniqueItems by `setName`
 	// Unused ATM
-	private static final Map<String, ArrayList<UniqueItem>> bySetName = buildSetMap();
-	public static ArrayList<UniqueItem> getBySetName(String name)
+	private static final Map<String, List<UniqueItem>> bySetName = buildSetMap();
+	public static List<UniqueItem> getBySetName(String name)
 	{
 		return bySetName.get(name.toUpperCase());
 	}
-	private static Map<String, ArrayList<UniqueItem>> buildSetMap()
+	private static Map<String, List<UniqueItem>> buildSetMap()
 	{
-		Map<String, ArrayList<UniqueItem>> byName = new HashMap<>();
+		Map<String, List<UniqueItem>> byName = new HashMap<>();
 		for (UniqueItem item : values())
 		{
 			byName.computeIfAbsent(item.getSetName().toUpperCase(), e -> new ArrayList<>()).add(item);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/ItemPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/ItemPanel.java
index 4199f3b44b..aa4947c9e3 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/ItemPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/ItemPanel.java
@@ -30,12 +30,14 @@ import java.awt.Dimension;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.GridLayout;
+import javax.inject.Singleton;
 import javax.swing.BorderFactory;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
 import javax.swing.border.Border;
 import javax.swing.border.EmptyBorder;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.client.game.ItemManager;
 import net.runelite.client.plugins.stonedloottracker.data.LootTrackerItemEntry;
@@ -44,7 +46,8 @@ import net.runelite.client.ui.FontManager;
 import net.runelite.client.ui.components.shadowlabel.JShadowedLabel;
 import net.runelite.client.util.StackFormatter;
 
-@Getter
+@Singleton
+@Getter(AccessLevel.PACKAGE)
 class ItemPanel extends JPanel
 {
 	private static final GridBagLayout LAYOUT = new GridBagLayout();
@@ -57,7 +60,7 @@ class ItemPanel extends JPanel
 
 	private LootTrackerItemEntry record;
 
-	ItemPanel(LootTrackerItemEntry record, ItemManager itemManager)
+	ItemPanel(final LootTrackerItemEntry record, final ItemManager itemManager)
 	{
 		this.record = record;
 		this.setLayout(LAYOUT);
@@ -88,7 +91,7 @@ class ItemPanel extends JPanel
 		}
 
 		JShadowedLabel labelValue = new JShadowedLabel(gpLabel);
-		labelValue.setFont(FontManager.getRunescapeSmallFont());
+		labelValue.setFont(FontManager.getSmallFont(getFont()));
 		colorLabel(labelValue, this.record.getTotal());
 		labelValue.setVerticalAlignment(SwingUtilities.TOP);
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootGrid.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootGrid.java
index b5ee9a7449..33927c6ffe 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootGrid.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootGrid.java
@@ -26,8 +26,9 @@ package net.runelite.client.plugins.stonedloottracker.ui;
 
 import java.awt.Dimension;
 import java.awt.GridLayout;
-import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
+import javax.inject.Singleton;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.SwingConstants;
@@ -37,14 +38,15 @@ import net.runelite.client.plugins.stonedloottracker.data.LootTrackerItemEntry;
 import net.runelite.client.ui.ColorScheme;
 import net.runelite.client.util.StackFormatter;
 
+@Singleton
 class LootGrid extends JPanel
 {
 	private static final int ITEMS_PER_ROW = 5;
 	private static final Dimension ITEM_SIZE = new Dimension(40, 40);
 	private final LootTrackerItemEntry[] itemsToDisplay;
-	private ItemManager itemManager;
+	private final ItemManager itemManager;
 
-	LootGrid(LootTrackerItemEntry[] itemsToDisplay, ItemManager itemManager)
+	LootGrid(final LootTrackerItemEntry[] itemsToDisplay, final ItemManager itemManager)
 	{
 		this.itemsToDisplay = itemsToDisplay;
 		this.itemManager = itemManager;
@@ -60,7 +62,7 @@ class LootGrid extends JPanel
 	 */
 	private void buildItems()
 	{
-		ArrayList<LootTrackerItemEntry> items = LootTrackerBox.dedupeClues(Arrays.asList(itemsToDisplay));
+		List<LootTrackerItemEntry> items = LootTrackerBox.dedupeClues(Arrays.asList(itemsToDisplay));
 
 		// Calculates how many rows need to be display to fit all items
 		final int rowSize = LootTrackerBox.rowSize(items.size());
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootPanel.java
index c89adcaafb..5abe89d05c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootPanel.java
@@ -32,9 +32,11 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
+import javax.inject.Singleton;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
 import javax.swing.border.EmptyBorder;
@@ -48,14 +50,15 @@ import net.runelite.client.plugins.stonedloottracker.data.UniqueItemPrepared;
 import net.runelite.client.ui.ColorScheme;
 
 @Slf4j
+@Singleton
 class LootPanel extends JPanel
 {
-	private Collection<LootRecordCustom> records;
-	private Map<Integer, Collection<UniqueItemPrepared>> uniqueMap;
-	private boolean hideUniques;
-	private ItemSortTypes sortType;
-	private boolean itemBreakdown;
-	private ItemManager itemManager;
+	private final Collection<LootRecordCustom> records;
+	private final Map<Integer, Collection<UniqueItemPrepared>> uniqueMap;
+	private final boolean hideUniques;
+	private final ItemSortTypes sortType;
+	private final boolean itemBreakdown;
+	private final ItemManager itemManager;
 	// Consolidate LTItemEntries stored by ItemID
 	private Map<Integer, LootTrackerItemEntry> consolidated;
 
@@ -63,7 +66,7 @@ class LootPanel extends JPanel
 	private boolean playbackPlaying = false;
 	private boolean cancelPlayback = false;
 
-	LootPanel(Collection<LootRecordCustom> records, Map<Integer, Collection<UniqueItemPrepared>> uniqueMap, boolean hideUnqiues, ItemSortTypes sort, boolean itemBreakdown, ItemManager itemManager)
+	LootPanel(final Collection<LootRecordCustom> records, final Map<Integer, Collection<UniqueItemPrepared>> uniqueMap, final boolean hideUnqiues, final ItemSortTypes sort, final boolean itemBreakdown, final ItemManager itemManager)
 	{
 		this.records = (records == null ? new ArrayList<>() : records);
 		this.uniqueMap = (uniqueMap == null ? new HashMap<>() : uniqueMap);
@@ -185,7 +188,7 @@ class LootPanel extends JPanel
 
 
 		Collection<LootTrackerItemEntry> itemsToDisplay = new ArrayList<>();
-		ArrayList<LootTrackerItemEntry> items = LootTrackerBox.dedupeClues(new ArrayList<>(consolidated.values()));
+		List<LootTrackerItemEntry> items = LootTrackerBox.dedupeClues(new ArrayList<>(consolidated.values()));
 		for (LootTrackerItemEntry item : items)
 		{
 			totalValue += item.getTotal();
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootTrackerBox.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootTrackerBox.java
index 1b6083505d..3008f2d421 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootTrackerBox.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootTrackerBox.java
@@ -33,6 +33,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import javax.annotation.Nullable;
+import javax.inject.Singleton;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.SwingConstants;
@@ -47,7 +48,8 @@ import net.runelite.client.ui.FontManager;
 import net.runelite.client.util.StackFormatter;
 import net.runelite.client.util.Text;
 
-@Getter
+@Singleton
+@Getter(AccessLevel.PACKAGE)
 class LootTrackerBox extends JPanel
 {
 	private static final int ITEMS_PER_ROW = 5;
@@ -58,7 +60,7 @@ class LootTrackerBox extends JPanel
 	@Getter(AccessLevel.PACKAGE)
 	private final String id;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final List<LootRecordCustom> records = new ArrayList<>();
 
 	private long totalPrice;
@@ -78,12 +80,12 @@ class LootTrackerBox extends JPanel
 		logTitle.setBackground(ColorScheme.DARKER_GRAY_COLOR.darker());
 
 		final JLabel titleLabel = new JLabel(Text.removeTags(id));
-		titleLabel.setFont(FontManager.getRunescapeSmallFont());
+		titleLabel.setFont(FontManager.getSmallFont(getFont()));
 		titleLabel.setForeground(Color.WHITE);
 
 		logTitle.add(titleLabel, BorderLayout.WEST);
 
-		subTitleLabel.setFont(FontManager.getRunescapeSmallFont());
+		subTitleLabel.setFont(FontManager.getSmallFont(getFont()));
 		subTitleLabel.setForeground(ColorScheme.LIGHT_GRAY_COLOR);
 		logTitle.add(subTitleLabel, BorderLayout.CENTER);
 
@@ -92,7 +94,7 @@ class LootTrackerBox extends JPanel
 			subTitleLabel.setText(subtitle);
 		}
 
-		priceLabel.setFont(FontManager.getRunescapeSmallFont());
+		priceLabel.setFont(FontManager.getSmallFont(getFont()));
 		priceLabel.setForeground(ColorScheme.LIGHT_GRAY_COLOR);
 		logTitle.add(priceLabel, BorderLayout.EAST);
 
@@ -182,9 +184,9 @@ class LootTrackerBox extends JPanel
 		repaint();
 	}
 
-	static ArrayList<LootTrackerItemEntry> dedupeClues(List<LootTrackerItemEntry> items)
+	static List<LootTrackerItemEntry> dedupeClues(List<LootTrackerItemEntry> items)
 	{
-		final ArrayList<LootTrackerItemEntry> newItems = new ArrayList<>();
+		final List<LootTrackerItemEntry> newItems = new ArrayList<>();
 
 		int eliteClues = 0;
 		int hardClues = 0;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootTrackerPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootTrackerPanel.java
index 50af60e653..6ce3b3cad5 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootTrackerPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/LootTrackerPanel.java
@@ -37,6 +37,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import javax.imageio.ImageIO;
+import javax.inject.Singleton;
 import javax.swing.ImageIcon;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
@@ -56,6 +57,7 @@ import net.runelite.client.ui.PluginPanel;
 import net.runelite.client.ui.components.PluginErrorPanel;
 
 @Slf4j
+@Singleton
 public class LootTrackerPanel extends PluginPanel
 {
 	private static final BufferedImage ICON_DELETE;
@@ -99,7 +101,7 @@ public class LootTrackerPanel extends PluginPanel
 	private final ItemManager itemManager;
 	private final StonedLootTrackerPlugin plugin;
 
-	public LootTrackerPanel(final ItemManager itemManager, StonedLootTrackerPlugin plugin)
+	public LootTrackerPanel(final ItemManager itemManager, final StonedLootTrackerPlugin plugin)
 	{
 		super(false);
 		this.itemManager = itemManager;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/SelectionPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/SelectionPanel.java
index 37acb992e0..510fa4491b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/SelectionPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/SelectionPanel.java
@@ -33,9 +33,10 @@ import java.awt.Image;
 import java.awt.Insets;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.util.ArrayList;
+import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
+import javax.inject.Singleton;
 import javax.swing.ImageIcon;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -49,19 +50,20 @@ import net.runelite.client.ui.ColorScheme;
 import net.runelite.client.ui.components.materialtabs.MaterialTab;
 import net.runelite.client.ui.components.materialtabs.MaterialTabGroup;
 
-public class SelectionPanel extends JPanel
+@Singleton
+class SelectionPanel extends JPanel
 {
-	private TreeSet<String> names;
-	private LootTrackerPanel parent;
-	private ItemManager itemManager;
+	private final Set<String> names;
+	private final LootTrackerPanel parent;
+	private final ItemManager itemManager;
 
 	private final static Color BACKGROUND_COLOR = ColorScheme.DARK_GRAY_COLOR;
 	private final static Color BUTTON_COLOR = ColorScheme.DARKER_GRAY_COLOR;
 	private final static Color BUTTON_HOVER_COLOR = ColorScheme.DARKER_GRAY_HOVER_COLOR;
 
-	private boolean configToggle;
+	private final boolean configToggle;
 
-	SelectionPanel(boolean configToggle, TreeSet<String> names, LootTrackerPanel parent, ItemManager itemManager)
+	SelectionPanel(final boolean configToggle, final Set<String> names, final LootTrackerPanel parent, final ItemManager itemManager)
 	{
 		this.names = names == null ? new TreeSet<>() : names;
 		this.parent = parent;
@@ -166,7 +168,7 @@ public class SelectionPanel extends JPanel
 		name.setForeground(Color.WHITE);
 		name.setVerticalAlignment(SwingConstants.CENTER);
 
-		ArrayList<BossTab> categoryTabs = BossTab.getByCategoryName(categoryName);
+		List<BossTab> categoryTabs = BossTab.getByCategoryName(categoryName);
 		for (BossTab tab : categoryTabs)
 		{
 			// Create tab (with hover effects/text)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/TextPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/TextPanel.java
index 38529cce86..e05caac244 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/TextPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/TextPanel.java
@@ -28,17 +28,20 @@ import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
+import javax.inject.Singleton;
 import javax.swing.BorderFactory;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.SwingConstants;
 import javax.swing.border.Border;
 import javax.swing.border.EmptyBorder;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.client.ui.ColorScheme;
 import net.runelite.client.util.StackFormatter;
 
-@Getter
+@Singleton
+@Getter(AccessLevel.PACKAGE)
 class TextPanel extends JPanel
 {
 	private static final GridBagLayout LAYOUT = new GridBagLayout();
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/UniqueItemPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/UniqueItemPanel.java
index e5a4c38721..e4aa3be03b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/UniqueItemPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedloottracker/ui/UniqueItemPanel.java
@@ -32,12 +32,14 @@ import java.awt.GridBagLayout;
 import java.awt.image.BufferedImage;
 import java.util.Collection;
 import java.util.Map;
+import javax.inject.Singleton;
 import javax.swing.ImageIcon;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
 import javax.swing.border.Border;
 import javax.swing.border.EmptyBorder;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.client.game.AsyncBufferedImage;
 import net.runelite.client.game.ItemManager;
@@ -46,19 +48,20 @@ import net.runelite.client.ui.ColorScheme;
 import net.runelite.client.util.ImageUtil;
 import net.runelite.client.util.StackFormatter;
 
-@Getter
+@Singleton
+@Getter(AccessLevel.PACKAGE)
 class UniqueItemPanel extends JPanel
 {
 	private ItemManager itemManager;
 
-	private final float alphaMissing = 0.35f;
-	private final float alphaHas = 1.0f;
+	private final static float alphaMissing = 0.35f;
+	private final static float alphaHas = 1.0f;
 
 	private static final Dimension panelSize = new Dimension(215, 50);
 	private static final Border panelBorder = new EmptyBorder(3, 0, 3, 0);
 	private static final Color panelBackgroundColor = ColorScheme.DARK_GRAY_COLOR;
 
-	UniqueItemPanel(Collection<UniqueItemPrepared> items, Map<UniqueItemPrepared, Integer> uniqueMap, ItemManager itemManager)
+	UniqueItemPanel(final Collection<UniqueItemPrepared> items, final Map<UniqueItemPrepared, Integer> uniqueMap, final ItemManager itemManager)
 	{
 		this.itemManager = itemManager;
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stretchedmode/StretchedModePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/stretchedmode/StretchedModePlugin.java
index cbaceb550b..1d57cdb4ee 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/stretchedmode/StretchedModePlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/stretchedmode/StretchedModePlugin.java
@@ -27,6 +27,7 @@ package net.runelite.client.plugins.stretchedmode;
 
 import com.google.inject.Provides;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.ResizeableChanged;
@@ -42,6 +43,7 @@ import net.runelite.client.plugins.PluginDescriptor;
 	tags = {"resize", "ui", "interface", "stretch", "scaling", "fixed"},
 	enabledByDefault = false
 )
+@Singleton
 public class StretchedModePlugin extends Plugin
 {
 	@Inject
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stretchedmode/TranslateMouseListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/stretchedmode/TranslateMouseListener.java
index 4720dbe98f..c2093cb32b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/stretchedmode/TranslateMouseListener.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/stretchedmode/TranslateMouseListener.java
@@ -29,15 +29,17 @@ import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.event.MouseEvent;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.client.input.MouseListener;
 
+@Singleton
 public class TranslateMouseListener implements MouseListener
 {
 	private final Client client;
 
 	@Inject
-	public TranslateMouseListener(Client client)
+	public TranslateMouseListener(final Client client)
 	{
 		this.client = client;
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stretchedmode/TranslateMouseWheelListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/stretchedmode/TranslateMouseWheelListener.java
index 2fdd39ec03..e204be23cc 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/stretchedmode/TranslateMouseWheelListener.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/stretchedmode/TranslateMouseWheelListener.java
@@ -29,15 +29,17 @@ import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.event.MouseWheelEvent;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.client.input.MouseWheelListener;
 
+@Singleton
 public class TranslateMouseWheelListener implements MouseWheelListener
 {
 	private final Client client;
 
 	@Inject
-	public TranslateMouseWheelListener(Client client)
+	public TranslateMouseWheelListener(final Client client)
 	{
 		this.client = client;
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/BlowpipeDartType.java b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/BlowpipeDartType.java
index 5ab1a31652..1d625ea7e3 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/BlowpipeDartType.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/BlowpipeDartType.java
@@ -24,6 +24,7 @@
  */
 package net.runelite.client.plugins.suppliestracker;
 
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import static net.runelite.api.ItemID.ADAMANT_DART;
@@ -45,7 +46,7 @@ public enum BlowpipeDartType
 	ADAMANT(ADAMANT_DART), RUNE(RUNE_DART),
 	DRAGON(DRAGON_DART);
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private int dartID;
 
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/ItemType.java b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/ItemType.java
index 56887d9837..c372f584ea 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/ItemType.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/ItemType.java
@@ -25,6 +25,7 @@
  */
 package net.runelite.client.plugins.suppliestracker;
 
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -41,7 +42,7 @@ public enum ItemType
 	AMMO("Ammo"),
 	TELEPORT("Teleports");
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private String label;
 
 	/**
@@ -65,7 +66,7 @@ public enum ItemType
 		{
 			return ItemType.AMMO;
 		}
-		if (item.getName().contains("rune"))
+		if (item.getName().toLowerCase().contains("rune"))
 		{
 			return ItemType.RUNE;
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/MenuAction.java b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/MenuAction.java
index 76c83d1bb6..3decf36460 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/MenuAction.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/MenuAction.java
@@ -24,6 +24,7 @@
  */
 package net.runelite.client.plugins.suppliestracker;
 
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import net.runelite.api.Item;
@@ -34,20 +35,20 @@ import net.runelite.api.Item;
 @AllArgsConstructor
 public class MenuAction
 {
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private ActionType type;
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private Item[] oldInventory;
 
 	static class ItemAction extends MenuAction
 	{
 
-		@Getter
+		@Getter(AccessLevel.PACKAGE)
 		private int itemID;
-		@Getter
+		@Getter(AccessLevel.PACKAGE)
 		private int slot;
 
-		ItemAction(ActionType type, Item[] oldInventory, int itemID, int slot)
+		ItemAction(final ActionType type, final Item[] oldInventory, final int itemID, final int slot)
 		{
 			super(type, oldInventory);
 			this.itemID = itemID;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesBox.java b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesBox.java
index ee4788a3ce..b5ef601ced 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesBox.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesBox.java
@@ -30,6 +30,7 @@ import java.awt.Color;
 import java.awt.GridLayout;
 import java.util.ArrayList;
 import java.util.List;
+import javax.inject.Singleton;
 import javax.swing.JLabel;
 import javax.swing.JMenuItem;
 import javax.swing.JPanel;
@@ -78,6 +79,7 @@ import net.runelite.client.util.StackFormatter;
 import net.runelite.client.util.Text;
 import net.runelite.http.api.item.ItemPrice;
 
+@Singleton
 class SuppliesBox extends JPanel
 {
 	private static final int ITEMS_PER_ROW = 5;
@@ -91,12 +93,12 @@ class SuppliesBox extends JPanel
 	private final SuppliesTrackerPlugin plugin;
 	private final SuppliesTrackerPanel panel;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final List<SuppliesTrackerItem> trackedItems = new ArrayList<>();
 
 	private long totalPrice;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final ItemType type;
 
 	SuppliesBox(final ItemManager itemManager, final String id,
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerItem.java
index 4333d77c8f..5347945d00 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerItem.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerItem.java
@@ -24,18 +24,16 @@
  */
 package net.runelite.client.plugins.suppliestracker;
 
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+@Getter(AccessLevel.PACKAGE)
 @AllArgsConstructor
 class SuppliesTrackerItem
 {
-	@Getter
 	private int id;
-	@Getter
 	private String name;
-	@Getter
 	private int quantity;
-	@Getter
 	private long price;
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPanel.java
index da19cc4842..983587c50c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPanel.java
@@ -31,6 +31,7 @@ import java.awt.GridLayout;
 import java.awt.image.BufferedImage;
 import java.util.ArrayList;
 import java.util.List;
+import javax.inject.Singleton;
 import javax.swing.BoxLayout;
 import javax.swing.ImageIcon;
 import javax.swing.JLabel;
@@ -46,7 +47,7 @@ import net.runelite.client.ui.components.PluginErrorPanel;
 import net.runelite.client.util.ColorUtil;
 import net.runelite.client.util.StackFormatter;
 
-
+@Singleton
 class SuppliesTrackerPanel extends PluginPanel
 {
 	private static final String HTML_LABEL_TEMPLATE =
@@ -89,8 +90,8 @@ class SuppliesTrackerPanel extends PluginPanel
 		overallInfo.setBackground(ColorScheme.DARKER_GRAY_COLOR);
 		overallInfo.setLayout(new GridLayout(2, 1));
 		overallInfo.setBorder(new EmptyBorder(0, 10, 0, 0));
-		overallSuppliesUsedLabel.setFont(FontManager.getRunescapeSmallFont());
-		overallCostLabel.setFont(FontManager.getRunescapeSmallFont());
+		overallSuppliesUsedLabel.setFont(FontManager.getSmallFont(getFont()));
+		overallCostLabel.setFont(FontManager.getSmallFont(getFont()));
 		overallInfo.add(overallSuppliesUsedLabel);
 		overallInfo.add(overallCostLabel);
 		overallPanel.add(overallIcon, BorderLayout.WEST);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java
index 3731f6df9a..6b0d864198 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java
@@ -35,9 +35,11 @@ import java.util.ArrayDeque;
 import java.util.Deque;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Random;
 import java.util.regex.Pattern;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import javax.swing.SwingUtilities;
 import lombok.extern.slf4j.Slf4j;
 import static net.runelite.api.AnimationID.BLOWPIPE_ATTACK;
@@ -47,113 +49,10 @@ import net.runelite.api.Client;
 import net.runelite.api.EquipmentInventorySlot;
 import net.runelite.api.InventoryID;
 import net.runelite.api.Item;
-import net.runelite.api.ItemDefinition;
 import net.runelite.api.ItemContainer;
+import net.runelite.api.ItemDefinition;
 import net.runelite.api.ItemID;
-import static net.runelite.api.ItemID.ACCUMULATOR_MAX_CAPE;
-import static net.runelite.api.ItemID.ADAMANT_DART;
-import static net.runelite.api.ItemID.ADAMANT_KNIFE;
-import static net.runelite.api.ItemID.ADAMANT_THROWNAXE;
-import static net.runelite.api.ItemID.ADMIRAL_PIE;
-import static net.runelite.api.ItemID.AIR_RUNE;
-import static net.runelite.api.ItemID.ANCHOVY_PIZZA;
-import static net.runelite.api.ItemID.APPLE_PIE;
-import static net.runelite.api.ItemID.ASSEMBLER_MAX_CAPE;
-import static net.runelite.api.ItemID.ASTRAL_RUNE;
-import static net.runelite.api.ItemID.AVAS_ACCUMULATOR;
-import static net.runelite.api.ItemID.AVAS_ASSEMBLER;
-import static net.runelite.api.ItemID.AVAS_ATTRACTOR;
-import static net.runelite.api.ItemID.BLACK_CHINCHOMPA;
-import static net.runelite.api.ItemID.BLACK_DART;
-import static net.runelite.api.ItemID.BLACK_KNIFE;
-import static net.runelite.api.ItemID.BLOOD_RUNE;
-import static net.runelite.api.ItemID.BODY_RUNE;
-import static net.runelite.api.ItemID.BOTANICAL_PIE;
-import static net.runelite.api.ItemID.BRONZE_DART;
-import static net.runelite.api.ItemID.BRONZE_KNIFE;
-import static net.runelite.api.ItemID.BRONZE_THROWNAXE;
-import static net.runelite.api.ItemID.CAKE;
-import static net.runelite.api.ItemID.CANNONBALL;
-import static net.runelite.api.ItemID.CHAOS_RUNE;
-import static net.runelite.api.ItemID.CHINCHOMPA_10033;
-import static net.runelite.api.ItemID.CHOCOLATE_CAKE;
-import static net.runelite.api.ItemID.CHOCOLATE_SLICE;
-import static net.runelite.api.ItemID.COINS_995;
-import static net.runelite.api.ItemID.COSMIC_RUNE;
-import static net.runelite.api.ItemID.DEATH_RUNE;
-import static net.runelite.api.ItemID.DRAGON_DART;
-import static net.runelite.api.ItemID.DRAGON_KNIFE;
-import static net.runelite.api.ItemID.DRAGON_KNIFEP;
-import static net.runelite.api.ItemID.DRAGON_KNIFEP_22808;
-import static net.runelite.api.ItemID.DRAGON_KNIFEP_22810;
-import static net.runelite.api.ItemID.DRAGON_KNIFE_22812;
-import static net.runelite.api.ItemID.DRAGON_KNIFE_22814;
-import static net.runelite.api.ItemID.DRAGON_THROWNAXE;
-import static net.runelite.api.ItemID.DUST_RUNE;
-import static net.runelite.api.ItemID.EARTH_RUNE;
-import static net.runelite.api.ItemID.FIRE_RUNE;
-import static net.runelite.api.ItemID.FISH_PIE;
-import static net.runelite.api.ItemID.GARDEN_PIE;
-import static net.runelite.api.ItemID.HALF_AN_ADMIRAL_PIE;
-import static net.runelite.api.ItemID.HALF_AN_APPLE_PIE;
-import static net.runelite.api.ItemID.HALF_A_BOTANICAL_PIE;
-import static net.runelite.api.ItemID.HALF_A_FISH_PIE;
-import static net.runelite.api.ItemID.HALF_A_GARDEN_PIE;
-import static net.runelite.api.ItemID.HALF_A_MEAT_PIE;
-import static net.runelite.api.ItemID.HALF_A_MUSHROOM_PIE;
-import static net.runelite.api.ItemID.HALF_A_REDBERRY_PIE;
-import static net.runelite.api.ItemID.HALF_A_SUMMER_PIE;
-import static net.runelite.api.ItemID.HALF_A_WILD_PIE;
-import static net.runelite.api.ItemID.IRON_DART;
-import static net.runelite.api.ItemID.IRON_KNIFE;
-import static net.runelite.api.ItemID.IRON_THROWNAXE;
-import static net.runelite.api.ItemID.LAVA_RUNE;
-import static net.runelite.api.ItemID.LAW_RUNE;
-import static net.runelite.api.ItemID.MEAT_PIE;
-import static net.runelite.api.ItemID.MEAT_PIZZA;
-import static net.runelite.api.ItemID.MIND_RUNE;
-import static net.runelite.api.ItemID.MIST_RUNE;
-import static net.runelite.api.ItemID.MITHRIL_DART;
-import static net.runelite.api.ItemID.MITHRIL_KNIFE;
-import static net.runelite.api.ItemID.MITHRIL_THROWNAXE;
-import static net.runelite.api.ItemID.MUD_RUNE;
-import static net.runelite.api.ItemID.MUSHROOM_PIE;
-import static net.runelite.api.ItemID.NATURE_RUNE;
-import static net.runelite.api.ItemID.PINEAPPLE_PIZZA;
-import static net.runelite.api.ItemID.PLAIN_PIZZA;
-import static net.runelite.api.ItemID.RANGING_CAPE;
-import static net.runelite.api.ItemID.REDBERRY_PIE;
-import static net.runelite.api.ItemID.RED_CHINCHOMPA_10034;
-import static net.runelite.api.ItemID.RUNE_DART;
-import static net.runelite.api.ItemID.RUNE_KNIFE;
-import static net.runelite.api.ItemID.RUNE_THROWNAXE;
-import static net.runelite.api.ItemID.SANGUINESTI_STAFF;
-import static net.runelite.api.ItemID.SANGUINESTI_STAFF_UNCHARGED;
-import static net.runelite.api.ItemID.SLICE_OF_CAKE;
-import static net.runelite.api.ItemID.SMOKE_RUNE;
-import static net.runelite.api.ItemID.SOUL_RUNE;
-import static net.runelite.api.ItemID.STEAM_RUNE;
-import static net.runelite.api.ItemID.STEEL_DART;
-import static net.runelite.api.ItemID.STEEL_KNIFE;
-import static net.runelite.api.ItemID.STEEL_THROWNAXE;
-import static net.runelite.api.ItemID.SUMMER_PIE;
-import static net.runelite.api.ItemID.TRIDENT_OF_THE_SEAS;
-import static net.runelite.api.ItemID.TRIDENT_OF_THE_SEAS_E;
-import static net.runelite.api.ItemID.TRIDENT_OF_THE_SEAS_FULL;
-import static net.runelite.api.ItemID.TRIDENT_OF_THE_SWAMP;
-import static net.runelite.api.ItemID.TRIDENT_OF_THE_SWAMP_E;
-import static net.runelite.api.ItemID.UNCHARGED_TOXIC_TRIDENT;
-import static net.runelite.api.ItemID.UNCHARGED_TOXIC_TRIDENT_E;
-import static net.runelite.api.ItemID.WATER_RUNE;
-import static net.runelite.api.ItemID.WILD_PIE;
-import static net.runelite.api.ItemID.WRATH_RUNE;
-import static net.runelite.api.ItemID.ZULRAHS_SCALES;
-import static net.runelite.api.ItemID._12_ANCHOVY_PIZZA;
-import static net.runelite.api.ItemID._12_MEAT_PIZZA;
-import static net.runelite.api.ItemID._12_PINEAPPLE_PIZZA;
-import static net.runelite.api.ItemID._12_PLAIN_PIZZA;
-import static net.runelite.api.ItemID._23_CAKE;
-import static net.runelite.api.ItemID._23_CHOCOLATE_CAKE;
+import static net.runelite.api.ItemID.*;
 import net.runelite.api.Player;
 import net.runelite.api.VarPlayer;
 import net.runelite.api.events.AnimationChanged;
@@ -184,7 +83,7 @@ import net.runelite.http.api.item.ItemPrice;
 	type = PluginType.UTILITY,
 	enabledByDefault = false
 )
-
+@Singleton
 @Slf4j
 public class SuppliesTrackerPlugin extends Plugin
 {
@@ -220,9 +119,9 @@ public class SuppliesTrackerPlugin extends Plugin
 	private static final int[] RUNE_IDS = new int[]{AIR_RUNE, WATER_RUNE, EARTH_RUNE, MIND_RUNE, BODY_RUNE, COSMIC_RUNE, CHAOS_RUNE, NATURE_RUNE, LAW_RUNE, DEATH_RUNE, ASTRAL_RUNE, BLOOD_RUNE, SOUL_RUNE, WRATH_RUNE, MIST_RUNE, DUST_RUNE, MUD_RUNE, SMOKE_RUNE, STEAM_RUNE, LAVA_RUNE};
 
 	//Hold Supply Data
-	private static HashMap<Integer, SuppliesTrackerItem> suppliesEntry = new HashMap<>();
+	private static final Map<Integer, SuppliesTrackerItem> suppliesEntry = new HashMap<>();
 	private ItemContainer old;
-	private Deque<MenuAction> actionStack = new ArrayDeque<>();
+	private final Deque<MenuAction> actionStack = new ArrayDeque<>();
 	private int ammoId = 0;
 	private int ammoAmount = 0;
 	private int thrownId = 0;
@@ -233,7 +132,7 @@ public class SuppliesTrackerPlugin extends Plugin
 	private int mainHand = 0;
 	private SuppliesTrackerPanel panel;
 	private NavigationButton navButton;
-	private String[] RAIDS_CONSUMABLES = new String[]{"xeric's", "elder", "twisted", "revitalisation", "overload", "prayer enhance", "pysk", "suphi", "leckish", "brawk", "mycil", "roqed", "kyren", "guanic", "prael", "giral", "phluxia", "kryket", "murng", "psykk"};
+	private final String[] RAIDS_CONSUMABLES = new String[]{"xeric's", "elder", "twisted", "revitalisation", "overload", "prayer enhance", "pysk", "suphi", "leckish", "brawk", "mycil", "roqed", "kyren", "guanic", "prael", "giral", "phluxia", "kryket", "murng", "psykk"};
 
 	private int attackStyleVarbit = -1;
 	private int ticks = 0;
@@ -400,7 +299,13 @@ public class SuppliesTrackerPlugin extends Plugin
 					{
 						quantity -= newItem.getQuantity();
 					}
-					buildEntries(oldItem.getId(), quantity);
+					// ensure that only positive quantities are added since it is reported
+					// that sometimes checkUsedRunes is called on the same tick that a player
+					// gains runes in their inventory
+					if (quantity > 0)
+					{
+						buildEntries(oldItem.getId(), quantity);
+					}
 				}
 			}
 		}
@@ -603,9 +508,8 @@ public class SuppliesTrackerPlugin extends Plugin
 		// Create pattern to find eat/drink at beginning
 		Pattern eatPattern = Pattern.compile(EAT_PATTERN);
 		Pattern drinkPattern = Pattern.compile(DRINK_PATTERN);
-		if (eatPattern.matcher(event.getTarget().toLowerCase()).find() || drinkPattern.matcher(event.getTarget().toLowerCase()).find())
-		{
-			if (actionStack.stream().noneMatch(a ->
+		if ((eatPattern.matcher(event.getTarget().toLowerCase()).find() || drinkPattern.matcher(event.getTarget().toLowerCase()).find()) &&
+			actionStack.stream().noneMatch(a ->
 			{
 				if (a instanceof MenuAction.ItemAction)
 				{
@@ -614,15 +518,14 @@ public class SuppliesTrackerPlugin extends Plugin
 				}
 				return false;
 			}))
+		{
+			old = client.getItemContainer(InventoryID.INVENTORY);
+			int slot = event.getActionParam0();
+			if (old.getItems() != null)
 			{
-				old = client.getItemContainer(InventoryID.INVENTORY);
-				int slot = event.getActionParam0();
-				if (old.getItems() != null)
-				{
-					int pushItem = old.getItems()[event.getActionParam0()].getId();
-					MenuAction newAction = new MenuAction.ItemAction(CONSUMABLE, old.getItems(), pushItem, slot);
-					actionStack.push(newAction);
-				}
+				int pushItem = old.getItems()[event.getActionParam0()].getId();
+				MenuAction newAction = new MenuAction.ItemAction(CONSUMABLE, old.getItems(), pushItem, slot);
+				actionStack.push(newAction);
 			}
 		}
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tarnslair/TarnsLairOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/tarnslair/TarnsLairOverlay.java
index e7ed05731e..01670c2fdf 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/tarnslair/TarnsLairOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/tarnslair/TarnsLairOverlay.java
@@ -29,6 +29,7 @@ import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.awt.Polygon;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
 import net.runelite.api.coords.LocalPoint;
@@ -36,6 +37,7 @@ import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 
+@Singleton
 @Slf4j
 public class TarnsLairOverlay extends Overlay
 {
@@ -45,7 +47,7 @@ public class TarnsLairOverlay extends Overlay
 	private final TarnsLairPlugin plugin;
 
 	@Inject
-	public TarnsLairOverlay(Client client, TarnsLairPlugin plugin)
+	public TarnsLairOverlay(final Client client, final TarnsLairPlugin plugin)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_SCENE);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tarnslair/TarnsLairPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/tarnslair/TarnsLairPlugin.java
index b6dd13f6ad..fc2bbff2f7 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/tarnslair/TarnsLairPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/tarnslair/TarnsLairPlugin.java
@@ -25,7 +25,9 @@
 package net.runelite.client.plugins.tarnslair;
 
 import java.util.HashMap;
+import java.util.Map;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
@@ -54,7 +56,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	type = PluginType.UTILITY,
 	enabledByDefault = false
 )
-
+@Singleton
 @Slf4j
 public class TarnsLairPlugin extends Plugin
 {
@@ -62,13 +64,13 @@ public class TarnsLairPlugin extends Plugin
 	private static final int TARNS_LAIR_SOUTH_REGION = 12615;
 
 	@Getter(AccessLevel.PACKAGE)
-	private final HashMap<TileObject, Tile> staircases = new HashMap<>();
+	private final Map<TileObject, Tile> staircases = new HashMap<>();
 
 	@Getter(AccessLevel.PACKAGE)
-	private final HashMap<TileObject, Tile> wallTraps = new HashMap<>();
+	private final Map<TileObject, Tile> wallTraps = new HashMap<>();
 
 	@Getter(AccessLevel.PACKAGE)
-	private final HashMap<TileObject, Tile> floorTraps = new HashMap<>();
+	private final Map<TileObject, Tile> floorTraps = new HashMap<>();
 
 	@Getter(AccessLevel.PACKAGE)
 	private boolean inLair;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/teamcapes/TeamCapesOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/teamcapes/TeamCapesOverlay.java
index 9dbd2dc861..21e4ed2606 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/teamcapes/TeamCapesOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/teamcapes/TeamCapesOverlay.java
@@ -28,6 +28,7 @@ import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.util.Map;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.ItemID;
 import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.client.game.ItemManager;
@@ -40,6 +41,7 @@ import net.runelite.client.ui.overlay.components.ComponentOrientation;
 import net.runelite.client.ui.overlay.components.ImageComponent;
 import net.runelite.client.ui.overlay.components.PanelComponent;
 
+@Singleton
 public class TeamCapesOverlay extends Overlay
 {
 	private final PanelComponent panelComponent = new PanelComponent();
@@ -48,7 +50,7 @@ public class TeamCapesOverlay extends Overlay
 	private final ItemManager manager;
 
 	@Inject
-	private TeamCapesOverlay(TeamCapesPlugin plugin, TeamCapesConfig config, ItemManager manager)
+	private TeamCapesOverlay(final TeamCapesPlugin plugin, final TeamCapesConfig config, final ItemManager manager)
 	{
 		super(plugin);
 		setPosition(OverlayPosition.TOP_LEFT);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/teamcapes/TeamCapesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/teamcapes/TeamCapesPlugin.java
index 61d283cbfd..f2a25b57ad 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/teamcapes/TeamCapesPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/teamcapes/TeamCapesPlugin.java
@@ -33,6 +33,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.GameState;
 import net.runelite.api.Player;
@@ -48,6 +49,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	tags = {"overlay", "players"},
 	enabledByDefault = false
 )
+@Singleton
 public class TeamCapesPlugin extends Plugin
 {
 	@Inject
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixExperienceOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixExperienceOverlay.java
index b702556f5f..9f5669f4db 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixExperienceOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixExperienceOverlay.java
@@ -25,6 +25,7 @@
 
 package net.runelite.client.plugins.tearsofguthix;
 
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayPosition;
@@ -36,6 +37,7 @@ import java.awt.Graphics2D;
 import net.runelite.client.ui.overlay.components.table.TableAlignment;
 import net.runelite.client.ui.overlay.components.table.TableComponent;
 
+@Singleton
 class TearsOfGuthixExperienceOverlay extends Overlay
 {
 	private final TearsOfGuthixPlugin plugin;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixOverlay.java
index 4c1a5569fc..be546772ab 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixOverlay.java
@@ -30,12 +30,14 @@ import java.awt.Graphics2D;
 import java.time.Duration;
 import java.time.Instant;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Point;
 import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.components.ProgressPieComponent;
 
+@Singleton
 class TearsOfGuthixOverlay extends Overlay
 {
 	private static final Color CYAN_ALPHA = new Color(Color.CYAN.getRed(), Color.CYAN.getGreen(), Color.CYAN.getBlue(), 100);
@@ -43,7 +45,7 @@ class TearsOfGuthixOverlay extends Overlay
 	private final TearsOfGuthixPlugin plugin;
 
 	@Inject
-	private TearsOfGuthixOverlay(TearsOfGuthixPlugin plugin)
+	private TearsOfGuthixOverlay(final TearsOfGuthixPlugin plugin)
 	{
 		this.plugin = plugin;
 		setPosition(OverlayPosition.DYNAMIC);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixPlugin.java
index 9d2f1100aa..56740fdd0a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixPlugin.java
@@ -28,6 +28,7 @@ import java.time.Instant;
 import java.util.HashMap;
 import java.util.Map;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.Client;
@@ -48,6 +49,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	description = "Show timers for the Tears Of Guthix streams",
 	tags = {"minigame", "overlay", "skilling", "timers", "tog"}
 )
+@Singleton
 public class TearsOfGuthixPlugin extends Plugin
 {
 	private static final int TOG_REGION = 12948;
@@ -123,13 +125,11 @@ public class TearsOfGuthixPlugin extends Plugin
 	{
 		DecorativeObject object = event.getDecorativeObject();
 
-		if (object.getId() == ObjectID.BLUE_TEARS ||
-			object.getId() == ObjectID.BLUE_TEARS_6665)
+		if ((object.getId() == ObjectID.BLUE_TEARS ||
+			object.getId() == ObjectID.BLUE_TEARS_6665) &&
+			client.getLocalPlayer().getWorldLocation().getRegionID() == TOG_REGION)
 		{
-			if (client.getLocalPlayer().getWorldLocation().getRegionID() == TOG_REGION)
-			{
-				streams.put(event.getDecorativeObject(), Instant.now());
-			}
+			streams.put(event.getDecorativeObject(), Instant.now());
 		}
 	}
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/RoomHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/RoomHandler.java
index 3615d58f6d..5d007a342c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/RoomHandler.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/RoomHandler.java
@@ -5,7 +5,6 @@ import java.awt.Color;
 import java.awt.Font;
 import java.awt.Graphics2D;
 import java.awt.Polygon;
-import java.util.Iterator;
 import java.util.Map;
 import net.runelite.api.Client;
 import net.runelite.api.NPC;
@@ -22,13 +21,11 @@ public abstract class RoomHandler
 
 	protected final Client client;
 	protected final TheatrePlugin plugin;
-	protected final TheatreConfig config;
 
-	public RoomHandler(Client client, TheatrePlugin plugin, TheatreConfig config)
+	protected RoomHandler(final Client client, final TheatrePlugin plugin)
 	{
 		this.client = client;
 		this.plugin = plugin;
-		this.config = config;
 	}
 
 	public abstract void onStart();
@@ -64,11 +61,8 @@ public abstract class RoomHandler
 
 	protected void renderProjectiles(Graphics2D graphics, Map<Projectile, String> projectiles)
 	{
-
-		Iterator<Map.Entry<Projectile, String>> itr = projectiles.entrySet().iterator();
-		while (itr.hasNext())
+		for (Map.Entry<Projectile, String> entry : projectiles.entrySet())
 		{
-			Map.Entry<Projectile, String> entry = itr.next();
 			int projectileId = entry.getKey().getId();
 			String text = entry.getValue();
 			int x = (int) entry.getKey().getX();
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/TheatreOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/TheatreOverlay.java
index e4dc6c2683..5237641000 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/TheatreOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/TheatreOverlay.java
@@ -11,27 +11,21 @@ package net.runelite.client.plugins.theatre;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
-import net.runelite.api.Client;
-import net.runelite.client.graphics.ModelOutlineRenderer;
+import javax.inject.Singleton;
 import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayPriority;
 
+@Singleton
 public class TheatreOverlay extends Overlay
 {
-	private final Client client;
 	private final TheatrePlugin plugin;
-	private final TheatreConfig config;
-	private final ModelOutlineRenderer modelOutline;
 
 	@Inject
-	private TheatreOverlay(Client client, TheatrePlugin plugin, TheatreConfig config, ModelOutlineRenderer modelOutline)
+	private TheatreOverlay(final TheatrePlugin plugin)
 	{
-		this.client = client;
 		this.plugin = plugin;
-		this.config = config;
-		this.modelOutline = modelOutline;
 
 		setPosition(OverlayPosition.DYNAMIC);
 		setPriority(OverlayPriority.HIGH);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/TheatrePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/TheatrePlugin.java
index 2a08416e84..26238c416b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/TheatrePlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/TheatrePlugin.java
@@ -13,6 +13,7 @@ import java.awt.Color;
 import java.util.LinkedList;
 import java.util.List;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
@@ -54,7 +55,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	type = PluginType.PVM,
 	enabledByDefault = false
 )
-
+@Singleton
 @Slf4j
 public class TheatrePlugin extends Plugin
 {
@@ -98,6 +99,59 @@ public class TheatrePlugin extends Plugin
 	@Inject
 	private ModelOutlineRenderer modelOutline;
 
+	@Getter
+	private boolean showMaidenBloodToss;
+	@Getter
+	private boolean showMaidenBloodSpawns;
+	@Getter
+	private boolean showNyloFreezeHighlights;
+	@Getter
+	private boolean showBloatIndicator;
+	@Getter
+	private boolean showBloatHands;
+	@Getter
+	private boolean BloatFeetIndicatorRaveEdition;
+	@Getter
+	private boolean showBloatTimer;
+	@Getter
+	private boolean showNyloPillarHealth;
+	@Getter
+	private TheatreConfig.NYLOOPTION showNylocasExplosions;
+	@Getter
+	private boolean showNylocasAmount;
+	@Getter
+	private boolean highlightNyloAgros;
+	@Getter
+	private boolean showSotetsegAttacks;
+	@Getter
+	private boolean showSotetsegMaze;
+	@Getter
+	private boolean showSotetsegSolo;
+	@Getter
+	private Color mazeTileColour;
+	@Getter
+	private boolean showXarpusHeals;
+	@Getter
+	private boolean showXarpusTick;
+	@Getter
+	private boolean showVerzikAttacks;
+	@Getter
+	private boolean showVerzikYellows;
+	@Getter
+	private boolean showCrabTargets;
+	@Getter
+	private boolean VerzikTankTile;
+	@Getter
+	private boolean verzikRangeAttacks;
+	@Getter
+	private boolean extraTimers;
+	@Getter
+	private boolean p1attacks;
+	@Getter
+	private boolean p2attacks;
+	@Getter
+	private boolean p3attacks;
+
 	@Provides
 	TheatreConfig getConfig(ConfigManager configManager)
 	{
@@ -107,14 +161,16 @@ public class TheatrePlugin extends Plugin
 	@Override
 	protected void startUp()
 	{
+		updateConfig();
+		
 		room = TheatreRoom.UNKNOWN;
 
-		maidenHandler = new MaidenHandler(client, this, config, modelOutline);
-		bloatHandler = new BloatHandler(client, this, config);
-		nyloHandler = new NyloHandler(client, this, config);
-		sotetsegHandler = new SotetsegHandler(client, this, config);
-		xarpusHandler = new XarpusHandler(client, this, config);
-		verzikHandler = new VerzikHandler(client, this, config);
+		maidenHandler = new MaidenHandler(client, this, modelOutline);
+		bloatHandler = new BloatHandler(client, this);
+		nyloHandler = new NyloHandler(client, this);
+		sotetsegHandler = new SotetsegHandler(client, this);
+		xarpusHandler = new XarpusHandler(client, this);
+		verzikHandler = new VerzikHandler(client, this);
 
 		overlayManager.add(overlay);
 	}
@@ -406,6 +462,11 @@ public class TheatrePlugin extends Plugin
 	@Subscribe
 	public void onConfigChanged(ConfigChanged event)
 	{
+		if (!event.getGroup().equals("Theatre"))
+		{
+			return;
+		}
+
 		if (nyloHandler != null)
 		{
 			nyloHandler.onConfigChanged();
@@ -439,4 +500,34 @@ public class TheatrePlugin extends Plugin
 			verzikHandler.onProjectileMoved(event);
 		}
 	}
+	
+	private void updateConfig()
+	{
+		this.showMaidenBloodToss = config.showMaidenBloodToss();
+		this.showMaidenBloodSpawns = config.showMaidenBloodSpawns();
+		this.showNyloFreezeHighlights = config.showNyloFreezeHighlights();
+		this.showBloatIndicator = config.showBloatIndicator();
+		this.showBloatHands = config.showBloatHands();
+		this.BloatFeetIndicatorRaveEdition = config.BloatFeetIndicatorRaveEdition();
+		this.showBloatTimer = config.showBloatTimer();
+		this.showNyloPillarHealth = config.showNyloPillarHealth();
+		this.showNylocasExplosions = config.showNylocasExplosions();
+		this.showNylocasAmount = config.showNylocasAmount();
+		this.highlightNyloAgros = config.highlightNyloAgros();
+		this.showSotetsegAttacks = config.showSotetsegAttacks();
+		this.showSotetsegMaze = config.showSotetsegMaze();
+		this.showSotetsegSolo = config.showSotetsegSolo();
+		this.mazeTileColour = config.mazeTileColour();
+		this.showXarpusHeals = config.showXarpusHeals();
+		this.showXarpusTick = config.showXarpusTick();
+		this.showVerzikAttacks = config.showVerzikAttacks();
+		this.showVerzikYellows = config.showVerzikYellows();
+		this.showCrabTargets = config.showCrabTargets();
+		this.VerzikTankTile = config.VerzikTankTile();
+		this.verzikRangeAttacks = config.verzikRangeAttacks();
+		this.extraTimers = config.extraTimers();
+		this.p1attacks = config.p1attacks();
+		this.p2attacks = config.p2attacks();
+		this.p3attacks = config.p3attacks();
+	}
 }
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/BloatHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/BloatHandler.java
index b62b979012..f7c262c853 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/BloatHandler.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/BloatHandler.java
@@ -18,7 +18,6 @@ import net.runelite.api.events.NpcSpawned;
 import net.runelite.api.events.VarbitChanged;
 import net.runelite.client.eventbus.Subscribe;
 import net.runelite.client.plugins.theatre.RoomHandler;
-import net.runelite.client.plugins.theatre.TheatreConfig;
 import net.runelite.client.plugins.theatre.TheatrePlugin;
 import net.runelite.client.plugins.theatre.TheatreRoom;
 
@@ -34,9 +33,9 @@ public class BloatHandler extends RoomHandler
 	@Getter(AccessLevel.PUBLIC)
 	private BloatState bloatState;
 
-	public BloatHandler(Client client, TheatrePlugin plugin, TheatreConfig config)
+	public BloatHandler(final Client client, final TheatrePlugin plugin)
 	{
-		super(client, plugin, config);
+		super(client, plugin);
 	}
 
 	@Override
@@ -49,7 +48,6 @@ public class BloatHandler extends RoomHandler
 
 		this.reset();
 		this.plugin.setRoom(TheatreRoom.BLOAT);
-		System.out.println("Starting Bloat Room");
 	}
 
 	@Override
@@ -57,10 +55,9 @@ public class BloatHandler extends RoomHandler
 	{
 		this.reset();
 		this.plugin.setRoom(TheatreRoom.UNKNOWN);
-		System.out.println("Stopping Bloat Room");
 	}
 
-	public void reset()
+	private void reset()
 	{
 		bloat = null;
 		bloatFlag = false;
@@ -76,7 +73,7 @@ public class BloatHandler extends RoomHandler
 			return;
 		}
 
-		if (config.showBloatIndicator())
+		if (plugin.isShowBloatIndicator())
 		{
 			switch (bloatState)
 			{
@@ -92,7 +89,7 @@ public class BloatHandler extends RoomHandler
 			}
 		}
 
-		if (config.showBloatHands())
+		if (plugin.isShowBloatHands())
 		{
 			for (GraphicsObject object : client.getGraphicsObjects())
 			{
@@ -100,7 +97,7 @@ public class BloatHandler extends RoomHandler
 				if (id >= 1560 && id <= 1590)
 				{
 					WorldPoint point = WorldPoint.fromLocal(client, object.getLocation());
-					if (!config.BloatFeetIndicatorRaveEdition())
+					if (!plugin.isBloatFeetIndicatorRaveEdition())
 					{
 						drawTile(graphics, point, new Color(36, 248, 229), 2, 255, 10);
 					}
@@ -113,7 +110,7 @@ public class BloatHandler extends RoomHandler
 			}
 		}
 
-		if (config.showBloatTimer())
+		if (plugin.isShowBloatTimer())
 		{
 			final String tickCounter = String.valueOf(bloatTimer);
 			int secondConversion = (int) (bloatTimer * .6);
@@ -135,13 +132,10 @@ public class BloatHandler extends RoomHandler
 	@Subscribe
 	public void onVarbitChanged(VarbitChanged event)
 	{
-		if (client.getVar(Varbits.BLOAT_DOOR) == 1)
+		if (client.getVar(Varbits.BLOAT_DOOR) == 1 && !bloatFlag)
 		{
-			if (!bloatFlag)
-			{
-				bloatTimer = 0;
-				bloatFlag = true;
-			}
+			bloatTimer = 0;
+			bloatFlag = true;
 		}
 	}
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/MaidenHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/MaidenHandler.java
index 68115623fa..af76b8c921 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/MaidenHandler.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/MaidenHandler.java
@@ -20,7 +20,6 @@ import net.runelite.api.events.NpcSpawned;
 import net.runelite.api.events.SpotAnimationChanged;
 import net.runelite.client.graphics.ModelOutlineRenderer;
 import net.runelite.client.plugins.theatre.RoomHandler;
-import net.runelite.client.plugins.theatre.TheatreConfig;
 import net.runelite.client.plugins.theatre.TheatreConstant;
 import net.runelite.client.plugins.theatre.TheatrePlugin;
 import net.runelite.client.plugins.theatre.TheatreRoom;
@@ -55,22 +54,22 @@ public class MaidenHandler extends RoomHandler
 	);
 	private static final Color TRANSPARENT = new Color(0, 0, 0, 0);
 	private static final Color FREEZE = new Color(0, 226, 255, 255);
-	private List<WorldPoint> bloodThrows = new ArrayList<>();
-	private List<NPC> bloodSpawns = new ArrayList<>();
+	private final List<WorldPoint> bloodThrows = new ArrayList<>();
+	private final List<NPC> bloodSpawns = new ArrayList<>();
 	private List<WorldPoint> bloodSpawnLocation = new ArrayList<>();
-	private List<WorldPoint> bloodSpawnTarget = new ArrayList<>();
+	private final List<WorldPoint> bloodSpawnTarget = new ArrayList<>();
 	private NPC maiden;
 	private String nyloCall;
-	private Set<Nylos> nylos = new HashSet<>();
-	private List<NPC> healers = new ArrayList<>();
+	private final Set<Nylos> nylos = new HashSet<>();
+	private final List<NPC> healers = new ArrayList<>();
 	private int healerCount = 0;
 	private int wave = 1;
 	private long startTime = 0;
-	private ModelOutlineRenderer modelOutline;
+	private final ModelOutlineRenderer modelOutline;
 
-	public MaidenHandler(Client client, TheatrePlugin plugin, TheatreConfig config, ModelOutlineRenderer modelOutline)
+	public MaidenHandler(final Client client, final TheatrePlugin plugin, final ModelOutlineRenderer modelOutline)
 	{
-		super(client, plugin, config);
+		super(client, plugin);
 		this.modelOutline = modelOutline;
 	}
 
@@ -95,7 +94,7 @@ public class MaidenHandler extends RoomHandler
 		log.debug("Stopping Maiden Room");
 	}
 
-	public void reset()
+	private void reset()
 	{
 		this.bloodThrows.clear();
 		this.bloodSpawns.clear();
@@ -139,7 +138,7 @@ public class MaidenHandler extends RoomHandler
 			}
 		}
 
-		if (config.showMaidenBloodToss())
+		if (plugin.isShowMaidenBloodToss())
 		{
 			for (WorldPoint point : bloodThrows)
 			{
@@ -147,7 +146,7 @@ public class MaidenHandler extends RoomHandler
 			}
 		}
 
-		if (config.showMaidenBloodSpawns())
+		if (plugin.isShowMaidenBloodSpawns())
 		{
 			for (WorldPoint point : bloodSpawnLocation)
 			{
@@ -197,7 +196,7 @@ public class MaidenHandler extends RoomHandler
 				maiden = npc;
 				break;
 			case "Nylocas Matomenos":
-				if (!config.showNyloFreezeHighlights())
+				if (!plugin.isShowNyloFreezeHighlights())
 				{
 					return;
 				}
@@ -241,12 +240,9 @@ public class MaidenHandler extends RoomHandler
 	{
 		NPC npc = event.getNpc();
 
-		if (npc.getName() != null && npc.getName().equals("Nylocas Matomenos"))
+		if (npc.getName() != null && npc.getName().equals("Nylocas Matomenos") && npc.getId() == -1)
 		{
-			if (npc.getId() == -1)
-			{
-				nylos.removeIf(c -> c.getNpc() == npc);
-			}
+			nylos.removeIf(c -> c.getNpc() == npc);
 		}
 	}
 
@@ -327,7 +323,7 @@ public class MaidenHandler extends RoomHandler
 			seconds = seconds % 60;
 
 			int percentage = 70 - (20 * ((wave++) - 1));
-			if (config.extraTimers())
+			if (plugin.isExtraTimers())
 			{
 				this.client.addChatMessage(ChatMessageType.GAMEMESSAGE, "", "Wave 'The Maiden of Sugadinti - " + percentage + "%' completed! Duration: <col=ff0000>" + minutes + ":" + twoDigitString(seconds), null);
 			}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/Nylos.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/Nylos.java
index 53469f3fe4..5429f016e7 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/Nylos.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/Nylos.java
@@ -1,5 +1,6 @@
 package net.runelite.client.plugins.theatre.rooms;
 
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
@@ -7,12 +8,12 @@ import net.runelite.api.NPC;
 
 class Nylos
 {
-	@Getter
+	@Getter(AccessLevel.PUBLIC)
 	private NPC npc;
-	@Getter
+	@Getter(AccessLevel.PUBLIC)
 	private int npcIndex;
-	@Getter
-	@Setter
+	@Getter(AccessLevel.PUBLIC)
+	@Setter(AccessLevel.PUBLIC)
 	private SpawnLocation spawnLocation;
 
 	Nylos(NPC npc, SpawnLocation spawnLocation)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/SotetsegHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/SotetsegHandler.java
index 13551b9ec4..ae6aabfcf3 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/SotetsegHandler.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/SotetsegHandler.java
@@ -24,7 +24,6 @@ import net.runelite.api.events.NpcDespawned;
 import net.runelite.api.events.NpcSpawned;
 import net.runelite.api.events.ProjectileMoved;
 import net.runelite.client.plugins.theatre.RoomHandler;
-import net.runelite.client.plugins.theatre.TheatreConfig;
 import net.runelite.client.plugins.theatre.TheatreConstant;
 import net.runelite.client.plugins.theatre.TheatrePlugin;
 import net.runelite.client.plugins.theatre.TheatreRoom;
@@ -40,17 +39,16 @@ public class SotetsegHandler extends RoomHandler
 	private int playerY;
 	@Getter(AccessLevel.PUBLIC)
 	private List<WorldPoint> redOverworld = new ArrayList<>();
-	private List<WorldPoint> blackOverworld = new ArrayList<>();
-	private List<WorldPoint> blackUnderworld = new ArrayList<>();
-	private List<WorldPoint> redUnderworld = new ArrayList<>();
-	private List<Point> gridPath = new ArrayList<>();
-	private Map<Projectile, WorldPoint> soteyProjectiles = new HashMap<>();
+	private final List<WorldPoint> blackOverworld = new ArrayList<>();
+	private final List<WorldPoint> blackUnderworld = new ArrayList<>();
+	private final List<WorldPoint> redUnderworld = new ArrayList<>();
+	private final List<Point> gridPath = new ArrayList<>();
+	private final Map<Projectile, WorldPoint> soteyProjectiles = new HashMap<>();
 	private NPC npc;
-	private long startTime = 0;
 
-	public SotetsegHandler(Client client, TheatrePlugin plugin, TheatreConfig config)
+	public SotetsegHandler(final Client client, final TheatrePlugin plugin)
 	{
-		super(client, plugin, config);
+		super(client, plugin);
 	}
 
 	@Override
@@ -63,7 +61,6 @@ public class SotetsegHandler extends RoomHandler
 
 		this.reset();
 		this.plugin.setRoom(TheatreRoom.SOTETSEG);
-		System.out.println("Starting Sotetseg Room");
 	}
 
 	@Override
@@ -71,12 +68,10 @@ public class SotetsegHandler extends RoomHandler
 	{
 		this.reset();
 		this.plugin.setRoom(TheatreRoom.UNKNOWN);
-		System.out.println("Stopping Sotetseg Room");
 	}
 
-	public void reset()
+	private void reset()
 	{
-		startTime = 0;
 		npc = null;
 		soteyProjectiles.clear();
 		redTiles.clear();
@@ -89,7 +84,7 @@ public class SotetsegHandler extends RoomHandler
 
 	public void render(Graphics2D graphics)
 	{
-		if (config.showSotetsegMaze())
+		if (plugin.isShowSotetsegMaze())
 		{
 			int i = 1;
 			for (GroundObject o : redTiles.keySet())
@@ -98,7 +93,7 @@ public class SotetsegHandler extends RoomHandler
 
 				if (poly != null)
 				{
-					graphics.setColor(config.mazeTileColour());
+					graphics.setColor(plugin.getMazeTileColour());
 					graphics.setStroke(new BasicStroke(2));
 					graphics.draw(poly);
 				}
@@ -113,15 +108,15 @@ public class SotetsegHandler extends RoomHandler
 			}
 		}
 
-		if (config.showSotetsegSolo())
+		if (plugin.isShowSotetsegSolo())
 		{
 			for (WorldPoint p : redOverworld)
 			{
-				drawTile(graphics, p, config.mazeTileColour(), 2, 255, 10);
+				drawTile(graphics, p, plugin.getMazeTileColour(), 2, 255, 10);
 			}
 		}
 
-		if (config.showSotetsegAttacks())
+		if (plugin.isShowSotetsegAttacks())
 		{
 
 			Map<Projectile, String> projectileMap = new HashMap<>();
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/VerzikHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/VerzikHandler.java
index 0f92345fa4..65cb217054 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/VerzikHandler.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/VerzikHandler.java
@@ -13,7 +13,6 @@ import net.runelite.api.Actor;
 import net.runelite.api.ChatMessageType;
 import net.runelite.api.Client;
 import net.runelite.api.GraphicsObject;
-import net.runelite.api.Model;
 import net.runelite.api.NPC;
 import net.runelite.api.Perspective;
 import net.runelite.api.Player;
@@ -25,7 +24,6 @@ import net.runelite.api.events.AnimationChanged;
 import net.runelite.api.events.NpcSpawned;
 import net.runelite.api.events.ProjectileMoved;
 import net.runelite.client.plugins.theatre.RoomHandler;
-import net.runelite.client.plugins.theatre.TheatreConfig;
 import net.runelite.client.plugins.theatre.TheatreConstant;
 import net.runelite.client.plugins.theatre.TheatrePlugin;
 import net.runelite.client.plugins.theatre.TheatreRoom;
@@ -43,15 +41,13 @@ public class VerzikHandler extends RoomHandler
 	@Getter(AccessLevel.PUBLIC)
 	private NPC npc;
 	private int lastId = -1;
-	private int autosSinceYellows;
 	private int yellows;
 	private boolean tornados;
-	private int attackTick = -1;
 	private long startTime = 0;
 
-	public VerzikHandler(Client client, TheatrePlugin plugin, TheatreConfig config)
+	public VerzikHandler(final Client client, final TheatrePlugin plugin)
 	{
-		super(client, plugin, config);
+		super(client, plugin);
 	}
 
 	@Override
@@ -64,7 +60,6 @@ public class VerzikHandler extends RoomHandler
 
 		this.reset();
 		this.plugin.setRoom(TheatreRoom.VERSIK);
-		System.out.println("Starting Verzik Room");
 	}
 
 	@Override
@@ -72,10 +67,9 @@ public class VerzikHandler extends RoomHandler
 	{
 		this.reset();
 		this.plugin.setRoom(TheatreRoom.UNKNOWN);
-		System.out.println("Stopping Verzik Room");
 	}
 
-	public void reset()
+	private void reset()
 	{
 		this.redCrabsTimer = 13;
 		this.Verzik_RangeProjectiles.clear();
@@ -83,7 +77,6 @@ public class VerzikHandler extends RoomHandler
 		this.attacksLeft = 0;
 		this.npc = null;
 		this.yellows = 0;
-		this.autosSinceYellows = 0;
 		this.lastId = -1;
 		this.tornados = false;
 		this.startTime = 0;
@@ -97,96 +90,77 @@ public class VerzikHandler extends RoomHandler
 		}
 
 		int id = npc.getId();
-		if (config.verzikRangeAttacks())
+		if (plugin.isVerzikRangeAttacks())
 		{
 			for (WorldPoint p : getVerzik_RangeProjectiles().values())
 			{
 				drawTile(graphics, p, Color.RED, 2, 180, 50);
 			}
 		}
-		if (config.showVerzikAttacks())
+		if (plugin.isShowVerzikAttacks())
 		{
 
 			if (id == TheatreConstant.VERZIK_ID_P1)
 			{
-				if (config.p1attacks())
+				if (plugin.isP1attacks() && this.versikCounter >= 0)
 				{
-					if (this.versikCounter >= 0)
-					{
-						String str = Integer.toString(versikCounter);
+					String str = Integer.toString(versikCounter);
 
-						LocalPoint lp = npc.getLocalLocation();
-						Point point = Perspective.getCanvasTextLocation(client, graphics, lp, str, 0);
+					LocalPoint lp = npc.getLocalLocation();
+					Point point = Perspective.getCanvasTextLocation(client, graphics, lp, str, 0);
 
-						renderTextLocation(graphics, str, 20, Font.BOLD, Color.CYAN, point);
-					}
+					renderTextLocation(graphics, str, 20, Font.BOLD, Color.CYAN, point);
 				}
 			}
 			else if (id == TheatreConstant.VERZIK_ID_P2)
 			{
-				if (config.p2attacks())
+				if (plugin.isP2attacks() && this.versikCounter >= 0)
 				{
-					if (this.versikCounter >= 0)
-					{
-						String str = Integer.toString(versikCounter);
+					String str = Integer.toString(versikCounter);
 
-						LocalPoint lp = npc.getLocalLocation();
-						Point point = Perspective.getCanvasTextLocation(client, graphics, lp, str, 0);
+					LocalPoint lp = npc.getLocalLocation();
+					Point point = Perspective.getCanvasTextLocation(client, graphics, lp, str, 0);
 
-						renderTextLocation(graphics, str, 20, Font.BOLD, Color.CYAN, point);
-					}
+					renderTextLocation(graphics, str, 20, Font.BOLD, Color.CYAN, point);
 				}
 			}
 
-			else if (id == TheatreConstant.VERZIK_ID_P3)
+			else if (id == TheatreConstant.VERZIK_ID_P3 && plugin.isP3attacks() && versikCounter > 0 && versikCounter < 8)
 			{
-				if (config.p3attacks())
-				{
-					Model model = npc.getModel();
-					if (versikCounter > 0 && versikCounter < 8)
-					{
-						String str = Math.max(versikCounter, 0) + "";// + " | " + model.getModelHeight();// + " | " + model.getRadius();
+				String str = Math.max(versikCounter, 0) + "";// + " | " + model.getModelHeight();// + " | " + model.getRadius();
 
-						LocalPoint lp = npc.getLocalLocation();
-						Point point = Perspective.getCanvasTextLocation(client, graphics, lp, str, 0);
+				LocalPoint lp = npc.getLocalLocation();
+				Point point = Perspective.getCanvasTextLocation(client, graphics, lp, str, 0);
 
-						renderTextLocation(graphics, str, 15, Font.BOLD, Color.WHITE, point);
-					}
-				}
+				renderTextLocation(graphics, str, 15, Font.BOLD, Color.WHITE, point);
 			}
 		}
 
-		if (config.VerzikTankTile())
+		if (plugin.isVerzikTankTile() && id == TheatreConstant.VERZIK_ID_P3)
 		{
-			if (id == TheatreConstant.VERZIK_ID_P3)
-			{
-				WorldPoint wp = new WorldPoint(npc.getWorldLocation().getX() + 3, npc.getWorldLocation().getY() + 3, client.getPlane());
-				drawTile2(graphics, wp, new Color(75, 0, 130), 2, 255, 0);
-				//renderNpcOverlay(graphics, boss, new Color(75, 0, 130), 1, 255, 0);
-			}
-
+			WorldPoint wp = new WorldPoint(npc.getWorldLocation().getX() + 3, npc.getWorldLocation().getY() + 3, client.getPlane());
+			drawTile2(graphics, wp, new Color(75, 0, 130), 2, 255, 0);
+			//renderNpcOverlay(graphics, boss, new Color(75, 0, 130), 1, 255, 0);
 		}
 
-		if (config.showVerzikYellows())
-		{
-			if (this.yellows > 0)
-			{
-				String text = Integer.toString(this.yellows);
 
-				for (GraphicsObject object : client.getGraphicsObjects())
+		if (plugin.isShowVerzikYellows() && this.yellows > 0)
+		{
+			String text = Integer.toString(this.yellows);
+
+			for (GraphicsObject object : client.getGraphicsObjects())
+			{
+				if (object.getId() == TheatreConstant.GRAPHIC_ID_YELLOWS)
 				{
-					if (object.getId() == TheatreConstant.GRAPHIC_ID_YELLOWS)
-					{
-						drawTile(graphics, WorldPoint.fromLocal(client, object.getLocation()), Color.YELLOW, 3, 255, 0);
-						LocalPoint lp = object.getLocation();
-						Point point = Perspective.getCanvasTextLocation(client, graphics, lp, text, 0);
-						renderTextLocation(graphics, text, 12, Font.BOLD, Color.WHITE, point);
-					}
+					drawTile(graphics, WorldPoint.fromLocal(client, object.getLocation()), Color.YELLOW, 3, 255, 0);
+					LocalPoint lp = object.getLocation();
+					Point point = Perspective.getCanvasTextLocation(client, graphics, lp, text, 0);
+					renderTextLocation(graphics, text, 12, Font.BOLD, Color.WHITE, point);
 				}
 			}
 		}
 
-		if (config.showCrabTargets())
+		if (plugin.isShowCrabTargets())
 		{
 			Player local = client.getLocalPlayer();
 			if (local != null && local.getName() != null)
@@ -330,8 +304,6 @@ public class VerzikHandler extends RoomHandler
 				{
 					this.yellows = 14;
 //						this.versikCounter = 22;
-					this.autosSinceYellows = 0;
-					System.out.println("Yellows have spawned.");
 					break;
 				}
 			}
@@ -342,12 +314,9 @@ public class VerzikHandler extends RoomHandler
 			this.yellows--;
 		}
 
-		if (npc != null)
+		if (npc != null && npc.getAnimation() == 8117)
 		{
-			if (npc.getAnimation() == 8117)
-			{
-				redCrabsTimer = redCrabsTimer - 1;
-			}
+			redCrabsTimer = redCrabsTimer - 1;
 		}
 
 
@@ -400,7 +369,7 @@ public class VerzikHandler extends RoomHandler
 
 				long minutes = seconds / 60L;
 				seconds = seconds % 60;
-				if (config.extraTimers())
+				if (plugin.isExtraTimers())
 				{
 					this.client.addChatMessage(ChatMessageType.GAMEMESSAGE, "", "Wave 'The Final Challenge - Part 1' completed! Duration: <col=ff0000>" + minutes + ":" + twoDigitString(seconds), null);
 				}
@@ -413,10 +382,9 @@ public class VerzikHandler extends RoomHandler
 				long minutes = seconds / 60L;
 				seconds = seconds % 60;
 
-				this.attackTick = this.client.getTickCount() - 4;
 				this.versikCounter = -1;
 				this.attacksLeft = 9;
-				if (config.extraTimers())
+				if (plugin.isExtraTimers())
 				{
 					this.client.addChatMessage(ChatMessageType.GAMEMESSAGE, "", "Wave 'The Final Challenge - Part 2' completed! Duration: <col=ff0000>" + minutes + ":" + twoDigitString(seconds), null);
 				}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java
index 4ff3c17ae7..e16ba749e9 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloHandler.java
@@ -8,6 +8,7 @@ import java.awt.Polygon;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.regex.Matcher;
@@ -25,7 +26,6 @@ import net.runelite.api.coords.WorldPoint;
 import net.runelite.api.events.NpcDespawned;
 import net.runelite.api.events.NpcSpawned;
 import net.runelite.client.plugins.theatre.RoomHandler;
-import net.runelite.client.plugins.theatre.TheatreConfig;
 import net.runelite.client.plugins.theatre.TheatreConstant;
 import net.runelite.client.plugins.theatre.TheatrePlugin;
 import net.runelite.client.plugins.theatre.TheatreRoom;
@@ -35,24 +35,21 @@ public class NyloHandler extends RoomHandler
 
 	public long startTime = 0L;
 	int startTick = 0;
-	ArrayList<NPC> waveSpawns = new ArrayList<NPC>();
-	ArrayList<NPC> waveAgros = new ArrayList<NPC>();
+	final List<NPC> waveSpawns = new ArrayList<>();
+	final List<NPC> waveAgros = new ArrayList<>();
 	@Getter(AccessLevel.PUBLIC)
 	private Map<NPC, Integer> pillars = new HashMap<>();
 	@Getter(AccessLevel.PUBLIC)
 	private Map<NPC, Integer> spiders = new HashMap<>();
-	@Getter
-	@Setter
+	@Getter(AccessLevel.PACKAGE)
+	@Setter(AccessLevel.PACKAGE)
 	private int wave = 0;
 	private NyloOverlay overlay = null;
 	private NyloPredictor predictor = null;
-	private Point south = new Point(64, 41);
-	private Point west = new Point(49, 56);
-	private Point east = new Point(78, 56);
 
-	public NyloHandler(Client client, TheatrePlugin plugin, TheatreConfig config)
+	public NyloHandler(final Client client, final TheatrePlugin plugin)
 	{
-		super(client, plugin, config);
+		super(client, plugin);
 	}
 
 	@Override
@@ -66,13 +63,12 @@ public class NyloHandler extends RoomHandler
 		this.reset();
 
 		this.plugin.setRoom(TheatreRoom.NYLOCAS);
-		if (overlay == null && config.showNylocasAmount())
+		if (overlay == null && plugin.isShowNylocasAmount())
 		{
-			overlay = new NyloOverlay(client, plugin, config, this);
+			overlay = new NyloOverlay(client, plugin, this);
 			plugin.getOverlayManager().add(overlay);
 		}
 
-		System.out.println("Starting Nylocas Room");
 		this.startTime = System.currentTimeMillis();
 		this.startTick = this.client.getTickCount();
 	}
@@ -98,17 +94,13 @@ public class NyloHandler extends RoomHandler
 		long minutes = seconds / 60L;
 		seconds = seconds % 60;
 
-		if (this.startTime != 0)
+		if (this.startTime != 0 && plugin.isExtraTimers())
 		{
-			if (config.extraTimers())
-			{
-				this.client.addChatMessage(ChatMessageType.GAMEMESSAGE, "", "Wave 'The Nylocas - Waves' completed! Duration: <col=ff0000>" + minutes + ":" + twoDigitString(seconds), null);
-			}
+			this.client.addChatMessage(ChatMessageType.GAMEMESSAGE, "", "Wave 'The Nylocas - Waves' completed! Duration: <col=ff0000>" + minutes + ":" + twoDigitString(seconds), null);
 		}
-		System.out.println("Stopping Nylocas Room");
 	}
 
-	public void reset()
+	private void reset()
 	{
 		this.pillars.clear();
 		this.spiders.clear();
@@ -128,12 +120,12 @@ public class NyloHandler extends RoomHandler
 			return;
 		}
 
-		if (overlay == null && config.showNylocasAmount())
+		if (overlay == null && plugin.isShowNylocasAmount())
 		{
-			overlay = new NyloOverlay(client, plugin, config, this);
+			overlay = new NyloOverlay(client, plugin, this);
 			plugin.getOverlayManager().add(overlay);
 		}
-		else if (overlay != null && !config.showNylocasAmount())
+		else if (overlay != null && !plugin.isShowNylocasAmount())
 		{
 			plugin.getOverlayManager().remove(overlay);
 			overlay = null;
@@ -148,40 +140,43 @@ public class NyloHandler extends RoomHandler
 		double rMod = 130.0 * health / 100.0;
 		double gMod = 255.0 * health / 100.0;
 		double bMod = 125.0 * health / 100.0;
-		Color c = new Color((int) (255 - rMod), (int) (0 + gMod), (int) (0 + bMod));
 
-		return c;
+		return new Color((int) (255 - rMod), (int) (0 + gMod), (int) (0 + bMod));
 	}
 
 	public void render(Graphics2D graphics)
 	{
-		if (config.showNyloPillarHealth())
+		if (plugin.isShowNyloPillarHealth())
 		{
-			for (NPC npc : pillars.keySet())
+			for (Map.Entry<NPC, Integer> pillars : pillars.entrySet())
 			{
-				final int health = pillars.get(npc);
+				final int health = pillars.getValue();
 				final String healthStr = health + "%";
-				WorldPoint p = npc.getWorldLocation();
+				WorldPoint p = pillars.getKey().getWorldLocation();
 				LocalPoint lp = LocalPoint.fromWorld(client, p.getX() + 1, p.getY() + 1);
 
 				Color c = this.healthColorCode(health);
-				Point canvasPoint = Perspective.localToCanvas(client, lp, client.getPlane(), 65);
+				Point canvasPoint = null;
+				if (lp != null)
+				{
+					canvasPoint = Perspective.localToCanvas(client, lp, client.getPlane(), 65);
+				}
 				renderTextLocation(graphics, healthStr, 13, Font.BOLD, c, canvasPoint);
 			}
 		}
 
-		switch (config.showNylocasExplosions())
+		switch (plugin.getShowNylocasExplosions())
 		{
 			case TILE:
-				for (NPC npc : spiders.keySet())
+				for (Map.Entry<NPC, Integer> spiders : spiders.entrySet())
 				{
-					int ticksLeft = spiders.get(npc);
+					int ticksLeft = spiders.getValue();
 					if (ticksLeft > -1 && ticksLeft < 6)
 					{
 						Color color = new Color(255, 255, 0, 180);
 						int outlineWidth = 2;
 						int outlineAlpha = 150;
-						renderNpcOverlay(graphics, npc, color, outlineWidth, outlineAlpha, 15);
+						renderNpcOverlay(graphics, spiders.getKey(), color, outlineWidth, outlineAlpha, 15);
 					}
 				}
 				break;
@@ -202,11 +197,11 @@ public class NyloHandler extends RoomHandler
 				break;
 		}
 
-		Set<NPC> toHighlight = new HashSet<NPC>();
+		Set<NPC> toHighlight = new HashSet<>();
 
-		if (config.highlightNyloAgros())
+		if (plugin.isHighlightNyloAgros())
 		{
-			for (NPC npc : new ArrayList<NPC>(this.waveAgros))
+			for (NPC npc : new ArrayList<>(this.waveAgros))
 			{
 				try
 				{
@@ -267,26 +262,23 @@ public class NyloHandler extends RoomHandler
 			this.pillars.put(npc, 100);
 			this.recalculateLocal();
 		}
-		else if (npc.getName() != null)
+		else if (npc.getName() != null && this.plugin.getRoom() == TheatreRoom.NYLOCAS)
 		{
-			if (this.plugin.getRoom() == TheatreRoom.NYLOCAS)
+			Pattern p = Pattern.compile("Nylocas (Hagios|Toxobolos|Ischyros)");
+			Matcher m = p.matcher(npc.getName());
+			if (m.matches())
 			{
-				Pattern p = Pattern.compile("Nylocas (Hagios|Toxobolos|Ischyros)");
-				Matcher m = p.matcher(npc.getName());
-				if (m.matches())
-				{
-					this.spiders.put(npc, 52);
+				this.spiders.put(npc, 52);
 
-					if (this.predictor != null)
-					{
-						this.predictor.onNpcSpawned(event);
-					}
-				}
-				else if (npc.getName().equals("Nylocas Vasilias"))
+				if (this.predictor != null)
 				{
-					this.onStop();
+					this.predictor.onNpcSpawned(event);
 				}
 			}
+			else if (npc.getName().equals("Nylocas Vasilias"))
+			{
+				this.onStop();
+			}
 		}
 	}
 
@@ -399,10 +391,6 @@ public class NyloHandler extends RoomHandler
 			int centerX = minX + 5;
 			int centerY = minY + 5;
 
-			south = new Point(centerX + 1, centerY - 14);
-			east = new Point(centerX + 15, centerY);
-			west = new Point(centerX - 14, centerY);
-
 			if (this.predictor != null)
 			{
 				this.predictor.southBound = centerY - 12;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloOverlay.java
index 9c57485f26..d7e2703b93 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloOverlay.java
@@ -30,7 +30,6 @@ import java.awt.Graphics2D;
 import net.runelite.api.Client;
 import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.api.NPC;
-import net.runelite.client.plugins.theatre.TheatreConfig;
 import net.runelite.client.plugins.theatre.TheatrePlugin;
 import net.runelite.client.plugins.theatre.TheatreRoom;
 import net.runelite.client.ui.overlay.Overlay;
@@ -51,9 +50,9 @@ class NyloOverlay extends Overlay
 	private final TheatrePlugin plugin;
 	private final PanelComponent panelComponent = new PanelComponent();
 
-	private NyloHandler nylohandler;
+	private final NyloHandler nylohandler;
 
-	NyloOverlay(Client client, TheatrePlugin plugin, TheatreConfig config, NyloHandler nylohandler)
+	NyloOverlay(final Client client, final TheatrePlugin plugin, final NyloHandler nylohandler)
 	{
 		super(plugin);
 
@@ -84,17 +83,17 @@ class NyloOverlay extends Overlay
 			String name = npc.getName();
 			if (name != null)
 			{
-				if (name.equals("Nylocas Hagios"))
+				switch (name)
 				{
-					hagios++;
-				}
-				else if (name.equals("Nylocas Toxobolos"))
-				{
-					toxobolos++;
-				}
-				else if (name.equals("Nylocas Ischyros"))
-				{
-					ischyros++;
+					case "Nylocas Hagios":
+						hagios++;
+						break;
+					case "Nylocas Toxobolos":
+						toxobolos++;
+						break;
+					case "Nylocas Ischyros":
+						ischyros++;
+						break;
 				}
 			}
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloPredictor.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloPredictor.java
index b9d3e19b44..40226ac167 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloPredictor.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/nylocas/NyloPredictor.java
@@ -46,12 +46,12 @@ public class NyloPredictor
 			new Wave(new Nylocas(NylocasType.RANGE_260, Spawn.WEST), new Nylocas(NylocasType.MAGE_162, Spawn.SOUTH), new Nylocas(NylocasType.MELEE_162, Spawn.SOUTH), new Nylocas(NylocasType.MAGE_260, Spawn.EAST)),
 			new Wave(new Nylocas(NylocasType.MELEE_162, Spawn.WEST), new Nylocas(NylocasType.RANGE_162, Spawn.WEST), new Nylocas(NylocasType.MAGE_162, Spawn.SOUTH), new Nylocas(NylocasType.MELEE_162, Spawn.SOUTH), new Nylocas(NylocasType.RANGE_162, Spawn.EAST), new Nylocas(NylocasType.MAGE_162, Spawn.EAST))
 		};
-	public Client client;
+	private final Client client;
 	int westBound = 50;
 	int eastBound = 77;
 	int southBound = 42;
-	private NyloHandler handler;
-	private Map<Nylocas, NPC> currentSpawns = new HashMap<Nylocas, NPC>();
+	private final NyloHandler handler;
+	private final Map<Nylocas, NPC> currentSpawns = new HashMap<>();
 	private int currentIndex = -1;
 
 	NyloPredictor(Client client, NyloHandler handler)
@@ -108,8 +108,6 @@ public class NyloPredictor
 			type = NylocasType.valueOf("MELEE_" + level);
 		}
 
-		System.out.println(npc.getName() + " | " + npc.getCombatLevel() + " | (" + lp.getSceneX() + ", " + lp.getSceneY() + ") | (" + westBound + ", " + eastBound + ", " + southBound + ") | " + type + " | " + spawn);
-
 		if (spawn == null || type == null)
 		{
 			return;
@@ -126,7 +124,7 @@ public class NyloPredictor
 			Wave checkWave = NYLOCAS_WAVES[i];
 
 			List<Nylocas> queue = new ArrayList<>(currentSpawns.keySet());
-			HashMap<NPC, Nylocas> npcs = new HashMap<NPC, Nylocas>();
+			HashMap<NPC, Nylocas> npcs = new HashMap<>();
 
 			boolean found = true;
 			for (Nylocas nylocas : checkWave.getSpawns())
@@ -150,20 +148,19 @@ public class NyloPredictor
 				currentSpawns.clear();
 
 				handler.setWave(currentIndex);
-				System.out.println("Nylocas Wave #" + currentIndex + " has spawned @ " + (this.client.getTickCount() - this.handler.startTick) + " | " + npcs.size() + " size.");
 
-				for (NPC npc : npcs.keySet())
+				for (Map.Entry<NPC, Nylocas> nylocas : npcs.entrySet())
 				{
-					Nylocas nylo = npcs.get(npc);
+					Nylocas nylo = nylocas.getValue();
 
-					if (!this.handler.waveSpawns.contains(npc))
+					if (!this.handler.waveSpawns.contains(nylocas.getKey()))
 					{
-						this.handler.waveSpawns.add(npc);
+						this.handler.waveSpawns.add(nylocas.getKey());
 					}
 
-					if (this.isAgressive(nylo.getType(), nylo.getSpawn(), currentIndex) && !this.handler.waveAgros.contains(npc))
+					if (this.isAgressive(nylo.getType(), nylo.getSpawn(), currentIndex) && !this.handler.waveAgros.contains(nylocas.getKey()))
 					{
-						this.handler.waveAgros.add(npc);
+						this.handler.waveAgros.add(nylocas.getKey());
 					}
 				}
 
@@ -220,7 +217,6 @@ public class NyloPredictor
 					}
 				}
 
-				System.out.printf("%d\t%d\t%d\t%d\t%d\t%d\t%d\n", elapsedTicks, mage_count, mage_level, range_count, range_level, melee_count, melee_level);
 			}
 		}
 	}
@@ -376,8 +372,7 @@ public class NyloPredictor
 	{
 		if ((currentIndex + 1) < NYLOCAS_WAVES.length)
 		{
-			Wave nextWave = NYLOCAS_WAVES[currentIndex + 1];
-			return nextWave;
+			return NYLOCAS_WAVES[currentIndex + 1];
 		}
 		else
 		{
@@ -393,7 +388,7 @@ public class NyloPredictor
 		}
 		else
 		{
-			String types = "";
+			StringBuilder types = new StringBuilder();
 
 			for (Nylocas nylo : wave.getSpawns())
 			{
@@ -401,34 +396,34 @@ public class NyloPredictor
 				{
 					if (types.length() > 0)
 					{
-						types += ", ";
+						types.append(", ");
 					}
 
 					switch (nylo.getType())
 					{
 						case MAGE_162:
-							types += "Small Mage";
+							types.append("Small Mage");
 							break;
 						case MAGE_260:
-							types += "Big Mage";
+							types.append("Big Mage");
 							break;
 						case MELEE_162:
-							types += "Small Melee";
+							types.append("Small Melee");
 							break;
 						case MELEE_260:
-							types += "Big Melee";
+							types.append("Big Melee");
 							break;
 						case RANGE_162:
-							types += "Small Range";
+							types.append("Small Range");
 							break;
 						case RANGE_260:
-							types += "Big Range";
+							types.append("Big Range");
 							break;
 					}
 				}
 			}
 
-			return types.length() > 0 ? types : null;
+			return types.length() > 0 ? types.toString() : null;
 		}
 	}
 
@@ -452,21 +447,21 @@ public class NyloPredictor
 	public static class Nylocas
 	{
 
-		private NylocasType type;
-		private Spawn spawn;
+		private final NylocasType type;
+		private final Spawn spawn;
 
-		public Nylocas(NylocasType type, Spawn spawn)
+		Nylocas(NylocasType type, Spawn spawn)
 		{
 			this.type = type;
 			this.spawn = spawn;
 		}
 
-		public NylocasType getType()
+		NylocasType getType()
 		{
 			return this.type;
 		}
 
-		public Spawn getSpawn()
+		Spawn getSpawn()
 		{
 			return this.spawn;
 		}
@@ -474,7 +469,7 @@ public class NyloPredictor
 		@Override
 		public boolean equals(Object object)
 		{
-			if (object != null && (object instanceof Nylocas))
+			if ((object instanceof Nylocas))
 			{
 				Nylocas nylo = (Nylocas) object;
 				return nylo.getType() == this.type && nylo.getSpawn() == this.spawn;
@@ -487,14 +482,14 @@ public class NyloPredictor
 	public static class Wave
 	{
 
-		private Nylocas[] spawns;
+		private final Nylocas[] spawns;
 
-		public Wave(Nylocas... nylocas)
+		Wave(Nylocas... nylocas)
 		{
 			this.spawns = nylocas;
 		}
 
-		public Nylocas[] getSpawns()
+		Nylocas[] getSpawns()
 		{
 			return this.spawns;
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusCounter.java
index 2be0d90109..f6ee089e31 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusCounter.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusCounter.java
@@ -3,9 +3,7 @@ package net.runelite.client.plugins.theatre.rooms.xarpus;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
-import net.runelite.api.Client;
 import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
-import net.runelite.client.plugins.theatre.TheatreConfig;
 import net.runelite.client.plugins.theatre.TheatrePlugin;
 import net.runelite.client.ui.overlay.Overlay;
 import static net.runelite.client.ui.overlay.OverlayManager.OPTION_CONFIGURE;
@@ -16,22 +14,15 @@ import net.runelite.client.ui.overlay.components.TitleComponent;
 import net.runelite.client.ui.overlay.components.table.TableAlignment;
 import net.runelite.client.ui.overlay.components.table.TableComponent;
 
-public class XarpusCounter extends Overlay
+class XarpusCounter extends Overlay
 {
+	private final PanelComponent panelComponent = new PanelComponent();
+	private final XarpusHandler xarpusHandler;
 
-	private final Client client;
-	private final TheatrePlugin plugin;
-	private final TheatreConfig config;
-	PanelComponent panelComponent = new PanelComponent();
-	private XarpusHandler xarpusHandler;
-
-	public XarpusCounter(Client client, TheatrePlugin plugin, TheatreConfig config, XarpusHandler xarpushandler)
+	XarpusCounter(final TheatrePlugin plugin, final XarpusHandler xarpushandler)
 	{
 		super(plugin);
-		this.client = client;
 		this.xarpusHandler = xarpushandler;
-		this.plugin = plugin;
-		this.config = config;
 
 		setPosition(OverlayPosition.ABOVE_CHATBOX_RIGHT);
 		getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY_CONFIG, OPTION_CONFIGURE, "Theatre xarpus overlay"));
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusHandler.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusHandler.java
index d2c278806e..36c7cf918e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusHandler.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/rooms/xarpus/XarpusHandler.java
@@ -8,6 +8,7 @@ import java.awt.Polygon;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.ChatMessageType;
 import net.runelite.api.Client;
@@ -23,7 +24,6 @@ import net.runelite.api.events.NpcDespawned;
 import net.runelite.api.events.NpcSpawned;
 import net.runelite.api.events.VarbitChanged;
 import net.runelite.client.plugins.theatre.RoomHandler;
-import net.runelite.client.plugins.theatre.TheatreConfig;
 import net.runelite.client.plugins.theatre.TheatreConstant;
 import net.runelite.client.plugins.theatre.TheatrePlugin;
 import net.runelite.client.plugins.theatre.TheatreRoom;
@@ -36,21 +36,21 @@ public class XarpusHandler extends RoomHandler
 	private boolean staring;
 	private int ticksUntilShoot = 8;
 
-	@Getter
+	@Getter(AccessLevel.PUBLIC)
 	private NPC npc;
 
 	private long startTime = 0;
 	private boolean up = false;
 
-	@Getter
+	@Getter(AccessLevel.PUBLIC)
 	private int exhumesCount;
 	private boolean xarpusFlag;
 
 	private XarpusCounter overlay = null;
 
-	public XarpusHandler(Client client, TheatrePlugin plugin, TheatreConfig config)
+	public XarpusHandler(final Client client, final TheatrePlugin plugin)
 	{
-		super(client, plugin, config);
+		super(client, plugin);
 	}
 
 	@Override
@@ -66,11 +66,9 @@ public class XarpusHandler extends RoomHandler
 
 		if (overlay == null)
 		{
-			overlay = new XarpusCounter(client, plugin, config, this);
+			overlay = new XarpusCounter(plugin, this);
 			plugin.getOverlayManager().add(overlay);
 		}
-
-		System.out.println("Starting Xarpus Room");
 	}
 
 	@Override
@@ -84,11 +82,9 @@ public class XarpusHandler extends RoomHandler
 			plugin.getOverlayManager().remove(overlay);
 			overlay = null;
 		}
-
-		System.out.println("Stopping Xarpus Room");
 	}
 
-	public void reset()
+	private void reset()
 	{
 		exhumesCount = 0;
 		xarpusFlag = false;
@@ -121,7 +117,7 @@ public class XarpusHandler extends RoomHandler
 				seconds = seconds % 60;
 
 				this.ticksUntilShoot = 8;
-				if (config.extraTimers())
+				if (plugin.isExtraTimers())
 				{
 					this.client.addChatMessage(ChatMessageType.GAMEMESSAGE, "", "Wave 'Xarpus - Recovery' completed! Duration: <col=ff0000>" + minutes + ":" + twoDigitString(seconds), null);
 				}
@@ -132,11 +128,11 @@ public class XarpusHandler extends RoomHandler
 			renderTextLocation(graphics, ticksLeftStr, 12, Font.BOLD, Color.WHITE, canvasPoint);
 		}
 
-		if (npc.getId() == NpcID.XARPUS_8339 && config.showXarpusHeals())
+		if (npc.getId() == NpcID.XARPUS_8339 && plugin.isShowXarpusHeals())
 		{
-			for (GroundObject o : exhumes.keySet())
+			for (Map.Entry<GroundObject, Integer> exhum : exhumes.entrySet())
 			{
-				Polygon poly = o.getCanvasTilePoly();
+				Polygon poly = exhum.getKey().getCanvasTilePoly();
 				if (poly != null)
 				{
 					Color c = new Color(0, 255, 0, 130);
@@ -144,8 +140,8 @@ public class XarpusHandler extends RoomHandler
 					graphics.setStroke(new BasicStroke(1));
 					graphics.draw(poly);
 
-					String count = Integer.toString(exhumes.get(o) + 1);
-					LocalPoint lp = o.getLocalLocation();
+					String count = Integer.toString(exhum.getValue() + 1);
+					LocalPoint lp = exhum.getKey().getLocalLocation();
 					Point point = Perspective.getCanvasTextLocation(client, graphics, lp, count, 0);
 					if (point != null)
 					{
@@ -158,35 +154,34 @@ public class XarpusHandler extends RoomHandler
 
 	public void onVarbitChanged(VarbitChanged event)
 	{
-		if (client.getVar(Varbits.MULTICOMBAT_AREA) == 1 || client.getVarbitValue(client.getVarps(), TheatreConstant.DOOR_VARP) == 2)
+		if ((client.getVar(Varbits.MULTICOMBAT_AREA) == 1 ||
+			client.getVarbitValue(client.getVarps(), TheatreConstant.DOOR_VARP) == 2) &&
+			!xarpusFlag)
 		{
-			if (!xarpusFlag)
+			int players = client.getPlayers().size();
+
+			if (players == 5)
 			{
-				int players = client.getPlayers().size();
-
-				if (players == 5)
-				{
-					exhumesCount = 18;
-				}
-				else if (players == 4)
-				{
-					exhumesCount = 15;
-				}
-				else if (players == 3)
-				{
-					exhumesCount = 12;
-				}
-				else if (players == 2)
-				{
-					exhumesCount = 9;
-				}
-				else
-				{
-					exhumesCount = 7;
-				}
-
-				xarpusFlag = true;
+				exhumesCount = 18;
 			}
+			else if (players == 4)
+			{
+				exhumesCount = 15;
+			}
+			else if (players == 3)
+			{
+				exhumesCount = 12;
+			}
+			else if (players == 2)
+			{
+				exhumesCount = 9;
+			}
+			else
+			{
+				exhumesCount = 7;
+			}
+
+			xarpusFlag = true;
 		}
 	}
 
@@ -263,7 +258,7 @@ public class XarpusHandler extends RoomHandler
 
 				long minutes = seconds / 60L;
 				seconds = seconds % 60;
-				if (config.extraTimers())
+				if (plugin.isExtraTimers())
 				{
 					this.client.addChatMessage(ChatMessageType.GAMEMESSAGE, "", "Wave 'Xarpus - Acid' completed! Duration: <col=ff0000>" + minutes + ":" + twoDigitString(seconds), null);
 				}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/timers/RoomTimer.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/timers/RoomTimer.java
index 3a9c13252f..c01b81d990 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/timers/RoomTimer.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/timers/RoomTimer.java
@@ -27,7 +27,7 @@ public class RoomTimer extends Overlay
 
 
 	@Inject
-	public RoomTimer(Client client, TheatrePlugin plugin)
+	public RoomTimer(final Client client, final TheatrePlugin plugin)
 	{
 		super(plugin);
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/timers/Timeable.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/timers/Timeable.java
index 04c5a1a6c5..250fdca506 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/timers/Timeable.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/timers/Timeable.java
@@ -1,8 +1,8 @@
 package net.runelite.client.plugins.theatre.timers;
 
-import java.util.HashMap;
+import java.util.Map;
 
 public interface Timeable
 {
-	HashMap<String, Long> getTimes();
+	Map<String, Long> getTimes();
 }
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/thieving/ThievingOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/thieving/ThievingOverlay.java
index abd408abb4..dece27f927 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/thieving/ThievingOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/thieving/ThievingOverlay.java
@@ -31,6 +31,7 @@ import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.text.DecimalFormat;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import static net.runelite.api.AnimationID.BLOCK_UNARMED;
 import static net.runelite.api.AnimationID.PICKPOCKET_SUCCESS;
 import static net.runelite.api.AnimationID.THIEVING_STALL;
@@ -44,6 +45,7 @@ import net.runelite.client.ui.overlay.components.TitleComponent;
 import net.runelite.client.ui.overlay.components.table.TableAlignment;
 import net.runelite.client.ui.overlay.components.table.TableComponent;
 
+@Singleton
 public class ThievingOverlay extends Overlay
 {
 	private static final DecimalFormat FORMAT = new DecimalFormat("#.#");
@@ -54,7 +56,7 @@ public class ThievingOverlay extends Overlay
 	private final PanelComponent panelComponent = new PanelComponent();
 
 	@Inject
-	private ThievingOverlay(Client client, ThievingPlugin plugin, XpTrackerService xpTrackerService)
+	private ThievingOverlay(final Client client, final ThievingPlugin plugin, final XpTrackerService xpTrackerService)
 	{
 		setPosition(OverlayPosition.TOP_LEFT);
 		this.client = client;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/thieving/ThievingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/thieving/ThievingPlugin.java
index e1babf47fd..fa73e5b00f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/thieving/ThievingPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/thieving/ThievingPlugin.java
@@ -29,11 +29,13 @@ package net.runelite.client.plugins.thieving;
 import java.time.Duration;
 import java.time.Instant;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Getter;
 import com.google.inject.Provides;
 import net.runelite.api.ChatMessageType;
 import net.runelite.api.events.ChatMessage;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.GameTick;
 import net.runelite.client.config.ConfigManager;
 import net.runelite.client.eventbus.Subscribe;
@@ -52,7 +54,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	type = PluginType.SKILLING,
 	enabledByDefault = false
 )
-
+@Singleton
 @PluginDependency(XpTrackerPlugin.class)
 public class ThievingPlugin extends Plugin
 {
@@ -68,6 +70,8 @@ public class ThievingPlugin extends Plugin
 	@Getter(AccessLevel.PACKAGE)
 	private ThievingSession session;
 
+	private int statTimeout;
+
 	@Provides
 	ThievingConfig getConfig(ConfigManager configManager)
 	{
@@ -77,6 +81,8 @@ public class ThievingPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		this.statTimeout = config.statTimeout();
+
 		session = null;
 		overlayManager.add(overlay);
 	}
@@ -91,12 +97,12 @@ public class ThievingPlugin extends Plugin
 	@Subscribe
 	public void onGameTick(GameTick gameTick)
 	{
-		if (session == null || config.statTimeout() == 0)
+		if (session == null || this.statTimeout == 0)
 		{
 			return;
 		}
 
-		Duration statTimeout = Duration.ofMinutes(config.statTimeout());
+		Duration statTimeout = Duration.ofMinutes(this.statTimeout);
 		Duration sinceCut = Duration.between(session.getLastTheivingAction(), Instant.now());
 
 		if (sinceCut.compareTo(statTimeout) >= 0)
@@ -138,5 +144,16 @@ public class ThievingPlugin extends Plugin
 			session.hasFailed();
 		}
 	}
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (!"thieving".equals(event.getGroup()))
+		{
+			return;
+		}
+
+		this.statTimeout = config.statTimeout();
+	}
 }
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/thieving/ThievingSession.java b/runelite-client/src/main/java/net/runelite/client/plugins/thieving/ThievingSession.java
index 97cf75212f..967fd60cf4 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/thieving/ThievingSession.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/thieving/ThievingSession.java
@@ -30,7 +30,7 @@ import java.time.Instant;
 import lombok.AccessLevel;
 import lombok.Getter;
 
-public class ThievingSession
+class ThievingSession
 {
 	@Getter(AccessLevel.PACKAGE)
 	private Instant lastTheivingAction;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/NPCContainer.java b/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/NPCContainer.java
index 6edc06cead..d0a1328c88 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/NPCContainer.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/NPCContainer.java
@@ -28,6 +28,7 @@ package net.runelite.client.plugins.ticktimers;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import java.awt.Color;
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -39,7 +40,7 @@ import net.runelite.api.NPCDefinition;
 import net.runelite.api.NpcID;
 import net.runelite.api.Prayer;
 
-@Getter
+@Getter(AccessLevel.PACKAGE)
 class NPCContainer
 {
 	private NPC npc;
@@ -48,14 +49,14 @@ class NPCContainer
 	private int npcSize;
 	private ImmutableSet<Integer> animations;
 	private int attackSpeed;
-	@Setter
+	@Setter(AccessLevel.PACKAGE)
 	private int ticksUntilAttack;
-	@Setter
+	@Setter(AccessLevel.PACKAGE)
 	private Actor npcInteracting;
-	@Setter
+	@Setter(AccessLevel.PACKAGE)
 	private AttackStyle attackStyle;
 
-	NPCContainer(NPC npc, int attackSpeed)
+	NPCContainer(final NPC npc, final int attackSpeed)
 	{
 		this.npc = npc;
 		this.npcName = npc.getName();
@@ -109,7 +110,7 @@ class NPCContainer
 		DAGANNOTH_SUPREME(NpcID.DAGANNOTH_SUPREME, AttackStyle.RANGE, ImmutableSet.of(AnimationID.DAG_SUPREME)),
 		DAGANNOTH_PRIME(NpcID.DAGANNOTH_PRIME, AttackStyle.MAGE, ImmutableSet.of(AnimationID.DAG_PRIME));
 
-		private static ImmutableMap<Integer, BossMonsters> idMap;
+		private static final ImmutableMap<Integer, BossMonsters> idMap;
 
 		static
 		{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TickTimersConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TickTimersConfig.java
index 58b0a346cd..c61c121a2d 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TickTimersConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TickTimersConfig.java
@@ -24,6 +24,7 @@
 package net.runelite.client.plugins.ticktimers;
 
 import java.awt.Font;
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import net.runelite.client.config.Config;
@@ -169,7 +170,7 @@ public interface TickTimersConfig extends Config
 		return false;
 	}
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	@AllArgsConstructor
 	enum FontStyle
 	{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TickTimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TickTimersPlugin.java
index 2454e42a1e..b801e83a40 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TickTimersPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TickTimersPlugin.java
@@ -28,6 +28,7 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
@@ -35,6 +36,7 @@ import net.runelite.api.Client;
 import net.runelite.api.GameState;
 import net.runelite.api.NPC;
 import net.runelite.api.NpcID;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.GameStateChanged;
 import net.runelite.api.events.GameTick;
 import net.runelite.api.events.NpcDespawned;
@@ -54,7 +56,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	enabledByDefault = false,
 	type = PluginType.PVM
 )
-
+@Singleton
 @Slf4j
 public class TickTimersPlugin extends Plugin
 {
@@ -78,6 +80,21 @@ public class TickTimersPlugin extends Plugin
 	private Set<NPCContainer> npcContainer = new HashSet<>();
 	private boolean validRegion;
 
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showPrayerWidgetHelper;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showHitSquares;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean changeTickColor;
+	private boolean gwd;
+	private boolean dks;
+	@Getter(AccessLevel.PACKAGE)
+	private TickTimersConfig.FontStyle fontStyle;
+	@Getter(AccessLevel.PACKAGE)
+	private int textSize;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean shadows;
+
 	@Provides
 	TickTimersConfig getConfig(ConfigManager configManager)
 	{
@@ -87,6 +104,7 @@ public class TickTimersPlugin extends Plugin
 	@Override
 	public void startUp()
 	{
+		updateConfig();
 		npcContainer.clear();
 	}
 
@@ -147,7 +165,7 @@ public class TickTimersPlugin extends Plugin
 			case NpcID.FLOCKLEADER_GEERIN:
 			case NpcID.WINGMAN_SKREE:
 			case NpcID.KREEARRA:
-				if (config.gwd())
+				if (this.gwd)
 				{
 					npcContainer.add(new NPCContainer(npc, npcManager.getAttackSpeed(npc.getId())));
 				}
@@ -155,7 +173,7 @@ public class TickTimersPlugin extends Plugin
 			case NpcID.DAGANNOTH_REX:
 			case NpcID.DAGANNOTH_SUPREME:
 			case NpcID.DAGANNOTH_PRIME:
-				if (config.dks())
+				if (this.dks)
 				{
 					npcContainer.add(new NPCContainer(npc, npcManager.getAttackSpeed(npc.getId())));
 				}
@@ -221,12 +239,9 @@ public class TickTimersPlugin extends Plugin
 
 			for (int anims : npcs.getAnimations())
 			{
-				if (anims == npcs.getNpc().getAnimation())
+				if (anims == npcs.getNpc().getAnimation() && npcs.getTicksUntilAttack() < 1)
 				{
-					if (npcs.getTicksUntilAttack() < 1)
-					{
-						npcs.setTicksUntilAttack(npcs.getAttackSpeed());
-					}
+					npcs.setTicksUntilAttack(npcs.getAttackSpeed());
 				}
 			}
 		}
@@ -238,4 +253,27 @@ public class TickTimersPlugin extends Plugin
 			x -> x == ARMA_REGION || x == GENERAL_REGION || x == ZAMMY_REGION || x == SARA_REGION || x == WATERBITH_REGION
 		);
 	}
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (!"TickTimers".equals(event.getGroup()))
+		{
+			return;
+		}
+
+		updateConfig();
+	}
+
+	private void updateConfig()
+	{
+		this.showPrayerWidgetHelper = config.showPrayerWidgetHelper();
+		this.showHitSquares = config.showHitSquares();
+		this.changeTickColor = config.changeTickColor();
+		this.gwd = config.gwd();
+		this.dks = config.dks();
+		this.fontStyle = config.fontStyle();
+		this.textSize = config.textSize();
+		this.shadows = config.shadows();
+	}
 }
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TimersOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TimersOverlay.java
index a07cf1bede..2063625a2c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TimersOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TimersOverlay.java
@@ -31,6 +31,7 @@ import java.awt.Graphics2D;
 import java.awt.Rectangle;
 import java.util.List;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.Point;
 import net.runelite.api.coords.WorldArea;
@@ -41,18 +42,17 @@ import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayPriority;
 import net.runelite.client.ui.overlay.OverlayUtil;
 
+@Singleton
 public class TimersOverlay extends Overlay
 {
-	private TickTimersPlugin plugin;
-	private Client client;
-	private TickTimersConfig config;
+	private final TickTimersPlugin plugin;
+	private final Client client;
 
 	@Inject
-	TimersOverlay(TickTimersPlugin plugin, Client client, TickTimersConfig config)
+	TimersOverlay(final TickTimersPlugin plugin, final Client client)
 	{
 		this.plugin = plugin;
 		this.client = client;
-		this.config = config;
 		setPosition(OverlayPosition.DYNAMIC);
 		setPriority(OverlayPriority.HIGHEST);
 		setLayer(OverlayLayer.ALWAYS_ON_TOP);
@@ -72,7 +72,7 @@ public class TimersOverlay extends Overlay
 			final List<WorldPoint> hitSquares = getHitSquares(npc.getNpc().getWorldLocation(), npc.getNpcSize(), 1, false);
 			final NPCContainer.AttackStyle attackStyle = npc.getAttackStyle();
 
-			if (config.showHitSquares() && attackStyle.getName().equals("Melee"))
+			if (plugin.isShowHitSquares() && attackStyle.getName().equals("Melee"))
 			{
 				for (WorldPoint p : hitSquares)
 				{
@@ -86,26 +86,26 @@ public class TimersOverlay extends Overlay
 			}
 
 			final String ticksLeftStr = String.valueOf(ticksLeft);
-			final int font = config.fontStyle().getFont();
-			final boolean shadows = config.shadows();
+			final int font = plugin.getFontStyle().getFont();
+			final boolean shadows = plugin.isShadows();
 			Color color = (ticksLeft <= 1 ? Color.WHITE : attackStyle.getColor());
 
-			if (!config.changeTickColor())
+			if (!plugin.isChangeTickColor())
 			{
 				color = attackStyle.getColor();
 			}
 
 			final Point canvasPoint = npc.getNpc().getCanvasTextLocation(graphics, Integer.toString(ticksLeft), 0);
 
-			OverlayUtil.renderTextLocation(graphics, ticksLeftStr, config.textSize(), font, color, canvasPoint, shadows, 0);
+			OverlayUtil.renderTextLocation(graphics, ticksLeftStr, plugin.getTextSize(), font, color, canvasPoint, shadows, 0);
 
-			if (config.showPrayerWidgetHelper() && attackStyle.getPrayer() != null)
+			if (plugin.isShowPrayerWidgetHelper() && attackStyle.getPrayer() != null)
 			{
 				Rectangle bounds = OverlayUtil.renderPrayerOverlay(graphics, client, attackStyle.getPrayer(), color);
 
 				if (bounds != null)
 				{
-					renderTextLocation(graphics, ticksLeftStr, 16, config.fontStyle().getFont(), color, centerPoint(bounds), shadows);
+					renderTextLocation(graphics, ticksLeftStr, 16, plugin.getFontStyle().getFont(), color, centerPoint(bounds), shadows);
 				}
 			}
 		}
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 0d1022d92f..03bea0d0c1 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
@@ -35,9 +35,9 @@ public interface TileIndicatorsConfig extends Config
 {
 	@Alpha
 	@ConfigItem(
-			keyName = "highlightDestinationColor",
-			name = "Color of current destination highlighting",
-			description = "Configures the highlight color of current destination"
+		keyName = "highlightDestinationColor",
+		name = "Color of current destination highlighting",
+		description = "Configures the highlight color of current destination"
 	)
 	default Color highlightDestinationColor()
 	{
@@ -45,9 +45,9 @@ public interface TileIndicatorsConfig extends Config
 	}
 
 	@ConfigItem(
-			keyName = "highlightDestinationTile",
-			name = "Highlight destination tile",
-			description = "Highlights tile player is walking to"
+		keyName = "highlightDestinationTile",
+		name = "Highlight destination tile",
+		description = "Highlights tile player is walking to"
 	)
 	default boolean highlightDestinationTile()
 	{
@@ -56,9 +56,9 @@ public interface TileIndicatorsConfig extends Config
 
 	@Alpha
 	@ConfigItem(
-			keyName = "highlightCurrentColor",
-			name = "Color of current tile highlighting",
-			description = "Configures the highlight color of current tile position"
+		keyName = "highlightCurrentColor",
+		name = "Color of current tile highlighting",
+		description = "Configures the highlight color of current tile position"
 	)
 	default Color highlightCurrentColor()
 	{
@@ -66,9 +66,9 @@ public interface TileIndicatorsConfig extends Config
 	}
 
 	@ConfigItem(
-			keyName = "highlightCurrentTile",
-			name = "Highlight current tile",
-			description = "Highlights tile player is on"
+		keyName = "highlightCurrentTile",
+		name = "Highlight current tile",
+		description = "Highlights tile player is on"
 	)
 	default boolean highlightCurrentTile()
 	{
@@ -77,9 +77,9 @@ public interface TileIndicatorsConfig extends Config
 
 	@Alpha
 	@ConfigItem(
-			keyName = "highlightHoveredColor",
-			name = "Color of current hovered highlighting",
-			description = "Configures the highlight color of hovered tile"
+		keyName = "highlightHoveredColor",
+		name = "Color of current hovered highlighting",
+		description = "Configures the highlight color of hovered tile"
 	)
 	default Color highlightHoveredColor()
 	{
@@ -87,9 +87,9 @@ public interface TileIndicatorsConfig extends Config
 	}
 
 	@ConfigItem(
-			keyName = "highlightHoveredTile",
-			name = "Highlight hovered tile",
-			description = "Highlights tile player is hovering with mouse"
+		keyName = "highlightHoveredTile",
+		name = "Highlight hovered tile",
+		description = "Highlights tile player is hovering with mouse"
 	)
 	default boolean highlightHoveredTile()
 	{
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 938a842088..e701b46390 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
@@ -29,6 +29,7 @@ import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.awt.Polygon;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.Perspective;
 import net.runelite.api.coords.LocalPoint;
@@ -39,16 +40,17 @@ import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayPriority;
 import net.runelite.client.ui.overlay.OverlayUtil;
 
+@Singleton
 public class TileIndicatorsOverlay extends Overlay
 {
 	private final Client client;
-	private final TileIndicatorsConfig config;
+	private final TileIndicatorsPlugin plugin;
 
 	@Inject
-	private TileIndicatorsOverlay(Client client, TileIndicatorsConfig config)
+	private TileIndicatorsOverlay(final Client client, final TileIndicatorsPlugin plugin)
 	{
 		this.client = client;
-		this.config = config;
+		this.plugin = plugin;
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_SCENE);
 		setPriority(OverlayPriority.MED);
@@ -57,21 +59,19 @@ public class TileIndicatorsOverlay extends Overlay
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (config.highlightHoveredTile())
-		{
+		if (plugin.isHighlightHoveredTile() &&
 			// If we have tile "selected" render it
-			if (client.getSelectedSceneTile() != null)
-			{
-				renderTile(graphics, client.getSelectedSceneTile().getLocalLocation(), config.highlightHoveredColor());
-			}
-		}
-
-		if (config.highlightDestinationTile())
+			client.getSelectedSceneTile() != null)
 		{
-			renderTile(graphics, client.getLocalDestinationLocation(), config.highlightDestinationColor());
+			renderTile(graphics, client.getSelectedSceneTile().getLocalLocation(), plugin.getHighlightHoveredColor());
 		}
 
-		if (config.highlightCurrentTile())
+		if (plugin.isHighlightDestinationTile())
+		{
+			renderTile(graphics, client.getLocalDestinationLocation(), plugin.getHighlightDestinationColor());
+		}
+
+		if (plugin.isHighlightCurrentTile())
 		{
 			final WorldPoint playerPos = client.getLocalPlayer().getWorldLocation();
 			if (playerPos == null)
@@ -85,7 +85,7 @@ public class TileIndicatorsOverlay extends Overlay
 				return null;
 			}
 
-			renderTile(graphics, playerPosLocal, config.highlightCurrentColor());
+			renderTile(graphics, playerPosLocal, plugin.getHighlightCurrentColor());
 		}
 
 		return null;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsPlugin.java
index 7347c8611e..9a41a6a35b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsPlugin.java
@@ -25,8 +25,14 @@
 package net.runelite.client.plugins.tileindicators;
 
 import com.google.inject.Provides;
+import java.awt.Color;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
+import lombok.Getter;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.client.config.ConfigManager;
+import net.runelite.client.eventbus.Subscribe;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginDescriptor;
 import net.runelite.client.ui.overlay.OverlayManager;
@@ -37,6 +43,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	tags = {"highlight", "overlay"},
 	enabledByDefault = false
 )
+@Singleton
 public class TileIndicatorsPlugin extends Plugin
 {
 	@Inject
@@ -45,6 +52,22 @@ public class TileIndicatorsPlugin extends Plugin
 	@Inject
 	private TileIndicatorsOverlay overlay;
 
+	@Inject
+	private TileIndicatorsConfig config;
+
+	@Getter(AccessLevel.PACKAGE)
+	private Color highlightDestinationColor;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean highlightDestinationTile;
+	@Getter(AccessLevel.PACKAGE)
+	private Color highlightCurrentColor;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean highlightCurrentTile;
+	@Getter(AccessLevel.PACKAGE)
+	private Color highlightHoveredColor;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean highlightHoveredTile;
+
 	@Provides
 	TileIndicatorsConfig provideConfig(ConfigManager configManager)
 	{
@@ -54,6 +77,7 @@ public class TileIndicatorsPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
 		overlayManager.add(overlay);
 	}
 
@@ -62,4 +86,25 @@ public class TileIndicatorsPlugin extends Plugin
 	{
 		overlayManager.remove(overlay);
 	}
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (!"tileindicators".equals(event.getGroup()))
+		{
+			return;
+		}
+
+		updateConfig();
+	}
+
+	private void updateConfig()
+	{
+		this.highlightDestinationColor = config.highlightDestinationColor();
+		this.highlightDestinationTile = config.highlightDestinationTile();
+		this.highlightCurrentColor = config.highlightCurrentColor();
+		this.highlightCurrentTile = config.highlightCurrentTile();
+		this.highlightHoveredColor = config.highlightHoveredColor();
+		this.highlightHoveredTile = config.highlightHoveredTile();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/GameIndicator.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/GameIndicator.java
index b91f8c7080..6434ad8203 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/GameIndicator.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/GameIndicator.java
@@ -45,7 +45,7 @@ enum GameIndicator
 	private final int imageId;
 	private final GameTimerImageType imageType;
 
-	GameIndicator(int imageId, GameTimerImageType idType, String description, String text, Color textColor)
+	GameIndicator(final int imageId, final GameTimerImageType idType, final String description, final String text, final Color textColor)
 	{
 		this.imageId = imageId;
 		this.imageType = idType;
@@ -54,7 +54,7 @@ enum GameIndicator
 		this.textColor = textColor;
 	}
 
-	GameIndicator(int imageId, GameTimerImageType idType, String description)
+	GameIndicator(final int imageId, final GameTimerImageType idType, final String description)
 	{
 		this(imageId, idType, description, "", null);
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/GameTimer.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/GameTimer.java
index dcd739fad6..97b51e82fb 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/GameTimer.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/GameTimer.java
@@ -30,6 +30,7 @@ package net.runelite.client.plugins.timers;
 import java.awt.image.BufferedImage;
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.GraphicID;
 import net.runelite.api.ItemID;
@@ -73,21 +74,22 @@ enum GameTimer
 	MINIGAME_TELEPORT(SpriteID.TAB_QUESTS_RED_MINIGAMES, GameTimerImageType.SPRITE, "Minigame Teleport", 20, ChronoUnit.MINUTES),
 	SKULL(SpriteID.PLAYER_KILLER_SKULL_523, GameTimerImageType.SPRITE, "Skull", 20, ChronoUnit.MINUTES),
 	ANTIPOISON(ItemID.ANTIPOISON4, GameTimerImageType.ITEM, "Antipoison"),
-	ANTIVENOM(ItemID.ANTIVENOM4, GameTimerImageType.ITEM, "Anti-venom");
+	ANTIVENOM(ItemID.ANTIVENOM4, GameTimerImageType.ITEM, "Anti-venom"),
+	DRAGON_FIRE_SHIELD(ItemID.DRAGONFIRE_SHIELD_11284, GameTimerImageType.ITEM, "Dragonfire Shield Special", 2, ChronoUnit.MINUTES);
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final Duration duration;
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final Integer graphicId;
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final String description;
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final boolean removedOnDeath;
 
 	private final int imageId;
 	private final GameTimerImageType imageType;
 
-	GameTimer(int imageId, GameTimerImageType idType, String description, Integer graphicId, long time, ChronoUnit unit, boolean removedOnDeath)
+	GameTimer(final int imageId, final GameTimerImageType idType, final String description, final Integer graphicId, final long time, final ChronoUnit unit, final boolean removedOnDeath)
 	{
 		this.description = description;
 		this.graphicId = graphicId;
@@ -97,22 +99,22 @@ enum GameTimer
 		this.removedOnDeath = removedOnDeath;
 	}
 
-	GameTimer(int imageId, GameTimerImageType idType, String description, long time, ChronoUnit unit, boolean removeOnDeath)
+	GameTimer(final int imageId, final GameTimerImageType idType, final String description, final long time, final ChronoUnit unit, final boolean removeOnDeath)
 	{
 		this(imageId, idType, description, null, time, unit, removeOnDeath);
 	}
 
-	GameTimer(int imageId, GameTimerImageType idType, String description, Integer graphicId, long time, ChronoUnit unit)
+	GameTimer(final int imageId, final GameTimerImageType idType, final String description, final Integer graphicId, final long time, final ChronoUnit unit)
 	{
 		this(imageId, idType, description, graphicId, time, unit, false);
 	}
 
-	GameTimer(int imageId, GameTimerImageType idType, String description, long time, ChronoUnit unit)
+	GameTimer(final int imageId, final GameTimerImageType idType, final String description, final long time, final ChronoUnit unit)
 	{
 		this(imageId, idType, description, null, time, unit, false);
 	}
 
-	GameTimer(int imageId, GameTimerImageType idType, String description)
+	GameTimer(final int imageId, final GameTimerImageType idType, final String description)
 	{
 		this(imageId, idType, description, null, 1, ChronoUnit.MILLIS, false);
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/IndicatorIndicator.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/IndicatorIndicator.java
index 9af1716f4d..395fd7ba74 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/IndicatorIndicator.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/IndicatorIndicator.java
@@ -26,6 +26,7 @@ package net.runelite.client.plugins.timers;
 
 import java.awt.Color;
 import java.awt.Image;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.ui.overlay.infobox.InfoBox;
@@ -33,10 +34,10 @@ import net.runelite.client.ui.overlay.infobox.InfoBoxPriority;
 
 public class IndicatorIndicator extends InfoBox
 {
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final GameIndicator indicator;
 
-	IndicatorIndicator(GameIndicator indicator, Image image, Plugin plugin)
+	IndicatorIndicator(final GameIndicator indicator, final Image image, final Plugin plugin)
 	{
 		super(image, plugin);
 		this.indicator = indicator;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimerTimer.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimerTimer.java
index 0a648a43f5..5d7ffa5762 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimerTimer.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimerTimer.java
@@ -35,14 +35,14 @@ class TimerTimer extends Timer
 {
 	private final GameTimer timer;
 
-	TimerTimer(GameTimer timer, Plugin plugin, BufferedImage image)
+	TimerTimer(final GameTimer timer, final Plugin plugin, final BufferedImage image)
 	{
 		super(timer.getDuration().toMillis(), ChronoUnit.MILLIS, image, plugin);
 		this.timer = timer;
 		setPriority(InfoBoxPriority.MED);
 	}
 
-	TimerTimer(GameTimer timer, int amount, Plugin plugin, BufferedImage image)
+	TimerTimer(final GameTimer timer, final int amount, final Plugin plugin, final BufferedImage image)
 	{
 		super(timer.getDuration().toMillis() * amount, ChronoUnit.MILLIS, image, plugin);
 		this.timer = timer;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersConfig.java
index 39f228d994..320509b301 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersConfig.java
@@ -210,4 +210,14 @@ public interface TimersConfig extends Config
 	{
 		return true;
 	}
+
+	@ConfigItem(
+		keyName = "showDfsSpecial",
+		name = "Dragonfire Shield special timer",
+		description = "Configures whether the special attack cooldown timer for the Dragonfire Shield is displayed"
+	)
+	default boolean showDFSSpecial()
+	{
+		return true;
+	}
 }
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 8ddf85f6a9..36ac85610f 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
@@ -30,6 +30,9 @@ import com.google.inject.Provides;
 import java.awt.image.BufferedImage;
 import java.util.regex.Pattern;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
+import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Actor;
 import net.runelite.api.AnimationID;
@@ -57,11 +60,11 @@ import net.runelite.api.events.ChatMessage;
 import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.GameStateChanged;
 import net.runelite.api.events.GameTick;
-import net.runelite.api.events.SpotAnimationChanged;
 import net.runelite.api.events.ItemContainerChanged;
 import net.runelite.api.events.LocalPlayerDeath;
 import net.runelite.api.events.MenuOptionClicked;
 import net.runelite.api.events.NpcDespawned;
+import net.runelite.api.events.SpotAnimationChanged;
 import net.runelite.api.events.VarbitChanged;
 import net.runelite.api.events.WidgetHiddenChanged;
 import net.runelite.api.widgets.Widget;
@@ -75,41 +78,7 @@ import net.runelite.client.game.SpriteManager;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginDescriptor;
 import static net.runelite.client.plugins.timers.GameIndicator.VENGEANCE_ACTIVE;
-import static net.runelite.client.plugins.timers.GameTimer.ABYSSAL_SIRE_STUN;
-import static net.runelite.client.plugins.timers.GameTimer.ANTIFIRE;
-import static net.runelite.client.plugins.timers.GameTimer.ANTIPOISON;
-import static net.runelite.client.plugins.timers.GameTimer.ANTIVENOM;
-import static net.runelite.client.plugins.timers.GameTimer.BIND;
-import static net.runelite.client.plugins.timers.GameTimer.CANNON;
-import static net.runelite.client.plugins.timers.GameTimer.CHARGE;
-import static net.runelite.client.plugins.timers.GameTimer.DMM_FULLTB;
-import static net.runelite.client.plugins.timers.GameTimer.DMM_HALFTB;
-import static net.runelite.client.plugins.timers.GameTimer.ENTANGLE;
-import static net.runelite.client.plugins.timers.GameTimer.EXANTIFIRE;
-import static net.runelite.client.plugins.timers.GameTimer.EXSUPERANTIFIRE;
-import static net.runelite.client.plugins.timers.GameTimer.FULLTB;
-import static net.runelite.client.plugins.timers.GameTimer.GOD_WARS_ALTAR;
-import static net.runelite.client.plugins.timers.GameTimer.HALFBIND;
-import static net.runelite.client.plugins.timers.GameTimer.HALFENTANGLE;
-import static net.runelite.client.plugins.timers.GameTimer.HALFSNARE;
-import static net.runelite.client.plugins.timers.GameTimer.HALFTB;
-import static net.runelite.client.plugins.timers.GameTimer.HOME_TELEPORT;
-import static net.runelite.client.plugins.timers.GameTimer.ICEBARRAGE;
-import static net.runelite.client.plugins.timers.GameTimer.ICEBLITZ;
-import static net.runelite.client.plugins.timers.GameTimer.ICEBURST;
-import static net.runelite.client.plugins.timers.GameTimer.ICERUSH;
-import static net.runelite.client.plugins.timers.GameTimer.IMBUEDHEART;
-import static net.runelite.client.plugins.timers.GameTimer.MAGICIMBUE;
-import static net.runelite.client.plugins.timers.GameTimer.MINIGAME_TELEPORT;
-import static net.runelite.client.plugins.timers.GameTimer.OVERLOAD;
-import static net.runelite.client.plugins.timers.GameTimer.OVERLOAD_RAID;
-import static net.runelite.client.plugins.timers.GameTimer.PRAYER_ENHANCE;
-import static net.runelite.client.plugins.timers.GameTimer.SKULL;
-import static net.runelite.client.plugins.timers.GameTimer.SNARE;
-import static net.runelite.client.plugins.timers.GameTimer.STAFF_OF_THE_DEAD;
-import static net.runelite.client.plugins.timers.GameTimer.STAMINA;
-import static net.runelite.client.plugins.timers.GameTimer.SUPERANTIFIRE;
-import static net.runelite.client.plugins.timers.GameTimer.VENGEANCE;
+import static net.runelite.client.plugins.timers.GameTimer.*;
 import net.runelite.client.ui.overlay.infobox.InfoBoxManager;
 
 @PluginDescriptor(
@@ -118,6 +87,7 @@ import net.runelite.client.ui.overlay.infobox.InfoBoxManager;
 	tags = {"combat", "items", "magic", "potions", "prayer", "overlay", "abyssal", "sire"}
 )
 @Slf4j
+@Singleton
 public class TimersPlugin extends Plugin
 {
 	private static final String ANTIFIRE_DRINK_MESSAGE = "You drink some of your antifire potion.";
@@ -180,6 +150,26 @@ public class TimersPlugin extends Plugin
 
 	@Inject
 	private InfoBoxManager infoBoxManager;
+	
+	private boolean showHomeMinigameTeleports;
+	private boolean showAntiPoison;
+	private boolean showAntiFire;
+	private boolean showStamina;
+	private boolean showOverload;
+	private boolean showPrayerEnhance;
+	private boolean showCannon;
+	private boolean showMagicImbue;
+	private boolean showCharge;
+	private boolean showImbuedHeart;
+	private boolean showVengeance;
+	private boolean showVengeanceActive;
+	@Setter(AccessLevel.PACKAGE)
+	private boolean showTeleblock;
+	private boolean showFreezes;
+	private boolean showGodWarsAltar;
+	private boolean showSkull;
+	private boolean showStaffOfTheDead;
+	private boolean showAbyssalSireStun;
 
 	@Provides
 	TimersConfig getConfig(ConfigManager configManager)
@@ -187,6 +177,12 @@ public class TimersPlugin extends Plugin
 		return configManager.getConfig(TimersConfig.class);
 	}
 
+	@Override
+	protected void startUp() throws Exception
+	{
+		updateConfig();
+	}
+	
 	@Override
 	protected void shutDown() throws Exception
 	{
@@ -217,7 +213,7 @@ public class TimersPlugin extends Plugin
 			lastRaidVarb = raidVarb;
 		}
 
-		if (lastVengCooldownVarb != vengCooldownVarb && config.showVengeance())
+		if (lastVengCooldownVarb != vengCooldownVarb && this.showVengeance)
 		{
 			if (vengCooldownVarb == 1)
 			{
@@ -231,7 +227,7 @@ public class TimersPlugin extends Plugin
 			lastVengCooldownVarb = vengCooldownVarb;
 		}
 
-		if (lastIsVengeancedVarb != isVengeancedVarb && config.showVengeanceActive())
+		if (lastIsVengeancedVarb != isVengeancedVarb && this.showVengeanceActive)
 		{
 			if (isVengeancedVarb == 1)
 			{
@@ -261,7 +257,7 @@ public class TimersPlugin extends Plugin
 			lastWildernessVarb = inWilderness;
 		}
 
-		if (lastPoisonVarp != poisonVarp && config.showAntiPoison())
+		if (lastPoisonVarp != poisonVarp && this.showAntiPoison)
 		{
 			if (nextPoisonTick - client.getTickCount() <= 0 || lastPoisonVarp == 0)
 			{
@@ -304,76 +300,83 @@ public class TimersPlugin extends Plugin
 	@Subscribe
 	public void onConfigChanged(ConfigChanged event)
 	{
-		if (!config.showHomeMinigameTeleports())
+		if (!event.getGroup().equals("timers"))
+		{
+			return;
+		}
+		
+		updateConfig();
+		
+		if (!this.showHomeMinigameTeleports)
 		{
 			removeGameTimer(HOME_TELEPORT);
 			removeGameTimer(MINIGAME_TELEPORT);
 		}
 
-		if (!config.showAntiFire())
+		if (!this.showAntiFire)
 		{
 			removeGameTimer(ANTIFIRE);
 			removeGameTimer(EXANTIFIRE);
 			removeGameTimer(SUPERANTIFIRE);
 		}
 
-		if (!config.showStamina())
+		if (!this.showStamina)
 		{
 			removeGameTimer(STAMINA);
 		}
 
-		if (!config.showOverload())
+		if (!this.showOverload)
 		{
 			removeGameTimer(OVERLOAD);
 			removeGameTimer(OVERLOAD_RAID);
 		}
 
-		if (!config.showPrayerEnhance())
+		if (!this.showPrayerEnhance)
 		{
 			removeGameTimer(PRAYER_ENHANCE);
 		}
 
-		if (!config.showCannon())
+		if (!this.showCannon)
 		{
 			removeGameTimer(CANNON);
 		}
 
-		if (!config.showMagicImbue())
+		if (!this.showMagicImbue)
 		{
 			removeGameTimer(MAGICIMBUE);
 		}
 
-		if (!config.showCharge())
+		if (!this.showCharge)
 		{
 			removeGameTimer(CHARGE);
 		}
 
-		if (!config.showImbuedHeart())
+		if (!this.showImbuedHeart)
 		{
 			removeGameTimer(IMBUEDHEART);
 		}
 
-		if (!config.showStaffOfTheDead())
+		if (!this.showStaffOfTheDead)
 		{
 			removeGameTimer(STAFF_OF_THE_DEAD);
 		}
 
-		if (!config.showVengeance())
+		if (!this.showVengeance)
 		{
 			removeGameTimer(VENGEANCE);
 		}
 
-		if (!config.showVengeanceActive())
+		if (!this.showVengeanceActive)
 		{
 			removeGameIndicator(VENGEANCE_ACTIVE);
 		}
 
-		if (!config.showTeleblock())
+		if (!this.showTeleblock)
 		{
 			removeTbTimers();
 		}
 
-		if (!config.showFreezes())
+		if (!this.showFreezes)
 		{
 			removeGameTimer(BIND);
 			removeGameTimer(HALFBIND);
@@ -397,7 +400,7 @@ public class TimersPlugin extends Plugin
 	@Subscribe
 	public void onMenuOptionClicked(MenuOptionClicked event)
 	{
-		if (config.showStamina()
+		if (this.showStamina
 			&& event.getOption().contains("Drink")
 			&& (event.getIdentifier() == ItemID.STAMINA_MIX1
 			|| event.getIdentifier() == ItemID.STAMINA_MIX2))
@@ -407,7 +410,7 @@ public class TimersPlugin extends Plugin
 			return;
 		}
 
-		if (config.showAntiFire()
+		if (this.showAntiFire
 			&& event.getOption().contains("Drink")
 			&& (event.getIdentifier() == ItemID.ANTIFIRE_MIX1
 			|| event.getIdentifier() == ItemID.ANTIFIRE_MIX2))
@@ -417,7 +420,7 @@ public class TimersPlugin extends Plugin
 			return;
 		}
 
-		if (config.showAntiFire()
+		if (this.showAntiFire
 			&& event.getOption().contains("Drink")
 			&& (event.getIdentifier() == ItemID.EXTENDED_ANTIFIRE_MIX1
 			|| event.getIdentifier() == ItemID.EXTENDED_ANTIFIRE_MIX2))
@@ -427,7 +430,7 @@ public class TimersPlugin extends Plugin
 			return;
 		}
 
-		if (config.showAntiFire()
+		if (this.showAntiFire
 			&& event.getOption().contains("Drink")
 			&& (event.getIdentifier() == ItemID.SUPER_ANTIFIRE_MIX1
 			|| event.getIdentifier() == ItemID.SUPER_ANTIFIRE_MIX2))
@@ -437,7 +440,7 @@ public class TimersPlugin extends Plugin
 			return;
 		}
 
-		if (config.showAntiFire()
+		if (this.showAntiFire
 			&& event.getOption().contains("Drink")
 			&& (event.getIdentifier() == ItemID.EXTENDED_SUPER_ANTIFIRE_MIX1
 			|| event.getIdentifier() == ItemID.EXTENDED_SUPER_ANTIFIRE_MIX2))
@@ -453,7 +456,7 @@ public class TimersPlugin extends Plugin
 			lastTeleportClicked = teleportWidget;
 		}
 
-		if (config.showImbuedHeart()
+		if (this.showImbuedHeart
 			&& event.getOption().contains("Invigorate"))
 		{
 			// Needs a hook as there's a few cases where potions boost the same amount as the heart
@@ -469,44 +472,44 @@ public class TimersPlugin extends Plugin
 			return;
 		}
 
-		if (config.showStamina() && (event.getMessage().equals(STAMINA_DRINK_MESSAGE) || event.getMessage().equals(STAMINA_SHARED_DRINK_MESSAGE)))
+		if (this.showStamina && (event.getMessage().equals(STAMINA_DRINK_MESSAGE) || event.getMessage().equals(STAMINA_SHARED_DRINK_MESSAGE)))
 		{
 			createGameTimer(STAMINA);
 		}
 
-		if (config.showStamina() && event.getMessage().equals(STAMINA_EXPIRED_MESSAGE))
+		if (this.showStamina && event.getMessage().equals(STAMINA_EXPIRED_MESSAGE))
 		{
 			removeGameTimer(STAMINA);
 		}
 
-		if (config.showAntiFire() && event.getMessage().equals(ANTIFIRE_DRINK_MESSAGE))
+		if (this.showAntiFire && event.getMessage().equals(ANTIFIRE_DRINK_MESSAGE))
 		{
 			createGameTimer(ANTIFIRE);
 		}
 
-		if (config.showAntiFire() && event.getMessage().equals(EXTENDED_ANTIFIRE_DRINK_MESSAGE))
+		if (this.showAntiFire && event.getMessage().equals(EXTENDED_ANTIFIRE_DRINK_MESSAGE))
 		{
 			createGameTimer(EXANTIFIRE);
 		}
 
-		if (config.showGodWarsAltar() && event.getMessage().equalsIgnoreCase(GOD_WARS_ALTAR_MESSAGE))//Normal altars are "You recharge your Prayer points." while gwd is "You recharge your Prayer."
+		if (this.showGodWarsAltar && event.getMessage().equalsIgnoreCase(GOD_WARS_ALTAR_MESSAGE))//Normal altars are "You recharge your Prayer points." while gwd is "You recharge your Prayer."
 		{
 			createGameTimer(GOD_WARS_ALTAR);
 		}
 
-		if (config.showAntiFire() && event.getMessage().equals(EXTENDED_SUPER_ANTIFIRE_DRINK_MESSAGE))
+		if (this.showAntiFire && event.getMessage().equals(EXTENDED_SUPER_ANTIFIRE_DRINK_MESSAGE))
 		{
 			createGameTimer(EXSUPERANTIFIRE);
 		}
 
-		if (config.showAntiFire() && event.getMessage().equals(ANTIFIRE_EXPIRED_MESSAGE))
+		if (this.showAntiFire && event.getMessage().equals(ANTIFIRE_EXPIRED_MESSAGE))
 		{
 			//they have the same expired message
 			removeGameTimer(ANTIFIRE);
 			removeGameTimer(EXANTIFIRE);
 		}
 
-		if (config.showOverload() && event.getMessage().startsWith("You drink some of your") && event.getMessage().contains("overload"))
+		if (this.showOverload && event.getMessage().startsWith("You drink some of your") && event.getMessage().contains("overload"))
 		{
 			if (client.getVar(Varbits.IN_RAID) == 1)
 			{
@@ -519,17 +522,17 @@ public class TimersPlugin extends Plugin
 
 		}
 
-		if (config.showCannon() && (event.getMessage().equals(CANNON_FURNACE_MESSAGE) || event.getMessage().contains(CANNON_REPAIR_MESSAGE)))
+		if (this.showCannon && (event.getMessage().equals(CANNON_FURNACE_MESSAGE) || event.getMessage().contains(CANNON_REPAIR_MESSAGE)))
 		{
 			createGameTimer(CANNON);
 		}
 
-		if (config.showCannon() && event.getMessage().equals(CANNON_PICKUP_MESSAGE))
+		if (this.showCannon && event.getMessage().equals(CANNON_PICKUP_MESSAGE))
 		{
 			removeGameTimer(CANNON);
 		}
 
-		if (config.showMagicImbue() && event.getMessage().equals(MAGIC_IMBUE_MESSAGE))
+		if (this.showMagicImbue && event.getMessage().equals(MAGIC_IMBUE_MESSAGE))
 		{
 			createGameTimer(MAGICIMBUE);
 		}
@@ -539,7 +542,7 @@ public class TimersPlugin extends Plugin
 			removeGameTimer(MAGICIMBUE);
 		}
 
-		if (config.showTeleblock())
+		if (this.showTeleblock)
 		{
 			if (FULL_TELEBLOCK_PATTERN.matcher(event.getMessage()).find())
 			{
@@ -564,53 +567,53 @@ public class TimersPlugin extends Plugin
 			}
 		}
 
-		if (config.showAntiFire() && event.getMessage().contains(SUPER_ANTIFIRE_DRINK_MESSAGE))
+		if (this.showAntiFire && event.getMessage().contains(SUPER_ANTIFIRE_DRINK_MESSAGE))
 		{
 			createGameTimer(SUPERANTIFIRE);
 		}
 
-		if (config.showAntiFire() && event.getMessage().equals(SUPER_ANTIFIRE_EXPIRED_MESSAGE))
+		if (this.showAntiFire && event.getMessage().equals(SUPER_ANTIFIRE_EXPIRED_MESSAGE))
 		{
 			removeGameTimer(SUPERANTIFIRE);
 		}
 
-		if (config.showImbuedHeart() && event.getMessage().contains(IMBUED_HEART_NOTREADY_MESSAGE))
+		if (this.showImbuedHeart && event.getMessage().contains(IMBUED_HEART_NOTREADY_MESSAGE))
 		{
 			imbuedHeartClicked = false;
 			return;
 		}
 
-		if (config.showImbuedHeart() && event.getMessage().equals(IMBUED_HEART_READY_MESSAGE))
+		if (this.showImbuedHeart && event.getMessage().equals(IMBUED_HEART_READY_MESSAGE))
 		{
 			removeGameTimer(IMBUEDHEART);
 		}
 
-		if (config.showPrayerEnhance() && event.getMessage().startsWith("You drink some of your") && event.getMessage().contains("prayer enhance"))
+		if (this.showPrayerEnhance && event.getMessage().startsWith("You drink some of your") && event.getMessage().contains("prayer enhance"))
 		{
 			createGameTimer(PRAYER_ENHANCE);
 		}
 
-		if (config.showCharge() && event.getMessage().equals(CHARGE_MESSAGE))
+		if (this.showCharge && event.getMessage().equals(CHARGE_MESSAGE))
 		{
 			createGameTimer(CHARGE);
 		}
 
-		if (config.showCharge() && event.getMessage().equals(CHARGE_EXPIRED_MESSAGE))
+		if (this.showCharge && event.getMessage().equals(CHARGE_EXPIRED_MESSAGE))
 		{
 			removeGameTimer(CHARGE);
 		}
 
-		if (config.showStaffOfTheDead() && event.getMessage().contains(STAFF_OF_THE_DEAD_SPEC_MESSAGE))
+		if (this.showStaffOfTheDead && event.getMessage().contains(STAFF_OF_THE_DEAD_SPEC_MESSAGE))
 		{
 			createGameTimer(STAFF_OF_THE_DEAD);
 		}
 
-		if (config.showStaffOfTheDead() && event.getMessage().contains(STAFF_OF_THE_DEAD_SPEC_EXPIRED_MESSAGE))
+		if (this.showStaffOfTheDead && event.getMessage().contains(STAFF_OF_THE_DEAD_SPEC_EXPIRED_MESSAGE))
 		{
 			removeGameTimer(STAFF_OF_THE_DEAD);
 		}
 
-		if (config.showFreezes() && event.getMessage().equals(FROZEN_MESSAGE))
+		if (this.showFreezes && event.getMessage().equals(FROZEN_MESSAGE))
 		{
 			freezeTimer = createGameTimer(ICEBARRAGE);
 			freezeTime = client.getTickCount();
@@ -627,7 +630,7 @@ public class TimersPlugin extends Plugin
 
 		final boolean isSkulled = player.getSkullIcon() != null && player.getSkullIcon() != SkullIcon.SKULL_FIGHT_PIT;
 
-		if (isSkulled != skulledLastTick && config.showSkull())
+		if (isSkulled != skulledLastTick && this.showSkull)
 		{
 			skulledLastTick = isSkulled;
 			if (isSkulled)
@@ -640,15 +643,13 @@ public class TimersPlugin extends Plugin
 			}
 		}
 
-		if (freezeTimer != null)
-		{
+		if (freezeTimer != null &&
 			// assume movement means unfrozen
-			if (freezeTime != client.getTickCount()
-				&& !currentWorldPoint.equals(lastPoint))
-			{
-				removeGameTimer(freezeTimer.getTimer());
-				freezeTimer = null;
-			}
+			freezeTime != client.getTickCount()
+			&& !currentWorldPoint.equals(lastPoint))
+		{
+			removeGameTimer(freezeTimer.getTimer());
+			freezeTimer = null;
 		}
 
 		lastPoint = currentWorldPoint;
@@ -689,7 +690,7 @@ public class TimersPlugin extends Plugin
 	{
 		Actor actor = event.getActor();
 
-		if (config.showAbyssalSireStun()
+		if (this.showAbyssalSireStun
 			&& actor instanceof NPC)
 		{
 			int npcId = ((NPC) actor).getId();
@@ -720,7 +721,7 @@ public class TimersPlugin extends Plugin
 			return;
 		}
 
-		if (config.showHomeMinigameTeleports()
+		if (this.showHomeMinigameTeleports
 			&& client.getLocalPlayer().getAnimation() == AnimationID.IDLE
 			&& (lastAnimation == AnimationID.BOOK_HOME_TELEPORT_5
 			|| lastAnimation == AnimationID.COW_HOME_TELEPORT_6))
@@ -735,6 +736,11 @@ public class TimersPlugin extends Plugin
 			}
 		}
 
+		if (config.showDFSSpecial() && lastAnimation == AnimationID.DRAGONFIRE_SHIELD_SPECIAL)
+		{
+			createGameTimer(DRAGON_FIRE_SHIELD);
+		}
+
 		lastAnimation = client.getLocalPlayer().getAnimation();
 	}
 
@@ -748,12 +754,12 @@ public class TimersPlugin extends Plugin
 			return;
 		}
 
-		if (config.showImbuedHeart() && actor.getSpotAnimation() == IMBUEDHEART.getGraphicId())
+		if (this.showImbuedHeart && actor.getSpotAnimation() == IMBUEDHEART.getGraphicId())
 		{
 			createGameTimer(IMBUEDHEART);
 		}
 
-		if (config.showFreezes())
+		if (this.showFreezes)
 		{
 			if (actor.getSpotAnimation() == BIND.getGraphicId())
 			{
@@ -891,7 +897,7 @@ public class TimersPlugin extends Plugin
 	{
 		Skill skill = event.getSkill();
 
-		if (skill != Skill.MAGIC || !config.showImbuedHeart() || !imbuedHeartClicked)
+		if (skill != Skill.MAGIC || !this.showImbuedHeart || !imbuedHeartClicked)
 		{
 			return;
 		}
@@ -960,4 +966,26 @@ public class TimersPlugin extends Plugin
 		removeGameTimer(DMM_FULLTB);
 		removeGameTimer(DMM_HALFTB);
 	}
+	
+	private void updateConfig()
+	{
+		this.showHomeMinigameTeleports = config.showHomeMinigameTeleports();
+		this.showAntiPoison = config.showAntiPoison();
+		this.showAntiFire = config.showAntiFire();
+		this.showStamina = config.showStamina();
+		this.showOverload = config.showOverload();
+		this.showPrayerEnhance = config.showPrayerEnhance();
+		this.showCannon = config.showCannon();
+		this.showMagicImbue = config.showMagicImbue();
+		this.showCharge = config.showCharge();
+		this.showImbuedHeart = config.showImbuedHeart();
+		this.showVengeance = config.showVengeance();
+		this.showVengeanceActive = config.showVengeanceActive();
+		this.showTeleblock = config.showTeleblock();
+		this.showFreezes = config.showFreezes();
+		this.showGodWarsAltar = config.showGodWarsAltar();
+		this.showSkull = config.showSkull();
+		this.showStaffOfTheDead = config.showStaffOfTheDead();
+		this.showAbyssalSireStun = config.showAbyssalSireStun();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timestamp/TimestampPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/timestamp/TimestampPlugin.java
index 4379d37844..516fb5eb94 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/timestamp/TimestampPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/timestamp/TimestampPlugin.java
@@ -33,6 +33,7 @@ import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.Date;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.Getter;
 import net.runelite.api.Client;
 import net.runelite.api.MessageNode;
@@ -51,6 +52,7 @@ import net.runelite.client.util.ColorUtil;
 	tags = {"timestamp"},
 	enabledByDefault = false
 )
+@Singleton
 public class TimestampPlugin extends Plugin
 {
 	@Inject
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/ClockPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/ClockPanel.java
index 98db274ee2..9b0e2c24cd 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/ClockPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/ClockPanel.java
@@ -242,7 +242,7 @@ abstract class ClockPanel extends JPanel
 		}
 	}
 
-	void updateActivityStatus()
+	private void updateActivityStatus()
 	{
 		boolean isActive = clock.isActive();
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/hunter/BirdHouseTracker.java b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/hunter/BirdHouseTracker.java
index bfb71e3287..1c30f2da58 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/hunter/BirdHouseTracker.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/hunter/BirdHouseTracker.java
@@ -50,7 +50,7 @@ public class BirdHouseTracker
 	// average time taken to harvest 10 birds, in seconds
 	static final int BIRD_HOUSE_DURATION = (int) Duration.ofMinutes(50).getSeconds();
 
-	private static ImmutableSet<Integer> FOSSIL_ISLAND_REGIONS = ImmutableSet.of(14650, 14651, 14652, 14906, 14907, 15162, 15163);
+	private static final ImmutableSet<Integer> FOSSIL_ISLAND_REGIONS = ImmutableSet.of(14650, 14651, 14652, 14906, 14907, 15162, 15163);
 
 	private final Client client;
 	private final ItemManager itemManager;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tithefarm/TitheFarmPlant.java b/runelite-client/src/main/java/net/runelite/client/plugins/tithefarm/TitheFarmPlant.java
index f7dce4fbfc..0488514d89 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/tithefarm/TitheFarmPlant.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/tithefarm/TitheFarmPlant.java
@@ -26,6 +26,7 @@ package net.runelite.client.plugins.tithefarm;
 
 import java.time.Duration;
 import java.time.Instant;
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
 import net.runelite.api.GameObject;
@@ -35,23 +36,23 @@ class TitheFarmPlant
 {
 	private static final Duration PLANT_TIME = Duration.ofMinutes(1);
 
-	@Getter
-	@Setter
+	@Getter(AccessLevel.PACKAGE)
+	@Setter(AccessLevel.PACKAGE)
 	private Instant planted;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final TitheFarmPlantState state;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final TitheFarmPlantType type;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final GameObject gameObject;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final WorldPoint worldLocation;
 
-	TitheFarmPlant(TitheFarmPlantState state, TitheFarmPlantType type, GameObject gameObject)
+	TitheFarmPlant(final TitheFarmPlantState state, final TitheFarmPlantType type, final GameObject gameObject)
 	{
 		this.planted = Instant.now();
 		this.state = state;
@@ -60,7 +61,7 @@ class TitheFarmPlant
 		this.worldLocation = gameObject.getWorldLocation();
 	}
 
-	public double getPlantTimeRelative()
+	double getPlantTimeRelative()
 	{
 		Duration duration = Duration.between(planted, Instant.now());
 		return duration.compareTo(PLANT_TIME) < 0 ? (double) duration.toMillis() / PLANT_TIME.toMillis() : 1;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tithefarm/TitheFarmPlantOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/tithefarm/TitheFarmPlantOverlay.java
index 5e39d3b452..0cf673b2dd 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/tithefarm/TitheFarmPlantOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/tithefarm/TitheFarmPlantOverlay.java
@@ -30,6 +30,7 @@ import java.awt.Graphics2D;
 import java.util.HashMap;
 import java.util.Map;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.Perspective;
 import net.runelite.api.Point;
@@ -40,21 +41,20 @@ import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.components.ProgressPieComponent;
 
+@Singleton
 public class TitheFarmPlantOverlay extends Overlay
 {
 	private final Client client;
 	private final TitheFarmPlugin plugin;
-	private final TitheFarmPluginConfig config;
 	private final Map<TitheFarmPlantState, Color> borders = new HashMap<>();
 	private final Map<TitheFarmPlantState, Color> fills = new HashMap<>();
 
 	@Inject
-	TitheFarmPlantOverlay(Client client, TitheFarmPlugin plugin, TitheFarmPluginConfig config)
+	TitheFarmPlantOverlay(final Client client, final TitheFarmPlugin plugin)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_SCENE);
 		this.plugin = plugin;
-		this.config = config;
 		this.client = client;
 	}
 
@@ -66,17 +66,17 @@ public class TitheFarmPlantOverlay extends Overlay
 		borders.clear();
 		fills.clear();
 
-		final Color colorUnwateredBorder = config.getColorUnwatered();
+		final Color colorUnwateredBorder = plugin.getGetColorUnwatered();
 		final Color colorUnwatered = new Color(colorUnwateredBorder.getRed(), colorUnwateredBorder.getGreen(), colorUnwateredBorder.getBlue(), 100);
 		borders.put(TitheFarmPlantState.UNWATERED, colorUnwateredBorder);
 		fills.put(TitheFarmPlantState.UNWATERED, colorUnwatered);
 
-		final Color colorWateredBorder = config.getColorWatered();
+		final Color colorWateredBorder = plugin.getGetColorWatered();
 		final Color colorWatered = new Color(colorWateredBorder.getRed(), colorWateredBorder.getGreen(), colorWateredBorder.getBlue(), 100);
 		borders.put(TitheFarmPlantState.WATERED, colorWateredBorder);
 		fills.put(TitheFarmPlantState.WATERED, colorWatered);
 
-		final Color colorGrownBorder = config.getColorGrown();
+		final Color colorGrownBorder = plugin.getGetColorGrown();
 		final Color colorGrown = new Color(colorGrownBorder.getRed(), colorGrownBorder.getGreen(), colorGrownBorder.getBlue(), 100);
 		borders.put(TitheFarmPlantState.GROWN, colorGrownBorder);
 		fills.put(TitheFarmPlantState.GROWN, colorGrown);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tithefarm/TitheFarmPlantType.java b/runelite-client/src/main/java/net/runelite/client/plugins/tithefarm/TitheFarmPlantType.java
index 04a48e6eb3..61e131aa22 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/tithefarm/TitheFarmPlantType.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/tithefarm/TitheFarmPlantType.java
@@ -26,6 +26,7 @@ package net.runelite.client.plugins.tithefarm;
 
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.ObjectID;
 
@@ -53,11 +54,11 @@ public enum TitheFarmPlantType
 		ObjectID.LOGAVANO_PLANT_27415, ObjectID.BLIGHTED_LOGAVANO_PLANT_27416
 	);
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final String name;
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final int baseId;
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final int[] objectIds;
 
 	private static final Map<Integer, TitheFarmPlantType> plantTypes;
@@ -77,7 +78,7 @@ public enum TitheFarmPlantType
 		plantTypes = builder.build();
 	}
 
-	TitheFarmPlantType(String name, int baseId, int... objectIds)
+	TitheFarmPlantType(final String name, final int baseId, final int... objectIds)
 	{
 		this.name = name;
 		this.baseId = baseId;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tithefarm/TitheFarmPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/tithefarm/TitheFarmPlugin.java
index ae3ee54894..bc69f169fe 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/tithefarm/TitheFarmPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/tithefarm/TitheFarmPlugin.java
@@ -25,9 +25,12 @@
 package net.runelite.client.plugins.tithefarm;
 
 import com.google.inject.Provides;
+import java.awt.Color;
 import java.util.HashSet;
 import java.util.Set;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.GameObject;
@@ -47,6 +50,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	description = "Show timers for the farming patches within the Tithe Farm minigame",
 	tags = {"farming", "minigame", "overlay", "skilling", "timers"}
 )
+@Singleton
 public class TitheFarmPlugin extends Plugin
 {
 	@Inject
@@ -55,9 +59,19 @@ public class TitheFarmPlugin extends Plugin
 	@Inject
 	private TitheFarmPlantOverlay titheFarmOverlay;
 
-	@Getter
+	@Inject
+	private TitheFarmPluginConfig config;
+
+	@Getter(AccessLevel.PACKAGE)
 	private final Set<TitheFarmPlant> plants = new HashSet<>();
 
+	@Getter(AccessLevel.PACKAGE)
+	private Color getColorUnwatered;
+	@Getter(AccessLevel.PACKAGE)
+	private Color getColorWatered;
+	@Getter(AccessLevel.PACKAGE)
+	private Color getColorGrown;
+
 	@Provides
 	TitheFarmPluginConfig getConfig(ConfigManager configManager)
 	{
@@ -67,6 +81,7 @@ public class TitheFarmPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
 		overlayManager.add(titheFarmOverlay);
 		titheFarmOverlay.updateConfig();
 	}
@@ -82,6 +97,8 @@ public class TitheFarmPlugin extends Plugin
 	{
 		if (event.getGroup().equals("tithefarmplugin"))
 		{
+			updateConfig();
+
 			titheFarmOverlay.updateConfig();
 		}
 	}
@@ -152,4 +169,11 @@ public class TitheFarmPlugin extends Plugin
 		}
 		return null;
 	}
+
+	private void updateConfig()
+	{
+		this.getColorUnwatered = config.getColorUnwatered();
+		this.getColorWatered = config.getColorWatered();
+		this.getColorGrown = config.getColorGrown();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tmorph/TMorph.java b/runelite-client/src/main/java/net/runelite/client/plugins/tmorph/TMorph.java
index e7795025b3..133636aa77 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/tmorph/TMorph.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/tmorph/TMorph.java
@@ -25,10 +25,12 @@ package net.runelite.client.plugins.tmorph;
 
 import com.google.inject.Provides;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.GameState;
 import net.runelite.api.Player;
 import net.runelite.api.events.AnimationChanged;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.GameTick;
 import net.runelite.api.kit.KitType;
 import net.runelite.api.widgets.WidgetInfo;
@@ -46,7 +48,7 @@ import org.apache.commons.lang3.ObjectUtils;
 	type = PluginType.UTILITY,
 	enabledByDefault = false
 )
-
+@Singleton
 public class TMorph extends Plugin
 {
 	@Inject
@@ -55,27 +57,103 @@ public class TMorph extends Plugin
 	@Inject
 	private TMorphConfig config;
 
+	private boolean mageSwap;
+	private boolean rangeSwap;
+	private boolean meleeSwap;
+	private int globalAnimSwap;
+	private int animationSwap;
+	private int animationTarget;
+	private int MainhandMage;
+	private int targetMainhandMage;
+	private int OffhandMage;
+	private int targetOffhandMage;
+	private int HelmetMage;
+	private int targetHelmetMage;
+	private int CapeMage;
+	private int targetCapeMage;
+	private int NeckMage;
+	private int targetNeckMage;
+	private int BodyMage;
+	private int targetBodyMage;
+	private int LegsMage;
+	private int targetLegsMage;
+	private int BootsMage;
+	private int targetBootsMage;
+	private int GlovesMage;
+	private int targetGlovesMage;
+	private int MainhandRange;
+	private int targetMainhandRange;
+	private int OffhandRange;
+	private int targetOffhandRange;
+	private int HelmetRange;
+	private int targetHelmetRange;
+	private int CapeRange;
+	private int targetCapeRange;
+	private int NeckRange;
+	private int targetNeckRange;
+	private int BodyRange;
+	private int targetBodyRange;
+	private int LegsRange;
+	private int targetLegsRange;
+	private int BootsRange;
+	private int targetBootsRange;
+	private int GlovesRange;
+	private int targetGlovesRange;
+	private int MainhandMelee;
+	private int targetMainhandMelee;
+	private int OffhandMelee;
+	private int targetOffhandMelee;
+	private int HelmetMelee;
+	private int targetHelmetMelee;
+	private int CapeMelee;
+	private int targetCapeMelee;
+	private int NeckMelee;
+	private int targetNeckMelee;
+	private int BodyMelee;
+	private int targetBodyMelee;
+	private int LegsMelee;
+	private int targetLegsMelee;
+	private int BootsMelee;
+	private int targetBootsMelee;
+	private int GlovesMelee;
+	private int targetGlovesMelee;
+
 	@Provides
 	TMorphConfig provideConfig(ConfigManager configManager)
 	{
 		return configManager.getConfig(TMorphConfig.class);
 	}
 
+	@Override
+	protected void startUp() throws Exception
+	{
+		updateConfig();
+	}
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (event.getGroup().equals("TMorph"))
+		{
+			updateConfig();
+		}
+	}
+
 	@Subscribe
 	public void onAnimationChanged(AnimationChanged event)
 	{
-		if (config.animationTarget() <= 0 && config.animationSwap() <= 0 && config.globalAnimSwap() > 0)
+		if (this.animationTarget <= 0 && this.animationSwap <= 0 && this.globalAnimSwap > 0)
 		{
 			if (event.getActor().getAnimation() != -1)
 			{
-				event.getActor().setAnimation(config.globalAnimSwap());
+				event.getActor().setAnimation(this.globalAnimSwap);
 			}
 		}
-		if (config.animationTarget() > 0 && config.animationSwap() > 0)
+		if (this.animationTarget > 0 && this.animationSwap > 0)
 		{
-			if (event.getActor().getAnimation() == config.animationTarget())
+			if (event.getActor().getAnimation() == this.animationTarget)
 			{
-				event.getActor().setAnimation(config.animationSwap());
+				event.getActor().setAnimation(this.animationSwap);
 			}
 		}
 	}
@@ -121,285 +199,349 @@ public class TMorph extends Plugin
 		final int glovesID = ObjectUtils.defaultIfNull(player.getPlayerAppearance().
 			getEquipmentId(KitType.HANDS), 0);
 
-		if (config.mageSwap())
+		if (this.mageSwap)
 		{
-			if (config.MainhandMage() > 0)
+			if (this.MainhandMage > 0)
 			{
-				if (config.targetMainhandMage() > 0)
+				if (this.targetMainhandMage > 0)
 				{
-					if (mainhandID == config.targetMainhandMage())
+					if (mainhandID == this.targetMainhandMage)
 					{
-						player.getPlayerAppearance().getEquipmentIds()[KitType.WEAPON.getIndex()] = config.MainhandMage() + 512;
+						player.getPlayerAppearance().getEquipmentIds()[KitType.WEAPON.getIndex()] = this.MainhandMage + 512;
 					}
 				}
 			}
-			if (config.OffhandMage() > 0)
+			if (this.OffhandMage > 0)
 			{
-				if (config.targetOffhandMage() > 0)
+				if (this.targetOffhandMage > 0)
 				{
-					if (offhandID == config.targetOffhandMage())
+					if (offhandID == this.targetOffhandMage)
 					{
-						player.getPlayerAppearance().getEquipmentIds()[KitType.SHIELD.getIndex()] = config.OffhandMage() + 512;
+						player.getPlayerAppearance().getEquipmentIds()[KitType.SHIELD.getIndex()] = this.OffhandMage + 512;
 					}
 				}
 			}
-			if (config.HelmetMage() > 0)
+			if (this.HelmetMage > 0)
 			{
-				if (config.targetHelmetMage() > 0)
+				if (this.targetHelmetMage > 0)
 				{
-					if (helmetID == config.targetHelmetMage())
+					if (helmetID == this.targetHelmetMage)
 					{
-						player.getPlayerAppearance().getEquipmentIds()[KitType.HELMET.getIndex()] = config.HelmetMage() + 512;
+						player.getPlayerAppearance().getEquipmentIds()[KitType.HELMET.getIndex()] = this.HelmetMage + 512;
 					}
 				}
 			}
-			if (config.CapeMage() > 0)
+			if (this.CapeMage > 0)
 			{
-				if (config.targetCapeMage() > 0)
+				if (this.targetCapeMage > 0)
 				{
-					if (capeID == config.targetCapeMage())
+					if (capeID == this.targetCapeMage)
 					{
-						player.getPlayerAppearance().getEquipmentIds()[KitType.CAPE.getIndex()] = config.CapeMage() + 512;
+						player.getPlayerAppearance().getEquipmentIds()[KitType.CAPE.getIndex()] = this.CapeMage + 512;
 					}
 				}
 			}
-			if (config.NeckMage() > 0)
+			if (this.NeckMage > 0)
 			{
-				if (config.targetNeckMage() > 0)
+				if (this.targetNeckMage > 0)
 				{
-					if (neckID == config.targetNeckMage())
+					if (neckID == this.targetNeckMage)
 					{
-						player.getPlayerAppearance().getEquipmentIds()[KitType.AMULET.getIndex()] = config.NeckMage() + 512;
+						player.getPlayerAppearance().getEquipmentIds()[KitType.AMULET.getIndex()] = this.NeckMage + 512;
 					}
 				}
 			}
-			if (config.BodyMage() > 0)
+			if (this.BodyMage > 0)
 			{
-				if (config.targetBodyMage() > 0)
+				if (this.targetBodyMage > 0)
 				{
-					if (bodyID == config.targetBodyMage())
+					if (bodyID == this.targetBodyMage)
 					{
-						player.getPlayerAppearance().getEquipmentIds()[KitType.TORSO.getIndex()] = config.BodyMage() + 512;
+						player.getPlayerAppearance().getEquipmentIds()[KitType.TORSO.getIndex()] = this.BodyMage + 512;
 					}
 				}
 			}
-			if (config.LegsMage() > 0)
+			if (this.LegsMage > 0)
 			{
-				if (config.targetLegsMage() > 0)
+				if (this.targetLegsMage > 0)
 				{
-					if (legsID == config.targetLegsMage())
+					if (legsID == this.targetLegsMage)
 					{
-						player.getPlayerAppearance().getEquipmentIds()[KitType.LEGS.getIndex()] = config.LegsMage() + 512;
+						player.getPlayerAppearance().getEquipmentIds()[KitType.LEGS.getIndex()] = this.LegsMage + 512;
 					}
 				}
 			}
-			if (config.BootsMage() > 0)
+			if (this.BootsMage > 0)
 			{
-				if (config.targetBootsMage() > 0)
+				if (this.targetBootsMage > 0)
 				{
-					if (bootsID == config.targetBootsMage())
+					if (bootsID == this.targetBootsMage)
 					{
-						player.getPlayerAppearance().getEquipmentIds()[KitType.BOOTS.getIndex()] = config.BootsMage() + 512;
+						player.getPlayerAppearance().getEquipmentIds()[KitType.BOOTS.getIndex()] = this.BootsMage + 512;
 					}
 				}
 			}
-			if (config.GlovesMage() > 0)
+			if (this.GlovesMage > 0)
 			{
-				if (config.targetGlovesMage() > 0)
+				if (this.targetGlovesMage > 0)
 				{
-					if (glovesID == config.targetGlovesMage())
+					if (glovesID == this.targetGlovesMage)
 					{
-						player.getPlayerAppearance().getEquipmentIds()[KitType.HANDS.getIndex()] = config.GlovesMage() + 512;
+						player.getPlayerAppearance().getEquipmentIds()[KitType.HANDS.getIndex()] = this.GlovesMage + 512;
 					}
 				}
 			}
 		}
-		if (config.rangeSwap())
+		if (this.rangeSwap)
 		{
-			if (config.MainhandRange() > 0)
+			if (this.MainhandRange > 0)
 			{
-				if (config.targetMainhandRange() > 0)
+				if (this.targetMainhandRange > 0)
 				{
-					if (mainhandID == config.targetMainhandRange())
+					if (mainhandID == this.targetMainhandRange)
 					{
-						player.getPlayerAppearance().getEquipmentIds()[KitType.WEAPON.getIndex()] = config.MainhandRange() + 512;
+						player.getPlayerAppearance().getEquipmentIds()[KitType.WEAPON.getIndex()] = this.MainhandRange + 512;
 					}
 				}
 			}
-			if (config.OffhandRange() > 0)
+			if (this.OffhandRange > 0)
 			{
-				if (config.targetOffhandRange() > 0)
+				if (this.targetOffhandRange > 0)
 				{
-					if (offhandID == config.targetOffhandRange())
+					if (offhandID == this.targetOffhandRange)
 					{
-						player.getPlayerAppearance().getEquipmentIds()[KitType.SHIELD.getIndex()] = config.OffhandRange() + 512;
+						player.getPlayerAppearance().getEquipmentIds()[KitType.SHIELD.getIndex()] = this.OffhandRange + 512;
 					}
 				}
 			}
-			if (config.HelmetRange() > 0)
+			if (this.HelmetRange > 0)
 			{
-				if (config.targetHelmetRange() > 0)
+				if (this.targetHelmetRange > 0)
 				{
-					if (helmetID == config.targetHelmetRange())
+					if (helmetID == this.targetHelmetRange)
 					{
-						player.getPlayerAppearance().getEquipmentIds()[KitType.HELMET.getIndex()] = config.HelmetRange() + 512;
+						player.getPlayerAppearance().getEquipmentIds()[KitType.HELMET.getIndex()] = this.HelmetRange + 512;
 					}
 				}
 			}
-			if (config.CapeRange() > 0)
+			if (this.CapeRange > 0)
 			{
-				if (config.targetCapeRange() > 0)
+				if (this.targetCapeRange > 0)
 				{
-					if (capeID == config.targetCapeRange())
+					if (capeID == this.targetCapeRange)
 					{
-						player.getPlayerAppearance().getEquipmentIds()[KitType.CAPE.getIndex()] = config.CapeRange() + 512;
+						player.getPlayerAppearance().getEquipmentIds()[KitType.CAPE.getIndex()] = this.CapeRange + 512;
 					}
 				}
 			}
-			if (config.NeckRange() > 0)
+			if (this.NeckRange > 0)
 			{
-				if (config.targetNeckRange() > 0)
+				if (this.targetNeckRange > 0)
 				{
-					if (neckID == config.targetNeckRange())
+					if (neckID == this.targetNeckRange)
 					{
-						player.getPlayerAppearance().getEquipmentIds()[KitType.AMULET.getIndex()] = config.NeckRange() + 512;
+						player.getPlayerAppearance().getEquipmentIds()[KitType.AMULET.getIndex()] = this.NeckRange + 512;
 					}
 				}
 			}
-			if (config.BodyRange() > 0)
+			if (this.BodyRange > 0)
 			{
-				if (config.targetBodyRange() > 0)
+				if (this.targetBodyRange > 0)
 				{
-					if (bodyID == config.targetBodyRange())
+					if (bodyID == this.targetBodyRange)
 					{
-						player.getPlayerAppearance().getEquipmentIds()[KitType.TORSO.getIndex()] = config.BodyRange() + 512;
+						player.getPlayerAppearance().getEquipmentIds()[KitType.TORSO.getIndex()] = this.BodyRange + 512;
 					}
 				}
 			}
-			if (config.LegsRange() > 0)
+			if (this.LegsRange > 0)
 			{
-				if (config.targetLegsRange() > 0)
+				if (this.targetLegsRange > 0)
 				{
-					if (legsID == config.targetLegsRange())
+					if (legsID == this.targetLegsRange)
 					{
-						player.getPlayerAppearance().getEquipmentIds()[KitType.LEGS.getIndex()] = config.LegsRange() + 512;
+						player.getPlayerAppearance().getEquipmentIds()[KitType.LEGS.getIndex()] = this.LegsRange + 512;
 					}
 				}
 			}
-			if (config.BootsRange() > 0)
+			if (this.BootsRange > 0)
 			{
-				if (config.targetBootsRange() > 0)
+				if (this.targetBootsRange > 0)
 				{
-					if (bootsID == config.targetBootsRange())
+					if (bootsID == this.targetBootsRange)
 					{
-						player.getPlayerAppearance().getEquipmentIds()[KitType.BOOTS.getIndex()] = config.BootsRange() + 512;
+						player.getPlayerAppearance().getEquipmentIds()[KitType.BOOTS.getIndex()] = this.BootsRange + 512;
 					}
 				}
 			}
-			if (config.GlovesRange() > 0)
+			if (this.GlovesRange > 0)
 			{
-				if (config.targetGlovesRange() > 0)
+				if (this.targetGlovesRange > 0)
 				{
-					if (glovesID == config.targetGlovesRange())
+					if (glovesID == this.targetGlovesRange)
 					{
-						player.getPlayerAppearance().getEquipmentIds()[KitType.HANDS.getIndex()] = config.GlovesRange() + 512;
+						player.getPlayerAppearance().getEquipmentIds()[KitType.HANDS.getIndex()] = this.GlovesRange + 512;
 					}
 				}
 			}
 		}
-		if (config.meleeSwap())
+		if (this.meleeSwap)
 		{
-			if (config.MainhandMelee() > 0)
+			if (this.MainhandMelee > 0)
 			{
-				if (config.targetMainhandMelee() > 0)
+				if (this.targetMainhandMelee > 0)
 				{
-					if (mainhandID == config.targetMainhandMelee())
+					if (mainhandID == this.targetMainhandMelee)
 					{
-						player.getPlayerAppearance().getEquipmentIds()[KitType.WEAPON.getIndex()] = config.MainhandMelee() + 512;
+						player.getPlayerAppearance().getEquipmentIds()[KitType.WEAPON.getIndex()] = this.MainhandMelee + 512;
 					}
 				}
 			}
-			if (config.OffhandMelee() > 0)
+			if (this.OffhandMelee > 0)
 			{
-				if (config.targetOffhandMelee() > 0)
+				if (this.targetOffhandMelee > 0)
 				{
-					if (offhandID == config.targetOffhandMelee())
+					if (offhandID == this.targetOffhandMelee)
 					{
-						player.getPlayerAppearance().getEquipmentIds()[KitType.SHIELD.getIndex()] = config.OffhandMelee() + 512;
+						player.getPlayerAppearance().getEquipmentIds()[KitType.SHIELD.getIndex()] = this.OffhandMelee + 512;
 					}
 				}
 			}
-			if (config.HelmetMelee() > 0)
+			if (this.HelmetMelee > 0)
 			{
-				if (config.targetHelmetMelee() > 0)
+				if (this.targetHelmetMelee > 0)
 				{
-					if (helmetID == config.targetHelmetMelee())
+					if (helmetID == this.targetHelmetMelee)
 					{
-						player.getPlayerAppearance().getEquipmentIds()[KitType.HELMET.getIndex()] = config.HelmetMelee() + 512;
+						player.getPlayerAppearance().getEquipmentIds()[KitType.HELMET.getIndex()] = this.HelmetMelee + 512;
 					}
 				}
 			}
-			if (config.CapeMelee() > 0)
+			if (this.CapeMelee > 0)
 			{
-				if (config.targetCapeMelee() > 0)
+				if (this.targetCapeMelee > 0)
 				{
-					if (capeID == config.targetCapeMelee())
+					if (capeID == this.targetCapeMelee)
 					{
-						player.getPlayerAppearance().getEquipmentIds()[KitType.CAPE.getIndex()] = config.CapeMelee() + 512;
+						player.getPlayerAppearance().getEquipmentIds()[KitType.CAPE.getIndex()] = this.CapeMelee + 512;
 					}
 				}
 			}
-			if (config.NeckMelee() > 0)
+			if (this.NeckMelee > 0)
 			{
-				if (config.targetNeckMelee() > 0)
+				if (this.targetNeckMelee > 0)
 				{
-					if (neckID == config.targetNeckMelee())
+					if (neckID == this.targetNeckMelee)
 					{
-						player.getPlayerAppearance().getEquipmentIds()[KitType.AMULET.getIndex()] = config.NeckMelee() + 512;
+						player.getPlayerAppearance().getEquipmentIds()[KitType.AMULET.getIndex()] = this.NeckMelee + 512;
 					}
 				}
 			}
-			if (config.BodyMelee() > 0)
+			if (this.BodyMelee > 0)
 			{
-				if (config.targetBodyMelee() > 0)
+				if (this.targetBodyMelee > 0)
 				{
-					if (bodyID == config.targetBodyMelee())
+					if (bodyID == this.targetBodyMelee)
 					{
-						player.getPlayerAppearance().getEquipmentIds()[KitType.TORSO.getIndex()] = config.BodyMelee() + 512;
+						player.getPlayerAppearance().getEquipmentIds()[KitType.TORSO.getIndex()] = this.BodyMelee + 512;
 					}
 				}
 			}
-			if (config.LegsMelee() > 0)
+			if (this.LegsMelee > 0)
 			{
-				if (config.targetLegsMelee() > 0)
+				if (this.targetLegsMelee > 0)
 				{
-					if (legsID == config.targetLegsMelee())
+					if (legsID == this.targetLegsMelee)
 					{
-						player.getPlayerAppearance().getEquipmentIds()[KitType.LEGS.getIndex()] = config.LegsMelee() + 512;
+						player.getPlayerAppearance().getEquipmentIds()[KitType.LEGS.getIndex()] = this.LegsMelee + 512;
 					}
 				}
 			}
-			if (config.BootsMelee() > 0)
+			if (this.BootsMelee > 0)
 			{
-				if (config.targetBootsMelee() > 0)
+				if (this.targetBootsMelee > 0)
 				{
-					if (bootsID == config.targetBootsMelee())
+					if (bootsID == this.targetBootsMelee)
 					{
-						player.getPlayerAppearance().getEquipmentIds()[KitType.BOOTS.getIndex()] = config.BootsMelee() + 512;
+						player.getPlayerAppearance().getEquipmentIds()[KitType.BOOTS.getIndex()] = this.BootsMelee + 512;
 					}
 				}
 			}
-			if (config.GlovesMelee() > 0)
+			if (this.GlovesMelee > 0)
 			{
-				if (config.targetGlovesMelee() > 0)
+				if (this.targetGlovesMelee > 0)
 				{
-					if (glovesID == config.targetGlovesMelee())
+					if (glovesID == this.targetGlovesMelee)
 					{
-						player.getPlayerAppearance().getEquipmentIds()[KitType.HANDS.getIndex()] = config.GlovesMelee() + 512;
+						player.getPlayerAppearance().getEquipmentIds()[KitType.HANDS.getIndex()] = this.GlovesMelee + 512;
 					}
 				}
 			}
 		}
 		player.getPlayerAppearance().setHash();
 	}
+
+	private void updateConfig()
+	{
+		this.mageSwap = config.mageSwap();
+		this.rangeSwap = config.rangeSwap();
+		this.meleeSwap = config.meleeSwap();
+		this.globalAnimSwap = config.globalAnimSwap();
+		this.animationSwap = config.animationSwap();
+		this.animationTarget = config.animationTarget();
+		this.MainhandMage = config.MainhandMage();
+		this.targetMainhandMage = config.targetMainhandMage();
+		this.OffhandMage = config.OffhandMage();
+		this.targetOffhandMage = config.targetOffhandMage();
+		this.HelmetMage = config.HelmetMage();
+		this.targetHelmetMage = config.targetHelmetMage();
+		this.CapeMage = config.CapeMage();
+		this.targetCapeMage = config.targetCapeMage();
+		this.NeckMage = config.NeckMage();
+		this.targetNeckMage = config.targetNeckMage();
+		this.BodyMage = config.BodyMage();
+		this.targetBodyMage = config.targetBodyMage();
+		this.LegsMage = config.LegsMage();
+		this.targetLegsMage = config.targetLegsMage();
+		this.BootsMage = config.BootsMage();
+		this.targetBootsMage = config.targetBootsMage();
+		this.GlovesMage = config.GlovesMage();
+		this.targetGlovesMage = config.targetGlovesMage();
+		this.MainhandRange = config.MainhandRange();
+		this.targetMainhandRange = config.targetMainhandRange();
+		this.OffhandRange = config.OffhandRange();
+		this.targetOffhandRange = config.targetOffhandRange();
+		this.HelmetRange = config.HelmetRange();
+		this.targetHelmetRange = config.targetHelmetRange();
+		this.CapeRange = config.CapeRange();
+		this.targetCapeRange = config.targetCapeRange();
+		this.NeckRange = config.NeckRange();
+		this.targetNeckRange = config.targetNeckRange();
+		this.BodyRange = config.BodyRange();
+		this.targetBodyRange = config.targetBodyRange();
+		this.LegsRange = config.LegsRange();
+		this.targetLegsRange = config.targetLegsRange();
+		this.BootsRange = config.BootsRange();
+		this.targetBootsRange = config.targetBootsRange();
+		this.GlovesRange = config.GlovesRange();
+		this.targetGlovesRange = config.targetGlovesRange();
+		this.MainhandMelee = config.MainhandMelee();
+		this.targetMainhandMelee = config.targetMainhandMelee();
+		this.OffhandMelee = config.OffhandMelee();
+		this.targetOffhandMelee = config.targetOffhandMelee();
+		this.HelmetMelee = config.HelmetMelee();
+		this.targetHelmetMelee = config.targetHelmetMelee();
+		this.CapeMelee = config.CapeMelee();
+		this.targetCapeMelee = config.targetCapeMelee();
+		this.NeckMelee = config.NeckMelee();
+		this.targetNeckMelee = config.targetNeckMelee();
+		this.BodyMelee = config.BodyMelee();
+		this.targetBodyMelee = config.targetBodyMelee();
+		this.LegsMelee = config.LegsMelee();
+		this.targetLegsMelee = config.targetLegsMelee();
+		this.BootsMelee = config.BootsMelee();
+		this.targetBootsMelee = config.targetBootsMelee();
+		this.GlovesMelee = config.GlovesMelee();
+		this.targetGlovesMelee = config.targetGlovesMelee();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tobdamagecount/DamageCounterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/tobdamagecount/DamageCounterPlugin.java
index 2cb2ff0de8..842e1cc887 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/tobdamagecount/DamageCounterPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/tobdamagecount/DamageCounterPlugin.java
@@ -27,6 +27,7 @@ package net.runelite.client.plugins.tobdamagecount;
 
 import java.text.DecimalFormat;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Actor;
 import net.runelite.api.ChatMessageType;
 import net.runelite.api.Client;
@@ -59,7 +60,7 @@ import net.runelite.client.plugins.PluginType;
 	type = PluginType.PVM,
 	enabledByDefault = false
 )
-
+@Singleton
 public class DamageCounterPlugin extends Plugin
 {
 	private int currentWorld = -1;
@@ -92,7 +93,7 @@ public class DamageCounterPlugin extends Plugin
 	private static final int[] ToB_Region = {MAIDEN_REGION, MAIDEN_REGION_1, BLOAT_REGION, NYLOCAS_REGION,
 		SOTETSEG_REGION, SOTETSEG_REGION2, XARPUS_REGION, VERZIK_REGION};
 	//setting up the array for a check list
-	private static int[] NPCARRAY = {NpcID.THE_MAIDEN_OF_SUGADINTI, NpcID.THE_MAIDEN_OF_SUGADINTI_8361,
+	private static final int[] NPCARRAY = {NpcID.THE_MAIDEN_OF_SUGADINTI, NpcID.THE_MAIDEN_OF_SUGADINTI_8361,
 		NpcID.THE_MAIDEN_OF_SUGADINTI_8362, NpcID.THE_MAIDEN_OF_SUGADINTI_8363, NpcID.THE_MAIDEN_OF_SUGADINTI_8364,
 		NpcID.THE_MAIDEN_OF_SUGADINTI_8365, NpcID.PESTILENT_BLOAT, NpcID.NYLOCAS_VASILIAS,
 		NpcID.NYLOCAS_VASILIAS_8355, NpcID.NYLOCAS_VASILIAS_8356, NpcID.NYLOCAS_VASILIAS_8357, NpcID.SOTETSEG,
@@ -100,8 +101,6 @@ public class DamageCounterPlugin extends Plugin
 		NpcID.VERZIK_VITUR, NpcID.VERZIK_VITUR_8369, NpcID.VERZIK_VITUR_8370, NpcID.VERZIK_VITUR_8371,
 		NpcID.VERZIK_VITUR_8372, NpcID.VERZIK_VITUR_8373, NpcID.VERZIK_VITUR_8374, NpcID.VERZIK_VITUR_8375};
 
-	private int[] HEALTHARRAY = {MAIDENHP, NYLOHP, VERZIKHP};
-
 	@Inject
 	private Client client;
 	@Inject
@@ -127,21 +126,15 @@ public class DamageCounterPlugin extends Plugin
 	{
 		Player localPlayer = client.getLocalPlayer();
 		Actor interacting = localPlayer.getInteracting();
-		if (client.getGameState() == GameState.LOGGED_IN)
+		if (client.getGameState() == GameState.LOGGED_IN && BossName == null && interacting instanceof NPC)
 		{
-			if (BossName == null)
+			int interactingId = ((NPC) interacting).getId();
+			String interactingName = interacting.getName();
+			for (int aNPCARRAY : NPCARRAY)
 			{
-				if (interacting instanceof NPC)
+				if (aNPCARRAY == interactingId)
 				{
-					int interactingId = ((NPC) interacting).getId();
-					String interactingName = interacting.getName();
-					for (int aNPCARRAY : NPCARRAY)
-					{
-						if (aNPCARRAY == interactingId)
-						{
-							BossName = interactingName;
-						}
-					}
+					BossName = interactingName;
 				}
 			}
 		}
@@ -187,17 +180,13 @@ public class DamageCounterPlugin extends Plugin
 	{
 		Player localPlayer = client.getLocalPlayer();
 		Actor interacting = localPlayer.getInteracting();
-		if (client.getGameState() == GameState.LOGGED_IN)
+		if (client.getGameState() == GameState.LOGGED_IN && interacting instanceof NPC)
 		{
-			if (interacting instanceof NPC)
+			String interactingName = interacting.getName();
+			if (interactingName.equals(BossName))
 			{
-				String interactingName = interacting.getName();
-				int NPC = ((NPC) interacting).getId();
-				if (interactingName.equals(BossName))
-				{
-					DamageCount += (XPtoDamage() * BOSS_MODIFIER);
+				DamageCount += (XPtoDamage() * BOSS_MODIFIER);
 
-				}
 			}
 		}
 	}
@@ -329,10 +318,10 @@ public class DamageCounterPlugin extends Plugin
 		String DeathMessage = "You have died! You did " + DAMAGEFORMAT.format(DamageCount) + " damage to " +
 			BossName + "!";
 		String MessageTaken = "You have taken " + DAMAGEFORMAT.format(DamageTaken) + " damage from this fight!";
-		for (int i = 0; i < ToB_Region.length; i++)
+		for (int value : ToB_Region)
 		{
 			if (WorldPoint.fromLocalInstance(client,
-				client.getLocalPlayer().getLocalLocation()).getRegionID() == ToB_Region[i])
+				client.getLocalPlayer().getLocalLocation()).getRegionID() == value)
 			{
 				sendChatMessage(DeathMessage);
 				sendChatMessage(MessageTaken);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/twitch/TwitchPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/twitch/TwitchPlugin.java
index ce7b25acb3..62923981a9 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/twitch/TwitchPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/twitch/TwitchPlugin.java
@@ -29,6 +29,7 @@ import com.google.inject.Provides;
 import java.time.temporal.ChronoUnit;
 import java.util.Map;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.ChatMessageType;
 import net.runelite.api.Client;
@@ -56,6 +57,7 @@ import net.runelite.client.task.Schedule;
 	enabledByDefault = false
 )
 @Slf4j
+@Singleton
 public class TwitchPlugin extends Plugin implements TwitchListener, ChatboxInputListener
 {
 	@Inject
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/twitch/irc/Message.java b/runelite-client/src/main/java/net/runelite/client/plugins/twitch/irc/Message.java
index fe990331cc..fb7945f17e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/twitch/irc/Message.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/twitch/irc/Message.java
@@ -28,9 +28,10 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import lombok.AccessLevel;
 import lombok.Getter;
 
-@Getter
+@Getter(AccessLevel.PACKAGE)
 class Message
 {
 	private final Map<String, String> tags = new HashMap<>();
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/twitch/irc/TwitchIRCClient.java b/runelite-client/src/main/java/net/runelite/client/plugins/twitch/irc/TwitchIRCClient.java
index f76ddcaa3c..a51a38a433 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/twitch/irc/TwitchIRCClient.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/twitch/irc/TwitchIRCClient.java
@@ -52,7 +52,7 @@ public class TwitchIRCClient extends Thread implements AutoCloseable
 	private long last;
 	private boolean pingSent;
 
-	public TwitchIRCClient(TwitchListener twitchListener, String username, String password, String channel)
+	public TwitchIRCClient(final TwitchListener twitchListener, final String username, final String password, final String channel)
 	{
 		setName("Twitch");
 		this.twitchListener = twitchListener;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/vetion/VetionOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/vetion/VetionOverlay.java
index 6dccc6abc3..0a42864ffe 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/vetion/VetionOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/vetion/VetionOverlay.java
@@ -45,7 +45,7 @@ public class VetionOverlay extends Overlay
 	private static final Color RED_ALPHA = new Color(Color.RED.getRed(), Color.RED.getGreen(), Color.RED.getBlue(), 100);
 	private static final Duration MAX_TIME = Duration.ofSeconds(9);
 	private final VetionPlugin plugin;
-	private Client client;
+	private final Client client;
 
 	@Inject
 	private VetionOverlay(Client client, VetionPlugin plugin)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/vetion/VetionPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/vetion/VetionPlugin.java
index 7f4ccff362..9d3179c68c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/vetion/VetionPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/vetion/VetionPlugin.java
@@ -28,6 +28,7 @@ import java.time.Instant;
 import java.util.HashMap;
 import java.util.Map;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.Getter;
 import net.runelite.api.Actor;
 import net.runelite.api.AnimationID;
@@ -45,7 +46,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	type = PluginType.PVM,
 	enabledByDefault = false
 )
-
+@Singleton
 public class VetionPlugin extends Plugin
 {
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/virtuallevels/VirtualLevelsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/virtuallevels/VirtualLevelsPlugin.java
index 7be76a31b4..c9f3bb462f 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/virtuallevels/VirtualLevelsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/virtuallevels/VirtualLevelsPlugin.java
@@ -27,6 +27,7 @@ package net.runelite.client.plugins.virtuallevels;
 
 import com.google.inject.Provides;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.Experience;
 import net.runelite.api.Skill;
@@ -45,6 +46,7 @@ import net.runelite.client.plugins.PluginDescriptor;
 	tags = {"skill", "total", "max"},
 	enabledByDefault = false
 )
+@Singleton
 public class VirtualLevelsPlugin extends Plugin
 {
 	private static final String TOTAL_LEVEL_TEXT_PREFIX = "Total level:<br>";
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/Vorkath.java b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/Vorkath.java
index 2691f4991d..02ae424527 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/Vorkath.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/Vorkath.java
@@ -70,7 +70,7 @@ public class Vorkath
 	 *
 	 * @param newPhase the new phase Vorkath is current on
 	 */
-	public void updatePhase(Phase newPhase)
+	void updatePhase(Phase newPhase)
 	{
 		Phase oldLastPhase = this.lastPhase;
 		Phase oldCurrentPhase = this.currentPhase;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathAttack.java b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathAttack.java
index 8e1b20daae..6a2479c57b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathAttack.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathAttack.java
@@ -27,13 +27,14 @@ package net.runelite.client.plugins.vorkath;
 
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import net.runelite.api.AnimationID;
 import net.runelite.api.ProjectileID;
 
 @AllArgsConstructor
-@Getter
+@Getter(AccessLevel.PACKAGE)
 public enum VorkathAttack
 {
 	/**
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathOverlay.java
index 3b94cefe7b..d55484adb6 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathOverlay.java
@@ -33,6 +33,7 @@ import java.awt.Graphics2D;
 import java.awt.geom.Arc2D;
 import java.awt.image.BufferedImage;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.Perspective;
 import net.runelite.api.Point;
@@ -41,6 +42,7 @@ import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 
+@Singleton
 public class VorkathOverlay extends Overlay
 {
 	private static final Color COLOR_ICON_BACKGROUND = new Color(0, 0, 0, 128);
@@ -49,11 +51,11 @@ public class VorkathOverlay extends Overlay
 	private static final int OVERLAY_ICON_DISTANCE = 30;
 	private static final int OVERLAY_ICON_MARGIN = 1;
 
-	private Client client;
-	private VorkathPlugin plugin;
+	private final Client client;
+	private final VorkathPlugin plugin;
 
 	@Inject
-	public VorkathOverlay(Client client, VorkathPlugin plugin)
+	public VorkathOverlay(final Client client, final VorkathPlugin plugin)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_SCENE);
@@ -78,7 +80,11 @@ public class VorkathOverlay extends Overlay
 
 					BufferedImage currentPhaseIcon = getIcon(vorkath);
 
-					int totalWidth = currentPhaseIcon.getWidth() * OVERLAY_ICON_MARGIN;
+					int totalWidth = 0;
+					if (currentPhaseIcon != null)
+					{
+						totalWidth = currentPhaseIcon.getWidth() * OVERLAY_ICON_MARGIN;
+					}
 					int bgPadding = 8;
 					int currentPosX = 0;
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathPlugin.java
index a694be9826..58cefc7efe 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathPlugin.java
@@ -27,6 +27,7 @@
 package net.runelite.client.plugins.vorkath;
 
 import com.google.inject.Inject;
+import com.google.inject.Singleton;
 import java.awt.image.BufferedImage;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
@@ -52,6 +53,7 @@ import org.apache.commons.lang3.ArrayUtils;
 	type = PluginType.PVM,
 	enabledByDefault = false
 )
+@Singleton
 @Slf4j
 public class VorkathPlugin extends Plugin
 {
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/ZombifiedSpawnOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/ZombifiedSpawnOverlay.java
index 50fb185532..a0cbc0451a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/ZombifiedSpawnOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/ZombifiedSpawnOverlay.java
@@ -28,17 +28,19 @@ import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayUtil;
 
+@Singleton
 public class ZombifiedSpawnOverlay extends Overlay
 {
-	private VorkathPlugin plugin;
+	private final VorkathPlugin plugin;
 
 	@Inject
-	public ZombifiedSpawnOverlay(VorkathPlugin plugin)
+	public ZombifiedSpawnOverlay(final VorkathPlugin plugin)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		setLayer(OverlayLayer.ABOVE_SCENE);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorConfig.java
index dca6ba47b3..226286ff19 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorConfig.java
@@ -97,7 +97,6 @@ public interface WarIndicatorConfig extends Config
 	)
 	void setActiveCallers(String key);
 
-
 	@ConfigItem(
 		position = 6,
 		keyName = "highlightSnipes",
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorMiniMapOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorMiniMapOverlay.java
index d7fa0cc92a..5e3e253797 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorMiniMapOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorMiniMapOverlay.java
@@ -41,12 +41,12 @@ import org.apache.commons.lang3.ArrayUtils;
 public class WarIndicatorMiniMapOverlay extends Overlay
 {
 	private final WarIndicatorService warIndicatorService;
-	private final WarIndicatorConfig config;
+	private final WarIndicatorPlugin plugin;
 
 	@Inject
-	private WarIndicatorMiniMapOverlay(WarIndicatorConfig config, WarIndicatorService warIndicatorService)
+	private WarIndicatorMiniMapOverlay(final WarIndicatorPlugin plugin, final WarIndicatorService warIndicatorService)
 	{
-		this.config = config;
+		this.plugin = plugin;
 		this.warIndicatorService = warIndicatorService;
 		setLayer(OverlayLayer.ABOVE_WIDGETS);
 		setPosition(OverlayPosition.DYNAMIC);
@@ -65,18 +65,15 @@ public class WarIndicatorMiniMapOverlay extends Overlay
 		final String name = actor.getName().replace('\u00A0', ' ');
 		final net.runelite.api.Point minimapLocation = actor.getMinimapLocation();
 
-		String[] callers = config.getActiveCallers().split(", ");
-		String[] targets = config.getTargetedSnipes().split(", ");
+		String[] callers = plugin.getGetActiveCallers().split(", ");
+		String[] targets = plugin.getGetTargetedSnipes().split(", ");
 
-		if (config.callerMinimap() && ArrayUtils.contains(callers, actor.getName()))
+		if (plugin.isCallerMinimap() && ArrayUtils.contains(callers, actor.getName()) && minimapLocation != null)
 		{
-			if (minimapLocation != null)
-			{
-				OverlayUtil.renderTextLocation(graphics, minimapLocation, name, color);
-			}
+			OverlayUtil.renderTextLocation(graphics, minimapLocation, name, color);
 		}
 
-		if (config.snipeMinimap() && ArrayUtils.contains(targets, actor.getName()))
+		if (plugin.isSnipeMinimap() && ArrayUtils.contains(targets, actor.getName()))
 		{
 			if (minimapLocation != null)
 			{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorOverlay.java
index 3eb4c463de..c430a3ba28 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorOverlay.java
@@ -43,12 +43,12 @@ import org.apache.commons.lang3.ArrayUtils;
 public class WarIndicatorOverlay extends Overlay
 {
 	private final WarIndicatorService warIndicatorService;
-	private final WarIndicatorConfig config;
+	private final WarIndicatorPlugin plugin;
 
 	@Inject
-	private WarIndicatorOverlay(WarIndicatorConfig config, WarIndicatorService warIndicatorService)
+	private WarIndicatorOverlay(final WarIndicatorPlugin plugin, final WarIndicatorService warIndicatorService)
 	{
-		this.config = config;
+		this.plugin = plugin;
 		this.warIndicatorService = warIndicatorService;
 		setLayer(OverlayLayer.ABOVE_SCENE);
 		setPosition(OverlayPosition.DYNAMIC);
@@ -64,29 +64,23 @@ public class WarIndicatorOverlay extends Overlay
 
 	private void renderPlayerOverlay(Graphics2D graphics, Player actor, Color color)
 	{
-		if (!config.highlightSnipes() && !config.highLightCallers())
+		if (!plugin.isHighlightSnipes() && !plugin.isHighLightCallers())
 		{
 			return;
 		}
 
 		Polygon poly = actor.getCanvasTilePoly();
-		String[] callers = config.getActiveCallers().split(", ");
-		String[] targets = config.getTargetedSnipes().split(", ");
+		String[] callers = plugin.getGetActiveCallers().split(", ");
+		String[] targets = plugin.getGetTargetedSnipes().split(", ");
 
-		if (config.callerTile() && ArrayUtils.contains(callers, actor.getName()))
+		if (plugin.isCallerTile() && ArrayUtils.contains(callers, actor.getName()) && poly != null)
 		{
-			if (poly != null)
-			{
-				OverlayUtil.renderPolygon(graphics, poly, color);
-			}
+			OverlayUtil.renderPolygon(graphics, poly, color);
 		}
 
-		if (config.snipeTile() && ArrayUtils.contains(targets, actor.getName()))
+		if (plugin.isSnipeTile() && ArrayUtils.contains(targets, actor.getName()) && poly != null)
 		{
-			if (poly != null)
-			{
-				OverlayUtil.renderPolygon(graphics, poly, color);
-			}
+			OverlayUtil.renderPolygon(graphics, poly, color);
 		}
 
 		String name = actor.getName().replace('\u00A0', ' ');
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorPlugin.java
index 6e6d80a476..e3ca95d45a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorPlugin.java
@@ -27,6 +27,9 @@ package net.runelite.client.plugins.warindicators;
 import com.google.inject.Provides;
 import java.awt.Color;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
+import lombok.Getter;
 import net.runelite.api.Client;
 import static net.runelite.api.MenuAction.FOLLOW;
 import static net.runelite.api.MenuAction.ITEM_USE_ON_PLAYER;
@@ -42,6 +45,7 @@ import static net.runelite.api.MenuAction.SPELL_CAST_ON_PLAYER;
 import static net.runelite.api.MenuAction.TRADE;
 import net.runelite.api.MenuEntry;
 import net.runelite.api.Player;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.MenuEntryAdded;
 import net.runelite.client.config.ConfigManager;
 import net.runelite.client.eventbus.Subscribe;
@@ -58,7 +62,7 @@ import org.apache.commons.lang3.ArrayUtils;
 	type = PluginType.PVP,
 	enabledByDefault = false
 )
-
+@Singleton
 public class WarIndicatorPlugin extends Plugin
 {
 	@Inject
@@ -76,6 +80,27 @@ public class WarIndicatorPlugin extends Plugin
 	@Inject
 	private Client client;
 
+	@Getter(AccessLevel.PACKAGE)
+	private boolean highLightCallers;
+	@Getter(AccessLevel.PACKAGE)
+	private Color getCallerColor;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean callerMinimap;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean callerTile;
+	@Getter(AccessLevel.PACKAGE)
+	private String getActiveCallers;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean highlightSnipes;
+	@Getter(AccessLevel.PACKAGE)
+	private Color getSnipeColor;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean snipeMinimap;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean snipeTile;
+	@Getter(AccessLevel.PACKAGE)
+	private String getTargetedSnipes;
+
 	@Provides
 	WarIndicatorConfig provideConfig(ConfigManager configManager)
 	{
@@ -85,6 +110,8 @@ public class WarIndicatorPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
+
 		overlayManager.add(warIndicatorOverlay);
 		overlayManager.add(warIndicatorMiniMapOverlay);
 	}
@@ -123,8 +150,8 @@ public class WarIndicatorPlugin extends Plugin
 			Player player = null;
 			String player2 = null;
 
-			String[] callers = config.getActiveCallers().split(", ");
-			String[] targets = config.getTargetedSnipes().split(", ");
+			String[] callers = this.getActiveCallers.split(", ");
+			String[] targets = this.getTargetedSnipes.split(", ");
 
 			if (identifier >= 0 && identifier < players.length)
 			{
@@ -139,14 +166,14 @@ public class WarIndicatorPlugin extends Plugin
 
 			Color color = null;
 
-			if (config.highLightCallers() && ArrayUtils.contains(callers, player2))
+			if (this.highLightCallers && ArrayUtils.contains(callers, player2))
 			{
-				color = config.getCallerColor();
+				color = this.getCallerColor;
 			}
 
-			if (config.highlightSnipes() && ArrayUtils.contains(targets, player2))
+			if (this.highlightSnipes && ArrayUtils.contains(targets, player2))
 			{
-				color = config.getSnipeColor();
+				color = this.getSnipeColor;
 			}
 
 			if (color != null)
@@ -167,4 +194,27 @@ public class WarIndicatorPlugin extends Plugin
 
 		}
 	}
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (event.getGroup().equals("warIndicators"))
+		{
+			updateConfig();
+		}
+	}
+
+	private void updateConfig()
+	{
+		this.highLightCallers = config.highLightCallers();
+		this.getCallerColor = config.getCallerColor();
+		this.callerMinimap = config.callerMinimap();
+		this.callerTile = config.callerTile();
+		this.getActiveCallers = config.getActiveCallers();
+		this.highlightSnipes = config.highlightSnipes();
+		this.getSnipeColor = config.getSnipeColor();
+		this.snipeMinimap = config.snipeMinimap();
+		this.snipeTile = config.snipeTile();
+		this.getTargetedSnipes = config.getTargetedSnipes();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorService.java b/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorService.java
index 1188dc6a12..630cbb4a47 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorService.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorService.java
@@ -35,23 +35,23 @@ import net.runelite.api.Player;
 public class WarIndicatorService
 {
 	private final Client client;
-	private final WarIndicatorConfig config;
+	private final WarIndicatorPlugin plugin;
 
 	@Inject
-	private WarIndicatorService(Client client, WarIndicatorConfig config)
+	private WarIndicatorService(final Client client, final WarIndicatorPlugin plugin)
 	{
-		this.config = config;
+		this.plugin = plugin;
 		this.client = client;
 	}
 
 	public void forEachPlayer(final BiConsumer<Player, Color> consumer)
 	{
-		if (!config.highlightSnipes() && !config.highLightCallers())
+		if (!plugin.isHighlightSnipes() && !plugin.isHighLightCallers())
 		{
 			return;
 		}
 
-		if (config.highlightSnipes())
+		if (plugin.isHighlightSnipes())
 		{
 			for (Player player : client.getPlayers())
 			{
@@ -60,19 +60,19 @@ public class WarIndicatorService
 					continue;
 				}
 
-				String[] targets = config.getTargetedSnipes().split(", ");
+				String[] targets = plugin.getGetTargetedSnipes().split(", ");
 
 				for (String target : targets)
 				{
 					if (player.getName().equalsIgnoreCase(target))
 					{
-						consumer.accept(player, config.getSnipeColor());
+						consumer.accept(player, plugin.getGetSnipeColor());
 					}
 				}
 			}
 		}
 
-		if (config.highLightCallers())
+		if (plugin.isHighLightCallers())
 		{
 			for (Player player : client.getPlayers())
 			{
@@ -81,13 +81,13 @@ public class WarIndicatorService
 					continue;
 				}
 
-				String[] callers = config.getActiveCallers().split(", ");
+				String[] callers = plugin.getGetActiveCallers().split(", ");
 
 				for (String caller : callers)
 				{
 					if (player.getName().equalsIgnoreCase(caller))
 					{
-						consumer.accept(player, config.getCallerColor());
+						consumer.accept(player, plugin.getGetCallerColor());
 					}
 				}
 			}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersGloryOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersGloryOverlay.java
index b15b87c431..3423fa083d 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersGloryOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersGloryOverlay.java
@@ -13,7 +13,7 @@ import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
-import net.runelite.api.Client;
+import javax.inject.Singleton;
 import net.runelite.api.ItemID;
 import net.runelite.client.game.AsyncBufferedImage;
 import net.runelite.client.game.ItemManager;
@@ -25,21 +25,18 @@ import net.runelite.client.ui.overlay.components.ImageComponent;
 import net.runelite.client.ui.overlay.components.PanelComponent;
 import net.runelite.client.ui.overlay.components.TitleComponent;
 
+@Singleton
 public class WhaleWatchersGloryOverlay extends Overlay
 {
-	private Client client;
-	private final WhaleWatchersConfig config;
-	private WhaleWatchersPlugin plugin;
-	private PanelComponent panelComponent;
+	private final WhaleWatchersPlugin plugin;
+	private final PanelComponent panelComponent;
 
 	@Inject
 	private ItemManager itemManager;
 
 	@Inject
-	public WhaleWatchersGloryOverlay(WhaleWatchersConfig config, Client client, WhaleWatchersPlugin plugin)
+	public WhaleWatchersGloryOverlay(final WhaleWatchersPlugin plugin)
 	{
-		this.client = client;
-		this.config = config;
 		this.plugin = plugin;
 		setLayer(OverlayLayer.ABOVE_WIDGETS);
 		setPriority(OverlayPriority.HIGH);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersOverlay.java
index 5ea462699b..2ee2ed02e3 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersOverlay.java
@@ -12,6 +12,7 @@ package net.runelite.client.plugins.whalewatchers;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.MenuAction;
 import net.runelite.client.ui.overlay.Overlay;
@@ -27,23 +28,22 @@ import net.runelite.client.ui.overlay.components.TitleComponent;
  * The overlay for the Damage Counter
  */
 
+@Singleton
 public class WhaleWatchersOverlay extends Overlay
 {
-	private Client client;
-	private final WhaleWatchersConfig config;
-	private WhaleWatchersPlugin plugin;
-	private PanelComponent panelComponent;
+	private final Client client;
+	private final WhaleWatchersPlugin plugin;
+	private final PanelComponent panelComponent;
 	private String lastOpponent = "-";
-	private final OverlayMenuEntry resetMenuEntry = new OverlayMenuEntry(MenuAction.RUNELITE_OVERLAY,
-		"Reset", "Damage Counter");
 
 
 	@Inject
-	public WhaleWatchersOverlay(WhaleWatchersConfig config, Client client, WhaleWatchersPlugin plugin)
+	public WhaleWatchersOverlay(final Client client, final WhaleWatchersPlugin plugin)
 	{
+		OverlayMenuEntry resetMenuEntry = new OverlayMenuEntry(MenuAction.RUNELITE_OVERLAY,
+			"Reset", "Damage Counter");
 		this.getMenuEntries().add(resetMenuEntry);
 		this.client = client;
-		this.config = config;
 		this.plugin = plugin;
 		setLayer(OverlayLayer.ABOVE_WIDGETS);
 		setPriority(OverlayPriority.HIGHEST);
@@ -57,14 +57,13 @@ public class WhaleWatchersOverlay extends Overlay
 	{
 		panelComponent.getChildren().clear();
 
-		if (plugin.inCombat && config.showDamageCounter())
+		if (plugin.inCombat && plugin.isShowDamageCounter())
 		{
 			panelComponent.setOrientation(ComponentOrientation.HORIZONTAL);
 			panelComponent.setWrapping(5);
-			String opp = client.getLocalPlayer().getInteracting() != null ?
-				client.getLocalPlayer().getInteracting().getName() : lastOpponent;
 
-			lastOpponent = opp;
+			lastOpponent = client.getLocalPlayer().getInteracting() != null ?
+				client.getLocalPlayer().getInteracting().getName() : lastOpponent;
 
 			String damageTaken = "Damage Taken: " + plugin.damageTaken;
 			String damageDealt = "Damage Dealt: " + plugin.damageDone;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersPlugin.java
index 4d554fee56..31878c18ab 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersPlugin.java
@@ -16,6 +16,8 @@ import com.google.inject.Provides;
 import java.util.EnumSet;
 import java.util.Objects;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.Client;
 import net.runelite.api.InventoryID;
@@ -50,16 +52,16 @@ import org.apache.commons.lang3.ObjectUtils;
 	type = PluginType.PVP,
 	enabledByDefault = false
 )
-
+@Singleton
 public class WhaleWatchersPlugin extends Plugin
 {
 
 	private static final String CONFIG_GROUP_NAME = "WhaleWatchers";
 
-	public boolean protectItemOverlay = false;
-	public int damageDone = 0;
-	public int damageTaken = 0;
-	public boolean inCombat = false;
+	boolean protectItemOverlay = false;
+	int damageDone = 0;
+	int damageTaken = 0;
+	boolean inCombat = false;
 	@Inject
 	private Client client;
 	@Inject
@@ -75,11 +77,18 @@ public class WhaleWatchersPlugin extends Plugin
 	@Inject
 	private OverlayManager overlayManager;
 	private int tickCountdown = 0;
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private boolean displaySmiteOverlay;
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private boolean displayGloryOverlay;
 
+	@Getter(AccessLevel.PACKAGE)
+	private boolean protectItemWarning;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showDamageCounter;
+	private boolean smiteableWarning;
+	private boolean gloryWarning;
+
 	@Provides
 	WhaleWatchersConfig getConfig(ConfigManager configManager)
 	{
@@ -89,18 +98,16 @@ public class WhaleWatchersPlugin extends Plugin
 	@Subscribe
 	public void onOverlayMenuClicked(OverlayMenuClicked event)
 	{
-		if (event.getOverlay().equals(overlay))
+		if (event.getOverlay().equals(overlay) && event.getEntry().getOption().equals("Reset"))
 		{
-			if (event.getEntry().getOption().equals("Reset"))
-			{
-				resetDamageCounter();
-			}
+			resetDamageCounter();
 		}
 	}
 
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
 
 		overlayManager.add(overlay);
 		overlayManager.add(whaleWatchersProtOverlay);
@@ -126,15 +133,17 @@ public class WhaleWatchersPlugin extends Plugin
 			return;
 		}
 
-		if (!config.protectItemWarning())
+		updateConfig();
+
+		if (!this.protectItemWarning)
 		{
 			protectItemOverlay = false;
 		}
-		if (!config.gloryWarning())
+		if (!this.gloryWarning)
 		{
 			displayGloryOverlay = false;
 		}
-		if (!config.smiteableWarning())
+		if (!this.smiteableWarning)
 		{
 			displaySmiteOverlay = false;
 		}
@@ -144,7 +153,7 @@ public class WhaleWatchersPlugin extends Plugin
 	@Subscribe
 	public void onHitsplatApplied(HitsplatApplied event)
 	{
-		if (config.showDamageCounter())
+		if (this.showDamageCounter)
 		{
 			if (!(event.getActor() == client.getLocalPlayer() ||
 				event.getActor() == client.getLocalPlayer().getInteracting()))
@@ -170,7 +179,7 @@ public class WhaleWatchersPlugin extends Plugin
 	@Subscribe
 	public void onItemContainerChanged(ItemContainerChanged event)
 	{
-		if (config.gloryWarning() && event.getItemContainer() == client.getItemContainer(InventoryID.EQUIPMENT))
+		if (this.gloryWarning && event.getItemContainer() == client.getItemContainer(InventoryID.EQUIPMENT))
 		{
 			final int amuletID = ObjectUtils.defaultIfNull(client.getLocalPlayer()
 				.getPlayerAppearance().getEquipmentId(KitType.AMULET), 0);
@@ -186,7 +195,7 @@ public class WhaleWatchersPlugin extends Plugin
 	@Subscribe
 	public void onMenuOptionClicked(MenuOptionClicked event)
 	{
-		if (config.showDamageCounter() && event.getMenuAction().equals(MenuAction.SPELL_CAST_ON_PLAYER))
+		if (this.showDamageCounter && event.getMenuAction().equals(MenuAction.SPELL_CAST_ON_PLAYER))
 		{
 			inCombat = true;
 		}
@@ -195,23 +204,17 @@ public class WhaleWatchersPlugin extends Plugin
 	@Subscribe
 	public void onVarbitChanged(VarbitChanged event)
 	{
-		if (config.showDamageCounter())
-		{
-			if (client.getVar(VarPlayer.ATTACKING_PLAYER) == -1)
+		if (this.showDamageCounter && client.getVar(VarPlayer.ATTACKING_PLAYER) == -1 && inCombat)
 			{
-				if (inCombat)
-				{
-					tickCountdown = 10;
-				}
+				tickCountdown = 10;
 			}
-		}
 
-		if (config.protectItemWarning())
+		if (this.protectItemWarning)
 		{
 			try
 			{
 				final SkullIcon skullIcon = Objects.requireNonNull(client.getLocalPlayer().getSkullIcon());
-				final EnumSet worldTypes = client.getWorldType();
+				final EnumSet<WorldType> worldTypes = client.getWorldType();
 				if (WorldType.isHighRiskWorld(worldTypes))
 				{
 					protectItemOverlay = false;
@@ -242,20 +245,17 @@ public class WhaleWatchersPlugin extends Plugin
 	@Subscribe
 	public void onGameTick(GameTick event)
 	{
-		if (config.showDamageCounter())
+		if (this.showDamageCounter && tickCountdown > 0 && tickCountdown < 11)
 		{
-			if (tickCountdown > 0 && tickCountdown < 11)
+			tickCountdown--;
+			if (tickCountdown == 1)
 			{
-				tickCountdown--;
-				if (tickCountdown == 1)
-				{
-					inCombat = false;
-					resetDamageCounter();
-					return;
-				}
+				inCombat = false;
+				resetDamageCounter();
+				return;
 			}
 		}
-		if (config.smiteableWarning() && (client.getVar(Varbits.IN_WILDERNESS) == 1 || isPvpWorld(client.getWorldType())))
+		if (this.smiteableWarning && (client.getVar(Varbits.IN_WILDERNESS) == 1 || isPvpWorld(client.getWorldType())))
 		{
 			if (client.getLocalPlayer().getSkullIcon() != null && client.getLocalPlayer().getSkullIcon().equals(SkullIcon.SKULL))
 			{
@@ -294,5 +294,13 @@ public class WhaleWatchersPlugin extends Plugin
 		damageTaken = 0;
 		damageDone = 0;
 	}
+	
+	private void updateConfig()
+	{
+		this.protectItemWarning = config.protectItemWarning();
+		this.showDamageCounter = config.showDamageCounter();
+		this.smiteableWarning = config.smiteableWarning();
+		this.gloryWarning = config.gloryWarning();
+	}
 
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersProtOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersProtOverlay.java
index b0d7dc7cac..f93a397d2e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersProtOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersProtOverlay.java
@@ -20,6 +20,7 @@ import java.awt.Graphics2D;
 import java.awt.Rectangle;
 import java.awt.Stroke;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.Point;
 import net.runelite.client.ui.FontManager;
@@ -29,19 +30,17 @@ import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayPriority;
 import net.runelite.client.ui.overlay.OverlayUtil;
 
-
+@Singleton
 public class WhaleWatchersProtOverlay extends Overlay
 {
 
-	private Client client;
-	private final WhaleWatchersConfig config;
-	private WhaleWatchersPlugin plugin;
+	private final Client client;
+	private final WhaleWatchersPlugin plugin;
 
 	@Inject
-	public WhaleWatchersProtOverlay(WhaleWatchersConfig config, Client client, WhaleWatchersPlugin plugin)
+	public WhaleWatchersProtOverlay(final Client client, final WhaleWatchersPlugin plugin)
 	{
 		this.client = client;
-		this.config = config;
 		this.plugin = plugin;
 		setLayer(OverlayLayer.ABOVE_WIDGETS);
 		setPriority(OverlayPriority.HIGH);
@@ -51,7 +50,7 @@ public class WhaleWatchersProtOverlay extends Overlay
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (plugin.protectItemOverlay && config.protectItemWarning())
+		if (plugin.protectItemOverlay && plugin.isProtectItemWarning())
 		{
 			Rectangle rectangle = new Rectangle();
 			rectangle.setBounds(client.getCanvas().getBounds());
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersSmiteableOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersSmiteableOverlay.java
index 4be28dce80..4a5b434900 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersSmiteableOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersSmiteableOverlay.java
@@ -14,6 +14,7 @@ import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
@@ -24,14 +25,15 @@ import net.runelite.client.ui.overlay.components.TitleComponent;
 /**
  * The overlay for the smiteable warning
  */
+@Singleton
 public class WhaleWatchersSmiteableOverlay extends Overlay
 {
-	private WhaleWatchersPlugin plugin;
-	private PanelComponent panelComponent;
+	private final WhaleWatchersPlugin plugin;
+	private final PanelComponent panelComponent;
 
 
 	@Inject
-	public WhaleWatchersSmiteableOverlay(WhaleWatchersPlugin plugin)
+	public WhaleWatchersSmiteableOverlay(final WhaleWatchersPlugin plugin)
 	{
 		this.plugin = plugin;
 		setLayer(OverlayLayer.ABOVE_WIDGETS);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiPlugin.java
index 8ff438b68f..b07ea0bad0 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiPlugin.java
@@ -30,6 +30,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.inject.Inject;
 import javax.inject.Provider;
+import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
 import net.runelite.api.MenuAction;
@@ -64,6 +65,7 @@ import okhttp3.HttpUrl;
 	name = "Wiki",
 	description = "Adds a Wiki button that takes you to the OSRS Wiki"
 )
+@Singleton
 public class WikiPlugin extends Plugin
 {
 	private static final int[] QUESTLIST_WIDGET_IDS = new int[]
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiSearchChatboxTextInput.java b/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiSearchChatboxTextInput.java
index 96ebec1479..0753c24338 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiSearchChatboxTextInput.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiSearchChatboxTextInput.java
@@ -75,8 +75,7 @@ public class WikiSearchChatboxTextInput extends ChatboxTextInput
 	private String offPrediction = null;
 
 	@Inject
-	public WikiSearchChatboxTextInput(ChatboxPanelManager chatboxPanelManager, ClientThread clientThread,
-									ScheduledExecutorService scheduledExecutorService, @Named("developerMode") final boolean developerMode)
+	public WikiSearchChatboxTextInput(final ChatboxPanelManager chatboxPanelManager, final ClientThread clientThread, final ScheduledExecutorService scheduledExecutorService, @Named("developerMode") final boolean developerMode)
 	{
 		super(chatboxPanelManager, clientThread);
 		this.chatboxPanelManager = chatboxPanelManager;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiSprite.java b/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiSprite.java
index 188d54837b..b470dc2212 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiSprite.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiSprite.java
@@ -24,6 +24,7 @@
  */
 package net.runelite.client.plugins.wiki;
 
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import net.runelite.api.SpriteID;
@@ -36,9 +37,9 @@ public enum WikiSprite implements SpriteOverride
 	WIKI_SELECTED_ICON(-301, "wiki_selected.png"),
 	FIXED_MODE_MINIMAP_CLICKMASK(SpriteID.MINIMAP_CLICK_MASK, "fixed_mode_minimap_clickmask.png");
 
-	@Getter
+	@Getter(AccessLevel.PUBLIC)
 	private final int spriteId;
 
-	@Getter
+	@Getter(AccessLevel.PUBLIC)
 	private final String fileName;
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsOverlay.java
index 41ad66e7d2..3a87600da7 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsOverlay.java
@@ -12,22 +12,21 @@ package net.runelite.client.plugins.wildernesslocations;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayPriority;
 import net.runelite.client.ui.overlay.components.TextComponent;
 
+@Singleton
 public class WildernessLocationsOverlay extends Overlay
 {
 	private final WildernessLocationsPlugin plugin;
-	private TextComponent textComponent;
+	private final TextComponent textComponent;
 
 	@Inject
-	private WildernessLocationsConfig wildyConfig;
-
-	@Inject
-	public WildernessLocationsOverlay(WildernessLocationsPlugin plugin)
+	public WildernessLocationsOverlay(final WildernessLocationsPlugin plugin)
 	{
 		this.plugin = plugin;
 		setLayer(OverlayLayer.ABOVE_WIDGETS);
@@ -39,7 +38,7 @@ public class WildernessLocationsOverlay extends Overlay
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (plugin.isRenderLocation() && wildyConfig.drawOverlay())
+		if (plugin.isRenderLocation() && plugin.isDrawOverlay())
 		{
 			textComponent.setText(plugin.getLocationString());
 			return textComponent.render(graphics);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsPlugin.java
index ba776475ed..07e7442638 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsPlugin.java
@@ -16,6 +16,8 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
@@ -24,11 +26,13 @@ import net.runelite.api.VarClientStr;
 import net.runelite.api.Varbits;
 import net.runelite.api.coords.WorldArea;
 import net.runelite.api.coords.WorldPoint;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.GameTick;
 import net.runelite.api.events.VarClientStrChanged;
 import net.runelite.api.widgets.WidgetInfo;
 import net.runelite.client.callback.ClientThread;
 import net.runelite.client.config.ConfigManager;
+import net.runelite.client.config.Keybind;
 import net.runelite.client.eventbus.Subscribe;
 import net.runelite.client.input.KeyManager;
 import net.runelite.client.plugins.Plugin;
@@ -46,7 +50,7 @@ import net.runelite.client.util.WildernessLocation;
 	type = PluginType.PVP,
 	enabledByDefault = false
 )
-
+@Singleton
 public class WildernessLocationsPlugin extends Plugin
 {
 
@@ -77,9 +81,9 @@ public class WildernessLocationsPlugin extends Plugin
 	private String oldChat = "";
 	private int currentCooldown = 0;
 	private WorldPoint worldPoint = null;
-	private final HashMap<WorldArea, String> wildLocs = getLocationMap();
+	private final Map<WorldArea, String> wildLocs = getLocationMap();
 
-	private final HotkeyListener hotkeyListener = new HotkeyListener(() -> wildyConfig.keybind())
+	private final HotkeyListener hotkeyListener = new HotkeyListener(() -> this.keybind)
 	{
 		@Override
 		public void hotkeyPressed()
@@ -88,6 +92,10 @@ public class WildernessLocationsPlugin extends Plugin
 		}
 	};
 
+	@Getter(AccessLevel.PACKAGE)
+	private boolean drawOverlay;
+	private Keybind keybind;
+
 	@Provides
 	WildernessLocationsConfig getConfig(ConfigManager configManager)
 	{
@@ -97,10 +105,25 @@ public class WildernessLocationsPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		this.drawOverlay = wildyConfig.drawOverlay();
+		this.keybind = wildyConfig.keybind();
+
 		overlayManager.add(overlay);
 		keyManager.registerKeyListener(hotkeyListener);
 	}
 
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (!event.getGroup().equals("wildernesslocations"))
+		{
+			return;
+		}
+
+		this.drawOverlay = wildyConfig.drawOverlay();
+		this.keybind = wildyConfig.keybind();
+	}
+
 	@Override
 	protected void shutDown() throws Exception
 	{
@@ -179,9 +202,9 @@ public class WildernessLocationsPlugin extends Plugin
 		return s;
 	}
 
-	private static HashMap<WorldArea, String> getLocationMap()
+	private static Map<WorldArea, String> getLocationMap()
 	{
-		HashMap<WorldArea, String> hashMap = new HashMap<>();
+		Map<WorldArea, String> hashMap = new HashMap<>();
 		Arrays.stream(WildernessLocation.values()).forEach(wildernessLocation ->
 			hashMap.put(wildernessLocation.getWorldArea(), wildernessLocation.getName()));
 		return hashMap;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtActivity.java b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtActivity.java
index dadca4137b..bf81e101be 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtActivity.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtActivity.java
@@ -25,11 +25,12 @@
  */
 package net.runelite.client.plugins.wintertodt;
 
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @AllArgsConstructor
-@Getter
+@Getter(AccessLevel.PACKAGE)
 enum WintertodtActivity
 {
 	IDLE("IDLE"),
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtConfig.java
index 8fd6e6e446..6b1adb7e9d 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtConfig.java
@@ -29,6 +29,7 @@ import java.awt.Color;
 import net.runelite.client.config.Config;
 import net.runelite.client.config.ConfigGroup;
 import net.runelite.client.config.ConfigItem;
+import net.runelite.client.config.Range;
 import net.runelite.client.plugins.wintertodt.config.WintertodtNotifyMode;
 
 @ConfigGroup("wintertodt")
@@ -55,4 +56,18 @@ public interface WintertodtConfig extends Config
 	{
 		return Color.CYAN;
 	}
+
+	@ConfigItem(
+		position = 3,
+		keyName = "roundNotification",
+		name = "Wintertodt round notification",
+		description = "Notifies you before the round starts (in seconds)"
+	)
+	@Range(
+		max = 60
+	)
+	default int roundNotification()
+	{
+		return 5;
+	}
 }
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtInterruptType.java b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtInterruptType.java
index db7fe0d416..582cf55ed6 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtInterruptType.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtInterruptType.java
@@ -25,11 +25,12 @@
  */
 package net.runelite.client.plugins.wintertodt;
 
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @AllArgsConstructor
-@Getter
+@Getter(AccessLevel.PACKAGE)
 enum WintertodtInterruptType
 {
 	COLD("Damaged by Wintertodt Cold"),
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtOverlay.java
index 95dc4a7e42..edf894b549 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtOverlay.java
@@ -29,6 +29,7 @@ import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.api.Skill;
@@ -44,6 +45,7 @@ import net.runelite.client.ui.overlay.components.table.TableAlignment;
 import net.runelite.client.ui.overlay.components.table.TableComponent;
 import net.runelite.client.util.ColorUtil;
 
+@Singleton
 class WintertodtOverlay extends Overlay
 {
 	@Inject
@@ -53,7 +55,7 @@ class WintertodtOverlay extends Overlay
 	private final PanelComponent panelComponent = new PanelComponent();
 
 	@Inject
-	private WintertodtOverlay(WintertodtPlugin plugin)
+	private WintertodtOverlay(final WintertodtPlugin plugin)
 	{
 		super(plugin);
 		this.plugin = plugin;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java
index 0ad69971f7..910b9ae241 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java
@@ -26,9 +26,11 @@
 package net.runelite.client.plugins.wintertodt;
 
 import com.google.inject.Provides;
+import java.awt.Color;
 import java.time.Duration;
 import java.time.Instant;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
@@ -42,16 +44,20 @@ import static net.runelite.api.ItemID.BRUMA_KINDLING;
 import static net.runelite.api.ItemID.BRUMA_ROOT;
 import net.runelite.api.MessageNode;
 import net.runelite.api.Player;
+import net.runelite.api.Varbits;
 import net.runelite.api.events.AnimationChanged;
 import net.runelite.api.events.ChatMessage;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.GameTick;
 import net.runelite.api.events.ItemContainerChanged;
+import net.runelite.api.events.VarbitChanged;
 import net.runelite.client.Notifier;
 import net.runelite.client.chat.ChatMessageManager;
 import net.runelite.client.config.ConfigManager;
 import net.runelite.client.eventbus.Subscribe;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginDescriptor;
+import net.runelite.client.plugins.wintertodt.config.WintertodtNotifyMode;
 import net.runelite.client.ui.overlay.OverlayManager;
 import net.runelite.client.util.ColorUtil;
 
@@ -61,6 +67,7 @@ import net.runelite.client.util.ColorUtil;
 	tags = {"minigame", "firemaking", "boss"}
 )
 @Slf4j
+@Singleton
 public class WintertodtPlugin extends Plugin
 {
 	private static final int WINTERTODT_REGION = 6462;
@@ -100,6 +107,10 @@ public class WintertodtPlugin extends Plugin
 
 	private Instant lastActionTime;
 
+	private int previousTimerValue;
+	private WintertodtNotifyMode notifyCondition;
+	private Color damageNotificationColor;
+
 	@Provides
 	WintertodtConfig getConfig(ConfigManager configManager)
 	{
@@ -109,6 +120,9 @@ public class WintertodtPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		this.notifyCondition = config.notifyCondition();
+		this.damageNotificationColor = config.damageNotificationColor();
+
 		reset();
 		overlayManager.add(overlay);
 	}
@@ -120,6 +134,18 @@ public class WintertodtPlugin extends Plugin
 		reset();
 	}
 
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (!event.getGroup().equals("wintertodt"))
+		{
+			return;
+		}
+
+		this.notifyCondition = config.notifyCondition();
+		this.damageNotificationColor = config.damageNotificationColor();
+	}
+
 	private void reset()
 	{
 		numRoots = 0;
@@ -163,6 +189,30 @@ public class WintertodtPlugin extends Plugin
 		checkActionTimeout();
 	}
 
+	@Subscribe
+	public void onVarbitChanged(VarbitChanged varbitChanged)
+	{
+		int timerValue = client.getVar(Varbits.WINTERTODT_TIMER);
+		if (timerValue != previousTimerValue)
+		{
+			int timeToNotify = config.roundNotification();
+			if (timeToNotify > 0)
+			{
+				int timeInSeconds = timerValue * 30 / 50;
+				int prevTimeInSeconds = previousTimerValue * 30 / 50;
+
+				log.debug("Seconds left until round start: {}", timeInSeconds);
+
+				if (prevTimeInSeconds > timeToNotify && timeInSeconds <= timeToNotify)
+				{
+					notifier.notify("Wintertodt round is about to start");
+				}
+			}
+
+			previousTimerValue = timerValue;
+		}
+	}
+
 	private void checkActionTimeout()
 	{
 		if (currentActivity == WintertodtActivity.IDLE)
@@ -253,7 +303,7 @@ public class WintertodtPlugin extends Plugin
 				wasDamaged = true;
 
 				// Recolor message for damage notification
-				messageNode.setRuneLiteFormatMessage(ColorUtil.wrapWithColorTag(messageNode.getValue(), config.damageNotificationColor()));
+				messageNode.setRuneLiteFormatMessage(ColorUtil.wrapWithColorTag(messageNode.getValue(), this.damageNotificationColor));
 				chatMessageManager.update(messageNode);
 				client.refreshChat();
 
@@ -280,7 +330,7 @@ public class WintertodtPlugin extends Plugin
 		{
 			boolean shouldNotify = false;
 
-			switch (config.notifyCondition())
+			switch (this.notifyCondition)
 			{
 				case ONLY_WHEN_INTERRUPTED:
 					if (wasInterrupted)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/config/WintertodtNotifyMode.java b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/config/WintertodtNotifyMode.java
index c5a3b114fd..e5c54b7be6 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/config/WintertodtNotifyMode.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/config/WintertodtNotifyMode.java
@@ -25,10 +25,11 @@
  */
 package net.runelite.client.plugins.wintertodt.config;
 
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
-@Getter
+@Getter(AccessLevel.PACKAGE)
 @RequiredArgsConstructor
 public enum WintertodtNotifyMode
 {
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/Axe.java b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/Axe.java
index 7b8a5c5f4e..709ea85378 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/Axe.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/Axe.java
@@ -26,6 +26,7 @@ package net.runelite.client.plugins.woodcutting;
 
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import static net.runelite.api.AnimationID.WOODCUTTING_3A_AXE;
@@ -50,7 +51,7 @@ import static net.runelite.api.ItemID.STEEL_AXE;
 import static net.runelite.api.ItemID._3RD_AGE_AXE;
 
 @AllArgsConstructor
-@Getter
+@Getter(AccessLevel.PACKAGE)
 enum Axe
 {
 	BRONZE(WOODCUTTING_BRONZE, BRONZE_AXE),
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/Tree.java b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/Tree.java
index befc78df8c..dfb670ac5a 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/Tree.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/Tree.java
@@ -26,18 +26,19 @@ package net.runelite.client.plugins.woodcutting;
 
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;
+import lombok.AccessLevel;
 import lombok.Getter;
 import static net.runelite.api.ObjectID.REDWOOD;
 import static net.runelite.api.ObjectID.REDWOOD_29670;
 
-@Getter
+@Getter(AccessLevel.PACKAGE)
 enum Tree
 {
 	REDWOOD_TREE_SPAWN(REDWOOD, REDWOOD_29670);
 
 	private final int[] treeIds;
 
-	Tree(int... treeIds)
+	Tree(final int... treeIds)
 	{
 		this.treeIds = treeIds;
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingOverlay.java
index 497d9695b4..0aa27918d7 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingOverlay.java
@@ -28,6 +28,7 @@ import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.api.Skill;
@@ -41,22 +42,21 @@ import net.runelite.client.ui.overlay.components.TitleComponent;
 import net.runelite.client.ui.overlay.components.table.TableAlignment;
 import net.runelite.client.ui.overlay.components.table.TableComponent;
 
+@Singleton
 class WoodcuttingOverlay extends Overlay
 {
 	private final Client client;
 	private final WoodcuttingPlugin plugin;
-	private final WoodcuttingConfig config;
 	private final XpTrackerService xpTrackerService;
 	private final PanelComponent panelComponent = new PanelComponent();
 
 	@Inject
-	private WoodcuttingOverlay(Client client, WoodcuttingPlugin plugin, WoodcuttingConfig config, XpTrackerService xpTrackerService)
+	private WoodcuttingOverlay(final Client client, final WoodcuttingPlugin plugin, final XpTrackerService xpTrackerService)
 	{
 		super(plugin);
 		setPosition(OverlayPosition.TOP_LEFT);
 		this.client = client;
 		this.plugin = plugin;
-		this.config = config;
 		this.xpTrackerService = xpTrackerService;
 		getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY_CONFIG, OPTION_CONFIGURE, "Woodcutting overlay"));
 	}
@@ -64,7 +64,7 @@ class WoodcuttingOverlay extends Overlay
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (!config.showWoodcuttingStats())
+		if (!plugin.isShowWoodcuttingStats())
 		{
 			return null;
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingPlugin.java
index 28547b8921..996a13cb30 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingPlugin.java
@@ -30,6 +30,8 @@ import java.time.Instant;
 import java.util.HashSet;
 import java.util.Set;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.ChatMessageType;
 import net.runelite.api.Client;
@@ -38,6 +40,7 @@ import net.runelite.api.GameState;
 import net.runelite.api.Player;
 import net.runelite.api.events.AnimationChanged;
 import net.runelite.api.events.ChatMessage;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.GameObjectChanged;
 import net.runelite.api.events.GameObjectDespawned;
 import net.runelite.api.events.GameObjectSpawned;
@@ -57,6 +60,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	description = "Show woodcutting statistics and/or bird nest notifications",
 	tags = {"birds", "nest", "notifications", "overlay", "skilling", "wc"}
 )
+@Singleton
 @PluginDependency(XpTrackerPlugin.class)
 public class WoodcuttingPlugin extends Plugin
 {
@@ -78,15 +82,22 @@ public class WoodcuttingPlugin extends Plugin
 	@Inject
 	private WoodcuttingConfig config;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private WoodcuttingSession session;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private Axe axe;
 
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private final Set<GameObject> treeObjects = new HashSet<>();
 
+	private int statTimeout;
+	private boolean showNestNotification;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showWoodcuttingStats;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showRedwoodTrees;
+
 	@Provides
 	WoodcuttingConfig getConfig(ConfigManager configManager)
 	{
@@ -96,6 +107,8 @@ public class WoodcuttingPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
+
 		overlayManager.add(overlay);
 		overlayManager.add(treesOverlay);
 	}
@@ -118,7 +131,7 @@ public class WoodcuttingPlugin extends Plugin
 			return;
 		}
 
-		Duration statTimeout = Duration.ofMinutes(config.statTimeout());
+		Duration statTimeout = Duration.ofMinutes(this.statTimeout);
 		Duration sinceCut = Duration.between(session.getLastLogCut(), Instant.now());
 
 		if (sinceCut.compareTo(statTimeout) >= 0)
@@ -143,7 +156,7 @@ public class WoodcuttingPlugin extends Plugin
 				session.setLastLogCut();
 			}
 
-			if (event.getMessage().contains("A bird's nest falls out of the tree") && config.showNestNotification())
+			if (event.getMessage().contains("A bird's nest falls out of the tree") && this.showNestNotification)
 			{
 				notifier.notify("A bird nest has spawned!");
 			}
@@ -200,4 +213,23 @@ public class WoodcuttingPlugin extends Plugin
 			this.axe = axe;
 		}
 	}
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (!event.getGroup().equals("woodcutting"))
+		{
+			return;
+		}
+
+		updateConfig();
+	}
+
+	private void updateConfig()
+	{
+		this.statTimeout = config.statTimeout();
+		this.showNestNotification = config.showNestNotification();
+		this.showWoodcuttingStats = config.showWoodcuttingStats();
+		this.showRedwoodTrees = config.showRedwoodTrees();
+	}
 }
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingSession.java b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingSession.java
index ac5d66130e..aaf2919c01 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingSession.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingSession.java
@@ -26,16 +26,16 @@ package net.runelite.client.plugins.woodcutting;
 
 import java.time.Instant;
 
-public class WoodcuttingSession
+class WoodcuttingSession
 {
 	private Instant lastLogCut;
 
-	public void setLastLogCut()
+	void setLastLogCut()
 	{
 		lastLogCut = Instant.now();
 	}
 
-	public Instant getLastLogCut()
+	Instant getLastLogCut()
 	{
 		return lastLogCut;
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingTreesOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingTreesOverlay.java
index 2415d17f7a..cf25150169 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingTreesOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingTreesOverlay.java
@@ -28,6 +28,7 @@ package net.runelite.client.plugins.woodcutting;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import net.runelite.api.GameObject;
 import net.runelite.client.game.ItemManager;
@@ -36,18 +37,17 @@ import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayUtil;
 
+@Singleton
 class WoodcuttingTreesOverlay extends Overlay
 {
 	private final Client client;
-	private final WoodcuttingConfig config;
 	private final ItemManager itemManager;
 	private final WoodcuttingPlugin plugin;
 
 	@Inject
-	private WoodcuttingTreesOverlay(final Client client, final WoodcuttingConfig config, final ItemManager itemManager, final WoodcuttingPlugin plugin)
+	private WoodcuttingTreesOverlay(final Client client, final ItemManager itemManager, final WoodcuttingPlugin plugin)
 	{
 		this.client = client;
-		this.config = config;
 		this.itemManager = itemManager;
 		this.plugin = plugin;
 		setLayer(OverlayLayer.ABOVE_SCENE);
@@ -57,7 +57,7 @@ class WoodcuttingTreesOverlay extends Overlay
 	@Override
 	public Dimension render(Graphics2D graphics)
 	{
-		if (plugin.getSession() == null || !config.showRedwoodTrees())
+		if (plugin.getSession() == null || !plugin.isShowRedwoodTrees())
 		{
 			return null;
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperConfig.java
index f7a75781fd..8035af73fb 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperConfig.java
@@ -102,11 +102,22 @@ public interface WorldHopperConfig extends Config
 		return true;
 	}
 
+	@ConfigItem(
+		keyName = "menuOption",
+		name = "Show Hop-to menu option",
+		description = "Adds Hop-to menu option to the friends list and clan members list",
+		position = 6
+	)
+	default boolean menuOption()
+	{
+		return true;
+	}
+
 	@ConfigItem(
 		keyName = "subscriptionFilter",
 		name = "Show subscription types",
 		description = "Only show free worlds, member worlds, or both types of worlds in sidebar",
-		position = 6
+		position = 7
 	)
 	default SubscriptionFilterMode subscriptionFilter()
 	{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java
index 84abfcf9f5..1136fffc31 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java
@@ -44,6 +44,7 @@ import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 import javax.imageio.ImageIO;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import javax.swing.SwingUtilities;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
@@ -65,12 +66,12 @@ import net.runelite.api.events.PlayerMenuOptionClicked;
 import net.runelite.api.events.VarbitChanged;
 import net.runelite.api.events.WorldListLoad;
 import net.runelite.api.widgets.WidgetInfo;
-import net.runelite.client.callback.ClientThread;
 import net.runelite.client.chat.ChatColorType;
 import net.runelite.client.chat.ChatMessageBuilder;
 import net.runelite.client.chat.ChatMessageManager;
 import net.runelite.client.chat.QueuedMessage;
 import net.runelite.client.config.ConfigManager;
+import net.runelite.client.config.Keybind;
 import net.runelite.client.eventbus.Subscribe;
 import net.runelite.client.input.KeyManager;
 import net.runelite.client.plugins.Plugin;
@@ -93,6 +94,7 @@ import org.apache.commons.lang3.ArrayUtils;
 	description = "Allows you to quickly hop worlds"
 )
 @Slf4j
+@Singleton
 public class WorldHopperPlugin extends Plugin
 {
 	private static final int WORLD_FETCH_TIMER = 10;
@@ -110,9 +112,6 @@ public class WorldHopperPlugin extends Plugin
 	@Inject
 	private Client client;
 
-	@Inject
-	private ClientThread clientThread;
-
 	@Inject
 	private ConfigManager configManager;
 
@@ -149,7 +148,15 @@ public class WorldHopperPlugin extends Plugin
 	private Instant lastFetch;
 	private boolean firstRun;
 
-	private final HotkeyListener previousKeyListener = new HotkeyListener(() -> config.previousKey())
+	private Keybind previousKey;
+	private Keybind nextKey;
+	private boolean quickhopOutOfDanger;
+	private boolean showSidebar;
+	private boolean ping;
+	private boolean showWorldHopMessage;
+	private SubscriptionFilterMode subscriptionFilter;
+
+	private final HotkeyListener previousKeyListener = new HotkeyListener(() -> this.previousKey)
 	{
 		@Override
 		public void hotkeyPressed()
@@ -157,7 +164,7 @@ public class WorldHopperPlugin extends Plugin
 			hop(true);
 		}
 	};
-	private final HotkeyListener nextKeyListener = new HotkeyListener(() -> config.nextKey())
+	private final HotkeyListener nextKeyListener = new HotkeyListener(() -> this.nextKey)
 	{
 		@Override
 		public void hotkeyPressed()
@@ -175,6 +182,8 @@ public class WorldHopperPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
+		
 		firstRun = true;
 
 		keyManager.registerKeyListener(previousKeyListener);
@@ -195,12 +204,12 @@ public class WorldHopperPlugin extends Plugin
 			.panel(panel)
 			.build();
 
-		if (config.showSidebar())
+		if (this.showSidebar)
 		{
 			clientToolbar.addNavigation(navButton);
 		}
 
-		panel.setFilterMode(config.subscriptionFilter());
+		panel.setFilterMode(this.subscriptionFilter);
 		worldResultFuture = executorService.scheduleAtFixedRate(this::tick, 0, WORLD_FETCH_TIMER, TimeUnit.MINUTES);
 
 		hopperExecutorService = new ExecutorServiceExceptionLogger(Executors.newSingleThreadScheduledExecutor());
@@ -232,10 +241,12 @@ public class WorldHopperPlugin extends Plugin
 	{
 		if (event.getGroup().equals(WorldHopperConfig.GROUP))
 		{
+			updateConfig();
+			
 			switch (event.getKey())
 			{
 				case "showSidebar":
-					if (config.showSidebar())
+					if (this.showSidebar)
 					{
 						clientToolbar.addNavigation(navButton);
 					}
@@ -245,7 +256,7 @@ public class WorldHopperPlugin extends Plugin
 					}
 					break;
 				case "ping":
-					if (config.ping())
+					if (this.ping)
 					{
 						SwingUtilities.invokeLater(() -> panel.showPing());
 					}
@@ -255,7 +266,7 @@ public class WorldHopperPlugin extends Plugin
 					}
 					break;
 				case "subscriptionFilter":
-					panel.setFilterMode(config.subscriptionFilter());
+					panel.setFilterMode(this.subscriptionFilter);
 					updateList();
 					break;
 			}
@@ -327,6 +338,11 @@ public class WorldHopperPlugin extends Plugin
 	@Subscribe
 	public void onMenuEntryAdded(MenuEntryAdded event)
 	{
+		if (!config.menuOption())
+		{
+			return;
+		}
+
 		int groupId = WidgetInfo.TO_GROUP(event.getActionParam1());
 		String option = event.getOption();
 
@@ -409,7 +425,7 @@ public class WorldHopperPlugin extends Plugin
 	public void onGameStateChanged(GameStateChanged gameStateChanged)
 	{
 		// If the player has disabled the side bar plugin panel, do not update the UI
-		if (config.showSidebar() && gameStateChanged.getGameState() == GameState.LOGGED_IN)
+		if (this.showSidebar && gameStateChanged.getGameState() == GameState.LOGGED_IN)
 		{
 			if (lastWorld != client.getWorld())
 			{
@@ -423,7 +439,7 @@ public class WorldHopperPlugin extends Plugin
 	@Subscribe
 	public void onWorldListLoad(WorldListLoad worldListLoad)
 	{
-		if (!config.showSidebar())
+		if (!this.showSidebar)
 		{
 			return;
 		}
@@ -516,7 +532,7 @@ public class WorldHopperPlugin extends Plugin
 
 		EnumSet<WorldType> currentWorldTypes = currentWorld.getTypes().clone();
 		// Make it so you always hop out of PVP and high risk worlds
-		if (config.quickhopOutOfDanger())
+		if (this.quickhopOutOfDanger)
 		{
 			currentWorldTypes.remove(WorldType.PVP);
 			currentWorldTypes.remove(WorldType.HIGH_RISK);
@@ -634,7 +650,7 @@ public class WorldHopperPlugin extends Plugin
 			return;
 		}
 
-		if (config.showWorldHopMessage())
+		if (this.showWorldHopMessage)
 		{
 			String chatMessage = new ChatMessageBuilder()
 				.append(ChatColorType.NORMAL)
@@ -752,7 +768,7 @@ public class WorldHopperPlugin extends Plugin
 
 	private void pingWorlds()
 	{
-		if (worldResult == null || !config.showSidebar() || !config.ping())
+		if (worldResult == null || !this.showSidebar || !this.ping)
 		{
 			return;
 		}
@@ -769,4 +785,15 @@ public class WorldHopperPlugin extends Plugin
 
 		log.debug("Done pinging worlds in {}", stopwatch.elapsed());
 	}
+	
+	private void updateConfig()
+	{
+		this.previousKey = config.previousKey();
+		this.nextKey = config.nextKey();
+		this.quickhopOutOfDanger = config.quickhopOutOfDanger();
+		this.showSidebar = config.showSidebar();
+		this.ping = config.ping();
+		this.showWorldHopMessage = config.showWorldHopMessage();
+		this.subscriptionFilter = config.subscriptionFilter();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java
index 27eb29b321..67552394c9 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java
@@ -24,6 +24,7 @@
  */
 package net.runelite.client.plugins.worldhopper;
 
+import com.google.common.collect.Ordering;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Dimension;
@@ -33,6 +34,7 @@ import java.awt.event.MouseEvent;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
 import lombok.AccessLevel;
@@ -159,24 +161,28 @@ class WorldSwitcherPanel extends PluginPanel
 			switch (orderIndex)
 			{
 				case PING:
-					return Integer.compare(r1.getPing(), r2.getPing()) * (ascendingOrder ? 1 : -1);
+					// Leave worlds with unknown ping at the bottom
+					return getCompareValue(r1, r2, row ->
+					{
+						int ping = row.getPing();
+						return ping > 0 ? ping : null;
+					});
 				case WORLD:
-					return Integer.compare(r1.getWorld().getId(), r2.getWorld().getId()) * (ascendingOrder ? 1 : -1);
+					return getCompareValue(r1, r2, row -> row.getWorld().getId());
 				case PLAYERS:
-					return Integer.compare(r1.getUpdatedPlayerCount(), r2.getUpdatedPlayerCount()) * (ascendingOrder ? 1 : -1);
+					return getCompareValue(r1, r2, WorldTableRow::getUpdatedPlayerCount);
 				case ACTIVITY:
-					return r1.getWorld().getActivity().compareTo(r2.getWorld().getActivity()) * -1 * (ascendingOrder ? 1 : -1);
+					// Leave empty activity worlds on the bottom of the list
+					return getCompareValue(r1, r2, row ->
+					{
+						String activity = row.getWorld().getActivity();
+						return !activity.equals("-") ? activity : null;
+					});
 				default:
 					return 0;
 			}
 		});
 
-		// Leave empty activity worlds on the bottom of the list
-		if (orderIndex == WorldOrder.ACTIVITY)
-		{
-			rows.sort((r1, r2) -> r1.getWorld().getActivity().equals("-") ? 1 : -1);
-		}
-
 		rows.sort((r1, r2) ->
 		{
 			boolean b1 = plugin.isFavorite(r1.getWorld());
@@ -197,6 +203,17 @@ class WorldSwitcherPanel extends PluginPanel
 		listContainer.repaint();
 	}
 
+	private int getCompareValue(WorldTableRow row1, WorldTableRow row2, Function<WorldTableRow, Comparable> compareByFn)
+	{
+		Ordering<Comparable> ordering = Ordering.natural();
+		if (!ascendingOrder)
+		{
+			ordering = ordering.reverse();
+		}
+		ordering = ordering.nullsLast();
+		return ordering.compare(compareByFn.apply(row1), compareByFn.apply(row2));
+	}
+
 	void updateFavoriteMenu(int world, boolean favorite)
 	{
 		for (WorldTableRow row : rows)
@@ -396,4 +413,4 @@ class WorldSwitcherPanel extends PluginPanel
 		ACTIVITY,
 		PING
 	}
-}
+}
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableHeader.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableHeader.java
index 25d0cc9f9a..a1ad1e76b7 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableHeader.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableHeader.java
@@ -31,6 +31,7 @@ import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.awt.image.BufferedImage;
 import javax.annotation.Nonnull;
+import javax.inject.Singleton;
 import javax.swing.BorderFactory;
 import javax.swing.ImageIcon;
 import javax.swing.JLabel;
@@ -43,6 +44,7 @@ import net.runelite.client.ui.ColorScheme;
 import net.runelite.client.ui.FontManager;
 import net.runelite.client.util.ImageUtil;
 
+@Singleton
 class WorldTableHeader extends JPanel
 {
 	private static final ImageIcon ARROW_UP;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableRow.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableRow.java
index 3133a81a4f..7aa7eb12b1 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableRow.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableRow.java
@@ -32,6 +32,7 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
+import javax.inject.Singleton;
 import javax.swing.ImageIcon;
 import javax.swing.JLabel;
 import javax.swing.JMenuItem;
@@ -45,6 +46,7 @@ import net.runelite.client.util.ImageUtil;
 import net.runelite.http.api.worlds.World;
 import net.runelite.http.api.worlds.WorldType;
 
+@Singleton
 class WorldTableRow extends JPanel
 {
 	private static final ImageIcon FLAG_AUS;
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/ping/IcmpEchoReply.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/ping/IcmpEchoReply.java
index 0e1cc198a3..75a7e4226c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/ping/IcmpEchoReply.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/ping/IcmpEchoReply.java
@@ -47,7 +47,7 @@ public class IcmpEchoReply extends Structure
 	public WinDef.UCHAR optionsSize;
 	public WinDef.PVOID optionsData;
 
-	IcmpEchoReply(Pointer p)
+	IcmpEchoReply(final Pointer p)
 	{
 		super(p);
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/WorldMapPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/WorldMapPlugin.java
index d5be4c8591..7f8a0ec744 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/WorldMapPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/WorldMapPlugin.java
@@ -127,6 +127,24 @@ public class WorldMapPlugin extends Plugin
 	private int agilityLevel = 0;
 	private int woodcuttingLevel = 0;
 
+	private boolean fairyRingTooltips;
+	private boolean fairyRingIcon;
+	private boolean agilityShortcutTooltips;
+	private boolean agilityShortcutLevelIcon;
+	private boolean normalTeleportIcon;
+	private boolean minigameTooltip;
+	private boolean ancientTeleportIcon;
+	private boolean lunarTeleportIcon;
+	private boolean arceuusTeleportIcon;
+	private boolean jewelleryTeleportIcon;
+	private boolean scrollTeleportIcon;
+	private boolean miscellaneousTeleportIcon;
+	private boolean questStartTooltips;
+	private boolean farmingPatchTooltips;
+	private boolean rareTreeTooltips;
+	private boolean rareTreeLevelIcon;
+	private boolean transportationTeleportTooltips;
+
 	@Provides
 	WorldMapConfig provideConfig(ConfigManager configManager)
 	{
@@ -136,6 +154,7 @@ public class WorldMapPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
 		agilityLevel = client.getRealSkillLevel(Skill.AGILITY);
 		woodcuttingLevel = client.getRealSkillLevel(Skill.WOODCUTTING);
 		updateShownIcons();
@@ -164,6 +183,7 @@ public class WorldMapPlugin extends Plugin
 			return;
 		}
 
+		updateConfig();
 		updateShownIcons();
 	}
 
@@ -206,13 +226,13 @@ public class WorldMapPlugin extends Plugin
 	{
 		worldMapPointManager.removeIf(AgilityShortcutPoint.class::isInstance);
 
-		if (config.agilityShortcutLevelIcon() || config.agilityShortcutTooltips())
+		if (this.agilityShortcutLevelIcon || this.agilityShortcutTooltips)
 		{
 			Arrays.stream(AgilityShortcut.values())
 				.filter(value -> value.getWorldMapLocation() != null)
 				.map(value -> new AgilityShortcutPoint(value,
-					agilityLevel > 0 && config.agilityShortcutLevelIcon() && value.getLevel() > agilityLevel ? NOPE_ICON : BLANK_ICON,
-					config.agilityShortcutTooltips()))
+					agilityLevel > 0 && this.agilityShortcutLevelIcon && value.getLevel() > agilityLevel ? NOPE_ICON : BLANK_ICON,
+					this.agilityShortcutTooltips))
 				.forEach(worldMapPointManager::add);
 		}
 	}
@@ -221,15 +241,15 @@ public class WorldMapPlugin extends Plugin
 	{
 		worldMapPointManager.removeIf(RareTreePoint.class::isInstance);
 
-		if (config.rareTreeLevelIcon() || config.rareTreeTooltips())
+		if (this.rareTreeLevelIcon || this.rareTreeTooltips)
 		{
 			Arrays.stream(RareTreeLocation.values()).forEach(rareTree ->
 				Arrays.stream(rareTree.getLocations())
 					.map(point -> new RareTreePoint(point,
 						rareTree.getTooltip(),
-						woodcuttingLevel > 0 && config.rareTreeLevelIcon() &&
+						woodcuttingLevel > 0 && this.rareTreeLevelIcon &&
 							rareTree.getLevelReq() > woodcuttingLevel ? NOPE_ICON : BLANK_ICON,
-						config.rareTreeTooltips()))
+						this.rareTreeTooltips))
 					.forEach(worldMapPointManager::add));
 		}
 	}
@@ -241,17 +261,17 @@ public class WorldMapPlugin extends Plugin
 		updateQuestStartPointIcons();
 
 		worldMapPointManager.removeIf(FairyRingPoint.class::isInstance);
-		if (config.fairyRingIcon() || config.fairyRingTooltips())
+		if (this.fairyRingIcon || this.fairyRingTooltips)
 		{
 			Arrays.stream(FairyRingLocation.values())
 				.map(value -> new FairyRingPoint(value,
-					config.fairyRingIcon() ? FAIRY_TRAVEL_ICON : BLANK_ICON,
-					config.fairyRingTooltips()))
+					this.fairyRingIcon ? FAIRY_TRAVEL_ICON : BLANK_ICON,
+					this.fairyRingTooltips))
 				.forEach(worldMapPointManager::add);
 		}
 
 		worldMapPointManager.removeIf(MinigamePoint.class::isInstance);
-		if (config.minigameTooltip())
+		if (this.minigameTooltip)
 		{
 			Arrays.stream(MinigameLocation.values())
 				.map(value -> new MinigamePoint(value, BLANK_ICON))
@@ -259,7 +279,7 @@ public class WorldMapPlugin extends Plugin
 		}
 
 		worldMapPointManager.removeIf(TransportationPoint.class::isInstance);
-		if (config.transportationTeleportTooltips())
+		if (this.transportationTeleportTooltips)
 		{
 			Arrays.stream(TransportationPointLocation.values())
 				.map(value -> new TransportationPoint(value, BLANK_ICON))
@@ -267,7 +287,7 @@ public class WorldMapPlugin extends Plugin
 		}
 
 		worldMapPointManager.removeIf(FarmingPatchPoint.class::isInstance);
-		if (config.farmingPatchTooltips())
+		if (this.farmingPatchTooltips)
 		{
 			Arrays.stream(FarmingPatchLocation.values()).forEach(location ->
 				Arrays.stream(location.getLocations())
@@ -283,19 +303,19 @@ public class WorldMapPlugin extends Plugin
 				switch (data.getType())
 				{
 					case NORMAL_MAGIC:
-						return config.normalTeleportIcon();
+						return this.normalTeleportIcon;
 					case ANCIENT_MAGICKS:
-						return config.ancientTeleportIcon();
+						return this.ancientTeleportIcon;
 					case LUNAR_MAGIC:
-						return config.lunarTeleportIcon();
+						return this.lunarTeleportIcon;
 					case ARCEUUS_MAGIC:
-						return config.arceuusTeleportIcon();
+						return this.arceuusTeleportIcon;
 					case JEWELLERY:
-						return config.jewelleryTeleportIcon();
+						return this.jewelleryTeleportIcon;
 					case SCROLL:
-						return config.scrollTeleportIcon();
+						return this.scrollTeleportIcon;
 					case OTHER:
-						return config.miscellaneousTeleportIcon();
+						return this.miscellaneousTeleportIcon;
 					default:
 						return false;
 				}
@@ -307,7 +327,7 @@ public class WorldMapPlugin extends Plugin
 	{
 		worldMapPointManager.removeIf(QuestStartPoint.class::isInstance);
 
-		if (!config.questStartTooltips())
+		if (!this.questStartTooltips)
 		{
 			return;
 		}
@@ -333,11 +353,11 @@ public class WorldMapPlugin extends Plugin
 
 		// Get first uncompleted quest. Else, return the last quest.
 		Quest quest = null;
-		for (int i = 0; i < quests.length; i++)
+		for (Quest value : quests)
 		{
-			if (quests[i].getState(client) != QuestState.FINISHED)
+			if (value.getState(client) != QuestState.FINISHED)
 			{
-				quest = quests[i];
+				quest = value;
 				break;
 			}
 		}
@@ -370,4 +390,25 @@ public class WorldMapPlugin extends Plugin
 
 		return new QuestStartPoint(data.getLocation(), icon, tooltip);
 	}
+
+	private void updateConfig()
+	{
+		this.fairyRingTooltips = config.fairyRingTooltips();
+		this.fairyRingIcon = config.fairyRingIcon();
+		this.agilityShortcutTooltips = config.agilityShortcutTooltips();
+		this.agilityShortcutLevelIcon = config.agilityShortcutLevelIcon();
+		this.normalTeleportIcon = config.normalTeleportIcon();
+		this.minigameTooltip = config.minigameTooltip();
+		this.ancientTeleportIcon = config.ancientTeleportIcon();
+		this.lunarTeleportIcon = config.lunarTeleportIcon();
+		this.arceuusTeleportIcon = config.arceuusTeleportIcon();
+		this.jewelleryTeleportIcon = config.jewelleryTeleportIcon();
+		this.scrollTeleportIcon = config.scrollTeleportIcon();
+		this.miscellaneousTeleportIcon = config.miscellaneousTeleportIcon();
+		this.questStartTooltips = config.questStartTooltips();
+		this.farmingPatchTooltips = config.farmingPatchTooltips();
+		this.rareTreeTooltips = config.rareTreeTooltips();
+		this.rareTreeLevelIcon = config.rareTreeLevelIcon();
+		this.transportationTeleportTooltips = config.transportationTeleportTooltips();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobe.java b/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobe.java
index 51d0e1328d..68ffee0499 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobe.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobe.java
@@ -25,13 +25,14 @@
 package net.runelite.client.plugins.xpglobes;
 
 import java.time.Instant;
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
 import net.runelite.api.Skill;
 
-@Getter
-@Setter
+@Getter(AccessLevel.PACKAGE)
+@Setter(AccessLevel.PACKAGE)
 @AllArgsConstructor
 class XpGlobe
 {
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesOverlay.java
index 942ccd2988..4d6d53ad36 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesOverlay.java
@@ -37,8 +37,10 @@ import java.awt.geom.Ellipse2D;
 import java.awt.image.BufferedImage;
 import java.text.DecimalFormat;
 import java.time.Instant;
+import java.util.Comparator;
 import java.util.List;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.api.Client;
 import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
 import net.runelite.api.Point;
@@ -56,6 +58,7 @@ import net.runelite.client.ui.overlay.components.table.TableAlignment;
 import net.runelite.client.ui.overlay.components.table.TableComponent;
 import net.runelite.client.util.ColorUtil;
 
+@Singleton
 public class XpGlobesOverlay extends Overlay
 {
 	private static final int MINIMUM_STEP = 10;
@@ -66,24 +69,22 @@ public class XpGlobesOverlay extends Overlay
 
 	private final Client client;
 	private final XpGlobesPlugin plugin;
-	private final XpGlobesConfig config;
 	private final XpTrackerService xpTrackerService;
 	private final PanelComponent xpTooltip = new PanelComponent();
 	private final SkillIconManager iconManager;
 
 	@Inject
 	private XpGlobesOverlay(
-		Client client,
-		XpGlobesPlugin plugin,
-		XpGlobesConfig config,
-		XpTrackerService xpTrackerService,
-		SkillIconManager iconManager)
+		final Client client,
+		final XpGlobesPlugin plugin,
+		final XpTrackerService xpTrackerService,
+		final SkillIconManager iconManager)
 	{
 		super(plugin);
 		this.iconManager = iconManager;
 		this.client = client;
 		this.plugin = plugin;
-		this.config = config;
+
 		this.xpTrackerService = xpTrackerService;
 		setPosition(OverlayPosition.TOP_CENTER);
 		getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY_CONFIG, OPTION_CONFIGURE, "XP Globes overlay"));
@@ -99,7 +100,7 @@ public class XpGlobesOverlay extends Overlay
 		}
 
 		final List<XpGlobe> sortedXpGlobes = plugin.getXpGlobes();
-		sortedXpGlobes.sort((a, b) -> a.getSkill().compareTo(b.getSkill()));
+		sortedXpGlobes.sort(Comparator.comparing(XpGlobe::getSkill));
 
 		int curDrawX = 0;
 		for (final XpGlobe xpGlobe : sortedXpGlobes)
@@ -107,12 +108,12 @@ public class XpGlobesOverlay extends Overlay
 			int startXp = xpTrackerService.getStartGoalXp(xpGlobe.getSkill());
 			int goalXp = xpTrackerService.getEndGoalXp(xpGlobe.getSkill());
 			renderProgressCircle(graphics, xpGlobe, startXp, goalXp, curDrawX, 0, getBounds());
-			curDrawX += MINIMUM_STEP + config.xpOrbSize();
+			curDrawX += MINIMUM_STEP + plugin.getXpOrbSize();
 		}
 
 		// Get width of markers
-		final int markersLength = (queueSize * (config.xpOrbSize())) + ((MINIMUM_STEP) * (queueSize - 1));
-		return new Dimension(markersLength, config.xpOrbSize());
+		final int markersLength = (queueSize * (plugin.getXpOrbSize())) + ((MINIMUM_STEP) * (queueSize - 1));
+		return new Dimension(markersLength, plugin.getXpOrbSize());
 	}
 
 	private double getSkillProgress(int startXp, int currentXp, int goalXp)
@@ -150,7 +151,7 @@ public class XpGlobesOverlay extends Overlay
 
 			drawProgressLabel(graphics, skillToDraw, startXp, goalXp, x, y);
 
-			if (config.enableTooltips())
+			if (plugin.isEnableTooltips())
 			{
 				drawTooltip(graphics, skillToDraw, goalXp, backgroundCircle);
 			}
@@ -161,18 +162,18 @@ public class XpGlobesOverlay extends Overlay
 		drawProgressArc(
 			graphics,
 			x, y,
-			config.xpOrbSize(), config.xpOrbSize(),
+			plugin.getXpOrbSize(), plugin.getXpOrbSize(),
 			PROGRESS_RADIUS_REMAINDER, radiusToGoalXp,
 			5,
-			config.progressOrbOutLineColor()
+			plugin.getProgressOrbOutLineColor()
 		);
 		drawProgressArc(
 			graphics,
 			x, y,
-			config.xpOrbSize(), config.xpOrbSize(),
+			plugin.getXpOrbSize(), plugin.getXpOrbSize(),
 			PROGRESS_RADIUS_START, radiusCurrentXp,
-			config.progressArcStrokeWidth(),
-			config.enableCustomArcColor() ? config.progressArcColor() : SkillColor.find(skillToDraw.getSkill()).getColor());
+			plugin.getProgressArcStrokeWidth(),
+			plugin.isEnableCustomArcColor() ? plugin.getProgressArcColor() : SkillColor.find(skillToDraw.getSkill()).getColor());
 	}
 
 	private void drawProgressLabel(Graphics2D graphics, XpGlobe globe, int startXp, int goalXp, int x, int y)
@@ -186,8 +187,8 @@ public class XpGlobesOverlay extends Overlay
 		String progress = (int) (getSkillProgress(startXp, globe.getCurrentXp(), goalXp)) + "%";
 
 		final FontMetrics metrics = graphics.getFontMetrics();
-		int drawX = x + (config.xpOrbSize() / 2) - (metrics.stringWidth(progress) / 2);
-		int drawY = y + (config.xpOrbSize() / 2) + (metrics.getHeight() / 2) - metrics.getMaxDescent();
+		int drawX = x + (plugin.getXpOrbSize() / 2) - (metrics.stringWidth(progress) / 2);
+		int drawY = y + (plugin.getXpOrbSize() / 2) + (metrics.getHeight() / 2) - metrics.getMaxDescent();
 
 		OverlayUtil.renderTextLocation(graphics, new Point(drawX, drawY), progress, Color.WHITE);
 	}
@@ -207,8 +208,8 @@ public class XpGlobesOverlay extends Overlay
 
 	private Ellipse2D drawEllipse(Graphics2D graphics, int x, int y)
 	{
-		graphics.setColor(config.progressOrbBackgroundColor());
-		Ellipse2D ellipse = new Ellipse2D.Double(x, y, config.xpOrbSize(), config.xpOrbSize());
+		graphics.setColor(plugin.getProgressOrbBackgroundColor());
+		Ellipse2D ellipse = new Ellipse2D.Double(x, y, plugin.getXpOrbSize(), plugin.getXpOrbSize());
 		graphics.fill(ellipse);
 		graphics.draw(ellipse);
 		return ellipse;
@@ -225,8 +226,8 @@ public class XpGlobesOverlay extends Overlay
 
 		graphics.drawImage(
 			skillImage,
-			x + (config.xpOrbSize() / 2) - (skillImage.getWidth() / 2),
-			y + (config.xpOrbSize() / 2) - (skillImage.getHeight() / 2),
+			x + (plugin.getXpOrbSize() / 2) - (skillImage.getWidth() / 2),
+			y + (plugin.getXpOrbSize() / 2) - (skillImage.getHeight() / 2),
 			null
 		);
 	}
@@ -234,8 +235,8 @@ public class XpGlobesOverlay extends Overlay
 	private void drawTooltip(Graphics2D graphics, XpGlobe mouseOverSkill, int goalXp, Ellipse2D drawnGlobe)
 	{
 		//draw tooltip under the globe of the mouse location
-		int x = (int) drawnGlobe.getX() - (TOOLTIP_RECT_SIZE_X / 2) + (config.xpOrbSize() / 2);
-		int y = (int) drawnGlobe.getY() + config.xpOrbSize() + 10;
+		int x = (int) drawnGlobe.getX() - (TOOLTIP_RECT_SIZE_X / 2) + (plugin.getXpOrbSize() / 2);
+		int y = (int) drawnGlobe.getY() + plugin.getXpOrbSize() + 10;
 
 		// reset the timer on XpGlobe to prevent it from disappearing while hovered over it
 		mouseOverSkill.setTime(Instant.now());
@@ -279,7 +280,7 @@ public class XpGlobesOverlay extends Overlay
 				tableComponent.addRow(ColorUtil.prependColorTag("XP per hour:", Color.ORANGE), xpHrString);
 			}
 			
-			if (config.enableTimeToLevel())
+			if (plugin.isEnableTimeToLevel())
 			{
 				String timeLeft = xpTrackerService.getTimeTillGoal(mouseOverSkill.getSkill());
 				tableComponent.addRow(ColorUtil.prependColorTag("TimeLeft:", Color.ORANGE), timeLeft);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesPlugin.java
index 2771c986f5..591543e137 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesPlugin.java
@@ -25,16 +25,20 @@
 package net.runelite.client.plugins.xpglobes;
 
 import com.google.inject.Provides;
+import java.awt.Color;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
 import lombok.Getter;
 import net.runelite.api.Client;
 import net.runelite.api.Experience;
 import net.runelite.api.Skill;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.ExperienceChanged;
 import net.runelite.api.events.GameStateChanged;
 import net.runelite.client.config.ConfigManager;
@@ -52,6 +56,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	tags = {"experience", "levels", "overlay"},
 	enabledByDefault = false
 )
+@Singleton
 @PluginDependency(XpTrackerPlugin.class)
 public class XpGlobesPlugin extends Plugin
 {
@@ -74,6 +79,25 @@ public class XpGlobesPlugin extends Plugin
 	@Inject
 	private XpGlobesOverlay overlay;
 
+	@Getter(AccessLevel.PACKAGE)
+	private boolean enableTooltips;
+	private boolean hideMaxed;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean enableTimeToLevel;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean enableCustomArcColor;
+	@Getter(AccessLevel.PACKAGE)
+	private Color progressArcColor;
+	@Getter(AccessLevel.PACKAGE)
+	private Color progressOrbOutLineColor;
+	@Getter(AccessLevel.PACKAGE)
+	private Color progressOrbBackgroundColor;
+	@Getter(AccessLevel.PACKAGE)
+	private int progressArcStrokeWidth;
+	@Getter(AccessLevel.PACKAGE)
+	private int xpOrbSize;
+	private int xpOrbDuration;
+
 	@Provides
 	XpGlobesConfig getConfig(ConfigManager configManager)
 	{
@@ -83,6 +107,7 @@ public class XpGlobesPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
+		updateConfig();
 		overlayManager.add(overlay);
 	}
 
@@ -107,7 +132,7 @@ public class XpGlobesPlugin extends Plugin
 			return;
 		}
 
-		if (config.hideMaxed() && currentLevel >= Experience.MAX_REAL_LEVEL)
+		if (this.hideMaxed && currentLevel >= Experience.MAX_REAL_LEVEL)
 		{
 			return;
 		}
@@ -156,7 +181,7 @@ public class XpGlobesPlugin extends Plugin
 			{
 				XpGlobe globe = it.next();
 				Instant globeCreationTime = globe.getTime();
-				if (currentTime.isBefore(globeCreationTime.plusSeconds(config.xpOrbDuration())))
+				if (currentTime.isBefore(globeCreationTime.plusSeconds(this.xpOrbDuration)))
 				{
 					//if a globe is not expired, stop checking newer globes
 					return;
@@ -184,4 +209,31 @@ public class XpGlobesPlugin extends Plugin
 		}
 	}
 
+
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (!event.getGroup().equals("xpglobes"))
+		{
+			return;
+		}
+
+		updateConfig();
+	}
+
+	private void updateConfig()
+	{
+		this.enableTooltips = config.enableTooltips();
+		this.hideMaxed = config.hideMaxed();
+		this.enableTimeToLevel = config.enableTimeToLevel();
+		this.enableCustomArcColor = config.enableCustomArcColor();
+		this.progressArcColor = config.progressArcColor();
+		this.progressOrbOutLineColor = config.progressOrbOutLineColor();
+		this.progressOrbBackgroundColor = config.progressOrbBackgroundColor();
+		this.progressArcStrokeWidth = config.progressArcStrokeWidth();
+		this.xpOrbSize = config.xpOrbSize();
+		this.xpOrbDuration = config.xpOrbDuration();
+
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpInfoBox.java b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpInfoBox.java
index d0d157c480..4b6142b1d8 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpInfoBox.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpInfoBox.java
@@ -75,6 +75,7 @@ class XpInfoBox extends JPanel
 
 	// Instance members
 	private final JPanel panel;
+	private final XpTrackerPlugin plugin;
 
 	@Getter(AccessLevel.PACKAGE)
 	private final Skill skill;
@@ -98,8 +99,6 @@ class XpInfoBox extends JPanel
 	private final JMenuItem pauseSkill = new JMenuItem("Pause");
 	private final JMenuItem canvasItem = new JMenuItem(ADD_STATE);
 
-	private final XpTrackerConfig xpTrackerConfig;
-
 	private boolean paused = false;
 
 	private Style style = Style.FULL;
@@ -110,9 +109,9 @@ class XpInfoBox extends JPanel
 		SIMPLE
 	}
 
-	XpInfoBox(XpTrackerPlugin xpTrackerPlugin, XpTrackerConfig xpTrackerConfig, Client client, JPanel panel, Skill skill, SkillIconManager iconManager)
+	XpInfoBox(XpTrackerPlugin xpTrackerPlugin, Client client, JPanel panel, Skill skill, SkillIconManager iconManager)
 	{
-		this.xpTrackerConfig = xpTrackerConfig;
+		this.plugin = xpTrackerPlugin;
 		this.panel = panel;
 		this.skill = skill;
 
@@ -276,7 +275,7 @@ class XpInfoBox extends JPanel
 				: "Lvl. " + xpSnapshotSingle.getEndLevel());
 
 			// Add intermediate level positions to progressBar
-			if (xpTrackerConfig.showIntermediateLevels() && xpSnapshotSingle.getEndLevel() - xpSnapshotSingle.getStartLevel() > 1)
+			if (plugin.isShowIntermediateLevels() && xpSnapshotSingle.getEndLevel() - xpSnapshotSingle.getStartLevel() > 1)
 			{
 				final List<Integer> positions = new ArrayList<>();
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpInfoBoxOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpInfoBoxOverlay.java
index 2f07d07389..e31fa0a13b 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpInfoBoxOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpInfoBoxOverlay.java
@@ -59,7 +59,6 @@ class XpInfoBoxOverlay extends Overlay
 	private final PanelComponent panel = new PanelComponent();
 	private final PanelComponent iconXpSplitPanel = new PanelComponent();
 	private final XpTrackerPlugin plugin;
-	private final XpTrackerConfig config;
 
 	@Getter(AccessLevel.PACKAGE)
 	private final Skill skill;
@@ -67,13 +66,11 @@ class XpInfoBoxOverlay extends Overlay
 
 	XpInfoBoxOverlay(
 		XpTrackerPlugin plugin,
-		XpTrackerConfig config,
 		Skill skill,
 		BufferedImage icon)
 	{
 		super(plugin);
 		this.plugin = plugin;
-		this.config = config;
 		this.skill = skill;
 		this.icon = icon;
 		panel.setBorder(new Rectangle(BORDER_SIZE, BORDER_SIZE, BORDER_SIZE, BORDER_SIZE));
@@ -99,7 +96,7 @@ class XpInfoBoxOverlay extends Overlay
 		final String leftStr;
 		final int rightNum;
 
-		switch (config.onScreenDisplayMode())
+		switch (plugin.getOnScreenDisplayMode())
 		{
 			case ACTIONS_DONE:
 				leftStr = snapshot.getActionType().getLabel() + " Done";
@@ -128,7 +125,7 @@ class XpInfoBoxOverlay extends Overlay
 		final String bottemLeftStr;
 		final int bottomRightNum;
 
-		switch (config.onScreenDisplayModeBottom())
+		switch (plugin.getOnScreenDisplayModeBottom())
 		{
 			case ACTIONS_HOUR:
 				bottemLeftStr = snapshot.getActionType().getLabel() + "/Hour";
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpPanel.java
index d716f12630..f456958292 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpPanel.java
@@ -62,7 +62,7 @@ class XpPanel extends PluginPanel
 	/* This displays the "No exp gained" text */
 	private final PluginErrorPanel errorPanel = new PluginErrorPanel();
 
-	XpPanel(XpTrackerPlugin xpTrackerPlugin, XpTrackerConfig xpTrackerConfig, Client client, SkillIconManager iconManager)
+	XpPanel(XpTrackerPlugin xpTrackerPlugin, Client client, SkillIconManager iconManager)
 	{
 		super();
 
@@ -134,7 +134,7 @@ class XpPanel extends PluginPanel
 			{
 				break;
 			}
-			infoBoxes.put(skill, new XpInfoBox(xpTrackerPlugin, xpTrackerConfig, client, infoBoxPanel, skill, iconManager));
+			infoBoxes.put(skill, new XpInfoBox(xpTrackerPlugin, client, infoBoxPanel, skill, iconManager));
 		}
 
 		errorPanel.setContent("Exp trackers", "You have not gained experience yet.");
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java
index 68663a896f..f592cdc166 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java
@@ -35,6 +35,8 @@ import java.util.EnumSet;
 import java.util.List;
 import java.util.Objects;
 import javax.inject.Inject;
+import lombok.AccessLevel;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Actor;
 import net.runelite.api.Client;
@@ -45,6 +47,7 @@ import net.runelite.api.Player;
 import net.runelite.api.Skill;
 import net.runelite.api.VarPlayer;
 import net.runelite.api.WorldType;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.ExperienceChanged;
 import net.runelite.api.events.GameStateChanged;
 import net.runelite.api.events.GameTick;
@@ -114,6 +117,16 @@ public class XpTrackerPlugin extends Plugin
 	private final XpState xpState = new XpState();
 	private final XpPauseState xpPauseState = new XpPauseState();
 
+	private boolean hideMaxed;
+	private boolean pauseOnLogout;
+	@Getter(AccessLevel.PACKAGE)
+	private boolean showIntermediateLevels;
+	private int pauseSkillAfter;
+	@Getter(AccessLevel.PACKAGE)
+	private XpTrackerConfig.OnScreenDisplayMode onScreenDisplayMode;
+	@Getter(AccessLevel.PACKAGE)
+	private XpTrackerConfig.OnScreenDisplayModeBottom onScreenDisplayModeBottom;
+
 	@Provides
 	XpTrackerConfig provideConfig(ConfigManager configManager)
 	{
@@ -129,7 +142,9 @@ public class XpTrackerPlugin extends Plugin
 	@Override
 	protected void startUp() throws Exception
 	{
-		xpPanel = new XpPanel(this, xpTrackerConfig, client, skillIconManager);
+		updateConfig();
+
+		xpPanel = new XpPanel(this, client, skillIconManager);
 
 		final BufferedImage icon = ImageUtil.getResourceStreamFromClass(getClass(), "/skill_icons/overall.png");
 
@@ -221,7 +236,7 @@ public class XpTrackerPlugin extends Plugin
 	void addOverlay(Skill skill)
 	{
 		removeOverlay(skill);
-		overlayManager.add(new XpInfoBoxOverlay(this, xpTrackerConfig, skill, skillIconManager.getSkillImage(skill)));
+		overlayManager.add(new XpInfoBoxOverlay(this, skill, skillIconManager.getSkillImage(skill)));
 	}
 
 	/**
@@ -314,7 +329,7 @@ public class XpTrackerPlugin extends Plugin
 		final int startGoalXp = startGoal != null ? client.getVar(startGoal) : -1;
 		final int endGoalXp = endGoal != null ? client.getVar(endGoal) : -1;
 
-		if (xpTrackerConfig.hideMaxed() && currentLevel >= Experience.MAX_REAL_LEVEL)
+		if (this.hideMaxed && currentLevel >= Experience.MAX_REAL_LEVEL)
 		{
 			return;
 		}
@@ -511,10 +526,10 @@ public class XpTrackerPlugin extends Plugin
 				skillExperience = client.getSkillExperience(skill);
 			}
 
-			xpPauseState.tickXp(skill, skillExperience, xpTrackerConfig.pauseSkillAfter());
+			xpPauseState.tickXp(skill, skillExperience, this.pauseSkillAfter);
 		}
 
-		xpPauseState.tickLogout(xpTrackerConfig.pauseOnLogout(), !GameState.LOGIN_SCREEN.equals(client.getGameState()));
+		xpPauseState.tickLogout(this.pauseOnLogout, !GameState.LOGIN_SCREEN.equals(client.getGameState()));
 
 		if (lastTickMillis == 0)
 		{
@@ -563,4 +578,25 @@ public class XpTrackerPlugin extends Plugin
 			pauseSkill(skill, pause);
 		}
 	}
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (!event.getGroup().equals("xpTracker"))
+		{
+			return;
+		}
+
+		updateConfig();
+	}
+
+	private void updateConfig()
+	{
+		this.hideMaxed = xpTrackerConfig.hideMaxed();
+		this.pauseOnLogout = xpTrackerConfig.pauseOnLogout();
+		this.showIntermediateLevels = xpTrackerConfig.showIntermediateLevels();
+		this.pauseSkillAfter = xpTrackerConfig.pauseSkillAfter();
+		this.onScreenDisplayMode = xpTrackerConfig.onScreenDisplayMode();
+		this.onScreenDisplayModeBottom = xpTrackerConfig.onScreenDisplayModeBottom();
+	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ImagePanelComponent.java b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ImagePanelComponent.java
index dae0a1e354..bb7bf6a80e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ImagePanelComponent.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ImagePanelComponent.java
@@ -36,10 +36,13 @@ import java.awt.Point;
 import java.awt.Rectangle;
 import java.awt.image.BufferedImage;
 import javax.annotation.Nullable;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
 import lombok.Setter;
 import net.runelite.client.ui.overlay.RenderableEntity;
 import net.runelite.client.ui.overlay.components.BackgroundComponent;
 
+@Singleton
 public class ImagePanelComponent implements RenderableEntity
 {
 	private static final int TOP_BORDER = 3;
@@ -47,20 +50,20 @@ public class ImagePanelComponent implements RenderableEntity
 	private static final int BOTTOM_BORDER = 6;
 	private static final int SEPARATOR = 4;
 
-	@Setter
+	@Setter(AccessLevel.PUBLIC)
 	@Nullable
 	private String title;
 
-	@Setter
+	@Setter(AccessLevel.PACKAGE)
 	private Color titleColor = Color.WHITE;
 
-	@Setter
+	@Setter(AccessLevel.PUBLIC)
 	private Color backgroundColor = new Color(70, 61, 50, 156);
 
-	@Setter
+	@Setter(AccessLevel.PUBLIC)
 	private BufferedImage image;
 
-	@Setter
+	@Setter(AccessLevel.PACKAGE)
 	private Point position = new Point();
 
 	@Override
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/TextComponent.java b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/TextComponent.java
index 043916c147..ed0e737ef2 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/TextComponent.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/TextComponent.java
@@ -32,18 +32,19 @@ import java.awt.Dimension;
 import java.awt.FontMetrics;
 import java.awt.Graphics2D;
 import java.awt.Point;
+import lombok.AccessLevel;
 import lombok.Setter;
 import net.runelite.client.ui.overlay.RenderableEntity;
 
 public class TextComponent implements RenderableEntity
 {
-	@Setter
+	@Setter(AccessLevel.PACKAGE)
 	private String text;
 
-	@Setter
+	@Setter(AccessLevel.PACKAGE)
 	private Point position = new Point();
 
-	@Setter
+	@Setter(AccessLevel.PACKAGE)
 	private Color color = Color.WHITE;
 
 	@Override
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahConfig.java
index 2911317a38..539a15cbc8 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahConfig.java
@@ -36,19 +36,9 @@ import net.runelite.client.config.ConfigItem;
 public interface ZulrahConfig extends Config
 {
 	@ConfigItem(
-		keyName = "enabled",
-		name = "Enabled",
-		description = "Configures whether or not zulrah overlays are displayed"
-	)
-	default boolean enabled()
-	{
-		return true;
-	}
-
-	@ConfigItem(
-			keyName = "sounds",
-			name = "Sounds Enabled",
-			description = "Configures whether client sounds are enabled for zulrah"
+		keyName = "sounds",
+		name = "Sounds Enabled",
+		description = "Configures whether client sounds are enabled for zulrah"
 	)
 	default boolean sounds()
 	{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahInstance.java b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahInstance.java
index e701cd65f6..fdbff52358 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahInstance.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahInstance.java
@@ -65,7 +65,7 @@ public class ZulrahInstance
 	private int stage;
 	private ZulrahPhase phase;
 
-	public ZulrahInstance(NPC zulrah)
+	ZulrahInstance(final NPC zulrah)
 	{
 		this.startLocation = zulrah.getLocalLocation();
 	}
@@ -85,12 +85,12 @@ public class ZulrahInstance
 		this.pattern = pattern;
 	}
 
-	public int getStage()
+	int getStage()
 	{
 		return stage;
 	}
 
-	public void nextStage()
+	void nextStage()
 	{
 		++stage;
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahPlugin.java
index 366d636e94..82deb0d766 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahPlugin.java
@@ -29,6 +29,8 @@ package net.runelite.client.plugins.zulrah;
 
 import com.google.inject.Provides;
 import javax.inject.Inject;
+import javax.inject.Singleton;
+import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Actor;
@@ -68,6 +70,7 @@ import net.runelite.client.ui.overlay.OverlayManager;
 	enabledByDefault = false
 )
 @Slf4j
+@Singleton
 public class ZulrahPlugin extends Plugin
 {
 	private static final ZulrahPattern[] patterns = new ZulrahPattern[]
@@ -77,7 +80,7 @@ public class ZulrahPlugin extends Plugin
 			new ZulrahPatternC(),
 			new ZulrahPatternD()
 		};
-	@Getter
+	@Getter(AccessLevel.PACKAGE)
 	private NPC zulrah;
 	@Inject
 	private Client client;
@@ -126,7 +129,7 @@ public class ZulrahPlugin extends Plugin
 	@Subscribe
 	public void onGameTick(GameTick event)
 	{
-		if (!config.enabled() || client.getGameState() != GameState.LOGGED_IN)
+		if (client.getGameState() != GameState.LOGGED_IN)
 		{
 			return;
 		}
@@ -209,26 +212,20 @@ public class ZulrahPlugin extends Plugin
 		}
 
 		Actor actor = event.getActor();
-		if (config.sounds())
+		if (config.sounds() && zulrah != null && zulrah.equals(actor) && zulrah.getAnimation() == AnimationID.ZULRAH_PHASE)
 		{
-			if (zulrah == actor)
-			{
-				if (zulrah.getAnimation() == AnimationID.ZULRAH_PHASE)
-				{
-					Prayer prayer = instance.getNextPhase().getPrayer();
+			Prayer prayer = instance.getNextPhase().getPrayer();
 
-					if (prayer != null)
-					{
-						switch (prayer)
-						{
-							case PROTECT_FROM_MAGIC:
-								soundManager.playSound(Sound.PRAY_MAGIC);
-								break;
-							case PROTECT_FROM_MISSILES:
-								soundManager.playSound(Sound.PRAY_RANGED);
-								break;
-						}
-					}
+			if (prayer != null)
+			{
+				switch (prayer)
+				{
+					case PROTECT_FROM_MAGIC:
+						soundManager.playSound(Sound.PRAY_MAGIC);
+						break;
+					case PROTECT_FROM_MISSILES:
+						soundManager.playSound(Sound.PRAY_RANGED);
+						break;
 				}
 			}
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahCurrentPhaseOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahCurrentPhaseOverlay.java
index 2d7bbbcff1..26c37887e8 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahCurrentPhaseOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahCurrentPhaseOverlay.java
@@ -31,6 +31,7 @@ import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.client.plugins.zulrah.ImagePanelComponent;
 import net.runelite.client.plugins.zulrah.ZulrahInstance;
 import net.runelite.client.plugins.zulrah.ZulrahPlugin;
@@ -38,15 +39,14 @@ import net.runelite.client.plugins.zulrah.phase.ZulrahPhase;
 import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayPriority;
-import net.runelite.client.ui.overlay.components.PanelComponent;
 
+@Singleton
 public class ZulrahCurrentPhaseOverlay extends Overlay
 {
 	private final ZulrahPlugin plugin;
-	private final PanelComponent imagePanelComponent = new PanelComponent();
 
 	@Inject
-	ZulrahCurrentPhaseOverlay(ZulrahPlugin plugin)
+	ZulrahCurrentPhaseOverlay(final ZulrahPlugin plugin)
 	{
 		setPosition(OverlayPosition.BOTTOM_RIGHT);
 		setPriority(OverlayPriority.HIGH);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahImageManager.java b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahImageManager.java
index c64736c352..b181acc041 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahImageManager.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahImageManager.java
@@ -34,13 +34,13 @@ import net.runelite.client.plugins.zulrah.phase.ZulrahType;
 import net.runelite.client.util.ImageUtil;
 
 @Slf4j
-public class ZulrahImageManager
+class ZulrahImageManager
 {
 	private static final BufferedImage[] zulrahBufferedImages = new BufferedImage[3];
 	private static final BufferedImage[] smallZulrahBufferedImages = new BufferedImage[3];
 	private static final BufferedImage[] prayerBufferedImages = new BufferedImage[2];
 
-	public static BufferedImage getZulrahBufferedImage(ZulrahType type)
+	static BufferedImage getZulrahBufferedImage(ZulrahType type)
 	{
 		switch (type)
 		{
@@ -66,7 +66,7 @@ public class ZulrahImageManager
 		return null;
 	}
 
-	public static BufferedImage getSmallZulrahBufferedImage(ZulrahType type)
+	static BufferedImage getSmallZulrahBufferedImage(ZulrahType type)
 	{
 		switch (type)
 		{
@@ -92,7 +92,7 @@ public class ZulrahImageManager
 		return null;
 	}
 
-	public static BufferedImage getProtectionPrayerBufferedImage(Prayer prayer)
+	static BufferedImage getProtectionPrayerBufferedImage(Prayer prayer)
 	{
 		switch (prayer)
 		{
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahNextPhaseOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahNextPhaseOverlay.java
index 509631e9b8..ca9903302d 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahNextPhaseOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahNextPhaseOverlay.java
@@ -31,6 +31,7 @@ import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import net.runelite.client.plugins.zulrah.ImagePanelComponent;
 import net.runelite.client.plugins.zulrah.ZulrahInstance;
 import net.runelite.client.plugins.zulrah.ZulrahPlugin;
@@ -39,12 +40,13 @@ import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayPriority;
 
+@Singleton
 public class ZulrahNextPhaseOverlay extends Overlay
 {
 	private final ZulrahPlugin plugin;
 
 	@Inject
-	ZulrahNextPhaseOverlay(ZulrahPlugin plugin)
+	ZulrahNextPhaseOverlay(final ZulrahPlugin plugin)
 	{
 		setPosition(OverlayPosition.BOTTOM_RIGHT);
 		setPriority(OverlayPriority.HIGH);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahOverlay.java
index 93ce00d4bc..3d9e5eac0e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahOverlay.java
@@ -31,11 +31,11 @@ import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.FontMetrics;
 import java.awt.Graphics2D;
-import java.awt.Image;
 import java.awt.Polygon;
 import java.awt.image.BufferedImage;
 import javax.annotation.Nullable;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
 import net.runelite.api.Perspective;
@@ -48,6 +48,7 @@ import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayPosition;
 
 @Slf4j
+@Singleton
 public class ZulrahOverlay extends Overlay
 {
 	private static final Color TILE_BORDER_COLOR = new Color(0, 0, 0, 100);
@@ -57,7 +58,7 @@ public class ZulrahOverlay extends Overlay
 	private final ZulrahPlugin plugin;
 
 	@Inject
-	ZulrahOverlay(@Nullable Client client, ZulrahPlugin plugin)
+	ZulrahOverlay(final @Nullable Client client, final ZulrahPlugin plugin)
 	{
 		setPosition(OverlayPosition.DYNAMIC);
 		this.client = client;
@@ -121,10 +122,10 @@ public class ZulrahOverlay extends Overlay
 		}
 		if (nextPhase.isJad())
 		{
-			Image jadPrayerImg = ZulrahImageManager.getProtectionPrayerBufferedImage(nextPhase.getPrayer());
+			BufferedImage jadPrayerImg = ZulrahImageManager.getProtectionPrayerBufferedImage(nextPhase.getPrayer());
 			if (jadPrayerImg != null)
 			{
-				Point imageLoc = Perspective.getCanvasImageLocation(client, localTile, (BufferedImage) jadPrayerImg, 0);
+				Point imageLoc = Perspective.getCanvasImageLocation(client, localTile, jadPrayerImg, 0);
 				if (imageLoc != null)
 				{
 					graphics.drawImage(jadPrayerImg, imageLoc.getX(), imageLoc.getY(), null);
@@ -165,10 +166,10 @@ public class ZulrahOverlay extends Overlay
 
 		if (phase.isJad())
 		{
-			Image jadPrayerImg = ZulrahImageManager.getProtectionPrayerBufferedImage(phase.getPrayer());
+			BufferedImage jadPrayerImg = ZulrahImageManager.getProtectionPrayerBufferedImage(phase.getPrayer());
 			if (jadPrayerImg != null)
 			{
-				Point imageLoc = Perspective.getCanvasImageLocation(client, localTile, (BufferedImage) jadPrayerImg, 0);
+				Point imageLoc = Perspective.getCanvasImageLocation(client, localTile, jadPrayerImg, 0);
 				if (imageLoc != null)
 				{
 					graphics.drawImage(jadPrayerImg, imageLoc.getX(), imageLoc.getY(), null);
@@ -187,15 +188,24 @@ public class ZulrahOverlay extends Overlay
 		Point zulrahMinimapPoint = Perspective.localToMinimap(client, zulrahLocalTile);
 		Color color = phase.getColor();
 		graphics.setColor(color);
-		graphics.fillOval(zulrahMinimapPoint.getX() - 2, zulrahMinimapPoint.getY() - 2, 4, 4);
+		if (zulrahMinimapPoint != null)
+		{
+			graphics.fillOval(zulrahMinimapPoint.getX() - 2, zulrahMinimapPoint.getY() - 2, 4, 4);
+		}
 		graphics.setColor(TILE_BORDER_COLOR);
 		graphics.setStroke(new BasicStroke(1));
-		graphics.drawOval(zulrahMinimapPoint.getX() - 2, zulrahMinimapPoint.getY() - 2, 4, 4);
+		if (zulrahMinimapPoint != null)
+		{
+			graphics.drawOval(zulrahMinimapPoint.getX() - 2, zulrahMinimapPoint.getY() - 2, 4, 4);
+		}
 		if (next)
 		{
 			graphics.setColor(NEXT_TEXT_COLOR);
 			FontMetrics fm = graphics.getFontMetrics();
-			graphics.drawString("Next", zulrahMinimapPoint.getX() - fm.stringWidth("Next") / 2, zulrahMinimapPoint.getY() - 2);
+			if (zulrahMinimapPoint != null)
+			{
+				graphics.drawString("Next", zulrahMinimapPoint.getX() - fm.stringWidth("Next") / 2, zulrahMinimapPoint.getY() - 2);
+			}
 		}
 	}
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahPrayerOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahPrayerOverlay.java
index abcd234034..cd3315f1fe 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahPrayerOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/overlays/ZulrahPrayerOverlay.java
@@ -31,6 +31,7 @@ import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
 import javax.annotation.Nullable;
 import javax.inject.Inject;
+import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
 import net.runelite.api.Prayer;
@@ -42,6 +43,7 @@ import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayPriority;
 
+@Singleton
 @Slf4j
 public class ZulrahPrayerOverlay extends Overlay
 {
@@ -49,7 +51,7 @@ public class ZulrahPrayerOverlay extends Overlay
 	private final ZulrahPlugin plugin;
 
 	@Inject
-	ZulrahPrayerOverlay(@Nullable Client client, ZulrahPlugin plugin)
+	ZulrahPrayerOverlay(final @Nullable Client client, final ZulrahPlugin plugin)
 	{
 		setPosition(OverlayPosition.BOTTOM_RIGHT);
 		setPriority(OverlayPriority.MED);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/patterns/ZulrahPattern.java b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/patterns/ZulrahPattern.java
index 04cd35e278..74f89b05d4 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/patterns/ZulrahPattern.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/patterns/ZulrahPattern.java
@@ -39,12 +39,12 @@ public abstract class ZulrahPattern
 {
 	private final List<ZulrahPhase> pattern = new ArrayList<>();
 
-	protected final void add(ZulrahLocation loc, ZulrahType type, StandLocation standLocation, Prayer prayer)
+	final void add(ZulrahLocation loc, ZulrahType type, StandLocation standLocation, Prayer prayer)
 	{
 		add(loc, type, standLocation, false, prayer);
 	}
 
-	protected final void addJad(ZulrahLocation loc, ZulrahType type, StandLocation standLocation, Prayer prayer)
+	final void addJad(ZulrahLocation loc, ZulrahType type, StandLocation standLocation, Prayer prayer)
 	{
 		add(loc, type, standLocation, true, prayer);
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/phase/ZulrahPhase.java b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/phase/ZulrahPhase.java
index c1fc54b7da..fdc9b2b4b3 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/phase/ZulrahPhase.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/phase/ZulrahPhase.java
@@ -124,11 +124,6 @@ public class ZulrahPhase
 		return startTile;
 	}
 
-	public ZulrahLocation getZulrahLocation()
-	{
-		return zulrahLocation;
-	}
-
 	public ZulrahType getType()
 	{
 		return type;
diff --git a/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java b/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java
index 1024da016f..e39b76716d 100644
--- a/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java
+++ b/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java
@@ -40,7 +40,7 @@ import lombok.extern.slf4j.Slf4j;
 public class ClientLoader
 {
 	private final ClientConfigLoader clientConfigLoader;
-	private ClientUpdateCheckMode updateCheckMode;
+	private final ClientUpdateCheckMode updateCheckMode;
 	public static boolean useLocalInjected = false;
 
 	@Inject
@@ -69,14 +69,16 @@ public class ClientLoader
 					return null;
 			}
 		}
-		catch (IOException | ClassNotFoundException | InstantiationException | IllegalAccessException e)
+		catch (IOException | InstantiationException | IllegalAccessException e)
 		{
-			if (e instanceof ClassNotFoundException)
-			{
-				log.error("Unable to load client - class not found. This means you"
-					+ " are not running RuneLite with Maven as the injected client"
-					+ " is not in your classpath.");
-			}
+			log.error("Error loading RS!", e);
+			return null;
+		}
+		catch (ClassNotFoundException e)
+		{
+			log.error("Unable to load client - class not found. This means you"
+				+ " are not running RuneLite with Maven as the injected client"
+				+ " is not in your classpath.");
 
 			log.error("Error loading RS!", e);
 			return null;
diff --git a/runelite-client/src/main/java/net/runelite/client/rs/mixins/MixinRunner.java b/runelite-client/src/main/java/net/runelite/client/rs/mixins/MixinRunner.java
deleted file mode 100644
index b43179e044..0000000000
--- a/runelite-client/src/main/java/net/runelite/client/rs/mixins/MixinRunner.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- *  Copyright (c) 2019, ThatGamerBlue <thatgamerblue@gmail.com>
- *  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.rs.mixins;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Map;
-import lombok.RequiredArgsConstructor;
-import net.runelite.client.rs.mixins.transformers.DoNothingTransformer;
-import net.runelite.client.rs.mixins.transformers.SanityChecker;
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.commons.ClassRemapper;
-import org.objectweb.asm.commons.Remapper;
-import org.objectweb.asm.tree.ClassNode;
-
-@RequiredArgsConstructor
-public class MixinRunner
-{
-
-	private final Map<String, byte[]> classes;
-	private final Map<String, byte[]> patches;
-
-	public Map<String, byte[]> run()
-		throws NoSuchMethodException, InstantiationException, IllegalAccessException, InvocationTargetException
-	{
-		//	runVisitor(InterfaceTransformer.class);
-		//	runVisitor(OverwriteTransformer.class);
-		//	runSanityChecker(OverwriteSanityCheck.class);
-		//	runVisitor(InjectTransformer.class);
-		//	runVisitor(AppendTransformer.class); // append has to come before prepend or append does nothing
-		// (test method:    Projectile.rl$$init()V    )
-		//	runVisitor(PrependTransformer.class);
-		//	runRemapper(ProtectTransformer.class);
-
-		//	recalcMaxes();
-		return classes;
-	}
-
-	private void runRemapper(Class<? extends Remapper> clazz) throws IllegalAccessException, InstantiationException
-	{
-		for (Map.Entry<String, byte[]> entry : classes.entrySet())
-		{
-			if (entry.getKey().contains("META-INF"))
-			{
-				continue;
-			}
-			Remapper inst = clazz.newInstance();
-			ClassReader cr = new ClassReader(entry.getValue());
-			ClassWriter cw = new ClassWriter(cr, 1);
-			cr.accept(new ClassRemapper(cw, inst), 0);
-
-			entry.setValue(cw.toByteArray());
-		}
-	}
-
-	private void runVisitor(Class<? extends ClassVisitor> clazz)
-		throws IllegalAccessException, NoSuchMethodException, InvocationTargetException, InstantiationException
-	{
-		runVisitor(clazz, 1);
-	}
-
-	private void runVisitor(Class<? extends ClassVisitor> clazz, int flags)
-		throws IllegalAccessException, NoSuchMethodException, InvocationTargetException, InstantiationException
-	{
-		for (Map.Entry<String, byte[]> entry : classes.entrySet())
-		{
-			if (entry.getKey().contains("META-INF"))
-			{
-				continue;
-			}
-			ClassReader cr = new ClassReader(entry.getValue());
-			ClassWriter cw = new ClassWriter(cr, flags);
-			byte[] patch = patches.getOrDefault(entry.getKey(), null);
-			ClassNode node = new ClassNode();
-			cr.accept(node, 0);
-			ClassVisitor inst = clazz.getConstructor(ClassVisitor.class, byte[].class, ClassNode.class).newInstance(cw,
-				patch, node);
-			cr.accept(inst, 0);
-
-			entry.setValue(cw.toByteArray());
-		}
-	}
-
-	private void runSanityChecker(Class<? extends SanityChecker> clazz)
-		throws IllegalAccessException, NoSuchMethodException, InvocationTargetException, InstantiationException
-	{
-		runSanityChecker(clazz, 1);
-	}
-
-	private void runSanityChecker(Class<? extends SanityChecker> clazz, int flags)
-		throws IllegalAccessException, NoSuchMethodException, InvocationTargetException, InstantiationException
-	{
-		for (Map.Entry<String, byte[]> entry : patches.entrySet())
-		{
-			ClassReader cr = new ClassReader(entry.getValue());
-			ClassWriter cw = new ClassWriter(cr, flags);
-			ClassNode node = new ClassNode();
-			cr.accept(node, 0);
-			SanityChecker inst = clazz.getConstructor(ClassVisitor.class, ClassNode.class).newInstance(cw, node);
-			cr.accept(inst, 0);
-		}
-	}
-
-	private void recalcMaxes()
-		throws InvocationTargetException, NoSuchMethodException, InstantiationException, IllegalAccessException
-	{
-		runVisitor(DoNothingTransformer.class, 3);
-	}
-
-}
diff --git a/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/AppendTransformer.java b/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/AppendTransformer.java
deleted file mode 100644
index 5ee15c84c8..0000000000
--- a/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/AppendTransformer.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- *  Copyright (c) 2019, ThatGamerBlue <thatgamerblue@gmail.com>
- *  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.rs.mixins.transformers;
-
-import lombok.extern.slf4j.Slf4j;
-import net.runelite.client.util.RefUtils;
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.tree.AbstractInsnNode;
-import org.objectweb.asm.tree.ClassNode;
-import org.objectweb.asm.tree.LabelNode;
-import org.objectweb.asm.tree.LineNumberNode;
-import org.objectweb.asm.tree.MethodNode;
-
-@Slf4j
-public class AppendTransformer extends ClassVisitor implements Opcodes
-{
-
-	private final byte[] patch;
-	private String className;
-	private ClassNode classNode;
-
-	public AppendTransformer(ClassVisitor classVisitor, byte[] patch, ClassNode node)
-	{
-		super(Opcodes.ASM6, classVisitor);
-		this.patch = patch;
-		this.classNode = node;
-	}
-
-	@Override
-	public void visit(int version, int access, String name, String signature, String superName, String[] interfaces)
-	{
-		className = name;
-		super.visit(version, access, name, signature, superName, interfaces);
-	}
-
-	@Override
-	public MethodVisitor visitMethod(int access, String name, String descriptor, String signature, String[] exceptions)
-	{
-		if (patch == null)
-		{
-			return super.visitMethod(access, name, descriptor, signature, exceptions);
-		}
-		ClassReader cr = new ClassReader(patch);
-		ClassNode patchNode = new ClassNode(Opcodes.ASM6);
-		cr.accept(patchNode, 0);
-		for (Object obj : patchNode.methods)
-		{
-			MethodNode patchMethod = (MethodNode) obj;
-			if ((patchMethod.access == access && patchMethod.name.equals("append$" + name) &&
-				patchMethod.desc.equals(descriptor)) &&
-				RefUtils.checkAnnotation(patchMethod, "Append"))
-			{
-				MethodVisitor mv =
-					new MethodVisitor(Opcodes.ASM6, super.visitMethod(access, name, descriptor, signature,
-						exceptions))
-					{
-					};
-				mv.visitCode();
-
-				for (Object obj2 : classNode.methods)
-				{
-					MethodNode classMethod = (MethodNode) obj2;
-					if (classMethod.access == access && classMethod.name.equals(name) &&
-						classMethod.desc.equals(descriptor))
-					{
-						AbstractInsnNode inode = classMethod.instructions.getLast();
-
-						while (inode instanceof LabelNode || inode instanceof LineNumberNode)
-						{
-							inode = inode.getPrevious();
-						}
-
-						if (RefUtils.isReturn(inode.getOpcode(), true))
-						{
-							log.error("[Append] Can't append to {}.{}, requires typed return opcode", className, name);
-							return super.visitMethod(access, name, descriptor, signature, exceptions);
-						}
-
-						classMethod.instructions.remove(inode);
-
-						classMethod.accept(new MethodReflector(mv));
-						break;
-					}
-				}
-
-				patchMethod.accept(new MethodReflector(mv));
-
-				mv.visitEnd();
-				return mv;
-			}
-		}
-		return super.visitMethod(access, name, descriptor, signature, exceptions);
-	}
-}
diff --git a/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/DoNothingTransformer.java b/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/DoNothingTransformer.java
deleted file mode 100644
index 7f6079c792..0000000000
--- a/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/DoNothingTransformer.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *  Copyright (c) 2019, ThatGamerBlue <thatgamerblue@gmail.com>
- *  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.rs.mixins.transformers;
-
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.tree.ClassNode;
-
-public class DoNothingTransformer extends ClassVisitor
-{
-	public DoNothingTransformer(ClassVisitor parent, byte[] patch, ClassNode node)
-	{
-		super(Opcodes.ASM6, parent);
-	}
-}
diff --git a/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/InjectTransformer.java b/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/InjectTransformer.java
deleted file mode 100644
index 29fb2bf554..0000000000
--- a/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/InjectTransformer.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- *  Copyright (c) 2019, ThatGamerBlue <thatgamerblue@gmail.com>
- *  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.rs.mixins.transformers;
-
-import net.runelite.client.util.RefUtils;
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.tree.ClassNode;
-import org.objectweb.asm.tree.FieldNode;
-import org.objectweb.asm.tree.MethodNode;
-
-public class InjectTransformer extends ClassVisitor
-{
-
-	private final byte[] patch;
-	private ClassNode node;
-	private String className;
-	private boolean patching = false;
-
-	public InjectTransformer(ClassVisitor classVisitor, byte[] patch, ClassNode node)
-	{
-		super(Opcodes.ASM6, classVisitor);
-		this.patch = patch;
-		this.node = node;
-	}
-
-	@Override
-	public void visit(int version, int access, String name, String signature, String superName, String[] interfaces)
-	{
-		className = name;
-		super.visit(version, access, name, signature, superName, interfaces);
-	}
-
-	@Override
-	public MethodVisitor visitMethod(int access, String name, String descriptor, String signature, String[] exceptions)
-	{
-		if (patch == null || name.startsWith("1protect$"))
-		{
-			return super.visitMethod(access, name, descriptor, signature, exceptions);
-		}
-		if (name.startsWith("prepend$") || name.startsWith("append$") ||
-			(patching && name.startsWith("<")))
-		{
-			return null;
-		}
-		MethodVisitor mv = super.visitMethod(access, name, descriptor, signature, exceptions);
-		ClassReader cr = new ClassReader(patch);
-		ClassNode patchNode = new ClassNode(Opcodes.ASM6);
-		cr.accept(patchNode, 0);
-		for (Object obj : patchNode.methods)
-		{
-			MethodNode node = (MethodNode) obj;
-			if ((node.access == access && node.name.equals(name) && node.desc.equals(descriptor)) &&
-				RefUtils.checkAnnotation(node, "Inject"))
-			{
-				mv.visitCode();
-				node.accept(new MethodReflector(mv));
-				mv.visitEnd();
-			}
-		}
-		return mv;
-	}
-
-	@Override
-	public void visitEnd()
-	{
-
-		if (patch == null)
-		{
-			super.visitEnd();
-			return;
-		}
-
-		ClassReader cr = new ClassReader(patch);
-		ClassNode patchNode = new ClassNode(Opcodes.ASM6);
-		cr.accept(patchNode, 0);
-		patching = true;
-		for (Object obj : patchNode.methods)
-		{
-			MethodNode node = (MethodNode) obj;
-			if (RefUtils.checkAnnotation(node, "Inject"))
-			{
-				visitMethod(node.access, node.name, node.desc, node.signature,
-					(String[]) node.exceptions.toArray(new String[0]));
-			}
-		}
-
-		for (Object obj : patchNode.fields)
-		{
-			FieldNode node = (FieldNode) obj;
-			if (RefUtils.checkAnnotation(node, "Inject"))
-			{
-				visitField(node.access, node.name, node.desc, node.signature, node.value);
-			}
-		}
-		patching = false;
-		super.visitEnd();
-	}
-
-}
diff --git a/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/InterfaceTransformer.java b/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/InterfaceTransformer.java
deleted file mode 100644
index 850e3be921..0000000000
--- a/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/InterfaceTransformer.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- *  Copyright (c) 2019, ThatGamerBlue <thatgamerblue@gmail.com>
- *  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.rs.mixins.transformers;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import lombok.extern.slf4j.Slf4j;
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.tree.ClassNode;
-
-@Slf4j
-public class InterfaceTransformer extends ClassVisitor implements Opcodes
-{
-
-	private final byte[] patch;
-	private ClassNode node;
-	private String className;
-
-	public InterfaceTransformer(ClassVisitor classVisitor, byte[] patch, ClassNode node)
-	{
-		super(Opcodes.ASM6, classVisitor);
-		this.patch = patch;
-		this.node = node;
-	}
-
-	@Override
-	public void visit(int version, int access, String name, String signature, String superName, String[] interfaces)
-	{
-		className = name;
-		if (patch != null)
-		{
-			ClassReader reader = new ClassReader(patch);
-			ClassNode pNode = new ClassNode();
-			reader.accept(pNode, 0);
-			if (pNode.interfaces != null && pNode.interfaces.size() != 0)
-			{
-				if (interfaces == null)
-				{
-					interfaces = (String[]) pNode.interfaces.toArray(new String[0]);
-				}
-				else
-				{
-					ArrayList<String> list = new ArrayList<>(Arrays.asList(interfaces));
-					pNode.interfaces.forEach((s) -> list.add((String) s));
-					interfaces = list.toArray(new String[0]);
-				}
-			}
-		}
-		super.visit(version, access, name, signature, superName, interfaces);
-	}
-
-}
diff --git a/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/MethodReflector.java b/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/MethodReflector.java
deleted file mode 100644
index a6f6813c49..0000000000
--- a/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/MethodReflector.java
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- *  Copyright (c) 2019, ThatGamerBlue <thatgamerblue@gmail.com>
- *  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.rs.mixins.transformers;
-
-import org.objectweb.asm.AnnotationVisitor;
-import org.objectweb.asm.Attribute;
-import org.objectweb.asm.Handle;
-import org.objectweb.asm.Label;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.TypePath;
-
-public class MethodReflector extends MethodVisitor
-{
-
-	private MethodVisitor target;
-
-	public MethodReflector(MethodVisitor target)
-	{
-		super(Opcodes.ASM6);
-		this.target = target;
-	}
-
-	public void visitParameter(String var1, int var2)
-	{
-		if (target != null)
-		{
-			target.visitParameter(var1, var2);
-		}
-		super.visitParameter(var1, var2);
-	}
-
-	public AnnotationVisitor visitAnnotationDefault()
-	{
-		return super.visitAnnotationDefault();
-	}
-
-	public AnnotationVisitor visitAnnotation(String var1, boolean var2)
-	{
-		return super.visitAnnotation(var1, var2);
-	}
-
-	public AnnotationVisitor visitTypeAnnotation(int var1, TypePath var2, String var3, boolean var4)
-	{
-		return super.visitTypeAnnotation(var1, var2, var3, var4);
-	}
-
-	public AnnotationVisitor visitParameterAnnotation(int var1, String var2, boolean var3)
-	{
-		return super.visitParameterAnnotation(var1, var2, var3);
-	}
-
-	public void visitAttribute(Attribute var1)
-	{
-		if (target != null)
-		{
-			target.visitAttribute(var1);
-		}
-		super.visitAttribute(var1);
-	}
-
-	public void visitFrame(int var1, int var2, Object[] var3, int var4, Object[] var5)
-	{
-		if (target != null)
-		{
-			target.visitFrame(var1, var2, var3, var4, var5);
-		}
-		super.visitFrame(var1, var2, var3, var4, var5);
-	}
-
-	public void visitInsn(int var1)
-	{
-		if (target != null)
-		{
-			target.visitInsn(var1);
-		}
-		super.visitInsn(var1);
-	}
-
-	public void visitIntInsn(int var1, int var2)
-	{
-		if (target != null)
-		{
-			target.visitIntInsn(var1, var2);
-		}
-		super.visitIntInsn(var1, var2);
-	}
-
-	public void visitVarInsn(int var1, int var2)
-	{
-		if (target != null)
-		{
-			target.visitVarInsn(var1, var2);
-		}
-		super.visitVarInsn(var1, var2);
-	}
-
-	public void visitTypeInsn(int var1, String var2)
-	{
-		if (target != null)
-		{
-			target.visitTypeInsn(var1, var2);
-		}
-		super.visitTypeInsn(var1, var2);
-	}
-
-	public void visitFieldInsn(int var1, String var2, String var3, String var4)
-	{
-		if (target != null)
-		{
-			target.visitFieldInsn(var1, var2, var3, var4);
-		}
-		super.visitFieldInsn(var1, var2, var3, var4);
-	}
-
-	/**
-	 * @deprecated
-	 */
-	public void visitMethodInsn(int var1, String var2, String var3, String var4)
-	{
-		if (target != null)
-		{
-			target.visitMethodInsn(var1, var2, var3, var4);
-		}
-		super.visitMethodInsn(var1, var2, var3, var4);
-	}
-
-	public void visitMethodInsn(int var1, String var2, String var3, String var4, boolean var5)
-	{
-		if (target != null)
-		{
-			target.visitMethodInsn(var1, var2, var3, var4, var5);
-		}
-		super.visitMethodInsn(var1, var2, var3, var4, var5);
-	}
-
-	public void visitInvokeDynamicInsn(String var1, String var2, Handle var3, Object... var4)
-	{
-		if (target != null)
-		{
-			target.visitInvokeDynamicInsn(var1, var2, var3, var4);
-		}
-		super.visitInvokeDynamicInsn(var1, var2, var3, var4);
-	}
-
-	public void visitJumpInsn(int var1, Label var2)
-	{
-		if (target != null)
-		{
-			target.visitJumpInsn(var1, var2);
-		}
-		super.visitJumpInsn(var1, var2);
-	}
-
-	public void visitLabel(Label var1)
-	{
-		if (target != null)
-		{
-			target.visitLabel(var1);
-		}
-		super.visitLabel(var1);
-	}
-
-	public void visitLdcInsn(Object var1)
-	{
-		if (target != null)
-		{
-			target.visitLdcInsn(var1);
-		}
-		super.visitLdcInsn(var1);
-	}
-
-	public void visitIincInsn(int var1, int var2)
-	{
-		if (target != null)
-		{
-			target.visitIincInsn(var1, var2);
-		}
-		super.visitIincInsn(var1, var2);
-	}
-
-	public void visitTableSwitchInsn(int var1, int var2, Label var3, Label... var4)
-	{
-		if (target != null)
-		{
-			target.visitTableSwitchInsn(var1, var2, var3, var4);
-		}
-		super.visitTableSwitchInsn(var1, var2, var3, var4);
-	}
-
-	public void visitLookupSwitchInsn(Label var1, int[] var2, Label[] var3)
-	{
-		if (target != null)
-		{
-			target.visitLookupSwitchInsn(var1, var2, var3);
-		}
-		super.visitLookupSwitchInsn(var1, var2, var3);
-	}
-
-	public void visitMultiANewArrayInsn(String var1, int var2)
-	{
-		if (target != null)
-		{
-			target.visitMultiANewArrayInsn(var1, var2);
-		}
-		super.visitMultiANewArrayInsn(var1, var2);
-	}
-
-	public AnnotationVisitor visitInsnAnnotation(int var1, TypePath var2, String var3, boolean var4)
-	{
-		if (target != null)
-		{
-			target.visitInsnAnnotation(var1, var2, var3, var4);
-		}
-		return super.visitInsnAnnotation(var1, var2, var3, var4);
-	}
-
-	public void visitTryCatchBlock(Label var1, Label var2, Label var3, String var4)
-	{
-		if (target != null)
-		{
-			target.visitTryCatchBlock(var1, var2, var3, var4);
-		}
-		super.visitTryCatchBlock(var1, var2, var3, var4);
-	}
-
-	public AnnotationVisitor visitTryCatchAnnotation(int var1, TypePath var2, String var3, boolean var4)
-	{
-		if (target != null)
-		{
-			target.visitTryCatchAnnotation(var1, var2, var3, var4);
-		}
-		return super.visitTryCatchAnnotation(var1, var2, var3, var4);
-	}
-
-	public void visitLocalVariable(String var1, String var2, String var3, Label var4, Label var5, int var6)
-	{
-		if (target != null)
-		{
-			target.visitLocalVariable(var1, var2, var3, var4, var5, var6);
-		}
-		super.visitLocalVariable(var1, var2, var3, var4, var5, var6);
-	}
-
-	public AnnotationVisitor visitLocalVariableAnnotation(int var1, TypePath var2, Label[] var3, Label[] var4, int[] var5, String var6, boolean var7)
-	{
-		if (target != null)
-		{
-			target.visitLocalVariableAnnotation(var1, var2, var3, var4, var5, var6, var7);
-		}
-		return super.visitLocalVariableAnnotation(var1, var2, var3, var4, var5, var6, var7);
-	}
-
-	public void visitLineNumber(int var1, Label var2)
-	{
-		if (target != null)
-		{
-			target.visitLineNumber(var1, var2);
-		}
-		super.visitLineNumber(var1, var2);
-	}
-
-	public void visitMaxs(int var1, int var2)
-	{
-		if (target != null)
-		{
-			target.visitMaxs(var1, var2);
-		}
-		super.visitMaxs(var1, var2);
-	}
-
-}
diff --git a/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/OverwriteSanityCheck.java b/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/OverwriteSanityCheck.java
deleted file mode 100644
index 37c0ca9d65..0000000000
--- a/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/OverwriteSanityCheck.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- *  Copyright (c) 2019, ThatGamerBlue <thatgamerblue@gmail.com>
- *  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.rs.mixins.transformers;
-
-import java.util.ArrayList;
-import lombok.extern.slf4j.Slf4j;
-import net.runelite.client.util.RefUtils;
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.tree.ClassNode;
-import org.objectweb.asm.tree.MethodNode;
-
-@Slf4j
-public class OverwriteSanityCheck extends SanityChecker implements Opcodes
-{
-
-	private String className;
-	private ClassNode patchNode;
-	public static final ArrayList<String> methodsUsed = new ArrayList<>();
-
-	public OverwriteSanityCheck(ClassVisitor classVisitor, ClassNode node)
-	{
-		super(ASM6, classVisitor);
-		this.className = node.name;
-		this.patchNode = node;
-	}
-
-	@Override
-	public MethodVisitor visitMethod(int access, String name, String descriptor, String signature, String[] exceptions)
-	{
-		String check = String.format("%s %s %s %s", className, name,
-			descriptor, access);
-
-		MethodNode methodNode = null;
-		for (Object obj2 : patchNode.methods)
-		{
-			MethodNode classMethod = (MethodNode) obj2;
-			if (classMethod.access == access && classMethod.name.equals(name) &&
-				classMethod.desc.equals(descriptor))
-			{
-				methodNode = classMethod;
-			}
-		}
-
-		if (methodNode == null)
-		{
-			log.error("[OverwriteSanity] Failed to find original patch method for {}", check);
-			return super.visitMethod(access, name, descriptor, signature, exceptions);
-		}
-
-		if (!RefUtils.checkAnnotation(methodNode, "Overwrite"))
-		{
-			return super.visitMethod(access, name, descriptor, signature, exceptions);
-		}
-
-		if (!methodsUsed.contains(check))
-		{
-			throw new RuntimeException("[OverwriteSanity] Overwrite target not found: " + check);
-		}
-		return super.visitMethod(access, name, descriptor, signature, exceptions);
-	}
-}
diff --git a/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/OverwriteTransformer.java b/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/OverwriteTransformer.java
deleted file mode 100644
index 9decd259bd..0000000000
--- a/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/OverwriteTransformer.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- *  Copyright (c) 2019, ThatGamerBlue <thatgamerblue@gmail.com>
- *  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.rs.mixins.transformers;
-
-import lombok.extern.slf4j.Slf4j;
-import net.runelite.client.util.RefUtils;
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.tree.ClassNode;
-import org.objectweb.asm.tree.MethodNode;
-
-@Slf4j
-public class OverwriteTransformer extends ClassVisitor
-{
-
-	private final byte[] patch;
-	private ClassNode node;
-	private String className;
-
-	public OverwriteTransformer(ClassVisitor classVisitor, byte[] patch, ClassNode node)
-	{
-		super(Opcodes.ASM6, classVisitor);
-		this.patch = patch;
-		this.node = node;
-		this.className = node.name;
-	}
-
-	@Override
-	public void visit(int version, int access, String name, String signature, String superName, String[] interfaces)
-	{
-		className = name;
-		super.visit(version, access, name, signature, superName, interfaces);
-	}
-
-	@Override
-	public MethodVisitor visitMethod(int access, String name, String descriptor, String signature, String[] exceptions)
-	{
-		if (patch == null || name.startsWith("1protect$"))
-		{
-			return super.visitMethod(access, name, descriptor, signature, exceptions);
-		}
-
-		if (name.startsWith("prepend$") || name.startsWith("append$"))
-		{
-			return null;
-		}
-
-		ClassReader cr = new ClassReader(patch);
-		ClassNode patchNode = new ClassNode(Opcodes.ASM6);
-		cr.accept(patchNode, 0);
-
-		for (Object obj : patchNode.methods)
-		{
-			MethodNode patchMethod = (MethodNode) obj;
-
-			if (patchMethod.access == access && patchMethod.name.equals(name) && patchMethod.desc.equals(descriptor))
-			{
-				if (RefUtils.checkAnnotation(patchMethod, "Overwrite"))
-				{
-					MethodVisitor mv =
-						new MethodVisitor(Opcodes.ASM6, super.visitMethod(access, name, descriptor, signature,
-							exceptions))
-						{
-						};
-					mv.visitCode();
-					patchMethod.accept(new MethodReflector(mv));
-					mv.visitEnd();
-					String s = String.format("%s %s %s %s", className, patchMethod.name,
-						patchMethod.desc, patchMethod.access);
-					OverwriteSanityCheck.methodsUsed.add(s);
-					return mv;
-				}
-			}
-		}
-		return super.visitMethod(access, name, descriptor, signature, exceptions);
-	}
-}
diff --git a/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/PrependTransformer.java b/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/PrependTransformer.java
deleted file mode 100644
index e06c4703ea..0000000000
--- a/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/PrependTransformer.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- *  Copyright (c) 2019, ThatGamerBlue <thatgamerblue@gmail.com>
- *  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.rs.mixins.transformers;
-
-import net.runelite.client.util.RefUtils;
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.tree.AbstractInsnNode;
-import org.objectweb.asm.tree.ClassNode;
-import org.objectweb.asm.tree.InsnNode;
-import org.objectweb.asm.tree.MethodNode;
-
-public class PrependTransformer extends ClassVisitor
-{
-
-	private final byte[] patch;
-	private String className;
-	private ClassNode classNode;
-
-	public PrependTransformer(ClassVisitor classVisitor, byte[] patch, ClassNode node)
-	{
-		super(Opcodes.ASM6, classVisitor);
-		this.patch = patch;
-		this.classNode = node;
-	}
-
-	@Override
-	public void visit(int version, int access, String name, String signature, String superName, String[] interfaces)
-	{
-		className = name;
-		super.visit(version, access, name, signature, superName, interfaces);
-	}
-
-	@Override
-	public MethodVisitor visitMethod(int access, String name, String descriptor, String signature, String[] exceptions)
-	{
-		if (patch == null)
-		{
-			return super.visitMethod(access, name, descriptor, signature, exceptions);
-		}
-		ClassReader cr = new ClassReader(patch);
-		ClassNode patchNode = new ClassNode(Opcodes.ASM6);
-		cr.accept(patchNode, 0);
-		for (Object obj : patchNode.methods)
-		{
-			MethodNode patchMethod = (MethodNode) obj;
-			if ((patchMethod.access == access && patchMethod.name.equals("prepend$" + name) &&
-				patchMethod.desc.equals(descriptor)) &&
-				RefUtils.checkAnnotation(patchMethod, "Prepend"))
-			{
-				MethodVisitor mv =
-					new MethodVisitor(Opcodes.ASM6, super.visitMethod(access, name, descriptor, signature,
-						exceptions))
-					{
-					};
-				mv.visitCode();
-
-				AbstractInsnNode node = patchMethod.instructions.getLast();
-				while (!(node instanceof InsnNode))
-				{
-					node = node.getPrevious();
-				}
-
-				if (RefUtils.isReturn(node.getOpcode()))
-				{
-					patchMethod.instructions.remove(node);
-				}
-
-				patchMethod.accept(new MethodReflector(mv));
-
-				for (Object obj2 : classNode.methods)
-				{
-					MethodNode classMethod = (MethodNode) obj2;
-					if (classMethod.access == access && classMethod.name.equals(name) &&
-						classMethod.desc.equals(descriptor))
-					{
-						classMethod.accept(new MethodReflector(mv));
-						break;
-					}
-				}
-
-				mv.visitEnd();
-				return mv;
-			}
-		}
-		return super.visitMethod(access, name, descriptor, signature, exceptions);
-	}
-
-	@Override
-	public void visitEnd()
-	{
-		if (patch == null)
-		{
-			super.visitEnd();
-			return;
-		}
-		super.visitEnd();
-	}
-
-}
diff --git a/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/ProtectTransformer.java b/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/ProtectTransformer.java
deleted file mode 100644
index 51a96cfc14..0000000000
--- a/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/ProtectTransformer.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  Copyright (c) 2019, ThatGamerBlue <thatgamerblue@gmail.com>
- *  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.rs.mixins.transformers;
-
-import org.objectweb.asm.commons.Remapper;
-
-public class ProtectTransformer extends Remapper
-{
-
-	public String mapFieldName(String owner, String name, String descriptor)
-	{
-		if (name.startsWith("1protect$"))
-		{
-			name = name.substring("1protect$".length());
-		}
-		return super.mapFieldName(owner, name, descriptor);
-	}
-
-	public String mapMethodName(String owner, String name, String descriptor)
-	{
-		if (name.startsWith("1protect$"))
-		{
-			name = name.substring("1protect$".length());
-		}
-		return super.mapMethodName(owner, name, descriptor);
-	}
-
-}
diff --git a/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/SanityChecker.java b/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/SanityChecker.java
deleted file mode 100644
index 4581b00c59..0000000000
--- a/runelite-client/src/main/java/net/runelite/client/rs/mixins/transformers/SanityChecker.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *  Copyright (c) 2019, ThatGamerBlue <thatgamerblue@gmail.com>
- *  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.rs.mixins.transformers;
-
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.Opcodes;
-
-public abstract class SanityChecker extends ClassVisitor implements Opcodes
-{
-	protected SanityChecker(int i, ClassVisitor classVisitor)
-	{
-		super(i, classVisitor);
-	}
-
-}
diff --git a/runelite-client/src/main/java/net/runelite/client/ui/ContainableFrame.java b/runelite-client/src/main/java/net/runelite/client/ui/ContainableFrame.java
index 0e60a97e13..1a528f75aa 100644
--- a/runelite-client/src/main/java/net/runelite/client/ui/ContainableFrame.java
+++ b/runelite-client/src/main/java/net/runelite/client/ui/ContainableFrame.java
@@ -39,6 +39,17 @@ public class ContainableFrame extends JFrame
 	private boolean containedInScreen;
 	private boolean expandedClientOppositeDirection;
 
+	ContainableFrame()
+	{
+		addWindowStateListener(windowEvent ->
+		{
+			if (windowEvent.getNewState() == Frame.NORMAL)
+			{
+				revalidateMinimumSize();
+			}
+		});
+	}
+
 	public void setContainedInScreen(boolean value)
 	{
 		this.containedInScreen = value;
@@ -114,23 +125,28 @@ public class ContainableFrame extends JFrame
 		if (forcedWidthIncrease || expandResizeType == ExpandResizeType.KEEP_GAME_SIZE)
 		{
 			final int newWindowWidth = getWidth() + increment;
-			final Rectangle screenBounds = getGraphicsConfiguration().getBounds();
-			final boolean wouldExpandThroughEdge = getX() + newWindowWidth > screenBounds.getX() + screenBounds.getWidth();
 			int newWindowX = getX();
 
-			if (wouldExpandThroughEdge)
+			if (containedInScreen)
 			{
-				if (!isFrameCloseToRightEdge() || isFrameCloseToLeftEdge())
+				final Rectangle screenBounds = getGraphicsConfiguration().getBounds();
+				final boolean wouldExpandThroughEdge = getX() + newWindowWidth > screenBounds.getX() + screenBounds.getWidth();
+
+				if (wouldExpandThroughEdge)
 				{
-					// Move the window to the edge
-					newWindowX = (int) (screenBounds.getX() + screenBounds.getWidth()) - getWidth();
+
+					if (!isFrameCloseToRightEdge() || isFrameCloseToLeftEdge())
+					{
+						// Move the window to the edge
+						newWindowX = (int) (screenBounds.getX() + screenBounds.getWidth()) - getWidth();
+					}
+
+					// Expand the window to the left as the user probably don't want the
+					// window to go through the screen
+					newWindowX -= increment;
+
+					expandedClientOppositeDirection = true;
 				}
-
-				// Expand the window to the left as the user probably don't want the
-				// window to go through the screen
-				newWindowX -= increment;
-
-				expandedClientOppositeDirection = true;
 			}
 
 			setBounds(newWindowX, getY(), newWindowWidth, getHeight());
diff --git a/runelite-client/src/main/java/net/runelite/client/ui/FontManager.java b/runelite-client/src/main/java/net/runelite/client/ui/FontManager.java
index 91a1a658ab..1205c6b3a7 100644
--- a/runelite-client/src/main/java/net/runelite/client/ui/FontManager.java
+++ b/runelite-client/src/main/java/net/runelite/client/ui/FontManager.java
@@ -34,6 +34,7 @@ import java.awt.Font;
 import java.awt.FontFormatException;
 import java.awt.GraphicsEnvironment;
 import java.io.IOException;
+import java.util.Map;
 import lombok.Getter;
 import net.runelite.client.config.FontType;
 
@@ -59,7 +60,7 @@ public class FontManager
 	}
 
 	private static final ImmutableBiMap<String, Font> fontMap;
-	private static final HashMap<Font, CachedFont> derivedFontMap = new HashMap<>();
+	private static final Map<Font, CachedFont> derivedFontMap = new HashMap<>();
 
 	static
 	{
@@ -108,7 +109,7 @@ public class FontManager
 		}
 	}
 
-	public static Font getFontOffCorrectSize(Font f)
+	private static Font getFontOffCorrectSize(Font f)
 	{
 		// Size of the font is already set
 		if (f.getSize2D() > 1)
@@ -214,7 +215,7 @@ public class FontManager
 
 	public static String[] getAvailableFontNames()
 	{
-		return fontMap.keySet().toArray(new String[fontMap.keySet().size()]);
+		return fontMap.keySet().toArray(new String[0]);
 	}
 
 	public static boolean isAvailable(Font font)
diff --git a/runelite-client/src/main/java/net/runelite/client/ui/RuneLiteSplashScreen.java b/runelite-client/src/main/java/net/runelite/client/ui/RuneLiteSplashScreen.java
index 8dbc86a701..1427745ea0 100644
--- a/runelite-client/src/main/java/net/runelite/client/ui/RuneLiteSplashScreen.java
+++ b/runelite-client/src/main/java/net/runelite/client/ui/RuneLiteSplashScreen.java
@@ -53,15 +53,13 @@ import org.pushingpixels.substance.internal.SubstanceSynapse;
 @Singleton
 public class RuneLiteSplashScreen
 {
-	private RuneLiteProperties runeLiteProperties = new RuneLiteProperties();
+	private final RuneLiteProperties runeLiteProperties = new RuneLiteProperties();
 
-	public JFrame frame;
-	public JPanel panel = new JPanel();
-	public JLabel messageLabel;
-	public JLabel subMessageLabel;
-	public JProgressBar progressBar = new JProgressBar();
-
-	private int currentStep;
+	private JFrame frame;
+	private final JPanel panel = new JPanel();
+	private JLabel messageLabel;
+	private JLabel subMessageLabel;
+	private final JProgressBar progressBar = new JProgressBar();
 
 	/**
 	 * This is not done in the constructor in order to avoid processing in case the user chooses to not load
diff --git a/runelite-client/src/main/java/net/runelite/client/ui/components/CustomScrollBarUI.java b/runelite-client/src/main/java/net/runelite/client/ui/components/CustomScrollBarUI.java
index 128c88197a..29125a9ee3 100644
--- a/runelite-client/src/main/java/net/runelite/client/ui/components/CustomScrollBarUI.java
+++ b/runelite-client/src/main/java/net/runelite/client/ui/components/CustomScrollBarUI.java
@@ -76,7 +76,7 @@ public class CustomScrollBarUI extends BasicScrollBarUI
 	/**
 	 * Creates an empty JButton to be used as the scroll bar's arrows (to disable the arrows).
 	 */
-	protected JButton createEmptyButton()
+	private JButton createEmptyButton()
 	{
 		JButton button = new JButton();
 		Dimension zeroDim = new Dimension(0, 0);
diff --git a/runelite-client/src/main/java/net/runelite/client/ui/components/ProgressBar.java b/runelite-client/src/main/java/net/runelite/client/ui/components/ProgressBar.java
index dc340613d6..ac5ba1cd79 100644
--- a/runelite-client/src/main/java/net/runelite/client/ui/components/ProgressBar.java
+++ b/runelite-client/src/main/java/net/runelite/client/ui/components/ProgressBar.java
@@ -159,7 +159,7 @@ public class ProgressBar extends DimmableJPanel
 		centerLabel.setText(isDimmed() ? txt : centerLabelText);
 	}
 
-	public int getPercentage()
+	private int getPercentage()
 	{
 		if (value == 0)
 		{
diff --git a/runelite-client/src/main/java/net/runelite/client/ui/components/colorpicker/ColorPanel.java b/runelite-client/src/main/java/net/runelite/client/ui/components/colorpicker/ColorPanel.java
index dab064566c..036de05ae2 100644
--- a/runelite-client/src/main/java/net/runelite/client/ui/components/colorpicker/ColorPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/ui/components/colorpicker/ColorPanel.java
@@ -46,7 +46,7 @@ public class ColorPanel extends JPanel
 
 	private final int size;
 
-	private BufferedImage image;
+	private final BufferedImage image;
 	private Point targetPosition;
 	private int selectedY;
 	private boolean forceRedraw;
diff --git a/runelite-client/src/main/java/net/runelite/client/ui/components/colorpicker/ColorValuePanel.java b/runelite-client/src/main/java/net/runelite/client/ui/components/colorpicker/ColorValuePanel.java
index 08110b01b6..43f549143b 100644
--- a/runelite-client/src/main/java/net/runelite/client/ui/components/colorpicker/ColorValuePanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/ui/components/colorpicker/ColorValuePanel.java
@@ -43,12 +43,12 @@ import javax.swing.text.DocumentFilter;
 import net.runelite.client.ui.ColorScheme;
 import net.runelite.client.util.ColorUtil;
 
-public class ColorValuePanel extends JPanel
+class ColorValuePanel extends JPanel
 {
 	private static final int DEFAULT_VALUE = ColorUtil.MAX_RGB_VALUE;
 
-	private ColorValueSlider slider = new ColorValueSlider();
-	private JTextField input = new JTextField();
+	private final ColorValueSlider slider = new ColorValueSlider();
+	private final JTextField input = new JTextField();
 
 	private Consumer<Integer> onValueChanged;
 
diff --git a/runelite-client/src/main/java/net/runelite/client/ui/components/materialtabs/MaterialTab.java b/runelite-client/src/main/java/net/runelite/client/ui/components/materialtabs/MaterialTab.java
index 365206340c..f4e7e835fc 100644
--- a/runelite-client/src/main/java/net/runelite/client/ui/components/materialtabs/MaterialTab.java
+++ b/runelite-client/src/main/java/net/runelite/client/ui/components/materialtabs/MaterialTab.java
@@ -57,9 +57,6 @@ public class MaterialTab extends JLabel
 	private static final Border UNSELECTED_BORDER = BorderFactory
 		.createEmptyBorder(5, 10, 5, 10);
 
-	/* The tab's containing group */
-	private final MaterialTabGroup group;
-
 	/* The tab's associated content display */
 	@Getter
 	private final JComponent content;
@@ -75,7 +72,7 @@ public class MaterialTab extends JLabel
 	{
 		super(string);
 
-		this.group = group;
+		/* The tab's containing group */
 		this.content = content;
 
 		if (selected)
diff --git a/runelite-client/src/main/java/net/runelite/client/ui/components/materialtabs/MaterialTabGroup.java b/runelite-client/src/main/java/net/runelite/client/ui/components/materialtabs/MaterialTabGroup.java
index a25019ad8f..d6ef646b50 100644
--- a/runelite-client/src/main/java/net/runelite/client/ui/components/materialtabs/MaterialTabGroup.java
+++ b/runelite-client/src/main/java/net/runelite/client/ui/components/materialtabs/MaterialTabGroup.java
@@ -75,7 +75,7 @@ public class MaterialTabGroup extends JPanel
 	public MaterialTab getTab(int index)
 	{
 
-		if (tabs == null || tabs.isEmpty())
+		if (tabs.isEmpty())
 		{
 			return null;
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java
index d68a7acbc1..40d82c357d 100644
--- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java
+++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java
@@ -138,10 +138,7 @@ public class OverlayManager
 			Optional<OverlayMenuEntry> optionalOverlayMenuEntry = menuEntries.stream()
 				.filter(me -> me.getOption().equals(event.getOption()))
 				.findAny();
-			if (optionalOverlayMenuEntry.isPresent())
-			{
-				eventBus.post(new OverlayMenuClicked(optionalOverlayMenuEntry.get(), overlay));
-			}
+			optionalOverlayMenuEntry.ifPresent(overlayMenuEntry -> eventBus.post(new OverlayMenuClicked(overlayMenuEntry, overlay)));
 		}
 	}
 
diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java
index 38677410f2..76d5a21386 100644
--- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java
+++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java
@@ -27,6 +27,7 @@ package net.runelite.client.ui.overlay;
 import com.google.common.base.MoreObjects;
 import java.awt.Color;
 import java.awt.Dimension;
+import java.awt.Font;
 import java.awt.Graphics2D;
 import java.awt.Point;
 import java.awt.Rectangle;
@@ -44,6 +45,7 @@ import net.runelite.api.MenuAction;
 import net.runelite.api.MenuEntry;
 import net.runelite.api.events.BeforeRender;
 import net.runelite.api.events.ClientTick;
+import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.FocusChanged;
 import net.runelite.api.widgets.Widget;
 import net.runelite.api.widgets.WidgetInfo;
@@ -89,6 +91,10 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener
 	private boolean isResizeable;
 	private OverlayBounds snapCorners;
 
+	private Font standardFont;
+	private Font tooltipFont;
+	private Font interfaceFont;
+
 	@Inject
 	private OverlayRenderer(
 		final Client client,
@@ -100,10 +106,29 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener
 		this.client = client;
 		this.overlayManager = overlayManager;
 		this.runeLiteConfig = runeLiteConfig;
+		this.updateConfig();
 		keyManager.registerKeyListener(this);
 		mouseManager.registerMouseListener(this);
 	}
 
+	private void updateConfig()
+	{
+		// Overlay Fonts
+		Font clientFont = runeLiteConfig.clientFont();
+		this.standardFont = FontManager.getFontFromType(clientFont, runeLiteConfig.fontType());
+		this.tooltipFont = FontManager.getFontFromType(clientFont, runeLiteConfig.tooltipFontType());
+		this.interfaceFont = FontManager.getFontFromType(clientFont, runeLiteConfig.interfaceFontType());
+	}
+
+	@Subscribe
+	public void onConfigChanged(ConfigChanged event)
+	{
+		if (event.getGroup().equals("runelite"))
+		{
+			updateConfig();
+		}
+	}
+
 	@Subscribe
 	public void onFocusChanged(FocusChanged event)
 	{
@@ -457,15 +482,15 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener
 		// Set font based on configuration
 		if (position == OverlayPosition.DYNAMIC || position == OverlayPosition.DETACHED)
 		{
-			subGraphics.setFont(FontManager.getFontFromType(runeLiteConfig.clientFont(), runeLiteConfig.fontType()));
+			subGraphics.setFont(this.standardFont);
 		}
 		else if (position == OverlayPosition.TOOLTIP)
 		{
-			subGraphics.setFont(FontManager.getFontFromType(runeLiteConfig.clientFont(), runeLiteConfig.tooltipFontType()));
+			subGraphics.setFont(this.tooltipFont);
 		}
 		else
 		{
-			subGraphics.setFont(FontManager.getFontFromType(runeLiteConfig.clientFont(), runeLiteConfig.interfaceFontType()));
+			subGraphics.setFont(this.interfaceFont);
 		}
 
 		subGraphics.translate(point.x, point.y);
diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetItemOverlay.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetItemOverlay.java
index 3d8f1ab2e2..5e707064b4 100644
--- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetItemOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetItemOverlay.java
@@ -43,6 +43,8 @@ import static net.runelite.api.widgets.WidgetID.GUIDE_PRICES_INVENTORY_GROUP_ID;
 import static net.runelite.api.widgets.WidgetID.INVENTORY_GROUP_ID;
 import static net.runelite.api.widgets.WidgetID.SEED_VAULT_INVENTORY_GROUP_ID;
 import static net.runelite.api.widgets.WidgetID.SHOP_INVENTORY_GROUP_ID;
+import static net.runelite.api.widgets.WidgetInfo.BANK_CONTENT_CONTAINER;
+import static net.runelite.api.widgets.WidgetInfo.BANK_TAB_CONTAINER;
 import static net.runelite.api.widgets.WidgetInfo.TO_GROUP;
 import net.runelite.api.widgets.WidgetItem;
 
@@ -73,8 +75,10 @@ public abstract class WidgetItemOverlay extends Overlay
 			Widget widget = widgetItem.getWidget();
 			int interfaceGroup = TO_GROUP(widget.getId());
 
-			// Don't draw if this widget isn't one of the allowed
-			if (!interfaceGroups.contains(interfaceGroup))
+			// Don't draw if this widget isn't one of the allowed nor in tag tab/item tab
+			if (!interfaceGroups.contains(interfaceGroup) ||
+				(interfaceGroup == BANK_GROUP_ID
+					&& (widget.getParentId() == BANK_CONTENT_CONTAINER.getId() || widget.getParentId() == BANK_TAB_CONTAINER.getId())))
 			{
 				continue;
 			}
diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowMinimapOverlay.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowMinimapOverlay.java
index 904eac78ce..91be8caeca 100644
--- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowMinimapOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowMinimapOverlay.java
@@ -28,8 +28,8 @@ import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.awt.geom.AffineTransform;
 import java.awt.image.BufferedImage;
-import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
@@ -106,7 +106,7 @@ public class ArrowMinimapOverlay extends Overlay
 				else if (arrowPoint.types.contains(ArrowType.OBJECT))
 				{
 
-					ArrayList<GameObject> objects = ArrowUtil.getObjects(client, arrowPoint.getObjectIDs());
+					List<GameObject> objects = ArrowUtil.getObjects(client, arrowPoint.getObjectIDs());
 					if (objects.isEmpty() && fallBackPoint != null)
 					{
 						renderMinimapArrow(graphics, arrowPoint, null, localPlayerPos, worldPlayerPos);
@@ -163,7 +163,10 @@ public class ArrowMinimapOverlay extends Overlay
 			AffineTransform at = new AffineTransform();
 			if (arrowPoint.isMinimapImagePointToTarget())
 			{
-				at.translate(minimapPlayerPos.getX(), minimapPlayerPos.getY());
+				if (minimapPlayerPos != null)
+				{
+					at.translate(minimapPlayerPos.getX(), minimapPlayerPos.getY());
+				}
 				at.rotate(cameraAngle - theta);
 				at.translate(0, 66);
 				at.translate(minimapImageOffset.getX() - minimapImage.getWidth() / 2, minimapImageOffset.getY() - minimapImage.getHeight() / 2);
@@ -177,7 +180,10 @@ public class ArrowMinimapOverlay extends Overlay
 				double dY = at.getTranslateY();
 				//Then apply that position to an un-rotated transform
 				at = new AffineTransform();
-				at.translate(minimapPlayerPos.getX(), minimapPlayerPos.getY());
+				if (minimapPlayerPos != null)
+				{
+					at.translate(minimapPlayerPos.getX(), minimapPlayerPos.getY());
+				}
 				at.translate(dX, dY);
 				at.translate(minimapImageOffset.getX() - minimapImage.getWidth() / 2, minimapImageOffset.getY() - minimapImage.getHeight() / 2);
 			}
diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowPoint.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowPoint.java
index 9969869356..2b381ca9cc 100644
--- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowPoint.java
+++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowPoint.java
@@ -27,7 +27,7 @@ package net.runelite.client.ui.overlay.arrow;
 import java.awt.Color;
 import java.awt.image.BufferedImage;
 import java.util.EnumSet;
-import java.util.HashSet;
+import java.util.Set;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NonNull;
@@ -44,15 +44,15 @@ public class ArrowPoint
 	@NonNull
 	private WorldPoint worldPoint;
 
-	private HashSet<Integer> npcIDs;
+	private Set<Integer> npcIDs;
 
-	private HashSet<Integer> objectIDs;
+	private Set<Integer> objectIDs;
 
 	/**
 	 * The regions that an NPC or Object has to be in to be marked (eg. Exam Centre locked chest Hard Clue requires
 	 * killing a Barbarian in Barbarian Village, or Konar Slayer requires killing monsters in a certain area)
 	 */
-	private HashSet<Integer> region;
+	private Set<Integer> region;
 
 	private BufferedImage worldImage;
 	@Builder.Default
diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowUtil.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowUtil.java
index a4380ae9a4..3d3b864b51 100644
--- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowUtil.java
+++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowUtil.java
@@ -1,7 +1,8 @@
 package net.runelite.client.ui.overlay.arrow;
 
 import java.util.ArrayList;
-import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 import net.runelite.api.Client;
 import net.runelite.api.GameObject;
 import net.runelite.api.ObjectDefinition;
@@ -10,7 +11,7 @@ import net.runelite.api.Tile;
 
 class ArrowUtil
 {
-	static ArrayList<GameObject> getObjects(final Client client, HashSet<Integer> objectIDs)
+	static List<GameObject> getObjects(final Client client, Set<Integer> objectIDs)
 	{
 		final Scene scene = client.getScene();
 		final Tile[][] tiles = scene.getTiles()[client.getPlane()];
diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowWorldOverlay.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowWorldOverlay.java
index 72301360f6..d822998223 100644
--- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowWorldOverlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/arrow/ArrowWorldOverlay.java
@@ -28,8 +28,8 @@ import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.awt.Polygon;
 import java.awt.image.BufferedImage;
-import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
@@ -105,7 +105,7 @@ public class ArrowWorldOverlay extends Overlay
 				else if (arrowPoint.types.contains(ArrowType.OBJECT))
 				{
 
-					ArrayList<GameObject> objects = ArrowUtil.getObjects(client, arrowPoint.getObjectIDs());
+					List<GameObject> objects = ArrowUtil.getObjects(client, arrowPoint.getObjectIDs());
 					if (objects.isEmpty() && fallBackPoint != null)
 					{
 						renderWorldArrow(graphics, arrowPoint, fallBackPoint);
diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/TextComponent.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/TextComponent.java
index fba19f5013..c5c65893c0 100644
--- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/TextComponent.java
+++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/TextComponent.java
@@ -67,7 +67,7 @@ public class TextComponent implements RenderableEntity
 			for (String textSplitOnCol : parts)
 			{
 				final String textWithoutCol = textWithoutColTags(textSplitOnCol);
-				final String colColor = textSplitOnCol.substring(textSplitOnCol.indexOf("=") + 1, textSplitOnCol.indexOf(">"));
+				final String colColor = textSplitOnCol.substring(textSplitOnCol.indexOf('=') + 1, textSplitOnCol.indexOf('>'));
 
 				renderText(graphics, x, position.y, textWithoutCol, Color.decode("#" + colColor), borderColor);
 
diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/table/TableComponent.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/table/TableComponent.java
index 6edbca14e8..117b021eca 100644
--- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/table/TableComponent.java
+++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/table/TableComponent.java
@@ -341,7 +341,7 @@ public class TableComponent implements LayoutableRenderableEntity
 			defaultColor);
 	}
 
-	public void setColumnAlignment(final int col, final TableAlignment alignment)
+	private void setColumnAlignment(final int col, final TableAlignment alignment)
 	{
 		assert columns.size() > col;
 		columns.get(col).setAlignment(alignment);
@@ -409,7 +409,7 @@ public class TableComponent implements LayoutableRenderableEntity
 		this.rows.add(row);
 	}
 
-	public void addRows(@Nonnull final String[]... rows)
+	private void addRows(@Nonnull final String[]... rows)
 	{
 		for (String[] row : rows)
 		{
@@ -434,7 +434,7 @@ public class TableComponent implements LayoutableRenderableEntity
 		this.rows.addAll(Arrays.asList(elements));
 	}
 
-	public void addColumn(@Nonnull final String col)
+	private void addColumn(@Nonnull final String col)
 	{
 		this.columns.add(TableElement.builder().content(col).build());
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/ui/skin/ObsidianSkin.java b/runelite-client/src/main/java/net/runelite/client/ui/skin/ObsidianSkin.java
index 6cd6e140d4..33400b0bdc 100644
--- a/runelite-client/src/main/java/net/runelite/client/ui/skin/ObsidianSkin.java
+++ b/runelite-client/src/main/java/net/runelite/client/ui/skin/ObsidianSkin.java
@@ -46,7 +46,7 @@ import org.pushingpixels.substance.api.painter.overlay.TopLineOverlayPainter;
 import org.pushingpixels.substance.api.shaper.ClassicButtonShaper;
 import org.pushingpixels.substance.internal.utils.SubstanceColorUtilities;
 
-public class ObsidianSkin extends SubstanceSkin
+class ObsidianSkin extends SubstanceSkin
 {
 	/**
 	 * Display name for <code>this</code> skin.
diff --git a/runelite-client/src/main/java/net/runelite/client/util/DeferredEventBus.java b/runelite-client/src/main/java/net/runelite/client/util/DeferredEventBus.java
index 183fce738b..4ac1941d7f 100644
--- a/runelite-client/src/main/java/net/runelite/client/util/DeferredEventBus.java
+++ b/runelite-client/src/main/java/net/runelite/client/util/DeferredEventBus.java
@@ -29,6 +29,7 @@ import java.util.concurrent.ConcurrentLinkedQueue;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import net.runelite.client.eventbus.EventBus;
+import org.jetbrains.annotations.NotNull;
 
 @Singleton
 public class DeferredEventBus extends EventBus
@@ -43,19 +44,19 @@ public class DeferredEventBus extends EventBus
 	}
 
 	@Override
-	public void register(Object object)
+	public void register(@NotNull Object object)
 	{
 		eventBus.register(object);
 	}
 
 	@Override
-	public void unregister(Object object)
+	public void unregister(@NotNull Object object)
 	{
 		eventBus.unregister(object);
 	}
 
 	@Override
-	public void post(Object object)
+	public void post(@NotNull Object object)
 	{
 		pendingEvents.add(object);
 	}
@@ -66,7 +67,10 @@ public class DeferredEventBus extends EventBus
 		while (size-- > 0)
 		{
 			Object object = pendingEvents.poll();
-			eventBus.post(object);
+			if (object != null)
+			{
+				eventBus.post(object);
+			}
 		}
 	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/util/ItemFinder.java b/runelite-client/src/main/java/net/runelite/client/util/ItemFinder.java
new file mode 100644
index 0000000000..4f62062c97
--- /dev/null
+++ b/runelite-client/src/main/java/net/runelite/client/util/ItemFinder.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2018, Shaun Dreclin <shaundreclin@gmail.com>
+ * 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.util;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import javax.inject.Inject;
+import net.runelite.api.Client;
+import net.runelite.api.InventoryID;
+import net.runelite.api.Item;
+import net.runelite.api.ItemContainer;
+
+public class ItemFinder
+{
+	@Inject
+	private Client client;
+
+	public List<Item> find(Container container, Match match, Integer... itemIDs)
+	{
+		ItemContainer inventory = client.getItemContainer(InventoryID.INVENTORY);
+		ItemContainer equipment = client.getItemContainer(InventoryID.EQUIPMENT);
+		List<Integer> inputIDs = new ArrayList<>(Arrays.asList(itemIDs));
+		List<Integer> foundIDs = new ArrayList<>();
+		List<Item> foundItems = new ArrayList<>();
+		List<Item> items = new ArrayList<>();
+
+		if (inventory != null && equipment != null)
+		{
+			if (container == Container.INVENTORY || container == Container.INVENTORY_AND_EQUIPMENT)
+			{
+				items.addAll(Arrays.asList(inventory.getItems()));
+			}
+
+			if (container == Container.EQUIPMENT || container == Container.INVENTORY_AND_EQUIPMENT)
+			{
+				items.addAll(Arrays.asList(equipment.getItems()));
+			}
+
+			for (Item item : items)
+			{
+				if (inputIDs.contains(item.getId()))
+				{
+					foundIDs.add(item.getId());
+					foundItems.add(item);
+				}
+			}
+
+			//todo: make this work with multiples of the same item in inputIDs
+			if (match == Match.ALL_ITEMS && !foundIDs.containsAll(inputIDs))
+			{
+				foundItems = Collections.emptyList();
+			}
+		}
+
+		return foundItems;
+	}
+
+	public enum Container
+	{
+		INVENTORY,
+		EQUIPMENT,
+		INVENTORY_AND_EQUIPMENT
+	}
+
+	public enum Match
+	{
+		ALL_ITEMS,
+		ANY_ITEM
+	}
+}
diff --git a/runelite-client/src/main/java/net/runelite/client/util/MiscUtils.java b/runelite-client/src/main/java/net/runelite/client/util/MiscUtils.java
index c44767d4a5..647a411cdf 100644
--- a/runelite-client/src/main/java/net/runelite/client/util/MiscUtils.java
+++ b/runelite-client/src/main/java/net/runelite/client/util/MiscUtils.java
@@ -8,13 +8,13 @@ import net.runelite.api.coords.WorldPoint;
 
 public class MiscUtils
 {
-	private static int[] abovePointsX = {2944, 3392, 3392, 2944};
-	private static int[] abovePointsY = {3523, 3523, 3971, 3971};
-	private static int[] belowPointsX = {2944, 2944, 3264, 3264};
-	private static int[] belowPointsY = {9918, 10360, 10360, 9918};
+	private static final int[] abovePointsX = {2944, 3392, 3392, 2944};
+	private static final int[] abovePointsY = {3523, 3523, 3971, 3971};
+	private static final int[] belowPointsX = {2944, 2944, 3264, 3264};
+	private static final int[] belowPointsY = {9918, 10360, 10360, 9918};
 
-	private static Polygon abovePoly = new Polygon(abovePointsX, abovePointsY, abovePointsX.length);
-	private static Polygon belowPoly = new Polygon(belowPointsX, belowPointsY, belowPointsX.length);
+	private static final Polygon abovePoly = new Polygon(abovePointsX, abovePointsY, abovePointsX.length);
+	private static final Polygon belowPoly = new Polygon(belowPointsX, belowPointsY, belowPointsX.length);
 
 	//test replacement so private for now
 	private static boolean inWildy(WorldPoint point)
@@ -50,12 +50,9 @@ public class MiscUtils
 		//v underground        //v above ground
 		int wildernessLevel = clamp(y > 6400 ? ((y - 9920) / 8) + 1 : ((y - 3520) / 8) + 1, 0, 56);
 
-		if (point.getPlane() > 0)
+		if (point.getPlane() > 0 && y < 9920)
 		{
-			if (y < 9920)
-			{
-				wildernessLevel = 0;
-			}
+			wildernessLevel = 0;
 		}
 
 		if (client.getWorldType().stream().anyMatch(worldType -> worldType == WorldType.PVP || worldType == WorldType.HIGH_RISK))
diff --git a/runelite-client/src/main/java/net/runelite/client/util/PvPUtil.java b/runelite-client/src/main/java/net/runelite/client/util/PvPUtil.java
index 53672490ac..a91de1c7cc 100644
--- a/runelite-client/src/main/java/net/runelite/client/util/PvPUtil.java
+++ b/runelite-client/src/main/java/net/runelite/client/util/PvPUtil.java
@@ -36,7 +36,7 @@ public class PvPUtil
 	 * @param point the point in the world to get the wilderness level for
 	 * @return the int representing the wilderness level
 	 */
-	public static int getWildernessLevelFrom(WorldPoint point)
+	private static int getWildernessLevelFrom(WorldPoint point)
 	{
 		int y = point.getY();
 
diff --git a/runelite-client/src/main/java/net/runelite/client/util/RefUtils.java b/runelite-client/src/main/java/net/runelite/client/util/RefUtils.java
index 5c4e5d08f3..0d5afbf564 100644
--- a/runelite-client/src/main/java/net/runelite/client/util/RefUtils.java
+++ b/runelite-client/src/main/java/net/runelite/client/util/RefUtils.java
@@ -30,12 +30,12 @@ import org.objectweb.asm.tree.AnnotationNode;
 import org.objectweb.asm.tree.FieldNode;
 import org.objectweb.asm.tree.MethodNode;
 
-public class RefUtils implements Opcodes
+class RefUtils implements Opcodes
 {
 
 	private static final String TYPE_PREFIX = "us/runelitepl/mixinprocessor/annotations/";
 
-	public static boolean isReturn(int opcode, boolean checkType)
+	private static boolean isReturn(int opcode, boolean checkType)
 	{
 		return (opcode == RETURN && !checkType) || opcode == IRETURN || opcode == LRETURN || opcode == DRETURN ||
 			opcode == ARETURN || opcode == FRETURN;
@@ -76,7 +76,7 @@ public class RefUtils implements Opcodes
 		return false;
 	}
 
-	public static String makeAnnotationDesc(String annot)
+	private static String makeAnnotationDesc(String annot)
 	{
 		return "L" + TYPE_PREFIX + annot + ";";
 	}
diff --git a/runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java b/runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java
index 021de4dc10..ff62937bc8 100644
--- a/runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java
+++ b/runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java
@@ -76,7 +76,7 @@ public class SwingUtil
 	 * Sets some sensible defaults for swing.
 	 * IMPORTANT! Needs to be called before main frame creation
 	 */
-	public static void setupDefaults()
+	private static void setupDefaults()
 	{
 		// Force heavy-weight popups/tooltips.
 		// Prevents them from being obscured by the game applet.
@@ -117,7 +117,7 @@ public class SwingUtil
 	 *
 	 * @param laf the swing look and feel
 	 */
-	public static void setTheme(@Nonnull final LookAndFeel laf)
+	private static void setTheme(@Nonnull final LookAndFeel laf)
 	{
 		try
 		{
@@ -135,7 +135,7 @@ public class SwingUtil
 	 *
 	 * @param font the new font to use
 	 */
-	public static void setFont(@Nonnull final Font font)
+	private static void setFont(@Nonnull final Font font)
 	{
 		final FontUIResource f = new FontUIResource(font);
 		final Enumeration keys = UIManager.getDefaults().keys();
diff --git a/runelite-client/src/main/java/net/runelite/client/util/WildernessLocation.java b/runelite-client/src/main/java/net/runelite/client/util/WildernessLocation.java
index 4757c875f0..4bf7b3e4a4 100644
--- a/runelite-client/src/main/java/net/runelite/client/util/WildernessLocation.java
+++ b/runelite-client/src/main/java/net/runelite/client/util/WildernessLocation.java
@@ -77,12 +77,12 @@ public enum WildernessLocation
 		this.worldArea = new WorldArea(location.x, location.y, location.width, location.height, plane);
 	}
 
-	public static class Location
+	static class Location
 	{
-		public int x;
-		public int y;
-		public int width;
-		public int height;
+		final int x;
+		final int y;
+		final int width;
+		final int height;
 
 		Location(int x, int y, int x1, int y1)
 		{
diff --git a/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrap.java b/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrap.java
index b8e6d60d94..e22256425b 100644
--- a/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrap.java
+++ b/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrap.java
@@ -11,19 +11,11 @@ import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import javax.xml.bind.DatatypeConverter;
 import net.runelite.http.api.RuneLiteAPI;
+import org.codehaus.plexus.util.FileUtils;
 
 public class Bootstrap
 {
-	class Artifact
-	{
-		String hash;
-		String name;
-		String path;
-		String size;
-	}
-
-	String buildCommit = "2d0c2b8eb66a8088b41b29d42ec2a58ead460581";
-	private Artifact[] artifacts = getArtifacts();
+	String buildCommit = "b82c8903c64695d44b255d45b449440e4eaa17ef";
 	Client client = new Client();
 	String[] clientJvm9Arguments = new String[]{
 		"-XX:+DisableAttachMechanism",
@@ -52,7 +44,7 @@ public class Bootstrap
 		"-XX:+UseConcMarkSweepGC",
 		"-XX:+UseParNewGC",
 		"-Djna.nosys=true"};
-
+	private Artifact[] artifacts = getArtifacts();
 	Bootstrap()
 	{
 	}
@@ -76,7 +68,9 @@ public class Bootstrap
 		try (DigestInputStream dis = new DigestInputStream(new FileInputStream(filepath), md))
 		{
 			//empty loop to clear the data
-			while (dis.read() != -1);
+			while (dis.read() != -1)
+			{
+			}
 			md = dis.getMessageDigest();
 		}
 
@@ -96,6 +90,18 @@ public class Bootstrap
 
 	}
 
+	public void copyTodir(String origPath, String newPath)
+	{
+		try
+		{
+			FileUtils.copyFileToDirectory(new File(origPath), new File(newPath));
+		}
+		catch (IOException e)
+		{
+			e.printStackTrace();
+		}
+	}
+
 	private Artifact[] getArtifacts()
 	{
 		try
@@ -300,26 +306,31 @@ public class Bootstrap
 			artifacts[3].hash = getChecksumFile("./runelite-client/target/" + artifacts[3].name);
 			artifacts[3].path = "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/" + artifacts[3].name;
 			artifacts[3].size = Long.toString(getFileSize("./runelite-client/target/" + artifacts[3].name));
+			copyTodir("./runelite-client/target/" + artifacts[3].name, "./live/");
 			artifacts[35] = new Artifact();
 			artifacts[35].name = "runelite-api-" + RuneLiteAPI.getVersion() + ".jar";
 			artifacts[35].hash = getChecksumFile("./runelite-api/target/" + artifacts[35].name);
 			artifacts[35].path = "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/" + artifacts[35].name;
 			artifacts[35].size = Long.toString(getFileSize("./runelite-api/target/" + artifacts[35].name));
+			copyTodir("./runelite-api/target/" + artifacts[35].name, "./live/");
 			artifacts[36] = new Artifact();
 			artifacts[36].name = "runescape-api-" + RuneLiteAPI.getVersion() + ".jar";
 			artifacts[36].hash = getChecksumFile("./runescape-api/target/" + artifacts[36].name);
 			artifacts[36].path = "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/" + artifacts[36].name;
 			artifacts[36].size = Long.toString(getFileSize("./runescape-api/target/" + artifacts[36].name));
+			copyTodir("./runescape-api/target/" + artifacts[36].name, "./live/");
 			artifacts[37] = new Artifact();
 			artifacts[37].name = "http-api-" + RuneLiteAPI.getVersion() + ".jar";
 			artifacts[37].hash = getChecksumFile("./http-api/target/" + artifacts[37].name);
 			artifacts[37].path = "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/" + artifacts[37].name;
 			artifacts[37].size = Long.toString(getFileSize("./http-api/target/" + artifacts[37].name));
+			copyTodir("./http-api/target/" + artifacts[37].name, "./live/");
 			artifacts[42] = new Artifact();
 			artifacts[42].name = "injected-client-" + RuneLiteAPI.getVersion() + ".jar";
 			artifacts[42].hash = getChecksumFile("./injected-client/target/" + artifacts[42].name);
 			artifacts[42].path = "https://raw.githubusercontent.com/runelite-extended/maven-repo/master/live/" + artifacts[42].name;
 			artifacts[42].size = Long.toString(getFileSize("./injected-client/target/" + artifacts[42].name));
+			copyTodir("./injected-client/target/" + artifacts[42].name, "./live/");
 		}
 		catch (IOException | NoSuchAlgorithmException e)
 		{
@@ -334,4 +345,12 @@ public class Bootstrap
 		return f.length();
 	}
 
+	class Artifact
+	{
+		String hash;
+		String name;
+		String path;
+		String size;
+	}
+
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrapper.java b/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrapper.java
index b74b0453c2..7e21bed246 100644
--- a/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrapper.java
+++ b/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrapper.java
@@ -2,6 +2,8 @@ package net.runelite.client.util.bootstrap;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+
+import java.io.File;
 import java.io.FileWriter;
 
 public class Bootstrapper
@@ -10,7 +12,9 @@ public class Bootstrapper
 	public static void main(String[] args)
 	{
 		Gson gson = new GsonBuilder().disableHtmlEscaping().setPrettyPrinting().create();
-		try (FileWriter fw = new FileWriter("./bootstrap.json"))
+		File dir = new File("./live/");
+		dir.mkdir();
+		try (FileWriter fw = new FileWriter("./live/bootstrap.json"))
 		{
 			gson.toJson(new Bootstrap(), fw);
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/util/ping/IcmpEchoReply.java b/runelite-client/src/main/java/net/runelite/client/util/ping/IcmpEchoReply.java
index 2756320990..0e4af9137e 100644
--- a/runelite-client/src/main/java/net/runelite/client/util/ping/IcmpEchoReply.java
+++ b/runelite-client/src/main/java/net/runelite/client/util/ping/IcmpEchoReply.java
@@ -30,7 +30,7 @@ import com.sun.jna.platform.win32.WinDef;
 import java.util.Arrays;
 import java.util.List;
 
-public class IcmpEchoReply extends Structure
+class IcmpEchoReply extends Structure
 {
 	private static final int IP_OPTION_INFO_SIZE = 1 + 1 + 1 + 1 + (Pointer.SIZE == 8 ? 12 : 4); // on 64bit vms add 4 byte padding
 	public static final int SIZE = 4 + 4 + 4 + 2 + 2 + Pointer.SIZE + IP_OPTION_INFO_SIZE;
diff --git a/runelite-client/src/main/resources/item_variations.json b/runelite-client/src/main/resources/item_variations.json
index 987169cb75..d5639ec663 100644
--- a/runelite-client/src/main/resources/item_variations.json
+++ b/runelite-client/src/main/resources/item_variations.json
@@ -9101,5 +9101,9 @@
     23321,
     23324,
     23327
+  ],
+  "giant egg sac": [
+    23517,
+    23520
   ]
 }
\ No newline at end of file
diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/customcursor/cursor-dragon-dagger-p.png b/runelite-client/src/main/resources/net/runelite/client/plugins/customcursor/cursor-dragon-dagger-p.png
new file mode 100644
index 0000000000..86f1751afa
Binary files /dev/null and b/runelite-client/src/main/resources/net/runelite/client/plugins/customcursor/cursor-dragon-dagger-p.png differ
diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/info/folder_icon.png b/runelite-client/src/main/resources/net/runelite/client/plugins/info/folder_icon.png
new file mode 100644
index 0000000000..41aa88c301
Binary files /dev/null and b/runelite-client/src/main/resources/net/runelite/client/plugins/info/folder_icon.png differ
diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/info/wiki_icon.png b/runelite-client/src/main/resources/net/runelite/client/plugins/info/wiki_icon.png
deleted file mode 100644
index ece6eea18e..0000000000
Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/info/wiki_icon.png and /dev/null differ
diff --git a/runelite-client/src/main/resources/net/runelite/client/runelite.properties b/runelite-client/src/main/resources/net/runelite/client/runelite.properties
index 1867b78407..95807daaf6 100644
--- a/runelite-client/src/main/resources/net/runelite/client/runelite.properties
+++ b/runelite-client/src/main/resources/net/runelite/client/runelite.properties
@@ -2,7 +2,9 @@ runelite.title=RuneLite
 runelite.version=${project.version}
 runescape.version=${rs.version}
 runelite.discord.appid=409416265891971072
+runelite.plus.discord.appid=560644885250572289
 runelite.discord.invite=https://discord.gg/HN5gf3m
 runelite.github.link=https://github.com/runelite-extended/runelite
 runelite.wiki.link=https://github.com/runelite-extended/runelite/wiki
-runelite.patreon.link=https://www.patreon.com/RuneLitePlus
\ No newline at end of file
+runelite.patreon.link=https://www.patreon.com/RuneLitePlus
+runelit.version =2.0.1-1
\ No newline at end of file
diff --git a/runelite-client/src/main/scripts/SendPublicMessage.rs2asm b/runelite-client/src/main/scripts/SendPublicMessage.rs2asm
new file mode 100644
index 0000000000..eccfc90457
--- /dev/null
+++ b/runelite-client/src/main/scripts/SendPublicMessage.rs2asm
@@ -0,0 +1,39 @@
+;;;
+;
+; Copyright (c) 2019, Lucas <https://github.com/Lucwousin>
+; 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.
+;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;                         ;
+;  Send a public message  ;
+;                         ;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;
+.id                 13337
+.int_stack_count    0
+.string_stack_count 1
+.int_var_count      0
+.string_var_count   1
+   sload                  0
+   iconst                 0
+   chat_sendpublic
+   return
diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/bank/BankCalculationTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/bank/BankCalculationTest.java
index af690525c3..2736c133a5 100644
--- a/runelite-client/src/test/java/net/runelite/client/plugins/bank/BankCalculationTest.java
+++ b/runelite-client/src/test/java/net/runelite/client/plugins/bank/BankCalculationTest.java
@@ -61,7 +61,7 @@ public class BankCalculationTest
 	private BankConfig bankConfig;
 
 	@Inject
-	private BankCalculation bankCalculation;
+	private BankPlugin bankplugin;
 
 	@Before
 	public void before()
@@ -107,6 +107,7 @@ public class BankCalculationTest
 		when(itemManager.getItemDefinition(ItemID.ABYSSAL_WHIP))
 			.thenReturn(whipComp);
 
+		BankCalculation bankCalculation = new BankCalculation(itemManager, bankplugin, client);
 		bankCalculation.calculate();
 
 		long value = bankCalculation.getHaPrice();
diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/cerberus/CerberusPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/cerberus/CerberusPluginTest.java
index 4f35f7b174..daac7907de 100644
--- a/runelite-client/src/test/java/net/runelite/client/plugins/cerberus/CerberusPluginTest.java
+++ b/runelite-client/src/test/java/net/runelite/client/plugins/cerberus/CerberusPluginTest.java
@@ -71,7 +71,7 @@ public class CerberusPluginTest
 			mockNpc(new LocalPoint(2, 5)),
 			mockNpc(new LocalPoint(1, 5))
 		));
-		cerberusPlugin.onGameTick(new GameTick());
+		cerberusPlugin.onGameTick(GameTick.INSTANCE);
 
 		// Expected sort is by lowest y first, then by lowest x
 		assertEquals(ghosts.get(0).getLocalLocation(), new LocalPoint(0, 0));
diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/chatfilter/ChatFilterPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/chatfilter/ChatFilterPluginTest.java
index a12a8b257b..26348cbd16 100644
--- a/runelite-client/src/test/java/net/runelite/client/plugins/chatfilter/ChatFilterPluginTest.java
+++ b/runelite-client/src/test/java/net/runelite/client/plugins/chatfilter/ChatFilterPluginTest.java
@@ -65,16 +65,17 @@ public class ChatFilterPluginTest
 	{
 		Guice.createInjector(BoundFieldModule.of(this)).injectMembers(this);
 
-		when(chatFilterConfig.filterType()).thenReturn(ChatFilterType.CENSOR_WORDS);
-		when(chatFilterConfig.filteredWords()).thenReturn("");
-		when(chatFilterConfig.filteredRegex()).thenReturn("");
+		chatFilterPlugin.setFilterType(ChatFilterType.CENSOR_WORDS);
+		chatFilterPlugin.setFilteredWords("");
+		chatFilterPlugin.setFilteredRegex("");
+
 		when(client.getLocalPlayer()).thenReturn(localPlayer);
 	}
 
 	@Test
 	public void testCensorWords()
 	{
-		when(chatFilterConfig.filteredWords()).thenReturn("hat");
+		chatFilterPlugin.setFilteredWords("hat");
 
 		chatFilterPlugin.updateFilteredPatterns();
 		assertEquals("w***s up", chatFilterPlugin.censorMessage("whats up"));
@@ -83,8 +84,8 @@ public class ChatFilterPluginTest
 	@Test
 	public void testCensorRegex()
 	{
-		when(chatFilterConfig.filterType()).thenReturn(ChatFilterType.REMOVE_MESSAGE);
-		when(chatFilterConfig.filteredRegex()).thenReturn("5[0-9]x2\n(");
+		chatFilterPlugin.setFilterType(ChatFilterType.REMOVE_MESSAGE);
+		chatFilterPlugin.setFilteredRegex("5[0-9]x2\n(");
 
 		chatFilterPlugin.updateFilteredPatterns();
 		assertNull(chatFilterPlugin.censorMessage("55X2 Dicing | Trusted Ranks | Huge Pay Outs!"));
@@ -93,7 +94,7 @@ public class ChatFilterPluginTest
 	@Test
 	public void testBrokenRegex()
 	{
-		when(chatFilterConfig.filteredRegex()).thenReturn("Test\n)\n73");
+		chatFilterPlugin.setFilteredRegex("Test\n)\n73");
 
 		chatFilterPlugin.updateFilteredPatterns();
 		assertEquals("** isn't funny", chatFilterPlugin.censorMessage("73 isn't funny"));
@@ -102,8 +103,8 @@ public class ChatFilterPluginTest
 	@Test
 	public void testCaseSensitivity()
 	{
-		when(chatFilterConfig.filterType()).thenReturn(ChatFilterType.CENSOR_MESSAGE);
-		when(chatFilterConfig.filteredWords()).thenReturn("ReGeX!!!");
+		chatFilterPlugin.setFilterType(ChatFilterType.CENSOR_MESSAGE);
+		chatFilterPlugin.setFilteredWords("ReGeX!!!");
 
 		chatFilterPlugin.updateFilteredPatterns();
 		assertEquals("Hey, everyone, I just tried to say something very silly!",
@@ -113,8 +114,8 @@ public class ChatFilterPluginTest
 	@Test
 	public void testNonPrintableCharacters()
 	{
-		when(chatFilterConfig.filterType()).thenReturn(ChatFilterType.REMOVE_MESSAGE);
-		when(chatFilterConfig.filteredWords()).thenReturn("test");
+		chatFilterPlugin.setFilterType(ChatFilterType.REMOVE_MESSAGE);
+		chatFilterPlugin.setFilteredWords("test");
 
 		chatFilterPlugin.updateFilteredPatterns();
 		assertNull(chatFilterPlugin.censorMessage("te\u008Cst"));
@@ -124,7 +125,7 @@ public class ChatFilterPluginTest
 	public void testMessageFromFriendIsFiltered()
 	{
 		when(client.isFriended("Iron Mammal", false)).thenReturn(true);
-		when(chatFilterConfig.filterFriends()).thenReturn(true);
+		chatFilterPlugin.setFilterFriends(true);
 		assertTrue(chatFilterPlugin.shouldFilterPlayerMessage("Iron Mammal"));
 	}
 
@@ -132,7 +133,7 @@ public class ChatFilterPluginTest
 	public void testMessageFromFriendIsNotFiltered()
 	{
 		when(client.isFriended("Iron Mammal", false)).thenReturn(true);
-		when(chatFilterConfig.filterFriends()).thenReturn(false);
+		chatFilterPlugin.setFilterFriends(false);
 		assertFalse(chatFilterPlugin.shouldFilterPlayerMessage("Iron Mammal"));
 	}
 
@@ -140,7 +141,7 @@ public class ChatFilterPluginTest
 	public void testMessageFromClanIsFiltered()
 	{
 		when(client.isClanMember("B0aty")).thenReturn(true);
-		when(chatFilterConfig.filterClan()).thenReturn(true);
+		chatFilterPlugin.setFilterClan(true);
 		assertTrue(chatFilterPlugin.shouldFilterPlayerMessage("B0aty"));
 	}
 
@@ -148,7 +149,7 @@ public class ChatFilterPluginTest
 	public void testMessageFromClanIsNotFiltered()
 	{
 		when(client.isClanMember("B0aty")).thenReturn(true);
-		when(chatFilterConfig.filterClan()).thenReturn(false);
+		chatFilterPlugin.setFilterClan(false);
 		assertFalse(chatFilterPlugin.shouldFilterPlayerMessage("B0aty"));
 	}
 
diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPluginTest.java
index c30c8a4e9e..b9655c884e 100644
--- a/runelite-client/src/test/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPluginTest.java
+++ b/runelite-client/src/test/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPluginTest.java
@@ -36,6 +36,7 @@ import net.runelite.api.MessageNode;
 import net.runelite.api.events.ChatMessage;
 import net.runelite.client.Notifier;
 import net.runelite.client.chat.ChatMessageManager;
+import net.runelite.client.config.RuneLitePlusConfig;
 import net.runelite.client.util.Text;
 import static org.junit.Assert.assertEquals;
 import org.junit.Before;
@@ -66,6 +67,10 @@ public class ChatNotificationsPluginTest
 	@Bind
 	private Notifier notifier;
 
+	@Mock
+	@Bind
+	private RuneLitePlusConfig runeLitePlusConfig;
+
 	@Inject
 	private ChatNotificationsPlugin chatNotificationsPlugin;
 
diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdTemperatureTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdTemperatureTest.java
new file mode 100644
index 0000000000..e4ea28eb7f
--- /dev/null
+++ b/runelite-client/src/test/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdTemperatureTest.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2019, Jordan Atwood <nightfirecat@protonmail.com>
+ * 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.cluescrolls.clues.hotcold;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import org.junit.Test;
+
+public class HotColdTemperatureTest
+{
+	private static final String[] VALID_MESSAGES = {
+		"The device is warm, and warmer than last time.",
+		"The device is visibly shaking and burns to the touch. This must be the spot.",
+		"The device is cold.",
+		"The device is ice cold.",
+		"The device is very cold.",
+		"The device is hot.",
+		"The device is incredibly hot.",
+	};
+	private static final String[] INVALID_MESSAGES = {
+		"The device is an octopus, and is wetter than last time.",
+		"foobar",
+		"a q p w",
+		"My feet are cold, I should put them in some lukewarm water, or run hot water over them.",
+	};
+
+	@Test
+	public void testValidTemperatureMessages()
+	{
+		for (final String message : VALID_MESSAGES)
+		{
+			assertNotNull(message, HotColdTemperature.getFromTemperatureSet(HotColdTemperature.BEGINNER_HOT_COLD_TEMPERATURES, message));
+			assertNotNull(message, HotColdTemperature.getFromTemperatureSet(HotColdTemperature.MASTER_HOT_COLD_TEMPERATURES, message));
+		}
+	}
+
+	@Test
+	public void testInvalidTemperatureMessages()
+	{
+		for (final String message : INVALID_MESSAGES)
+		{
+			assertNull(message, HotColdTemperature.getFromTemperatureSet(HotColdTemperature.BEGINNER_HOT_COLD_TEMPERATURES, message));
+			assertNull(message, HotColdTemperature.getFromTemperatureSet(HotColdTemperature.MASTER_HOT_COLD_TEMPERATURES, message));
+		}
+	}
+
+	@Test
+	public void testAmbiguousTemperatureMessages()
+	{
+		assertEquals(HotColdTemperature.ICE_COLD, HotColdTemperature.getFromTemperatureSet(HotColdTemperature.MASTER_HOT_COLD_TEMPERATURES, "The device is ice cold."));
+		assertEquals(HotColdTemperature.VERY_COLD, HotColdTemperature.getFromTemperatureSet(HotColdTemperature.MASTER_HOT_COLD_TEMPERATURES, "The device is very cold."));
+		assertEquals(HotColdTemperature.VERY_HOT, HotColdTemperature.getFromTemperatureSet(HotColdTemperature.MASTER_HOT_COLD_TEMPERATURES, "The device is very hot."));
+		assertEquals(HotColdTemperature.COLD, HotColdTemperature.getFromTemperatureSet(HotColdTemperature.BEGINNER_HOT_COLD_TEMPERATURES, "The device is cold, and warmer than last time."));
+		assertEquals(HotColdTemperature.WARM, HotColdTemperature.getFromTemperatureSet(HotColdTemperature.BEGINNER_HOT_COLD_TEMPERATURES, "The device is warm, but colder than last time."));
+	}
+}
\ No newline at end of file
diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/cooking/CookingPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/cooking/CookingPluginTest.java
index 6b8334e99d..5c5d4dd176 100644
--- a/runelite-client/src/test/java/net/runelite/client/plugins/cooking/CookingPluginTest.java
+++ b/runelite-client/src/test/java/net/runelite/client/plugins/cooking/CookingPluginTest.java
@@ -115,7 +115,8 @@ public class CookingPluginTest
 		Player player = mock(Player.class);
 		when(player.getSpotAnimation()).thenReturn(GraphicID.WINE_MAKE);
 
-		when(config.fermentTimer()).thenReturn(true);
+		cookingPlugin.setFermentTimer(true);
+
 		when(client.getLocalPlayer()).thenReturn(player);
 
 		SpotAnimationChanged graphicChanged = new SpotAnimationChanged();
diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPluginTest.java
index 51dc7842e0..508a396e97 100644
--- a/runelite-client/src/test/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPluginTest.java
+++ b/runelite-client/src/test/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPluginTest.java
@@ -114,12 +114,12 @@ public class IdleNotifierPluginTest
 		when(client.getLocalPlayer()).thenReturn(player);
 
 		// Mock config
-		when(config.logoutIdle()).thenReturn(true);
-		when(config.animationIdle()).thenReturn(true);
-		when(config.interactionIdle()).thenReturn(true);
-		when(config.getIdleNotificationDelay()).thenReturn(0);
-		when(config.getHitpointsThreshold()).thenReturn(42);
-		when(config.getPrayerThreshold()).thenReturn(42);
+		plugin.setLogoutIdle(true);
+		plugin.setAnimationIdle(true);
+		plugin.setInteractionIdle(true);
+		plugin.setGetIdleNotificationDelay(0);
+		plugin.setGetHitpointsThreshold(42);
+		plugin.setGetPrayerThreshold(42);
 
 		// Mock client
 		when(client.getGameState()).thenReturn(GameState.LOGGED_IN);
@@ -135,10 +135,10 @@ public class IdleNotifierPluginTest
 		AnimationChanged animationChanged = new AnimationChanged();
 		animationChanged.setActor(player);
 		plugin.onAnimationChanged(animationChanged);
-		plugin.onGameTick(new GameTick());
+		plugin.onGameTick(GameTick.INSTANCE);
 		when(player.getAnimation()).thenReturn(AnimationID.IDLE);
 		plugin.onAnimationChanged(animationChanged);
-		plugin.onGameTick(new GameTick());
+		plugin.onGameTick(GameTick.INSTANCE);
 		verify(notifier).notify("[" + PLAYER_NAME + "] is now idle!");
 	}
 
@@ -149,13 +149,13 @@ public class IdleNotifierPluginTest
 		AnimationChanged animationChanged = new AnimationChanged();
 		animationChanged.setActor(player);
 		plugin.onAnimationChanged(animationChanged);
-		plugin.onGameTick(new GameTick());
+		plugin.onGameTick(GameTick.INSTANCE);
 		when(player.getAnimation()).thenReturn(AnimationID.LOOKING_INTO);
 		plugin.onAnimationChanged(animationChanged);
-		plugin.onGameTick(new GameTick());
+		plugin.onGameTick(GameTick.INSTANCE);
 		when(player.getAnimation()).thenReturn(AnimationID.IDLE);
 		plugin.onAnimationChanged(animationChanged);
-		plugin.onGameTick(new GameTick());
+		plugin.onGameTick(GameTick.INSTANCE);
 		verify(notifier, times(0)).notify(any());
 	}
 
@@ -166,7 +166,7 @@ public class IdleNotifierPluginTest
 		AnimationChanged animationChanged = new AnimationChanged();
 		animationChanged.setActor(player);
 		plugin.onAnimationChanged(animationChanged);
-		plugin.onGameTick(new GameTick());
+		plugin.onGameTick(GameTick.INSTANCE);
 
 		// Logout
 		when(client.getGameState()).thenReturn(GameState.LOGIN_SCREEN);
@@ -182,7 +182,7 @@ public class IdleNotifierPluginTest
 		// Tick
 		when(player.getAnimation()).thenReturn(AnimationID.IDLE);
 		plugin.onAnimationChanged(animationChanged);
-		plugin.onGameTick(new GameTick());
+		plugin.onGameTick(GameTick.INSTANCE);
 		verify(notifier, times(0)).notify(any());
 	}
 
@@ -191,10 +191,10 @@ public class IdleNotifierPluginTest
 	{
 		when(player.getInteracting()).thenReturn(monster);
 		plugin.onInteractingChanged(new InteractingChanged(player, monster));
-		plugin.onGameTick(new GameTick());
+		plugin.onGameTick(GameTick.INSTANCE);
 		when(player.getInteracting()).thenReturn(null);
 		plugin.onInteractingChanged(new InteractingChanged(player, null));
-		plugin.onGameTick(new GameTick());
+		plugin.onGameTick(GameTick.INSTANCE);
 		verify(notifier).notify("[" + PLAYER_NAME + "] is now out of combat!");
 	}
 
@@ -203,13 +203,13 @@ public class IdleNotifierPluginTest
 	{
 		when(player.getInteracting()).thenReturn(monster);
 		plugin.onInteractingChanged(new InteractingChanged(player, monster));
-		plugin.onGameTick(new GameTick());
+		plugin.onGameTick(GameTick.INSTANCE);
 		when(player.getInteracting()).thenReturn(randomEvent);
 		plugin.onInteractingChanged(new InteractingChanged(player, randomEvent));
-		plugin.onGameTick(new GameTick());
+		plugin.onGameTick(GameTick.INSTANCE);
 		when(player.getInteracting()).thenReturn(null);
 		plugin.onInteractingChanged(new InteractingChanged(player, null));
-		plugin.onGameTick(new GameTick());
+		plugin.onGameTick(GameTick.INSTANCE);
 		verify(notifier, times(0)).notify(any());
 	}
 
@@ -218,7 +218,7 @@ public class IdleNotifierPluginTest
 	{
 		plugin.onInteractingChanged(new InteractingChanged(player, monster));
 		when(player.getInteracting()).thenReturn(monster);
-		plugin.onGameTick(new GameTick());
+		plugin.onGameTick(GameTick.INSTANCE);
 
 		// Logout
 		when(client.getGameState()).thenReturn(GameState.LOGIN_SCREEN);
@@ -234,7 +234,7 @@ public class IdleNotifierPluginTest
 		// Tick
 		when(player.getInteracting()).thenReturn(null);
 		plugin.onInteractingChanged(new InteractingChanged(player, null));
-		plugin.onGameTick(new GameTick());
+		plugin.onGameTick(GameTick.INSTANCE);
 		verify(notifier, times(0)).notify(any());
 	}
 
@@ -249,7 +249,7 @@ public class IdleNotifierPluginTest
 		hitsplatApplied.setActor(player);
 		hitsplatApplied.setHitsplat(new Hitsplat(Hitsplat.HitsplatType.DAMAGE, 0, 0));
 		plugin.onHitsplatApplied(hitsplatApplied);
-		plugin.onGameTick(new GameTick());
+		plugin.onGameTick(GameTick.INSTANCE);
 		verify(notifier, times(0)).notify(any());
 	}
 
@@ -262,22 +262,22 @@ public class IdleNotifierPluginTest
 		when(client.getKeyboardIdleTicks()).thenReturn(80_000);
 		when(client.getMouseIdleTicks()).thenReturn(14_500);
 
-		plugin.onGameTick(new GameTick());
-		plugin.onGameTick(new GameTick());
+		plugin.onGameTick(GameTick.INSTANCE);
+		plugin.onGameTick(GameTick.INSTANCE);
 		verify(notifier, times(1)).notify(any());
 	}
 
 	@Test
 	public void testSpecRegen()
 	{
-		when(config.getSpecEnergyThreshold()).thenReturn(50);
+		plugin.setGetSpecEnergyThreshold(50);
 
 		when(client.getVar(Matchers.eq(VarPlayer.SPECIAL_ATTACK_PERCENT))).thenReturn(400); // 40%
-		plugin.onGameTick(new GameTick()); // once to set lastSpecEnergy to 400
+		plugin.onGameTick(GameTick.INSTANCE); // once to set lastSpecEnergy to 400
 		verify(notifier, never()).notify(any());
 
 		when(client.getVar(Matchers.eq(VarPlayer.SPECIAL_ATTACK_PERCENT))).thenReturn(500); // 50%
-		plugin.onGameTick(new GameTick());
+		plugin.onGameTick(GameTick.INSTANCE);
 		verify(notifier).notify(Matchers.eq("[" + PLAYER_NAME + "] has restored spec energy!"));
 	}
 }
\ No newline at end of file
diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/maxhit/calculators/testconfig/MagicMaxHitConfig.java b/runelite-client/src/test/java/net/runelite/client/plugins/maxhit/calculators/testconfig/MagicMaxHitConfig.java
index 452aa484fc..6702012544 100644
--- a/runelite-client/src/test/java/net/runelite/client/plugins/maxhit/calculators/testconfig/MagicMaxHitConfig.java
+++ b/runelite-client/src/test/java/net/runelite/client/plugins/maxhit/calculators/testconfig/MagicMaxHitConfig.java
@@ -24,7 +24,13 @@
  */
 package net.runelite.client.plugins.maxhit.calculators.testconfig;
 
-import net.runelite.api.*;
+import net.runelite.api.Client;
+import net.runelite.api.InventoryID;
+import net.runelite.api.Item;
+import net.runelite.api.ItemContainer;
+import net.runelite.api.ItemID;
+import net.runelite.api.Skill;
+import net.runelite.api.Varbits;
 import net.runelite.client.plugins.maxhit.calculators.MagicMaxHitCalculator;
 
 import static org.junit.Assert.assertEquals;
diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/maxhit/calculators/testconfig/MeleeMaxHitConfig.java b/runelite-client/src/test/java/net/runelite/client/plugins/maxhit/calculators/testconfig/MeleeMaxHitConfig.java
index dd03f9487e..be9b240de9 100644
--- a/runelite-client/src/test/java/net/runelite/client/plugins/maxhit/calculators/testconfig/MeleeMaxHitConfig.java
+++ b/runelite-client/src/test/java/net/runelite/client/plugins/maxhit/calculators/testconfig/MeleeMaxHitConfig.java
@@ -24,10 +24,17 @@
  */
 package net.runelite.client.plugins.maxhit.calculators.testconfig;
 
-import net.runelite.api.*;
+import net.runelite.api.Client;
+import net.runelite.api.InventoryID;
+import net.runelite.api.Item;
+import net.runelite.api.ItemContainer;
+import net.runelite.api.ItemID;
+import net.runelite.api.Skill;
+import net.runelite.api.VarPlayer;
+import net.runelite.api.Varbits;
 import net.runelite.api.widgets.Widget;
 import net.runelite.api.widgets.WidgetInfo;
-import net.runelite.client.plugins.maxhit.attackstyle.WeaponType;
+import net.runelite.client.plugins.attackstyles.WeaponType;
 import net.runelite.client.plugins.maxhit.calculators.MeleeMaxHitCalculator;
 
 import static org.junit.Assert.assertEquals;
diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/maxhit/calculators/testconfig/RangeMaxHitConfig.java b/runelite-client/src/test/java/net/runelite/client/plugins/maxhit/calculators/testconfig/RangeMaxHitConfig.java
index 31ac795bb5..de85db6ef3 100644
--- a/runelite-client/src/test/java/net/runelite/client/plugins/maxhit/calculators/testconfig/RangeMaxHitConfig.java
+++ b/runelite-client/src/test/java/net/runelite/client/plugins/maxhit/calculators/testconfig/RangeMaxHitConfig.java
@@ -24,7 +24,14 @@
  */
 package net.runelite.client.plugins.maxhit.calculators.testconfig;
 
-import net.runelite.api.*;
+import net.runelite.api.Client;
+import net.runelite.api.InventoryID;
+import net.runelite.api.Item;
+import net.runelite.api.ItemContainer;
+import net.runelite.api.ItemID;
+import net.runelite.api.Skill;
+import net.runelite.api.VarPlayer;
+import net.runelite.api.Varbits;
 import net.runelite.api.widgets.Widget;
 import net.runelite.api.widgets.WidgetInfo;
 import net.runelite.client.plugins.maxhit.attackstyle.WeaponType;
diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPluginTest.java
index 87f69cceb3..fb5b92810d 100644
--- a/runelite-client/src/test/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPluginTest.java
+++ b/runelite-client/src/test/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPluginTest.java
@@ -37,7 +37,6 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import static org.mockito.Mockito.when;
 import org.mockito.runners.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
@@ -67,7 +66,7 @@ public class NpcIndicatorsPluginTest
 	@Test
 	public void getHighlights()
 	{
-		when(npcIndicatorsConfig.getNpcToHighlight()).thenReturn("goblin, , zulrah   , *wyvern, ,");
+		npcIndicatorsPlugin.setGetNpcToHighlight("goblin, , zulrah   , *wyvern, ,");
 		final List<String> highlightedNpcs = npcIndicatorsPlugin.getHighlights();
 		assertEquals("Length of parsed NPCs is incorrect", 3, highlightedNpcs.size());
 
diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/screenshot/ScreenshotPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/screenshot/ScreenshotPluginTest.java
index 9aff61c346..4a34a86712 100644
--- a/runelite-client/src/test/java/net/runelite/client/plugins/screenshot/ScreenshotPluginTest.java
+++ b/runelite-client/src/test/java/net/runelite/client/plugins/screenshot/ScreenshotPluginTest.java
@@ -101,10 +101,10 @@ public class ScreenshotPluginTest
 	public void before()
 	{
 		Guice.createInjector(BoundFieldModule.of(this)).injectMembers(this);
-		when(screenshotConfig.screenshotRewards()).thenReturn(true);
-		when(screenshotConfig.screenshotLevels()).thenReturn(true);
-		when(screenshotConfig.screenshotValuableDrop()).thenReturn(true);
-		when(screenshotConfig.screenshotUntradeableDrop()).thenReturn(true);
+		screenshotPlugin.setScreenshotRewards(true);
+		screenshotPlugin.setScreenshotLevels(true);
+		screenshotPlugin.setScreenshotValuableDrop(true);
+		screenshotPlugin.setScreenshotUntradeableDrop(true);
 	}
 
 	@Test
@@ -179,7 +179,7 @@ public class ScreenshotPluginTest
 		event.setGroupId(LEVEL_UP_GROUP_ID);
 		screenshotPlugin.onWidgetLoaded(event);
 
-		GameTick tick = new GameTick();
+		GameTick tick = GameTick.INSTANCE;
 		screenshotPlugin.onGameTick(tick);
 
 		verify(drawManager).requestNextFrameListener(Matchers.any(Consumer.class));
@@ -202,7 +202,7 @@ public class ScreenshotPluginTest
 		event.setGroupId(LEVEL_UP_GROUP_ID);
 		screenshotPlugin.onWidgetLoaded(event);
 
-		GameTick tick = new GameTick();
+		GameTick tick = GameTick.INSTANCE;
 		screenshotPlugin.onGameTick(tick);
 
 		verify(drawManager).requestNextFrameListener(Matchers.any(Consumer.class));
@@ -225,7 +225,7 @@ public class ScreenshotPluginTest
 		event.setGroupId(LEVEL_UP_GROUP_ID);
 		screenshotPlugin.onWidgetLoaded(event);
 
-		GameTick tick = new GameTick();
+		GameTick tick = GameTick.INSTANCE;
 		screenshotPlugin.onGameTick(tick);
 
 		verify(drawManager).requestNextFrameListener(Matchers.any(Consumer.class));
@@ -248,7 +248,7 @@ public class ScreenshotPluginTest
 		event.setGroupId(DIALOG_SPRITE_GROUP_ID);
 		screenshotPlugin.onWidgetLoaded(event);
 
-		GameTick tick = new GameTick();
+		GameTick tick = GameTick.INSTANCE;
 		screenshotPlugin.onGameTick(tick);
 
 		verify(drawManager).requestNextFrameListener(Matchers.any(Consumer.class));
diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java
index 099a76d19b..169caac2a9 100644
--- a/runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java
+++ b/runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java
@@ -155,7 +155,7 @@ public class SlayerPluginTest
 		Widget npcDialog = mock(Widget.class);
 		when(npcDialog.getText()).thenReturn(TASK_NEW);
 		when(client.getWidget(WidgetInfo.DIALOG_NPC_TEXT)).thenReturn(npcDialog);
-		slayerPlugin.onGameTick(new GameTick());
+		slayerPlugin.onGameTick(GameTick.INSTANCE);
 
 		assertEquals("Suqahs", slayerPlugin.getCurrentTask().getTaskName());
 		assertEquals(231, slayerPlugin.getCurrentTask().getAmount());
@@ -167,7 +167,7 @@ public class SlayerPluginTest
 		Widget npcDialog = mock(Widget.class);
 		when(npcDialog.getText()).thenReturn(TASK_NEW_KONAR);
 		when(client.getWidget(WidgetInfo.DIALOG_NPC_TEXT)).thenReturn(npcDialog);
-		slayerPlugin.onGameTick(new GameTick());
+		slayerPlugin.onGameTick(GameTick.INSTANCE);
 
 		assertEquals("Wyrms", slayerPlugin.getCurrentTask().getTaskName());
 		assertEquals(147, slayerPlugin.getCurrentTask().getAmount());
@@ -180,7 +180,7 @@ public class SlayerPluginTest
 		Widget npcDialog = mock(Widget.class);
 		when(npcDialog.getText()).thenReturn(TASK_NEW_KONAR_2);
 		when(client.getWidget(WidgetInfo.DIALOG_NPC_TEXT)).thenReturn(npcDialog);
-		slayerPlugin.onGameTick(new GameTick());
+		slayerPlugin.onGameTick(GameTick.INSTANCE);
 
 		assertEquals("Hellhounds", slayerPlugin.getCurrentTask().getTaskName());
 		assertEquals(142, slayerPlugin.getCurrentTask().getAmount());
@@ -193,7 +193,7 @@ public class SlayerPluginTest
 		Widget npcDialog = mock(Widget.class);
 		when(npcDialog.getText()).thenReturn(TASK_NEW_KONAR_3);
 		when(client.getWidget(WidgetInfo.DIALOG_NPC_TEXT)).thenReturn(npcDialog);
-		slayerPlugin.onGameTick(new GameTick());
+		slayerPlugin.onGameTick(GameTick.INSTANCE);
 
 		assertEquals("Trolls", slayerPlugin.getCurrentTask().getTaskName());
 		assertEquals(135, slayerPlugin.getCurrentTask().getAmount());
@@ -206,7 +206,7 @@ public class SlayerPluginTest
 		Widget npcDialog = mock(Widget.class);
 		when(npcDialog.getText()).thenReturn(TASK_NEW_FIRST);
 		when(client.getWidget(WidgetInfo.DIALOG_NPC_TEXT)).thenReturn(npcDialog);
-		slayerPlugin.onGameTick(new GameTick());
+		slayerPlugin.onGameTick(GameTick.INSTANCE);
 
 		assertEquals("goblins", slayerPlugin.getCurrentTask().getTaskName());
 		assertEquals(17, slayerPlugin.getCurrentTask().getAmount());
@@ -218,7 +218,7 @@ public class SlayerPluginTest
 		Widget npcDialog = mock(Widget.class);
 		when(npcDialog.getText()).thenReturn(TASK_NEW_NPC_CONTACT);
 		when(client.getWidget(WidgetInfo.DIALOG_NPC_TEXT)).thenReturn(npcDialog);
-		slayerPlugin.onGameTick(new GameTick());
+		slayerPlugin.onGameTick(GameTick.INSTANCE);
 
 		assertEquals("Suqahs", slayerPlugin.getCurrentTask().getTaskName());
 		assertEquals(211, slayerPlugin.getCurrentTask().getAmount());
@@ -230,7 +230,7 @@ public class SlayerPluginTest
 		Widget npcDialog = mock(Widget.class);
 		when(npcDialog.getText()).thenReturn(TASK_BOSS_NEW);
 		when(client.getWidget(WidgetInfo.DIALOG_NPC_TEXT)).thenReturn(npcDialog);
-		slayerPlugin.onGameTick(new GameTick());
+		slayerPlugin.onGameTick(GameTick.INSTANCE);
 
 		assertEquals("Vet'ion", slayerPlugin.getCurrentTask().getTaskName());
 		assertEquals(3, slayerPlugin.getCurrentTask().getAmount());
@@ -243,7 +243,7 @@ public class SlayerPluginTest
 		Widget npcDialog = mock(Widget.class);
 		when(npcDialog.getText()).thenReturn(TASK_BOSS_NEW_THE);
 		when(client.getWidget(WidgetInfo.DIALOG_NPC_TEXT)).thenReturn(npcDialog);
-		slayerPlugin.onGameTick(new GameTick());
+		slayerPlugin.onGameTick(GameTick.INSTANCE);
 
 		assertEquals("Chaos Elemental", slayerPlugin.getCurrentTask().getTaskName());
 		assertEquals(3, slayerPlugin.getCurrentTask().getAmount());
@@ -296,7 +296,7 @@ public class SlayerPluginTest
 		Widget npcDialog = mock(Widget.class);
 		when(npcDialog.getText()).thenReturn(TASK_EXISTING);
 		when(client.getWidget(WidgetInfo.DIALOG_NPC_TEXT)).thenReturn(npcDialog);
-		slayerPlugin.onGameTick(new GameTick());
+		slayerPlugin.onGameTick(GameTick.INSTANCE);
 
 		assertEquals("suqahs", slayerPlugin.getCurrentTask().getTaskName());
 		assertEquals(222, slayerPlugin.getCurrentTask().getAmount());
@@ -387,11 +387,11 @@ public class SlayerPluginTest
 	{
 		ChatMessage chatMessageEvent = new ChatMessage(null, GAMEMESSAGE, "Superior", SUPERIOR_MESSAGE, null, 0);
 
-		when(slayerConfig.showSuperiorNotification()).thenReturn(true);
+		slayerPlugin.setShowSuperiorNotification(true);
 		slayerPlugin.onChatMessage(chatMessageEvent);
 		verify(notifier).notify(SUPERIOR_MESSAGE);
 
-		when(slayerConfig.showSuperiorNotification()).thenReturn(false);
+		slayerPlugin.setShowSuperiorNotification(false);
 		slayerPlugin.onChatMessage(chatMessageEvent);
 		verifyNoMoreInteractions(notifier);
 	}
@@ -405,7 +405,7 @@ public class SlayerPluginTest
 		task.setAmount(42);
 		task.setInitialAmount(42);
 
-		when(slayerConfig.taskCommand()).thenReturn(true);
+		slayerPlugin.setTaskCommand(true);
 		when(chatClient.getTask(anyString())).thenReturn(task);
 
 		ChatMessage setMessage = new ChatMessage();
diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/timers/TimersPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/timers/TimersPluginTest.java
index f9ba35154d..378f062de2 100644
--- a/runelite-client/src/test/java/net/runelite/client/plugins/timers/TimersPluginTest.java
+++ b/runelite-client/src/test/java/net/runelite/client/plugins/timers/TimersPluginTest.java
@@ -86,7 +86,7 @@ public class TimersPluginTest
 	@Test
 	public void testHalfTeleblock()
 	{
-		when(timersConfig.showTeleblock()).thenReturn(true);
+		timersPlugin.setShowTeleblock(true);
 		when(client.getWorldType()).thenReturn(EnumSet.of(WorldType.MEMBERS));
 		ChatMessage chatMessage = new ChatMessage(null, ChatMessageType.SPAM, "", HALF_TELEBLOCK_MESSAGE, "", 0);
 		timersPlugin.onChatMessage(chatMessage);
@@ -100,7 +100,7 @@ public class TimersPluginTest
 	@Test
 	public void testFullTeleblock()
 	{
-		when(timersConfig.showTeleblock()).thenReturn(true);
+		timersPlugin.setShowTeleblock(true);
 		ChatMessage chatMessage = new ChatMessage(null, ChatMessageType.SPAM, "", FULL_TELEBLOCK_MESSAGE, "", 0);
 		timersPlugin.onChatMessage(chatMessage);
 
@@ -113,7 +113,7 @@ public class TimersPluginTest
 	@Test
 	public void testDmmHalfTb()
 	{
-		when(timersConfig.showTeleblock()).thenReturn(true);
+		timersPlugin.setShowTeleblock(true);
 		when(client.getWorldType()).thenReturn(EnumSet.of(WorldType.DEADMAN));
 		ChatMessage chatMessage = new ChatMessage(null, ChatMessageType.SPAM, "", DMM_HALF_TELEBLOCK_MESSAGE, "", 0);
 		timersPlugin.onChatMessage(chatMessage);
@@ -127,7 +127,7 @@ public class TimersPluginTest
 	@Test
 	public void testDmmFullTb()
 	{
-		when(timersConfig.showTeleblock()).thenReturn(true);
+		timersPlugin.setShowTeleblock(true);
 		when(client.getWorldType()).thenReturn(EnumSet.of(WorldType.DEADMAN));
 		ChatMessage chatMessage = new ChatMessage(null, ChatMessageType.SPAM, "", HALF_TELEBLOCK_MESSAGE, "", 0);
 		timersPlugin.onChatMessage(chatMessage);
diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/wintertodt/WintertodtPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/wintertodt/WintertodtPluginTest.java
new file mode 100644
index 0000000000..7069d4f06a
--- /dev/null
+++ b/runelite-client/src/test/java/net/runelite/client/plugins/wintertodt/WintertodtPluginTest.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 2019, Kusha Gharahi<kusha.me>
+ * Copyright (c) 2019, Adam <Adam@sigterm.info>
+ * 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.wintertodt;
+
+import com.google.inject.Guice;
+import com.google.inject.testing.fieldbinder.Bind;
+import com.google.inject.testing.fieldbinder.BoundFieldModule;
+import javax.inject.Inject;
+import net.runelite.api.Client;
+import net.runelite.api.Varbits;
+import net.runelite.api.events.VarbitChanged;
+import net.runelite.client.Notifier;
+import net.runelite.client.chat.ChatMessageManager;
+import net.runelite.client.ui.overlay.OverlayManager;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import org.mockito.runners.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class WintertodtPluginTest
+{
+	@Inject
+	WintertodtPlugin wintertodtPlugin;
+
+	@Mock
+	@Bind
+	WintertodtConfig config;
+
+	@Mock
+	@Bind
+	WintertodtOverlay wintertodtOverlay;
+
+	@Mock
+	@Bind
+	OverlayManager overlayManager;
+
+	@Mock
+	@Bind
+	ChatMessageManager chatMessageManager;
+
+	@Mock
+	@Bind
+	Notifier notifier;
+
+	@Mock
+	@Bind
+	Client client;
+
+	@Before
+	public void before()
+	{
+		Guice.createInjector(BoundFieldModule.of(this)).injectMembers(this);
+	}
+
+	@Test
+	public void matchStartingNotification_shouldNotify_when15SecondsOptionSelected()
+	{
+		when(config.roundNotification()).thenReturn(15);
+
+		when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(35);
+		wintertodtPlugin.onVarbitChanged(new VarbitChanged());
+		//(15 * 50) / 30 = ~25
+		when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(25);
+		wintertodtPlugin.onVarbitChanged(new VarbitChanged());
+
+		verify(notifier, times(1)).notify("Wintertodt round is about to start");
+	}
+
+	@Test
+	public void matchStartingNotification_shouldNotify_when10SecondsOptionSelected()
+	{
+		when(config.roundNotification()).thenReturn(10);
+
+		when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(20);
+		wintertodtPlugin.onVarbitChanged(new VarbitChanged());
+		//(10 * 50) / 30 = ~16
+		when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(16);
+		wintertodtPlugin.onVarbitChanged(new VarbitChanged());
+
+		verify(notifier, times(1)).notify("Wintertodt round is about to start");
+	}
+
+	@Test
+	public void matchStartingNotification_shouldNotify_when5SecondsOptionSelected()
+	{
+		when(config.roundNotification()).thenReturn(5);
+
+		when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(10);
+		wintertodtPlugin.onVarbitChanged(new VarbitChanged());
+		//(5 * 50) / 30 = ~8
+		when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(8);
+		wintertodtPlugin.onVarbitChanged(new VarbitChanged());
+
+		verify(notifier, times(1)).notify("Wintertodt round is about to start");
+	}
+
+	@Test
+	public void matchStartingNotification_shouldNotifyOnce()
+	{
+		when(config.roundNotification()).thenReturn(5);
+
+		when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(0);
+		wintertodtPlugin.onVarbitChanged(new VarbitChanged());
+		when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(10);
+		wintertodtPlugin.onVarbitChanged(new VarbitChanged());
+		when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(8);
+		wintertodtPlugin.onVarbitChanged(new VarbitChanged());
+		when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(6);
+		wintertodtPlugin.onVarbitChanged(new VarbitChanged());
+		when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(5);
+		wintertodtPlugin.onVarbitChanged(new VarbitChanged());
+		when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(4);
+		wintertodtPlugin.onVarbitChanged(new VarbitChanged());
+
+		verify(notifier, times(1)).notify("Wintertodt round is about to start");
+	}
+
+	@Test
+	public void matchStartingNotification_shouldNotNotify_whenNoneOptionSelected()
+	{
+		when(config.roundNotification()).thenReturn(5);
+		when(client.getVar(Varbits.WINTERTODT_TIMER)).thenReturn(25);
+
+		wintertodtPlugin.onVarbitChanged(new VarbitChanged());
+		verify(notifier, times(0)).notify("Wintertodt round is about to start");
+	}
+}
diff --git a/runelite-mixins/pom.xml b/runelite-mixins/pom.xml
index f299e82ec5..4885636cac 100644
--- a/runelite-mixins/pom.xml
+++ b/runelite-mixins/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.28-SNAPSHOT</version>
+		<version>1.5.29-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>mixins</artifactId>
diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/CameraMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/CameraMixin.java
index 4c231426b6..ee8c0e1bed 100644
--- a/runelite-mixins/src/main/java/net/runelite/mixins/CameraMixin.java
+++ b/runelite-mixins/src/main/java/net/runelite/mixins/CameraMixin.java
@@ -66,7 +66,7 @@ public abstract class CameraMixin implements RSClient
 		}
 	}
 
-	@FieldHook("cameraPitchTarget")
+	@FieldHook("camAngleX")
 	@Inject
 	static void onCameraPitchTargetChanged(int idx)
 	{
diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/ClickboxMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/ClickboxMixin.java
index 3bf15193e1..d8cc17ecfd 100644
--- a/runelite-mixins/src/main/java/net/runelite/mixins/ClickboxMixin.java
+++ b/runelite-mixins/src/main/java/net/runelite/mixins/ClickboxMixin.java
@@ -40,8 +40,7 @@ public abstract class ClickboxMixin implements RSClient
 			return;
 		}
 
-		boolean bb = boundingboxCheck(model, _x, _y, _z);
-		if (!bb)
+		if (!boundingboxCheck(model, _x, _y, _z))
 		{
 			return;
 		}
diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSAbstractIndexCacheMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSAbstractArchiveMixin.java
similarity index 89%
rename from runelite-mixins/src/main/java/net/runelite/mixins/RSAbstractIndexCacheMixin.java
rename to runelite-mixins/src/main/java/net/runelite/mixins/RSAbstractArchiveMixin.java
index 444be65691..5b83be84c9 100644
--- a/runelite-mixins/src/main/java/net/runelite/mixins/RSAbstractIndexCacheMixin.java
+++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSAbstractArchiveMixin.java
@@ -15,12 +15,12 @@ import net.runelite.api.mixins.Mixin;
 import net.runelite.api.mixins.Replace;
 import net.runelite.api.mixins.Shadow;
 import org.slf4j.Logger;
-import net.runelite.rs.api.RSAbstractIndexCache;
+import net.runelite.rs.api.RSAbstractArchive;
 import net.runelite.rs.api.RSClient;
-import net.runelite.rs.api.RSIndexCache;
+import net.runelite.rs.api.RSArchive;
 
-@Mixin(RSAbstractIndexCache.class)
-public abstract class RSAbstractIndexCacheMixin implements RSAbstractIndexCache
+@Mixin(RSAbstractArchive.class)
+public abstract class RSAbstractArchiveMixin implements RSAbstractArchive
 {
 	@Shadow("client")
 	private static RSClient client;
@@ -35,14 +35,14 @@ public abstract class RSAbstractIndexCacheMixin implements RSAbstractIndexCache
 		return overlayOutdated;
 	}
 
-	@Copy("takeRecord")
+	@Copy("takeFile")
 	abstract byte[] rs$getConfigData(int archiveId, int fileId);
 
-	@Replace("takeRecord")
+	@Replace("takeFile")
 	public byte[] rl$getConfigData(int archiveId, int fileId)
 	{
 		byte[] rsData = rs$getConfigData(archiveId, fileId);
-		RSIndexCache indexData = (RSIndexCache) this;
+		RSArchive indexData = (RSArchive) this;
 
 		if (!OverlayIndex.hasOverlay(indexData.getIndex(), archiveId))
 		{
diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSActorMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSActorMixin.java
index f25c98e263..65951bc9c5 100644
--- a/runelite-mixins/src/main/java/net/runelite/mixins/RSActorMixin.java
+++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSActorMixin.java
@@ -251,7 +251,7 @@ public abstract class RSActorMixin implements RSActor
 			{
 				client.getLogger().debug("You died!");
 
-				LocalPlayerDeath event = new LocalPlayerDeath();
+				LocalPlayerDeath event = LocalPlayerDeath.INSTANCE;
 				client.getCallbacks().post(event);
 			}
 			else if (this instanceof RSNPC)
diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java
index ee569abca0..5336cf43d2 100644
--- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java
+++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java
@@ -24,6 +24,8 @@
  */
 package net.runelite.mixins;
 
+import java.util.HashSet;
+import java.util.Set;
 import net.runelite.api.ChatMessageType;
 import net.runelite.api.ClanMember;
 import net.runelite.api.EnumDefinition;
@@ -50,7 +52,6 @@ import net.runelite.api.MenuEntry;
 import net.runelite.api.MessageNode;
 import net.runelite.api.NPC;
 import net.runelite.api.Node;
-import net.runelite.api.PacketBuffer;
 import static net.runelite.api.Perspective.LOCAL_TILE_SIZE;
 import net.runelite.api.Player;
 import net.runelite.api.Point;
@@ -86,6 +87,7 @@ import net.runelite.api.events.ResizeableChanged;
 import net.runelite.api.events.UsernameChanged;
 import net.runelite.api.events.VarbitChanged;
 import net.runelite.api.events.WidgetLoaded;
+import net.runelite.api.events.WidgetPressed;
 import net.runelite.api.hooks.Callbacks;
 import net.runelite.api.hooks.DrawCallbacks;
 import net.runelite.api.vars.AccountType;
@@ -110,8 +112,9 @@ import net.runelite.api.mixins.MethodHook;
 import net.runelite.api.mixins.Mixin;
 import net.runelite.api.mixins.Replace;
 import net.runelite.api.mixins.Shadow;
+import net.runelite.rs.api.RSPacketBuffer;
 import org.slf4j.Logger;
-import net.runelite.rs.api.RSAbstractIndexCache;
+import net.runelite.rs.api.RSAbstractArchive;
 import net.runelite.rs.api.RSChatChannel;
 import net.runelite.rs.api.RSClanChat;
 import net.runelite.rs.api.RSClient;
@@ -200,7 +203,13 @@ public abstract class RSClientMixin implements RSClient
 	}
 
 	@Inject
-	private static boolean hideFriendAttackOptions;
+	private static boolean hideFriendAttackOptions = false;
+
+	@Inject
+	private static boolean hideFriendCastOptions = false;
+
+	@Inject
+	private static Set<String> unhiddenCasts = new HashSet<String>();
 
 	@Inject
 	@Override
@@ -209,6 +218,20 @@ public abstract class RSClientMixin implements RSClient
 		hideFriendAttackOptions = yes;
 	}
 
+	@Inject
+	@Override
+	public void setHideFriendCastOptions(boolean yes)
+	{
+		hideFriendCastOptions = yes;
+	}
+
+	@Inject
+	@Override
+	public void setUnhiddenCasts(Set<String> casts)
+	{
+		unhiddenCasts = casts;
+	}
+
 	@Inject
 	public RSClientMixin()
 	{
@@ -1094,14 +1117,14 @@ public abstract class RSClientMixin implements RSClient
 	@Inject
 	public static void canvasWidthChanged(int idx)
 	{
-		client.getCallbacks().post(new CanvasSizeChanged());
+		client.getCallbacks().post(CanvasSizeChanged.INSTANCE);
 	}
 
 	@FieldHook("canvasHeight")
 	@Inject
 	public static void canvasHeightChanged(int idx)
 	{
-		client.getCallbacks().post(new CanvasSizeChanged());
+		client.getCallbacks().post(CanvasSizeChanged.INSTANCE);
 	}
 
 	@Inject
@@ -1232,9 +1255,16 @@ public abstract class RSClientMixin implements RSClient
 	@Replace("menuAction")
 	static void rl$menuAction(int actionParam, int widgetId, int menuAction, int id, String menuOption, String menuTarget, int var6, int var7)
 	{
+		boolean authentic = true;
+		if (menuTarget != null && menuTarget.startsWith("!AUTHENTIC"))
+		{
+			authentic = false;
+			menuTarget = menuTarget.substring(10);
+		}
+
 		if (printMenuActions && client.getLogger().isDebugEnabled())
 		{
-			client.getLogger().debug("Menuaction: {} {} {} {} {} {} {} {}", actionParam, widgetId, menuAction, id, menuOption, menuTarget, var6, var7);
+			client.getLogger().debug("Menuaction: {} {} {} {} {} {} {} {} {}", actionParam, widgetId, menuAction, id, menuOption, menuTarget, var6, var7, authentic);
 		}
 
 		/* Along the way, the RuneScape client may change a menuAction by incrementing it with 2000.
@@ -1254,7 +1284,8 @@ public abstract class RSClientMixin implements RSClient
 				actionParam,
 				widgetId,
 				false
-			)
+			),
+			authentic
 		);
 
 		client.getCallbacks().post(menuOptionClicked);
@@ -1268,11 +1299,28 @@ public abstract class RSClientMixin implements RSClient
 			menuOptionClicked.getIdentifier(), menuOptionClicked.getOption(), menuOptionClicked.getTarget(), var6, var7);
 	}
 
+	@Override
+	@Inject
+	public void invokeMenuAction(int actionParam, int widgetId, int menuAction, int id, String menuOption, String menuTarget, int var6, int var7)
+	{
+		client.sendMenuAction(actionParam, widgetId, menuAction, id, menuOption, "!AUTHENTIC" + menuTarget, var6, var7);
+	}
+
+	@Inject
+	@FieldHook("tempMenuAction")
+	public static void onTempMenuActionChanged(int idx)
+	{
+		if (client.getTempMenuAction() != null)
+		{
+			client.getCallbacks().post(WidgetPressed.INSTANCE);
+		}
+	}
+
 	@FieldHook("Login_username")
 	@Inject
 	public static void onUsernameChanged(int idx)
 	{
-		client.getCallbacks().post(new UsernameChanged());
+		client.getCallbacks().post(UsernameChanged.INSTANCE);
 	}
 
 	@Override
@@ -1304,12 +1352,11 @@ public abstract class RSClientMixin implements RSClient
 		final MenuOpened event = new MenuOpened();
 		event.setMenuEntries(getMenuEntries());
 		callbacks.post(event);
-		client.setMenuEntries(event.getMenuEntries());
 	}
 
 	@Inject
 	@MethodHook("updateNpcs")
-	public static void updateNpcs(boolean var0, PacketBuffer var1)
+	public static void updateNpcs(boolean var0, RSPacketBuffer var1)
 	{
 		client.getCallbacks().updateNpcs();
 	}
@@ -1335,13 +1382,13 @@ public abstract class RSClientMixin implements RSClient
 	}
 
 	@Inject
-	@MethodHook("methodDraw")
-	public void methodDraw(boolean var1)
+	@MethodHook("draw")
+	public void draw(boolean var1)
 	{
 		callbacks.clientMainLoop();
 	}
 
-	@MethodHook("drawWidgetGroup")
+	@MethodHook("drawInterface")
 	@Inject
 	public static void renderWidgetLayer(Widget[] widgets, int parentId, int minX, int minY, int maxX, int maxY, int x, int y, int var8)
 	{
@@ -1444,7 +1491,7 @@ public abstract class RSClientMixin implements RSClient
 	@Override
 	public RSSprite[] getSprites(IndexDataBase source, int archiveId, int fileId)
 	{
-		RSAbstractIndexCache rsSource = (RSAbstractIndexCache) source;
+		RSAbstractArchive rsSource = (RSAbstractArchive) source;
 		byte[] configData = rsSource.getConfigData(archiveId, fileId);
 		if (configData == null)
 		{
@@ -1515,7 +1562,7 @@ public abstract class RSClientMixin implements RSClient
 	@FieldHook("cycleCntr")
 	public static void onCycleCntrChanged(int idx)
 	{
-		client.getCallbacks().post(new ClientTick());
+		client.getCallbacks().post(ClientTick.INSTANCE);
 	}
 
 	@Copy("shouldLeftClickOpenMenu")
@@ -1578,6 +1625,29 @@ public abstract class RSClientMixin implements RSClient
 	@Inject
 	static boolean shouldHideAttackOptionFor(RSPlayer p)
 	{
-		return hideFriendAttackOptions && p.isFriended() || p.isClanMember();
+		if (client.isSpellSelected())
+		{
+			return hideFriendCastOptions
+				&& (p.isFriended() || p.isClanMember())
+				&& !unhiddenCasts.contains(client.getSelectedSpellName());
+		}
+
+		return hideFriendAttackOptions && (p.isFriended() || p.isClanMember());
+	}
+
+	@Inject
+	@Override
+	public void addFriend(String friend)
+	{
+		RSFriendSystem friendSystem = getFriendManager();
+		friendSystem.addFriend(friend);
+	}
+
+	@Inject
+	@Override
+	public void removeFriend(String friend)
+	{
+		RSFriendSystem friendSystem = getFriendManager();
+		friendSystem.removeFriend(friend);
 	}
 }
\ No newline at end of file
diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSDynamicObjectMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSDynamicObjectMixin.java
index 5760e13157..ed1a4a70b9 100644
--- a/runelite-mixins/src/main/java/net/runelite/mixins/RSDynamicObjectMixin.java
+++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSDynamicObjectMixin.java
@@ -24,6 +24,7 @@
  */
 package net.runelite.mixins;
 
+import net.runelite.api.events.DynamicObjectAnimationChanged;
 import net.runelite.api.mixins.Copy;
 import net.runelite.api.mixins.FieldHook;
 import net.runelite.api.mixins.Inject;
@@ -89,6 +90,14 @@ public abstract class RSDynamicObjectMixin implements RSDynamicObject
 	public void rl$init(int id, int type, int orientation, int plane, int x, int y, int animationID, boolean var8, RSEntity var9)
 	{
 		this.animationID = animationID;
+
+		if (animationID != -1)
+		{
+			DynamicObjectAnimationChanged dynamicObjectAnimationChanged = new DynamicObjectAnimationChanged();
+			dynamicObjectAnimationChanged.setObject(id);
+			dynamicObjectAnimationChanged.setAnimation(animationID);
+			client.getCallbacks().post(dynamicObjectAnimationChanged);
+		}
 	}
 
 	@Inject
diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSFriendSystemMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSFriendSystemMixin.java
index 7497e7c2a5..d273a3bf33 100644
--- a/runelite-mixins/src/main/java/net/runelite/mixins/RSFriendSystemMixin.java
+++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSFriendSystemMixin.java
@@ -1,6 +1,7 @@
 package net.runelite.mixins;
 
-import net.runelite.api.events.RemovedFriend;
+import net.runelite.api.events.FriendAdded;
+import net.runelite.api.events.FriendRemoved;
 import net.runelite.api.mixins.Inject;
 import net.runelite.api.mixins.MethodHook;
 import net.runelite.api.mixins.Mixin;
@@ -18,7 +19,15 @@ public abstract class RSFriendSystemMixin implements RSFriendSystem
 	@Inject
 	public void rl$removeFriend(String friendName)
 	{
-		RemovedFriend removedFriend = new RemovedFriend(friendName);
-		client.getCallbacks().post(removedFriend);
+		FriendRemoved friendRemoved = new FriendRemoved(friendName);
+		client.getCallbacks().post(friendRemoved);
+	}
+
+	@MethodHook("addFriend")
+	@Inject
+	public void rl$addFriend(String friendName)
+	{
+		FriendAdded friendAdded = new FriendAdded(friendName);
+		client.getCallbacks().post(friendAdded);
 	}
 }
diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSHealthBarDefinitionMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSHealthBarDefinitionMixin.java
index f6f31abdf6..383892e7b5 100644
--- a/runelite-mixins/src/main/java/net/runelite/mixins/RSHealthBarDefinitionMixin.java
+++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSHealthBarDefinitionMixin.java
@@ -15,7 +15,7 @@ public abstract class RSHealthBarDefinitionMixin implements RSHealthBarDefinitio
 	@Shadow("client")
 	private static RSClient client;
 
-	@MethodHook(value = "read", end = true)
+	@MethodHook(value = "decode", end = true)
 	@Inject
 	public void onRead(RSBuffer buffer)
 	{
diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSRasterizer2DMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSRasterizer2DMixin.java
index 8b8c3534e6..0233976309 100644
--- a/runelite-mixins/src/main/java/net/runelite/mixins/RSRasterizer2DMixin.java
+++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSRasterizer2DMixin.java
@@ -27,13 +27,13 @@ public abstract class RSRasterizer2DMixin implements RSClient
 		pixels[index] = value & 0x00FFFFFF | outAlpha << 24;
 	}
 
-	@Copy("drawGradientAlpha")
-	private static void rs$raster2d6(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7)
+	@Copy("Rasterizer2D_fillRectangleGradientAlpha")
+	private static void rs$drawGradientAlpha(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7)
 	{
 		throw new RuntimeException();
 	}
 
-	@Replace("drawGradientAlpha")
+	@Replace("Rasterizer2D_fillRectangleGradientAlpha")
 	private static void rl$drawGradientAlpha(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7)
 	{
 		final int width = client.getGraphicsPixelsWidth();
@@ -45,7 +45,7 @@ public abstract class RSRasterizer2DMixin implements RSClient
 
 		if (!client.isGpu())
 		{
-			rs$raster2d6(var0, var1, var2, var3, var4, var5, var6, var7);
+			rs$drawGradientAlpha(var0, var1, var2, var3, var4, var5, var6, var7);
 			return;
 		}
 
diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSTextureMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSTextureMixin.java
index b273fec9a6..6715cba2e4 100644
--- a/runelite-mixins/src/main/java/net/runelite/mixins/RSTextureMixin.java
+++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSTextureMixin.java
@@ -44,10 +44,10 @@ public abstract class RSTextureMixin implements RSTexture
 	@Inject
 	private float rl$v;
 
-	@Copy("Texture_animate")
+	@Copy("animate")
 	public abstract void rs$animate(int diff);
 
-	@Replace("Texture_animate")
+	@Replace("animate")
 	public void rl$animate(int diff)
 	{
 		// The client animates textures by cycling the backing pixels of the texture each fram
diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java
index 4c59a88e53..208c813667 100644
--- a/runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java
+++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java
@@ -496,7 +496,7 @@ public abstract class RSWidgetMixin implements RSWidget
 
 		client.getLogger().trace("Posting widget position changed");
 
-		WidgetPositioned widgetPositioned = new WidgetPositioned();
+		WidgetPositioned widgetPositioned = WidgetPositioned.INSTANCE;
 		client.getCallbacks().postDeferred(widgetPositioned);
 	}
 
diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/SpriteMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/SpriteMixin.java
index 6bb2f91a8b..b08827b18a 100644
--- a/runelite-mixins/src/main/java/net/runelite/mixins/SpriteMixin.java
+++ b/runelite-mixins/src/main/java/net/runelite/mixins/SpriteMixin.java
@@ -7,7 +7,7 @@ import net.runelite.api.mixins.Copy;
 import net.runelite.api.mixins.Inject;
 import net.runelite.api.mixins.Mixin;
 import net.runelite.api.mixins.Replace;
-import net.runelite.rs.api.RSAbstractIndexCache;
+import net.runelite.rs.api.RSAbstractArchive;
 import net.runelite.rs.api.RSClient;
 import net.runelite.rs.api.RSSprite;
 
@@ -35,13 +35,13 @@ public abstract class SpriteMixin implements RSClient
 	}
 
 	@Copy("readSprite")
-	public static RSSprite rs$loadSprite(RSAbstractIndexCache var0, int var1, int var2)
+	public static RSSprite rs$loadSprite(RSAbstractArchive var0, int var1, int var2)
 	{
 		throw new RuntimeException();
 	}
 
 	@Replace("readSprite")
-	public static RSSprite rl$loadSprite(RSAbstractIndexCache var0, int var1, int var2)
+	public static RSSprite rl$loadSprite(RSAbstractArchive var0, int var1, int var2)
 	{
 		Sprite sprite = spriteOverrides.get(var1);
 
diff --git a/runelite-plugin-archetype/pom.xml b/runelite-plugin-archetype/pom.xml
index 1fd933b70e..15ff5ed7f8 100644
--- a/runelite-plugin-archetype/pom.xml
+++ b/runelite-plugin-archetype/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.28-SNAPSHOT</version>
+		<version>1.5.29-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>runelite-plugin-archetype</artifactId>
diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml
index 25f0b49f51..6387f338e7 100644
--- a/runelite-script-assembler-plugin/pom.xml
+++ b/runelite-script-assembler-plugin/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.28-SNAPSHOT</version>
+		<version>1.5.29-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>script-assembler-plugin</artifactId>
diff --git a/runescape-api/pom.xml b/runescape-api/pom.xml
index 710b68be9f..cfe8d98273 100644
--- a/runescape-api/pom.xml
+++ b/runescape-api/pom.xml
@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.28-SNAPSHOT</version>
+		<version>1.5.29-SNAPSHOT</version>
 	</parent>
 
 	<groupId>net.runelite.rs</groupId>
diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSAbstractIndexCache.java b/runescape-api/src/main/java/net/runelite/rs/api/RSAbstractArchive.java
similarity index 65%
rename from runescape-api/src/main/java/net/runelite/rs/api/RSAbstractIndexCache.java
rename to runescape-api/src/main/java/net/runelite/rs/api/RSAbstractArchive.java
index f561f1e562..052bc4ee74 100644
--- a/runescape-api/src/main/java/net/runelite/rs/api/RSAbstractIndexCache.java
+++ b/runescape-api/src/main/java/net/runelite/rs/api/RSAbstractArchive.java
@@ -3,8 +3,8 @@ package net.runelite.rs.api;
 import net.runelite.api.IndexDataBase;
 import net.runelite.mapping.Import;
 
-public interface RSAbstractIndexCache extends IndexDataBase
+public interface RSAbstractArchive extends IndexDataBase
 {
-	@Import("takeRecord")
+	@Import("takeFile")
 	byte[] getConfigData(int archiveId, int fileId);
 }
diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSActor.java b/runescape-api/src/main/java/net/runelite/rs/api/RSActor.java
index 24cc729f68..bc094b0f91 100644
--- a/runescape-api/src/main/java/net/runelite/rs/api/RSActor.java
+++ b/runescape-api/src/main/java/net/runelite/rs/api/RSActor.java
@@ -100,7 +100,7 @@ public interface RSActor extends RSEntity, Actor
 
 	// Idle animation
 
-	@Import("idleSequence")
+	@Import("readySequence")
 	@Override
 	void setIdlePoseAnimation(int animation);
 
diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSIndexCache.java b/runescape-api/src/main/java/net/runelite/rs/api/RSArchive.java
similarity index 64%
rename from runescape-api/src/main/java/net/runelite/rs/api/RSIndexCache.java
rename to runescape-api/src/main/java/net/runelite/rs/api/RSArchive.java
index bf68b6cba4..25f1cb2cef 100644
--- a/runescape-api/src/main/java/net/runelite/rs/api/RSIndexCache.java
+++ b/runescape-api/src/main/java/net/runelite/rs/api/RSArchive.java
@@ -2,7 +2,7 @@ package net.runelite.rs.api;
 
 import net.runelite.mapping.Import;
 
-public interface RSIndexCache extends RSAbstractIndexCache
+public interface RSArchive extends RSAbstractArchive
 {
 	@Import("index")
 	int getIndex();
diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSBuddy.java b/runescape-api/src/main/java/net/runelite/rs/api/RSBuddy.java
index e13893c244..77b62b5aca 100644
--- a/runescape-api/src/main/java/net/runelite/rs/api/RSBuddy.java
+++ b/runescape-api/src/main/java/net/runelite/rs/api/RSBuddy.java
@@ -5,7 +5,7 @@ import net.runelite.mapping.Import;
 
 public interface RSBuddy extends ChatPlayer, RSUser
 {
-	@Import("world0")
+	@Import("getWorld")
 	@Override
 	int getWorld();
 
diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java
index 17f88f3eb3..f1095a3f00 100644
--- a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java
+++ b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java
@@ -84,7 +84,7 @@ public interface RSClient extends RSGameShell, Client
 	@Override
 	int getFPS();
 
-	@Import("minimapOrientation")
+	@Import("camAngleY")
 	@Override
 	int getMapAngle();
 
@@ -187,7 +187,7 @@ public interface RSClient extends RSGameShell, Client
 	@Override
 	void setDraggedOnWidget(Widget widget);
 
-	@Import("widgets")
+	@Import("interfaceComponents")
 	RSWidget[][] getWidgets();
 
 	/**
@@ -390,8 +390,10 @@ public interface RSClient extends RSGameShell, Client
 	RSSprite createItemSprite(int itemId, int quantity, int thickness, int borderColor, int stackable, boolean noted);
 
 	@Import("menuAction")
-	@Override
-	void invokeMenuAction(int n2, int n3, int n4, int n5, String string, String string2, int n6, int n7);
+	void sendMenuAction(int n2, int n3, int n4, int n5, String string, String string2, int n6, int n7);
+
+	@Import("tempMenuAction")
+	RSMenuAction getTempMenuAction();
 
 	@Import("decodeSprite")
 	void decodeSprite(byte[] data);
@@ -441,19 +443,19 @@ public interface RSClient extends RSGameShell, Client
 	@Import("indexedSpritePalette")
 	void setIndexedSpritePalette(int[] indexedSpritePalette);
 
-	@Import("indexCache8")
+	@Import("archive8")
 	@Override
-	RSAbstractIndexCache getIndexSprites();
+	RSAbstractArchive getIndexSprites();
 
-	@Import("indexCache12")
+	@Import("archive12")
 	@Override
-	RSAbstractIndexCache getIndexScripts();
+	RSAbstractArchive getIndexScripts();
 
 	@Import("widgetClickMasks")
 	@Override
 	RSNodeHashTable getWidgetFlags();
 
-	@Import("widgetGroupParents")
+	@Import("interfaceParents")
 	@Override
 	RSNodeHashTable getComponentTable();
 
@@ -514,7 +516,7 @@ public interface RSClient extends RSGameShell, Client
 	 * Get the widget top group. widgets[topGroup] contains widgets with
 	 * parentId -1, which are the widget roots.
 	 */
-	@Import("rootWidgetGroup")
+	@Import("rootInterface")
 	int getWidgetRoot();
 
 	@Import("WorldMapElement_cached")
@@ -662,10 +664,10 @@ public interface RSClient extends RSGameShell, Client
 	 *
 	 * (1) JAU - Jagex Angle Unit; 1/1024 of a revolution
 	 */
-	@Import("cameraPitchTarget")
+	@Import("camAngleX")
 	int getCameraPitchTarget();
 
-	@Import("cameraPitchTarget")
+	@Import("camAngleX")
 	void setCameraPitchTarget(int pitch);
 
 	@Import("Scene_cameraPitchSine")
@@ -979,7 +981,7 @@ public interface RSClient extends RSGameShell, Client
 	@Import("Rasterizer2D_drawVerticalLine")
 	void rasterizerDrawVerticalLine(int x, int y, int h, int rgb);
 
-	@Import("drawGradient")
+	@Import("Rasterizer2D_fillRectangleGradient")
 	void rasterizerDrawGradient(int x, int y, int w, int h, int rgbTop, int rgbBottom);
 
 	@Import("Rasterizer2D_fillRectangleAlpha")
@@ -1012,10 +1014,10 @@ public interface RSClient extends RSGameShell, Client
 	String getSelectedSpellName();
 
 	@Import("isSpellSelected")
-	boolean getIsSpellSelected();
+	boolean isSpellSelected();
 
 	@Import("readSoundEffect")
-	RSSoundEffect getTrack(RSAbstractIndexCache indexData, int id, int var0);
+	RSSoundEffect getTrack(RSAbstractArchive indexData, int id, int var0);
 
 	@Import("createRawPcmStream")
 	RSRawPcmStream createRawPcmStream(RSRawSound audioNode, int var0, int volume);
@@ -1023,8 +1025,8 @@ public interface RSClient extends RSGameShell, Client
 	@Import("pcmStreamMixer")
 	RSPcmStreamMixer getSoundEffectAudioQueue();
 
-	@Import("indexCache4")
-	RSAbstractIndexCache getIndexCache4();
+	@Import("archive4")
+	RSAbstractArchive getIndexCache4();
 
 	@Import("decimator")
 	RSDecimator getSoundEffectResampler();
diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSEntity.java b/runescape-api/src/main/java/net/runelite/rs/api/RSEntity.java
index 89229d0fb6..0392a0dbbf 100644
--- a/runescape-api/src/main/java/net/runelite/rs/api/RSEntity.java
+++ b/runescape-api/src/main/java/net/runelite/rs/api/RSEntity.java
@@ -40,7 +40,7 @@ public interface RSEntity extends RSNode, Renderable
 	@Override
 	RSModel getModel();
 
-	@Import("renderDraw")
+	@Import("draw")
 	@Override
 	void draw(int orientation, int pitchSin, int pitchCos, int yawSin, int yawCos, int x, int y, int z, long hash);
 }
diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSEnumDefinition.java b/runescape-api/src/main/java/net/runelite/rs/api/RSEnumDefinition.java
index 0e4206e29a..494cdfb111 100644
--- a/runescape-api/src/main/java/net/runelite/rs/api/RSEnumDefinition.java
+++ b/runescape-api/src/main/java/net/runelite/rs/api/RSEnumDefinition.java
@@ -13,13 +13,13 @@ public interface RSEnumDefinition extends EnumDefinition, RSDualNode
 	@Override
 	int[] getIntVals();
 
-	@Import("stringVals")
+	@Import("strVals")
 	@Override
 	String[] getStringVals();
 
 	@Import("defaultInt")
 	int getDefaultInt();
 
-	@Import("defaultString")
+	@Import("defaultStr")
 	String getDefaultString();
 }
diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSFriendSystem.java b/runescape-api/src/main/java/net/runelite/rs/api/RSFriendSystem.java
index 017971b308..ce0977f4a8 100644
--- a/runescape-api/src/main/java/net/runelite/rs/api/RSFriendSystem.java
+++ b/runescape-api/src/main/java/net/runelite/rs/api/RSFriendSystem.java
@@ -13,4 +13,10 @@ public interface RSFriendSystem extends FriendManager
 
 	@Import("isFriended")
 	boolean isFriended(RSUsername var1, boolean var2);
+
+	@Import("addFriend")
+	void addFriend(String username);
+
+	@Import("removeFriend")
+	void removeFriend(String username);
 }
diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWidgetGroupParent.java b/runescape-api/src/main/java/net/runelite/rs/api/RSInterfaceParent.java
similarity index 70%
rename from runescape-api/src/main/java/net/runelite/rs/api/RSWidgetGroupParent.java
rename to runescape-api/src/main/java/net/runelite/rs/api/RSInterfaceParent.java
index 34c867e031..f89d359baf 100644
--- a/runescape-api/src/main/java/net/runelite/rs/api/RSWidgetGroupParent.java
+++ b/runescape-api/src/main/java/net/runelite/rs/api/RSInterfaceParent.java
@@ -3,7 +3,7 @@ package net.runelite.rs.api;
 import net.runelite.api.WidgetNode;
 import net.runelite.mapping.Import;
 
-public interface RSWidgetGroupParent extends RSNode, WidgetNode
+public interface RSInterfaceParent extends RSNode, WidgetNode
 {
 	@Import("group")
 	@Override
diff --git a/runelite-api/src/main/java/net/runelite/api/PacketBuffer.java b/runescape-api/src/main/java/net/runelite/rs/api/RSMenuAction.java
similarity index 92%
rename from runelite-api/src/main/java/net/runelite/api/PacketBuffer.java
rename to runescape-api/src/main/java/net/runelite/rs/api/RSMenuAction.java
index a44f4c9ac9..02cf730a39 100644
--- a/runelite-api/src/main/java/net/runelite/api/PacketBuffer.java
+++ b/runescape-api/src/main/java/net/runelite/rs/api/RSMenuAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Adam <Adam@sigterm.info>
+ * Copyright (c) 2019, https://runelitepl.us
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -22,8 +22,8 @@
  * (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.api;
+package net.runelite.rs.api;
 
-public interface PacketBuffer
+public interface RSMenuAction
 {
 }
diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSNPCDefinition.java b/runescape-api/src/main/java/net/runelite/rs/api/RSNPCDefinition.java
index fef328c669..7e6fd4ba16 100644
--- a/runescape-api/src/main/java/net/runelite/rs/api/RSNPCDefinition.java
+++ b/runescape-api/src/main/java/net/runelite/rs/api/RSNPCDefinition.java
@@ -9,7 +9,7 @@ public interface RSNPCDefinition extends NPCDefinition
 	@Override
 	String getName();
 
-	@Import("archives")
+	@Import("models")
 	@Override
 	int[] getModels();
 
diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSPacketBuffer.java b/runescape-api/src/main/java/net/runelite/rs/api/RSPacketBuffer.java
index 614734671d..602a497d4a 100644
--- a/runescape-api/src/main/java/net/runelite/rs/api/RSPacketBuffer.java
+++ b/runescape-api/src/main/java/net/runelite/rs/api/RSPacketBuffer.java
@@ -1,7 +1,5 @@
 package net.runelite.rs.api;
 
-import net.runelite.api.PacketBuffer;
-
-public interface RSPacketBuffer extends PacketBuffer
+public interface RSPacketBuffer
 {
 }
diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSScene.java b/runescape-api/src/main/java/net/runelite/rs/api/RSScene.java
index 0949305e33..0b2705397d 100644
--- a/runescape-api/src/main/java/net/runelite/rs/api/RSScene.java
+++ b/runescape-api/src/main/java/net/runelite/rs/api/RSScene.java
@@ -34,6 +34,6 @@ public interface RSScene extends Scene
 	@Import("ySize")
 	int getMaxZ();
 
-	@Import("Scene_minPlane")
+	@Import("minPlane")
 	int getMinLevel();
 }
diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSVarbitDefinition.java b/runescape-api/src/main/java/net/runelite/rs/api/RSVarbitDefinition.java
index 2624226dd5..947106c183 100644
--- a/runescape-api/src/main/java/net/runelite/rs/api/RSVarbitDefinition.java
+++ b/runescape-api/src/main/java/net/runelite/rs/api/RSVarbitDefinition.java
@@ -4,12 +4,12 @@ import net.runelite.mapping.Import;
 
 public interface RSVarbitDefinition extends RSDualNode
 {
-	@Import("varp")
+	@Import("baseVar")
 	int getIndex();
 
-	@Import("lowBit")
+	@Import("startBit")
 	int getLeastSignificantBit();
 
-	@Import("highBit")
+	@Import("endBit")
 	int getMostSignificantBit();
 }
diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java
index f8134a75b5..85c45da695 100644
--- a/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java
+++ b/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java
@@ -312,7 +312,7 @@ public interface RSWidget extends Widget
 	@Override
 	void setHasListener(boolean hasListener);
 
-	@Import("onKeyListener")
+	@Import("onKey")
 	@Override
 	Object[] getOnKeyListener();
 
@@ -320,11 +320,11 @@ public interface RSWidget extends Widget
 	@Override
 	Object[] getOnLoadListener();
 
-	@Import("onDialogAbortListener")
+	@Import("onDialogAbort")
 	@Override
 	void setOnDialogAbortListener(Object... args);
 
-	@Import("onKeyListener")
+	@Import("onKey")
 	@Override
 	void setOnKeyListener(Object... args);
 
diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMap.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMap.java
index eb7f92d551..c13e58d668 100644
--- a/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMap.java
+++ b/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMap.java
@@ -43,7 +43,7 @@ public interface RSWorldMap extends RenderOverview
 	@Override
 	RSWorldMapManager getWorldMapManager();
 
-	@Import("initializeWorldMap")
+	@Import("initializeWorldMapManager")
 	@Override
 	void initializeWorldMap(WorldMapData var1);
 
diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMapManager.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMapManager.java
index 9a534ce187..ec78157ef3 100644
--- a/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMapManager.java
+++ b/runescape-api/src/main/java/net/runelite/rs/api/RSWorldMapManager.java
@@ -5,7 +5,7 @@ import net.runelite.mapping.Import;
 
 public interface RSWorldMapManager extends WorldMapManager
 {
-	@Import("isLoaded0")
+	@Import("isLoaded")
 	@Override
 	boolean isLoaded();
 
diff --git a/runescape-client/pom.xml b/runescape-client/pom.xml
index 04e2850dde..611fd54161 100644
--- a/runescape-client/pom.xml
+++ b/runescape-client/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>net.runelite</groupId>
 		<artifactId>runelite-parent</artifactId>
-		<version>1.5.28-SNAPSHOT</version>
+		<version>1.5.29-SNAPSHOT</version>
 	</parent>
 
 	<groupId>net.runelite.rs</groupId>
@@ -16,7 +16,7 @@
 		<dependency>
 			<groupId>net.runelite.rs</groupId>
 			<artifactId>runescape-api</artifactId>
-			<version>1.5.28-SNAPSHOT</version>
+			<version>1.5.29-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
diff --git a/runescape-client/src/main/java/AbstractArchive.java b/runescape-client/src/main/java/AbstractArchive.java
new file mode 100644
index 0000000000..8c9bc68e6f
--- /dev/null
+++ b/runescape-client/src/main/java/AbstractArchive.java
@@ -0,0 +1,773 @@
+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("ir")
+@Implements("AbstractArchive")
+public abstract class AbstractArchive {
+   @ObfuscatedName("qb")
+   @ObfuscatedSignature(
+      signature = "Lco;"
+   )
+   @Export("pcmPlayer1")
+   static PcmPlayer pcmPlayer1;
+   @ObfuscatedName("i")
+   @ObfuscatedSignature(
+      signature = "Lgo;"
+   )
+   @Export("gzipDecompressor")
+   static GzipDecompressor gzipDecompressor;
+   @ObfuscatedName("s")
+   @ObfuscatedGetter(
+      intValue = -244224193
+   )
+   static int field1;
+   @ObfuscatedName("au")
+   @Export("garbageCollector")
+   static GarbageCollectorMXBean garbageCollector;
+   @ObfuscatedName("bu")
+   @ObfuscatedGetter(
+      intValue = 334735939
+   )
+   static int field2;
+   @ObfuscatedName("di")
+   @ObfuscatedSignature(
+      signature = "Lit;"
+   )
+   @Export("archive0")
+   static Archive archive0;
+   @ObfuscatedName("f")
+   @ObfuscatedGetter(
+      intValue = 1694798923
+   )
+   @Export("groupCount")
+   int groupCount;
+   @ObfuscatedName("q")
+   @Export("groupIds")
+   int[] groupIds;
+   @ObfuscatedName("w")
+   @Export("groupNameHashes")
+   int[] groupNameHashes;
+   @ObfuscatedName("o")
+   @ObfuscatedSignature(
+      signature = "Llv;"
+   )
+   @Export("groupNameHashTable")
+   IntHashTable groupNameHashTable;
+   @ObfuscatedName("u")
+   @Export("groupCrcs")
+   int[] groupCrcs;
+   @ObfuscatedName("g")
+   @Export("groupVersions")
+   int[] groupVersions;
+   @ObfuscatedName("l")
+   @Export("fileCounts")
+   int[] fileCounts;
+   @ObfuscatedName("e")
+   @Export("fileIds")
+   int[][] fileIds;
+   @ObfuscatedName("x")
+   @Export("fileNameHashes")
+   int[][] fileNameHashes;
+   @ObfuscatedName("d")
+   @ObfuscatedSignature(
+      signature = "[Llv;"
+   )
+   @Export("fileNameHashTables")
+   IntHashTable[] fileNameHashTables;
+   @ObfuscatedName("k")
+   @Export("groups")
+   Object[] groups;
+   @ObfuscatedName("n")
+   @Export("files")
+   Object[][] files;
+   @ObfuscatedName("a")
+   @ObfuscatedGetter(
+      intValue = -530370811
+   )
+   @Export("hash")
+   public int hash;
+   @ObfuscatedName("z")
+   @Export("releaseGroups")
+   boolean releaseGroups;
+   @ObfuscatedName("j")
+   @Export("shallowFiles")
+   boolean shallowFiles;
+
+   AbstractArchive(boolean releaseGroups, boolean shallowFiles) {
+      this.releaseGroups = releaseGroups;
+      this.shallowFiles = shallowFiles;
+   }
+
+   @ObfuscatedName("m")
+   @ObfuscatedSignature(
+      signature = "([BB)V",
+      garbageValue = "0"
+   )
+   @Export("decodeIndex")
+   void decodeIndex(byte[] var1) {
+      this.hash = WallDecoration.method3257(var1, var1.length);
+      Buffer var2 = new Buffer(Strings.decompressBytes(var1));
+      int var3 = var2.readUnsignedByte();
+      if (var3 >= 5 && var3 <= 7) {
+         if (var3 >= 6) {
+            var2.readInt();
+         }
+
+         int var4 = var2.readUnsignedByte();
+         if (var3 >= 7) {
+            this.groupCount = var2.method50();
+         } else {
+            this.groupCount = var2.readUnsignedShort();
+         }
+
+         int var5 = 0;
+         int var6 = -1;
+         this.groupIds = new int[this.groupCount];
+         int var7;
+         if (var3 >= 7) {
+            for (var7 = 0; var7 < this.groupCount; ++var7) {
+               this.groupIds[var7] = var5 += var2.method50();
+               if (this.groupIds[var7] > var6) {
+                  var6 = this.groupIds[var7];
+               }
+            }
+         } else {
+            for (var7 = 0; var7 < this.groupCount; ++var7) {
+               this.groupIds[var7] = var5 += var2.readUnsignedShort();
+               if (this.groupIds[var7] > var6) {
+                  var6 = this.groupIds[var7];
+               }
+            }
+         }
+
+         this.groupCrcs = new int[var6 + 1];
+         this.groupVersions = new int[var6 + 1];
+         this.fileCounts = new int[var6 + 1];
+         this.fileIds = new int[var6 + 1][];
+         this.groups = new Object[var6 + 1];
+         this.files = new Object[var6 + 1][];
+         if (var4 != 0) {
+            this.groupNameHashes = new int[var6 + 1];
+
+            for (var7 = 0; var7 < this.groupCount; ++var7) {
+               this.groupNameHashes[this.groupIds[var7]] = var2.readInt();
+            }
+
+            this.groupNameHashTable = new IntHashTable(this.groupNameHashes);
+         }
+
+         for (var7 = 0; var7 < this.groupCount; ++var7) {
+            this.groupCrcs[this.groupIds[var7]] = var2.readInt();
+         }
+
+         for (var7 = 0; var7 < this.groupCount; ++var7) {
+            this.groupVersions[this.groupIds[var7]] = var2.readInt();
+         }
+
+         for (var7 = 0; var7 < this.groupCount; ++var7) {
+            this.fileCounts[this.groupIds[var7]] = var2.readUnsignedShort();
+         }
+
+         int var8;
+         int var9;
+         int var10;
+         int var11;
+         int var12;
+         if (var3 >= 7) {
+            for (var7 = 0; var7 < this.groupCount; ++var7) {
+               var8 = this.groupIds[var7];
+               var9 = this.fileCounts[var8];
+               var5 = 0;
+               var10 = -1;
+               this.fileIds[var8] = new int[var9];
+
+               for (var11 = 0; var11 < var9; ++var11) {
+                  var12 = this.fileIds[var8][var11] = var5 += var2.method50();
+                  if (var12 > var10) {
+                     var10 = var12;
+                  }
+               }
+
+               this.files[var8] = new Object[var10 + 1];
+            }
+         } else {
+            for (var7 = 0; var7 < this.groupCount; ++var7) {
+               var8 = this.groupIds[var7];
+               var9 = this.fileCounts[var8];
+               var5 = 0;
+               var10 = -1;
+               this.fileIds[var8] = new int[var9];
+
+               for (var11 = 0; var11 < var9; ++var11) {
+                  var12 = this.fileIds[var8][var11] = var5 += var2.readUnsignedShort();
+                  if (var12 > var10) {
+                     var10 = var12;
+                  }
+               }
+
+               this.files[var8] = new Object[var10 + 1];
+            }
+         }
+
+         if (var4 != 0) {
+            this.fileNameHashes = new int[var6 + 1][];
+            this.fileNameHashTables = new IntHashTable[var6 + 1];
+
+            for (var7 = 0; var7 < this.groupCount; ++var7) {
+               var8 = this.groupIds[var7];
+               var9 = this.fileCounts[var8];
+               this.fileNameHashes[var8] = new int[this.files[var8].length];
+
+               for (var10 = 0; var10 < var9; ++var10) {
+                  this.fileNameHashes[var8][this.fileIds[var8][var10]] = var2.readInt();
+               }
+
+               this.fileNameHashTables[var8] = new IntHashTable(this.fileNameHashes[var8]);
+            }
+         }
+
+      } else {
+         throw new RuntimeException("");
+      }
+   }
+
+   @ObfuscatedName("f")
+   @ObfuscatedSignature(
+      signature = "(II)V",
+      garbageValue = "2102142648"
+   )
+   void vmethod129(int var1) {
+   }
+
+   @ObfuscatedName("q")
+   @ObfuscatedSignature(
+      signature = "(III)[B",
+      garbageValue = "1945577069"
+   )
+   @Export("takeFile")
+   public byte[] takeFile(int group, int file) {
+      return this.takeFileEncrypted(group, file, (int[])null);
+   }
+
+   @ObfuscatedName("w")
+   @ObfuscatedSignature(
+      signature = "(II[II)[B",
+      garbageValue = "-1363136655"
+   )
+   @Export("takeFileEncrypted")
+   public byte[] takeFileEncrypted(int group, int file, int[] xteaKey) {
+      if (group >= 0 && group < this.files.length && this.files[group] != null && file >= 0 && file < this.files[group].length) {
+         if (this.files[group][file] == null) {
+            boolean var4 = this.buildFiles(group, xteaKey);
+            if (!var4) {
+               this.loadGroup(group);
+               var4 = this.buildFiles(group, xteaKey);
+               if (!var4) {
+                  return null;
+               }
+            }
+         }
+
+         byte[] var5 = TextureProvider.byteArrayFromObject(this.files[group][file], false);
+         if (this.shallowFiles) {
+            this.files[group][file] = null;
+         }
+
+         return var5;
+      } else {
+         return null;
+      }
+   }
+
+   @ObfuscatedName("o")
+   @ObfuscatedSignature(
+      signature = "(III)Z",
+      garbageValue = "-1822260214"
+   )
+   @Export("tryLoadFile")
+   public boolean tryLoadFile(int group, int file) {
+      if (group >= 0 && group < this.files.length && this.files[group] != null && file >= 0 && file < this.files[group].length) {
+         if (this.files[group][file] != null) {
+            return true;
+         } else if (this.groups[group] != null) {
+            return true;
+         } else {
+            this.loadGroup(group);
+            return this.groups[group] != null;
+         }
+      } else {
+         return false;
+      }
+   }
+
+   @ObfuscatedName("u")
+   @ObfuscatedSignature(
+      signature = "(II)Z",
+      garbageValue = "-1923759754"
+   )
+   public boolean method1(int var1) {
+      if (this.files.length == 1) {
+         return this.tryLoadFile(0, var1);
+      } else if (this.files[var1].length == 1) {
+         return this.tryLoadFile(var1, 0);
+      } else {
+         throw new RuntimeException();
+      }
+   }
+
+   @ObfuscatedName("g")
+   @ObfuscatedSignature(
+      signature = "(II)Z",
+      garbageValue = "-374594123"
+   )
+   @Export("tryLoadGroup")
+   public boolean tryLoadGroup(int group) {
+      if (this.groups[group] != null) {
+         return true;
+      } else {
+         this.loadGroup(group);
+         return this.groups[group] != null;
+      }
+   }
+
+   @ObfuscatedName("l")
+   @ObfuscatedSignature(
+      signature = "(I)Z",
+      garbageValue = "1694975256"
+   )
+   public boolean method2() {
+      boolean var1 = true;
+
+      for (int var2 = 0; var2 < this.groupIds.length; ++var2) {
+         int var3 = this.groupIds[var2];
+         if (this.groups[var3] == null) {
+            this.loadGroup(var3);
+            if (this.groups[var3] == null) {
+               var1 = false;
+            }
+         }
+      }
+
+      return var1;
+   }
+
+   @ObfuscatedName("e")
+   @ObfuscatedSignature(
+      signature = "(II)I",
+      garbageValue = "-1809769865"
+   )
+   @Export("groupLoadPercent")
+   int groupLoadPercent(int var1) {
+      return this.groups[var1] != null ? 100 : 0;
+   }
+
+   @ObfuscatedName("x")
+   @ObfuscatedSignature(
+      signature = "(IS)[B",
+      garbageValue = "-10015"
+   )
+   @Export("takeFileFlat")
+   public byte[] takeFileFlat(int groupOrFile) {
+      if (this.files.length == 1) {
+         return this.takeFile(0, groupOrFile);
+      } else if (this.files[groupOrFile].length == 1) {
+         return this.takeFile(groupOrFile, 0);
+      } else {
+         throw new RuntimeException();
+      }
+   }
+
+   @ObfuscatedName("d")
+   @ObfuscatedSignature(
+      signature = "(III)[B",
+      garbageValue = "-755739011"
+   )
+   @Export("getFile")
+   public byte[] getFile(int group, int file) {
+      if (group >= 0 && group < this.files.length && this.files[group] != null && file >= 0 && file < this.files[group].length) {
+         if (this.files[group][file] == null) {
+            boolean var3 = this.buildFiles(group, (int[])null);
+            if (!var3) {
+               this.loadGroup(group);
+               var3 = this.buildFiles(group, (int[])null);
+               if (!var3) {
+                  return null;
+               }
+            }
+         }
+
+         byte[] var4 = TextureProvider.byteArrayFromObject(this.files[group][file], false);
+         return var4;
+      } else {
+         return null;
+      }
+   }
+
+   @ObfuscatedName("a")
+   @ObfuscatedSignature(
+      signature = "(IB)[B",
+      garbageValue = "68"
+   )
+   @Export("getFileFlat")
+   public byte[] getFileFlat(int groupOrFile) {
+      if (this.files.length == 1) {
+         return this.getFile(0, groupOrFile);
+      } else if (this.files[groupOrFile].length == 1) {
+         return this.getFile(groupOrFile, 0);
+      } else {
+         throw new RuntimeException();
+      }
+   }
+
+   @ObfuscatedName("z")
+   @ObfuscatedSignature(
+      signature = "(II)V",
+      garbageValue = "-1829145107"
+   )
+   @Export("loadGroup")
+   void loadGroup(int group) {
+   }
+
+   @ObfuscatedName("j")
+   @ObfuscatedSignature(
+      signature = "(IB)[I",
+      garbageValue = "28"
+   )
+   public int[] method3(int var1) {
+      return var1 >= 0 && var1 < this.fileIds.length ? this.fileIds[var1] : null;
+   }
+
+   @ObfuscatedName("s")
+   @ObfuscatedSignature(
+      signature = "(II)I",
+      garbageValue = "1178362496"
+   )
+   @Export("getGroupFileCount")
+   public int getGroupFileCount(int group) {
+      return this.files[group].length;
+   }
+
+   @ObfuscatedName("t")
+   @ObfuscatedSignature(
+      signature = "(I)I",
+      garbageValue = "1702434573"
+   )
+   @Export("getGroupCount")
+   public int getGroupCount() {
+      return this.files.length;
+   }
+
+   @ObfuscatedName("y")
+   @ObfuscatedSignature(
+      signature = "(B)V",
+      garbageValue = "38"
+   )
+   public void method6() {
+      for (int var1 = 0; var1 < this.groups.length; ++var1) {
+         this.groups[var1] = null;
+      }
+
+   }
+
+   @ObfuscatedName("h")
+   @ObfuscatedSignature(
+      signature = "(II)V",
+      garbageValue = "330258899"
+   )
+   public void method7(int var1) {
+      for (int var2 = 0; var2 < this.files[var1].length; ++var2) {
+         this.files[var1][var2] = null;
+      }
+
+   }
+
+   @ObfuscatedName("b")
+   @ObfuscatedSignature(
+      signature = "(I)V",
+      garbageValue = "-709581639"
+   )
+   public void method8() {
+      for (int var1 = 0; var1 < this.files.length; ++var1) {
+         if (this.files[var1] != null) {
+            for (int var2 = 0; var2 < this.files[var1].length; ++var2) {
+               this.files[var1][var2] = null;
+            }
+         }
+      }
+
+   }
+
+   @ObfuscatedName("c")
+   @ObfuscatedSignature(
+      signature = "(I[II)Z",
+      garbageValue = "-1835696874"
+   )
+   @Export("buildFiles")
+   boolean buildFiles(int group, int[] xteaKey) {
+      if (this.groups[group] == null) {
+         return false;
+      } else {
+         int var3 = this.fileCounts[group];
+         int[] var4 = this.fileIds[group];
+         Object[] var5 = this.files[group];
+         boolean var6 = true;
+
+         for (int var7 = 0; var7 < var3; ++var7) {
+            if (var5[var4[var7]] == null) {
+               var6 = false;
+               break;
+            }
+         }
+
+         if (var6) {
+            return true;
+         } else {
+            byte[] var18;
+            if (xteaKey == null || xteaKey[0] == 0 && xteaKey[1] == 0 && xteaKey[2] == 0 && xteaKey[3] == 0) {
+               var18 = TextureProvider.byteArrayFromObject(this.groups[group], false);
+            } else {
+               var18 = TextureProvider.byteArrayFromObject(this.groups[group], true);
+               Buffer var8 = new Buffer(var18);
+               var8.xteaDecrypt(xteaKey, 5, var8.array.length);
+            }
+
+            byte[] var19 = Strings.decompressBytes(var18);
+            if (this.releaseGroups) {
+               this.groups[group] = null;
+            }
+
+            if (var3 > 1) {
+               int var9 = var19.length;
+               --var9;
+               int var10 = var19[var9] & 255;
+               var9 -= var10 * var3 * 4;
+               Buffer var11 = new Buffer(var19);
+               int[] var12 = new int[var3];
+               var11.index = var9;
+
+               int var13;
+               int var14;
+               for (int var15 = 0; var15 < var10; ++var15) {
+                  var13 = 0;
+
+                  for (var14 = 0; var14 < var3; ++var14) {
+                     var13 += var11.readInt();
+                     var12[var14] += var13;
+                  }
+               }
+
+               byte[][] var20 = new byte[var3][];
+
+               for (var13 = 0; var13 < var3; ++var13) {
+                  var20[var13] = new byte[var12[var13]];
+                  var12[var13] = 0;
+               }
+
+               var11.index = var9;
+               var13 = 0;
+
+               for (var14 = 0; var14 < var10; ++var14) {
+                  int var16 = 0;
+
+                  for (int var17 = 0; var17 < var3; ++var17) {
+                     var16 += var11.readInt();
+                     System.arraycopy(var19, var13, var20[var17], var12[var17], var16);
+                     var12[var17] += var16;
+                     var13 += var16;
+                  }
+               }
+
+               for (var14 = 0; var14 < var3; ++var14) {
+                  if (!this.shallowFiles) {
+                     var5[var4[var14]] = Projectile.byteArrayToObject(var20[var14], false);
+                  } else {
+                     var5[var4[var14]] = var20[var14];
+                  }
+               }
+            } else if (!this.shallowFiles) {
+               var5[var4[0]] = Projectile.byteArrayToObject(var19, false);
+            } else {
+               var5[var4[0]] = var19;
+            }
+
+            return true;
+         }
+      }
+   }
+
+   @ObfuscatedName("p")
+   @ObfuscatedSignature(
+      signature = "(Ljava/lang/String;I)I",
+      garbageValue = "-224510300"
+   )
+   @Export("getGroupId")
+   public int getGroupId(String groupName) {
+      groupName = groupName.toLowerCase();
+      return this.groupNameHashTable.get(Client.hashString(groupName));
+   }
+
+   @ObfuscatedName("v")
+   @ObfuscatedSignature(
+      signature = "(ILjava/lang/String;I)I",
+      garbageValue = "-443631072"
+   )
+   @Export("getFileId")
+   public int getFileId(int group, String fileName) {
+      fileName = fileName.toLowerCase();
+      return this.fileNameHashTables[group].get(Client.hashString(fileName));
+   }
+
+   @ObfuscatedName("ag")
+   @ObfuscatedSignature(
+      signature = "(Ljava/lang/String;Ljava/lang/String;B)Z",
+      garbageValue = "68"
+   )
+   public boolean method9(String var1, String var2) {
+      var1 = var1.toLowerCase();
+      var2 = var2.toLowerCase();
+      int var3 = this.groupNameHashTable.get(Client.hashString(var1));
+      if (var3 < 0) {
+         return false;
+      } else {
+         int var4 = this.fileNameHashTables[var3].get(Client.hashString(var2));
+         return var4 >= 0;
+      }
+   }
+
+   @ObfuscatedName("aq")
+   @ObfuscatedSignature(
+      signature = "(Ljava/lang/String;Ljava/lang/String;S)[B",
+      garbageValue = "-22726"
+   )
+   @Export("takeFileByNames")
+   public byte[] takeFileByNames(String groupName, String fileName) {
+      groupName = groupName.toLowerCase();
+      fileName = fileName.toLowerCase();
+      int var3 = this.groupNameHashTable.get(Client.hashString(groupName));
+      int var4 = this.fileNameHashTables[var3].get(Client.hashString(fileName));
+      return this.takeFile(var3, var4);
+   }
+
+   @ObfuscatedName("aj")
+   @ObfuscatedSignature(
+      signature = "(Ljava/lang/String;Ljava/lang/String;I)Z",
+      garbageValue = "2140743930"
+   )
+   @Export("tryLoadFileByNames")
+   public boolean tryLoadFileByNames(String groupName, String fileName) {
+      groupName = groupName.toLowerCase();
+      fileName = fileName.toLowerCase();
+      int var3 = this.groupNameHashTable.get(Client.hashString(groupName));
+      int var4 = this.fileNameHashTables[var3].get(Client.hashString(fileName));
+      return this.tryLoadFile(var3, var4);
+   }
+
+   @ObfuscatedName("av")
+   @ObfuscatedSignature(
+      signature = "(Ljava/lang/String;I)Z",
+      garbageValue = "-1282569336"
+   )
+   @Export("tryLoadGroupByName")
+   public boolean tryLoadGroupByName(String groupName) {
+      groupName = groupName.toLowerCase();
+      int var2 = this.groupNameHashTable.get(Client.hashString(groupName));
+      return this.tryLoadGroup(var2);
+   }
+
+   @ObfuscatedName("ar")
+   @ObfuscatedSignature(
+      signature = "(Ljava/lang/String;B)V",
+      garbageValue = "40"
+   )
+   public void method10(String var1) {
+      var1 = var1.toLowerCase();
+      int var2 = this.groupNameHashTable.get(Client.hashString(var1));
+      if (var2 >= 0) {
+         this.vmethod129(var2);
+      }
+
+   }
+
+   @ObfuscatedName("ac")
+   @ObfuscatedSignature(
+      signature = "(Ljava/lang/String;I)I",
+      garbageValue = "-1645224643"
+   )
+   @Export("groupLoadPercentByName")
+   public int groupLoadPercentByName(String groupName) {
+      groupName = groupName.toLowerCase();
+      int var2 = this.groupNameHashTable.get(Client.hashString(groupName));
+      return this.groupLoadPercent(var2);
+   }
+
+   @ObfuscatedName("m")
+   @ObfuscatedSignature(
+      signature = "(Lgr;Llh;I)Llh;",
+      garbageValue = "15597880"
+   )
+   @Export("readStringIntParameters")
+   static final IterableNodeHashTable readStringIntParameters(Buffer buffer, IterableNodeHashTable hashTable) {
+      int var2 = buffer.readUnsignedByte();
+      int var3;
+      if (hashTable == null) {
+         var3 = World.method1759(var2);
+         hashTable = new IterableNodeHashTable(var3);
+      }
+
+      for (var3 = 0; var3 < var2; ++var3) {
+         boolean var4 = buffer.readUnsignedByte() == 1;
+         int var5 = buffer.readMedium();
+         Object var6;
+         if (var4) {
+            var6 = new ObjectNode(buffer.readStringCp1252NullTerminated());
+         } else {
+            var6 = new IntegerNode(buffer.readInt());
+         }
+
+         hashTable.put((Node)var6, (long)var5);
+      }
+
+      return hashTable;
+   }
+
+   @ObfuscatedName("m")
+   @ObfuscatedSignature(
+      signature = "(Lby;S)V",
+      garbageValue = "-4702"
+   )
+   @Export("runScript")
+   public static void runScript(ScriptEvent scriptEvent) {
+      GrandExchangeEvent.runScript0(scriptEvent, 500000);
+   }
+
+   @ObfuscatedName("eg")
+   @ObfuscatedSignature(
+      signature = "(I)Z",
+      garbageValue = "308670894"
+   )
+   static boolean method4585() {
+      if (Client.archiveLoaders != null && Client.archiveLoaderArchive < Client.archiveLoaders.size()) {
+         while (Client.archiveLoaderArchive < Client.archiveLoaders.size()) {
+            ArchiveLoader var0 = (ArchiveLoader)Client.archiveLoaders.get(Client.archiveLoaderArchive);
+            if (!var0.isLoaded()) {
+               return false;
+            }
+
+            ++Client.archiveLoaderArchive;
+         }
+
+         return true;
+      } else {
+         return true;
+      }
+   }
+
+   static {
+      gzipDecompressor = new GzipDecompressor();
+      field1 = 0;
+   }
+}
diff --git a/runescape-client/src/main/java/AbstractByteArrayCopier.java b/runescape-client/src/main/java/AbstractByteArrayCopier.java
index f87ef77718..94a019905b 100644
--- a/runescape-client/src/main/java/AbstractByteArrayCopier.java
+++ b/runescape-client/src/main/java/AbstractByteArrayCopier.java
@@ -13,11 +13,8 @@ public abstract class AbstractByteArrayCopier {
    @ObfuscatedSignature(
       signature = "Lit;"
    )
-   static IndexCache __gu_et;
-
-   static {
-      directBufferUnavailable = false;
-   }
+   @Export("archive20")
+   static Archive archive20;
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
@@ -33,7 +30,7 @@ public abstract class AbstractByteArrayCopier {
       garbageValue = "-2034091753"
    )
    @Export("set")
-   abstract void set(byte[] var1);
+   abstract void set(byte[] array);
 
    @ObfuscatedName("f")
    @ObfuscatedSignature(
@@ -43,13 +40,13 @@ public abstract class AbstractByteArrayCopier {
    @Export("getVarcInt")
    public static VarcInt getVarcInt(int var0) {
       VarcInt var1 = (VarcInt)VarcInt.cachedVarcInts.get((long)var0);
-      if(var1 != null) {
+      if (var1 != null) {
          return var1;
       } else {
-         byte[] var2 = VarcInt.__iw_m.takeRecord(19, var0);
+         byte[] var2 = VarcInt.field942.takeFile(19, var0);
          var1 = new VarcInt();
-         if(var2 != null) {
-            var1.__q_411(new Buffer(var2));
+         if (var2 != null) {
+            var1.method354(new Buffer(var2));
          }
 
          VarcInt.cachedVarcInts.put(var1, (long)var0);
@@ -62,32 +59,31 @@ public abstract class AbstractByteArrayCopier {
       signature = "(II)V",
       garbageValue = "-1941491045"
    )
-   @Export("unloadWidgetGroup")
-   public static void unloadWidgetGroup(int var0) {
-      if(var0 != -1) {
-         if(Widget.loadedWidgetGroups[var0]) {
-            Widget.Widget_indexCache.__h_399(var0);
-            if(Widget.widgets[var0] != null) {
-               boolean var1 = true;
+   @Export("unloadInterface")
+   public static void unloadInterface(int var0) {
+      if (var0 != -1 && Widget.loadedInterfaces[var0]) {
+         Widget.Widget_archive.method7(var0);
+         if (Widget.interfaceComponents[var0] != null) {
+            boolean var1 = true;
 
-               for(int var2 = 0; var2 < Widget.widgets[var0].length; ++var2) {
-                  if(Widget.widgets[var0][var2] != null) {
-                     if(Widget.widgets[var0][var2].type != 2) {
-                        Widget.widgets[var0][var2] = null;
-                     } else {
-                        var1 = false;
-                     }
+            for (int var2 = 0; var2 < Widget.interfaceComponents[var0].length; ++var2) {
+               if (Widget.interfaceComponents[var0][var2] != null) {
+                  if (Widget.interfaceComponents[var0][var2].type != 2) {
+                     Widget.interfaceComponents[var0][var2] = null;
+                  } else {
+                     var1 = false;
                   }
                }
-
-               if(var1) {
-                  Widget.widgets[var0] = null;
-               }
-
-               Widget.loadedWidgetGroups[var0] = false;
             }
+
+            if (var1) {
+               Widget.interfaceComponents[var0] = null;
+            }
+
+            Widget.loadedInterfaces[var0] = false;
          }
       }
+
    }
 
    @ObfuscatedName("gb")
@@ -96,10 +92,14 @@ public abstract class AbstractByteArrayCopier {
       garbageValue = "-1256278627"
    )
    static void method4024() {
-      PacketBufferNode var0 = Interpreter.method1915(ClientPacket.__gs_aw, Client.packetWriter.isaacCipher);
-      var0.packetBuffer.writeByte(SpotAnimationDefinition.method4822());
+      PacketBufferNode var0 = Interpreter.method1915(ClientPacket.field257, Client.packetWriter.isaacCipher);
+      var0.packetBuffer.writeByte(SpotAnimationDefinition.getWindowedMode());
       var0.packetBuffer.writeShort(SoundCache.canvasWidth);
       var0.packetBuffer.writeShort(Huffman.canvasHeight);
-      Client.packetWriter.__q_167(var0);
+      Client.packetWriter.method241(var0);
+   }
+
+   static {
+      directBufferUnavailable = false;
    }
 }
diff --git a/runescape-client/src/main/java/AbstractFont.java b/runescape-client/src/main/java/AbstractFont.java
index 967f2b291c..6cd19a4b75 100644
--- a/runescape-client/src/main/java/AbstractFont.java
+++ b/runescape-client/src/main/java/AbstractFont.java
@@ -77,20 +77,6 @@ public abstract class AbstractFont extends Rasterizer2D {
    @Export("kerning")
    byte[] kerning;
 
-   static {
-      AbstractFont_strike = -1;
-      AbstractFont_underline = -1;
-      AbstractFont_previousShadow = -1;
-      AbstractFont_shadow = -1;
-      AbstractFont_previousColor = 0;
-      AbstractFont_color = 0;
-      AbstractFont_alpha = 256;
-      AbstractFont_justificationTotal = 0;
-      AbstractFont_justificationCurrent = 0;
-      AbstractFont_random = new Random();
-      AbstractFont_lines = new String[100];
-   }
-
    AbstractFont(byte[] var1, int[] var2, int[] var3, int[] var4, int[] var5, int[] var6, byte[][] var7) {
       this.pixels = new byte[256][];
       this.ascent = 0;
@@ -103,12 +89,12 @@ public abstract class AbstractFont extends Rasterizer2D {
       int var8 = Integer.MAX_VALUE;
       int var9 = Integer.MIN_VALUE;
 
-      for(int var10 = 0; var10 < 256; ++var10) {
-         if(this.topBearings[var10] < var8 && this.heights[var10] != 0) {
+      for (int var10 = 0; var10 < 256; ++var10) {
+         if (this.topBearings[var10] < var8 && this.heights[var10] != 0) {
             var8 = this.topBearings[var10];
          }
 
-         if(this.topBearings[var10] + this.heights[var10] > var9) {
+         if (this.topBearings[var10] + this.heights[var10] > var9) {
             var9 = this.topBearings[var10] + this.heights[var10];
          }
       }
@@ -125,81 +111,81 @@ public abstract class AbstractFont extends Rasterizer2D {
 
    @ObfuscatedName("m")
    @Export("drawGlyph")
-   abstract void drawGlyph(byte[] var1, int var2, int var3, int var4, int var5, int var6);
+   abstract void drawGlyph(byte[] pixels, int x, int y, int width, int height, int color);
 
    @ObfuscatedName("f")
    @Export("drawGlyphAlpha")
-   abstract void drawGlyphAlpha(byte[] var1, int var2, int var3, int var4, int var5, int var6, int var7);
+   abstract void drawGlyphAlpha(byte[] pixels, int x, int y, int width, int height, int color, int alpha);
 
    @ObfuscatedName("l")
    @Export("readMetrics")
-   void readMetrics(byte[] var1) {
+   void readMetrics(byte[] bytes) {
       this.advances = new int[256];
       int var2;
-      if(var1.length == 257) {
-         for(var2 = 0; var2 < this.advances.length; ++var2) {
-            this.advances[var2] = var1[var2] & 255;
+      if (bytes.length == 257) {
+         for (var2 = 0; var2 < this.advances.length; ++var2) {
+            this.advances[var2] = bytes[var2] & 255;
          }
 
-         this.ascent = var1[256] & 255;
+         this.ascent = bytes[256] & 255;
       } else {
          var2 = 0;
 
-         for(int var3 = 0; var3 < 256; ++var3) {
-            this.advances[var3] = var1[var2++] & 255;
+         for (int var3 = 0; var3 < 256; ++var3) {
+            this.advances[var3] = bytes[var2++] & 255;
          }
 
-         int[] var10 = new int[256];
+         int[] var12 = new int[256];
          int[] var4 = new int[256];
 
          int var5;
-         for(var5 = 0; var5 < 256; ++var5) {
-            var10[var5] = var1[var2++] & 255;
+         for (var5 = 0; var5 < 256; ++var5) {
+            var12[var5] = bytes[var2++] & 255;
          }
 
-         for(var5 = 0; var5 < 256; ++var5) {
-            var4[var5] = var1[var2++] & 255;
+         for (var5 = 0; var5 < 256; ++var5) {
+            var4[var5] = bytes[var2++] & 255;
          }
 
-         byte[][] var11 = new byte[256][];
+         byte[][] var6 = new byte[256][];
 
-         int var8;
-         for(int var6 = 0; var6 < 256; ++var6) {
-            var11[var6] = new byte[var10[var6]];
-            byte var7 = 0;
+         int var7;
+         for (int var8 = 0; var8 < 256; ++var8) {
+            var6[var8] = new byte[var12[var8]];
+            byte var9 = 0;
 
-            for(var8 = 0; var8 < var11[var6].length; ++var8) {
-               var7 += var1[var2++];
-               var11[var6][var8] = var7;
+            for (var7 = 0; var7 < var6[var8].length; ++var7) {
+               var9 += bytes[var2++];
+               var6[var8][var7] = var9;
             }
          }
 
-         byte[][] var12 = new byte[256][];
+         byte[][] var13 = new byte[256][];
 
-         int var13;
-         for(var13 = 0; var13 < 256; ++var13) {
-            var12[var13] = new byte[var10[var13]];
-            byte var14 = 0;
+         int var14;
+         for (var14 = 0; var14 < 256; ++var14) {
+            var13[var14] = new byte[var12[var14]];
+            byte var10 = 0;
 
-            for(int var9 = 0; var9 < var12[var13].length; ++var9) {
-               var14 += var1[var2++];
-               var12[var13][var9] = var14;
+            for (int var11 = 0; var11 < var13[var14].length; ++var11) {
+               var10 += bytes[var2++];
+               var13[var14][var11] = var10;
             }
          }
 
          this.kerning = new byte[65536];
 
-         for(var13 = 0; var13 < 256; ++var13) {
-            if(var13 != 32 && var13 != 160) {
-               for(var8 = 0; var8 < 256; ++var8) {
-                  if(var8 != 32 && var8 != 160) {
-                     this.kerning[var8 + (var13 << 8)] = (byte)method5658(var11, var12, var4, this.advances, var10, var13, var8);
+         for (var14 = 0; var14 < 256; ++var14) {
+            if (var14 != 32 && var14 != 160) {
+               for (var7 = 0; var7 < 256; ++var7) {
+                  if (var7 != 32 && var7 != 160) {
+                     this.kerning[var7 + (var14 << 8)] = (byte)method5658(var6, var13, var4, this.advances, var12, var14, var7);
                   }
                }
             }
          }
 
-         this.ascent = var4[32] + var10[32];
+         this.ascent = var4[32] + var12[32];
       }
 
    }
@@ -207,7 +193,7 @@ public abstract class AbstractFont extends Rasterizer2D {
    @ObfuscatedName("x")
    @Export("charWidth")
    int charWidth(char var1) {
-      if(var1 == 160) {
+      if (var1 == 160) {
          var1 = ' ';
       }
 
@@ -217,32 +203,31 @@ public abstract class AbstractFont extends Rasterizer2D {
    @ObfuscatedName("d")
    @Export("stringWidth")
    public int stringWidth(String var1) {
-      if(var1 == null) {
+      if (var1 == null) {
          return 0;
       } else {
          int var2 = -1;
          int var3 = -1;
          int var4 = 0;
 
-         for(int var5 = 0; var5 < var1.length(); ++var5) {
+         for (int var5 = 0; var5 < var1.length(); ++var5) {
             char var6 = var1.charAt(var5);
-            if(var6 == '<') {
+            if (var6 == '<') {
                var2 = var5;
             } else {
-               if(var6 == '>' && var2 != -1) {
+               if (var6 == '>' && var2 != -1) {
                   String var7 = var1.substring(var2 + 1, var5);
                   var2 = -1;
-                  if(var7.equals("lt")) {
+                  if (var7.equals("lt")) {
                      var6 = '<';
                   } else {
-                     if(!var7.equals("gt")) {
-                        if(var7.startsWith("img=")) {
+                     if (!var7.equals("gt")) {
+                        if (var7.startsWith("img=")) {
                            try {
                               int var8 = MouseHandler.method1085(var7.substring(4));
                               var4 += AbstractFont_modIconSprites[var8].width;
                               var3 = -1;
-                           } catch (Exception var10) {
-                              ;
+                           } catch (Exception var9) {
                            }
                         }
                         continue;
@@ -252,13 +237,13 @@ public abstract class AbstractFont extends Rasterizer2D {
                   }
                }
 
-               if(var6 == 160) {
+               if (var6 == 160) {
                   var6 = ' ';
                }
 
-               if(var2 == -1) {
+               if (var2 == -1) {
                   var4 += this.advances[(char)(HealthBar.charToByteCp1252(var6) & 255)];
-                  if(this.kerning != null && var3 != -1) {
+                  if (this.kerning != null && var3 != -1) {
                      var4 += this.kerning[var6 + (var3 << 8)];
                   }
 
@@ -273,8 +258,8 @@ public abstract class AbstractFont extends Rasterizer2D {
 
    @ObfuscatedName("a")
    @Export("breakLines")
-   public int breakLines(String var1, int[] var2, String[] var3) {
-      if(var1 == null) {
+   public int breakLines(String var1, int[] lineWidths, String[] linesDst) {
+      if (var1 == null) {
          return 0;
       } else {
          int var4 = 0;
@@ -288,70 +273,69 @@ public abstract class AbstractFont extends Rasterizer2D {
          int var12 = 0;
          int var13 = var1.length();
 
-         for(int var14 = 0; var14 < var13; ++var14) {
+         for (int var14 = 0; var14 < var13; ++var14) {
             char var15 = var1.charAt(var14);
-            if(var15 == '<') {
+            if (var15 == '<') {
                var10 = var14;
             } else {
-               if(var15 == '>' && var10 != -1) {
+               if (var15 == '>' && var10 != -1) {
                   String var16 = var1.substring(var10 + 1, var14);
                   var10 = -1;
                   var6.append('<');
                   var6.append(var16);
                   var6.append('>');
-                  if(var16.equals("br")) {
-                     var3[var12] = var6.toString().substring(var5, var6.length());
+                  if (var16.equals("br")) {
+                     linesDst[var12] = var6.toString().substring(var5, var6.length());
                      ++var12;
                      var5 = var6.length();
                      var4 = 0;
                      var7 = -1;
                      var11 = 0;
-                  } else if(var16.equals("lt")) {
+                  } else if (var16.equals("lt")) {
                      var4 += this.charWidth('<');
-                     if(this.kerning != null && var11 != -1) {
+                     if (this.kerning != null && var11 != -1) {
                         var4 += this.kerning[(var11 << '\b') + 60];
                      }
 
                      var11 = '<';
-                  } else if(var16.equals("gt")) {
+                  } else if (var16.equals("gt")) {
                      var4 += this.charWidth('>');
-                     if(this.kerning != null && var11 != -1) {
+                     if (this.kerning != null && var11 != -1) {
                         var4 += this.kerning[(var11 << '\b') + 62];
                      }
 
                      var11 = '>';
-                  } else if(var16.startsWith("img=")) {
+                  } else if (var16.startsWith("img=")) {
                      try {
                         int var17 = MouseHandler.method1085(var16.substring(4));
                         var4 += AbstractFont_modIconSprites[var17].width;
                         var11 = 0;
-                     } catch (Exception var20) {
-                        ;
+                     } catch (Exception var18) {
                      }
                   }
 
                   var15 = 0;
                }
 
-               if(var10 == -1) {
-                  if(var15 != 0) {
+               if (var10 == -1) {
+                  if (var15 != 0) {
                      var6.append(var15);
                      var4 += this.charWidth(var15);
-                     if(this.kerning != null && var11 != -1) {
+                     if (this.kerning != null && var11 != -1) {
                         var4 += this.kerning[var15 + (var11 << '\b')];
                      }
 
                      var11 = var15;
                   }
 
-                  if(var15 == ' ') {
+                  if (var15 == ' ') {
                      var7 = var6.length();
                      var8 = var4;
                      var9 = 1;
                   }
 
-                  if(var2 != null && var4 > var2[var12 < var2.length?var12:var2.length - 1] && var7 >= 0) {
-                     var3[var12] = var6.toString().substring(var5, var7 - var9);
+                  if (lineWidths != null && var4 > lineWidths[var12 < lineWidths.length ? var12 : lineWidths.length - 1] && var7 >= 0) {
+                     linesDst[var12] = var6.toString().substring(var5, var7 - var9);
                      ++var12;
                      var5 = var7;
                      var7 = -1;
@@ -359,7 +343,7 @@ public abstract class AbstractFont extends Rasterizer2D {
                      var11 = 0;
                   }
 
-                  if(var15 == '-') {
+                  if (var15 == '-') {
                      var7 = var6.length();
                      var8 = var4;
                      var9 = 0;
@@ -369,8 +353,8 @@ public abstract class AbstractFont extends Rasterizer2D {
          }
 
          String var19 = var6.toString();
-         if(var19.length() > var5) {
-            var3[var12++] = var19.substring(var5, var19.length());
+         if (var19.length() > var5) {
+            linesDst[var12++] = var19.substring(var5, var19.length());
          }
 
          return var12;
@@ -379,13 +363,13 @@ public abstract class AbstractFont extends Rasterizer2D {
 
    @ObfuscatedName("z")
    @Export("lineWidth")
-   public int lineWidth(String var1, int var2) {
-      int var3 = this.breakLines(var1, new int[]{var2}, AbstractFont_lines);
+   public int lineWidth(String var1, int lineWidth) {
+      int var3 = this.breakLines(var1, new int[]{lineWidth}, AbstractFont_lines);
       int var4 = 0;
 
-      for(int var5 = 0; var5 < var3; ++var5) {
+      for (int var5 = 0; var5 < var3; ++var5) {
          int var6 = this.stringWidth(AbstractFont_lines[var5]);
-         if(var6 > var4) {
+         if (var6 > var4) {
             var4 = var6;
          }
       }
@@ -395,102 +379,106 @@ public abstract class AbstractFont extends Rasterizer2D {
 
    @ObfuscatedName("j")
    @Export("lineCount")
-   public int lineCount(String var1, int var2) {
-      return this.breakLines(var1, new int[]{var2}, AbstractFont_lines);
+   public int lineCount(String var1, int lineWidth) {
+      return this.breakLines(var1, new int[]{lineWidth}, AbstractFont_lines);
    }
 
    @ObfuscatedName("t")
    @Export("draw")
-   public void draw(String var1, int var2, int var3, int var4, int var5) {
-      if(var1 != null) {
-         this.reset(var4, var5);
-         this.draw0(var1, var2, var3);
+   public void draw(String var1, int x, int y, int color, int shadow) {
+      if (var1 != null) {
+         this.reset(color, shadow);
+         this.draw0(var1, x, y);
       }
+
    }
 
    @ObfuscatedName("y")
    @Export("drawAlpha")
-   public void drawAlpha(String var1, int var2, int var3, int var4, int var5, int var6) {
-      if(var1 != null) {
-         this.reset(var4, var5);
-         AbstractFont_alpha = var6;
-         this.draw0(var1, var2, var3);
+   public void drawAlpha(String var1, int x, int y, int color, int shadow, int alpha) {
+      if (var1 != null) {
+         this.reset(color, shadow);
+         AbstractFont_alpha = alpha;
+         this.draw0(var1, x, y);
       }
+
    }
 
    @ObfuscatedName("h")
    @Export("drawRightAligned")
-   public void drawRightAligned(String var1, int var2, int var3, int var4, int var5) {
-      if(var1 != null) {
-         this.reset(var4, var5);
-         this.draw0(var1, var2 - this.stringWidth(var1), var3);
+   public void drawRightAligned(String var1, int x, int y, int color, int shadow) {
+      if (var1 != null) {
+         this.reset(color, shadow);
+         this.draw0(var1, x - this.stringWidth(var1), y);
       }
+
    }
 
    @ObfuscatedName("b")
    @Export("drawCentered")
-   public void drawCentered(String var1, int var2, int var3, int var4, int var5) {
-      if(var1 != null) {
-         this.reset(var4, var5);
-         this.draw0(var1, var2 - this.stringWidth(var1) / 2, var3);
+   public void drawCentered(String var1, int x, int y, int color, int shadow) {
+      if (var1 != null) {
+         this.reset(color, shadow);
+         this.draw0(var1, x - this.stringWidth(var1) / 2, y);
       }
+
    }
 
    @ObfuscatedName("c")
    @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) {
+   public int drawLines(String var1, int x, int y, int width, int height, int color, int shadow, int xAlignment, int yAlignment, int lineHeight) {
+      if (var1 == null) {
          return 0;
       } else {
-         this.reset(var6, var7);
-         if(var10 == 0) {
-            var10 = this.ascent;
+         this.reset(color, shadow);
+         if (lineHeight == 0) {
+            lineHeight = this.ascent;
          }
 
-         int[] var11 = new int[]{var4};
-         if(var5 < var10 + this.maxAscent + this.maxDescent && var5 < var10 + var10) {
+         int[] var11 = new int[]{width};
+         if (height < lineHeight + this.maxAscent + this.maxDescent && height < lineHeight + lineHeight) {
             var11 = null;
          }
 
          int var12 = this.breakLines(var1, var11, AbstractFont_lines);
-         if(var9 == 3 && var12 == 1) {
-            var9 = 1;
+         if (yAlignment == 3 && var12 == 1) {
+            yAlignment = 1;
          }
 
          int var13;
          int var14;
-         if(var9 == 0) {
-            var13 = var3 + this.maxAscent;
-         } else if(var9 == 1) {
-            var13 = var3 + (var5 - this.maxAscent - this.maxDescent - var10 * (var12 - 1)) / 2 + this.maxAscent;
-         } else if(var9 == 2) {
-            var13 = var3 + var5 - this.maxDescent - var10 * (var12 - 1);
+         if (yAlignment == 0) {
+            var13 = y + this.maxAscent;
+         } else if (yAlignment == 1) {
+            var13 = y + (height - this.maxAscent - this.maxDescent - lineHeight * (var12 - 1)) / 2 + this.maxAscent;
+         } else if (yAlignment == 2) {
+            var13 = y + height - this.maxDescent - lineHeight * (var12 - 1);
          } else {
-            var14 = (var5 - this.maxAscent - this.maxDescent - var10 * (var12 - 1)) / (var12 + 1);
-            if(var14 < 0) {
+            var14 = (height - this.maxAscent - this.maxDescent - lineHeight * (var12 - 1)) / (var12 + 1);
+            if (var14 < 0) {
                var14 = 0;
             }
 
-            var13 = var3 + var14 + this.maxAscent;
-            var10 += var14;
+            var13 = y + var14 + this.maxAscent;
+            lineHeight += var14;
          }
 
-         for(var14 = 0; var14 < var12; ++var14) {
-            if(var8 == 0) {
-               this.draw0(AbstractFont_lines[var14], var2, var13);
-            } else if(var8 == 1) {
-               this.draw0(AbstractFont_lines[var14], var2 + (var4 - this.stringWidth(AbstractFont_lines[var14])) / 2, var13);
-            } else if(var8 == 2) {
-               this.draw0(AbstractFont_lines[var14], var2 + var4 - this.stringWidth(AbstractFont_lines[var14]), var13);
-            } else if(var14 == var12 - 1) {
-               this.draw0(AbstractFont_lines[var14], var2, var13);
+         for (var14 = 0; var14 < var12; ++var14) {
+            if (xAlignment == 0) {
+               this.draw0(AbstractFont_lines[var14], x, var13);
+            } else if (xAlignment == 1) {
+               this.draw0(AbstractFont_lines[var14], x + (width - this.stringWidth(AbstractFont_lines[var14])) / 2, var13);
+            } else if (xAlignment == 2) {
+               this.draw0(AbstractFont_lines[var14], x + width - this.stringWidth(AbstractFont_lines[var14]), var13);
+            } else if (var14 == var12 - 1) {
+               this.draw0(AbstractFont_lines[var14], x, var13);
             } else {
-               this.calculateLineJustification(AbstractFont_lines[var14], var4);
-               this.draw0(AbstractFont_lines[var14], var2, var13);
+               this.calculateLineJustification(AbstractFont_lines[var14], width);
+               this.draw0(AbstractFont_lines[var14], x, var13);
                AbstractFont_justificationTotal = 0;
             }
 
-            var13 += var10;
+            var13 += lineHeight;
          }
 
          return var12;
@@ -499,86 +487,90 @@ public abstract class AbstractFont extends Rasterizer2D {
 
    @ObfuscatedName("p")
    @Export("drawCenteredWave")
-   public void drawCenteredWave(String var1, int var2, int var3, int var4, int var5, int var6) {
-      if(var1 != null) {
-         this.reset(var4, var5);
+   public void drawCenteredWave(String var1, int x, int y, int color, int shadow, int seed) {
+      if (var1 != null) {
+         this.reset(color, shadow);
          int[] var7 = new int[var1.length()];
 
-         for(int var8 = 0; var8 < var1.length(); ++var8) {
-            var7[var8] = (int)(Math.sin((double)var8 / 2.0D + (double)var6 / 5.0D) * 5.0D);
+         for (int var8 = 0; var8 < var1.length(); ++var8) {
+            var7[var8] = (int)(Math.sin((double)var8 / 2.0D + (double)seed / 5.0D) * 5.0D);
          }
 
-         this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, (int[])null, var7);
+         this.drawWithOffsets0(var1, x - this.stringWidth(var1) / 2, y, (int[])null, var7);
       }
+
    }
 
    @ObfuscatedName("v")
    @Export("drawCenteredWave2")
-   public void drawCenteredWave2(String var1, int var2, int var3, int var4, int var5, int var6) {
-      if(var1 != null) {
-         this.reset(var4, var5);
+   public void drawCenteredWave2(String var1, int x, int y, int color, int shadow, int seed) {
+      if (var1 != null) {
+         this.reset(color, shadow);
          int[] var7 = new int[var1.length()];
          int[] var8 = new int[var1.length()];
 
-         for(int var9 = 0; var9 < var1.length(); ++var9) {
-            var7[var9] = (int)(Math.sin((double)var9 / 5.0D + (double)var6 / 5.0D) * 5.0D);
-            var8[var9] = (int)(Math.sin((double)var9 / 3.0D + (double)var6 / 5.0D) * 5.0D);
+         for (int var9 = 0; var9 < var1.length(); ++var9) {
+            var7[var9] = (int)(Math.sin((double)var9 / 5.0D + (double)seed / 5.0D) * 5.0D);
+            var8[var9] = (int)(Math.sin((double)var9 / 3.0D + (double)seed / 5.0D) * 5.0D);
          }
 
-         this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, var7, var8);
+         this.drawWithOffsets0(var1, x - this.stringWidth(var1) / 2, y, var7, var8);
       }
+
    }
 
    @ObfuscatedName("ag")
    @Export("drawCenteredShake")
-   public void drawCenteredShake(String var1, int var2, int var3, int var4, int var5, int var6, int var7) {
-      if(var1 != null) {
-         this.reset(var4, var5);
-         double var8 = 7.0D - (double)var7 / 8.0D;
-         if(var8 < 0.0D) {
+   public void drawCenteredShake(String var1, int x, int y, int color, int shadow, int seed, int seed2) {
+      if (var1 != null) {
+         this.reset(color, shadow);
+         double var8 = 7.0D - (double)seed2 / 8.0D;
+         if (var8 < 0.0D) {
             var8 = 0.0D;
          }
 
          int[] var10 = new int[var1.length()];
 
-         for(int var11 = 0; var11 < var1.length(); ++var11) {
-            var10[var11] = (int)(Math.sin((double)var11 / 1.5D + (double)var6 / 1.0D) * var8);
+         for (int var11 = 0; var11 < var1.length(); ++var11) {
+            var10[var11] = (int)(Math.sin((double)var11 / 1.5D + (double)seed / 1.0D) * var8);
          }
 
-         this.drawWithOffsets0(var1, var2 - this.stringWidth(var1) / 2, var3, (int[])null, var10);
+         this.drawWithOffsets0(var1, x - this.stringWidth(var1) / 2, y, (int[])null, var10);
       }
+
    }
 
    @ObfuscatedName("aq")
    @Export("drawRandomAlphaAndSpacing")
-   public void drawRandomAlphaAndSpacing(String var1, int var2, int var3, int var4, int var5, int var6) {
-      if(var1 != null) {
-         this.reset(var4, var5);
-         AbstractFont_random.setSeed((long)var6);
+   public void drawRandomAlphaAndSpacing(String var1, int x, int y, int color, int shadow, int seed) {
+      if (var1 != null) {
+         this.reset(color, shadow);
+         AbstractFont_random.setSeed((long)seed);
          AbstractFont_alpha = 192 + (AbstractFont_random.nextInt() & 31);
          int[] var7 = new int[var1.length()];
          int var8 = 0;
 
-         for(int var9 = 0; var9 < var1.length(); ++var9) {
+         for (int var9 = 0; var9 < var1.length(); ++var9) {
             var7[var9] = var8;
-            if((AbstractFont_random.nextInt() & 3) == 0) {
+            if ((AbstractFont_random.nextInt() & 3) == 0) {
                ++var8;
             }
          }
 
-         this.drawWithOffsets0(var1, var2, var3, var7, (int[])null);
+         this.drawWithOffsets0(var1, x, y, var7, (int[])null);
       }
+
    }
 
    @ObfuscatedName("aj")
    @Export("reset")
-   void reset(int var1, int var2) {
+   void reset(int color, int shadow) {
       AbstractFont_strike = -1;
       AbstractFont_underline = -1;
-      AbstractFont_previousShadow = var2;
-      AbstractFont_shadow = var2;
-      AbstractFont_previousColor = var1;
-      AbstractFont_color = var1;
+      AbstractFont_previousShadow = shadow;
+      AbstractFont_shadow = shadow;
+      AbstractFont_previousColor = color;
+      AbstractFont_color = color;
       AbstractFont_alpha = 256;
       AbstractFont_justificationTotal = 0;
       AbstractFont_justificationCurrent = 0;
@@ -588,93 +580,91 @@ public abstract class AbstractFont extends Rasterizer2D {
    @Export("decodeTag")
    void decodeTag(String var1) {
       try {
-         if(var1.startsWith("col=")) {
+         if (var1.startsWith("col=")) {
             AbstractFont_color = class214.method4157(var1.substring(4), 16);
-         } else if(var1.equals("/col")) {
+         } else if (var1.equals("/col")) {
             AbstractFont_color = AbstractFont_previousColor;
-         } else if(var1.startsWith("str=")) {
+         } else if (var1.startsWith("str=")) {
             AbstractFont_strike = class214.method4157(var1.substring(4), 16);
-         } else if(var1.equals("str")) {
+         } else if (var1.equals("str")) {
             AbstractFont_strike = 8388608;
-         } else if(var1.equals("/str")) {
+         } else if (var1.equals("/str")) {
             AbstractFont_strike = -1;
-         } else if(var1.startsWith("u=")) {
+         } else if (var1.startsWith("u=")) {
             AbstractFont_underline = class214.method4157(var1.substring(2), 16);
-         } else if(var1.equals("u")) {
+         } else if (var1.equals("u")) {
             AbstractFont_underline = 0;
-         } else if(var1.equals("/u")) {
+         } else if (var1.equals("/u")) {
             AbstractFont_underline = -1;
-         } else if(var1.startsWith("shad=")) {
+         } else if (var1.startsWith("shad=")) {
             AbstractFont_shadow = class214.method4157(var1.substring(5), 16);
-         } else if(var1.equals("shad")) {
+         } else if (var1.equals("shad")) {
             AbstractFont_shadow = 0;
-         } else if(var1.equals("/shad")) {
+         } else if (var1.equals("/shad")) {
             AbstractFont_shadow = AbstractFont_previousShadow;
-         } else if(var1.equals("br")) {
+         } else if (var1.equals("br")) {
             this.reset(AbstractFont_previousColor, AbstractFont_previousShadow);
          }
       } catch (Exception var3) {
-         ;
       }
 
    }
 
    @ObfuscatedName("ar")
    @Export("calculateLineJustification")
-   void calculateLineJustification(String var1, int var2) {
+   void calculateLineJustification(String var1, int lineWidth) {
       int var3 = 0;
       boolean var4 = false;
 
-      for(int var5 = 0; var5 < var1.length(); ++var5) {
+      for (int var5 = 0; var5 < var1.length(); ++var5) {
          char var6 = var1.charAt(var5);
-         if(var6 == '<') {
+         if (var6 == '<') {
             var4 = true;
-         } else if(var6 == '>') {
+         } else if (var6 == '>') {
             var4 = false;
-         } else if(!var4 && var6 == ' ') {
+         } else if (!var4 && var6 == ' ') {
             ++var3;
          }
       }
 
-      if(var3 > 0) {
-         AbstractFont_justificationTotal = (var2 - this.stringWidth(var1) << 8) / var3;
+      if (var3 > 0) {
+         AbstractFont_justificationTotal = (lineWidth - this.stringWidth(var1) << 8) / var3;
       }
 
    }
 
    @ObfuscatedName("ac")
    @Export("draw0")
-   void draw0(String var1, int var2, int var3) {
-      var3 -= this.ascent;
+   void draw0(String var1, int x, int y) {
+      y -= this.ascent;
       int var4 = -1;
       int var5 = -1;
 
-      for(int var6 = 0; var6 < var1.length(); ++var6) {
-         if(var1.charAt(var6) != 0) {
+      for (int var6 = 0; var6 < var1.length(); ++var6) {
+         if (var1.charAt(var6) != 0) {
             char var7 = (char)(HealthBar.charToByteCp1252(var1.charAt(var6)) & 255);
-            if(var7 == '<') {
+            if (var7 == '<') {
                var4 = var6;
             } else {
-               int var9;
-               if(var7 == '>' && var4 != -1) {
-                  String var8 = var1.substring(var4 + 1, var6);
+               int var8;
+               if (var7 == '>' && var4 != -1) {
+                  String var9 = var1.substring(var4 + 1, var6);
                   var4 = -1;
-                  if(var8.equals("lt")) {
+                  if (var9.equals("lt")) {
                      var7 = '<';
                   } else {
-                     if(!var8.equals("gt")) {
-                        if(var8.startsWith("img=")) {
+                     if (!var9.equals("gt")) {
+                        if (var9.startsWith("img=")) {
                            try {
-                              var9 = MouseHandler.method1085(var8.substring(4));
-                              IndexedSprite var10 = AbstractFont_modIconSprites[var9];
-                              var10.drawAt(var2, var3 + this.ascent - var10.height);
-                              var2 += var10.width;
+                              var8 = MouseHandler.method1085(var9.substring(4));
+                              IndexedSprite var13 = AbstractFont_modIconSprites[var8];
+                              var13.drawAt(x, y + this.ascent - var13.height);
+                              x += var13.width;
                               var5 = -1;
-                           } catch (Exception var14) {
-                              ;
+                           } catch (Exception var11) {
                            }
                         } else {
-                           this.decodeTag(var8);
+                           this.decodeTag(var9);
                         }
                         continue;
                      }
@@ -683,47 +673,47 @@ public abstract class AbstractFont extends Rasterizer2D {
                   }
                }
 
-               if(var7 == 160) {
+               if (var7 == 160) {
                   var7 = ' ';
                }
 
-               if(var4 == -1) {
-                  if(this.kerning != null && var5 != -1) {
-                     var2 += this.kerning[var7 + (var5 << 8)];
+               if (var4 == -1) {
+                  if (this.kerning != null && var5 != -1) {
+                     x += this.kerning[var7 + (var5 << 8)];
                   }
 
                   int var12 = this.widths[var7];
-                  var9 = this.heights[var7];
-                  if(var7 != ' ') {
-                     if(AbstractFont_alpha == 256) {
-                        if(AbstractFont_shadow != -1) {
-                           AbstractFont_drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7] + 1, var3 + this.topBearings[var7] + 1, var12, var9, AbstractFont_shadow);
+                  var8 = this.heights[var7];
+                  if (var7 != ' ') {
+                     if (AbstractFont_alpha == 256) {
+                        if (AbstractFont_shadow != -1) {
+                           AbstractFont_drawGlyph(this.pixels[var7], x + this.leftBearings[var7] + 1, y + this.topBearings[var7] + 1, var12, var8, AbstractFont_shadow);
                         }
 
-                        this.drawGlyph(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color);
+                        this.drawGlyph(this.pixels[var7], x + this.leftBearings[var7], y + this.topBearings[var7], var12, var8, AbstractFont_color);
                      } else {
-                        if(AbstractFont_shadow != -1) {
-                           AbstractFont_drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7] + 1, var3 + this.topBearings[var7] + 1, var12, var9, AbstractFont_shadow, AbstractFont_alpha);
+                        if (AbstractFont_shadow != -1) {
+                           AbstractFont_drawGlyphAlpha(this.pixels[var7], x + this.leftBearings[var7] + 1, y + this.topBearings[var7] + 1, var12, var8, AbstractFont_shadow, AbstractFont_alpha);
                         }
 
-                        this.drawGlyphAlpha(this.pixels[var7], var2 + this.leftBearings[var7], var3 + this.topBearings[var7], var12, var9, AbstractFont_color, AbstractFont_alpha);
+                        this.drawGlyphAlpha(this.pixels[var7], x + this.leftBearings[var7], y + this.topBearings[var7], var12, var8, AbstractFont_color, AbstractFont_alpha);
                      }
-                  } else if(AbstractFont_justificationTotal > 0) {
+                  } else if (AbstractFont_justificationTotal > 0) {
                      AbstractFont_justificationCurrent += AbstractFont_justificationTotal;
-                     var2 += AbstractFont_justificationCurrent >> 8;
+                     x += AbstractFont_justificationCurrent >> 8;
                      AbstractFont_justificationCurrent &= 255;
                   }
 
-                  int var13 = this.advances[var7];
-                  if(AbstractFont_strike != -1) {
-                     Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var13, AbstractFont_strike);
+                  int var10 = this.advances[var7];
+                  if (AbstractFont_strike != -1) {
+                     Rasterizer2D.Rasterizer2D_drawHorizontalLine(x, y + (int)((double)this.ascent * 0.7D), var10, AbstractFont_strike);
                   }
 
-                  if(AbstractFont_underline != -1) {
-                     Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent + 1, var13, AbstractFont_underline);
+                  if (AbstractFont_underline != -1) {
+                     Rasterizer2D.Rasterizer2D_drawHorizontalLine(x, y + this.ascent + 1, var10, AbstractFont_underline);
                   }
 
-                  var2 += var13;
+                  x += var10;
                   var5 = var7;
                }
             }
@@ -734,53 +724,52 @@ public abstract class AbstractFont extends Rasterizer2D {
 
    @ObfuscatedName("ay")
    @Export("drawWithOffsets0")
-   void drawWithOffsets0(String var1, int var2, int var3, int[] var4, int[] var5) {
-      var3 -= this.ascent;
+   void drawWithOffsets0(String var1, int x, int y, int[] xs, int[] ys) {
+      y -= this.ascent;
       int var6 = -1;
       int var7 = -1;
       int var8 = 0;
 
-      for(int var9 = 0; var9 < var1.length(); ++var9) {
-         if(var1.charAt(var9) != 0) {
+      for (int var9 = 0; var9 < var1.length(); ++var9) {
+         if (var1.charAt(var9) != 0) {
             char var10 = (char)(HealthBar.charToByteCp1252(var1.charAt(var9)) & 255);
-            if(var10 == '<') {
+            if (var10 == '<') {
                var6 = var9;
             } else {
+               int var11;
                int var12;
                int var13;
-               int var14;
-               if(var10 == '>' && var6 != -1) {
-                  String var11 = var1.substring(var6 + 1, var9);
+               if (var10 == '>' && var6 != -1) {
+                  String var14 = var1.substring(var6 + 1, var9);
                   var6 = -1;
-                  if(var11.equals("lt")) {
+                  if (var14.equals("lt")) {
                      var10 = '<';
                   } else {
-                     if(!var11.equals("gt")) {
-                        if(var11.startsWith("img=")) {
+                     if (!var14.equals("gt")) {
+                        if (var14.startsWith("img=")) {
                            try {
-                              if(var4 != null) {
-                                 var12 = var4[var8];
+                              if (xs != null) {
+                                 var11 = xs[var8];
+                              } else {
+                                 var11 = 0;
+                              }
+
+                              if (ys != null) {
+                                 var12 = ys[var8];
                               } else {
                                  var12 = 0;
                               }
 
-                              if(var5 != null) {
-                                 var13 = var5[var8];
-                              } else {
-                                 var13 = 0;
-                              }
-
                               ++var8;
-                              var14 = MouseHandler.method1085(var11.substring(4));
-                              IndexedSprite var15 = AbstractFont_modIconSprites[var14];
-                              var15.drawAt(var12 + var2, var13 + (var3 + this.ascent - var15.height));
-                              var2 += var15.width;
+                              var13 = MouseHandler.method1085(var14.substring(4));
+                              IndexedSprite var18 = AbstractFont_modIconSprites[var13];
+                              var18.drawAt(var11 + x, var12 + (y + this.ascent - var18.height));
+                              x += var18.width;
                               var7 = -1;
-                           } catch (Exception var19) {
-                              ;
+                           } catch (Exception var16) {
                            }
                         } else {
-                           this.decodeTag(var11);
+                           this.decodeTag(var14);
                         }
                         continue;
                      }
@@ -789,60 +778,60 @@ public abstract class AbstractFont extends Rasterizer2D {
                   }
                }
 
-               if(var10 == 160) {
+               if (var10 == 160) {
                   var10 = ' ';
                }
 
-               if(var6 == -1) {
-                  if(this.kerning != null && var7 != -1) {
-                     var2 += this.kerning[var10 + (var7 << 8)];
+               if (var6 == -1) {
+                  if (this.kerning != null && var7 != -1) {
+                     x += this.kerning[var10 + (var7 << 8)];
                   }
 
                   int var17 = this.widths[var10];
-                  var12 = this.heights[var10];
-                  if(var4 != null) {
-                     var13 = var4[var8];
+                  var11 = this.heights[var10];
+                  if (xs != null) {
+                     var12 = xs[var8];
+                  } else {
+                     var12 = 0;
+                  }
+
+                  if (ys != null) {
+                     var13 = ys[var8];
                   } else {
                      var13 = 0;
                   }
 
-                  if(var5 != null) {
-                     var14 = var5[var8];
-                  } else {
-                     var14 = 0;
-                  }
-
                   ++var8;
-                  if(var10 != ' ') {
-                     if(AbstractFont_alpha == 256) {
-                        if(AbstractFont_shadow != -1) {
-                           AbstractFont_drawGlyph(this.pixels[var10], var13 + var2 + this.leftBearings[var10] + 1, var3 + var14 + this.topBearings[var10] + 1, var17, var12, AbstractFont_shadow);
+                  if (var10 != ' ') {
+                     if (AbstractFont_alpha == 256) {
+                        if (AbstractFont_shadow != -1) {
+                           AbstractFont_drawGlyph(this.pixels[var10], var12 + x + this.leftBearings[var10] + 1, y + var13 + this.topBearings[var10] + 1, var17, var11, AbstractFont_shadow);
                         }
 
-                        this.drawGlyph(this.pixels[var10], var13 + var2 + this.leftBearings[var10], var3 + var14 + this.topBearings[var10], var17, var12, AbstractFont_color);
+                        this.drawGlyph(this.pixels[var10], var12 + x + this.leftBearings[var10], y + var13 + this.topBearings[var10], var17, var11, AbstractFont_color);
                      } else {
-                        if(AbstractFont_shadow != -1) {
-                           AbstractFont_drawGlyphAlpha(this.pixels[var10], var13 + var2 + this.leftBearings[var10] + 1, var3 + var14 + this.topBearings[var10] + 1, var17, var12, AbstractFont_shadow, AbstractFont_alpha);
+                        if (AbstractFont_shadow != -1) {
+                           AbstractFont_drawGlyphAlpha(this.pixels[var10], var12 + x + this.leftBearings[var10] + 1, y + var13 + this.topBearings[var10] + 1, var17, var11, 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);
+                        this.drawGlyphAlpha(this.pixels[var10], var12 + x + this.leftBearings[var10], y + var13 + this.topBearings[var10], var17, var11, AbstractFont_color, AbstractFont_alpha);
                      }
-                  } else if(AbstractFont_justificationTotal > 0) {
+                  } else if (AbstractFont_justificationTotal > 0) {
                      AbstractFont_justificationCurrent += AbstractFont_justificationTotal;
-                     var2 += AbstractFont_justificationCurrent >> 8;
+                     x += AbstractFont_justificationCurrent >> 8;
                      AbstractFont_justificationCurrent &= 255;
                   }
 
-                  int var18 = this.advances[var10];
-                  if(AbstractFont_strike != -1) {
-                     Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + (int)((double)this.ascent * 0.7D), var18, AbstractFont_strike);
+                  int var15 = this.advances[var10];
+                  if (AbstractFont_strike != -1) {
+                     Rasterizer2D.Rasterizer2D_drawHorizontalLine(x, y + (int)((double)this.ascent * 0.7D), var15, AbstractFont_strike);
                   }
 
-                  if(AbstractFont_underline != -1) {
-                     Rasterizer2D.Rasterizer2D_drawHorizontalLine(var2, var3 + this.ascent, var18, AbstractFont_underline);
+                  if (AbstractFont_underline != -1) {
+                     Rasterizer2D.Rasterizer2D_drawHorizontalLine(x, y + this.ascent, var15, AbstractFont_underline);
                   }
 
-                  var2 += var18;
+                  x += var15;
                   var7 = var10;
                }
             }
@@ -858,17 +847,17 @@ public abstract class AbstractFont extends Rasterizer2D {
       int var9 = var2[var6];
       int var10 = var9 + var4[var6];
       int var11 = var7;
-      if(var9 > var7) {
+      if (var9 > var7) {
          var11 = var9;
       }
 
       int var12 = var8;
-      if(var10 < var8) {
+      if (var10 < var8) {
          var12 = var10;
       }
 
       int var13 = var3[var5];
-      if(var3[var6] < var13) {
+      if (var3[var6] < var13) {
          var13 = var3[var6];
       }
 
@@ -877,9 +866,9 @@ public abstract class AbstractFont extends Rasterizer2D {
       int var16 = var11 - var7;
       int var17 = var11 - var9;
 
-      for(int var18 = var11; var18 < var12; ++var18) {
+      for (int var18 = var11; var18 < var12; ++var18) {
          int var19 = var14[var16++] + var15[var17++];
-         if(var19 < var13) {
+         if (var19 < var13) {
             var13 = var19;
          }
       }
@@ -893,20 +882,20 @@ public abstract class AbstractFont extends Rasterizer2D {
       int var1 = var0.length();
       int var2 = 0;
 
-      for(int var3 = 0; var3 < var1; ++var3) {
+      for (int var3 = 0; var3 < var1; ++var3) {
          char var4 = var0.charAt(var3);
-         if(var4 == '<' || var4 == '>') {
+         if (var4 == '<' || var4 == '>') {
             var2 += 3;
          }
       }
 
       StringBuilder var6 = new StringBuilder(var1 + var2);
 
-      for(int var7 = 0; var7 < var1; ++var7) {
+      for (int var7 = 0; var7 < var1; ++var7) {
          char var5 = var0.charAt(var7);
-         if(var5 == '<') {
+         if (var5 == '<') {
             var6.append("<lt>");
-         } else if(var5 == '>') {
+         } else if (var5 == '>') {
             var6.append("<gt>");
          } else {
             var6.append(var5);
@@ -918,44 +907,45 @@ public abstract class AbstractFont extends Rasterizer2D {
 
    @ObfuscatedName("ah")
    @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;
-      int var7 = Rasterizer2D.Rasterizer2D_width - var3;
+   static void AbstractFont_drawGlyph(byte[] pixels, int x, int y, int width, int height, int color) {
+      int var6 = x + y * Rasterizer2D.Rasterizer2D_width;
+      int var7 = Rasterizer2D.Rasterizer2D_width - width;
       int var8 = 0;
       int var9 = 0;
       int var10;
-      if(var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
-         var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2;
-         var4 -= var10;
-         var2 = Rasterizer2D.Rasterizer2D_yClipStart;
-         var9 += var3 * var10;
+      if (y < Rasterizer2D.Rasterizer2D_yClipStart) {
+         var10 = Rasterizer2D.Rasterizer2D_yClipStart - y;
+         height -= var10;
+         y = Rasterizer2D.Rasterizer2D_yClipStart;
+         var9 += width * var10;
          var6 += var10 * Rasterizer2D.Rasterizer2D_width;
       }
 
-      if(var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) {
-         var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd;
+      if (y + height > Rasterizer2D.Rasterizer2D_yClipEnd) {
+         height -= y + height - Rasterizer2D.Rasterizer2D_yClipEnd;
       }
 
-      if(var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
-         var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1;
-         var3 -= var10;
-         var1 = Rasterizer2D.Rasterizer2D_xClipStart;
+      if (x < Rasterizer2D.Rasterizer2D_xClipStart) {
+         var10 = Rasterizer2D.Rasterizer2D_xClipStart - x;
+         width -= var10;
+         x = Rasterizer2D.Rasterizer2D_xClipStart;
          var9 += var10;
          var6 += var10;
          var8 += var10;
          var7 += var10;
       }
 
-      if(var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
-         var10 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd;
-         var3 -= var10;
+      if (width + x > Rasterizer2D.Rasterizer2D_xClipEnd) {
+         var10 = width + x - Rasterizer2D.Rasterizer2D_xClipEnd;
+         width -= var10;
          var8 += var10;
          var7 += var10;
       }
 
-      if(var3 > 0 && var4 > 0) {
-         AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var9, var6, var3, var4, var7, var8);
+      if (width > 0 && height > 0) {
+         AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, pixels, color, var9, var6, width, height, var7, var8);
       }
+
    }
 
    @ObfuscatedName("ak")
@@ -964,36 +954,36 @@ public abstract class AbstractFont extends Rasterizer2D {
       int var9 = -(var5 >> 2);
       var5 = -(var5 & 3);
 
-      for(int var10 = -var6; var10 < 0; ++var10) {
+      for (int var10 = -var6; var10 < 0; ++var10) {
          int var11;
-         for(var11 = var9; var11 < 0; ++var11) {
-            if(var1[var3++] != 0) {
+         for (var11 = var9; var11 < 0; ++var11) {
+            if (var1[var3++] != 0) {
                var0[var4++] = var2;
             } else {
                ++var4;
             }
 
-            if(var1[var3++] != 0) {
+            if (var1[var3++] != 0) {
                var0[var4++] = var2;
             } else {
                ++var4;
             }
 
-            if(var1[var3++] != 0) {
+            if (var1[var3++] != 0) {
                var0[var4++] = var2;
             } else {
                ++var4;
             }
 
-            if(var1[var3++] != 0) {
+            if (var1[var3++] != 0) {
                var0[var4++] = var2;
             } else {
                ++var4;
             }
          }
 
-         for(var11 = var5; var11 < 0; ++var11) {
-            if(var1[var3++] != 0) {
+         for (var11 = var5; var11 < 0; ++var11) {
+            if (var1[var3++] != 0) {
                var0[var4++] = var2;
             } else {
                ++var4;
@@ -1008,44 +998,45 @@ public abstract class AbstractFont extends Rasterizer2D {
 
    @ObfuscatedName("aw")
    @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;
-      int var8 = Rasterizer2D.Rasterizer2D_width - var3;
+   static void AbstractFont_drawGlyphAlpha(byte[] pixels, int x, int y, int width, int height, int color, int alpha) {
+      int var7 = x + y * Rasterizer2D.Rasterizer2D_width;
+      int var8 = Rasterizer2D.Rasterizer2D_width - width;
       int var9 = 0;
       int var10 = 0;
       int var11;
-      if(var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
-         var11 = Rasterizer2D.Rasterizer2D_yClipStart - var2;
-         var4 -= var11;
-         var2 = Rasterizer2D.Rasterizer2D_yClipStart;
-         var10 += var3 * var11;
+      if (y < Rasterizer2D.Rasterizer2D_yClipStart) {
+         var11 = Rasterizer2D.Rasterizer2D_yClipStart - y;
+         height -= var11;
+         y = Rasterizer2D.Rasterizer2D_yClipStart;
+         var10 += width * var11;
          var7 += var11 * Rasterizer2D.Rasterizer2D_width;
       }
 
-      if(var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) {
-         var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd;
+      if (y + height > Rasterizer2D.Rasterizer2D_yClipEnd) {
+         height -= y + height - Rasterizer2D.Rasterizer2D_yClipEnd;
       }
 
-      if(var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
-         var11 = Rasterizer2D.Rasterizer2D_xClipStart - var1;
-         var3 -= var11;
-         var1 = Rasterizer2D.Rasterizer2D_xClipStart;
+      if (x < Rasterizer2D.Rasterizer2D_xClipStart) {
+         var11 = Rasterizer2D.Rasterizer2D_xClipStart - x;
+         width -= var11;
+         x = Rasterizer2D.Rasterizer2D_xClipStart;
          var10 += var11;
          var7 += var11;
          var9 += var11;
          var8 += var11;
       }
 
-      if(var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
-         var11 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd;
-         var3 -= var11;
+      if (width + x > Rasterizer2D.Rasterizer2D_xClipEnd) {
+         var11 = width + x - Rasterizer2D.Rasterizer2D_xClipEnd;
+         width -= var11;
          var9 += var11;
          var8 += var11;
       }
 
-      if(var3 > 0 && var4 > 0) {
-         AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var5, var10, var7, var3, var4, var8, var9, var6);
+      if (width > 0 && height > 0) {
+         AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, pixels, color, var10, var7, width, height, var8, var9, alpha);
       }
+
    }
 
    @ObfuscatedName("al")
@@ -1054,9 +1045,9 @@ public abstract class AbstractFont extends Rasterizer2D {
       var2 = ((var2 & 65280) * var9 & 16711680) + (var9 * (var2 & 16711935) & -16711936) >> 8;
       var9 = 256 - var9;
 
-      for(int var10 = -var6; var10 < 0; ++var10) {
-         for(int var11 = -var5; var11 < 0; ++var11) {
-            if(var1[var3++] != 0) {
+      for (int var10 = -var6; var10 < 0; ++var10) {
+         for (int var11 = -var5; var11 < 0; ++var11) {
+            if (var1[var3++] != 0) {
                int var12 = var0[var4];
                var0[var4++] = (((var12 & 65280) * var9 & 16711680) + ((var12 & 16711935) * var9 & -16711936) >> 8) + var2;
             } else {
@@ -1069,4 +1060,18 @@ public abstract class AbstractFont extends Rasterizer2D {
       }
 
    }
+
+   static {
+      AbstractFont_strike = -1;
+      AbstractFont_underline = -1;
+      AbstractFont_previousShadow = -1;
+      AbstractFont_shadow = -1;
+      AbstractFont_previousColor = 0;
+      AbstractFont_color = 0;
+      AbstractFont_alpha = 256;
+      AbstractFont_justificationTotal = 0;
+      AbstractFont_justificationCurrent = 0;
+      AbstractFont_random = new Random();
+      AbstractFont_lines = new String[100];
+   }
 }
diff --git a/runescape-client/src/main/java/AbstractIndexCache.java b/runescape-client/src/main/java/AbstractIndexCache.java
deleted file mode 100644
index 22249e8e50..0000000000
--- a/runescape-client/src/main/java/AbstractIndexCache.java
+++ /dev/null
@@ -1,770 +0,0 @@
-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("ir")
-@Implements("AbstractIndexCache")
-public abstract class AbstractIndexCache {
-   @ObfuscatedName("qb")
-   @ObfuscatedSignature(
-      signature = "Lco;"
-   )
-   @Export("pcmPlayer1")
-   static PcmPlayer pcmPlayer1;
-   @ObfuscatedName("i")
-   @ObfuscatedSignature(
-      signature = "Lgo;"
-   )
-   @Export("gzipDecompressor")
-   static GzipDecompressor gzipDecompressor;
-   @ObfuscatedName("s")
-   @ObfuscatedGetter(
-      intValue = -244224193
-   )
-   static int __ir_s;
-   @ObfuscatedName("au")
-   @Export("garbageCollector")
-   static GarbageCollectorMXBean garbageCollector;
-   @ObfuscatedName("bu")
-   @ObfuscatedGetter(
-      intValue = 334735939
-   )
-   static int __ir_bu;
-   @ObfuscatedName("di")
-   @ObfuscatedSignature(
-      signature = "Lit;"
-   )
-   @Export("indexCache0")
-   static IndexCache indexCache0;
-   @ObfuscatedName("f")
-   @ObfuscatedGetter(
-      intValue = 1694798923
-   )
-   @Export("archiveCount")
-   int archiveCount;
-   @ObfuscatedName("q")
-   @Export("archiveIds")
-   int[] archiveIds;
-   @ObfuscatedName("w")
-   @Export("archiveNameHashes")
-   int[] archiveNameHashes;
-   @ObfuscatedName("o")
-   @ObfuscatedSignature(
-      signature = "Llv;"
-   )
-   @Export("archiveNameHashTable")
-   IntHashTable archiveNameHashTable;
-   @ObfuscatedName("u")
-   @Export("archiveCrcs")
-   int[] archiveCrcs;
-   @ObfuscatedName("g")
-   @Export("archiveVersions")
-   int[] archiveVersions;
-   @ObfuscatedName("l")
-   @Export("recordCounts")
-   int[] recordCounts;
-   @ObfuscatedName("e")
-   @Export("recordIds")
-   int[][] recordIds;
-   @ObfuscatedName("x")
-   @Export("recordNameHashes")
-   int[][] recordNameHashes;
-   @ObfuscatedName("d")
-   @ObfuscatedSignature(
-      signature = "[Llv;"
-   )
-   @Export("recordNameHashTables")
-   IntHashTable[] recordNameHashTables;
-   @ObfuscatedName("k")
-   @Export("archives")
-   Object[] archives;
-   @ObfuscatedName("n")
-   @Export("records")
-   Object[][] records;
-   @ObfuscatedName("a")
-   @ObfuscatedGetter(
-      intValue = -530370811
-   )
-   @Export("hash")
-   public int hash;
-   @ObfuscatedName("z")
-   @Export("releaseArchives")
-   boolean releaseArchives;
-   @ObfuscatedName("j")
-   @Export("shallowRecords")
-   boolean shallowRecords;
-
-   static {
-      gzipDecompressor = new GzipDecompressor();
-      __ir_s = 0;
-   }
-
-   AbstractIndexCache(boolean var1, boolean var2) {
-      this.releaseArchives = var1;
-      this.shallowRecords = var2;
-   }
-
-   @ObfuscatedName("m")
-   @ObfuscatedSignature(
-      signature = "([BB)V",
-      garbageValue = "0"
-   )
-   @Export("setIndexReference")
-   void setIndexReference(byte[] var1) {
-      this.hash = WallDecoration.method3257(var1, var1.length);
-      Buffer var2 = new Buffer(Strings.decompressBytes(var1));
-      int var3 = var2.readUnsignedByte();
-      if(var3 >= 5 && var3 <= 7) {
-         if(var3 >= 6) {
-            var2.readInt();
-         }
-
-         int var4 = var2.readUnsignedByte();
-         if(var3 >= 7) {
-            this.archiveCount = var2.__ad_309();
-         } else {
-            this.archiveCount = var2.__ag_302();
-         }
-
-         int var5 = 0;
-         int var6 = -1;
-         this.archiveIds = new int[this.archiveCount];
-         int var7;
-         if(var3 >= 7) {
-            for(var7 = 0; var7 < this.archiveCount; ++var7) {
-               this.archiveIds[var7] = var5 += var2.__ad_309();
-               if(this.archiveIds[var7] > var6) {
-                  var6 = this.archiveIds[var7];
-               }
-            }
-         } else {
-            for(var7 = 0; var7 < this.archiveCount; ++var7) {
-               this.archiveIds[var7] = var5 += var2.__ag_302();
-               if(this.archiveIds[var7] > var6) {
-                  var6 = this.archiveIds[var7];
-               }
-            }
-         }
-
-         this.archiveCrcs = new int[var6 + 1];
-         this.archiveVersions = new int[var6 + 1];
-         this.recordCounts = new int[var6 + 1];
-         this.recordIds = new int[var6 + 1][];
-         this.archives = new Object[var6 + 1];
-         this.records = new Object[var6 + 1][];
-         if(var4 != 0) {
-            this.archiveNameHashes = new int[var6 + 1];
-
-            for(var7 = 0; var7 < this.archiveCount; ++var7) {
-               this.archiveNameHashes[this.archiveIds[var7]] = var2.readInt();
-            }
-
-            this.archiveNameHashTable = new IntHashTable(this.archiveNameHashes);
-         }
-
-         for(var7 = 0; var7 < this.archiveCount; ++var7) {
-            this.archiveCrcs[this.archiveIds[var7]] = var2.readInt();
-         }
-
-         for(var7 = 0; var7 < this.archiveCount; ++var7) {
-            this.archiveVersions[this.archiveIds[var7]] = var2.readInt();
-         }
-
-         for(var7 = 0; var7 < this.archiveCount; ++var7) {
-            this.recordCounts[this.archiveIds[var7]] = var2.__ag_302();
-         }
-
-         int var8;
-         int var9;
-         int var10;
-         int var11;
-         int var12;
-         if(var3 >= 7) {
-            for(var7 = 0; var7 < this.archiveCount; ++var7) {
-               var8 = this.archiveIds[var7];
-               var9 = this.recordCounts[var8];
-               var5 = 0;
-               var10 = -1;
-               this.recordIds[var8] = new int[var9];
-
-               for(var11 = 0; var11 < var9; ++var11) {
-                  var12 = this.recordIds[var8][var11] = var5 += var2.__ad_309();
-                  if(var12 > var10) {
-                     var10 = var12;
-                  }
-               }
-
-               this.records[var8] = new Object[var10 + 1];
-            }
-         } else {
-            for(var7 = 0; var7 < this.archiveCount; ++var7) {
-               var8 = this.archiveIds[var7];
-               var9 = this.recordCounts[var8];
-               var5 = 0;
-               var10 = -1;
-               this.recordIds[var8] = new int[var9];
-
-               for(var11 = 0; var11 < var9; ++var11) {
-                  var12 = this.recordIds[var8][var11] = var5 += var2.__ag_302();
-                  if(var12 > var10) {
-                     var10 = var12;
-                  }
-               }
-
-               this.records[var8] = new Object[var10 + 1];
-            }
-         }
-
-         if(var4 != 0) {
-            this.recordNameHashes = new int[var6 + 1][];
-            this.recordNameHashTables = new IntHashTable[var6 + 1];
-
-            for(var7 = 0; var7 < this.archiveCount; ++var7) {
-               var8 = this.archiveIds[var7];
-               var9 = this.recordCounts[var8];
-               this.recordNameHashes[var8] = new int[this.records[var8].length];
-
-               for(var10 = 0; var10 < var9; ++var10) {
-                  this.recordNameHashes[var8][this.recordIds[var8][var10]] = var2.readInt();
-               }
-
-               this.recordNameHashTables[var8] = new IntHashTable(this.recordNameHashes[var8]);
-            }
-         }
-
-      } else {
-         throw new RuntimeException("");
-      }
-   }
-
-   @ObfuscatedName("f")
-   @ObfuscatedSignature(
-      signature = "(II)V",
-      garbageValue = "2102142648"
-   )
-   void __f_392(int var1) {
-   }
-
-   @ObfuscatedName("q")
-   @ObfuscatedSignature(
-      signature = "(III)[B",
-      garbageValue = "1945577069"
-   )
-   @Export("takeRecord")
-   public byte[] takeRecord(int var1, int var2) {
-      return this.takeRecordEncrypted(var1, var2, (int[])null);
-   }
-
-   @ObfuscatedName("w")
-   @ObfuscatedSignature(
-      signature = "(II[II)[B",
-      garbageValue = "-1363136655"
-   )
-   @Export("takeRecordEncrypted")
-   public byte[] takeRecordEncrypted(int var1, int var2, int[] var3) {
-      if(var1 >= 0 && var1 < this.records.length && this.records[var1] != null && var2 >= 0 && var2 < this.records[var1].length) {
-         if(this.records[var1][var2] == null) {
-            boolean var4 = this.buildRecords(var1, var3);
-            if(!var4) {
-               this.loadArchive(var1);
-               var4 = this.buildRecords(var1, var3);
-               if(!var4) {
-                  return null;
-               }
-            }
-         }
-
-         byte[] var5 = TextureProvider.byteArrayFromObject(this.records[var1][var2], false);
-         if(this.shallowRecords) {
-            this.records[var1][var2] = null;
-         }
-
-         return var5;
-      } else {
-         return null;
-      }
-   }
-
-   @ObfuscatedName("o")
-   @ObfuscatedSignature(
-      signature = "(III)Z",
-      garbageValue = "-1822260214"
-   )
-   @Export("tryLoadRecord")
-   public boolean tryLoadRecord(int var1, int var2) {
-      if(var1 >= 0 && var1 < this.records.length && this.records[var1] != null && var2 >= 0 && var2 < this.records[var1].length) {
-         if(this.records[var1][var2] != null) {
-            return true;
-         } else if(this.archives[var1] != null) {
-            return true;
-         } else {
-            this.loadArchive(var1);
-            return this.archives[var1] != null;
-         }
-      } else {
-         return false;
-      }
-   }
-
-   @ObfuscatedName("u")
-   @ObfuscatedSignature(
-      signature = "(II)Z",
-      garbageValue = "-1923759754"
-   )
-   public boolean __u_393(int var1) {
-      if(this.records.length == 1) {
-         return this.tryLoadRecord(0, var1);
-      } else if(this.records[var1].length == 1) {
-         return this.tryLoadRecord(var1, 0);
-      } else {
-         throw new RuntimeException();
-      }
-   }
-
-   @ObfuscatedName("g")
-   @ObfuscatedSignature(
-      signature = "(II)Z",
-      garbageValue = "-374594123"
-   )
-   @Export("tryLoadArchive")
-   public boolean tryLoadArchive(int var1) {
-      if(this.archives[var1] != null) {
-         return true;
-      } else {
-         this.loadArchive(var1);
-         return this.archives[var1] != null;
-      }
-   }
-
-   @ObfuscatedName("l")
-   @ObfuscatedSignature(
-      signature = "(I)Z",
-      garbageValue = "1694975256"
-   )
-   public boolean __l_394() {
-      boolean var1 = true;
-
-      for(int var2 = 0; var2 < this.archiveIds.length; ++var2) {
-         int var3 = this.archiveIds[var2];
-         if(this.archives[var3] == null) {
-            this.loadArchive(var3);
-            if(this.archives[var3] == null) {
-               var1 = false;
-            }
-         }
-      }
-
-      return var1;
-   }
-
-   @ObfuscatedName("e")
-   @ObfuscatedSignature(
-      signature = "(II)I",
-      garbageValue = "-1809769865"
-   )
-   @Export("archiveLoadPercent")
-   int archiveLoadPercent(int var1) {
-      return this.archives[var1] != null?100:0;
-   }
-
-   @ObfuscatedName("x")
-   @ObfuscatedSignature(
-      signature = "(IS)[B",
-      garbageValue = "-10015"
-   )
-   @Export("takeRecordFlat")
-   public byte[] takeRecordFlat(int var1) {
-      if(this.records.length == 1) {
-         return this.takeRecord(0, var1);
-      } else if(this.records[var1].length == 1) {
-         return this.takeRecord(var1, 0);
-      } else {
-         throw new RuntimeException();
-      }
-   }
-
-   @ObfuscatedName("d")
-   @ObfuscatedSignature(
-      signature = "(III)[B",
-      garbageValue = "-755739011"
-   )
-   @Export("getRecord")
-   public byte[] getRecord(int var1, int var2) {
-      if(var1 >= 0 && var1 < this.records.length && this.records[var1] != null && var2 >= 0 && var2 < this.records[var1].length) {
-         if(this.records[var1][var2] == null) {
-            boolean var3 = this.buildRecords(var1, (int[])null);
-            if(!var3) {
-               this.loadArchive(var1);
-               var3 = this.buildRecords(var1, (int[])null);
-               if(!var3) {
-                  return null;
-               }
-            }
-         }
-
-         byte[] var4 = TextureProvider.byteArrayFromObject(this.records[var1][var2], false);
-         return var4;
-      } else {
-         return null;
-      }
-   }
-
-   @ObfuscatedName("a")
-   @ObfuscatedSignature(
-      signature = "(IB)[B",
-      garbageValue = "68"
-   )
-   @Export("getRecordFlat")
-   public byte[] getRecordFlat(int var1) {
-      if(this.records.length == 1) {
-         return this.getRecord(0, var1);
-      } else if(this.records[var1].length == 1) {
-         return this.getRecord(var1, 0);
-      } else {
-         throw new RuntimeException();
-      }
-   }
-
-   @ObfuscatedName("z")
-   @ObfuscatedSignature(
-      signature = "(II)V",
-      garbageValue = "-1829145107"
-   )
-   @Export("loadArchive")
-   void loadArchive(int var1) {
-   }
-
-   @ObfuscatedName("j")
-   @ObfuscatedSignature(
-      signature = "(IB)[I",
-      garbageValue = "28"
-   )
-   public int[] __j_395(int var1) {
-      return var1 >= 0 && var1 < this.recordIds.length?this.recordIds[var1]:null;
-   }
-
-   @ObfuscatedName("s")
-   @ObfuscatedSignature(
-      signature = "(II)I",
-      garbageValue = "1178362496"
-   )
-   public int __s_396(int var1) {
-      return this.records[var1].length;
-   }
-
-   @ObfuscatedName("t")
-   @ObfuscatedSignature(
-      signature = "(I)I",
-      garbageValue = "1702434573"
-   )
-   public int __t_397() {
-      return this.records.length;
-   }
-
-   @ObfuscatedName("y")
-   @ObfuscatedSignature(
-      signature = "(B)V",
-      garbageValue = "38"
-   )
-   public void __y_398() {
-      for(int var1 = 0; var1 < this.archives.length; ++var1) {
-         this.archives[var1] = null;
-      }
-
-   }
-
-   @ObfuscatedName("h")
-   @ObfuscatedSignature(
-      signature = "(II)V",
-      garbageValue = "330258899"
-   )
-   public void __h_399(int var1) {
-      for(int var2 = 0; var2 < this.records[var1].length; ++var2) {
-         this.records[var1][var2] = null;
-      }
-
-   }
-
-   @ObfuscatedName("b")
-   @ObfuscatedSignature(
-      signature = "(I)V",
-      garbageValue = "-709581639"
-   )
-   public void __b_400() {
-      for(int var1 = 0; var1 < this.records.length; ++var1) {
-         if(this.records[var1] != null) {
-            for(int var2 = 0; var2 < this.records[var1].length; ++var2) {
-               this.records[var1][var2] = null;
-            }
-         }
-      }
-
-   }
-
-   @ObfuscatedName("c")
-   @ObfuscatedSignature(
-      signature = "(I[II)Z",
-      garbageValue = "-1835696874"
-   )
-   @Export("buildRecords")
-   boolean buildRecords(int var1, int[] var2) {
-      if(this.archives[var1] == null) {
-         return false;
-      } else {
-         int var3 = this.recordCounts[var1];
-         int[] var4 = this.recordIds[var1];
-         Object[] var5 = this.records[var1];
-         boolean var6 = true;
-
-         for(int var7 = 0; var7 < var3; ++var7) {
-            if(var5[var4[var7]] == null) {
-               var6 = false;
-               break;
-            }
-         }
-
-         if(var6) {
-            return true;
-         } else {
-            byte[] var18;
-            if(var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) {
-               var18 = TextureProvider.byteArrayFromObject(this.archives[var1], false);
-            } else {
-               var18 = TextureProvider.byteArrayFromObject(this.archives[var1], true);
-               Buffer var8 = new Buffer(var18);
-               var8.xteaDecrypt(var2, 5, var8.array.length);
-            }
-
-            byte[] var20 = Strings.decompressBytes(var18);
-            if(this.releaseArchives) {
-               this.archives[var1] = null;
-            }
-
-            if(var3 > 1) {
-               int var9 = var20.length;
-               --var9;
-               int var10 = var20[var9] & 255;
-               var9 -= var10 * var3 * 4;
-               Buffer var11 = new Buffer(var20);
-               int[] var12 = new int[var3];
-               var11.index = var9;
-
-               int var14;
-               int var15;
-               for(int var13 = 0; var13 < var10; ++var13) {
-                  var14 = 0;
-
-                  for(var15 = 0; var15 < var3; ++var15) {
-                     var14 += var11.readInt();
-                     var12[var15] += var14;
-                  }
-               }
-
-               byte[][] var19 = new byte[var3][];
-
-               for(var14 = 0; var14 < var3; ++var14) {
-                  var19[var14] = new byte[var12[var14]];
-                  var12[var14] = 0;
-               }
-
-               var11.index = var9;
-               var14 = 0;
-
-               for(var15 = 0; var15 < var10; ++var15) {
-                  int var16 = 0;
-
-                  for(int var17 = 0; var17 < var3; ++var17) {
-                     var16 += var11.readInt();
-                     System.arraycopy(var20, var14, var19[var17], var12[var17], var16);
-                     var12[var17] += var16;
-                     var14 += var16;
-                  }
-               }
-
-               for(var15 = 0; var15 < var3; ++var15) {
-                  if(!this.shallowRecords) {
-                     var5[var4[var15]] = Projectile.byteArrayToObject(var19[var15], false);
-                  } else {
-                     var5[var4[var15]] = var19[var15];
-                  }
-               }
-            } else if(!this.shallowRecords) {
-               var5[var4[0]] = Projectile.byteArrayToObject(var20, false);
-            } else {
-               var5[var4[0]] = var20;
-            }
-
-            return true;
-         }
-      }
-   }
-
-   @ObfuscatedName("p")
-   @ObfuscatedSignature(
-      signature = "(Ljava/lang/String;I)I",
-      garbageValue = "-224510300"
-   )
-   @Export("getArchiveId")
-   public int getArchiveId(String var1) {
-      var1 = var1.toLowerCase();
-      return this.archiveNameHashTable.get(Client.hashString(var1));
-   }
-
-   @ObfuscatedName("v")
-   @ObfuscatedSignature(
-      signature = "(ILjava/lang/String;I)I",
-      garbageValue = "-443631072"
-   )
-   @Export("getRecordId")
-   public int getRecordId(int var1, String var2) {
-      var2 = var2.toLowerCase();
-      return this.recordNameHashTables[var1].get(Client.hashString(var2));
-   }
-
-   @ObfuscatedName("ag")
-   @ObfuscatedSignature(
-      signature = "(Ljava/lang/String;Ljava/lang/String;B)Z",
-      garbageValue = "68"
-   )
-   public boolean __ag_401(String var1, String var2) {
-      var1 = var1.toLowerCase();
-      var2 = var2.toLowerCase();
-      int var3 = this.archiveNameHashTable.get(Client.hashString(var1));
-      if(var3 < 0) {
-         return false;
-      } else {
-         int var4 = this.recordNameHashTables[var3].get(Client.hashString(var2));
-         return var4 >= 0;
-      }
-   }
-
-   @ObfuscatedName("aq")
-   @ObfuscatedSignature(
-      signature = "(Ljava/lang/String;Ljava/lang/String;S)[B",
-      garbageValue = "-22726"
-   )
-   @Export("takeRecordByNames")
-   public byte[] takeRecordByNames(String var1, String var2) {
-      var1 = var1.toLowerCase();
-      var2 = var2.toLowerCase();
-      int var3 = this.archiveNameHashTable.get(Client.hashString(var1));
-      int var4 = this.recordNameHashTables[var3].get(Client.hashString(var2));
-      return this.takeRecord(var3, var4);
-   }
-
-   @ObfuscatedName("aj")
-   @ObfuscatedSignature(
-      signature = "(Ljava/lang/String;Ljava/lang/String;I)Z",
-      garbageValue = "2140743930"
-   )
-   @Export("tryLoadRecordByNames")
-   public boolean tryLoadRecordByNames(String var1, String var2) {
-      var1 = var1.toLowerCase();
-      var2 = var2.toLowerCase();
-      int var3 = this.archiveNameHashTable.get(Client.hashString(var1));
-      int var4 = this.recordNameHashTables[var3].get(Client.hashString(var2));
-      return this.tryLoadRecord(var3, var4);
-   }
-
-   @ObfuscatedName("av")
-   @ObfuscatedSignature(
-      signature = "(Ljava/lang/String;I)Z",
-      garbageValue = "-1282569336"
-   )
-   @Export("tryLoadArchiveByName")
-   public boolean tryLoadArchiveByName(String var1) {
-      var1 = var1.toLowerCase();
-      int var2 = this.archiveNameHashTable.get(Client.hashString(var1));
-      return this.tryLoadArchive(var2);
-   }
-
-   @ObfuscatedName("ar")
-   @ObfuscatedSignature(
-      signature = "(Ljava/lang/String;B)V",
-      garbageValue = "40"
-   )
-   public void __ar_402(String var1) {
-      var1 = var1.toLowerCase();
-      int var2 = this.archiveNameHashTable.get(Client.hashString(var1));
-      if(var2 >= 0) {
-         this.__f_392(var2);
-      }
-   }
-
-   @ObfuscatedName("ac")
-   @ObfuscatedSignature(
-      signature = "(Ljava/lang/String;I)I",
-      garbageValue = "-1645224643"
-   )
-   @Export("archiveLoadPercentByName")
-   public int archiveLoadPercentByName(String var1) {
-      var1 = var1.toLowerCase();
-      int var2 = this.archiveNameHashTable.get(Client.hashString(var1));
-      return this.archiveLoadPercent(var2);
-   }
-
-   @ObfuscatedName("m")
-   @ObfuscatedSignature(
-      signature = "(Lgr;Llh;I)Llh;",
-      garbageValue = "15597880"
-   )
-   @Export("readStringIntParameters")
-   static final IterableNodeHashTable readStringIntParameters(Buffer var0, IterableNodeHashTable var1) {
-      int var2 = var0.readUnsignedByte();
-      int var3;
-      if(var1 == null) {
-         var3 = World.method1759(var2);
-         var1 = new IterableNodeHashTable(var3);
-      }
-
-      for(var3 = 0; var3 < var2; ++var3) {
-         boolean var4 = var0.readUnsignedByte() == 1;
-         int var5 = var0.readMedium();
-         Object var6;
-         if(var4) {
-            var6 = new ObjectNode(var0.readStringCp1252NullTerminated());
-         } else {
-            var6 = new IntegerNode(var0.readInt());
-         }
-
-         var1.put((Node)var6, (long)var5);
-      }
-
-      return var1;
-   }
-
-   @ObfuscatedName("m")
-   @ObfuscatedSignature(
-      signature = "(Lby;S)V",
-      garbageValue = "-4702"
-   )
-   @Export("runScript")
-   public static void runScript(ScriptEvent var0) {
-      GrandExchangeEvent.runScript0(var0, 500000);
-   }
-
-   @ObfuscatedName("eg")
-   @ObfuscatedSignature(
-      signature = "(I)Z",
-      garbageValue = "308670894"
-   )
-   static boolean method4585() {
-      if(Client.indexCacheLoaders != null && Client.indexCacheLoaderIndex < Client.indexCacheLoaders.size()) {
-         while(Client.indexCacheLoaderIndex < Client.indexCacheLoaders.size()) {
-            IndexCacheLoader var0 = (IndexCacheLoader)Client.indexCacheLoaders.get(Client.indexCacheLoaderIndex);
-            if(!var0.__m_122()) {
-               return false;
-            }
-
-            ++Client.indexCacheLoaderIndex;
-         }
-
-         return true;
-      } else {
-         return true;
-      }
-   }
-}
diff --git a/runescape-client/src/main/java/AbstractRasterProvider.java b/runescape-client/src/main/java/AbstractRasterProvider.java
index 4d6fcf99ea..d218bd3f3a 100644
--- a/runescape-client/src/main/java/AbstractRasterProvider.java
+++ b/runescape-client/src/main/java/AbstractRasterProvider.java
@@ -32,7 +32,7 @@ public abstract class AbstractRasterProvider {
       garbageValue = "-430495007"
    )
    @Export("drawFull")
-   public abstract void drawFull(int var1, int var2);
+   public abstract void drawFull(int x, int y);
 
    @ObfuscatedName("q")
    @ObfuscatedSignature(
@@ -40,7 +40,7 @@ public abstract class AbstractRasterProvider {
       garbageValue = "18"
    )
    @Export("draw")
-   public abstract void draw(int var1, int var2, int var3, int var4);
+   public abstract void draw(int x, int y, int width, int height);
 
    @ObfuscatedName("b")
    @ObfuscatedSignature(
diff --git a/runescape-client/src/main/java/AbstractSocket.java b/runescape-client/src/main/java/AbstractSocket.java
index 9748d7bcfc..46978179ee 100644
--- a/runescape-client/src/main/java/AbstractSocket.java
+++ b/runescape-client/src/main/java/AbstractSocket.java
@@ -13,7 +13,7 @@ public abstract class AbstractSocket {
       garbageValue = "1765046516"
    )
    @Export("isAvailable")
-   public abstract boolean isAvailable(int var1) throws IOException;
+   public abstract boolean isAvailable(int length) throws IOException;
 
    @ObfuscatedName("q")
    @ObfuscatedSignature(
@@ -37,7 +37,7 @@ public abstract class AbstractSocket {
       garbageValue = "-1089665746"
    )
    @Export("read")
-   public abstract int read(byte[] var1, int var2, int var3) throws IOException;
+   public abstract int read(byte[] dst, int dstIndex, int length) throws IOException;
 
    @ObfuscatedName("u")
    @ObfuscatedSignature(
@@ -45,7 +45,7 @@ public abstract class AbstractSocket {
       garbageValue = "-86"
    )
    @Export("write")
-   public abstract void write(byte[] var1, int var2, int var3) throws IOException;
+   public abstract void write(byte[] src, int srcIndex, int length) throws IOException;
 
    @ObfuscatedName("g")
    @ObfuscatedSignature(
@@ -61,12 +61,12 @@ public abstract class AbstractSocket {
       garbageValue = "-15"
    )
    public static void method3488(int var0) {
-      class214.__hf_o = 1;
-      class214.__hf_u = null;
-      class30.musicTrackArchiveId = -1;
+      class214.field1129 = 1;
+      class214.field1130 = null;
+      class30.musicTrackGroupId = -1;
       GrandExchangeOffer.musicTrackFileId = -1;
-      WorldMapLabel.__aj_e = 0;
+      WorldMapLabel.field1039 = 0;
       RectangleMode.musicTrackBoolean = false;
-      FaceNormal.__el_x = var0;
+      FaceNormal.field344 = var0;
    }
 }
diff --git a/runescape-client/src/main/java/AbstractUserComparator.java b/runescape-client/src/main/java/AbstractUserComparator.java
index 2ce70ecb9b..6071aae588 100644
--- a/runescape-client/src/main/java/AbstractUserComparator.java
+++ b/runescape-client/src/main/java/AbstractUserComparator.java
@@ -8,18 +8,20 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("AbstractUserComparator")
 public abstract class AbstractUserComparator implements Comparator {
    @ObfuscatedName("f")
-   Comparator __f;
+   @Export("nextComparator")
+   Comparator nextComparator;
 
    @ObfuscatedName("e")
    @ObfuscatedSignature(
       signature = "(Ljava/util/Comparator;B)V",
       garbageValue = "-2"
    )
-   final void __e_460(Comparator var1) {
-      if(this.__f == null) {
-         this.__f = var1;
-      } else if(this.__f instanceof AbstractUserComparator) {
-         ((AbstractUserComparator)this.__f).__e_460(var1);
+   @Export("addComparator")
+   final void addComparator(Comparator var1) {
+      if (this.nextComparator == null) {
+         this.nextComparator = var1;
+      } else if (this.nextComparator instanceof AbstractUserComparator) {
+         ((AbstractUserComparator)this.nextComparator).addComparator(var1);
       }
 
    }
@@ -29,12 +31,12 @@ public abstract class AbstractUserComparator implements Comparator {
       signature = "(Ljs;Ljs;I)I",
       garbageValue = "-962181316"
    )
-   protected final int __x_461(User var1, User var2) {
-      return this.__f == null?0:this.__f.compare(var1, var2);
+   @Export("compareUser")
+   protected final int compareUser(User var1, User var2) {
+      return this.nextComparator == null ? 0 : this.nextComparator.compare(var1, var2);
    }
 
-   @ObfuscatedName("equals")
-   public boolean __equals_462(Object var1) {
+   public boolean equals(Object var1) {
       return super.equals(var1);
    }
 
@@ -44,22 +46,22 @@ public abstract class AbstractUserComparator implements Comparator {
       garbageValue = "2048322935"
    )
    static void method5437(int var0) {
-      if(var0 == -1 && !Client.__client_qq) {
+      if (var0 == -1 && !Client.field107) {
          class214.midiPcmStream.clear();
-         class214.__hf_o = 1;
-         class214.__hf_u = null;
-      } else if(var0 != -1 && var0 != Client.__client_qy && Client.__client_qf != 0 && !Client.__client_qq) {
-         IndexCache var1 = UserComparator3.indexCache6;
-         int var2 = Client.__client_qf;
-         class214.__hf_o = 1;
-         class214.__hf_u = var1;
-         class30.musicTrackArchiveId = var0;
+         class214.field1129 = 1;
+         class214.field1130 = null;
+      } else if (var0 != -1 && var0 != Client.field112 && Client.field128 != 0 && !Client.field107) {
+         Archive var1 = UserComparator3.archive6;
+         int var2 = Client.field128;
+         class214.field1129 = 1;
+         class214.field1130 = var1;
+         class30.musicTrackGroupId = var0;
          GrandExchangeOffer.musicTrackFileId = 0;
-         WorldMapLabel.__aj_e = var2;
+         WorldMapLabel.field1039 = var2;
          RectangleMode.musicTrackBoolean = false;
-         FaceNormal.__el_x = 2;
+         FaceNormal.field344 = 2;
       }
 
-      Client.__client_qy = var0;
+      Client.field112 = var0;
    }
 }
diff --git a/runescape-client/src/main/java/AbstractWorldMapIcon.java b/runescape-client/src/main/java/AbstractWorldMapIcon.java
index f98c6c3107..1c881a4b02 100644
--- a/runescape-client/src/main/java/AbstractWorldMapIcon.java
+++ b/runescape-client/src/main/java/AbstractWorldMapIcon.java
@@ -11,7 +11,7 @@ public abstract class AbstractWorldMapIcon {
    @ObfuscatedGetter(
       intValue = -1942470229
    )
-   static int __ak_qj;
+   static int field4;
    @ObfuscatedName("ka")
    @ObfuscatedGetter(
       intValue = -1734004743
@@ -23,28 +23,30 @@ public abstract class AbstractWorldMapIcon {
       signature = "Lhu;"
    )
    @Export("coord2")
-   public final TileLocation coord2;
+   public final Coord coord2;
    @ObfuscatedName("l")
    @ObfuscatedSignature(
       signature = "Lhu;"
    )
    @Export("coord1")
-   public final TileLocation coord1;
+   public final Coord coord1;
    @ObfuscatedName("e")
    @ObfuscatedGetter(
       intValue = -521086143
    )
-   int __e;
+   @Export("screenX")
+   int screenX;
    @ObfuscatedName("x")
    @ObfuscatedGetter(
       intValue = -1065362217
    )
-   int __x;
+   @Export("screenY")
+   int screenY;
 
    @ObfuscatedSignature(
       signature = "(Lhu;Lhu;)V"
    )
-   AbstractWorldMapIcon(TileLocation var1, TileLocation var2) {
+   AbstractWorldMapIcon(Coord var1, Coord var2) {
       this.coord1 = var1;
       this.coord2 = var2;
    }
@@ -54,36 +56,38 @@ public abstract class AbstractWorldMapIcon {
       signature = "(I)I",
       garbageValue = "1990181988"
    )
-   public abstract int __m_15();
+   @Export("getElement")
+   public abstract int getElement();
 
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "(I)Laj;",
       garbageValue = "1159446036"
    )
-   abstract WorldMapLabel __f_16();
+   @Export("getLabel")
+   abstract WorldMapLabel getLabel();
 
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "(B)I",
       garbageValue = "75"
    )
-   abstract int __q_17();
+   abstract int vmethod397();
 
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "(I)I",
       garbageValue = "-1558233611"
    )
-   abstract int __w_18();
+   abstract int vmethod398();
 
    @ObfuscatedName("y")
    @ObfuscatedSignature(
       signature = "(IIB)Z",
       garbageValue = "-63"
    )
-   boolean __y_66(int var1, int var2) {
-      return this.__b_68(var1, var2)?true:this.__c_69(var1, var2);
+   boolean method18(int var1, int var2) {
+      return this.method20(var1, var2) ? true : this.method21(var1, var2);
    }
 
    @ObfuscatedName("h")
@@ -91,8 +95,8 @@ public abstract class AbstractWorldMapIcon {
       signature = "(I)Z",
       garbageValue = "1150380891"
    )
-   boolean __h_67() {
-      return this.__m_15() >= 0;
+   boolean method19() {
+      return this.getElement() >= 0;
    }
 
    @ObfuscatedName("b")
@@ -100,44 +104,45 @@ public abstract class AbstractWorldMapIcon {
       signature = "(III)Z",
       garbageValue = "484201257"
    )
-   boolean __b_68(int var1, int var2) {
-      if(!this.__h_67()) {
+   boolean method20(int var1, int var2) {
+      if (!this.method19()) {
          return false;
       } else {
-         WorldMapElement var3 = ViewportMouse.getWorldMapElement(this.__m_15());
-         int var4 = this.__q_17();
-         int var5 = this.__w_18();
-         switch(var3.field3287.field3528) {
+         WorldMapElement var3 = ViewportMouse.getWorldMapElement(this.getElement());
+         int var4 = this.vmethod397();
+         int var5 = this.vmethod398();
+         switch(var3.horizontalAlignment.value) {
          case 0:
-            if(var1 < this.__e - var4 / 2 || var1 > var4 / 2 + this.__e) {
-               return false;
+            if (var1 >= this.screenX - var4 / 2 && var1 <= var4 / 2 + this.screenX) {
+               break;
             }
-            break;
+
+            return false;
          case 1:
-            if(var1 >= this.__e && var1 < var4 + this.__e) {
+            if (var1 >= this.screenX && var1 < var4 + this.screenX) {
                break;
             }
 
             return false;
          case 2:
-            if(var1 <= this.__e - var4 || var1 > this.__e) {
+            if (var1 <= this.screenX - var4 || var1 > this.screenX) {
                return false;
             }
          }
 
-         switch(var3.field3301.field3275) {
+         switch(var3.verticalAlignment.value) {
          case 0:
-            if(var2 <= this.__x - var5 || var2 > this.__x) {
+            if (var2 <= this.screenY - var5 || var2 > this.screenY) {
                return false;
             }
             break;
          case 1:
-            if(var2 < this.__x - var5 / 2 || var2 > var5 / 2 + this.__x) {
+            if (var2 < this.screenY - var5 / 2 || var2 > var5 / 2 + this.screenY) {
                return false;
             }
             break;
          case 2:
-            if(var2 < this.__x || var2 >= var5 + this.__x) {
+            if (var2 < this.screenY || var2 >= var5 + this.screenY) {
                return false;
             }
          }
@@ -151,9 +156,9 @@ public abstract class AbstractWorldMapIcon {
       signature = "(III)Z",
       garbageValue = "1201712205"
    )
-   boolean __c_69(int var1, int var2) {
-      WorldMapLabel var3 = this.__f_16();
-      return var3 == null?false:(var1 >= this.__e - var3.width / 2 && var1 <= var3.width / 2 + this.__e?var2 >= this.__x && var2 <= var3.height + this.__x:false);
+   boolean method21(int var1, int var2) {
+      WorldMapLabel var3 = this.getLabel();
+      return var3 == null ? false : (var1 >= this.screenX - var3.width / 2 && var1 <= var3.width / 2 + this.screenX ? var2 >= this.screenY && var2 <= var3.height + this.screenY : false);
    }
 
    @ObfuscatedName("es")
@@ -161,9 +166,9 @@ public abstract class AbstractWorldMapIcon {
       signature = "(Lit;Ljava/lang/String;I)V",
       garbageValue = "-1018878027"
    )
-   static void method625(IndexCache var0, String var1) {
-      IndexCacheLoader var2 = new IndexCacheLoader(var0, var1);
-      Client.indexCacheLoaders.add(var2);
-      Client.__client_sx += var2.__q;
+   static void method625(Archive var0, String var1) {
+      ArchiveLoader var2 = new ArchiveLoader(var0, var1);
+      Client.archiveLoaders.add(var2);
+      Client.field140 += var2.groupCount;
    }
 }
diff --git a/runescape-client/src/main/java/AccessFile.java b/runescape-client/src/main/java/AccessFile.java
index cf25c7a265..2c31c8b140 100644
--- a/runescape-client/src/main/java/AccessFile.java
+++ b/runescape-client/src/main/java/AccessFile.java
@@ -16,12 +16,12 @@ public final class AccessFile {
    @ObfuscatedGetter(
       intValue = -1762891465
    )
-   static int __dk_o;
+   static int field7;
    @ObfuscatedName("lm")
    @ObfuscatedSignature(
       signature = "Lho;"
    )
-   static Widget __dk_lm;
+   static Widget field8;
    @ObfuscatedName("m")
    @Export("file")
    RandomAccessFile file;
@@ -39,11 +39,11 @@ public final class AccessFile {
    long index;
 
    public AccessFile(File var1, String var2, long var3) throws IOException {
-      if(var3 == -1L) {
+      if (var3 == -1L) {
          var3 = Long.MAX_VALUE;
       }
 
-      if(var1.length() >= var3) {
+      if (var1.length() >= var3) {
          var1.delete();
       }
 
@@ -51,7 +51,7 @@ public final class AccessFile {
       this.capacity = var3;
       this.index = 0L;
       int var5 = this.file.read();
-      if(var5 != -1 && !var2.equals("r")) {
+      if (var5 != -1 && !var2.equals("r")) {
          this.file.seek(0L);
          this.file.write(var5);
       }
@@ -61,9 +61,9 @@ public final class AccessFile {
 
    @ObfuscatedName("m")
    @Export("seek")
-   final void seek(long var1) throws IOException {
-      this.file.seek(var1);
-      this.index = var1;
+   final void seek(long index) throws IOException {
+      this.file.seek(index);
+      this.index = index;
    }
 
    @ObfuscatedName("f")
@@ -72,14 +72,14 @@ public final class AccessFile {
       garbageValue = "-86"
    )
    @Export("write")
-   public final void write(byte[] var1, int var2, int var3) throws IOException {
-      if((long)var3 + this.index > this.capacity) {
+   public final void write(byte[] src, int srcIndex, int length) throws IOException {
+      if ((long)length + this.index > this.capacity) {
          this.file.seek(this.capacity + 1L);
          this.file.write(1);
          throw new EOFException();
       } else {
-         this.file.write(var1, var2, var3);
-         this.index += (long)var3;
+         this.file.write(src, srcIndex, length);
+         this.index += (long)length;
       }
    }
 
@@ -99,13 +99,12 @@ public final class AccessFile {
       garbageValue = "166642884"
    )
    @Export("closeSync")
-   public final void closeSync(boolean var1) throws IOException {
-      if(this.file != null) {
-         if(var1) {
+   public final void closeSync(boolean sync) throws IOException {
+      if (this.file != null) {
+         if (sync) {
             try {
                this.file.getFD().sync();
             } catch (SyncFailedException var3) {
-               ;
             }
          }
 
@@ -131,9 +130,9 @@ public final class AccessFile {
       garbageValue = "971670468"
    )
    @Export("read")
-   public final int read(byte[] var1, int var2, int var3) throws IOException {
-      int var4 = this.file.read(var1, var2, var3);
-      if(var4 > 0) {
+   public final int read(byte[] dst, int dstIndex, int length) throws IOException {
+      int var4 = this.file.read(dst, dstIndex, length);
+      if (var4 > 0) {
          this.index += (long)var4;
       }
 
@@ -141,8 +140,8 @@ public final class AccessFile {
    }
 
    @ObfuscatedName("finalize")
-   protected void __finalize_211() throws Throwable {
-      if(this.file != null) {
+   protected void method22() throws Throwable {
+      if (this.file != null) {
          System.out.println("");
          this.close();
       }
@@ -155,31 +154,31 @@ public final class AccessFile {
       garbageValue = "-728558316"
    )
    @Export("addWidgetItemMenuItem")
-   static final void addWidgetItemMenuItem(Widget widget, ItemDefinition definition, int var2, int actionIndex, boolean shiftClick) {
-      String[] var5 = definition.inventoryActions;
-      byte opcode = -1;
-      String action = null;
-      if(var5 != null && var5[actionIndex] != null) {
-         if(actionIndex == 0) {
-            opcode = 33;
-         } else if(actionIndex == 1) {
-            opcode = 34;
-         } else if(actionIndex == 2) {
-            opcode = 35;
-         } else if(actionIndex == 3) {
-            opcode = 36;
+   static final void addWidgetItemMenuItem(Widget var0, ItemDefinition var1, int var2, int var3, boolean var4) {
+      String[] var5 = var1.inventoryActions;
+      byte var6 = -1;
+      String var7 = null;
+      if (var5 != null && var5[var3] != null) {
+         if (var3 == 0) {
+            var6 = 33;
+         } else if (var3 == 1) {
+            var6 = 34;
+         } else if (var3 == 2) {
+            var6 = 35;
+         } else if (var3 == 3) {
+            var6 = 36;
          } else {
-            opcode = 37;
+            var6 = 37;
          }
 
-         action = var5[actionIndex];
-      } else if(actionIndex == 4) {
-         opcode = 37;
-         action = "Drop";
+         var7 = var5[var3];
+      } else if (var3 == 4) {
+         var6 = 37;
+         var7 = "Drop";
       }
 
-      if(opcode != -1 && action != null) {
-         class16.insertMenuItem(action, BufferedFile.colorStartTag(0xff9040) + definition.name, opcode, definition.id, var2, widget.id, shiftClick);
+      if (var6 != -1 && var7 != null) {
+         class16.insertMenuItem(var7, BufferedFile.colorStartTag(16748608) + var1.name, var6, var1.id, var2, var0.id, var4);
       }
 
    }
diff --git a/runescape-client/src/main/java/Actor.java b/runescape-client/src/main/java/Actor.java
index ecd96ba288..5c22e661a8 100644
--- a/runescape-client/src/main/java/Actor.java
+++ b/runescape-client/src/main/java/Actor.java
@@ -23,9 +23,9 @@ public abstract class Actor extends Entity {
    @ObfuscatedGetter(
       intValue = 1439711403
    )
-   int __ac;
+   int field9;
    @ObfuscatedName("ay")
-   boolean __ay;
+   boolean field10;
    @ObfuscatedName("ah")
    @ObfuscatedGetter(
       intValue = -1357622739
@@ -42,8 +42,8 @@ public abstract class Actor extends Entity {
    @ObfuscatedGetter(
       intValue = -299122235
    )
-   @Export("idleSequence")
-   int idleSequence;
+   @Export("readySequence")
+   int readySequence;
    @ObfuscatedName("al")
    @ObfuscatedGetter(
       intValue = -831787909
@@ -66,20 +66,20 @@ public abstract class Actor extends Entity {
    @ObfuscatedGetter(
       intValue = -1598871111
    )
-   @Export("walkTurnSequence")
-   int walkTurnSequence;
+   @Export("walkBackSequence")
+   int walkBackSequence;
    @ObfuscatedName("ad")
    @ObfuscatedGetter(
       intValue = -568830521
    )
-   @Export("walkTurnLeftSequence")
-   int walkTurnLeftSequence;
+   @Export("walkLeftSequence")
+   int walkLeftSequence;
    @ObfuscatedName("ap")
    @ObfuscatedGetter(
       intValue = -257240117
    )
-   @Export("walkTurnRightSequence")
-   int walkTurnRightSequence;
+   @Export("walkRightSequence")
+   int walkRightSequence;
    @ObfuscatedName("as")
    @ObfuscatedGetter(
       intValue = 1708570917
@@ -93,7 +93,7 @@ public abstract class Actor extends Entity {
    @Export("isAutoChatting")
    boolean isAutoChatting;
    @ObfuscatedName("az")
-   boolean __az;
+   boolean field11;
    @ObfuscatedName("au")
    @ObfuscatedGetter(
       intValue = 137508815
@@ -149,7 +149,7 @@ public abstract class Actor extends Entity {
    @ObfuscatedGetter(
       intValue = 139384875
    )
-   int __bc;
+   int field12;
    @ObfuscatedName("bo")
    @ObfuscatedGetter(
       intValue = 1614854211
@@ -196,7 +196,7 @@ public abstract class Actor extends Entity {
    @ObfuscatedGetter(
       intValue = -1523249259
    )
-   int __bj;
+   int field13;
    @ObfuscatedName("bi")
    @ObfuscatedGetter(
       intValue = -220610999
@@ -219,7 +219,7 @@ public abstract class Actor extends Entity {
    @ObfuscatedGetter(
       intValue = 886371765
    )
-   int __bt;
+   int field14;
    @ObfuscatedName("bp")
    @ObfuscatedGetter(
       intValue = -779457309
@@ -230,37 +230,37 @@ public abstract class Actor extends Entity {
    @ObfuscatedGetter(
       intValue = 2121599561
    )
-   int __bf;
+   int field15;
    @ObfuscatedName("bh")
    @ObfuscatedGetter(
       intValue = 280591281
    )
-   int __bh;
+   int field16;
    @ObfuscatedName("be")
    @ObfuscatedGetter(
       intValue = 837989037
    )
-   int __be;
+   int field17;
    @ObfuscatedName("bv")
    @ObfuscatedGetter(
       intValue = -1857513783
    )
-   int __bv;
+   int field18;
    @ObfuscatedName("bw")
    @ObfuscatedGetter(
       intValue = -1630403001
    )
-   int __bw;
+   int field19;
    @ObfuscatedName("cr")
    @ObfuscatedGetter(
       intValue = 1367256299
    )
-   int __cr;
+   int field20;
    @ObfuscatedName("cv")
    @ObfuscatedGetter(
       intValue = -1723834619
    )
-   int __cv;
+   int field21;
    @ObfuscatedName("ce")
    @ObfuscatedGetter(
       intValue = 2051334073
@@ -283,12 +283,12 @@ public abstract class Actor extends Entity {
    @ObfuscatedGetter(
       intValue = 1252341007
    )
-   int __cm;
+   int field22;
    @ObfuscatedName("cj")
    @ObfuscatedGetter(
       intValue = -336931157
    )
-   int __cj;
+   int field23;
    @ObfuscatedName("cu")
    @ObfuscatedGetter(
       intValue = -2033082375
@@ -308,26 +308,26 @@ public abstract class Actor extends Entity {
    @ObfuscatedGetter(
       intValue = -1583514013
    )
-   int __cq;
+   int field24;
    @ObfuscatedName("ch")
    @ObfuscatedGetter(
       intValue = 1584102533
    )
-   int __ch;
+   int field25;
 
    Actor() {
-      this.__ay = false;
+      this.field10 = false;
       this.size = 1;
-      this.idleSequence = -1;
+      this.readySequence = -1;
       this.turnLeftSequence = -1;
       this.turnRightSequence = -1;
       this.walkSequence = -1;
-      this.walkTurnSequence = -1;
-      this.walkTurnLeftSequence = -1;
-      this.walkTurnRightSequence = -1;
+      this.walkBackSequence = -1;
+      this.walkLeftSequence = -1;
+      this.walkRightSequence = -1;
       this.runSequence = -1;
       this.overheadText = null;
-      this.__az = false;
+      this.field11 = false;
       this.overheadTextCyclesRemaining = 100;
       this.overheadTextColor = 0;
       this.overheadTextEffect = 0;
@@ -340,7 +340,7 @@ public abstract class Actor extends Entity {
       this.healthBars = new IterableNodeDeque();
       this.targetIndex = -1;
       this.false0 = false;
-      this.__bc = -1;
+      this.field12 = -1;
       this.movementSequence = -1;
       this.movementFrame = 0;
       this.movementFrameCycle = 0;
@@ -348,20 +348,20 @@ public abstract class Actor extends Entity {
       this.sequenceFrame = 0;
       this.sequenceFrameCycle = 0;
       this.sequenceDelay = 0;
-      this.__bj = 0;
+      this.field13 = 0;
       this.spotAnimation = -1;
       this.spotAnimationFrame = 0;
       this.spotAnimationFrameCycle = 0;
       this.npcCycle = 0;
       this.defaultHeight = 200;
-      this.__cm = 0;
-      this.__cj = 32;
+      this.field22 = 0;
+      this.field23 = 32;
       this.pathLength = 0;
       this.pathX = new int[10];
       this.pathY = new int[10];
       this.pathTraversed = new byte[10];
-      this.__cq = 0;
-      this.__ch = 0;
+      this.field24 = 0;
+      this.field25 = 0;
    }
 
    @ObfuscatedName("z")
@@ -379,9 +379,9 @@ public abstract class Actor extends Entity {
       signature = "(I)V",
       garbageValue = "1415393262"
    )
-   final void __bb_143() {
+   final void method23() {
       this.pathLength = 0;
-      this.__ch = 0;
+      this.field25 = 0;
    }
 
    @ObfuscatedName("bs")
@@ -390,13 +390,13 @@ public abstract class Actor extends Entity {
       garbageValue = "-1925126781"
    )
    @Export("addHitSplat")
-   final void addHitSplat(int var1, int var2, int var3, int var4, int var5, int var6) {
+   final void addHitSplat(int type, int value, int type2, int value2, int cycle, int cycle2) {
       boolean var7 = true;
       boolean var8 = true;
 
       int var9;
-      for(var9 = 0; var9 < 4; ++var9) {
-         if(this.hitSplatCycles[var9] > var5) {
+      for (var9 = 0; var9 < 4; ++var9) {
+         if (this.hitSplatCycles[var9] > cycle) {
             var7 = false;
          } else {
             var8 = false;
@@ -406,63 +406,64 @@ public abstract class Actor extends Entity {
       var9 = -1;
       int var10 = -1;
       int var11 = 0;
-      if(var1 >= 0) {
-         HitSplatDefinition var12 = LoginScreenAnimation.getHitSplatDefinition(var1);
-         var10 = var12.__c;
-         var11 = var12.__i;
+      if (type >= 0) {
+         HitSplatDefinition var12 = LoginScreenAnimation.getHitSplatDefinition(type);
+         var10 = var12.field396;
+         var11 = var12.field387;
       }
 
       int var14;
-      if(var8) {
-         if(var10 == -1) {
+      if (var8) {
+         if (var10 == -1) {
             return;
          }
 
          var9 = 0;
          var14 = 0;
-         if(var10 == 0) {
+         if (var10 == 0) {
             var14 = this.hitSplatCycles[0];
-         } else if(var10 == 1) {
+         } else if (var10 == 1) {
             var14 = this.hitSplatValues[0];
          }
 
-         for(int var13 = 1; var13 < 4; ++var13) {
-            if(var10 == 0) {
-               if(this.hitSplatCycles[var13] < var14) {
+         for (int var13 = 1; var13 < 4; ++var13) {
+            if (var10 == 0) {
+               if (this.hitSplatCycles[var13] < var14) {
                   var9 = var13;
                   var14 = this.hitSplatCycles[var13];
                }
-            } else if(var10 == 1 && this.hitSplatValues[var13] < var14) {
+            } else if (var10 == 1 && this.hitSplatValues[var13] < var14) {
                var9 = var13;
                var14 = this.hitSplatValues[var13];
             }
          }
 
-         if(var10 == 1 && var14 >= var2) {
+         if (var10 == 1 && var14 >= value) {
             return;
          }
       } else {
-         if(var7) {
+         if (var7) {
             this.hitSplatCount = 0;
          }
 
-         for(var14 = 0; var14 < 4; ++var14) {
+         for (var14 = 0; var14 < 4; ++var14) {
             byte var15 = this.hitSplatCount;
             this.hitSplatCount = (byte)((this.hitSplatCount + 1) % 4);
-            if(this.hitSplatCycles[var15] <= var5) {
+            if (this.hitSplatCycles[var15] <= cycle) {
                var9 = var15;
                break;
             }
          }
       }
 
-      if(var9 >= 0) {
-         this.hitSplatTypes[var9] = var1;
-         this.hitSplatValues[var9] = var2;
-         this.hitSplatTypes2[var9] = var3;
-         this.hitSplatValues2[var9] = var4;
-         this.hitSplatCycles[var9] = var5 + var11 + var6;
+      if (var9 >= 0) {
+         this.hitSplatTypes[var9] = type;
+         this.hitSplatValues[var9] = value;
+         this.hitSplatTypes2[var9] = type2;
+         this.hitSplatValues2[var9] = value2;
+         this.hitSplatCycles[var9] = cycle + var11 + cycle2;
       }
+
    }
 
    @ObfuscatedName("bq")
@@ -471,60 +472,60 @@ public abstract class Actor extends Entity {
       garbageValue = "27"
    )
    @Export("addHealthBar")
-   final void addHealthBar(int var1, int var2, int var3, int var4, int var5, int var6) {
-      HealthBarDefinition var8 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1);
-      HealthBarDefinition var7;
-      if(var8 != null) {
-         var7 = var8;
+   final void addHealthBar(int healthBarDefinition, int cycle, int var3, int var4, int var5, int var6) {
+      HealthBarDefinition var7 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)healthBarDefinition);
+      HealthBarDefinition var8;
+      if (var7 != null) {
+         var8 = var7;
       } else {
-         byte[] var9 = HealthBarDefinition.__ii_m.takeRecord(33, var1);
-         var8 = new HealthBarDefinition();
-         if(var9 != null) {
-            var8.read(new Buffer(var9));
+         byte[] var9 = HealthBarDefinition.field379.takeFile(33, healthBarDefinition);
+         var7 = new HealthBarDefinition();
+         if (var9 != null) {
+            var7.decode(new Buffer(var9));
          }
 
-         HealthBarDefinition.HealthBarDefinition_cached.put(var8, (long)var1);
-         var7 = var8;
+         HealthBarDefinition.HealthBarDefinition_cached.put(var7, (long)healthBarDefinition);
+         var8 = var7;
       }
 
-      var8 = var7;
+      var7 = var8;
       HealthBar var14 = null;
       HealthBar var10 = null;
-      int var11 = var7.int2;
+      int var11 = var8.int2;
       int var12 = 0;
 
       HealthBar var13;
-      for(var13 = (HealthBar)this.healthBars.last(); var13 != null; var13 = (HealthBar)this.healthBars.previous()) {
+      for (var13 = (HealthBar)this.healthBars.last(); var13 != null; var13 = (HealthBar)this.healthBars.previous()) {
          ++var12;
-         if(var13.definition.__o == var8.__o) {
-            var13.put(var2 + var4, var5, var6, var3);
+         if (var13.definition.field381 == var7.field381) {
+            var13.put(cycle + var4, var5, var6, var3);
             return;
          }
 
-         if(var13.definition.int1 <= var8.int1) {
+         if (var13.definition.int1 <= var7.int1) {
             var14 = var13;
          }
 
-         if(var13.definition.int2 > var11) {
+         if (var13.definition.int2 > var11) {
             var10 = var13;
             var11 = var13.definition.int2;
          }
       }
 
-      if(var10 != null || var12 < 4) {
-         var13 = new HealthBar(var8);
-         if(var14 == null) {
+      if (var10 != null || var12 < 4) {
+         var13 = new HealthBar(var7);
+         if (var14 == null) {
             this.healthBars.addLast(var13);
          } else {
             IterableNodeDeque.IterableNodeDeque_addBefore(var13, var14);
          }
 
-         var13.put(var2 + var4, var5, var6, var3);
-         if(var12 >= 4) {
+         var13.put(cycle + var4, var5, var6, var3);
+         if (var12 >= 4) {
             var10.remove();
          }
-
       }
+
    }
 
    @ObfuscatedName("bn")
@@ -533,26 +534,26 @@ public abstract class Actor extends Entity {
       garbageValue = "-31198"
    )
    @Export("removeHealthBar")
-   final void removeHealthBar(int var1) {
-      HealthBarDefinition var3 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var1);
-      HealthBarDefinition var2;
-      if(var3 != null) {
-         var2 = var3;
+   final void removeHealthBar(int healthBarDefinition) {
+      HealthBarDefinition var2 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)healthBarDefinition);
+      HealthBarDefinition var3;
+      if (var2 != null) {
+         var3 = var2;
       } else {
-         byte[] var4 = HealthBarDefinition.__ii_m.takeRecord(33, var1);
-         var3 = new HealthBarDefinition();
-         if(var4 != null) {
-            var3.read(new Buffer(var4));
+         byte[] var4 = HealthBarDefinition.field379.takeFile(33, healthBarDefinition);
+         var2 = new HealthBarDefinition();
+         if (var4 != null) {
+            var2.decode(new Buffer(var4));
          }
 
-         HealthBarDefinition.HealthBarDefinition_cached.put(var3, (long)var1);
-         var2 = var3;
+         HealthBarDefinition.HealthBarDefinition_cached.put(var2, (long)healthBarDefinition);
+         var3 = var2;
       }
 
-      var3 = var2;
+      var2 = var3;
 
-      for(HealthBar var5 = (HealthBar)this.healthBars.last(); var5 != null; var5 = (HealthBar)this.healthBars.previous()) {
-         if(var3 == var5.definition) {
+      for (HealthBar var5 = (HealthBar)this.healthBars.last(); var5 != null; var5 = (HealthBar)this.healthBars.previous()) {
+         if (var2 == var5.definition) {
             var5.remove();
             return;
          }
@@ -566,754 +567,754 @@ public abstract class Actor extends Entity {
       garbageValue = "493234011"
    )
    @Export("menuAction")
-   static final void menuAction(int arg1, int arg2, int opcode, int arg0, String action, String target, int mouseX, int mouseY) {
-      if(opcode >= 2000) {
+   static final void menuAction(int argument1, int argument2, int opcode, int argument0, String action, String targetName, int mouseX, int mouseY) {
+      if (opcode >= 2000) {
          opcode -= 2000;
       }
 
       PacketBufferNode var8;
-      if(opcode == 1) {
+      if (opcode == 1) {
          Client.mouseCrossX = mouseX;
          Client.mouseCrossY = mouseY;
          Client.mouseCrossColor = 2;
          Client.mouseCrossState = 0;
-         Client.destinationX = arg1;
-         Client.destinationY = arg2;
-         var8 = Interpreter.method1915(ClientPacket.__gs_an, Client.packetWriter.isaacCipher);
-         var8.packetBuffer.__bx_323(GraphicsObject.baseY + arg2);
+         Client.destinationX = argument1;
+         Client.destinationY = argument2;
+         var8 = Interpreter.method1915(ClientPacket.field266, Client.packetWriter.isaacCipher);
+         var8.packetBuffer.method64(GraphicsObject.baseY + argument2);
          var8.packetBuffer.writeShortLE(HealthBarDefinition.selectedItemSlot);
-         var8.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
+         var8.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
          var8.packetBuffer.writeIntLE(ServerPacket.selectedItemWidget);
-         var8.packetBuffer.__bx_323(arg1 + class50.baseX);
-         var8.packetBuffer.writeShort(arg0);
+         var8.packetBuffer.method64(argument1 + class50.baseX);
+         var8.packetBuffer.writeShort(argument0);
          var8.packetBuffer.writeShortLE(MenuAction.selectedItemId);
-         Client.packetWriter.__q_167(var8);
-      } else if(opcode == 2) {
+         Client.packetWriter.method241(var8);
+      } else if (opcode == 2) {
          Client.mouseCrossX = mouseX;
          Client.mouseCrossY = mouseY;
          Client.mouseCrossColor = 2;
          Client.mouseCrossState = 0;
-         Client.destinationX = arg1;
-         Client.destinationY = arg2;
-         var8 = Interpreter.method1915(ClientPacket.__gs_cg, Client.packetWriter.isaacCipher);
-         var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-         var8.packetBuffer.writeShort(arg1 + class50.baseX);
-         var8.packetBuffer.__bo_322(arg0);
-         var8.packetBuffer.writeIntLE16(ServerBuild.__iy_lo);
-         var8.packetBuffer.writeShort(Client.__client_lc);
-         var8.packetBuffer.writeShortLE(GraphicsObject.baseY + arg2);
-         Client.packetWriter.__q_167(var8);
-      } else if(opcode == 3) {
+         Client.destinationX = argument1;
+         Client.destinationY = argument2;
+         var8 = Interpreter.method1915(ClientPacket.field314, Client.packetWriter.isaacCipher);
+         var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+         var8.packetBuffer.writeShort(argument1 + class50.baseX);
+         var8.packetBuffer.method63(argument0);
+         var8.packetBuffer.writeIntLE16(ServerBuild.field788);
+         var8.packetBuffer.writeShort(Client.field220);
+         var8.packetBuffer.writeShortLE(GraphicsObject.baseY + argument2);
+         Client.packetWriter.method241(var8);
+      } else if (opcode == 3) {
          Client.mouseCrossX = mouseX;
          Client.mouseCrossY = mouseY;
          Client.mouseCrossColor = 2;
          Client.mouseCrossState = 0;
-         Client.destinationX = arg1;
-         Client.destinationY = arg2;
-         var8 = Interpreter.method1915(ClientPacket.__gs_d, Client.packetWriter.isaacCipher);
-         var8.packetBuffer.writeShort(GraphicsObject.baseY + arg2);
-         var8.packetBuffer.__ba_316(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-         var8.packetBuffer.__bo_322(arg0);
-         var8.packetBuffer.__bx_323(arg1 + class50.baseX);
-         Client.packetWriter.__q_167(var8);
-      } else if(opcode == 4) {
+         Client.destinationX = argument1;
+         Client.destinationY = argument2;
+         var8 = Interpreter.method1915(ClientPacket.field232, Client.packetWriter.isaacCipher);
+         var8.packetBuffer.writeShort(GraphicsObject.baseY + argument2);
+         var8.packetBuffer.method57(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+         var8.packetBuffer.method63(argument0);
+         var8.packetBuffer.method64(argument1 + class50.baseX);
+         Client.packetWriter.method241(var8);
+      } else if (opcode == 4) {
          Client.mouseCrossX = mouseX;
          Client.mouseCrossY = mouseY;
          Client.mouseCrossColor = 2;
          Client.mouseCrossState = 0;
-         Client.destinationX = arg1;
-         Client.destinationY = arg2;
-         var8 = Interpreter.method1915(ClientPacket.__gs_cv, Client.packetWriter.isaacCipher);
-         var8.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-         var8.packetBuffer.writeShort(arg0);
-         var8.packetBuffer.writeShort(GraphicsObject.baseY + arg2);
-         var8.packetBuffer.writeShort(arg1 + class50.baseX);
-         Client.packetWriter.__q_167(var8);
-      } else if(opcode == 5) {
+         Client.destinationX = argument1;
+         Client.destinationY = argument2;
+         var8 = Interpreter.method1915(ClientPacket.field301, Client.packetWriter.isaacCipher);
+         var8.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+         var8.packetBuffer.writeShort(argument0);
+         var8.packetBuffer.writeShort(GraphicsObject.baseY + argument2);
+         var8.packetBuffer.writeShort(argument1 + class50.baseX);
+         Client.packetWriter.method241(var8);
+      } else if (opcode == 5) {
          Client.mouseCrossX = mouseX;
          Client.mouseCrossY = mouseY;
          Client.mouseCrossColor = 2;
          Client.mouseCrossState = 0;
-         Client.destinationX = arg1;
-         Client.destinationY = arg2;
-         var8 = Interpreter.method1915(ClientPacket.__gs_cq, Client.packetWriter.isaacCipher);
-         var8.packetBuffer.__bx_323(arg1 + class50.baseX);
-         var8.packetBuffer.__bo_322(arg0);
-         var8.packetBuffer.__bx_323(GraphicsObject.baseY + arg2);
-         var8.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-         Client.packetWriter.__q_167(var8);
-      } else if(opcode == 6) {
+         Client.destinationX = argument1;
+         Client.destinationY = argument2;
+         var8 = Interpreter.method1915(ClientPacket.field311, Client.packetWriter.isaacCipher);
+         var8.packetBuffer.method64(argument1 + class50.baseX);
+         var8.packetBuffer.method63(argument0);
+         var8.packetBuffer.method64(GraphicsObject.baseY + argument2);
+         var8.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+         Client.packetWriter.method241(var8);
+      } else if (opcode == 6) {
          Client.mouseCrossX = mouseX;
          Client.mouseCrossY = mouseY;
          Client.mouseCrossColor = 2;
          Client.mouseCrossState = 0;
-         Client.destinationX = arg1;
-         Client.destinationY = arg2;
-         var8 = Interpreter.method1915(ClientPacket.__gs_w, Client.packetWriter.isaacCipher);
-         var8.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-         var8.packetBuffer.__bo_322(GraphicsObject.baseY + arg2);
-         var8.packetBuffer.__bo_322(arg1 + class50.baseX);
-         var8.packetBuffer.writeShortLE(arg0);
-         Client.packetWriter.__q_167(var8);
+         Client.destinationX = argument1;
+         Client.destinationY = argument2;
+         var8 = Interpreter.method1915(ClientPacket.field225, Client.packetWriter.isaacCipher);
+         var8.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+         var8.packetBuffer.method63(GraphicsObject.baseY + argument2);
+         var8.packetBuffer.method63(argument1 + class50.baseX);
+         var8.packetBuffer.writeShortLE(argument0);
+         Client.packetWriter.method241(var8);
       } else {
          PacketBufferNode var9;
-         Npc var13;
-         if(opcode == 7) {
-            var13 = Client.npcs[arg0];
-            if(var13 != null) {
+         NPC var10;
+         if (opcode == 7) {
+            var10 = Client.npcs[argument0];
+            if (var10 != null) {
                Client.mouseCrossX = mouseX;
                Client.mouseCrossY = mouseY;
                Client.mouseCrossColor = 2;
                Client.mouseCrossState = 0;
-               Client.destinationX = arg1;
-               Client.destinationY = arg2;
-               var9 = Interpreter.method1915(ClientPacket.__gs_r, Client.packetWriter.isaacCipher);
-               var9.packetBuffer.__bx_323(MenuAction.selectedItemId);
+               Client.destinationX = argument1;
+               Client.destinationY = argument2;
+               var9 = Interpreter.method1915(ClientPacket.field245, Client.packetWriter.isaacCipher);
+               var9.packetBuffer.method64(MenuAction.selectedItemId);
                var9.packetBuffer.writeShort(HealthBarDefinition.selectedItemSlot);
-               var9.packetBuffer.__bx_323(arg0);
-               var9.packetBuffer.__ai_315(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
+               var9.packetBuffer.method64(argument0);
+               var9.packetBuffer.method56(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
                var9.packetBuffer.writeInt(ServerPacket.selectedItemWidget);
-               Client.packetWriter.__q_167(var9);
+               Client.packetWriter.method241(var9);
             }
-         } else if(opcode == 8) {
-            var13 = Client.npcs[arg0];
-            if(var13 != null) {
+         } else if (opcode == 8) {
+            var10 = Client.npcs[argument0];
+            if (var10 != null) {
                Client.mouseCrossX = mouseX;
                Client.mouseCrossY = mouseY;
                Client.mouseCrossColor = 2;
                Client.mouseCrossState = 0;
-               Client.destinationX = arg1;
-               Client.destinationY = arg2;
-               var9 = Interpreter.method1915(ClientPacket.__gs_cb, Client.packetWriter.isaacCipher);
-               var9.packetBuffer.__bx_323(arg0);
-               var9.packetBuffer.__ai_315(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-               var9.packetBuffer.writeIntLE(ServerBuild.__iy_lo);
-               var9.packetBuffer.__bo_322(Client.__client_lc);
-               Client.packetWriter.__q_167(var9);
+               Client.destinationX = argument1;
+               Client.destinationY = argument2;
+               var9 = Interpreter.method1915(ClientPacket.field308, Client.packetWriter.isaacCipher);
+               var9.packetBuffer.method64(argument0);
+               var9.packetBuffer.method56(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+               var9.packetBuffer.writeIntLE(ServerBuild.field788);
+               var9.packetBuffer.method63(Client.field220);
+               Client.packetWriter.method241(var9);
             }
-         } else if(opcode == 9) {
-            var13 = Client.npcs[arg0];
-            if(var13 != null) {
+         } else if (opcode == 9) {
+            var10 = Client.npcs[argument0];
+            if (var10 != null) {
                Client.mouseCrossX = mouseX;
                Client.mouseCrossY = mouseY;
                Client.mouseCrossColor = 2;
                Client.mouseCrossState = 0;
-               Client.destinationX = arg1;
-               Client.destinationY = arg2;
-               var9 = Interpreter.method1915(ClientPacket.__gs_bt, Client.packetWriter.isaacCipher);
-               var9.packetBuffer.__ai_315(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-               var9.packetBuffer.writeShortLE(arg0);
-               Client.packetWriter.__q_167(var9);
+               Client.destinationX = argument1;
+               Client.destinationY = argument2;
+               var9 = Interpreter.method1915(ClientPacket.field293, Client.packetWriter.isaacCipher);
+               var9.packetBuffer.method56(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+               var9.packetBuffer.writeShortLE(argument0);
+               Client.packetWriter.method241(var9);
             }
-         } else if(opcode == 10) {
-            var13 = Client.npcs[arg0];
-            if(var13 != null) {
+         } else if (opcode == 10) {
+            var10 = Client.npcs[argument0];
+            if (var10 != null) {
                Client.mouseCrossX = mouseX;
                Client.mouseCrossY = mouseY;
                Client.mouseCrossColor = 2;
                Client.mouseCrossState = 0;
-               Client.destinationX = arg1;
-               Client.destinationY = arg2;
-               var9 = Interpreter.method1915(ClientPacket.__gs_f, Client.packetWriter.isaacCipher);
-               var9.packetBuffer.__bo_322(arg0);
-               var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-               Client.packetWriter.__q_167(var9);
+               Client.destinationX = argument1;
+               Client.destinationY = argument2;
+               var9 = Interpreter.method1915(ClientPacket.field223, Client.packetWriter.isaacCipher);
+               var9.packetBuffer.method63(argument0);
+               var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+               Client.packetWriter.method241(var9);
             }
-         } else if(opcode == 11) {
-            var13 = Client.npcs[arg0];
-            if(var13 != null) {
+         } else if (opcode == 11) {
+            var10 = Client.npcs[argument0];
+            if (var10 != null) {
                Client.mouseCrossX = mouseX;
                Client.mouseCrossY = mouseY;
                Client.mouseCrossColor = 2;
                Client.mouseCrossState = 0;
-               Client.destinationX = arg1;
-               Client.destinationY = arg2;
-               var9 = Interpreter.method1915(ClientPacket.__gs_ah, Client.packetWriter.isaacCipher);
-               var9.packetBuffer.__bx_323(arg0);
-               var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-               Client.packetWriter.__q_167(var9);
+               Client.destinationX = argument1;
+               Client.destinationY = argument2;
+               var9 = Interpreter.method1915(ClientPacket.field255, Client.packetWriter.isaacCipher);
+               var9.packetBuffer.method64(argument0);
+               var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+               Client.packetWriter.method241(var9);
             }
-         } else if(opcode == 12) {
-            var13 = Client.npcs[arg0];
-            if(var13 != null) {
+         } else if (opcode == 12) {
+            var10 = Client.npcs[argument0];
+            if (var10 != null) {
                Client.mouseCrossX = mouseX;
                Client.mouseCrossY = mouseY;
                Client.mouseCrossColor = 2;
                Client.mouseCrossState = 0;
-               Client.destinationX = arg1;
-               Client.destinationY = arg2;
-               var9 = Interpreter.method1915(ClientPacket.__gs_bc, Client.packetWriter.isaacCipher);
-               var9.packetBuffer.writeShort(arg0);
-               var9.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-               Client.packetWriter.__q_167(var9);
+               Client.destinationX = argument1;
+               Client.destinationY = argument2;
+               var9 = Interpreter.method1915(ClientPacket.field281, Client.packetWriter.isaacCipher);
+               var9.packetBuffer.writeShort(argument0);
+               var9.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+               Client.packetWriter.method241(var9);
             }
-         } else if(opcode == 13) {
-            var13 = Client.npcs[arg0];
-            if(var13 != null) {
+         } else if (opcode == 13) {
+            var10 = Client.npcs[argument0];
+            if (var10 != null) {
                Client.mouseCrossX = mouseX;
                Client.mouseCrossY = mouseY;
                Client.mouseCrossColor = 2;
                Client.mouseCrossState = 0;
-               Client.destinationX = arg1;
-               Client.destinationY = arg2;
-               var9 = Interpreter.method1915(ClientPacket.__gs_ac, Client.packetWriter.isaacCipher);
-               var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-               var9.packetBuffer.__bo_322(arg0);
-               Client.packetWriter.__q_167(var9);
+               Client.destinationX = argument1;
+               Client.destinationY = argument2;
+               var9 = Interpreter.method1915(ClientPacket.field253, Client.packetWriter.isaacCipher);
+               var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+               var9.packetBuffer.method63(argument0);
+               Client.packetWriter.method241(var9);
             }
          } else {
-            Player var15;
-            if(opcode == 14) {
-               var15 = Client.players[arg0];
-               if(var15 != null) {
+            Player var11;
+            if (opcode == 14) {
+               var11 = Client.players[argument0];
+               if (var11 != null) {
                   Client.mouseCrossX = mouseX;
                   Client.mouseCrossY = mouseY;
                   Client.mouseCrossColor = 2;
                   Client.mouseCrossState = 0;
-                  Client.destinationX = arg1;
-                  Client.destinationY = arg2;
-                  var9 = Interpreter.method1915(ClientPacket.__gs_cy, Client.packetWriter.isaacCipher);
-                  var9.packetBuffer.__bx_323(HealthBarDefinition.selectedItemSlot);
-                  var9.packetBuffer.__ba_316(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
+                  Client.destinationX = argument1;
+                  Client.destinationY = argument2;
+                  var9 = Interpreter.method1915(ClientPacket.field303, Client.packetWriter.isaacCipher);
+                  var9.packetBuffer.method64(HealthBarDefinition.selectedItemSlot);
+                  var9.packetBuffer.method57(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
                   var9.packetBuffer.writeIntME(ServerPacket.selectedItemWidget);
-                  var9.packetBuffer.writeShort(arg0);
+                  var9.packetBuffer.writeShort(argument0);
                   var9.packetBuffer.writeShort(MenuAction.selectedItemId);
-                  Client.packetWriter.__q_167(var9);
+                  Client.packetWriter.method241(var9);
                }
-            } else if(opcode == 15) {
-               var15 = Client.players[arg0];
-               if(var15 != null) {
+            } else if (opcode == 15) {
+               var11 = Client.players[argument0];
+               if (var11 != null) {
                   Client.mouseCrossX = mouseX;
                   Client.mouseCrossY = mouseY;
                   Client.mouseCrossColor = 2;
                   Client.mouseCrossState = 0;
-                  Client.destinationX = arg1;
-                  Client.destinationY = arg2;
-                  var9 = Interpreter.method1915(ClientPacket.__gs_bq, Client.packetWriter.isaacCipher);
-                  var9.packetBuffer.writeIntLE16(ServerBuild.__iy_lo);
-                  var9.packetBuffer.__ba_316(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-                  var9.packetBuffer.__bo_322(Client.__client_lc);
-                  var9.packetBuffer.writeShort(arg0);
-                  Client.packetWriter.__q_167(var9);
+                  Client.destinationX = argument1;
+                  Client.destinationY = argument2;
+                  var9 = Interpreter.method1915(ClientPacket.field277, Client.packetWriter.isaacCipher);
+                  var9.packetBuffer.writeIntLE16(ServerBuild.field788);
+                  var9.packetBuffer.method57(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+                  var9.packetBuffer.method63(Client.field220);
+                  var9.packetBuffer.writeShort(argument0);
+                  Client.packetWriter.method241(var9);
                }
-            } else if(opcode == 16) {
+            } else if (opcode == 16) {
                Client.mouseCrossX = mouseX;
                Client.mouseCrossY = mouseY;
                Client.mouseCrossColor = 2;
                Client.mouseCrossState = 0;
-               Client.destinationX = arg1;
-               Client.destinationY = arg2;
-               var8 = Interpreter.method1915(ClientPacket.__gs_t, Client.packetWriter.isaacCipher);
+               Client.destinationX = argument1;
+               Client.destinationY = argument2;
+               var8 = Interpreter.method1915(ClientPacket.field240, Client.packetWriter.isaacCipher);
                var8.packetBuffer.writeIntME(ServerPacket.selectedItemWidget);
-               var8.packetBuffer.__bx_323(MenuAction.selectedItemId);
-               var8.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
+               var8.packetBuffer.method64(MenuAction.selectedItemId);
+               var8.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
                var8.packetBuffer.writeShortLE(HealthBarDefinition.selectedItemSlot);
-               var8.packetBuffer.__bx_323(arg0);
-               var8.packetBuffer.__bx_323(arg1 + class50.baseX);
-               var8.packetBuffer.writeShortLE(GraphicsObject.baseY + arg2);
-               Client.packetWriter.__q_167(var8);
-            } else if(opcode == 17) {
+               var8.packetBuffer.method64(argument0);
+               var8.packetBuffer.method64(argument1 + class50.baseX);
+               var8.packetBuffer.writeShortLE(GraphicsObject.baseY + argument2);
+               Client.packetWriter.method241(var8);
+            } else if (opcode == 17) {
                Client.mouseCrossX = mouseX;
                Client.mouseCrossY = mouseY;
                Client.mouseCrossColor = 2;
                Client.mouseCrossState = 0;
-               Client.destinationX = arg1;
-               Client.destinationY = arg2;
-               var8 = Interpreter.method1915(ClientPacket.__gs_bb, Client.packetWriter.isaacCipher);
-               var8.packetBuffer.writeIntME(ServerBuild.__iy_lo);
-               var8.packetBuffer.writeShort(Client.__client_lc);
-               var8.packetBuffer.__bo_322(GraphicsObject.baseY + arg2);
-               var8.packetBuffer.__bo_322(arg1 + class50.baseX);
-               var8.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-               var8.packetBuffer.writeShortLE(arg0);
-               Client.packetWriter.__q_167(var8);
-            } else if(opcode == 18) {
+               Client.destinationX = argument1;
+               Client.destinationY = argument2;
+               var8 = Interpreter.method1915(ClientPacket.field275, Client.packetWriter.isaacCipher);
+               var8.packetBuffer.writeIntME(ServerBuild.field788);
+               var8.packetBuffer.writeShort(Client.field220);
+               var8.packetBuffer.method63(GraphicsObject.baseY + argument2);
+               var8.packetBuffer.method63(argument1 + class50.baseX);
+               var8.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+               var8.packetBuffer.writeShortLE(argument0);
+               Client.packetWriter.method241(var8);
+            } else if (opcode == 18) {
                Client.mouseCrossX = mouseX;
                Client.mouseCrossY = mouseY;
                Client.mouseCrossColor = 2;
                Client.mouseCrossState = 0;
-               Client.destinationX = arg1;
-               Client.destinationY = arg2;
-               var8 = Interpreter.method1915(ClientPacket.__gs_u, Client.packetWriter.isaacCipher);
-               var8.packetBuffer.__bx_323(GraphicsObject.baseY + arg2);
-               var8.packetBuffer.writeShortLE(arg0);
-               var8.packetBuffer.writeShortLE(arg1 + class50.baseX);
-               var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-               Client.packetWriter.__q_167(var8);
-            } else if(opcode == 19) {
+               Client.destinationX = argument1;
+               Client.destinationY = argument2;
+               var8 = Interpreter.method1915(ClientPacket.field227, Client.packetWriter.isaacCipher);
+               var8.packetBuffer.method64(GraphicsObject.baseY + argument2);
+               var8.packetBuffer.writeShortLE(argument0);
+               var8.packetBuffer.writeShortLE(argument1 + class50.baseX);
+               var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+               Client.packetWriter.method241(var8);
+            } else if (opcode == 19) {
                Client.mouseCrossX = mouseX;
                Client.mouseCrossY = mouseY;
                Client.mouseCrossColor = 2;
                Client.mouseCrossState = 0;
-               Client.destinationX = arg1;
-               Client.destinationY = arg2;
-               var8 = Interpreter.method1915(ClientPacket.__gs_bh, Client.packetWriter.isaacCipher);
-               var8.packetBuffer.__bx_323(arg0);
-               var8.packetBuffer.__bo_322(arg1 + class50.baseX);
-               var8.packetBuffer.writeShort(GraphicsObject.baseY + arg2);
-               var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-               Client.packetWriter.__q_167(var8);
-            } else if(opcode == 20) {
+               Client.destinationX = argument1;
+               Client.destinationY = argument2;
+               var8 = Interpreter.method1915(ClientPacket.field296, Client.packetWriter.isaacCipher);
+               var8.packetBuffer.method64(argument0);
+               var8.packetBuffer.method63(argument1 + class50.baseX);
+               var8.packetBuffer.writeShort(GraphicsObject.baseY + argument2);
+               var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+               Client.packetWriter.method241(var8);
+            } else if (opcode == 20) {
                Client.mouseCrossX = mouseX;
                Client.mouseCrossY = mouseY;
                Client.mouseCrossColor = 2;
                Client.mouseCrossState = 0;
-               Client.destinationX = arg1;
-               Client.destinationY = arg2;
-               var8 = Interpreter.method1915(ClientPacket.__gs_g, Client.packetWriter.isaacCipher);
-               var8.packetBuffer.writeShortLE(GraphicsObject.baseY + arg2);
-               var8.packetBuffer.__ba_316(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-               var8.packetBuffer.writeShortLE(arg1 + class50.baseX);
-               var8.packetBuffer.writeShortLE(arg0);
-               Client.packetWriter.__q_167(var8);
-            } else if(opcode == 21) {
+               Client.destinationX = argument1;
+               Client.destinationY = argument2;
+               var8 = Interpreter.method1915(ClientPacket.field228, Client.packetWriter.isaacCipher);
+               var8.packetBuffer.writeShortLE(GraphicsObject.baseY + argument2);
+               var8.packetBuffer.method57(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+               var8.packetBuffer.writeShortLE(argument1 + class50.baseX);
+               var8.packetBuffer.writeShortLE(argument0);
+               Client.packetWriter.method241(var8);
+            } else if (opcode == 21) {
                Client.mouseCrossX = mouseX;
                Client.mouseCrossY = mouseY;
                Client.mouseCrossColor = 2;
                Client.mouseCrossState = 0;
-               Client.destinationX = arg1;
-               Client.destinationY = arg2;
-               var8 = Interpreter.method1915(ClientPacket.__gs_av, Client.packetWriter.isaacCipher);
-               var8.packetBuffer.__bo_322(GraphicsObject.baseY + arg2);
-               var8.packetBuffer.writeShortLE(arg0);
-               var8.packetBuffer.writeShort(arg1 + class50.baseX);
-               var8.packetBuffer.__ba_316(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-               Client.packetWriter.__q_167(var8);
-            } else if(opcode == 22) {
+               Client.destinationX = argument1;
+               Client.destinationY = argument2;
+               var8 = Interpreter.method1915(ClientPacket.field251, Client.packetWriter.isaacCipher);
+               var8.packetBuffer.method63(GraphicsObject.baseY + argument2);
+               var8.packetBuffer.writeShortLE(argument0);
+               var8.packetBuffer.writeShort(argument1 + class50.baseX);
+               var8.packetBuffer.method57(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+               Client.packetWriter.method241(var8);
+            } else if (opcode == 22) {
                Client.mouseCrossX = mouseX;
                Client.mouseCrossY = mouseY;
                Client.mouseCrossColor = 2;
                Client.mouseCrossState = 0;
-               Client.destinationX = arg1;
-               Client.destinationY = arg2;
-               var8 = Interpreter.method1915(ClientPacket.__gs_ai, Client.packetWriter.isaacCipher);
-               var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-               var8.packetBuffer.__bx_323(arg0);
-               var8.packetBuffer.__bo_322(GraphicsObject.baseY + arg2);
-               var8.packetBuffer.writeShort(arg1 + class50.baseX);
-               Client.packetWriter.__q_167(var8);
-            } else if(opcode == 23) {
-               if(Client.isMenuOpen) {
-                  class65.scene.__as_250();
+               Client.destinationX = argument1;
+               Client.destinationY = argument2;
+               var8 = Interpreter.method1915(ClientPacket.field273, Client.packetWriter.isaacCipher);
+               var8.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+               var8.packetBuffer.method64(argument0);
+               var8.packetBuffer.method63(GraphicsObject.baseY + argument2);
+               var8.packetBuffer.writeShort(argument1 + class50.baseX);
+               Client.packetWriter.method241(var8);
+            } else if (opcode == 23) {
+               if (Client.isMenuOpen) {
+                  class65.scene.method296();
                } else {
-                  class65.scene.menuOpen(SoundSystem.plane, arg1, arg2, true);
+                  class65.scene.menuOpen(SoundSystem.plane, argument1, argument2, true);
                }
             } else {
-               PacketBufferNode var10;
-               Widget var16;
-               if(opcode == 24) {
-                  var16 = Huffman.getWidget(arg2);
-                  boolean var12 = true;
-                  if(var16.contentType > 0) {
-                     var12 = ViewportMouse.method2957(var16);
+               PacketBufferNode var12;
+               Widget var13;
+               if (opcode == 24) {
+                  var13 = Huffman.getWidget(argument2);
+                  boolean var14 = true;
+                  if (var13.contentType > 0) {
+                     var14 = ViewportMouse.method2957(var13);
                   }
 
-                  if(var12) {
-                     var10 = Interpreter.method1915(ClientPacket.__gs_bz, Client.packetWriter.isaacCipher);
-                     var10.packetBuffer.writeInt(arg2);
-                     Client.packetWriter.__q_167(var10);
+                  if (var14) {
+                     var12 = Interpreter.method1915(ClientPacket.field291, Client.packetWriter.isaacCipher);
+                     var12.packetBuffer.writeInt(argument2);
+                     Client.packetWriter.method241(var12);
                   }
                } else {
-                  if(opcode == 25) {
-                     var16 = class204.getWidgetChild(arg2, arg1);
-                     if(var16 != null) {
+                  if (opcode == 25) {
+                     var13 = class204.getWidgetChild(argument2, argument1);
+                     if (var13 != null) {
                         Player.method1281();
-                        class25.method350(arg2, arg1, class211.method4107(class1.getWidgetClickMask(var16)), var16.itemId);
+                        WorldMapDecoration.method350(argument2, argument1, Calendar.method4107(class1.getWidgetClickMask(var13)), var13.itemId);
                         Client.isItemSelected = 0;
-                        Client.selectedSpellActionName = class198.method3745(var16);
-                        if(Client.selectedSpellActionName == null) {
+                        Client.selectedSpellActionName = class198.method3745(var13);
+                        if (Client.selectedSpellActionName == null) {
                            Client.selectedSpellActionName = "null";
                         }
 
-                        if(var16.isIf3) {
-                           Client.selectedSpellName = var16.dataText + BufferedFile.colorStartTag(16777215);
+                        if (var13.isIf3) {
+                           Client.selectedSpellName = var13.dataText + BufferedFile.colorStartTag(16777215);
                         } else {
-                           Client.selectedSpellName = BufferedFile.colorStartTag(65280) + var16.spellName + BufferedFile.colorStartTag(16777215);
+                           Client.selectedSpellName = BufferedFile.colorStartTag(65280) + var13.spellName + BufferedFile.colorStartTag(16777215);
                         }
                      }
 
                      return;
                   }
 
-                  if(opcode == 26) {
+                  if (opcode == 26) {
                      WorldMapLabelSize.method198();
                   } else {
-                     int var11;
-                     Widget var14;
-                     if(opcode == 28) {
-                        var8 = Interpreter.method1915(ClientPacket.__gs_bz, Client.packetWriter.isaacCipher);
-                        var8.packetBuffer.writeInt(arg2);
-                        Client.packetWriter.__q_167(var8);
-                        var14 = Huffman.getWidget(arg2);
-                        if(var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) {
-                           var11 = var14.cs1Instructions[0][1];
-                           Varps.Varps_main[var11] = 1 - Varps.Varps_main[var11];
-                           IndexCache.method4703(var11);
+                     int var15;
+                     Widget var17;
+                     if (opcode == 28) {
+                        var8 = Interpreter.method1915(ClientPacket.field291, Client.packetWriter.isaacCipher);
+                        var8.packetBuffer.writeInt(argument2);
+                        Client.packetWriter.method241(var8);
+                        var17 = Huffman.getWidget(argument2);
+                        if (var17.cs1Instructions != null && var17.cs1Instructions[0][0] == 5) {
+                           var15 = var17.cs1Instructions[0][1];
+                           Varps.Varps_main[var15] = 1 - Varps.Varps_main[var15];
+                           Archive.method4703(var15);
                         }
-                     } else if(opcode == 29) {
-                        var8 = Interpreter.method1915(ClientPacket.__gs_bz, Client.packetWriter.isaacCipher);
-                        var8.packetBuffer.writeInt(arg2);
-                        Client.packetWriter.__q_167(var8);
-                        var14 = Huffman.getWidget(arg2);
-                        if(var14.cs1Instructions != null && var14.cs1Instructions[0][0] == 5) {
-                           var11 = var14.cs1Instructions[0][1];
-                           if(Varps.Varps_main[var11] != var14.cs1ComparisonValues[0]) {
-                              Varps.Varps_main[var11] = var14.cs1ComparisonValues[0];
-                              IndexCache.method4703(var11);
+                     } else if (opcode == 29) {
+                        var8 = Interpreter.method1915(ClientPacket.field291, Client.packetWriter.isaacCipher);
+                        var8.packetBuffer.writeInt(argument2);
+                        Client.packetWriter.method241(var8);
+                        var17 = Huffman.getWidget(argument2);
+                        if (var17.cs1Instructions != null && var17.cs1Instructions[0][0] == 5) {
+                           var15 = var17.cs1Instructions[0][1];
+                           if (Varps.Varps_main[var15] != var17.cs1ComparisonValues[0]) {
+                              Varps.Varps_main[var15] = var17.cs1ComparisonValues[0];
+                              Archive.method4703(var15);
                            }
                         }
-                     } else if(opcode == 30) {
-                        if(Client.__client_mo == null) {
-                           TilePaint.method3060(arg2, arg1);
-                           Client.__client_mo = class204.getWidgetChild(arg2, arg1);
-                           class22.method295(Client.__client_mo);
+                     } else if (opcode == 30) {
+                        if (Client.field127 == null) {
+                           TilePaint.method3060(argument2, argument1);
+                           Client.field127 = class204.getWidgetChild(argument2, argument1);
+                           WorldMapRectangle.method295(Client.field127);
                         }
-                     } else if(opcode == 31) {
-                        var8 = Interpreter.method1915(ClientPacket.__gs_bu, Client.packetWriter.isaacCipher);
-                        var8.packetBuffer.writeIntME(arg2);
+                     } else if (opcode == 31) {
+                        var8 = Interpreter.method1915(ClientPacket.field285, Client.packetWriter.isaacCipher);
+                        var8.packetBuffer.writeIntME(argument2);
                         var8.packetBuffer.writeIntLE16(ServerPacket.selectedItemWidget);
-                        var8.packetBuffer.__bx_323(HealthBarDefinition.selectedItemSlot);
+                        var8.packetBuffer.method64(HealthBarDefinition.selectedItemSlot);
                         var8.packetBuffer.writeShortLE(MenuAction.selectedItemId);
-                        var8.packetBuffer.writeShortLE(arg1);
-                        var8.packetBuffer.__bx_323(arg0);
-                        Client.packetWriter.__q_167(var8);
-                        Client.__client_ju = 0;
-                        BoundaryObject.__ej_jv = Huffman.getWidget(arg2);
-                        Client.__client_jz = arg1;
-                     } else if(opcode == 32) {
-                        var8 = Interpreter.method1915(ClientPacket.__gs_q, Client.packetWriter.isaacCipher);
-                        var8.packetBuffer.writeIntME(ServerBuild.__iy_lo);
-                        var8.packetBuffer.writeInt(arg2);
-                        var8.packetBuffer.writeShort(arg1);
-                        var8.packetBuffer.writeShortLE(arg0);
-                        var8.packetBuffer.writeShortLE(Client.__client_lc);
-                        Client.packetWriter.__q_167(var8);
-                        Client.__client_ju = 0;
-                        BoundaryObject.__ej_jv = Huffman.getWidget(arg2);
-                        Client.__client_jz = arg1;
-                     } else if(opcode == 33) {
-                        var8 = Interpreter.method1915(ClientPacket.__gs_ck, Client.packetWriter.isaacCipher);
-                        var8.packetBuffer.writeShortLE(arg0);
-                        var8.packetBuffer.writeIntME(arg2);
-                        var8.packetBuffer.writeShort(arg1);
-                        Client.packetWriter.__q_167(var8);
-                        Client.__client_ju = 0;
-                        BoundaryObject.__ej_jv = Huffman.getWidget(arg2);
-                        Client.__client_jz = arg1;
-                     } else if(opcode == 34) {
-                        var8 = Interpreter.method1915(ClientPacket.__gs_cc, Client.packetWriter.isaacCipher);
-                        var8.packetBuffer.__bo_322(arg0);
-                        var8.packetBuffer.writeIntLE16(arg2);
-                        var8.packetBuffer.__bx_323(arg1);
-                        Client.packetWriter.__q_167(var8);
-                        Client.__client_ju = 0;
-                        BoundaryObject.__ej_jv = Huffman.getWidget(arg2);
-                        Client.__client_jz = arg1;
-                     } else if(opcode == 35) {
-                        var8 = Interpreter.method1915(ClientPacket.__gs_bp, Client.packetWriter.isaacCipher);
-                        var8.packetBuffer.writeIntLE(arg2);
-                        var8.packetBuffer.__bx_323(arg1);
-                        var8.packetBuffer.__bx_323(arg0);
-                        Client.packetWriter.__q_167(var8);
-                        Client.__client_ju = 0;
-                        BoundaryObject.__ej_jv = Huffman.getWidget(arg2);
-                        Client.__client_jz = arg1;
-                     } else if(opcode == 36) {
-                        var8 = Interpreter.method1915(ClientPacket.__gs_l, Client.packetWriter.isaacCipher);
-                        var8.packetBuffer.__bx_323(arg0);
-                        var8.packetBuffer.writeInt(arg2);
-                        var8.packetBuffer.__bx_323(arg1);
-                        Client.packetWriter.__q_167(var8);
-                        Client.__client_ju = 0;
-                        BoundaryObject.__ej_jv = Huffman.getWidget(arg2);
-                        Client.__client_jz = arg1;
-                     } else if(opcode == 37) {
-                        var8 = Interpreter.method1915(ClientPacket.__gs_bd, Client.packetWriter.isaacCipher);
-                        var8.packetBuffer.writeInt(arg2);
-                        var8.packetBuffer.writeShort(arg1);
-                        var8.packetBuffer.writeShort(arg0);
-                        Client.packetWriter.__q_167(var8);
-                        Client.__client_ju = 0;
-                        BoundaryObject.__ej_jv = Huffman.getWidget(arg2);
-                        Client.__client_jz = arg1;
+                        var8.packetBuffer.writeShortLE(argument1);
+                        var8.packetBuffer.method64(argument0);
+                        Client.packetWriter.method241(var8);
+                        Client.field203 = 0;
+                        BoundaryObject.field40 = Huffman.getWidget(argument2);
+                        Client.field204 = argument1;
+                     } else if (opcode == 32) {
+                        var8 = Interpreter.method1915(ClientPacket.field224, Client.packetWriter.isaacCipher);
+                        var8.packetBuffer.writeIntME(ServerBuild.field788);
+                        var8.packetBuffer.writeInt(argument2);
+                        var8.packetBuffer.writeShort(argument1);
+                        var8.packetBuffer.writeShortLE(argument0);
+                        var8.packetBuffer.writeShortLE(Client.field220);
+                        Client.packetWriter.method241(var8);
+                        Client.field203 = 0;
+                        BoundaryObject.field40 = Huffman.getWidget(argument2);
+                        Client.field204 = argument1;
+                     } else if (opcode == 33) {
+                        var8 = Interpreter.method1915(ClientPacket.field309, Client.packetWriter.isaacCipher);
+                        var8.packetBuffer.writeShortLE(argument0);
+                        var8.packetBuffer.writeIntME(argument2);
+                        var8.packetBuffer.writeShort(argument1);
+                        Client.packetWriter.method241(var8);
+                        Client.field203 = 0;
+                        BoundaryObject.field40 = Huffman.getWidget(argument2);
+                        Client.field204 = argument1;
+                     } else if (opcode == 34) {
+                        var8 = Interpreter.method1915(ClientPacket.field320, Client.packetWriter.isaacCipher);
+                        var8.packetBuffer.method63(argument0);
+                        var8.packetBuffer.writeIntLE16(argument2);
+                        var8.packetBuffer.method64(argument1);
+                        Client.packetWriter.method241(var8);
+                        Client.field203 = 0;
+                        BoundaryObject.field40 = Huffman.getWidget(argument2);
+                        Client.field204 = argument1;
+                     } else if (opcode == 35) {
+                        var8 = Interpreter.method1915(ClientPacket.field294, Client.packetWriter.isaacCipher);
+                        var8.packetBuffer.writeIntLE(argument2);
+                        var8.packetBuffer.method64(argument1);
+                        var8.packetBuffer.method64(argument0);
+                        Client.packetWriter.method241(var8);
+                        Client.field203 = 0;
+                        BoundaryObject.field40 = Huffman.getWidget(argument2);
+                        Client.field204 = argument1;
+                     } else if (opcode == 36) {
+                        var8 = Interpreter.method1915(ClientPacket.field229, Client.packetWriter.isaacCipher);
+                        var8.packetBuffer.method64(argument0);
+                        var8.packetBuffer.writeInt(argument2);
+                        var8.packetBuffer.method64(argument1);
+                        Client.packetWriter.method241(var8);
+                        Client.field203 = 0;
+                        BoundaryObject.field40 = Huffman.getWidget(argument2);
+                        Client.field204 = argument1;
+                     } else if (opcode == 37) {
+                        var8 = Interpreter.method1915(ClientPacket.field280, Client.packetWriter.isaacCipher);
+                        var8.packetBuffer.writeInt(argument2);
+                        var8.packetBuffer.writeShort(argument1);
+                        var8.packetBuffer.writeShort(argument0);
+                        Client.packetWriter.method241(var8);
+                        Client.field203 = 0;
+                        BoundaryObject.field40 = Huffman.getWidget(argument2);
+                        Client.field204 = argument1;
                      } else {
-                        if(opcode == 38) {
+                        if (opcode == 38) {
                            Player.method1281();
-                           var16 = Huffman.getWidget(arg2);
+                           var13 = Huffman.getWidget(argument2);
                            Client.isItemSelected = 1;
-                           HealthBarDefinition.selectedItemSlot = arg1;
-                           ServerPacket.selectedItemWidget = arg2;
-                           MenuAction.selectedItemId = arg0;
-                           class22.method295(var16);
-                           Client.selectedItemName = BufferedFile.colorStartTag(16748608) + Skills.getItemDefinition(arg0).name + BufferedFile.colorStartTag(16777215);
-                           if(Client.selectedItemName == null) {
+                           HealthBarDefinition.selectedItemSlot = argument1;
+                           ServerPacket.selectedItemWidget = argument2;
+                           MenuAction.selectedItemId = argument0;
+                           WorldMapRectangle.method295(var13);
+                           Client.selectedItemName = BufferedFile.colorStartTag(16748608) + Skills.getItemDefinition(argument0).name + BufferedFile.colorStartTag(16777215);
+                           if (Client.selectedItemName == null) {
                               Client.selectedItemName = "null";
                            }
 
                            return;
                         }
 
-                        if(opcode == 39) {
-                           var8 = Interpreter.method1915(ClientPacket.__gs_au, Client.packetWriter.isaacCipher);
-                           var8.packetBuffer.__bx_323(arg0);
-                           var8.packetBuffer.writeIntLE16(arg2);
-                           var8.packetBuffer.writeShortLE(arg1);
-                           Client.packetWriter.__q_167(var8);
-                           Client.__client_ju = 0;
-                           BoundaryObject.__ej_jv = Huffman.getWidget(arg2);
-                           Client.__client_jz = arg1;
-                        } else if(opcode == 40) {
-                           var8 = Interpreter.method1915(ClientPacket.__gs_ag, Client.packetWriter.isaacCipher);
-                           var8.packetBuffer.writeIntLE16(arg2);
-                           var8.packetBuffer.writeShortLE(arg1);
-                           var8.packetBuffer.__bo_322(arg0);
-                           Client.packetWriter.__q_167(var8);
-                           Client.__client_ju = 0;
-                           BoundaryObject.__ej_jv = Huffman.getWidget(arg2);
-                           Client.__client_jz = arg1;
-                        } else if(opcode == 41) {
-                           var8 = Interpreter.method1915(ClientPacket.__gs_bl, Client.packetWriter.isaacCipher);
-                           var8.packetBuffer.writeIntLE(arg2);
-                           var8.packetBuffer.__bo_322(arg1);
-                           var8.packetBuffer.writeShort(arg0);
-                           Client.packetWriter.__q_167(var8);
-                           Client.__client_ju = 0;
-                           BoundaryObject.__ej_jv = Huffman.getWidget(arg2);
-                           Client.__client_jz = arg1;
-                        } else if(opcode == 42) {
-                           var8 = Interpreter.method1915(ClientPacket.__gs_bm, Client.packetWriter.isaacCipher);
-                           var8.packetBuffer.writeInt(arg2);
-                           var8.packetBuffer.__bo_322(arg1);
-                           var8.packetBuffer.writeShort(arg0);
-                           Client.packetWriter.__q_167(var8);
-                           Client.__client_ju = 0;
-                           BoundaryObject.__ej_jv = Huffman.getWidget(arg2);
-                           Client.__client_jz = arg1;
-                        } else if(opcode == 43) {
-                           var8 = Interpreter.method1915(ClientPacket.__gs_ay, Client.packetWriter.isaacCipher);
-                           var8.packetBuffer.writeShort(arg0);
-                           var8.packetBuffer.writeIntME(arg2);
-                           var8.packetBuffer.writeShort(arg1);
-                           Client.packetWriter.__q_167(var8);
-                           Client.__client_ju = 0;
-                           BoundaryObject.__ej_jv = Huffman.getWidget(arg2);
-                           Client.__client_jz = arg1;
-                        } else if(opcode == 44) {
-                           var15 = Client.players[arg0];
-                           if(var15 != null) {
+                        if (opcode == 39) {
+                           var8 = Interpreter.method1915(ClientPacket.field268, Client.packetWriter.isaacCipher);
+                           var8.packetBuffer.method64(argument0);
+                           var8.packetBuffer.writeIntLE16(argument2);
+                           var8.packetBuffer.writeShortLE(argument1);
+                           Client.packetWriter.method241(var8);
+                           Client.field203 = 0;
+                           BoundaryObject.field40 = Huffman.getWidget(argument2);
+                           Client.field204 = argument1;
+                        } else if (opcode == 40) {
+                           var8 = Interpreter.method1915(ClientPacket.field248, Client.packetWriter.isaacCipher);
+                           var8.packetBuffer.writeIntLE16(argument2);
+                           var8.packetBuffer.writeShortLE(argument1);
+                           var8.packetBuffer.method63(argument0);
+                           Client.packetWriter.method241(var8);
+                           Client.field203 = 0;
+                           BoundaryObject.field40 = Huffman.getWidget(argument2);
+                           Client.field204 = argument1;
+                        } else if (opcode == 41) {
+                           var8 = Interpreter.method1915(ClientPacket.field287, Client.packetWriter.isaacCipher);
+                           var8.packetBuffer.writeIntLE(argument2);
+                           var8.packetBuffer.method63(argument1);
+                           var8.packetBuffer.writeShort(argument0);
+                           Client.packetWriter.method241(var8);
+                           Client.field203 = 0;
+                           BoundaryObject.field40 = Huffman.getWidget(argument2);
+                           Client.field204 = argument1;
+                        } else if (opcode == 42) {
+                           var8 = Interpreter.method1915(ClientPacket.field286, Client.packetWriter.isaacCipher);
+                           var8.packetBuffer.writeInt(argument2);
+                           var8.packetBuffer.method63(argument1);
+                           var8.packetBuffer.writeShort(argument0);
+                           Client.packetWriter.method241(var8);
+                           Client.field203 = 0;
+                           BoundaryObject.field40 = Huffman.getWidget(argument2);
+                           Client.field204 = argument1;
+                        } else if (opcode == 43) {
+                           var8 = Interpreter.method1915(ClientPacket.field254, Client.packetWriter.isaacCipher);
+                           var8.packetBuffer.writeShort(argument0);
+                           var8.packetBuffer.writeIntME(argument2);
+                           var8.packetBuffer.writeShort(argument1);
+                           Client.packetWriter.method241(var8);
+                           Client.field203 = 0;
+                           BoundaryObject.field40 = Huffman.getWidget(argument2);
+                           Client.field204 = argument1;
+                        } else if (opcode == 44) {
+                           var11 = Client.players[argument0];
+                           if (var11 != null) {
                               Client.mouseCrossX = mouseX;
                               Client.mouseCrossY = mouseY;
                               Client.mouseCrossColor = 2;
                               Client.mouseCrossState = 0;
-                              Client.destinationX = arg1;
-                              Client.destinationY = arg2;
-                              var9 = Interpreter.method1915(ClientPacket.__gs_ao, Client.packetWriter.isaacCipher);
-                              var9.packetBuffer.writeShort(arg0);
-                              var9.packetBuffer.__ai_315(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-                              Client.packetWriter.__q_167(var9);
+                              Client.destinationX = argument1;
+                              Client.destinationY = argument2;
+                              var9 = Interpreter.method1915(ClientPacket.field269, Client.packetWriter.isaacCipher);
+                              var9.packetBuffer.writeShort(argument0);
+                              var9.packetBuffer.method56(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+                              Client.packetWriter.method241(var9);
                            }
-                        } else if(opcode == 45) {
-                           var15 = Client.players[arg0];
-                           if(var15 != null) {
+                        } else if (opcode == 45) {
+                           var11 = Client.players[argument0];
+                           if (var11 != null) {
                               Client.mouseCrossX = mouseX;
                               Client.mouseCrossY = mouseY;
                               Client.mouseCrossColor = 2;
                               Client.mouseCrossState = 0;
-                              Client.destinationX = arg1;
-                              Client.destinationY = arg2;
-                              var9 = Interpreter.method1915(ClientPacket.__gs_bn, Client.packetWriter.isaacCipher);
-                              var9.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-                              var9.packetBuffer.__bo_322(arg0);
-                              Client.packetWriter.__q_167(var9);
+                              Client.destinationX = argument1;
+                              Client.destinationY = argument2;
+                              var9 = Interpreter.method1915(ClientPacket.field278, Client.packetWriter.isaacCipher);
+                              var9.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+                              var9.packetBuffer.method63(argument0);
+                              Client.packetWriter.method241(var9);
                            }
-                        } else if(opcode == 46) {
-                           var15 = Client.players[arg0];
-                           if(var15 != null) {
+                        } else if (opcode == 46) {
+                           var11 = Client.players[argument0];
+                           if (var11 != null) {
                               Client.mouseCrossX = mouseX;
                               Client.mouseCrossY = mouseY;
                               Client.mouseCrossColor = 2;
                               Client.mouseCrossState = 0;
-                              Client.destinationX = arg1;
-                              Client.destinationY = arg2;
-                              var9 = Interpreter.method1915(ClientPacket.__gs_by, Client.packetWriter.isaacCipher);
-                              var9.packetBuffer.__bo_322(arg0);
-                              var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-                              Client.packetWriter.__q_167(var9);
+                              Client.destinationX = argument1;
+                              Client.destinationY = argument2;
+                              var9 = Interpreter.method1915(ClientPacket.field284, Client.packetWriter.isaacCipher);
+                              var9.packetBuffer.method63(argument0);
+                              var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+                              Client.packetWriter.method241(var9);
                            }
-                        } else if(opcode == 47) {
-                           var15 = Client.players[arg0];
-                           if(var15 != null) {
+                        } else if (opcode == 47) {
+                           var11 = Client.players[argument0];
+                           if (var11 != null) {
                               Client.mouseCrossX = mouseX;
                               Client.mouseCrossY = mouseY;
                               Client.mouseCrossColor = 2;
                               Client.mouseCrossState = 0;
-                              Client.destinationX = arg1;
-                              Client.destinationY = arg2;
-                              var9 = Interpreter.method1915(ClientPacket.__gs_aq, Client.packetWriter.isaacCipher);
-                              var9.packetBuffer.__bx_323(arg0);
-                              var9.packetBuffer.__ai_315(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-                              Client.packetWriter.__q_167(var9);
+                              Client.destinationX = argument1;
+                              Client.destinationY = argument2;
+                              var9 = Interpreter.method1915(ClientPacket.field249, Client.packetWriter.isaacCipher);
+                              var9.packetBuffer.method64(argument0);
+                              var9.packetBuffer.method56(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+                              Client.packetWriter.method241(var9);
                            }
-                        } else if(opcode == 48) {
-                           var15 = Client.players[arg0];
-                           if(var15 != null) {
+                        } else if (opcode == 48) {
+                           var11 = Client.players[argument0];
+                           if (var11 != null) {
                               Client.mouseCrossX = mouseX;
                               Client.mouseCrossY = mouseY;
                               Client.mouseCrossColor = 2;
                               Client.mouseCrossState = 0;
-                              Client.destinationX = arg1;
-                              Client.destinationY = arg2;
-                              var9 = Interpreter.method1915(ClientPacket.__gs_cm, Client.packetWriter.isaacCipher);
-                              var9.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-                              var9.packetBuffer.__bo_322(arg0);
-                              Client.packetWriter.__q_167(var9);
+                              Client.destinationX = argument1;
+                              Client.destinationY = argument2;
+                              var9 = Interpreter.method1915(ClientPacket.field305, Client.packetWriter.isaacCipher);
+                              var9.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+                              var9.packetBuffer.method63(argument0);
+                              Client.packetWriter.method241(var9);
                            }
-                        } else if(opcode == 49) {
-                           var15 = Client.players[arg0];
-                           if(var15 != null) {
+                        } else if (opcode == 49) {
+                           var11 = Client.players[argument0];
+                           if (var11 != null) {
                               Client.mouseCrossX = mouseX;
                               Client.mouseCrossY = mouseY;
                               Client.mouseCrossColor = 2;
                               Client.mouseCrossState = 0;
-                              Client.destinationX = arg1;
-                              Client.destinationY = arg2;
-                              var9 = Interpreter.method1915(ClientPacket.__gs_cf, Client.packetWriter.isaacCipher);
-                              var9.packetBuffer.__bo_322(arg0);
-                              var9.packetBuffer.__ba_316(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-                              Client.packetWriter.__q_167(var9);
+                              Client.destinationX = argument1;
+                              Client.destinationY = argument2;
+                              var9 = Interpreter.method1915(ClientPacket.field315, Client.packetWriter.isaacCipher);
+                              var9.packetBuffer.method63(argument0);
+                              var9.packetBuffer.method57(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+                              Client.packetWriter.method241(var9);
                            }
-                        } else if(opcode == 50) {
-                           var15 = Client.players[arg0];
-                           if(var15 != null) {
+                        } else if (opcode == 50) {
+                           var11 = Client.players[argument0];
+                           if (var11 != null) {
                               Client.mouseCrossX = mouseX;
                               Client.mouseCrossY = mouseY;
                               Client.mouseCrossColor = 2;
                               Client.mouseCrossState = 0;
-                              Client.destinationX = arg1;
-                              Client.destinationY = arg2;
-                              var9 = Interpreter.method1915(ClientPacket.__gs_be, Client.packetWriter.isaacCipher);
-                              var9.packetBuffer.__ba_316(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-                              var9.packetBuffer.writeShortLE(arg0);
-                              Client.packetWriter.__q_167(var9);
+                              Client.destinationX = argument1;
+                              Client.destinationY = argument2;
+                              var9 = Interpreter.method1915(ClientPacket.field297, Client.packetWriter.isaacCipher);
+                              var9.packetBuffer.method57(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+                              var9.packetBuffer.writeShortLE(argument0);
+                              Client.packetWriter.method241(var9);
                            }
-                        } else if(opcode == 51) {
-                           var15 = Client.players[arg0];
-                           if(var15 != null) {
+                        } else if (opcode == 51) {
+                           var11 = Client.players[argument0];
+                           if (var11 != null) {
                               Client.mouseCrossX = mouseX;
                               Client.mouseCrossY = mouseY;
                               Client.mouseCrossColor = 2;
                               Client.mouseCrossState = 0;
-                              Client.destinationX = arg1;
-                              Client.destinationY = arg2;
-                              var9 = Interpreter.method1915(ClientPacket.__gs_af, Client.packetWriter.isaacCipher);
-                              var9.packetBuffer.__ai_315(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-                              var9.packetBuffer.__bx_323(arg0);
-                              Client.packetWriter.__q_167(var9);
+                              Client.destinationX = argument1;
+                              Client.destinationY = argument2;
+                              var9 = Interpreter.method1915(ClientPacket.field272, Client.packetWriter.isaacCipher);
+                              var9.packetBuffer.method56(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+                              var9.packetBuffer.method64(argument0);
+                              Client.packetWriter.method241(var9);
                            }
                         } else {
-                           label921: {
-                              if(opcode != 57) {
-                                 if(opcode == 58) {
-                                    var16 = class204.getWidgetChild(arg2, arg1);
-                                    if(var16 != null) {
-                                       var9 = Interpreter.method1915(ClientPacket.__gs_cs, Client.packetWriter.isaacCipher);
-                                       var9.packetBuffer.writeShortLE(Client.__client_lc);
-                                       var9.packetBuffer.writeIntLE16(arg2);
-                                       var9.packetBuffer.writeShortLE(Client.__client_mh);
-                                       var9.packetBuffer.__bx_323(arg1);
-                                       var9.packetBuffer.writeInt(ServerBuild.__iy_lo);
-                                       var9.packetBuffer.__bx_323(var16.itemId);
-                                       Client.packetWriter.__q_167(var9);
+                           label415: {
+                              if (opcode != 57) {
+                                 if (opcode == 58) {
+                                    var13 = class204.getWidgetChild(argument2, argument1);
+                                    if (var13 != null) {
+                                       var9 = Interpreter.method1915(ClientPacket.field304, Client.packetWriter.isaacCipher);
+                                       var9.packetBuffer.writeShortLE(Client.field220);
+                                       var9.packetBuffer.writeIntLE16(argument2);
+                                       var9.packetBuffer.writeShortLE(Client.field157);
+                                       var9.packetBuffer.method64(argument1);
+                                       var9.packetBuffer.writeInt(ServerBuild.field788);
+                                       var9.packetBuffer.method64(var13.itemId);
+                                       Client.packetWriter.method241(var9);
                                     }
-                                    break label921;
+                                    break label415;
                                  }
 
-                                 if(opcode == 1001) {
+                                 if (opcode == 1001) {
                                     Client.mouseCrossX = mouseX;
                                     Client.mouseCrossY = mouseY;
                                     Client.mouseCrossColor = 2;
                                     Client.mouseCrossState = 0;
-                                    Client.destinationX = arg1;
-                                    Client.destinationY = arg2;
-                                    var8 = Interpreter.method1915(ClientPacket.__gs_cp, Client.packetWriter.isaacCipher);
-                                    var8.packetBuffer.writeShort(arg0);
-                                    var8.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?1:0);
-                                    var8.packetBuffer.__bo_322(arg1 + class50.baseX);
-                                    var8.packetBuffer.__bx_323(GraphicsObject.baseY + arg2);
-                                    Client.packetWriter.__q_167(var8);
-                                    break label921;
+                                    Client.destinationX = argument1;
+                                    Client.destinationY = argument2;
+                                    var8 = Interpreter.method1915(ClientPacket.field316, Client.packetWriter.isaacCipher);
+                                    var8.packetBuffer.writeShort(argument0);
+                                    var8.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0);
+                                    var8.packetBuffer.method63(argument1 + class50.baseX);
+                                    var8.packetBuffer.method64(GraphicsObject.baseY + argument2);
+                                    Client.packetWriter.method241(var8);
+                                    break label415;
                                  }
 
-                                 if(opcode == 1002) {
+                                 if (opcode == 1002) {
                                     Client.mouseCrossX = mouseX;
                                     Client.mouseCrossY = mouseY;
                                     Client.mouseCrossColor = 2;
                                     Client.mouseCrossState = 0;
-                                    var8 = Interpreter.method1915(ClientPacket.__gs_al, Client.packetWriter.isaacCipher);
-                                    var8.packetBuffer.__bo_322(arg0);
-                                    Client.packetWriter.__q_167(var8);
-                                    break label921;
+                                    var8 = Interpreter.method1915(ClientPacket.field258, Client.packetWriter.isaacCipher);
+                                    var8.packetBuffer.method63(argument0);
+                                    Client.packetWriter.method241(var8);
+                                    break label415;
                                  }
 
-                                 if(opcode == 1003) {
+                                 if (opcode == 1003) {
                                     Client.mouseCrossX = mouseX;
                                     Client.mouseCrossY = mouseY;
                                     Client.mouseCrossColor = 2;
                                     Client.mouseCrossState = 0;
-                                    var13 = Client.npcs[arg0];
-                                    if(var13 != null) {
-                                       NpcDefinition var17 = var13.definition;
-                                       if(var17.transforms != null) {
-                                          var17 = var17.transform();
+                                    var10 = Client.npcs[argument0];
+                                    if (var10 != null) {
+                                       NPCDefinition var16 = var10.definition;
+                                       if (var16.transforms != null) {
+                                          var16 = var16.transform();
                                        }
 
-                                       if(var17 != null) {
-                                          var10 = Interpreter.method1915(ClientPacket.__gs_ar, Client.packetWriter.isaacCipher);
-                                          var10.packetBuffer.__bo_322(var17.id);
-                                          Client.packetWriter.__q_167(var10);
+                                       if (var16 != null) {
+                                          var12 = Interpreter.method1915(ClientPacket.field252, Client.packetWriter.isaacCipher);
+                                          var12.packetBuffer.method63(var16.id);
+                                          Client.packetWriter.method241(var12);
                                        }
                                     }
-                                    break label921;
+                                    break label415;
                                  }
 
-                                 if(opcode == 1004) {
+                                 if (opcode == 1004) {
                                     Client.mouseCrossX = mouseX;
                                     Client.mouseCrossY = mouseY;
                                     Client.mouseCrossColor = 2;
                                     Client.mouseCrossState = 0;
-                                    var8 = Interpreter.method1915(ClientPacket.__gs_p, Client.packetWriter.isaacCipher);
-                                    var8.packetBuffer.writeShortLE(arg0);
-                                    Client.packetWriter.__q_167(var8);
-                                    break label921;
+                                    var8 = Interpreter.method1915(ClientPacket.field246, Client.packetWriter.isaacCipher);
+                                    var8.packetBuffer.writeShortLE(argument0);
+                                    Client.packetWriter.method241(var8);
+                                    break label415;
                                  }
 
-                                 if(opcode == 1005) {
-                                    var16 = Huffman.getWidget(arg2);
-                                    if(var16 != null && var16.itemQuantities[arg1] >= 100000) {
-                                       WorldMapIcon1.method219(27, "", var16.itemQuantities[arg1] + " x " + Skills.getItemDefinition(arg0).name);
+                                 if (opcode == 1005) {
+                                    var13 = Huffman.getWidget(argument2);
+                                    if (var13 != null && var13.itemQuantities[argument1] >= 100000) {
+                                       WorldMapIcon1.addGameMessage(27, "", var13.itemQuantities[argument1] + " x " + Skills.getItemDefinition(argument0).name);
                                     } else {
-                                       var9 = Interpreter.method1915(ClientPacket.__gs_p, Client.packetWriter.isaacCipher);
-                                       var9.packetBuffer.writeShortLE(arg0);
-                                       Client.packetWriter.__q_167(var9);
+                                       var9 = Interpreter.method1915(ClientPacket.field246, Client.packetWriter.isaacCipher);
+                                       var9.packetBuffer.writeShortLE(argument0);
+                                       Client.packetWriter.method241(var9);
                                     }
 
-                                    Client.__client_ju = 0;
-                                    BoundaryObject.__ej_jv = Huffman.getWidget(arg2);
-                                    Client.__client_jz = arg1;
-                                    break label921;
+                                    Client.field203 = 0;
+                                    BoundaryObject.field40 = Huffman.getWidget(argument2);
+                                    Client.field204 = argument1;
+                                    break label415;
                                  }
 
-                                 if(opcode != 1007) {
-                                    if(opcode == 1008 || opcode == 1011 || opcode == 1010 || opcode == 1009 || opcode == 1012) {
-                                       class60.worldMap0.menuAction(opcode, arg0, new TileLocation(arg1), new TileLocation(arg2));
+                                 if (opcode != 1007) {
+                                    if (opcode == 1008 || opcode == 1011 || opcode == 1010 || opcode == 1009 || opcode == 1012) {
+                                       class60.worldMap0.menuAction(opcode, argument0, new Coord(argument1), new Coord(argument2));
                                     }
-                                    break label921;
+                                    break label415;
                                  }
                               }
 
-                              var16 = class204.getWidgetChild(arg2, arg1);
-                              if(var16 != null) {
-                                 class171.method3494(arg0, arg2, arg1, var16.itemId, target);
+                              var13 = class204.getWidgetChild(argument2, argument1);
+                              if (var13 != null) {
+                                 class171.method3494(argument0, argument2, argument1, var13.itemId, targetName);
                               }
                            }
                         }
@@ -1324,17 +1325,17 @@ public abstract class Actor extends Entity {
          }
       }
 
-      if(Client.isItemSelected != 0) {
+      if (Client.isItemSelected != 0) {
          Client.isItemSelected = 0;
-         class22.method295(Huffman.getWidget(ServerPacket.selectedItemWidget));
+         WorldMapRectangle.method295(Huffman.getWidget(ServerPacket.selectedItemWidget));
       }
 
-      if(Client.isSpellSelected) {
+      if (Client.isSpellSelected) {
          Player.method1281();
       }
 
-      if(BoundaryObject.__ej_jv != null && Client.__client_ju == 0) {
-         class22.method295(BoundaryObject.__ej_jv);
+      if (BoundaryObject.field40 != null && Client.field203 == 0) {
+         WorldMapRectangle.method295(BoundaryObject.field40);
       }
 
    }
diff --git a/runescape-client/src/main/java/Animation.java b/runescape-client/src/main/java/Animation.java
index 826dd5043d..ee445af99c 100644
--- a/runescape-client/src/main/java/Animation.java
+++ b/runescape-client/src/main/java/Animation.java
@@ -7,13 +7,13 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("Animation")
 public class Animation {
    @ObfuscatedName("m")
-   static int[] __dz_m;
+   static int[] field26;
    @ObfuscatedName("f")
-   static int[] __dz_f;
+   static int[] field27;
    @ObfuscatedName("q")
-   static int[] __dz_q;
+   static int[] field28;
    @ObfuscatedName("w")
-   static int[] __dz_w;
+   static int[] field29;
    @ObfuscatedName("o")
    @ObfuscatedSignature(
       signature = "Lek;"
@@ -39,13 +39,6 @@ public class Animation {
    @Export("hasAlphaTransform")
    boolean hasAlphaTransform;
 
-   static {
-      __dz_m = new int[500];
-      __dz_f = new int[500];
-      __dz_q = new int[500];
-      __dz_w = new int[500];
-   }
-
    @ObfuscatedSignature(
       signature = "([BLek;)V"
    )
@@ -63,55 +56,55 @@ public class Animation {
       var4.index = var5 + var3.index;
 
       int var8;
-      for(var8 = 0; var8 < var5; ++var8) {
+      for (var8 = 0; var8 < var5; ++var8) {
          int var9 = var3.readUnsignedByte();
-         if(var9 > 0) {
-            if(this.skeleton.transformTypes[var8] != 0) {
-               for(int var10 = var8 - 1; var10 > var6; --var10) {
-                  if(this.skeleton.transformTypes[var10] == 0) {
-                     __dz_m[var7] = var10;
-                     __dz_f[var7] = 0;
-                     __dz_q[var7] = 0;
-                     __dz_w[var7] = 0;
+         if (var9 > 0) {
+            if (this.skeleton.transformTypes[var8] != 0) {
+               for (int var10 = var8 - 1; var10 > var6; --var10) {
+                  if (this.skeleton.transformTypes[var10] == 0) {
+                     field26[var7] = var10;
+                     field27[var7] = 0;
+                     field28[var7] = 0;
+                     field29[var7] = 0;
                      ++var7;
                      break;
                   }
                }
             }
 
-            __dz_m[var7] = var8;
+            field26[var7] = var8;
             short var11 = 0;
-            if(this.skeleton.transformTypes[var8] == 3) {
+            if (this.skeleton.transformTypes[var8] == 3) {
                var11 = 128;
             }
 
-            if((var9 & 1) != 0) {
-               __dz_f[var7] = var4.__ab_306();
+            if ((var9 & 1) != 0) {
+               field27[var7] = var4.readShortSmart();
             } else {
-               __dz_f[var7] = var11;
+               field27[var7] = var11;
             }
 
-            if((var9 & 2) != 0) {
-               __dz_q[var7] = var4.__ab_306();
+            if ((var9 & 2) != 0) {
+               field28[var7] = var4.readShortSmart();
             } else {
-               __dz_q[var7] = var11;
+               field28[var7] = var11;
             }
 
-            if((var9 & 4) != 0) {
-               __dz_w[var7] = var4.__ab_306();
+            if ((var9 & 4) != 0) {
+               field29[var7] = var4.readShortSmart();
             } else {
-               __dz_w[var7] = var11;
+               field29[var7] = var11;
             }
 
             var6 = var8;
             ++var7;
-            if(this.skeleton.transformTypes[var8] == 5) {
+            if (this.skeleton.transformTypes[var8] == 5) {
                this.hasAlphaTransform = true;
             }
          }
       }
 
-      if(var1.length != var4.index) {
+      if (var1.length != var4.index) {
          throw new RuntimeException();
       } else {
          this.transformCount = var7;
@@ -120,13 +113,20 @@ public class Animation {
          this.transformYs = new int[var7];
          this.transformZs = new int[var7];
 
-         for(var8 = 0; var8 < var7; ++var8) {
-            this.transformSkeletonLabels[var8] = __dz_m[var8];
-            this.transformXs[var8] = __dz_f[var8];
-            this.transformYs[var8] = __dz_q[var8];
-            this.transformZs[var8] = __dz_w[var8];
+         for (var8 = 0; var8 < var7; ++var8) {
+            this.transformSkeletonLabels[var8] = field26[var8];
+            this.transformXs[var8] = field27[var8];
+            this.transformYs[var8] = field28[var8];
+            this.transformZs[var8] = field29[var8];
          }
 
       }
    }
+
+   static {
+      field26 = new int[500];
+      field27 = new int[500];
+      field28 = new int[500];
+      field29 = new int[500];
+   }
 }
diff --git a/runescape-client/src/main/java/Archive.java b/runescape-client/src/main/java/Archive.java
new file mode 100644
index 0000000000..72a68414b8
--- /dev/null
+++ b/runescape-client/src/main/java/Archive.java
@@ -0,0 +1,554 @@
+import java.util.zip.CRC32;
+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")
+@Implements("Archive")
+public class Archive extends AbstractArchive {
+   @ObfuscatedName("aj")
+   @Export("Archive_crc")
+   static CRC32 Archive_crc;
+   @ObfuscatedName("c")
+   @ObfuscatedSignature(
+      signature = "Lff;"
+   )
+   @Export("archiveDisk")
+   ArchiveDisk archiveDisk;
+   @ObfuscatedName("r")
+   @ObfuscatedSignature(
+      signature = "Lff;"
+   )
+   @Export("masterDisk")
+   ArchiveDisk masterDisk;
+   @ObfuscatedName("p")
+   @ObfuscatedGetter(
+      intValue = -1579549759
+   )
+   @Export("index")
+   int index;
+   @ObfuscatedName("v")
+   volatile boolean field403;
+   @ObfuscatedName("ag")
+   boolean field404;
+   @ObfuscatedName("aq")
+   @Export("validGroups")
+   volatile boolean[] validGroups;
+   @ObfuscatedName("av")
+   @ObfuscatedGetter(
+      intValue = 1472870917
+   )
+   @Export("indexCrc")
+   int indexCrc;
+   @ObfuscatedName("ar")
+   @ObfuscatedGetter(
+      intValue = -785528219
+   )
+   @Export("indexVersion")
+   int indexVersion;
+   @ObfuscatedName("ac")
+   @ObfuscatedGetter(
+      intValue = -1884661133
+   )
+   int field405;
+
+   @ObfuscatedSignature(
+      signature = "(Lff;Lff;IZZZ)V"
+   )
+   public Archive(ArchiveDisk archiveDisk, ArchiveDisk masterDisk, int index, boolean releaseGroups, boolean shallowFiles, boolean var6) {
+      super(releaseGroups, shallowFiles);
+      this.field403 = false;
+      this.field404 = false;
+      this.field405 = -1;
+      this.archiveDisk = archiveDisk;
+      this.masterDisk = masterDisk;
+      this.index = index;
+      this.field404 = var6;
+      int var7 = this.index;
+      if (Players.NetCache_reference != null) {
+         Players.NetCache_reference.index = var7 * 8 + 5;
+         int var8 = Players.NetCache_reference.readInt();
+         int var9 = Players.NetCache_reference.readInt();
+         this.loadIndex(var8, var9);
+      } else {
+         PacketBuffer.requestNetFile((Archive)null, 255, 255, 0, (byte)0, true);
+         NetCache.NetCache_archives[var7] = this;
+      }
+
+   }
+
+   @ObfuscatedName("f")
+   @ObfuscatedSignature(
+      signature = "(II)V",
+      garbageValue = "2102142648"
+   )
+   void vmethod129(int var1) {
+      int var2 = this.index;
+      long var3 = (long)((var2 << 16) + var1);
+      NetFileRequest var5 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var3);
+      if (var5 != null) {
+         NetCache.NetCache_pendingWritesQueue.addLast(var5);
+      }
+
+   }
+
+   @ObfuscatedName("e")
+   @ObfuscatedSignature(
+      signature = "(II)I",
+      garbageValue = "-1809769865"
+   )
+   @Export("groupLoadPercent")
+   int groupLoadPercent(int var1) {
+      return super.groups[var1] != null ? 100 : (this.validGroups[var1] ? 100 : class54.method1086(this.index, var1));
+   }
+
+   @ObfuscatedName("z")
+   @ObfuscatedSignature(
+      signature = "(II)V",
+      garbageValue = "-1829145107"
+   )
+   @Export("loadGroup")
+   void loadGroup(int group) {
+      if (this.archiveDisk != null && this.validGroups != null && this.validGroups[group]) {
+         ArchiveDisk var2 = this.archiveDisk;
+         byte[] var3 = null;
+         NodeDeque var4 = ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue;
+         synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) {
+            for (ArchiveDiskAction var6 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var6 != null; var6 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) {
+               if (var6.key == (long)group && var2 == var6.archiveDisk && var6.type == 0) {
+                  var3 = var6.data;
+                  break;
+               }
+            }
+         }
+
+         if (var3 != null) {
+            this.load(var2, group, var3, true);
+         } else {
+            byte[] var5 = var2.read(group);
+            this.load(var2, group, var5, true);
+         }
+      } else {
+         PacketBuffer.requestNetFile(this, this.index, group, super.groupCrcs[group], (byte)2, true);
+      }
+
+   }
+
+   @ObfuscatedName("cx")
+   @ObfuscatedSignature(
+      signature = "(I)Z",
+      garbageValue = "1750279412"
+   )
+   public boolean method130() {
+      return this.field403;
+   }
+
+   @ObfuscatedName("ca")
+   @ObfuscatedSignature(
+      signature = "(I)I",
+      garbageValue = "1671499504"
+   )
+   @Export("percentage")
+   public int percentage() {
+      if (this.field403) {
+         return 100;
+      } else if (super.groups != null) {
+         return 99;
+      } else {
+         int var1 = class54.method1086(255, this.index);
+         if (var1 >= 100) {
+            var1 = 99;
+         }
+
+         return var1;
+      }
+   }
+
+   @ObfuscatedName("co")
+   @ObfuscatedSignature(
+      signature = "(III)V",
+      garbageValue = "-1621053520"
+   )
+   @Export("loadIndex")
+   public void loadIndex(int var1, int var2) {
+      this.indexCrc = var1;
+      this.indexVersion = var2;
+      if (this.masterDisk != null) {
+         int var3 = this.index;
+         ArchiveDisk var4 = this.masterDisk;
+         byte[] var5 = null;
+         NodeDeque var6 = ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue;
+         synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) {
+            for (ArchiveDiskAction var8 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.last(); var8 != null; var8 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.previous()) {
+               if (var8.key == (long)var3 && var4 == var8.archiveDisk && var8.type == 0) {
+                  var5 = var8.data;
+                  break;
+               }
+            }
+         }
+
+         if (var5 != null) {
+            this.load(var4, var3, var5, true);
+         } else {
+            byte[] var7 = var4.read(var3);
+            this.load(var4, var3, var7, true);
+         }
+      } else {
+         PacketBuffer.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
+      }
+
+   }
+
+   @ObfuscatedName("de")
+   @ObfuscatedSignature(
+      signature = "(I[BZZB)V",
+      garbageValue = "24"
+   )
+   @Export("write")
+   public void write(int var1, byte[] var2, boolean var3, boolean var4) {
+      if (var3) {
+         if (this.field403) {
+            throw new RuntimeException();
+         }
+
+         if (this.masterDisk != null) {
+            Widget.method4499(this.index, var2, this.masterDisk);
+         }
+
+         this.decodeIndex(var2);
+         this.loadAllLocal();
+      } else {
+         var2[var2.length - 2] = (byte)(super.groupVersions[var1] >> 8);
+         var2[var2.length - 1] = (byte)super.groupVersions[var1];
+         if (this.archiveDisk != null) {
+            Widget.method4499(var1, var2, this.archiveDisk);
+            this.validGroups[var1] = true;
+         }
+
+         if (var4) {
+            super.groups[var1] = Projectile.byteArrayToObject(var2, false);
+         }
+      }
+
+   }
+
+   @ObfuscatedName("dx")
+   @ObfuscatedSignature(
+      signature = "(Lff;I[BZI)V",
+      garbageValue = "-2045340856"
+   )
+   @Export("load")
+   void load(ArchiveDisk var1, int group, byte[] data, boolean var4) {
+      int var5;
+      if (var1 == this.masterDisk) {
+         if (this.field403) {
+            throw new RuntimeException();
+         }
+
+         if (data == null) {
+            PacketBuffer.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
+         } else {
+            Archive_crc.reset();
+            Archive_crc.update(data, 0, data.length);
+            var5 = (int)Archive_crc.getValue();
+            if (var5 != this.indexCrc) {
+               PacketBuffer.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
+            } else {
+               Buffer var6 = new Buffer(Strings.decompressBytes(data));
+               int var7 = var6.readUnsignedByte();
+               if (var7 != 5 && var7 != 6) {
+                  throw new RuntimeException(var7 + "," + this.index + "," + group);
+               }
+
+               int var8 = 0;
+               if (var7 >= 6) {
+                  var8 = var6.readInt();
+               }
+
+               if (var8 != this.indexVersion) {
+                  PacketBuffer.requestNetFile(this, 255, this.index, this.indexCrc, (byte)0, true);
+               } else {
+                  this.decodeIndex(data);
+                  this.loadAllLocal();
+               }
+            }
+         }
+      } else {
+         if (!var4 && group == this.field405) {
+            this.field403 = true;
+         }
+
+         if (data != null && data.length > 2) {
+            Archive_crc.reset();
+            Archive_crc.update(data, 0, data.length - 2);
+            var5 = (int)Archive_crc.getValue();
+            int var9 = ((data[data.length - 2] & 255) << 8) + (data[data.length - 1] & 255);
+            if (var5 == super.groupCrcs[group] && var9 == super.groupVersions[group]) {
+               this.validGroups[group] = true;
+               if (var4) {
+                  super.groups[group] = Projectile.byteArrayToObject(data, false);
+               }
+            } else {
+               this.validGroups[group] = false;
+               if (this.field404 || var4) {
+                  PacketBuffer.requestNetFile(this, this.index, group, super.groupCrcs[group], (byte)2, var4);
+               }
+            }
+         } else {
+            this.validGroups[group] = false;
+            if (this.field404 || var4) {
+               PacketBuffer.requestNetFile(this, this.index, group, super.groupCrcs[group], (byte)2, var4);
+            }
+         }
+      }
+
+   }
+
+   @ObfuscatedName("dt")
+   @ObfuscatedSignature(
+      signature = "(I)V",
+      garbageValue = "1357733042"
+   )
+   @Export("loadAllLocal")
+   void loadAllLocal() {
+      this.validGroups = new boolean[super.groups.length];
+
+      int var1;
+      for (var1 = 0; var1 < this.validGroups.length; ++var1) {
+         this.validGroups[var1] = false;
+      }
+
+      if (this.archiveDisk == null) {
+         this.field403 = true;
+      } else {
+         this.field405 = -1;
+
+         for (var1 = 0; var1 < this.validGroups.length; ++var1) {
+            if (super.fileCounts[var1] > 0) {
+               NPC.method2009(var1, this.archiveDisk, this);
+               this.field405 = var1;
+            }
+         }
+
+         if (this.field405 == -1) {
+            this.field403 = true;
+         }
+      }
+
+   }
+
+   @ObfuscatedName("dn")
+   @ObfuscatedSignature(
+      signature = "(IB)Z",
+      garbageValue = "0"
+   )
+   public boolean method132(int var1) {
+      return this.validGroups[var1];
+   }
+
+   @ObfuscatedName("df")
+   @ObfuscatedSignature(
+      signature = "(II)Z",
+      garbageValue = "1419648188"
+   )
+   public boolean method133(int var1) {
+      return this.method3(var1) != null;
+   }
+
+   @ObfuscatedName("da")
+   @ObfuscatedSignature(
+      signature = "(I)I",
+      garbageValue = "-1809381772"
+   )
+   @Export("loadPercent")
+   public int loadPercent() {
+      int var1 = 0;
+      int var2 = 0;
+
+      int var3;
+      for (var3 = 0; var3 < super.groups.length; ++var3) {
+         if (super.fileCounts[var3] > 0) {
+            var1 += 100;
+            var2 += this.groupLoadPercent(var3);
+         }
+      }
+
+      if (var1 == 0) {
+         return 100;
+      } else {
+         var3 = var2 * 100 / var1;
+         return var3;
+      }
+   }
+
+   @ObfuscatedName("jc")
+   @ObfuscatedSignature(
+      signature = "(IB)V",
+      garbageValue = "-34"
+   )
+   static final void method4703(int var0) {
+      GrandExchangeOfferAgeComparator.method159();
+
+      for (ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) {
+         if (var1.obj != null) {
+            var1.set();
+         }
+      }
+
+      int var4 = SecureRandomCallable.method1140(var0).type;
+      if (var4 != 0) {
+         int var2 = Varps.Varps_main[var0];
+         if (var4 == 1) {
+            if (var2 == 1) {
+               Rasterizer3D.Rasterizer3D_setBrightness(0.9D);
+               ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.9D);
+            }
+
+            if (var2 == 2) {
+               Rasterizer3D.Rasterizer3D_setBrightness(0.8D);
+               ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.8D);
+            }
+
+            if (var2 == 3) {
+               Rasterizer3D.Rasterizer3D_setBrightness(0.7D);
+               ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.7D);
+            }
+
+            if (var2 == 4) {
+               Rasterizer3D.Rasterizer3D_setBrightness(0.6D);
+               ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.6D);
+            }
+
+            ObjectDefinition.method5041();
+         }
+
+         if (var4 == 3) {
+            short var3 = 0;
+            if (var2 == 0) {
+               var3 = 255;
+            }
+
+            if (var2 == 1) {
+               var3 = 192;
+            }
+
+            if (var2 == 2) {
+               var3 = 128;
+            }
+
+            if (var2 == 3) {
+               var3 = 64;
+            }
+
+            if (var2 == 4) {
+               var3 = 0;
+            }
+
+            if (var3 != Client.field128) {
+               if (Client.field128 == 0 && Client.field112 != -1) {
+                  Login.method2076(UserComparator3.archive6, Client.field112, 0, var3, false);
+                  Client.field107 = false;
+               } else if (var3 == 0) {
+                  class214.midiPcmStream.clear();
+                  class214.field1129 = 1;
+                  class214.field1130 = null;
+                  Client.field107 = false;
+               } else {
+                  class203.method4008(var3);
+               }
+
+               Client.field128 = var3;
+            }
+         }
+
+         if (var4 == 4) {
+            if (var2 == 0) {
+               Client.soundEffectVolume = 127;
+            }
+
+            if (var2 == 1) {
+               Client.soundEffectVolume = 96;
+            }
+
+            if (var2 == 2) {
+               Client.soundEffectVolume = 64;
+            }
+
+            if (var2 == 3) {
+               Client.soundEffectVolume = 32;
+            }
+
+            if (var2 == 4) {
+               Client.soundEffectVolume = 0;
+            }
+         }
+
+         if (var4 == 5) {
+            Client.field215 = var2;
+         }
+
+         if (var4 == 6) {
+            Client.chatEffects = var2;
+         }
+
+         if (var4 == 9) {
+            Client.field136 = var2;
+         }
+
+         if (var4 == 10) {
+            if (var2 == 0) {
+               Client.field115 = 127;
+            }
+
+            if (var2 == 1) {
+               Client.field115 = 96;
+            }
+
+            if (var2 == 2) {
+               Client.field115 = 64;
+            }
+
+            if (var2 == 3) {
+               Client.field115 = 32;
+            }
+
+            if (var2 == 4) {
+               Client.field115 = 0;
+            }
+         }
+
+         if (var4 == 17) {
+            Client.followerIndex = var2 & 65535;
+         }
+
+         if (var4 == 18) {
+            Client.playerAttackOption = (AttackOption)ScriptFrame.findEnumerated(ClientPacket.method3665(), var2);
+            if (Client.playerAttackOption == null) {
+               Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels;
+            }
+         }
+
+         if (var4 == 19) {
+            if (var2 == -1) {
+               Client.combatTargetPlayerIndex = -1;
+            } else {
+               Client.combatTargetPlayerIndex = var2 & 2047;
+            }
+         }
+
+         if (var4 == 22) {
+            Client.npcAttackOption = (AttackOption)ScriptFrame.findEnumerated(ClientPacket.method3665(), var2);
+            if (Client.npcAttackOption == null) {
+               Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels;
+            }
+         }
+      }
+
+   }
+
+   static {
+      Archive_crc = new CRC32();
+   }
+}
diff --git a/runescape-client/src/main/java/ArchiveDisk.java b/runescape-client/src/main/java/ArchiveDisk.java
new file mode 100644
index 0000000000..19489b851f
--- /dev/null
+++ b/runescape-client/src/main/java/ArchiveDisk.java
@@ -0,0 +1,507 @@
+import java.io.EOFException;
+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("ff")
+@Implements("ArchiveDisk")
+public final class ArchiveDisk {
+   @ObfuscatedName("m")
+   @Export("ArchiveDisk_buffer")
+   static byte[] ArchiveDisk_buffer;
+   @ObfuscatedName("f")
+   @ObfuscatedSignature(
+      signature = "Ldy;"
+   )
+   @Export("datFile")
+   BufferedFile datFile;
+   @ObfuscatedName("q")
+   @ObfuscatedSignature(
+      signature = "Ldy;"
+   )
+   @Export("idxFile")
+   BufferedFile idxFile;
+   @ObfuscatedName("w")
+   @ObfuscatedGetter(
+      intValue = -1982523283
+   )
+   @Export("archive")
+   int archive;
+   @ObfuscatedName("o")
+   @ObfuscatedGetter(
+      intValue = -748616567
+   )
+   @Export("maxEntrySize")
+   int maxEntrySize;
+
+   @ObfuscatedSignature(
+      signature = "(ILdy;Ldy;I)V"
+   )
+   public ArchiveDisk(int var1, BufferedFile var2, BufferedFile var3, int var4) {
+      this.datFile = null;
+      this.idxFile = null;
+      this.maxEntrySize = 65000;
+      this.archive = var1;
+      this.datFile = var2;
+      this.idxFile = var3;
+      this.maxEntrySize = var4;
+   }
+
+   @ObfuscatedName("m")
+   @ObfuscatedSignature(
+      signature = "(II)[B",
+      garbageValue = "-294587791"
+   )
+   @Export("read")
+   public byte[] read(int entry) {
+      BufferedFile var2 = this.datFile;
+      synchronized(this.datFile) {
+         try {
+            byte[] var4;
+            Object var5;
+            byte[] var10000;
+            if (this.idxFile.length() < (long)(entry * 6 + 6)) {
+               var5 = null;
+               var4 = ((byte[])var5);
+               var10000 = var4;
+               return var10000;
+            } else {
+               this.idxFile.seek((long)(entry * 6));
+               this.idxFile.read(ArchiveDisk_buffer, 0, 6);
+               int var6 = ((ArchiveDisk_buffer[0] & 255) << 16) + (ArchiveDisk_buffer[2] & 255) + ((ArchiveDisk_buffer[1] & 255) << 8);
+               int var7 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[3] & 255) << 16) + ((ArchiveDisk_buffer[4] & 255) << 8);
+               if (var6 < 0 || var6 > this.maxEntrySize) {
+                  var5 = null;
+                  var4 = ((byte[])var5);
+                  var10000 = var4;
+                  return var10000;
+               } else if (var7 <= 0 || (long)var7 > this.datFile.length() / 520L) {
+                  var5 = null;
+                  var4 = ((byte[])var5);
+                  return var4;
+               } else {
+                  byte[] var8 = new byte[var6];
+                  int var9 = 0;
+                  int var10 = 0;
+
+                  while (var9 < var6) {
+                     if (var7 == 0) {
+                        var5 = null;
+                        var4 = ((byte[])var5);
+                        var10000 = var4;
+                        return var10000;
+                     }
+
+                     this.datFile.seek((long)(var7 * 520));
+                     int var11 = var6 - var9;
+                     if (var11 > 512) {
+                        var11 = 512;
+                     }
+
+                     this.datFile.read(ArchiveDisk_buffer, 0, var11 + 8);
+                     int var12 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8);
+                     int var13 = (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8);
+                     int var14 = ((ArchiveDisk_buffer[5] & 255) << 8) + ((ArchiveDisk_buffer[4] & 255) << 16) + (ArchiveDisk_buffer[6] & 255);
+                     int var15 = ArchiveDisk_buffer[7] & 255;
+                     if (var12 == entry && var10 == var13 && var15 == this.archive) {
+                        if (var14 >= 0 && (long)var14 <= this.datFile.length() / 520L) {
+                           for (int var16 = 0; var16 < var11; ++var16) {
+                              var8[var9++] = ArchiveDisk_buffer[var16 + 8];
+                           }
+
+                           var7 = var14;
+                           ++var10;
+                           continue;
+                        }
+
+                        var5 = null;
+                        var4 = ((byte[])var5);
+                        var10000 = var4;
+                        return var10000;
+                     }
+
+                     var5 = null;
+                     var4 = ((byte[])var5);
+                     var10000 = var4;
+                     return var10000;
+                  }
+
+                  var10000 = var8;
+                  return var10000;
+               }
+            }
+         } catch (IOException var18) {
+            return null;
+         }
+      }
+   }
+
+   @ObfuscatedName("f")
+   @ObfuscatedSignature(
+      signature = "(I[BII)Z",
+      garbageValue = "-1750864122"
+   )
+   @Export("write")
+   public boolean write(int var1, byte[] var2, int var3) {
+      BufferedFile var4 = this.datFile;
+      synchronized(this.datFile) {
+         if (var3 >= 0 && var3 <= this.maxEntrySize) {
+            boolean var6 = this.write0(var1, var2, var3, true);
+            if (!var6) {
+               var6 = this.write0(var1, var2, var3, false);
+            }
+
+            return var6;
+         } else {
+            throw new IllegalArgumentException();
+         }
+      }
+   }
+
+   @ObfuscatedName("q")
+   @ObfuscatedSignature(
+      signature = "(I[BIZI)Z",
+      garbageValue = "-944588642"
+   )
+   @Export("write0")
+   boolean write0(int var1, byte[] var2, int var3, boolean var4) {
+      BufferedFile var5 = this.datFile;
+      synchronized(this.datFile) {
+         try {
+            int var7;
+            boolean var8;
+            boolean var10000;
+            if (var4) {
+               if (this.idxFile.length() < (long)(var1 * 6 + 6)) {
+                  var8 = false;
+                  var10000 = var8;
+                  return var10000;
+               }
+
+               this.idxFile.seek((long)(var1 * 6));
+               this.idxFile.read(ArchiveDisk_buffer, 0, 6);
+               var7 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[3] & 255) << 16) + ((ArchiveDisk_buffer[4] & 255) << 8);
+               if (var7 <= 0 || (long)var7 > this.datFile.length() / 520L) {
+                  var8 = false;
+                  var10000 = var8;
+                  return var10000;
+               }
+            } else {
+               var7 = (int)((this.datFile.length() + 519L) / 520L);
+               if (var7 == 0) {
+                  var7 = 1;
+               }
+            }
+
+            ArchiveDisk_buffer[0] = (byte)(var3 >> 16);
+            ArchiveDisk_buffer[1] = (byte)(var3 >> 8);
+            ArchiveDisk_buffer[2] = (byte)var3;
+            ArchiveDisk_buffer[3] = (byte)(var7 >> 16);
+            ArchiveDisk_buffer[4] = (byte)(var7 >> 8);
+            ArchiveDisk_buffer[5] = (byte)var7;
+            this.idxFile.seek((long)(var1 * 6));
+            this.idxFile.write(ArchiveDisk_buffer, 0, 6);
+            int var10 = 0;
+            int var11 = 0;
+
+            while (true) {
+               if (var10 < var3) {
+                  label129: {
+                     int var12 = 0;
+                     int var13;
+                     if (var4) {
+                        this.datFile.seek((long)(var7 * 520));
+
+                        try {
+                           this.datFile.read(ArchiveDisk_buffer, 0, 8);
+                        } catch (EOFException var17) {
+                           break label129;
+                        }
+
+                        var13 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8);
+                        int var14 = (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8);
+                        var12 = ((ArchiveDisk_buffer[5] & 255) << 8) + ((ArchiveDisk_buffer[4] & 255) << 16) + (ArchiveDisk_buffer[6] & 255);
+                        int var15 = ArchiveDisk_buffer[7] & 255;
+                        if (var13 != var1 || var14 != var11 || var15 != this.archive) {
+                           var8 = false;
+                           var10000 = var8;
+                           return var10000;
+                        }
+
+                        if (var12 < 0 || (long)var12 > this.datFile.length() / 520L) {
+                           var8 = false;
+                           var10000 = var8;
+                           return var10000;
+                        }
+                     }
+
+                     if (var12 == 0) {
+                        var4 = false;
+                        var12 = (int)((this.datFile.length() + 519L) / 520L);
+                        if (var12 == 0) {
+                           ++var12;
+                        }
+
+                        if (var7 == var12) {
+                           ++var12;
+                        }
+                     }
+
+                     if (var3 - var10 <= 512) {
+                        var12 = 0;
+                     }
+
+                     ArchiveDisk_buffer[0] = (byte)(var1 >> 8);
+                     ArchiveDisk_buffer[1] = (byte)var1;
+                     ArchiveDisk_buffer[2] = (byte)(var11 >> 8);
+                     ArchiveDisk_buffer[3] = (byte)var11;
+                     ArchiveDisk_buffer[4] = (byte)(var12 >> 16);
+                     ArchiveDisk_buffer[5] = (byte)(var12 >> 8);
+                     ArchiveDisk_buffer[6] = (byte)var12;
+                     ArchiveDisk_buffer[7] = (byte)this.archive;
+                     this.datFile.seek((long)(var7 * 520));
+                     this.datFile.write(ArchiveDisk_buffer, 0, 8);
+                     var13 = var3 - var10;
+                     if (var13 > 512) {
+                        var13 = 512;
+                     }
+
+                     this.datFile.write(var2, var10, var13);
+                     var10 += var13;
+                     var7 = var12;
+                     ++var11;
+                     continue;
+                  }
+               }
+
+               var8 = true;
+               var10000 = var8;
+               return var10000;
+            }
+         } catch (IOException var18) {
+            return false;
+         }
+      }
+   }
+
+   @ObfuscatedName("q")
+   @ObfuscatedSignature(
+      signature = "(IIILfe;Lfy;B)Z",
+      garbageValue = "1"
+   )
+   static final boolean method3585(int var0, int var1, int var2, RouteStrategy var3, CollisionMap var4) {
+      int var5 = var0;
+      int var6 = var1;
+      byte var7 = 64;
+      byte var8 = 64;
+      int var9 = var0 - var7;
+      int var10 = var1 - var8;
+      class178.directions[var7][var8] = 99;
+      class178.distances[var7][var8] = 0;
+      byte var11 = 0;
+      int var12 = 0;
+      class178.bufferX[var11] = var0;
+      int var13 = var11 + 1;
+      class178.bufferY[var11] = var1;
+      int[][] var14 = var4.flags;
+
+      while (true) {
+         label241:
+         while (true) {
+            int var15;
+            int var16;
+            int var17;
+            int var18;
+            int var19;
+            int var20;
+            do {
+               do {
+                  do {
+                     label218:
+                     do {
+                        if (var13 == var12) {
+                           InterfaceParent.field986 = var5;
+                           UrlRequester.field929 = var6;
+                           return false;
+                        }
+
+                        var5 = class178.bufferX[var12];
+                        var6 = class178.bufferY[var12];
+                        var12 = var12 + 1 & 4095;
+                        var15 = var5 - var9;
+                        var16 = var6 - var10;
+                        var17 = var5 - var4.xInset;
+                        var18 = var6 - var4.yInset;
+                        if (var3.vmethod3644(var2, var5, var6, var4)) {
+                           InterfaceParent.field986 = var5;
+                           UrlRequester.field929 = var6;
+                           return true;
+                        }
+
+                        var19 = class178.distances[var15][var16] + 1;
+                        if (var15 > 0 && class178.directions[var15 - 1][var16] == 0 && (var14[var17 - 1][var18] & 19136782) == 0 && (var14[var17 - 1][var18 + var2 - 1] & 19136824) == 0) {
+                           var20 = 1;
+
+                           while (true) {
+                              if (var20 >= var2 - 1) {
+                                 class178.bufferX[var13] = var5 - 1;
+                                 class178.bufferY[var13] = var6;
+                                 var13 = var13 + 1 & 4095;
+                                 class178.directions[var15 - 1][var16] = 2;
+                                 class178.distances[var15 - 1][var16] = var19;
+                                 break;
+                              }
+
+                              if ((var14[var17 - 1][var20 + var18] & 19136830) != 0) {
+                                 break;
+                              }
+
+                              ++var20;
+                           }
+                        }
+
+                        if (var15 < 128 - var2 && class178.directions[var15 + 1][var16] == 0 && (var14[var17 + var2][var18] & 19136899) == 0 && (var14[var17 + var2][var18 + var2 - 1] & 19136992) == 0) {
+                           var20 = 1;
+
+                           while (true) {
+                              if (var20 >= var2 - 1) {
+                                 class178.bufferX[var13] = var5 + 1;
+                                 class178.bufferY[var13] = var6;
+                                 var13 = var13 + 1 & 4095;
+                                 class178.directions[var15 + 1][var16] = 8;
+                                 class178.distances[var15 + 1][var16] = var19;
+                                 break;
+                              }
+
+                              if ((var14[var17 + var2][var18 + var20] & 19136995) != 0) {
+                                 break;
+                              }
+
+                              ++var20;
+                           }
+                        }
+
+                        if (var16 > 0 && class178.directions[var15][var16 - 1] == 0 && (var14[var17][var18 - 1] & 19136782) == 0 && (var14[var17 + var2 - 1][var18 - 1] & 19136899) == 0) {
+                           var20 = 1;
+
+                           while (true) {
+                              if (var20 >= var2 - 1) {
+                                 class178.bufferX[var13] = var5;
+                                 class178.bufferY[var13] = var6 - 1;
+                                 var13 = var13 + 1 & 4095;
+                                 class178.directions[var15][var16 - 1] = 1;
+                                 class178.distances[var15][var16 - 1] = var19;
+                                 break;
+                              }
+
+                              if ((var14[var20 + var17][var18 - 1] & 19136911) != 0) {
+                                 break;
+                              }
+
+                              ++var20;
+                           }
+                        }
+
+                        if (var16 < 128 - var2 && class178.directions[var15][var16 + 1] == 0 && (var14[var17][var18 + var2] & 19136824) == 0 && (var14[var17 + var2 - 1][var18 + var2] & 19136992) == 0) {
+                           var20 = 1;
+
+                           while (true) {
+                              if (var20 >= var2 - 1) {
+                                 class178.bufferX[var13] = var5;
+                                 class178.bufferY[var13] = var6 + 1;
+                                 var13 = var13 + 1 & 4095;
+                                 class178.directions[var15][var16 + 1] = 4;
+                                 class178.distances[var15][var16 + 1] = var19;
+                                 break;
+                              }
+
+                              if ((var14[var20 + var17][var18 + var2] & 19137016) != 0) {
+                                 break;
+                              }
+
+                              ++var20;
+                           }
+                        }
+
+                        if (var15 > 0 && var16 > 0 && class178.directions[var15 - 1][var16 - 1] == 0 && (var14[var17 - 1][var18 - 1] & 19136782) == 0) {
+                           var20 = 1;
+
+                           while (true) {
+                              if (var20 >= var2) {
+                                 class178.bufferX[var13] = var5 - 1;
+                                 class178.bufferY[var13] = var6 - 1;
+                                 var13 = var13 + 1 & 4095;
+                                 class178.directions[var15 - 1][var16 - 1] = 3;
+                                 class178.distances[var15 - 1][var16 - 1] = var19;
+                                 break;
+                              }
+
+                              if ((var14[var17 - 1][var20 + (var18 - 1)] & 19136830) != 0 || (var14[var20 + (var17 - 1)][var18 - 1] & 19136911) != 0) {
+                                 break;
+                              }
+
+                              ++var20;
+                           }
+                        }
+
+                        if (var15 < 128 - var2 && var16 > 0 && class178.directions[var15 + 1][var16 - 1] == 0 && (var14[var17 + var2][var18 - 1] & 19136899) == 0) {
+                           var20 = 1;
+
+                           while (true) {
+                              if (var20 >= var2) {
+                                 class178.bufferX[var13] = var5 + 1;
+                                 class178.bufferY[var13] = var6 - 1;
+                                 var13 = var13 + 1 & 4095;
+                                 class178.directions[var15 + 1][var16 - 1] = 9;
+                                 class178.distances[var15 + 1][var16 - 1] = var19;
+                                 break;
+                              }
+
+                              if ((var14[var17 + var2][var20 + (var18 - 1)] & 19136995) != 0 || (var14[var20 + var17][var18 - 1] & 19136911) != 0) {
+                                 break;
+                              }
+
+                              ++var20;
+                           }
+                        }
+
+                        if (var15 > 0 && var16 < 128 - var2 && class178.directions[var15 - 1][var16 + 1] == 0 && (var14[var17 - 1][var18 + var2] & 19136824) == 0) {
+                           for (var20 = 1; var20 < var2; ++var20) {
+                              if ((var14[var17 - 1][var18 + var20] & 19136830) != 0 || (var14[var20 + (var17 - 1)][var18 + var2] & 19137016) != 0) {
+                                 continue label218;
+                              }
+                           }
+
+                           class178.bufferX[var13] = var5 - 1;
+                           class178.bufferY[var13] = var6 + 1;
+                           var13 = var13 + 1 & 4095;
+                           class178.directions[var15 - 1][var16 + 1] = 6;
+                           class178.distances[var15 - 1][var16 + 1] = var19;
+                        }
+                     } while(var15 >= 128 - var2);
+                  } while(var16 >= 128 - var2);
+               } while(class178.directions[var15 + 1][var16 + 1] != 0);
+            } while((var14[var17 + var2][var18 + var2] & 19136992) != 0);
+
+            for (var20 = 1; var20 < var2; ++var20) {
+               if ((var14[var17 + var20][var18 + var2] & 19137016) != 0 || (var14[var17 + var2][var20 + var18] & 19136995) != 0) {
+                  continue label241;
+               }
+            }
+
+            class178.bufferX[var13] = var5 + 1;
+            class178.bufferY[var13] = var6 + 1;
+            var13 = var13 + 1 & 4095;
+            class178.directions[var15 + 1][var16 + 1] = 12;
+            class178.distances[var15 + 1][var16 + 1] = var19;
+         }
+      }
+   }
+
+   static {
+      ArchiveDisk_buffer = new byte[520];
+   }
+}
diff --git a/runescape-client/src/main/java/IndexStoreAction.java b/runescape-client/src/main/java/ArchiveDiskAction.java
similarity index 55%
rename from runescape-client/src/main/java/IndexStoreAction.java
rename to runescape-client/src/main/java/ArchiveDiskAction.java
index 99aa4acd1b..ab50457c36 100644
--- a/runescape-client/src/main/java/IndexStoreAction.java
+++ b/runescape-client/src/main/java/ArchiveDiskAction.java
@@ -5,13 +5,13 @@ import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("ik")
-@Implements("IndexStoreAction")
-public class IndexStoreAction extends Node {
+@Implements("ArchiveDiskAction")
+public class ArchiveDiskAction extends Node {
    @ObfuscatedName("rt")
    @ObfuscatedGetter(
       intValue = -1086790653
    )
-   static int __ik_rt;
+   static int field410;
    @ObfuscatedName("a")
    @ObfuscatedSignature(
       signature = "[Ldy;"
@@ -22,7 +22,7 @@ public class IndexStoreAction extends Node {
    @ObfuscatedGetter(
       intValue = -1753937079
    )
-   public static int __ik_cn;
+   public static int field411;
    @ObfuscatedName("m")
    @ObfuscatedGetter(
       intValue = -1942326733
@@ -36,14 +36,14 @@ public class IndexStoreAction extends Node {
    @ObfuscatedSignature(
       signature = "Lff;"
    )
-   @Export("indexStore")
-   IndexStore indexStore;
+   @Export("archiveDisk")
+   ArchiveDisk archiveDisk;
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "Lit;"
    )
-   @Export("indexCache")
-   IndexCache indexCache;
+   @Export("archive")
+   Archive archive;
 
    @ObfuscatedName("fn")
    @ObfuscatedSignature(
@@ -51,66 +51,66 @@ public class IndexStoreAction extends Node {
       garbageValue = "483387730"
    )
    static final void method4553(Actor var0) {
-      if(var0.__cj != 0) {
-         if(var0.targetIndex != -1) {
+      if (var0.field23 != 0) {
+         if (var0.targetIndex != -1) {
             Object var1 = null;
-            if(var0.targetIndex < 32768) {
+            if (var0.targetIndex < 32768) {
                var1 = Client.npcs[var0.targetIndex];
-            } else if(var0.targetIndex >= 32768) {
+            } else if (var0.targetIndex >= 32768) {
                var1 = Client.players[var0.targetIndex - 32768];
             }
 
-            if(var1 != null) {
+            if (var1 != null) {
                int var2 = var0.x - ((Actor)var1).x;
                int var3 = var0.y - ((Actor)var1).y;
-               if(var2 != 0 || var3 != 0) {
+               if (var2 != 0 || var3 != 0) {
                   var0.orientation = (int)(Math.atan2((double)var2, (double)var3) * 325.949D) & 2047;
                }
-            } else if(var0.false0) {
+            } else if (var0.false0) {
                var0.targetIndex = -1;
                var0.false0 = false;
             }
          }
 
-         if(var0.__bc != -1 && (var0.pathLength == 0 || var0.__cq > 0)) {
-            var0.orientation = var0.__bc;
-            var0.__bc = -1;
+         if (var0.field12 != -1 && (var0.pathLength == 0 || var0.field24 > 0)) {
+            var0.orientation = var0.field12;
+            var0.field12 = -1;
          }
 
-         int var4 = var0.orientation - var0.__ac & 2047;
-         if(var4 == 0 && var0.false0) {
+         int var4 = var0.orientation - var0.field9 & 2047;
+         if (var4 == 0 && var0.false0) {
             var0.targetIndex = -1;
             var0.false0 = false;
          }
 
-         if(var4 != 0) {
-            ++var0.__cm;
-            boolean var6;
-            if(var4 > 1024) {
-               var0.__ac -= var0.__cj;
-               var6 = true;
-               if(var4 < var0.__cj || var4 > 2048 - var0.__cj) {
-                  var0.__ac = var0.orientation;
-                  var6 = false;
+         if (var4 != 0) {
+            ++var0.field22;
+            boolean var5;
+            if (var4 > 1024) {
+               var0.field9 -= var0.field23;
+               var5 = true;
+               if (var4 < var0.field23 || var4 > 2048 - var0.field23) {
+                  var0.field9 = var0.orientation;
+                  var5 = false;
                }
 
-               if(var0.movementSequence == var0.idleSequence && (var0.__cm > 25 || var6)) {
-                  if(var0.turnLeftSequence != -1) {
+               if (var0.movementSequence == var0.readySequence && (var0.field22 > 25 || var5)) {
+                  if (var0.turnLeftSequence != -1) {
                      var0.movementSequence = var0.turnLeftSequence;
                   } else {
                      var0.movementSequence = var0.walkSequence;
                   }
                }
             } else {
-               var0.__ac += var0.__cj;
-               var6 = true;
-               if(var4 < var0.__cj || var4 > 2048 - var0.__cj) {
-                  var0.__ac = var0.orientation;
-                  var6 = false;
+               var0.field9 += var0.field23;
+               var5 = true;
+               if (var4 < var0.field23 || var4 > 2048 - var0.field23) {
+                  var0.field9 = var0.orientation;
+                  var5 = false;
                }
 
-               if(var0.movementSequence == var0.idleSequence && (var0.__cm > 25 || var6)) {
-                  if(var0.turnRightSequence != -1) {
+               if (var0.movementSequence == var0.readySequence && (var0.field22 > 25 || var5)) {
+                  if (var0.turnRightSequence != -1) {
                      var0.movementSequence = var0.turnRightSequence;
                   } else {
                      var0.movementSequence = var0.walkSequence;
@@ -118,11 +118,11 @@ public class IndexStoreAction extends Node {
                }
             }
 
-            var0.__ac &= 2047;
+            var0.field9 &= 2047;
          } else {
-            var0.__cm = 0;
+            var0.field22 = 0;
          }
-
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/ArchiveDiskActionHandler.java b/runescape-client/src/main/java/ArchiveDiskActionHandler.java
new file mode 100644
index 0000000000..d9899dacb7
--- /dev/null
+++ b/runescape-client/src/main/java/ArchiveDiskActionHandler.java
@@ -0,0 +1,107 @@
+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("iv")
+@Implements("ArchiveDiskActionHandler")
+public class ArchiveDiskActionHandler implements Runnable {
+   @ObfuscatedName("m")
+   @ObfuscatedSignature(
+      signature = "Lje;"
+   )
+   @Export("ArchiveDiskActionHandler_requestQueue")
+   static NodeDeque ArchiveDiskActionHandler_requestQueue;
+   @ObfuscatedName("f")
+   @ObfuscatedSignature(
+      signature = "Lje;"
+   )
+   @Export("ArchiveDiskActionHandler_responseQueue")
+   static NodeDeque ArchiveDiskActionHandler_responseQueue;
+   @ObfuscatedName("q")
+   @ObfuscatedGetter(
+      intValue = -1282224505
+   )
+   static int field412;
+   @ObfuscatedName("w")
+   @Export("ArchiveDiskActionHandler_lock")
+   static Object ArchiveDiskActionHandler_lock;
+
+   public void run() {
+      try {
+         while (true) {
+            NodeDeque var1 = ArchiveDiskActionHandler_requestQueue;
+            ArchiveDiskAction var2;
+            synchronized(ArchiveDiskActionHandler_requestQueue) {
+               var2 = (ArchiveDiskAction)ArchiveDiskActionHandler_requestQueue.last();
+            }
+
+            Object var3;
+            if (var2 != null) {
+               if (var2.type == 0) {
+                  var2.archiveDisk.write((int)var2.key, var2.data, var2.data.length);
+                  var1 = ArchiveDiskActionHandler_requestQueue;
+                  synchronized(ArchiveDiskActionHandler_requestQueue) {
+                     var2.remove();
+                  }
+               } else if (var2.type == 1) {
+                  var2.data = var2.archiveDisk.read((int)var2.key);
+                  var1 = ArchiveDiskActionHandler_requestQueue;
+                  synchronized(ArchiveDiskActionHandler_requestQueue) {
+                     ArchiveDiskActionHandler_responseQueue.addFirst(var2);
+                  }
+               }
+
+               var3 = ArchiveDiskActionHandler_lock;
+               synchronized(ArchiveDiskActionHandler_lock) {
+                  if (field412 <= 1) {
+                     field412 = 0;
+                     ArchiveDiskActionHandler_lock.notifyAll();
+                     return;
+                  }
+
+                  field412 = 600;
+               }
+            } else {
+               class203.method4010(100L);
+               var3 = ArchiveDiskActionHandler_lock;
+               synchronized(ArchiveDiskActionHandler_lock) {
+                  if (field412 <= 1) {
+                     field412 = 0;
+                     ArchiveDiskActionHandler_lock.notifyAll();
+                     return;
+                  }
+
+                  --field412;
+               }
+            }
+         }
+      } catch (Exception var14) {
+         NPCDefinition.sendStackTrace((String)null, var14);
+      }
+   }
+
+   @ObfuscatedName("ky")
+   @ObfuscatedSignature(
+      signature = "(Ljava/lang/String;B)V",
+      garbageValue = "67"
+   )
+   @Export("clanKickUser")
+   static final void clanKickUser(String var0) {
+      if (PacketWriter.clanChat != null) {
+         PacketBufferNode var1 = Interpreter.method1915(ClientPacket.field235, Client.packetWriter.isaacCipher);
+         var1.packetBuffer.writeByte(WorldMapRegion.stringCp1252NullTerminatedByteSize(var0));
+         var1.packetBuffer.writeStringCp1252NullTerminated(var0);
+         Client.packetWriter.method241(var1);
+      }
+
+   }
+
+   static {
+      ArchiveDiskActionHandler_requestQueue = new NodeDeque();
+      ArchiveDiskActionHandler_responseQueue = new NodeDeque();
+      field412 = 0;
+      ArchiveDiskActionHandler_lock = new Object();
+   }
+}
diff --git a/runescape-client/src/main/java/ArchiveLoader.java b/runescape-client/src/main/java/ArchiveLoader.java
new file mode 100644
index 0000000000..6459f155c2
--- /dev/null
+++ b/runescape-client/src/main/java/ArchiveLoader.java
@@ -0,0 +1,712 @@
+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("bd")
+@Implements("ArchiveLoader")
+public class ArchiveLoader {
+   @ObfuscatedName("pf")
+   @ObfuscatedSignature(
+      signature = "Lko;"
+   )
+   static class310 field512;
+   @ObfuscatedName("u")
+   @ObfuscatedSignature(
+      signature = "Llq;"
+   )
+   @Export("titlebuttonSprite")
+   static IndexedSprite titlebuttonSprite;
+   @ObfuscatedName("x")
+   public static short[][] field406;
+   @ObfuscatedName("er")
+   @ObfuscatedGetter(
+      intValue = 636454135
+   )
+   static int field407;
+   @ObfuscatedName("gw")
+   @Export("regionMapArchiveIds")
+   static int[] regionMapArchiveIds;
+   @ObfuscatedName("f")
+   @ObfuscatedSignature(
+      signature = "Lit;"
+   )
+   @Export("archive")
+   final Archive archive;
+   @ObfuscatedName("q")
+   @ObfuscatedGetter(
+      intValue = 1459455501
+   )
+   @Export("groupCount")
+   final int groupCount;
+   @ObfuscatedName("w")
+   @ObfuscatedGetter(
+      intValue = 782003089
+   )
+   @Export("loadedCount")
+   int loadedCount;
+
+   @ObfuscatedSignature(
+      signature = "(Lit;Ljava/lang/String;)V"
+   )
+   ArchiveLoader(Archive archive, String name) {
+      this.loadedCount = 0;
+      this.archive = archive;
+      this.groupCount = archive.getGroupCount();
+   }
+
+   @ObfuscatedName("m")
+   @ObfuscatedSignature(
+      signature = "(I)Z",
+      garbageValue = "1352221725"
+   )
+   @Export("isLoaded")
+   boolean isLoaded() {
+      this.loadedCount = 0;
+
+      for (int var1 = 0; var1 < this.groupCount; ++var1) {
+         if (!this.archive.method133(var1) || this.archive.method132(var1)) {
+            ++this.loadedCount;
+         }
+      }
+
+      return this.loadedCount >= this.groupCount;
+   }
+
+   @ObfuscatedName("x")
+   @ObfuscatedSignature(
+      signature = "(Lkk;Lkk;Lkk;I)V",
+      garbageValue = "839403460"
+   )
+   @Export("drawTitle")
+   static void drawTitle(Font var0, Font var1, Font var2) {
+      Login.xPadding = (SoundCache.canvasWidth - 765) / 2;
+      Login.loginBoxX = Login.xPadding + 202;
+      Varps.loginBoxCenter = Login.loginBoxX + 180;
+      int var3;
+      int var4;
+      int var5;
+      byte var6;
+      int var7;
+      int var8;
+      int var9;
+      int var10;
+      boolean var11;
+      if (Login.worldSelectOpen) {
+         if (class30.worldSelectBackSprites == null) {
+            class30.worldSelectBackSprites = class2.method20(WorldMapSection1.archive8, "sl_back", "");
+         }
+
+         Archive var12;
+         int var13;
+         int var14;
+         IndexedSprite[] var15;
+         if (Frames.worldSelectFlagSprites == null) {
+            var12 = WorldMapSection1.archive8;
+            var14 = var12.getGroupId("sl_flags");
+            var13 = var12.getFileId(var14, "");
+            if (!SpriteMask.loadSprite(var12, var14, var13)) {
+               var15 = null;
+            } else {
+               var15 = WorldMapLabel.createIndexedSpriteArray();
+            }
+
+            Frames.worldSelectFlagSprites = var15;
+         }
+
+         if (AttackOption.worldSelectArrows == null) {
+            var12 = WorldMapSection1.archive8;
+            var14 = var12.getGroupId("sl_arrows");
+            var13 = var12.getFileId(var14, "");
+            if (!SpriteMask.loadSprite(var12, var14, var13)) {
+               var15 = null;
+            } else {
+               var15 = WorldMapLabel.createIndexedSpriteArray();
+            }
+
+            AttackOption.worldSelectArrows = var15;
+         }
+
+         if (UrlRequest.worldSelectStars == null) {
+            var12 = WorldMapSection1.archive8;
+            var14 = var12.getGroupId("sl_stars");
+            var13 = var12.getFileId(var14, "");
+            if (!SpriteMask.loadSprite(var12, var14, var13)) {
+               var15 = null;
+            } else {
+               var15 = WorldMapLabel.createIndexedSpriteArray();
+            }
+
+            UrlRequest.worldSelectStars = var15;
+         }
+
+         if (SecureRandomFuture.worldSelectLeftSprite == null) {
+            SecureRandomFuture.worldSelectLeftSprite = MenuAction.loadIndexedSpriteByName(WorldMapSection1.archive8, "leftarrow", "");
+         }
+
+         if (NetSocket.worldSelectRightSprite == null) {
+            NetSocket.worldSelectRightSprite = MenuAction.loadIndexedSpriteByName(WorldMapSection1.archive8, "rightarrow", "");
+         }
+
+         Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0);
+         Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding, 0, 125, 23, 0xbd9839, 0x8b6608);
+         Rasterizer2D.Rasterizer2D_fillRectangleGradient(Login.xPadding + 125, 0, 640, 23, 0x4f4f4f, 0x292929);
+         var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1);
+         if (UrlRequest.worldSelectStars != null) {
+            UrlRequest.worldSelectStars[1].drawAt(Login.xPadding + 140, 1);
+            var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1);
+            UrlRequest.worldSelectStars[0].drawAt(Login.xPadding + 140, 12);
+            var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1);
+         }
+
+         if (AttackOption.worldSelectArrows != null) {
+            var10 = Login.xPadding + 280;
+            if (World.sortOption1[0] == 0 && World.sortOption2[0] == 0) {
+               AttackOption.worldSelectArrows[2].drawAt(var10, 4);
+            } else {
+               AttackOption.worldSelectArrows[0].drawAt(var10, 4);
+            }
+
+            if (World.sortOption1[0] == 0 && World.sortOption2[0] == 1) {
+               AttackOption.worldSelectArrows[3].drawAt(var10 + 15, 4);
+            } else {
+               AttackOption.worldSelectArrows[1].drawAt(var10 + 15, 4);
+            }
+
+            var0.draw("World", var10 + 32, 17, 16777215, -1);
+            var7 = Login.xPadding + 390;
+            if (World.sortOption1[0] == 1 && World.sortOption2[0] == 0) {
+               AttackOption.worldSelectArrows[2].drawAt(var7, 4);
+            } else {
+               AttackOption.worldSelectArrows[0].drawAt(var7, 4);
+            }
+
+            if (World.sortOption1[0] == 1 && World.sortOption2[0] == 1) {
+               AttackOption.worldSelectArrows[3].drawAt(var7 + 15, 4);
+            } else {
+               AttackOption.worldSelectArrows[1].drawAt(var7 + 15, 4);
+            }
+
+            var0.draw("Players", var7 + 32, 17, 16777215, -1);
+            var14 = Login.xPadding + 500;
+            if (World.sortOption1[0] == 2 && World.sortOption2[0] == 0) {
+               AttackOption.worldSelectArrows[2].drawAt(var14, 4);
+            } else {
+               AttackOption.worldSelectArrows[0].drawAt(var14, 4);
+            }
+
+            if (World.sortOption1[0] == 2 && World.sortOption2[0] == 1) {
+               AttackOption.worldSelectArrows[3].drawAt(var14 + 15, 4);
+            } else {
+               AttackOption.worldSelectArrows[1].drawAt(var14 + 15, 4);
+            }
+
+            var0.draw("Location", var14 + 32, 17, 16777215, -1);
+            var13 = Login.xPadding + 610;
+            if (World.sortOption1[0] == 3 && World.sortOption2[0] == 0) {
+               AttackOption.worldSelectArrows[2].drawAt(var13, 4);
+            } else {
+               AttackOption.worldSelectArrows[0].drawAt(var13, 4);
+            }
+
+            if (World.sortOption1[0] == 3 && World.sortOption2[0] == 1) {
+               AttackOption.worldSelectArrows[3].drawAt(var13 + 15, 4);
+            } else {
+               AttackOption.worldSelectArrows[1].drawAt(var13 + 15, 4);
+            }
+
+            var0.draw("Type", var13 + 32, 17, 16777215, -1);
+         }
+
+         Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0);
+         var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1);
+         Login.hoveredWorldIndex = -1;
+         if (class30.worldSelectBackSprites != null) {
+            var6 = 88;
+            byte var16 = 19;
+            var14 = 765 / (var6 + 1) - 1;
+            var13 = 480 / (var16 + 1);
+
+            while (true) {
+               var8 = var13;
+               var9 = var14;
+               if (var13 * (var14 - 1) >= World.worldsCount) {
+                  --var14;
+               }
+
+               if (var14 * (var13 - 1) >= World.worldsCount) {
+                  --var13;
+               }
+
+               if (var14 * (var13 - 1) >= World.worldsCount) {
+                  --var13;
+               }
+
+               if (var13 == var8 && var14 == var9) {
+                  var8 = (765 - var6 * var14) / (var14 + 1);
+                  if (var8 > 5) {
+                     var8 = 5;
+                  }
+
+                  var9 = (480 - var16 * var13) / (var13 + 1);
+                  if (var9 > 5) {
+                     var9 = 5;
+                  }
+
+                  var3 = (765 - var14 * var6 - var8 * (var14 - 1)) / 2;
+                  int var17 = (480 - var13 * var16 - var9 * (var13 - 1)) / 2;
+                  var4 = (var13 + World.worldsCount - 1) / var13;
+                  Login.worldSelectPagesCount = var4 - var14;
+                  if (SecureRandomFuture.worldSelectLeftSprite != null && Login.worldSelectPage > 0) {
+                     SecureRandomFuture.worldSelectLeftSprite.drawAt(8, Huffman.canvasHeight / 2 - SecureRandomFuture.worldSelectLeftSprite.subHeight / 2);
+                  }
+
+                  if (NetSocket.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) {
+                     NetSocket.worldSelectRightSprite.drawAt(SoundCache.canvasWidth - NetSocket.worldSelectRightSprite.subWidth - 8, Huffman.canvasHeight / 2 - NetSocket.worldSelectRightSprite.subHeight / 2);
+                  }
+
+                  int var18 = var17 + 23;
+                  int var19 = var3 + Login.xPadding;
+                  int var20 = 0;
+                  var11 = false;
+                  int var21 = Login.worldSelectPage;
+
+                  int var22;
+                  for (var22 = var13 * var21; var22 < World.worldsCount && var21 - Login.worldSelectPage < var14; ++var22) {
+                     World var23 = ItemContainer.worlds[var22];
+                     boolean var24 = true;
+                     String var25 = Integer.toString(var23.population);
+                     if (var23.population == -1) {
+                        var25 = "OFF";
+                        var24 = false;
+                     } else if (var23.population > 1980) {
+                        var25 = "FULL";
+                        var24 = false;
+                     }
+
+                     int var26 = 0;
+                     byte var27;
+                     if (var23.isBeta()) {
+                        if (var23.isMembersOnly()) {
+                           var27 = 7;
+                        } else {
+                           var27 = 6;
+                        }
+                     } else if (var23.isDeadman()) {
+                        var26 = 16711680;
+                        if (var23.isMembersOnly()) {
+                           var27 = 5;
+                        } else {
+                           var27 = 4;
+                        }
+                     } else if (var23.isPvp()) {
+                        if (var23.isMembersOnly()) {
+                           var27 = 3;
+                        } else {
+                           var27 = 2;
+                        }
+                     } else if (var23.isMembersOnly()) {
+                        var27 = 1;
+                     } else {
+                        var27 = 0;
+                     }
+
+                     if (MouseHandler.MouseHandler_x >= var19 && MouseHandler.MouseHandler_y >= var18 && MouseHandler.MouseHandler_x < var19 + var6 && MouseHandler.MouseHandler_y < var16 + var18 && var24) {
+                        Login.hoveredWorldIndex = var22;
+                        class30.worldSelectBackSprites[var27].drawAtTransOverlay(var19, var18, 128, 16777215);
+                        var11 = true;
+                     } else {
+                        class30.worldSelectBackSprites[var27].drawAt(var19, var18);
+                     }
+
+                     if (Frames.worldSelectFlagSprites != null) {
+                        Frames.worldSelectFlagSprites[(var23.isMembersOnly() ? 8 : 0) + var23.location].drawAt(var19 + 29, var18);
+                     }
+
+                     var0.drawCentered(Integer.toString(var23.id), var19 + 15, var16 / 2 + var18 + 5, var26, -1);
+                     var1.drawCentered(var25, var19 + 60, var16 / 2 + var18 + 5, 268435455, -1);
+                     var18 = var18 + var9 + var16;
+                     ++var20;
+                     if (var20 >= var13) {
+                        var18 = var17 + 23;
+                        var19 = var19 + var6 + var8;
+                        var20 = 0;
+                        ++var21;
+                     }
+                  }
+
+                  if (var11) {
+                     var22 = var1.stringWidth(ItemContainer.worlds[Login.hoveredWorldIndex].activity) + 6;
+                     int var44 = var1.ascent + 8;
+                     var5 = MouseHandler.MouseHandler_y + 25;
+                     if (var44 + var5 > 480) {
+                        var5 = MouseHandler.MouseHandler_y - 25 - var44;
+                     }
+
+                     Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var22 / 2, var5, var22, var44, 16777120);
+                     Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var22 / 2, var5, var22, var44, 0);
+                     var1.drawCentered(ItemContainer.worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var5 + var1.ascent + 4, 0, -1);
+                  }
+                  break;
+               }
+            }
+         }
+
+         class197.rasterProvider.drawFull(0, 0);
+      } else {
+         Login.leftTitleSprite.drawAt(Login.xPadding, 0);
+         Fonts.rightTitleSprite.drawAt(Login.xPadding + 382, 0);
+         WorldMapSectionType.logoSprite.drawAt(Login.xPadding + 382 - WorldMapSectionType.logoSprite.subWidth / 2, 18);
+         if (Client.gameState == 0 || Client.gameState == 5) {
+            var6 = 20;
+            var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var6, 16777215, -1);
+            var7 = 253 - var6;
+            Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var7, 304, 34, 9179409);
+            Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var7 + 1, 302, 32, 0);
+            Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var7 + 2, Login.Login_loadingPercent * 3, 30, 9179409);
+            Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150 + Login.Login_loadingPercent * 3, var7 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0);
+            var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var6, 16777215, -1);
+         }
+
+         String var28;
+         String var29;
+         short var30;
+         String var31;
+         String var32;
+         String var33;
+         short var34;
+         if (Client.gameState == 20) {
+            Login.titleboxSprite.drawAt(Login.loginBoxX + 180 - Login.titleboxSprite.subWidth / 2, 271 - Login.titleboxSprite.subHeight / 2);
+            var30 = 201;
+            var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var30, 16776960, 0);
+            var10 = var30 + 15;
+            var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var10, 16776960, 0);
+            var10 += 15;
+            var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var10, 16776960, 0);
+            var10 += 15;
+            var10 += 7;
+            if (Login.loginIndex != 4) {
+               var0.draw("Login: ", Login.loginBoxX + 180 - 110, var10, 16777215, 0);
+               var34 = 200;
+               if (ReflectionCheck.clientPreferences.hideUsername) {
+                  var29 = Login.Login_username;
+                  var28 = class168.method3450('*', var29.length());
+                  var31 = var28;
+               } else {
+                  var31 = Login.Login_username;
+               }
+
+               for (var31 = var31; var0.stringWidth(var31) > var34; var31 = var31.substring(0, var31.length() - 1)) {
+               }
+
+               var0.draw(AbstractFont.escapeBrackets(var31), Login.loginBoxX + 180 - 70, var10, 16777215, 0);
+               var10 += 15;
+               var29 = "Password: ";
+               var32 = Login.Login_password;
+               var33 = class168.method3450('*', var32.length());
+               var0.draw(var29 + var33, Login.loginBoxX + 180 - 108, var10, 16777215, 0);
+               var10 += 15;
+            }
+         }
+
+         if (Client.gameState == 10 || Client.gameState == 11) {
+            Login.titleboxSprite.drawAt(Login.loginBoxX, 171);
+            short var35;
+            if (Login.loginIndex == 0) {
+               var30 = 251;
+               var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var30, 16776960, 0);
+               var10 = var30 + 30;
+               var7 = Login.loginBoxX + 180 - 80;
+               var35 = 291;
+               titlebuttonSprite.drawAt(var7 - 73, var35 - 20);
+               var0.drawLines("New User", var7 - 73, var35 - 20, 144, 40, 16777215, 0, 1, 1, 0);
+               var7 = Login.loginBoxX + 180 + 80;
+               titlebuttonSprite.drawAt(var7 - 73, var35 - 20);
+               var0.drawLines("Existing User", var7 - 73, var35 - 20, 144, 40, 16777215, 0, 1, 1, 0);
+            } else if (Login.loginIndex == 1) {
+               var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0);
+               var30 = 236;
+               var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var30, 16777215, 0);
+               var10 = var30 + 15;
+               var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var10, 16777215, 0);
+               var10 += 15;
+               var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var10, 16777215, 0);
+               var10 += 15;
+               var7 = Login.loginBoxX + 180 - 80;
+               var35 = 321;
+               titlebuttonSprite.drawAt(var7 - 73, var35 - 20);
+               var0.drawCentered("Continue", var7, var35 + 5, 16777215, 0);
+               var7 = Login.loginBoxX + 180 + 80;
+               titlebuttonSprite.drawAt(var7 - 73, var35 - 20);
+               var0.drawCentered("Cancel", var7, var35 + 5, 16777215, 0);
+            } else {
+               IndexedSprite var42;
+               if (Login.loginIndex == 2) {
+                  var30 = 201;
+                  var0.drawCentered(Login.Login_response1, Varps.loginBoxCenter, var30, 16776960, 0);
+                  var10 = var30 + 15;
+                  var0.drawCentered(Login.Login_response2, Varps.loginBoxCenter, var10, 16776960, 0);
+                  var10 += 15;
+                  var0.drawCentered(Login.Login_response3, Varps.loginBoxCenter, var10, 16776960, 0);
+                  var10 += 15;
+                  var10 += 7;
+                  var0.draw("Login: ", Varps.loginBoxCenter - 110, var10, 16777215, 0);
+                  var34 = 200;
+                  if (ReflectionCheck.clientPreferences.hideUsername) {
+                     var29 = Login.Login_username;
+                     var28 = class168.method3450('*', var29.length());
+                     var31 = var28;
+                  } else {
+                     var31 = Login.Login_username;
+                  }
+
+                  for (var31 = var31; var0.stringWidth(var31) > var34; var31 = var31.substring(1)) {
+                  }
+
+                  var0.draw(AbstractFont.escapeBrackets(var31) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20 ? BufferedFile.colorStartTag(16776960) + "|" : ""), Varps.loginBoxCenter - 70, var10, 16777215, 0);
+                  var10 += 15;
+                  var29 = "Password: ";
+                  var32 = Login.Login_password;
+                  var33 = class168.method3450('*', var32.length());
+                  var0.draw(var29 + var33 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20 ? BufferedFile.colorStartTag(16776960) + "|" : ""), Varps.loginBoxCenter - 108, var10, 16777215, 0);
+                  var10 += 15;
+                  var30 = 277;
+                  var4 = Varps.loginBoxCenter + -117;
+                  boolean var40 = Client.Login_isUsernameRemembered;
+                  var11 = Login.field468;
+                  var42 = var40 ? (var11 ? KeyHandler.options_buttons_6Sprite : class308.options_buttons_2Sprite) : (var11 ? GraphicsObject.options_buttons_4Sprite : Login.options_buttons_0Sprite);
+                  var42.drawAt(var4, var30);
+                  var4 = var4 + var42.subWidth + 5;
+                  var1.draw("Remember username", var4, var30 + 13, 16776960, 0);
+                  var4 = Varps.loginBoxCenter + 24;
+                  boolean var47 = ReflectionCheck.clientPreferences.hideUsername;
+                  boolean var45 = Login.field469;
+                  IndexedSprite var48 = var47 ? (var45 ? KeyHandler.options_buttons_6Sprite : class308.options_buttons_2Sprite) : (var45 ? GraphicsObject.options_buttons_4Sprite : Login.options_buttons_0Sprite);
+                  var48.drawAt(var4, var30);
+                  var4 = var4 + var48.subWidth + 5;
+                  var1.draw("Hide username", var4, var30 + 13, 16776960, 0);
+                  var10 = var30 + 15;
+                  var5 = Varps.loginBoxCenter - 80;
+                  short var49 = 321;
+                  titlebuttonSprite.drawAt(var5 - 73, var49 - 20);
+                  var0.drawCentered("Login", var5, var49 + 5, 16777215, 0);
+                  var5 = Varps.loginBoxCenter + 80;
+                  titlebuttonSprite.drawAt(var5 - 73, var49 - 20);
+                  var0.drawCentered("Cancel", var5, var49 + 5, 16777215, 0);
+                  var30 = 357;
+                  switch(Login.field467) {
+                  case 2:
+                     AttackOption.field31 = "Having trouble logging in?";
+                     break;
+                  default:
+                     AttackOption.field31 = "Can't login? Click here.";
+                  }
+
+                  TilePaint.field907 = new Bounds(Varps.loginBoxCenter, var30, var1.stringWidth(AttackOption.field31), 11);
+                  UrlRequester.field930 = new Bounds(Varps.loginBoxCenter, var30, var1.stringWidth("Still having trouble logging in?"), 11);
+                  var1.drawCentered(AttackOption.field31, Varps.loginBoxCenter, var30, 16777215, 0);
+               } else if (Login.loginIndex == 3) {
+                  var30 = 201;
+                  var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var30, 16776960, 0);
+                  var10 = var30 + 20;
+                  var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var10, 16776960, 0);
+                  var10 += 15;
+                  var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var10, 16776960, 0);
+                  var10 += 15;
+                  var7 = Login.loginBoxX + 180;
+                  var35 = 276;
+                  titlebuttonSprite.drawAt(var7 - 73, var35 - 20);
+                  var2.drawCentered("Try again", var7, var35 + 5, 16777215, 0);
+                  var7 = Login.loginBoxX + 180;
+                  var35 = 326;
+                  titlebuttonSprite.drawAt(var7 - 73, var35 - 20);
+                  var2.drawCentered("Forgotten password?", var7, var35 + 5, 16777215, 0);
+               } else {
+                  String var36;
+                  if (Login.loginIndex == 4) {
+                     var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0);
+                     var30 = 236;
+                     var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var30, 16777215, 0);
+                     var10 = var30 + 15;
+                     var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var10, 16777215, 0);
+                     var10 += 15;
+                     var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var10, 16777215, 0);
+                     var10 += 15;
+                     var36 = "PIN: ";
+                     var28 = Login.otp;
+                     var31 = class168.method3450('*', var28.length());
+                     var0.draw(var36 + var31 + (Client.cycle % 40 < 20 ? BufferedFile.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 108, var10, 16777215, 0);
+                     var10 -= 8;
+                     var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var10, 16776960, 0);
+                     var10 += 15;
+                     var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var10, 16776960, 0);
+                     var9 = Login.loginBoxX + 180 - 9 + var0.stringWidth("for 30 days: ") + 15;
+                     var3 = var10 - var0.ascent;
+                     if (Login.field470) {
+                        var42 = class308.options_buttons_2Sprite;
+                     } else {
+                        var42 = Login.options_buttons_0Sprite;
+                     }
+
+                     var42.drawAt(var9, var3);
+                     var10 += 15;
+                     var4 = Login.loginBoxX + 180 - 80;
+                     short var46 = 321;
+                     titlebuttonSprite.drawAt(var4 - 73, var46 - 20);
+                     var0.drawCentered("Continue", var4, var46 + 5, 16777215, 0);
+                     var4 = Login.loginBoxX + 180 + 80;
+                     titlebuttonSprite.drawAt(var4 - 73, var46 - 20);
+                     var0.drawCentered("Cancel", var4, var46 + 5, 16777215, 0);
+                     var1.drawCentered("<u=ff>Can't Log In?</u>", Login.loginBoxX + 180, var46 + 36, 255, 0);
+                  } else {
+                     short var37;
+                     if (Login.loginIndex != 5) {
+                        if (Login.loginIndex == 6) {
+                           var30 = 201;
+                           var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var30, 16776960, 0);
+                           var10 = var30 + 15;
+                           var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var10, 16776960, 0);
+                           var10 += 15;
+                           var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var10, 16776960, 0);
+                           var10 += 15;
+                           var7 = Login.loginBoxX + 180;
+                           var35 = 321;
+                           titlebuttonSprite.drawAt(var7 - 73, var35 - 20);
+                           var0.drawCentered("Back", var7, var35 + 5, 16777215, 0);
+                        } else if (Login.loginIndex == 7) {
+                           var30 = 216;
+                           var0.drawCentered("Your date of birth isn't set.", Login.loginBoxX + 180, var30, 16776960, 0);
+                           var10 = var30 + 15;
+                           var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var10, 16776960, 0);
+                           var10 += 15;
+                           var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var10, 16776960, 0);
+                           var10 += 15;
+                           var7 = Login.loginBoxX + 180 - 80;
+                           var35 = 321;
+                           titlebuttonSprite.drawAt(var7 - 73, var35 - 20);
+                           var0.drawCentered("Set Date of Birth", var7, var35 + 5, 16777215, 0);
+                           var7 = Login.loginBoxX + 180 + 80;
+                           titlebuttonSprite.drawAt(var7 - 73, var35 - 20);
+                           var0.drawCentered("Back", var7, var35 + 5, 16777215, 0);
+                        } else if (Login.loginIndex == 8) {
+                           var30 = 216;
+                           var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var30, 16776960, 0);
+                           var10 = var30 + 15;
+                           var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var10, 16776960, 0);
+                           var10 += 15;
+                           var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var10, 16776960, 0);
+                           var10 += 15;
+                           var7 = Login.loginBoxX + 180 - 80;
+                           var35 = 321;
+                           titlebuttonSprite.drawAt(var7 - 73, var35 - 20);
+                           var0.drawCentered("Privacy Policy", var7, var35 + 5, 16777215, 0);
+                           var7 = Login.loginBoxX + 180 + 80;
+                           titlebuttonSprite.drawAt(var7 - 73, var35 - 20);
+                           var0.drawCentered("Back", var7, var35 + 5, 16777215, 0);
+                        } else if (Login.loginIndex == 12) {
+                           var30 = 201;
+                           String var43 = "";
+                           var36 = "";
+                           var31 = "";
+                           switch(Login.field466) {
+                           case 0:
+                              var43 = "Your account has been disabled.";
+                              var36 = Strings.field880;
+                              var31 = "";
+                              break;
+                           case 1:
+                              var43 = "Account locked as we suspect it has been stolen.";
+                              var36 = Strings.field881;
+                              var31 = "";
+                              break;
+                           default:
+                              MouseHandler.method1084(false);
+                           }
+
+                           var0.drawCentered(var43, Login.loginBoxX + 180, var30, 16776960, 0);
+                           var10 = var30 + 15;
+                           var2.drawCentered(var36, Login.loginBoxX + 180, var10, 16776960, 0);
+                           var10 += 15;
+                           var2.drawCentered(var31, Login.loginBoxX + 180, var10, 16776960, 0);
+                           var10 += 15;
+                           var8 = Login.loginBoxX + 180;
+                           var37 = 276;
+                           titlebuttonSprite.drawAt(var8 - 73, var37 - 20);
+                           var0.drawCentered("Support Page", var8, var37 + 5, 16777215, 0);
+                           var8 = Login.loginBoxX + 180;
+                           var37 = 326;
+                           titlebuttonSprite.drawAt(var8 - 73, var37 - 20);
+                           var0.drawCentered("Back", var8, var37 + 5, 16777215, 0);
+                        }
+                     } else {
+                        var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0);
+                        var30 = 221;
+                        var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var30, 16776960, 0);
+                        var10 = var30 + 15;
+                        var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var10, 16776960, 0);
+                        var10 += 15;
+                        var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var10, 16776960, 0);
+                        var10 += 15;
+                        var10 += 14;
+                        var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var10, 16777215, 0);
+                        var34 = 174;
+                        if (ReflectionCheck.clientPreferences.hideUsername) {
+                           var29 = Login.Login_username;
+                           var28 = class168.method3450('*', var29.length());
+                           var31 = var28;
+                        } else {
+                           var31 = Login.Login_username;
+                        }
+
+                        for (var31 = var31; var0.stringWidth(var31) > var34; var31 = var31.substring(1)) {
+                        }
+
+                        var0.draw(AbstractFont.escapeBrackets(var31) + (Client.cycle % 40 < 20 ? BufferedFile.colorStartTag(16776960) + "|" : ""), Login.loginBoxX + 180 - 34, var10, 16777215, 0);
+                        var10 += 15;
+                        var8 = Login.loginBoxX + 180 - 80;
+                        var37 = 321;
+                        titlebuttonSprite.drawAt(var8 - 73, var37 - 20);
+                        var0.drawCentered("Recover", var8, var37 + 5, 16777215, 0);
+                        var8 = Login.loginBoxX + 180 + 80;
+                        titlebuttonSprite.drawAt(var8 - 73, var37 - 20);
+                        var0.drawCentered("Back", var8, var37 + 5, 16777215, 0);
+                        var37 = 356;
+                        var1.drawCentered("Still having trouble logging in?", Varps.loginBoxCenter, var37, 268435455, 0);
+                     }
+                  }
+               }
+            }
+         }
+
+         if (Client.gameState >= 10) {
+            int[] var38 = new int[4];
+            Rasterizer2D.Rasterizer2D_getClipArray(var38);
+            Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, Huffman.canvasHeight);
+            class16.loginScreenRunesAnimation.method1782(Login.xPadding - 22, Client.cycle);
+            class16.loginScreenRunesAnimation.method1782(Login.xPadding + 22 + 765 - 128, Client.cycle);
+            Rasterizer2D.Rasterizer2D_setClipArray(var38);
+         }
+
+         KeyHandler.title_muteSprite[ReflectionCheck.clientPreferences.titleMusicDisabled ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463);
+         if (Client.gameState > 5 && Client.language == 0) {
+            if (class277.field1144 != null) {
+               var10 = Login.xPadding + 5;
+               var34 = 463;
+               byte var39 = 100;
+               byte var41 = 35;
+               class277.field1144.drawAt(var10, var34);
+               var0.drawCentered("World " + Client.worldId, var39 / 2 + var10, var41 / 2 + var34 - 2, 16777215, 0);
+               if (FriendLoginUpdate.field356 != null) {
+                  var1.drawCentered("Loading...", var39 / 2 + var10, var41 / 2 + var34 + 12, 16777215, 0);
+               } else {
+                  var1.drawCentered("Click to switch", var39 / 2 + var10, var41 / 2 + var34 + 12, 16777215, 0);
+               }
+            } else {
+               class277.field1144 = MenuAction.loadIndexedSpriteByName(WorldMapSection1.archive8, "sl_button", "");
+            }
+         }
+      }
+
+   }
+}
diff --git a/runescape-client/src/main/java/AttackOption.java b/runescape-client/src/main/java/AttackOption.java
index 49787eda2c..207673d24a 100644
--- a/runescape-client/src/main/java/AttackOption.java
+++ b/runescape-client/src/main/java/AttackOption.java
@@ -33,10 +33,11 @@ public enum AttackOption implements Enumerated {
    )
    @Export("AttackOption_hidden")
    AttackOption_hidden(3);
+
    @ObfuscatedName("sp")
-   static short[] __cj_sp;
+   static short[] field30;
    @ObfuscatedName("ay")
-   static String __cj_ay;
+   static String field31;
    @ObfuscatedName("bo")
    @ObfuscatedSignature(
       signature = "[Llq;"
@@ -50,7 +51,7 @@ public enum AttackOption implements Enumerated {
    @Export("id")
    final int id;
 
-   AttackOption(int var3) {
+   private AttackOption(int var3) {
       this.id = var3;
    }
 
@@ -80,7 +81,7 @@ public enum AttackOption implements Enumerated {
       signature = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;II)I",
       garbageValue = "-189314181"
    )
-   public static int method2033(CharSequence var0, CharSequence var1, int var2) {
+   public static int method2033(CharSequence var0, CharSequence var1, int language) {
       int var3 = var0.length();
       int var4 = var1.length();
       int var5 = 0;
@@ -88,99 +89,99 @@ public enum AttackOption implements Enumerated {
       byte var7 = 0;
       byte var8 = 0;
 
-      while(var5 - var7 < var3 || var6 - var8 < var4) {
-         if(var5 - var7 >= var3) {
+      while (var5 - var7 < var3 || var6 - var8 < var4) {
+         if (var5 - var7 >= var3) {
             return -1;
          }
 
-         if(var6 - var8 >= var4) {
+         if (var6 - var8 >= var4) {
             return 1;
          }
 
          char var9;
-         if(var7 != 0) {
+         if (var7 != 0) {
             var9 = (char)var7;
-            boolean var14 = false;
+            boolean var10 = false;
          } else {
             var9 = var0.charAt(var5++);
          }
 
-         char var10;
-         if(var8 != 0) {
-            var10 = (char)var8;
-            boolean var15 = false;
+         char var14;
+         if (var8 != 0) {
+            var14 = (char)var8;
+            boolean var11 = false;
          } else {
-            var10 = var1.charAt(var6++);
+            var14 = var1.charAt(var6++);
          }
 
-         byte var11;
-         if(var9 == 198) {
-            var11 = 69;
-         } else if(var9 == 230) {
-            var11 = 101;
-         } else if(var9 == 223) {
-            var11 = 115;
-         } else if(var9 == 338) {
-            var11 = 69;
-         } else if(var9 == 339) {
-            var11 = 101;
+         byte var16;
+         if (var9 == 198) {
+            var16 = 69;
+         } else if (var9 == 230) {
+            var16 = 101;
+         } else if (var9 == 223) {
+            var16 = 115;
+         } else if (var9 == 338) {
+            var16 = 69;
+         } else if (var9 == 339) {
+            var16 = 101;
          } else {
-            var11 = 0;
+            var16 = 0;
          }
 
-         var7 = var11;
+         var7 = var16;
          byte var12;
-         if(var10 == 198) {
+         if (var14 == 198) {
             var12 = 69;
-         } else if(var10 == 230) {
+         } else if (var14 == 230) {
             var12 = 101;
-         } else if(var10 == 223) {
+         } else if (var14 == 223) {
             var12 = 115;
-         } else if(var10 == 338) {
+         } else if (var14 == 338) {
             var12 = 69;
-         } else if(var10 == 339) {
+         } else if (var14 == 339) {
             var12 = 101;
          } else {
             var12 = 0;
          }
 
          var8 = var12;
-         var9 = class12.method155(var9, var2);
-         var10 = class12.method155(var10, var2);
-         if(var9 != var10 && Character.toUpperCase(var9) != Character.toUpperCase(var10)) {
+         var9 = GrandExchangeOfferAgeComparator.method155(var9, language);
+         var14 = GrandExchangeOfferAgeComparator.method155(var14, language);
+         if (var9 != var14 && Character.toUpperCase(var9) != Character.toUpperCase(var14)) {
             var9 = Character.toLowerCase(var9);
-            var10 = Character.toLowerCase(var10);
-            if(var10 != var9) {
-               return CollisionMap.method3631(var9, var2) - CollisionMap.method3631(var10, var2);
+            var14 = Character.toLowerCase(var14);
+            if (var14 != var9) {
+               return CollisionMap.method3631(var9, language) - CollisionMap.method3631(var14, language);
             }
          }
       }
 
-      int var16 = Math.min(var3, var4);
+      int var15 = Math.min(var3, var4);
 
       int var17;
-      char var20;
-      for(var17 = 0; var17 < var16; ++var17) {
-         char var18 = var0.charAt(var17);
-         var20 = var1.charAt(var17);
-         if(var20 != var18 && Character.toUpperCase(var18) != Character.toUpperCase(var20)) {
+      char var18;
+      for (var17 = 0; var17 < var15; ++var17) {
+         char var19 = var0.charAt(var17);
+         var18 = var1.charAt(var17);
+         if (var18 != var19 && Character.toUpperCase(var19) != Character.toUpperCase(var18)) {
+            var19 = Character.toLowerCase(var19);
             var18 = Character.toLowerCase(var18);
-            var20 = Character.toLowerCase(var20);
-            if(var18 != var20) {
-               return CollisionMap.method3631(var18, var2) - CollisionMap.method3631(var20, var2);
+            if (var19 != var18) {
+               return CollisionMap.method3631(var19, language) - CollisionMap.method3631(var18, language);
             }
          }
       }
 
       var17 = var3 - var4;
-      if(var17 != 0) {
+      if (var17 != 0) {
          return var17;
       } else {
-         for(int var19 = 0; var19 < var16; ++var19) {
-            var20 = var0.charAt(var19);
-            char var13 = var1.charAt(var19);
-            if(var20 != var13) {
-               return CollisionMap.method3631(var20, var2) - CollisionMap.method3631(var13, var2);
+         for (int var20 = 0; var20 < var15; ++var20) {
+            var18 = var0.charAt(var20);
+            char var13 = var1.charAt(var20);
+            if (var18 != var13) {
+               return CollisionMap.method3631(var18, language) - CollisionMap.method3631(var13, language);
             }
          }
 
@@ -201,15 +202,14 @@ public enum AttackOption implements Enumerated {
          class168.randomDat.readFill(var0);
 
          int var1;
-         for(var1 = 0; var1 < 24 && var0[var1] == 0; ++var1) {
-            ;
+         for (var1 = 0; var1 < 24 && var0[var1] == 0; ++var1) {
          }
 
-         if(var1 >= 24) {
+         if (var1 >= 24) {
             throw new IOException();
          }
-      } catch (Exception var4) {
-         for(int var2 = 0; var2 < 24; ++var2) {
+      } catch (Exception var3) {
+         for (int var2 = 0; var2 < 24; ++var2) {
             var0[var2] = -1;
          }
       }
diff --git a/runescape-client/src/main/java/AudioFilter.java b/runescape-client/src/main/java/AudioFilter.java
index 4c84f460d0..c39825230b 100644
--- a/runescape-client/src/main/java/AudioFilter.java
+++ b/runescape-client/src/main/java/AudioFilter.java
@@ -1,4 +1,3 @@
-import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
@@ -7,92 +6,92 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("AudioFilter")
 public class AudioFilter {
    @ObfuscatedName("u")
-   static float[][] __di_u;
+   static float[][] field32;
    @ObfuscatedName("g")
-   static int[][] __di_g;
+   static int[][] coefficients;
    @ObfuscatedName("l")
-   static float __di_l;
+   static float field34;
    @ObfuscatedName("e")
-   static int __di_e;
+   static int forwardMultiplier;
    @ObfuscatedName("m")
-   int[] __m;
+   int[] pairs;
    @ObfuscatedName("q")
-   int[][][] __q;
+   int[][][] field37;
    @ObfuscatedName("w")
-   int[][][] __w;
+   int[][][] field38;
    @ObfuscatedName("o")
-   int[] __o;
-
-   static {
-      __di_u = new float[2][8];
-      __di_g = new int[2][8];
-   }
+   int[] field39;
 
    AudioFilter() {
-      this.__m = new int[2];
-      this.__q = new int[2][2][4];
-      this.__w = new int[2][2][4];
-      this.__o = new int[2];
+      this.pairs = new int[2];
+      this.field37 = new int[2][2][4];
+      this.field38 = new int[2][2][4];
+      this.field39 = new int[2];
    }
 
    @ObfuscatedName("m")
-   float __m_205(int var1, int var2, float var3) {
-      float var4 = (float)this.__w[var1][0][var2] + var3 * (float)(this.__w[var1][1][var2] - this.__w[var1][0][var2]);
+   float method24(int var1, int var2, float var3) {
+      float var4 = (float)this.field38[var1][0][var2] + var3 * (float)(this.field38[var1][1][var2] - this.field38[var1][0][var2]);
       var4 *= 0.0015258789F;
       return 1.0F - (float)Math.pow(10.0D, (double)(-var4 / 20.0F));
    }
 
    @ObfuscatedName("q")
-   float __q_206(int var1, int var2, float var3) {
-      float var4 = (float)this.__q[var1][0][var2] + var3 * (float)(this.__q[var1][1][var2] - this.__q[var1][0][var2]);
+   float method25(int var1, int var2, float var3) {
+      float var4 = (float)this.field37[var1][0][var2] + var3 * (float)(this.field37[var1][1][var2] - this.field37[var1][0][var2]);
       var4 *= 1.2207031E-4F;
       return method2646(var4);
    }
 
    @ObfuscatedName("w")
-   int __w_207(int var1, float var2) {
+   int compute(int var1, float var2) {
       float var3;
-      if(var1 == 0) {
-         var3 = (float)this.__o[0] + (float)(this.__o[1] - this.__o[0]) * var2;
+      if (var1 == 0) {
+         var3 = (float)this.field39[0] + (float)(this.field39[1] - this.field39[0]) * var2;
          var3 *= 0.0030517578F;
-         __di_l = (float)Math.pow(0.1D, (double)(var3 / 20.0F));
-         __di_e = (int)(__di_l * 65536.0F);
+         field34 = (float)Math.pow(0.1D, (double)(var3 / 20.0F));
+         forwardMultiplier = (int)(field34 * 65536.0F);
       }
 
-      if(this.__m[var1] == 0) {
+      if (this.pairs[var1] == 0) {
          return 0;
       } else {
-         var3 = this.__m_205(var1, 0, var2);
-         __di_u[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.__q_206(var1, 0, var2));
-         __di_u[var1][1] = var3 * var3;
+         var3 = this.method24(var1, 0, var2);
+         field32[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method25(var1, 0, var2));
+         field32[var1][1] = var3 * var3;
 
-         int var4;
-         for(var4 = 1; var4 < this.__m[var1]; ++var4) {
-            var3 = this.__m_205(var1, var4, var2);
-            float var5 = -2.0F * var3 * (float)Math.cos((double)this.__q_206(var1, var4, var2));
-            float var6 = var3 * var3;
-            __di_u[var1][var4 * 2 + 1] = __di_u[var1][var4 * 2 - 1] * var6;
-            __di_u[var1][var4 * 2] = __di_u[var1][var4 * 2 - 1] * var5 + __di_u[var1][var4 * 2 - 2] * var6;
+         float[] var4;
+         int var5;
+         for (var5 = 1; var5 < this.pairs[var1]; ++var5) {
+            var3 = this.method24(var1, var5, var2);
+            float var6 = -2.0F * var3 * (float)Math.cos((double)this.method25(var1, var5, var2));
+            float var7 = var3 * var3;
+            field32[var1][var5 * 2 + 1] = field32[var1][var5 * 2 - 1] * var7;
+            field32[var1][var5 * 2] = field32[var1][var5 * 2 - 1] * var6 + field32[var1][var5 * 2 - 2] * var7;
 
-            for(int var7 = var4 * 2 - 1; var7 >= 2; --var7) {
-               __di_u[var1][var7] += __di_u[var1][var7 - 1] * var5 + __di_u[var1][var7 - 2] * var6;
+            for (int var8 = var5 * 2 - 1; var8 >= 2; --var8) {
+               var4 = field32[var1];
+               var4[var8] += field32[var1][var8 - 1] * var6 + field32[var1][var8 - 2] * var7;
             }
 
-            __di_u[var1][1] += __di_u[var1][0] * var5 + var6;
-            __di_u[var1][0] += var5;
+            var4 = field32[var1];
+            var4[1] += field32[var1][0] * var6 + var7;
+            var4 = field32[var1];
+            var4[0] += var6;
          }
 
-         if(var1 == 0) {
-            for(var4 = 0; var4 < this.__m[0] * 2; ++var4) {
-               __di_u[0][var4] *= __di_l;
+         if (var1 == 0) {
+            for (var5 = 0; var5 < this.pairs[0] * 2; ++var5) {
+               var4 = field32[0];
+               var4[var5] *= field34;
             }
          }
 
-         for(var4 = 0; var4 < this.__m[var1] * 2; ++var4) {
-            __di_g[var1][var4] = (int)(__di_u[var1][var4] * 65536.0F);
+         for (var5 = 0; var5 < this.pairs[var1] * 2; ++var5) {
+            coefficients[var1][var5] = (int)(field32[var1][var5] * 65536.0F);
          }
 
-         return this.__m[var1] * 2;
+         return this.pairs[var1] * 2;
       }
    }
 
@@ -100,42 +99,42 @@ public class AudioFilter {
    @ObfuscatedSignature(
       signature = "(Lgr;Lde;)V"
    )
-   final void __o_208(Buffer var1, SoundEnvelope var2) {
+   final void method27(Buffer var1, SoundEnvelope var2) {
       int var3 = var1.readUnsignedByte();
-      this.__m[0] = var3 >> 4;
-      this.__m[1] = var3 & 15;
-      if(var3 != 0) {
-         this.__o[0] = var1.__ag_302();
-         this.__o[1] = var1.__ag_302();
+      this.pairs[0] = var3 >> 4;
+      this.pairs[1] = var3 & 15;
+      if (var3 != 0) {
+         this.field39[0] = var1.readUnsignedShort();
+         this.field39[1] = var1.readUnsignedShort();
          int var4 = var1.readUnsignedByte();
 
          int var5;
          int var6;
-         for(var5 = 0; var5 < 2; ++var5) {
-            for(var6 = 0; var6 < this.__m[var5]; ++var6) {
-               this.__q[var5][0][var6] = var1.__ag_302();
-               this.__w[var5][0][var6] = var1.__ag_302();
+         for (var5 = 0; var5 < 2; ++var5) {
+            for (var6 = 0; var6 < this.pairs[var5]; ++var6) {
+               this.field37[var5][0][var6] = var1.readUnsignedShort();
+               this.field38[var5][0][var6] = var1.readUnsignedShort();
             }
          }
 
-         for(var5 = 0; var5 < 2; ++var5) {
-            for(var6 = 0; var6 < this.__m[var5]; ++var6) {
-               if((var4 & 1 << var5 * 4 << var6) != 0) {
-                  this.__q[var5][1][var6] = var1.__ag_302();
-                  this.__w[var5][1][var6] = var1.__ag_302();
+         for (var5 = 0; var5 < 2; ++var5) {
+            for (var6 = 0; var6 < this.pairs[var5]; ++var6) {
+               if ((var4 & 1 << var5 * 4 << var6) != 0) {
+                  this.field37[var5][1][var6] = var1.readUnsignedShort();
+                  this.field38[var5][1][var6] = var1.readUnsignedShort();
                } else {
-                  this.__q[var5][1][var6] = this.__q[var5][0][var6];
-                  this.__w[var5][1][var6] = this.__w[var5][0][var6];
+                  this.field37[var5][1][var6] = this.field37[var5][0][var6];
+                  this.field38[var5][1][var6] = this.field38[var5][0][var6];
                }
             }
          }
 
-         if(var4 != 0 || this.__o[1] != this.__o[0]) {
+         if (var4 != 0 || this.field39[1] != this.field39[0]) {
             var2.decodeSegments(var1);
          }
       } else {
-         int[] var7 = this.__o;
-         this.__o[1] = 0;
+         int[] var7 = this.field39;
+         this.field39[1] = 0;
          var7[0] = 0;
       }
 
@@ -146,4 +145,9 @@ public class AudioFilter {
       float var1 = 32.703197F * (float)Math.pow(2.0D, (double)var0);
       return var1 * 3.1415927F / 11025.0F;
    }
+
+   static {
+      field32 = new float[2][8];
+      coefficients = new int[2][8];
+   }
 }
diff --git a/runescape-client/src/main/java/BoundaryObject.java b/runescape-client/src/main/java/BoundaryObject.java
index 8c65d3323a..f1a17d3d5b 100644
--- a/runescape-client/src/main/java/BoundaryObject.java
+++ b/runescape-client/src/main/java/BoundaryObject.java
@@ -11,7 +11,7 @@ public final class BoundaryObject {
    @ObfuscatedSignature(
       signature = "Lho;"
    )
-   static Widget __ej_jv;
+   static Widget field40;
    @ObfuscatedName("m")
    @ObfuscatedGetter(
       intValue = -9307913
@@ -79,57 +79,57 @@ public final class BoundaryObject {
    )
    @Export("doCheat")
    static final void doCheat(String var0) {
-      if(var0.equalsIgnoreCase("toggleroof")) {
+      if (var0.equalsIgnoreCase("toggleroof")) {
          ReflectionCheck.clientPreferences.roofsHidden = !ReflectionCheck.clientPreferences.roofsHidden;
-         WorldMapSection0.savePreferences();
-         if(ReflectionCheck.clientPreferences.roofsHidden) {
-            WorldMapIcon1.method219(99, "", "Roofs are now all hidden");
+         WorldMapSection3.savePreferences();
+         if (ReflectionCheck.clientPreferences.roofsHidden) {
+            WorldMapIcon1.addGameMessage(99, "", "Roofs are now all hidden");
          } else {
-            WorldMapIcon1.method219(99, "", "Roofs will only be removed selectively");
+            WorldMapIcon1.addGameMessage(99, "", "Roofs will only be removed selectively");
          }
       }
 
-      if(var0.equalsIgnoreCase("displayfps")) {
+      if (var0.equalsIgnoreCase("displayfps")) {
          Client.displayFps = !Client.displayFps;
       }
 
-      if(var0.equalsIgnoreCase("renderself")) {
+      if (var0.equalsIgnoreCase("renderself")) {
          Client.renderSelf = !Client.renderSelf;
       }
 
-      if(var0.equalsIgnoreCase("mouseovertext")) {
+      if (var0.equalsIgnoreCase("mouseovertext")) {
          Client.showMouseOverText = !Client.showMouseOverText;
       }
 
-      if(Client.rights >= 2) {
-         if(var0.equalsIgnoreCase("errortest")) {
+      if (Client.staffModLevel >= 2) {
+         if (var0.equalsIgnoreCase("errortest")) {
             throw new RuntimeException();
          }
 
-         if(var0.equalsIgnoreCase("showcoord")) {
+         if (var0.equalsIgnoreCase("showcoord")) {
             class60.worldMap0.showCoord = !class60.worldMap0.showCoord;
          }
 
-         if(var0.equalsIgnoreCase("fpson")) {
+         if (var0.equalsIgnoreCase("fpson")) {
             Client.displayFps = true;
          }
 
-         if(var0.equalsIgnoreCase("fpsoff")) {
+         if (var0.equalsIgnoreCase("fpsoff")) {
             Client.displayFps = false;
          }
 
-         if(var0.equalsIgnoreCase("gc")) {
+         if (var0.equalsIgnoreCase("gc")) {
             System.gc();
          }
 
-         if(var0.equalsIgnoreCase("clientdrop")) {
+         if (var0.equalsIgnoreCase("clientdrop")) {
             class48.method868();
          }
       }
 
-      PacketBufferNode var1 = Interpreter.method1915(ClientPacket.__gs_bo, Client.packetWriter.isaacCipher);
+      PacketBufferNode var1 = Interpreter.method1915(ClientPacket.field282, Client.packetWriter.isaacCipher);
       var1.packetBuffer.writeByte(var0.length() + 1);
       var1.packetBuffer.writeStringCp1252NullTerminated(var0);
-      Client.packetWriter.__q_167(var1);
+      Client.packetWriter.method241(var1);
    }
 }
diff --git a/runescape-client/src/main/java/Bounds.java b/runescape-client/src/main/java/Bounds.java
index 45b2743682..46652aebef 100644
--- a/runescape-client/src/main/java/Bounds.java
+++ b/runescape-client/src/main/java/Bounds.java
@@ -1,4 +1,3 @@
-import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
@@ -11,26 +10,26 @@ public class Bounds {
    @ObfuscatedGetter(
       intValue = -2004088829
    )
-   public int __m;
+   public int field41;
    @ObfuscatedName("f")
    @ObfuscatedGetter(
       intValue = -1887298731
    )
-   public int __f;
+   public int field42;
    @ObfuscatedName("q")
    @ObfuscatedGetter(
       intValue = 2001187823
    )
-   public int __q;
+   public int field43;
    @ObfuscatedName("w")
    @ObfuscatedGetter(
       intValue = 1377856837
    )
-   public int __w;
+   public int field44;
 
    public Bounds(int var1, int var2, int var3, int var4) {
-      this.__m_487(var1, var2);
-      this.__f_488(var3, var4);
+      this.method28(var1, var2);
+      this.method29(var3, var4);
    }
 
    public Bounds(int var1, int var2) {
@@ -42,9 +41,9 @@ public class Bounds {
       signature = "(IIB)V",
       garbageValue = "1"
    )
-   public void __m_487(int var1, int var2) {
-      this.__m = var1;
-      this.__f = var2;
+   public void method28(int var1, int var2) {
+      this.field41 = var1;
+      this.field42 = var2;
    }
 
    @ObfuscatedName("f")
@@ -52,9 +51,9 @@ public class Bounds {
       signature = "(III)V",
       garbageValue = "-11269827"
    )
-   public void __f_488(int var1, int var2) {
-      this.__q = var1;
-      this.__w = var2;
+   public void method29(int var1, int var2) {
+      this.field43 = var1;
+      this.field44 = var2;
    }
 
    @ObfuscatedName("q")
@@ -62,9 +61,9 @@ public class Bounds {
       signature = "(Lla;Lla;I)V",
       garbageValue = "-2123792170"
    )
-   public void __q_490(Bounds var1, Bounds var2) {
-      this.__w_491(var1, var2);
-      this.__o_492(var1, var2);
+   public void method30(Bounds var1, Bounds var2) {
+      this.method31(var1, var2);
+      this.method32(var1, var2);
    }
 
    @ObfuscatedName("w")
@@ -72,20 +71,20 @@ public class Bounds {
       signature = "(Lla;Lla;I)V",
       garbageValue = "314675149"
    )
-   void __w_491(Bounds var1, Bounds var2) {
-      var2.__m = this.__m;
-      var2.__q = this.__q;
-      if(this.__m < var1.__m) {
-         var2.__q -= var1.__m - this.__m;
-         var2.__m = var1.__m;
+   void method31(Bounds var1, Bounds var2) {
+      var2.field41 = this.field41;
+      var2.field43 = this.field43;
+      if (this.field41 < var1.field41) {
+         var2.field43 -= var1.field41 - this.field41;
+         var2.field41 = var1.field41;
       }
 
-      if(var2.__u_493() > var1.__u_493()) {
-         var2.__q -= var2.__u_493() - var1.__u_493();
+      if (var2.method33() > var1.method33()) {
+         var2.field43 -= var2.method33() - var1.method33();
       }
 
-      if(var2.__q < 0) {
-         var2.__q = 0;
+      if (var2.field43 < 0) {
+         var2.field43 = 0;
       }
 
    }
@@ -95,20 +94,20 @@ public class Bounds {
       signature = "(Lla;Lla;S)V",
       garbageValue = "128"
    )
-   void __o_492(Bounds var1, Bounds var2) {
-      var2.__f = this.__f;
-      var2.__w = this.__w;
-      if(this.__f < var1.__f) {
-         var2.__w -= var1.__f - this.__f;
-         var2.__f = var1.__f;
+   void method32(Bounds var1, Bounds var2) {
+      var2.field42 = this.field42;
+      var2.field44 = this.field44;
+      if (this.field42 < var1.field42) {
+         var2.field44 -= var1.field42 - this.field42;
+         var2.field42 = var1.field42;
       }
 
-      if(var2.__g_494() > var1.__g_494()) {
-         var2.__w -= var2.__g_494() - var1.__g_494();
+      if (var2.method34() > var1.method34()) {
+         var2.field44 -= var2.method34() - var1.method34();
       }
 
-      if(var2.__w < 0) {
-         var2.__w = 0;
+      if (var2.field44 < 0) {
+         var2.field44 = 0;
       }
 
    }
@@ -118,8 +117,8 @@ public class Bounds {
       signature = "(I)I",
       garbageValue = "-1842151293"
    )
-   int __u_493() {
-      return this.__m + this.__q;
+   int method33() {
+      return this.field41 + this.field43;
    }
 
    @ObfuscatedName("g")
@@ -127,12 +126,11 @@ public class Bounds {
       signature = "(B)I",
       garbageValue = "-22"
    )
-   int __g_494() {
-      return this.__f + this.__w;
+   int method34() {
+      return this.field42 + this.field44;
    }
 
-   @ObfuscatedName("toString")
-   public String __toString_489() {
+   public String toString() {
       return null;
    }
 
@@ -146,11 +144,11 @@ public class Bounds {
       double[] var6 = new double[var5];
       int var7 = -var4;
 
-      for(int var8 = 0; var7 <= var4; ++var8) {
-         double var15 = ((double)var7 - var0) / var2;
-         double var13 = Math.exp(-var15 * var15 / 2.0D) / Math.sqrt(6.283185307179586D);
-         double var11 = var13 / var2;
-         var6[var8] = var11;
+      for (int var8 = 0; var7 <= var4; ++var8) {
+         double var9 = ((double)var7 - var0) / var2;
+         double var11 = Math.exp(-var9 * var9 / 2.0D) / Math.sqrt(6.283185307179586D);
+         double var13 = var11 / var2;
+         var6[var8] = var13;
          ++var7;
       }
 
diff --git a/runescape-client/src/main/java/Buddy.java b/runescape-client/src/main/java/Buddy.java
index 42a54d7e6b..a45ba272a1 100644
--- a/runescape-client/src/main/java/Buddy.java
+++ b/runescape-client/src/main/java/Buddy.java
@@ -11,8 +11,8 @@ public class Buddy extends User {
    @ObfuscatedGetter(
       intValue = 429472919
    )
-   @Export("world0")
-   public int world0;
+   @Export("world")
+   public int world;
    @ObfuscatedName("u")
    @ObfuscatedGetter(
       intValue = 120689297
@@ -27,7 +27,7 @@ public class Buddy extends User {
    public int rank;
 
    Buddy() {
-      this.world0 = -1;
+      this.world = -1;
    }
 
    @ObfuscatedName("an")
@@ -37,7 +37,7 @@ public class Buddy extends User {
    )
    @Export("set")
    void set(int var1, int var2) {
-      this.world0 = var1;
+      this.world = var1;
       this.int2 = var2;
    }
 
@@ -46,9 +46,9 @@ public class Buddy extends User {
       signature = "(B)I",
       garbageValue = "0"
    )
-   @Export("world")
-   public int world() {
-      return this.world0;
+   @Export("getWorld")
+   public int getWorld() {
+      return this.world;
    }
 
    @ObfuscatedName("au")
@@ -58,7 +58,7 @@ public class Buddy extends User {
    )
    @Export("hasWorld")
    public boolean hasWorld() {
-      return this.world0 > 0;
+      return this.world > 0;
    }
 
    @ObfuscatedName("ff")
@@ -71,22 +71,22 @@ public class Buddy extends User {
       int[] var0 = Players.Players_indices;
 
       int var1;
-      for(var1 = 0; var1 < Players.Players_count; ++var1) {
+      for (var1 = 0; var1 < Players.Players_count; ++var1) {
          Player var2 = Client.players[var0[var1]];
-         if(var2 != null && var2.overheadTextCyclesRemaining > 0) {
+         if (var2 != null && var2.overheadTextCyclesRemaining > 0) {
             --var2.overheadTextCyclesRemaining;
-            if(var2.overheadTextCyclesRemaining == 0) {
+            if (var2.overheadTextCyclesRemaining == 0) {
                var2.overheadText = null;
             }
          }
       }
 
-      for(var1 = 0; var1 < Client.npcCount; ++var1) {
+      for (var1 = 0; var1 < Client.npcCount; ++var1) {
          int var4 = Client.npcIndices[var1];
-         Npc var3 = Client.npcs[var4];
-         if(var3 != null && var3.overheadTextCyclesRemaining > 0) {
+         NPC var3 = Client.npcs[var4];
+         if (var3 != null && var3.overheadTextCyclesRemaining > 0) {
             --var3.overheadTextCyclesRemaining;
-            if(var3.overheadTextCyclesRemaining == 0) {
+            if (var3.overheadTextCyclesRemaining == 0) {
                var3.overheadText = null;
             }
          }
diff --git a/runescape-client/src/main/java/class157.java b/runescape-client/src/main/java/BuddyRankComparator.java
similarity index 56%
rename from runescape-client/src/main/java/class157.java
rename to runescape-client/src/main/java/BuddyRankComparator.java
index 4f2d436c49..23c76bfbd4 100644
--- a/runescape-client/src/main/java/class157.java
+++ b/runescape-client/src/main/java/BuddyRankComparator.java
@@ -1,20 +1,23 @@
 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("fw")
-public class class157 extends AbstractUserComparator {
+@Implements("BuddyRankComparator")
+public class BuddyRankComparator extends AbstractUserComparator {
    @ObfuscatedName("nm")
    @ObfuscatedGetter(
       intValue = 1006519291
    )
-   static int __fw_nm;
+   static int field1114;
    @ObfuscatedName("m")
-   final boolean field1969;
+   @Export("reversed")
+   final boolean reversed;
 
-   public class157(boolean var1) {
-      this.field1969 = var1;
+   public BuddyRankComparator(boolean var1) {
+      this.reversed = var1;
    }
 
    @ObfuscatedName("m")
@@ -22,12 +25,13 @@ public class class157 extends AbstractUserComparator {
       signature = "(Lke;Lke;I)I",
       garbageValue = "884616259"
    )
-   int method3381(Buddy var1, Buddy var2) {
-      return var2.rank != var1.rank?(this.field1969?var1.rank - var2.rank:var2.rank - var1.rank):this.__x_461(var1, var2);
+   @Export("compareBuddy")
+   int compareBuddy(Buddy var1, Buddy var2) {
+      return var2.rank != var1.rank ? (this.reversed ? var1.rank - var2.rank : var2.rank - var1.rank) : this.compareUser(var1, var2);
    }
 
    public int compare(Object var1, Object var2) {
-      return this.method3381((Buddy)var1, (Buddy)var2);
+      return this.compareBuddy((Buddy)var1, (Buddy)var2);
    }
 
    @ObfuscatedName("s")
@@ -39,6 +43,6 @@ public class class157 extends AbstractUserComparator {
       Widget.widgetSpriteCache.clear();
       Widget.Widget_cachedModels.clear();
       Widget.Widget_cachedFonts.clear();
-      Widget.__ho_z.clear();
+      Widget.field956.clear();
    }
 }
diff --git a/runescape-client/src/main/java/Buffer.java b/runescape-client/src/main/java/Buffer.java
index c711dc32c1..ec0ccb5661 100644
--- a/runescape-client/src/main/java/Buffer.java
+++ b/runescape-client/src/main/java/Buffer.java
@@ -9,9 +9,11 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("Buffer")
 public class Buffer extends Node {
    @ObfuscatedName("q")
-   static int[] __gr_q;
+   @Export("crc32Table")
+   static int[] crc32Table;
    @ObfuscatedName("o")
-   static long[] __gr_o;
+   @Export("crc64Table")
+   static long[] crc64Table;
    @ObfuscatedName("m")
    @Export("array")
    public byte[] array;
@@ -22,42 +24,6 @@ public class Buffer extends Node {
    @Export("index")
    public int index;
 
-   static {
-      __gr_q = new int[256];
-
-      int var2;
-      for(int var1 = 0; var1 < 256; ++var1) {
-         int var0 = var1;
-
-         for(var2 = 0; var2 < 8; ++var2) {
-            if((var0 & 1) == 1) {
-               var0 = var0 >>> 1 ^ -306674912;
-            } else {
-               var0 >>>= 1;
-            }
-         }
-
-         __gr_q[var1] = var0;
-      }
-
-      __gr_o = new long[256];
-
-      for(var2 = 0; var2 < 256; ++var2) {
-         long var4 = (long)var2;
-
-         for(int var3 = 0; var3 < 8; ++var3) {
-            if((var4 & 1L) == 1L) {
-               var4 = var4 >>> 1 ^ -3932672073523589310L;
-            } else {
-               var4 >>>= 1;
-            }
-         }
-
-         __gr_o[var2] = var4;
-      }
-
-   }
-
    public Buffer(int var1) {
       this.array = Canvas.method862(var1);
       this.index = 0;
@@ -73,8 +39,8 @@ public class Buffer extends Node {
       signature = "(S)V",
       garbageValue = "13572"
    )
-   public void __f_295() {
-      if(this.array != null) {
+   public void method36() {
+      if (this.array != null) {
          VertexNormal.method2984(this.array);
       }
 
@@ -87,8 +53,8 @@ public class Buffer extends Node {
       garbageValue = "-654332799"
    )
    @Export("writeByte")
-   public void writeByte(int var1) {
-      this.array[++this.index - 1] = (byte)var1;
+   public void writeByte(int value) {
+      this.array[++this.index - 1] = (byte)value;
    }
 
    @ObfuscatedName("w")
@@ -97,9 +63,9 @@ public class Buffer extends Node {
       garbageValue = "0"
    )
    @Export("writeShort")
-   public void writeShort(int var1) {
-      this.array[++this.index - 1] = (byte)(var1 >> 8);
-      this.array[++this.index - 1] = (byte)var1;
+   public void writeShort(int value) {
+      this.array[++this.index - 1] = (byte)(value >> 8);
+      this.array[++this.index - 1] = (byte)value;
    }
 
    @ObfuscatedName("o")
@@ -108,10 +74,10 @@ public class Buffer extends Node {
       garbageValue = "-26"
    )
    @Export("writeMedium")
-   public void writeMedium(int var1) {
-      this.array[++this.index - 1] = (byte)(var1 >> 16);
-      this.array[++this.index - 1] = (byte)(var1 >> 8);
-      this.array[++this.index - 1] = (byte)var1;
+   public void writeMedium(int value) {
+      this.array[++this.index - 1] = (byte)(value >> 16);
+      this.array[++this.index - 1] = (byte)(value >> 8);
+      this.array[++this.index - 1] = (byte)value;
    }
 
    @ObfuscatedName("u")
@@ -120,11 +86,11 @@ public class Buffer extends Node {
       garbageValue = "-106996411"
    )
    @Export("writeInt")
-   public void writeInt(int var1) {
-      this.array[++this.index - 1] = (byte)(var1 >> 24);
-      this.array[++this.index - 1] = (byte)(var1 >> 16);
-      this.array[++this.index - 1] = (byte)(var1 >> 8);
-      this.array[++this.index - 1] = (byte)var1;
+   public void writeInt(int value) {
+      this.array[++this.index - 1] = (byte)(value >> 24);
+      this.array[++this.index - 1] = (byte)(value >> 16);
+      this.array[++this.index - 1] = (byte)(value >> 8);
+      this.array[++this.index - 1] = (byte)value;
    }
 
    @ObfuscatedName("g")
@@ -157,8 +123,8 @@ public class Buffer extends Node {
       garbageValue = "-125"
    )
    @Export("writeBoolean")
-   public void writeBoolean(boolean var1) {
-      this.writeByte(var1?1:0);
+   public void writeBoolean(boolean value) {
+      this.writeByte(value ? 1 : 0);
    }
 
    @ObfuscatedName("d")
@@ -167,12 +133,12 @@ public class Buffer extends Node {
       garbageValue = "-9"
    )
    @Export("writeStringCp1252NullTerminated")
-   public void writeStringCp1252NullTerminated(String var1) {
-      int var2 = var1.indexOf(0);
-      if(var2 >= 0) {
+   public void writeStringCp1252NullTerminated(String string) {
+      int var2 = string.indexOf(0);
+      if (var2 >= 0) {
          throw new IllegalArgumentException("");
       } else {
-         this.index += SoundCache.encodeStringCp1252(var1, 0, var1.length(), this.array, this.index);
+         this.index += SoundCache.encodeStringCp1252(string, 0, string.length(), this.array, this.index);
          this.array[++this.index - 1] = 0;
       }
    }
@@ -183,13 +149,13 @@ public class Buffer extends Node {
       garbageValue = "22356"
    )
    @Export("writeStringCp1252NullCircumfixed")
-   public void writeStringCp1252NullCircumfixed(String var1) {
-      int var2 = var1.indexOf(0);
-      if(var2 >= 0) {
+   public void writeStringCp1252NullCircumfixed(String string) {
+      int var2 = string.indexOf(0);
+      if (var2 >= 0) {
          throw new IllegalArgumentException("");
       } else {
          this.array[++this.index - 1] = 0;
-         this.index += SoundCache.encodeStringCp1252(var1, 0, var1.length(), this.array, this.index);
+         this.index += SoundCache.encodeStringCp1252(string, 0, string.length(), this.array, this.index);
          this.array[++this.index - 1] = 0;
       }
    }
@@ -199,23 +165,24 @@ public class Buffer extends Node {
       signature = "(Ljava/lang/CharSequence;B)V",
       garbageValue = "58"
    )
-   public void __j_296(CharSequence var1) {
-      int var3 = var1.length();
-      int var4 = 0;
+   @Export("writeCESU8")
+   public void writeCESU8(CharSequence var1) {
+      int var2 = var1.length();
+      int var3 = 0;
 
-      for(int var5 = 0; var5 < var3; ++var5) {
-         char var6 = var1.charAt(var5);
-         if(var6 <= 127) {
-            ++var4;
-         } else if(var6 <= 2047) {
-            var4 += 2;
+      for (int var4 = 0; var4 < var2; ++var4) {
+         char var5 = var1.charAt(var4);
+         if (var5 <= 127) {
+            ++var3;
+         } else if (var5 <= 2047) {
+            var3 += 2;
          } else {
-            var4 += 3;
+            var3 += 3;
          }
       }
 
       this.array[++this.index - 1] = 0;
-      this.__c_301(var4);
+      this.writeVarInt(var3);
       this.index += class16.method190(this.array, this.index, var1);
    }
 
@@ -224,9 +191,10 @@ public class Buffer extends Node {
       signature = "([BIII)V",
       garbageValue = "-1915344405"
    )
-   public void __s_297(byte[] var1, int var2, int var3) {
-      for(int var4 = var2; var4 < var3 + var2; ++var4) {
-         this.array[++this.index - 1] = var1[var4];
+   @Export("writeBytes")
+   public void writeBytes(byte[] bytes, int startIdx, int endIdx) {
+      for (int var4 = startIdx; var4 < endIdx + startIdx; ++var4) {
+         this.array[++this.index - 1] = bytes[var4];
       }
 
    }
@@ -236,7 +204,8 @@ public class Buffer extends Node {
       signature = "(II)V",
       garbageValue = "-225163682"
    )
-   public void __t_298(int var1) {
+   @Export("writeLengthInt")
+   public void writeLengthInt(int var1) {
       this.array[this.index - var1 - 4] = (byte)(var1 >> 24);
       this.array[this.index - var1 - 3] = (byte)(var1 >> 16);
       this.array[this.index - var1 - 2] = (byte)(var1 >> 8);
@@ -248,7 +217,8 @@ public class Buffer extends Node {
       signature = "(II)V",
       garbageValue = "-1298210761"
    )
-   public void __y_299(int var1) {
+   @Export("writeLengthShort")
+   public void writeLengthShort(int var1) {
       this.array[this.index - var1 - 2] = (byte)(var1 >> 8);
       this.array[this.index - var1 - 1] = (byte)var1;
    }
@@ -258,7 +228,8 @@ public class Buffer extends Node {
       signature = "(II)V",
       garbageValue = "-1839722163"
    )
-   public void __h_300(int var1) {
+   @Export("writeLengthByte")
+   public void writeLengthByte(int var1) {
       this.array[this.index - var1 - 1] = (byte)var1;
    }
 
@@ -268,14 +239,17 @@ public class Buffer extends Node {
       garbageValue = "1324532803"
    )
    @Export("writeSmartByteShort")
-   public void writeSmartByteShort(int var1) {
-      if(var1 >= 0 && var1 < 128) {
-         this.writeByte(var1);
-      } else if(var1 >= 0 && var1 < 32768) {
-         this.writeShort(var1 + 32768);
+   public void writeSmartByteShort(int value) {
+      if (value >= 0 && value < 128) {
+         this.writeByte(value);
       } else {
-         throw new IllegalArgumentException();
+         if (value < 0 || value >= 32768) {
+            throw new IllegalArgumentException();
+         }
+
+         this.writeShort(value + 32768);
       }
+
    }
 
    @ObfuscatedName("c")
@@ -283,11 +257,12 @@ public class Buffer extends Node {
       signature = "(II)V",
       garbageValue = "820873705"
    )
-   public void __c_301(int var1) {
-      if((var1 & -128) != 0) {
-         if((var1 & -16384) != 0) {
-            if((var1 & -2097152) != 0) {
-               if((var1 & -268435456) != 0) {
+   @Export("writeVarInt")
+   public void writeVarInt(int var1) {
+      if ((var1 & -128) != 0) {
+         if ((var1 & -16384) != 0) {
+            if ((var1 & -2097152) != 0) {
+               if ((var1 & -268435456) != 0) {
                   this.writeByte(var1 >>> 28 | 128);
                }
 
@@ -328,7 +303,8 @@ public class Buffer extends Node {
       signature = "(B)I",
       garbageValue = "-86"
    )
-   public int __ag_302() {
+   @Export("readUnsignedShort")
+   public int readUnsignedShort() {
       this.index += 2;
       return (this.array[this.index - 1] & 255) + ((this.array[this.index - 2] & 255) << 8);
    }
@@ -338,10 +314,11 @@ public class Buffer extends Node {
       signature = "(B)I",
       garbageValue = "1"
    )
-   public int __aq_303() {
+   @Export("readShort")
+   public int readShort() {
       this.index += 2;
       int var1 = (this.array[this.index - 1] & 255) + ((this.array[this.index - 2] & 255) << 8);
-      if(var1 > 32767) {
+      if (var1 > 32767) {
          var1 -= 65536;
       }
 
@@ -399,7 +376,7 @@ public class Buffer extends Node {
    )
    @Export("readStringCp1252NullTerminatedOrNull")
    public String readStringCp1252NullTerminatedOrNull() {
-      if(this.array[this.index] == 0) {
+      if (this.array[this.index] == 0) {
          ++this.index;
          return null;
       } else {
@@ -416,12 +393,11 @@ public class Buffer extends Node {
    public String readStringCp1252NullTerminated() {
       int var1 = this.index;
 
-      while(this.array[++this.index - 1] != 0) {
-         ;
+      while (this.array[++this.index - 1] != 0) {
       }
 
       int var2 = this.index - var1 - 1;
-      return var2 == 0?"":WidgetGroupParent.decodeStringCp1252(this.array, var1, var2);
+      return var2 == 0 ? "" : InterfaceParent.decodeStringCp1252(this.array, var1, var2);
    }
 
    @ObfuscatedName("ak")
@@ -432,17 +408,16 @@ public class Buffer extends Node {
    @Export("readStringCp1252NullCircumfixed")
    public String readStringCp1252NullCircumfixed() {
       byte var1 = this.array[++this.index - 1];
-      if(var1 != 0) {
+      if (var1 != 0) {
          throw new IllegalStateException("");
       } else {
          int var2 = this.index;
 
-         while(this.array[++this.index - 1] != 0) {
-            ;
+         while (this.array[++this.index - 1] != 0) {
          }
 
          int var3 = this.index - var2 - 1;
-         return var3 == 0?"":WidgetGroupParent.decodeStringCp1252(this.array, var2, var3);
+         return var3 == 0 ? "" : InterfaceParent.decodeStringCp1252(this.array, var2, var3);
       }
    }
 
@@ -451,69 +426,70 @@ public class Buffer extends Node {
       signature = "(B)Ljava/lang/String;",
       garbageValue = "-14"
    )
-   public String __aw_304() {
+   @Export("readCESU8")
+   public String readCESU8() {
       byte var1 = this.array[++this.index - 1];
-      if(var1 != 0) {
+      if (var1 != 0) {
          throw new IllegalStateException("");
       } else {
-         int var2 = this.__as_311();
-         if(var2 + this.index > this.array.length) {
+         int var2 = this.readVarInt();
+         if (var2 + this.index > this.array.length) {
             throw new IllegalStateException("");
          } else {
-            byte[] var4 = this.array;
-            int var5 = this.index;
-            char[] var6 = new char[var2];
-            int var7 = 0;
-            int var8 = var5;
+            byte[] var3 = this.array;
+            int var4 = this.index;
+            char[] var5 = new char[var2];
+            int var6 = 0;
+            int var7 = var4;
 
-            int var11;
-            for(int var9 = var5 + var2; var8 < var9; var6[var7++] = (char)var11) {
-               int var10 = var4[var8++] & 255;
-               if(var10 < 128) {
-                  if(var10 == 0) {
-                     var11 = 65533;
+            int var8;
+            for (int var9 = var4 + var2; var7 < var9; var5[var6++] = (char)var8) {
+               int var10 = var3[var7++] & 255;
+               if (var10 < 128) {
+                  if (var10 == 0) {
+                     var8 = 65533;
                   } else {
-                     var11 = var10;
+                     var8 = var10;
                   }
-               } else if(var10 < 192) {
-                  var11 = 65533;
-               } else if(var10 < 224) {
-                  if(var8 < var9 && (var4[var8] & 192) == 128) {
-                     var11 = (var10 & 31) << 6 | var4[var8++] & 63;
-                     if(var11 < 128) {
-                        var11 = 65533;
+               } else if (var10 < 192) {
+                  var8 = 65533;
+               } else if (var10 < 224) {
+                  if (var7 < var9 && (var3[var7] & 192) == 128) {
+                     var8 = (var10 & 31) << 6 | var3[var7++] & 63;
+                     if (var8 < 128) {
+                        var8 = 65533;
                      }
                   } else {
-                     var11 = 65533;
+                     var8 = 65533;
                   }
-               } else if(var10 < 240) {
-                  if(var8 + 1 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128) {
-                     var11 = (var10 & 15) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63;
-                     if(var11 < 2048) {
-                        var11 = 65533;
+               } else if (var10 < 240) {
+                  if (var7 + 1 < var9 && (var3[var7] & 192) == 128 && (var3[var7 + 1] & 192) == 128) {
+                     var8 = (var10 & 15) << 12 | (var3[var7++] & 63) << 6 | var3[var7++] & 63;
+                     if (var8 < 2048) {
+                        var8 = 65533;
                      }
                   } else {
-                     var11 = 65533;
+                     var8 = 65533;
                   }
-               } else if(var10 < 248) {
-                  if(var8 + 2 < var9 && (var4[var8] & 192) == 128 && (var4[var8 + 1] & 192) == 128 && (var4[var8 + 2] & 192) == 128) {
-                     var11 = (var10 & 7) << 18 | (var4[var8++] & 63) << 12 | (var4[var8++] & 63) << 6 | var4[var8++] & 63;
-                     if(var11 >= 65536 && var11 <= 1114111) {
-                        var11 = 65533;
+               } else if (var10 < 248) {
+                  if (var7 + 2 < var9 && (var3[var7] & 192) == 128 && (var3[var7 + 1] & 192) == 128 && (var3[var7 + 2] & 192) == 128) {
+                     var8 = (var10 & 7) << 18 | (var3[var7++] & 63) << 12 | (var3[var7++] & 63) << 6 | var3[var7++] & 63;
+                     if (var8 >= 65536 && var8 <= 1114111) {
+                        var8 = 65533;
                      } else {
-                        var11 = 65533;
+                        var8 = 65533;
                      }
                   } else {
-                     var11 = 65533;
+                     var8 = 65533;
                   }
                } else {
-                  var11 = 65533;
+                  var8 = 65533;
                }
             }
 
-            String var3 = new String(var6, 0, var7);
+            String var11 = new String(var5, 0, var6);
             this.index += var2;
-            return var3;
+            return var11;
          }
       }
    }
@@ -523,8 +499,9 @@ public class Buffer extends Node {
       signature = "([BIIB)V",
       garbageValue = "-122"
    )
-   public void __al_305(byte[] var1, int var2, int var3) {
-      for(int var4 = var2; var4 < var3 + var2; ++var4) {
+   @Export("readBytes")
+   public void readBytes(byte[] var1, int var2, int var3) {
+      for (int var4 = var2; var4 < var3 + var2; ++var4) {
          var1[var4] = this.array[++this.index - 1];
       }
 
@@ -535,9 +512,10 @@ public class Buffer extends Node {
       signature = "(B)I",
       garbageValue = "-24"
    )
-   public int __ab_306() {
+   @Export("readShortSmart")
+   public int readShortSmart() {
       int var1 = this.array[this.index] & 255;
-      return var1 < 128?this.readUnsignedByte() - 64:this.__ag_302() - 49152;
+      return var1 < 128 ? this.readUnsignedByte() - 64 : this.readUnsignedShort() - 49152;
    }
 
    @ObfuscatedName("ae")
@@ -545,9 +523,10 @@ public class Buffer extends Node {
       signature = "(I)I",
       garbageValue = "1370512869"
    )
-   public int __ae_307() {
+   @Export("readUShortSmart")
+   public int readUShortSmart() {
       int var1 = this.array[this.index] & 255;
-      return var1 < 128?this.readUnsignedByte():this.__ag_302() - 32768;
+      return var1 < 128 ? this.readUnsignedByte() : this.readUnsignedShort() - 32768;
    }
 
    @ObfuscatedName("at")
@@ -555,11 +534,11 @@ public class Buffer extends Node {
       signature = "(I)I",
       garbageValue = "1177684230"
    )
-   public int __at_308() {
+   public int method49() {
       int var1 = 0;
 
       int var2;
-      for(var2 = this.__ae_307(); var2 == 32767; var2 = this.__ae_307()) {
+      for (var2 = this.readUShortSmart(); var2 == 32767; var2 = this.readUShortSmart()) {
          var1 += 32767;
       }
 
@@ -572,8 +551,8 @@ public class Buffer extends Node {
       signature = "(B)I",
       garbageValue = "103"
    )
-   public int __ad_309() {
-      return this.array[this.index] < 0?this.readInt() & Integer.MAX_VALUE:this.__ag_302();
+   public int method50() {
+      return this.array[this.index] < 0 ? this.readInt() & Integer.MAX_VALUE : this.readUnsignedShort();
    }
 
    @ObfuscatedName("ap")
@@ -581,12 +560,12 @@ public class Buffer extends Node {
       signature = "(I)I",
       garbageValue = "-1151173205"
    )
-   public int __ap_310() {
-      if(this.array[this.index] < 0) {
+   public int method51() {
+      if (this.array[this.index] < 0) {
          return this.readInt() & Integer.MAX_VALUE;
       } else {
-         int var1 = this.__ag_302();
-         return var1 == 32767?-1:var1;
+         int var1 = this.readUnsignedShort();
+         return var1 == 32767 ? -1 : var1;
       }
    }
 
@@ -595,11 +574,12 @@ public class Buffer extends Node {
       signature = "(I)I",
       garbageValue = "984135559"
    )
-   public int __as_311() {
+   @Export("readVarInt")
+   public int readVarInt() {
       byte var1 = this.array[++this.index - 1];
 
       int var2;
-      for(var2 = 0; var1 < 0; var1 = this.array[++this.index - 1]) {
+      for (var2 = 0; var1 < 0; var1 = this.array[++this.index - 1]) {
          var2 = (var2 | var1 & 127) << 7;
       }
 
@@ -612,18 +592,18 @@ public class Buffer extends Node {
       garbageValue = "36"
    )
    @Export("xteaEncryptAll")
-   public void xteaEncryptAll(int[] var1) {
+   public void xteaEncryptAll(int[] xteaKey) {
       int var2 = this.index / 8;
       this.index = 0;
 
-      for(int var3 = 0; var3 < var2; ++var3) {
+      for (int var3 = 0; var3 < var2; ++var3) {
          int var4 = this.readInt();
          int var5 = this.readInt();
          int var6 = 0;
          int var7 = -1640531527;
 
-         for(int var8 = 32; var8-- > 0; var5 += var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6) {
-            var4 += var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3];
+         for (int var8 = 32; var8-- > 0; var5 += var4 + (var4 << 4 ^ var4 >>> 5) ^ xteaKey[var6 >>> 11 & 3] + var6) {
+            var4 += var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + xteaKey[var6 & 3];
             var6 += var7;
          }
 
@@ -640,18 +620,18 @@ public class Buffer extends Node {
       garbageValue = "1682045100"
    )
    @Export("xteaDecryptAll")
-   public void xteaDecryptAll(int[] var1) {
+   public void xteaDecryptAll(int[] xteaKey) {
       int var2 = this.index / 8;
       this.index = 0;
 
-      for(int var3 = 0; var3 < var2; ++var3) {
+      for (int var3 = 0; var3 < var2; ++var3) {
          int var4 = this.readInt();
          int var5 = this.readInt();
          int var6 = -957401312;
          int var7 = -1640531527;
 
-         for(int var8 = 32; var8-- > 0; var4 -= var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + var1[var6 & 3]) {
-            var5 -= var4 + (var4 << 4 ^ var4 >>> 5) ^ var1[var6 >>> 11 & 3] + var6;
+         for (int var8 = 32; var8-- > 0; var4 -= var5 + (var5 << 4 ^ var5 >>> 5) ^ var6 + xteaKey[var6 & 3]) {
+            var5 -= var4 + (var4 << 4 ^ var4 >>> 5) ^ xteaKey[var6 >>> 11 & 3] + var6;
             var6 -= var7;
          }
 
@@ -668,19 +648,19 @@ public class Buffer extends Node {
       garbageValue = "-1341435074"
    )
    @Export("xteaEncrypt")
-   public void xteaEncrypt(int[] var1, int var2, int var3) {
+   public void xteaEncrypt(int[] xteaKey, int start, int end) {
       int var4 = this.index;
-      this.index = var2;
-      int var5 = (var3 - var2) / 8;
+      this.index = start;
+      int var5 = (end - start) / 8;
 
-      for(int var6 = 0; var6 < var5; ++var6) {
+      for (int var6 = 0; var6 < var5; ++var6) {
          int var7 = this.readInt();
          int var8 = this.readInt();
          int var9 = 0;
          int var10 = -1640531527;
 
-         for(int var11 = 32; var11-- > 0; var8 += var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9) {
-            var7 += var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3];
+         for (int var11 = 32; var11-- > 0; var8 += var7 + (var7 << 4 ^ var7 >>> 5) ^ xteaKey[var9 >>> 11 & 3] + var9) {
+            var7 += var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + xteaKey[var9 & 3];
             var9 += var10;
          }
 
@@ -698,19 +678,19 @@ public class Buffer extends Node {
       garbageValue = "307218624"
    )
    @Export("xteaDecrypt")
-   public void xteaDecrypt(int[] var1, int var2, int var3) {
+   public void xteaDecrypt(int[] xteaKey, int start, int end) {
       int var4 = this.index;
-      this.index = var2;
-      int var5 = (var3 - var2) / 8;
+      this.index = start;
+      int var5 = (end - start) / 8;
 
-      for(int var6 = 0; var6 < var5; ++var6) {
+      for (int var6 = 0; var6 < var5; ++var6) {
          int var7 = this.readInt();
          int var8 = this.readInt();
          int var9 = -957401312;
          int var10 = -1640531527;
 
-         for(int var11 = 32; var11-- > 0; var7 -= var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + var1[var9 & 3]) {
-            var8 -= var7 + (var7 << 4 ^ var7 >>> 5) ^ var1[var9 >>> 11 & 3] + var9;
+         for (int var11 = 32; var11-- > 0; var7 -= var8 + (var8 << 4 ^ var8 >>> 5) ^ var9 + xteaKey[var9 & 3]) {
+            var8 -= var7 + (var7 << 4 ^ var7 >>> 5) ^ xteaKey[var9 >>> 11 & 3] + var9;
             var9 -= var10;
          }
 
@@ -732,13 +712,13 @@ public class Buffer extends Node {
       int var3 = this.index;
       this.index = 0;
       byte[] var4 = new byte[var3];
-      this.__al_305(var4, 0, var3);
+      this.readBytes(var4, 0, var3);
       BigInteger var5 = new BigInteger(var4);
       BigInteger var6 = var5.modPow(var1, var2);
       byte[] var7 = var6.toByteArray();
       this.index = 0;
       this.writeShort(var7.length);
-      this.__s_297(var7, 0, var7.length);
+      this.writeBytes(var7, 0, var7.length);
    }
 
    @ObfuscatedName("aa")
@@ -746,18 +726,19 @@ public class Buffer extends Node {
       signature = "(II)I",
       garbageValue = "-484928770"
    )
-   public int __aa_312(int var1) {
-      byte[] var3 = this.array;
-      int var4 = this.index;
-      int var5 = -1;
+   @Export("writeCrc")
+   public int writeCrc(int var1) {
+      byte[] var2 = this.array;
+      int var3 = this.index;
+      int var4 = -1;
 
-      for(int var6 = var1; var6 < var4; ++var6) {
-         var5 = var5 >>> 8 ^ __gr_q[(var5 ^ var3[var6]) & 255];
+      for (int var5 = var1; var5 < var3; ++var5) {
+         var4 = var4 >>> 8 ^ crc32Table[(var4 ^ var2[var5]) & 255];
       }
 
-      var5 = ~var5;
-      this.writeInt(var5);
-      return var5;
+      var4 = ~var4;
+      this.writeInt(var4);
+      return var4;
    }
 
    @ObfuscatedName("ax")
@@ -765,20 +746,21 @@ public class Buffer extends Node {
       signature = "(B)Z",
       garbageValue = "-11"
    )
-   public boolean __ax_313() {
+   @Export("checkCrc")
+   public boolean checkCrc() {
       this.index -= 4;
-      byte[] var2 = this.array;
-      int var3 = this.index;
-      int var4 = -1;
+      byte[] var1 = this.array;
+      int var2 = this.index;
+      int var3 = -1;
 
-      int var5;
-      for(var5 = 0; var5 < var3; ++var5) {
-         var4 = var4 >>> 8 ^ __gr_q[(var4 ^ var2[var5]) & 255];
+      int var4;
+      for (var4 = 0; var4 < var2; ++var4) {
+         var3 = var3 >>> 8 ^ crc32Table[(var3 ^ var1[var4]) & 255];
       }
 
-      var4 = ~var4;
-      var5 = this.readInt();
-      return var5 == var4;
+      var3 = ~var3;
+      var4 = this.readInt();
+      return var4 == var3;
    }
 
    @ObfuscatedName("af")
@@ -786,7 +768,7 @@ public class Buffer extends Node {
       signature = "(IB)V",
       garbageValue = "-47"
    )
-   public void __af_314(int var1) {
+   public void method55(int var1) {
       this.array[++this.index - 1] = (byte)(var1 + 128);
    }
 
@@ -795,7 +777,7 @@ public class Buffer extends Node {
       signature = "(II)V",
       garbageValue = "-1336494664"
    )
-   public void __ai_315(int var1) {
+   public void method56(int var1) {
       this.array[++this.index - 1] = (byte)(0 - var1);
    }
 
@@ -804,7 +786,7 @@ public class Buffer extends Node {
       signature = "(IB)V",
       garbageValue = "21"
    )
-   public void __ba_316(int var1) {
+   public void method57(int var1) {
       this.array[++this.index - 1] = (byte)(128 - var1);
    }
 
@@ -813,7 +795,7 @@ public class Buffer extends Node {
       signature = "(I)I",
       garbageValue = "-86972759"
    )
-   public int __bb_317() {
+   public int method58() {
       return this.array[++this.index - 1] - 128 & 255;
    }
 
@@ -832,7 +814,7 @@ public class Buffer extends Node {
       signature = "(I)I",
       garbageValue = "359814653"
    )
-   public int __bq_318() {
+   public int method59() {
       return 128 - this.array[++this.index - 1] & 255;
    }
 
@@ -841,7 +823,7 @@ public class Buffer extends Node {
       signature = "(I)B",
       garbageValue = "2130167320"
    )
-   public byte __bn_319() {
+   public byte method60() {
       return (byte)(this.array[++this.index - 1] - 128);
    }
 
@@ -850,7 +832,7 @@ public class Buffer extends Node {
       signature = "(I)B",
       garbageValue = "1415936818"
    )
-   public byte __bk_320() {
+   public byte method61() {
       return (byte)(0 - this.array[++this.index - 1]);
    }
 
@@ -859,7 +841,7 @@ public class Buffer extends Node {
       signature = "(I)B",
       garbageValue = "1496705333"
    )
-   public byte __bd_321() {
+   public byte method62() {
       return (byte)(128 - this.array[++this.index - 1]);
    }
 
@@ -869,9 +851,9 @@ public class Buffer extends Node {
       garbageValue = "51"
    )
    @Export("writeShortLE")
-   public void writeShortLE(int var1) {
-      this.array[++this.index - 1] = (byte)var1;
-      this.array[++this.index - 1] = (byte)(var1 >> 8);
+   public void writeShortLE(int value) {
+      this.array[++this.index - 1] = (byte)value;
+      this.array[++this.index - 1] = (byte)(value >> 8);
    }
 
    @ObfuscatedName("bo")
@@ -879,7 +861,7 @@ public class Buffer extends Node {
       signature = "(II)V",
       garbageValue = "189694315"
    )
-   public void __bo_322(int var1) {
+   public void method63(int var1) {
       this.array[++this.index - 1] = (byte)(var1 >> 8);
       this.array[++this.index - 1] = (byte)(var1 + 128);
    }
@@ -889,7 +871,7 @@ public class Buffer extends Node {
       signature = "(IB)V",
       garbageValue = "-7"
    )
-   public void __bx_323(int var1) {
+   public void method64(int var1) {
       this.array[++this.index - 1] = (byte)(var1 + 128);
       this.array[++this.index - 1] = (byte)(var1 >> 8);
    }
@@ -899,7 +881,7 @@ public class Buffer extends Node {
       signature = "(I)I",
       garbageValue = "2147134369"
    )
-   public int __by_324() {
+   public int method65() {
       this.index += 2;
       return ((this.array[this.index - 1] & 255) << 8) + (this.array[this.index - 2] & 255);
    }
@@ -909,7 +891,7 @@ public class Buffer extends Node {
       signature = "(I)I",
       garbageValue = "-1489217204"
    )
-   public int __bu_325() {
+   public int method66() {
       this.index += 2;
       return (this.array[this.index - 1] - 128 & 255) + ((this.array[this.index - 2] & 255) << 8);
    }
@@ -919,7 +901,7 @@ public class Buffer extends Node {
       signature = "(B)I",
       garbageValue = "-86"
    )
-   public int __bm_326() {
+   public int method67() {
       this.index += 2;
       return ((this.array[this.index - 1] & 255) << 8) + (this.array[this.index - 2] - 128 & 255);
    }
@@ -929,10 +911,10 @@ public class Buffer extends Node {
       signature = "(B)I",
       garbageValue = "54"
    )
-   public int __bl_327() {
+   public int method68() {
       this.index += 2;
       int var1 = ((this.array[this.index - 1] & 255) << 8) + (this.array[this.index - 2] & 255);
-      if(var1 > 32767) {
+      if (var1 > 32767) {
          var1 -= 65536;
       }
 
@@ -944,10 +926,10 @@ public class Buffer extends Node {
       signature = "(I)I",
       garbageValue = "388487388"
    )
-   public int __br_328() {
+   public int method69() {
       this.index += 2;
       int var1 = ((this.array[this.index - 1] & 255) << 8) + (this.array[this.index - 2] - 128 & 255);
-      if(var1 > 32767) {
+      if (var1 > 32767) {
          var1 -= 65536;
       }
 
@@ -959,7 +941,7 @@ public class Buffer extends Node {
       signature = "(I)I",
       garbageValue = "-88751042"
    )
-   public int __bj_329() {
+   public int method70() {
       this.index += 3;
       return (this.array[this.index - 3] & 255) + ((this.array[this.index - 2] & 255) << 8) + ((this.array[this.index - 1] & 255) << 16);
    }
@@ -970,11 +952,11 @@ public class Buffer extends Node {
       garbageValue = "78"
    )
    @Export("writeIntLE")
-   public void writeIntLE(int var1) {
-      this.array[++this.index - 1] = (byte)var1;
-      this.array[++this.index - 1] = (byte)(var1 >> 8);
-      this.array[++this.index - 1] = (byte)(var1 >> 16);
-      this.array[++this.index - 1] = (byte)(var1 >> 24);
+   public void writeIntLE(int value) {
+      this.array[++this.index - 1] = (byte)value;
+      this.array[++this.index - 1] = (byte)(value >> 8);
+      this.array[++this.index - 1] = (byte)(value >> 16);
+      this.array[++this.index - 1] = (byte)(value >> 24);
    }
 
    @ObfuscatedName("bz")
@@ -983,11 +965,11 @@ public class Buffer extends Node {
       garbageValue = "80"
    )
    @Export("writeIntME")
-   public void writeIntME(int var1) {
-      this.array[++this.index - 1] = (byte)(var1 >> 8);
-      this.array[++this.index - 1] = (byte)var1;
-      this.array[++this.index - 1] = (byte)(var1 >> 24);
-      this.array[++this.index - 1] = (byte)(var1 >> 16);
+   public void writeIntME(int value) {
+      this.array[++this.index - 1] = (byte)(value >> 8);
+      this.array[++this.index - 1] = (byte)value;
+      this.array[++this.index - 1] = (byte)(value >> 24);
+      this.array[++this.index - 1] = (byte)(value >> 16);
    }
 
    @ObfuscatedName("bg")
@@ -996,11 +978,11 @@ public class Buffer extends Node {
       garbageValue = "2115295559"
    )
    @Export("writeIntLE16")
-   public void writeIntLE16(int var1) {
-      this.array[++this.index - 1] = (byte)(var1 >> 16);
-      this.array[++this.index - 1] = (byte)(var1 >> 24);
-      this.array[++this.index - 1] = (byte)var1;
-      this.array[++this.index - 1] = (byte)(var1 >> 8);
+   public void writeIntLE16(int value) {
+      this.array[++this.index - 1] = (byte)(value >> 16);
+      this.array[++this.index - 1] = (byte)(value >> 24);
+      this.array[++this.index - 1] = (byte)value;
+      this.array[++this.index - 1] = (byte)(value >> 8);
    }
 
    @ObfuscatedName("bt")
@@ -1008,7 +990,7 @@ public class Buffer extends Node {
       signature = "(I)I",
       garbageValue = "-1322860835"
    )
-   public int __bt_330() {
+   public int method71() {
       this.index += 4;
       return (this.array[this.index - 4] & 255) + ((this.array[this.index - 3] & 255) << 8) + ((this.array[this.index - 2] & 255) << 16) + ((this.array[this.index - 1] & 255) << 24);
    }
@@ -1018,7 +1000,7 @@ public class Buffer extends Node {
       signature = "(I)I",
       garbageValue = "-1731171028"
    )
-   public int __bp_331() {
+   public int method72() {
       this.index += 4;
       return ((this.array[this.index - 2] & 255) << 24) + ((this.array[this.index - 4] & 255) << 8) + (this.array[this.index - 3] & 255) + ((this.array[this.index - 1] & 255) << 16);
    }
@@ -1028,7 +1010,7 @@ public class Buffer extends Node {
       signature = "(B)I",
       garbageValue = "-126"
    )
-   public int __bf_332() {
+   public int method73() {
       this.index += 4;
       return ((this.array[this.index - 1] & 255) << 8) + ((this.array[this.index - 4] & 255) << 16) + (this.array[this.index - 2] & 255) + ((this.array[this.index - 3] & 255) << 24);
    }
@@ -1038,8 +1020,8 @@ public class Buffer extends Node {
       signature = "([BIII)V",
       garbageValue = "1303287859"
    )
-   public void __bh_333(byte[] var1, int var2, int var3) {
-      for(int var4 = var2; var4 < var3 + var2; ++var4) {
+   public void method74(byte[] var1, int var2, int var3) {
+      for (int var4 = var2; var4 < var3 + var2; ++var4) {
          var1[var4] = (byte)(this.array[++this.index - 1] - 128);
       }
 
@@ -1055,4 +1037,40 @@ public class Buffer extends Node {
       HealthBarDefinition.HealthBarDefinition_cached.clear();
       HealthBarDefinition.HealthBarDefinition_cachedSprites.clear();
    }
+
+   static {
+      crc32Table = new int[256];
+
+      int var0;
+      for (int var1 = 0; var1 < 256; ++var1) {
+         int var2 = var1;
+
+         for (var0 = 0; var0 < 8; ++var0) {
+            if ((var2 & 1) == 1) {
+               var2 = var2 >>> 1 ^ -306674912;
+            } else {
+               var2 >>>= 1;
+            }
+         }
+
+         crc32Table[var1] = var2;
+      }
+
+      crc64Table = new long[256];
+
+      for (var0 = 0; var0 < 256; ++var0) {
+         long var4 = (long)var0;
+
+         for (int var3 = 0; var3 < 8; ++var3) {
+            if ((var4 & 1L) == 1L) {
+               var4 = var4 >>> 1 ^ -3932672073523589310L;
+            } else {
+               var4 >>>= 1;
+            }
+         }
+
+         crc64Table[var0] = var4;
+      }
+
+   }
 }
diff --git a/runescape-client/src/main/java/BufferedFile.java b/runescape-client/src/main/java/BufferedFile.java
index 5b4292d34b..14cb038e54 100644
--- a/runescape-client/src/main/java/BufferedFile.java
+++ b/runescape-client/src/main/java/BufferedFile.java
@@ -23,12 +23,12 @@ public class BufferedFile {
    @ObfuscatedGetter(
       longValue = -7773729680030815835L
    )
-   long __q;
+   long field47;
    @ObfuscatedName("w")
    @ObfuscatedGetter(
       intValue = -846810907
    )
-   int __w;
+   int field48;
    @ObfuscatedName("o")
    @Export("writeBuffer")
    byte[] writeBuffer;
@@ -36,22 +36,22 @@ public class BufferedFile {
    @ObfuscatedGetter(
       longValue = 5249231081498323007L
    )
-   long __u;
+   long field49;
    @ObfuscatedName("g")
    @ObfuscatedGetter(
       intValue = -1558233611
    )
-   int __g;
+   int field50;
    @ObfuscatedName("l")
    @ObfuscatedGetter(
       longValue = -6819476051574242871L
    )
-   long __l;
+   long field51;
    @ObfuscatedName("e")
    @ObfuscatedGetter(
       longValue = -3728247331531750871L
    )
-   long __e;
+   long field52;
    @ObfuscatedName("x")
    @ObfuscatedGetter(
       longValue = 2663146692618913943L
@@ -62,20 +62,20 @@ public class BufferedFile {
    @ObfuscatedGetter(
       longValue = 5720856138805191881L
    )
-   long __d;
+   long field53;
 
    @ObfuscatedSignature(
       signature = "(Ldk;II)V"
    )
    public BufferedFile(AccessFile var1, int var2, int var3) throws IOException {
-      this.__q = -1L;
-      this.__u = -1L;
-      this.__g = 0;
+      this.field47 = -1L;
+      this.field49 = -1L;
+      this.field50 = 0;
       this.accessFile = var1;
-      this.capacity = this.__e = var1.length();
+      this.capacity = this.field52 = var1.length();
       this.readBuffer = new byte[var2];
       this.writeBuffer = new byte[var3];
-      this.__l = 0L;
+      this.field51 = 0L;
    }
 
    @ObfuscatedName("m")
@@ -91,11 +91,11 @@ public class BufferedFile {
 
    @ObfuscatedName("f")
    @Export("seek")
-   public void seek(long var1) throws IOException {
-      if(var1 < 0L) {
+   public void seek(long index) throws IOException {
+      if (index < 0L) {
          throw new IOException("");
       } else {
-         this.__l = var1;
+         this.field51 = index;
       }
    }
 
@@ -115,8 +115,8 @@ public class BufferedFile {
       garbageValue = "617965847"
    )
    @Export("readFill")
-   public void readFill(byte[] var1) throws IOException {
-      this.read(var1, 0, var1.length);
+   public void readFill(byte[] dst) throws IOException {
+      this.read(dst, 0, dst.length);
    }
 
    @ObfuscatedName("o")
@@ -125,102 +125,102 @@ public class BufferedFile {
       garbageValue = "-35"
    )
    @Export("read")
-   public void read(byte[] var1, int var2, int var3) throws IOException {
+   public void read(byte[] dst, int dstIndex, int length) throws IOException {
       try {
-         if(var3 + var2 > var1.length) {
-            throw new ArrayIndexOutOfBoundsException(var3 + var2 - var1.length);
+         if (length + dstIndex > dst.length) {
+            throw new ArrayIndexOutOfBoundsException(length + dstIndex - dst.length);
          }
 
-         if(-1L != this.__u && this.__l >= this.__u && this.__l + (long)var3 <= this.__u + (long)this.__g) {
-            System.arraycopy(this.writeBuffer, (int)(this.__l - this.__u), var1, var2, var3);
-            this.__l += (long)var3;
+         if (-1L != this.field49 && this.field51 >= this.field49 && this.field51 + (long)length <= this.field49 + (long)this.field50) {
+            System.arraycopy(this.writeBuffer, (int)(this.field51 - this.field49), dst, dstIndex, length);
+            this.field51 += (long)length;
             return;
          }
 
-         long var4 = this.__l;
-         int var7 = var3;
-         int var8;
-         if(this.__l >= this.__q && this.__l < this.__q + (long)this.__w) {
-            var8 = (int)((long)this.__w - (this.__l - this.__q));
-            if(var8 > var3) {
-               var8 = var3;
+         long var4 = this.field51;
+         int var6 = length;
+         int var7;
+         if (this.field51 >= this.field47 && this.field51 < this.field47 + (long)this.field48) {
+            var7 = (int)((long)this.field48 - (this.field51 - this.field47));
+            if (var7 > length) {
+               var7 = length;
             }
 
-            System.arraycopy(this.readBuffer, (int)(this.__l - this.__q), var1, var2, var8);
-            this.__l += (long)var8;
-            var2 += var8;
-            var3 -= var8;
+            System.arraycopy(this.readBuffer, (int)(this.field51 - this.field47), dst, dstIndex, var7);
+            this.field51 += (long)var7;
+            dstIndex += var7;
+            length -= var7;
          }
 
-         if(var3 > this.readBuffer.length) {
-            this.accessFile.seek(this.__l);
+         if (length > this.readBuffer.length) {
+            this.accessFile.seek(this.field51);
 
-            for(this.__d = this.__l; var3 > 0; var3 -= var8) {
-               var8 = this.accessFile.read(var1, var2, var3);
-               if(var8 == -1) {
+            for (this.field53 = this.field51; length > 0; length -= var7) {
+               var7 = this.accessFile.read(dst, dstIndex, length);
+               if (var7 == -1) {
                   break;
                }
 
-               this.__d += (long)var8;
-               this.__l += (long)var8;
-               var2 += var8;
+               this.field53 += (long)var7;
+               this.field51 += (long)var7;
+               dstIndex += var7;
             }
-         } else if(var3 > 0) {
+         } else if (length > 0) {
             this.load();
-            var8 = var3;
-            if(var3 > this.__w) {
-               var8 = this.__w;
+            var7 = length;
+            if (length > this.field48) {
+               var7 = this.field48;
             }
 
-            System.arraycopy(this.readBuffer, 0, var1, var2, var8);
-            var2 += var8;
-            var3 -= var8;
-            this.__l += (long)var8;
+            System.arraycopy(this.readBuffer, 0, dst, dstIndex, var7);
+            dstIndex += var7;
+            length -= var7;
+            this.field51 += (long)var7;
          }
 
-         if(-1L != this.__u) {
-            if(this.__u > this.__l && var3 > 0) {
-               var8 = var2 + (int)(this.__u - this.__l);
-               if(var8 > var3 + var2) {
-                  var8 = var3 + var2;
+         if (-1L != this.field49) {
+            if (this.field49 > this.field51 && length > 0) {
+               var7 = dstIndex + (int)(this.field49 - this.field51);
+               if (var7 > length + dstIndex) {
+                  var7 = length + dstIndex;
                }
 
-               while(var2 < var8) {
-                  var1[var2++] = 0;
-                  --var3;
-                  ++this.__l;
+               while (dstIndex < var7) {
+                  dst[dstIndex++] = 0;
+                  --length;
+                  ++this.field51;
                }
             }
 
-            long var13 = -1L;
+            long var8 = -1L;
             long var10 = -1L;
-            if(this.__u >= var4 && this.__u < var4 + (long)var7) {
-               var13 = this.__u;
-            } else if(var4 >= this.__u && var4 < this.__u + (long)this.__g) {
-               var13 = var4;
+            if (this.field49 >= var4 && this.field49 < var4 + (long)var6) {
+               var8 = this.field49;
+            } else if (var4 >= this.field49 && var4 < this.field49 + (long)this.field50) {
+               var8 = var4;
             }
 
-            if((long)this.__g + this.__u > var4 && this.__u + (long)this.__g <= var4 + (long)var7) {
-               var10 = (long)this.__g + this.__u;
-            } else if((long)var7 + var4 > this.__u && (long)var7 + var4 <= this.__u + (long)this.__g) {
-               var10 = (long)var7 + var4;
+            if ((long)this.field50 + this.field49 > var4 && this.field49 + (long)this.field50 <= var4 + (long)var6) {
+               var10 = (long)this.field50 + this.field49;
+            } else if ((long)var6 + var4 > this.field49 && (long)var6 + var4 <= this.field49 + (long)this.field50) {
+               var10 = (long)var6 + var4;
             }
 
-            if(var13 > -1L && var10 > var13) {
-               int var12 = (int)(var10 - var13);
-               System.arraycopy(this.writeBuffer, (int)(var13 - this.__u), var1, (int)(var13 - var4) + var2, var12);
-               if(var10 > this.__l) {
-                  var3 = (int)((long)var3 - (var10 - this.__l));
-                  this.__l = var10;
+            if (var8 > -1L && var10 > var8) {
+               int var12 = (int)(var10 - var8);
+               System.arraycopy(this.writeBuffer, (int)(var8 - this.field49), dst, (int)(var8 - var4) + dstIndex, var12);
+               if (var10 > this.field51) {
+                  length = (int)((long)length - (var10 - this.field51));
+                  this.field51 = var10;
                }
             }
          }
-      } catch (IOException var16) {
-         this.__d = -1L;
-         throw var16;
+      } catch (IOException var13) {
+         this.field53 = -1L;
+         throw var13;
       }
 
-      if(var3 > 0) {
+      if (length > 0) {
          throw new EOFException();
       }
    }
@@ -232,20 +232,20 @@ public class BufferedFile {
    )
    @Export("load")
    void load() throws IOException {
-      this.__w = 0;
-      if(this.__d != this.__l) {
-         this.accessFile.seek(this.__l);
-         this.__d = this.__l;
+      this.field48 = 0;
+      if (this.field53 != this.field51) {
+         this.accessFile.seek(this.field51);
+         this.field53 = this.field51;
       }
 
       int var1;
-      for(this.__q = this.__l; this.__w < this.readBuffer.length; this.__w += var1) {
-         var1 = this.accessFile.read(this.readBuffer, this.__w, this.readBuffer.length - this.__w);
-         if(var1 == -1) {
+      for (this.field47 = this.field51; this.field48 < this.readBuffer.length; this.field48 += var1) {
+         var1 = this.accessFile.read(this.readBuffer, this.field48, this.readBuffer.length - this.field48);
+         if (var1 == -1) {
             break;
          }
 
-         this.__d += (long)var1;
+         this.field53 += (long)var1;
       }
 
    }
@@ -256,75 +256,75 @@ public class BufferedFile {
       garbageValue = "-601174169"
    )
    @Export("write")
-   public void write(byte[] var1, int var2, int var3) throws IOException {
+   public void write(byte[] src, int srcIndex, int length) throws IOException {
       try {
-         if(this.__l + (long)var3 > this.capacity) {
-            this.capacity = this.__l + (long)var3;
+         if (this.field51 + (long)length > this.capacity) {
+            this.capacity = this.field51 + (long)length;
          }
 
-         if(-1L != this.__u && (this.__l < this.__u || this.__l > this.__u + (long)this.__g)) {
+         if (-1L != this.field49 && (this.field51 < this.field49 || this.field51 > this.field49 + (long)this.field50)) {
             this.flush();
          }
 
-         if(this.__u != -1L && (long)var3 + this.__l > this.__u + (long)this.writeBuffer.length) {
-            int var4 = (int)((long)this.writeBuffer.length - (this.__l - this.__u));
-            System.arraycopy(var1, var2, this.writeBuffer, (int)(this.__l - this.__u), var4);
-            this.__l += (long)var4;
-            var2 += var4;
-            var3 -= var4;
-            this.__g = this.writeBuffer.length;
+         if (this.field49 != -1L && (long)length + this.field51 > this.field49 + (long)this.writeBuffer.length) {
+            int var4 = (int)((long)this.writeBuffer.length - (this.field51 - this.field49));
+            System.arraycopy(src, srcIndex, this.writeBuffer, (int)(this.field51 - this.field49), var4);
+            this.field51 += (long)var4;
+            srcIndex += var4;
+            length -= var4;
+            this.field50 = this.writeBuffer.length;
             this.flush();
          }
 
-         if(var3 <= this.writeBuffer.length) {
-            if(var3 > 0) {
-               if(this.__u == -1L) {
-                  this.__u = this.__l;
+         if (length <= this.writeBuffer.length) {
+            if (length > 0) {
+               if (this.field49 == -1L) {
+                  this.field49 = this.field51;
                }
 
-               System.arraycopy(var1, var2, this.writeBuffer, (int)(this.__l - this.__u), var3);
-               this.__l += (long)var3;
-               if(this.__l - this.__u > (long)this.__g) {
-                  this.__g = (int)(this.__l - this.__u);
+               System.arraycopy(src, srcIndex, this.writeBuffer, (int)(this.field51 - this.field49), length);
+               this.field51 += (long)length;
+               if (this.field51 - this.field49 > (long)this.field50) {
+                  this.field50 = (int)(this.field51 - this.field49);
                }
-
             }
          } else {
-            if(this.__d != this.__l) {
-               this.accessFile.seek(this.__l);
-               this.__d = this.__l;
+            if (this.field53 != this.field51) {
+               this.accessFile.seek(this.field51);
+               this.field53 = this.field51;
             }
 
-            this.accessFile.write(var1, var2, var3);
-            this.__d += (long)var3;
-            if(this.__d > this.__e) {
-               this.__e = this.__d;
+            this.accessFile.write(src, srcIndex, length);
+            this.field53 += (long)length;
+            if (this.field53 > this.field52) {
+               this.field52 = this.field53;
             }
 
-            long var9 = -1L;
+            long var10 = -1L;
             long var6 = -1L;
-            if(this.__l >= this.__q && this.__l < (long)this.__w + this.__q) {
-               var9 = this.__l;
-            } else if(this.__q >= this.__l && this.__q < (long)var3 + this.__l) {
-               var9 = this.__q;
+            if (this.field51 >= this.field47 && this.field51 < (long)this.field48 + this.field47) {
+               var10 = this.field51;
+            } else if (this.field47 >= this.field51 && this.field47 < (long)length + this.field51) {
+               var10 = this.field47;
             }
 
-            if(this.__l + (long)var3 > this.__q && (long)var3 + this.__l <= (long)this.__w + this.__q) {
-               var6 = this.__l + (long)var3;
-            } else if((long)this.__w + this.__q > this.__l && this.__q + (long)this.__w <= (long)var3 + this.__l) {
-               var6 = (long)this.__w + this.__q;
+            if (this.field51 + (long)length > this.field47 && (long)length + this.field51 <= (long)this.field48 + this.field47) {
+               var6 = this.field51 + (long)length;
+            } else if ((long)this.field48 + this.field47 > this.field51 && this.field47 + (long)this.field48 <= (long)length + this.field51) {
+               var6 = (long)this.field48 + this.field47;
             }
 
-            if(var9 > -1L && var6 > var9) {
-               int var8 = (int)(var6 - var9);
-               System.arraycopy(var1, (int)(var9 + (long)var2 - this.__l), this.readBuffer, (int)(var9 - this.__q), var8);
+            if (var10 > -1L && var6 > var10) {
+               int var8 = (int)(var6 - var10);
+               System.arraycopy(src, (int)(var10 + (long)srcIndex - this.field51), this.readBuffer, (int)(var10 - this.field47), var8);
             }
 
-            this.__l += (long)var3;
+            this.field51 += (long)length;
          }
-      } catch (IOException var12) {
-         this.__d = -1L;
-         throw var12;
+
+      } catch (IOException var9) {
+         this.field53 = -1L;
+         throw var9;
       }
    }
 
@@ -335,39 +335,39 @@ public class BufferedFile {
    )
    @Export("flush")
    void flush() throws IOException {
-      if(this.__u != -1L) {
-         if(this.__u != this.__d) {
-            this.accessFile.seek(this.__u);
-            this.__d = this.__u;
+      if (this.field49 != -1L) {
+         if (this.field49 != this.field53) {
+            this.accessFile.seek(this.field49);
+            this.field53 = this.field49;
          }
 
-         this.accessFile.write(this.writeBuffer, 0, this.__g);
-         this.__d += (long)(this.__g * 1290782301) * -1558233611L;
-         if(this.__d > this.__e) {
-            this.__e = this.__d;
+         this.accessFile.write(this.writeBuffer, 0, this.field50);
+         this.field53 += (long)(this.field50 * 1290782301) * -1558233611L;
+         if (this.field53 > this.field52) {
+            this.field52 = this.field53;
          }
 
          long var1 = -1L;
          long var3 = -1L;
-         if(this.__u >= this.__q && this.__u < (long)this.__w + this.__q) {
-            var1 = this.__u;
-         } else if(this.__q >= this.__u && this.__q < this.__u + (long)this.__g) {
-            var1 = this.__q;
+         if (this.field49 >= this.field47 && this.field49 < (long)this.field48 + this.field47) {
+            var1 = this.field49;
+         } else if (this.field47 >= this.field49 && this.field47 < this.field49 + (long)this.field50) {
+            var1 = this.field47;
          }
 
-         if(this.__u + (long)this.__g > this.__q && this.__u + (long)this.__g <= this.__q + (long)this.__w) {
-            var3 = this.__u + (long)this.__g;
-         } else if((long)this.__w + this.__q > this.__u && (long)this.__w + this.__q <= (long)this.__g + this.__u) {
-            var3 = this.__q + (long)this.__w;
+         if (this.field49 + (long)this.field50 > this.field47 && this.field49 + (long)this.field50 <= this.field47 + (long)this.field48) {
+            var3 = this.field49 + (long)this.field50;
+         } else if ((long)this.field48 + this.field47 > this.field49 && (long)this.field48 + this.field47 <= (long)this.field50 + this.field49) {
+            var3 = this.field47 + (long)this.field48;
          }
 
-         if(var1 > -1L && var3 > var1) {
+         if (var1 > -1L && var3 > var1) {
             int var5 = (int)(var3 - var1);
-            System.arraycopy(this.writeBuffer, (int)(var1 - this.__u), this.readBuffer, (int)(var1 - this.__q), var5);
+            System.arraycopy(this.writeBuffer, (int)(var1 - this.field49), this.readBuffer, (int)(var1 - this.field47), var5);
          }
 
-         this.__u = -1L;
-         this.__g = 0;
+         this.field49 = -1L;
+         this.field50 = 0;
       }
 
    }
@@ -387,8 +387,8 @@ public class BufferedFile {
       garbageValue = "-792629541"
    )
    @Export("colorStartTag")
-   static String colorStartTag(int var0) {
-      return "<col=" + Integer.toHexString(var0) + ">";
+   static String colorStartTag(int color) {
+      return "<col=" + Integer.toHexString(color) + ">";
    }
 
    @ObfuscatedName("er")
diff --git a/runescape-client/src/main/java/BufferedNetSocket.java b/runescape-client/src/main/java/BufferedNetSocket.java
index 1b5b13c43e..009146f408 100644
--- a/runescape-client/src/main/java/BufferedNetSocket.java
+++ b/runescape-client/src/main/java/BufferedNetSocket.java
@@ -40,8 +40,8 @@ public class BufferedNetSocket extends AbstractSocket {
       garbageValue = "1765046516"
    )
    @Export("isAvailable")
-   public boolean isAvailable(int var1) throws IOException {
-      return this.source.isAvailable(var1);
+   public boolean isAvailable(int length) throws IOException {
+      return this.source.isAvailable(length);
    }
 
    @ObfuscatedName("q")
@@ -70,8 +70,8 @@ public class BufferedNetSocket extends AbstractSocket {
       garbageValue = "-1089665746"
    )
    @Export("read")
-   public int read(byte[] var1, int var2, int var3) throws IOException {
-      return this.source.read(var1, var2, var3);
+   public int read(byte[] dst, int dstIndex, int length) throws IOException {
+      return this.source.read(dst, dstIndex, length);
    }
 
    @ObfuscatedName("u")
@@ -80,8 +80,8 @@ public class BufferedNetSocket extends AbstractSocket {
       garbageValue = "-86"
    )
    @Export("write")
-   public void write(byte[] var1, int var2, int var3) throws IOException {
-      this.sink.write(var1, var2, var3);
+   public void write(byte[] src, int srcIndex, int length) throws IOException {
+      this.sink.write(src, srcIndex, length);
    }
 
    @ObfuscatedName("g")
@@ -96,14 +96,13 @@ public class BufferedNetSocket extends AbstractSocket {
       try {
          this.socket.close();
       } catch (IOException var2) {
-         ;
       }
 
       this.source.close();
    }
 
    @ObfuscatedName("finalize")
-   protected void __finalize_280() {
+   protected void method75() {
       this.close();
    }
 
diff --git a/runescape-client/src/main/java/BufferedSink.java b/runescape-client/src/main/java/BufferedSink.java
index 3bca5ee7dd..107fecae1d 100644
--- a/runescape-client/src/main/java/BufferedSink.java
+++ b/runescape-client/src/main/java/BufferedSink.java
@@ -40,8 +40,8 @@ public class BufferedSink implements Runnable {
    @Export("exception")
    IOException exception;
    @ObfuscatedName("l")
-   @Export("isClosed0")
-   boolean isClosed0;
+   @Export("closed")
+   boolean closed;
 
    BufferedSink(OutputStream var1, int var2) {
       this.position = 0;
@@ -61,14 +61,14 @@ public class BufferedSink implements Runnable {
    )
    @Export("isClosed")
    boolean isClosed() {
-      if(this.isClosed0) {
+      if (this.closed) {
          try {
             this.outputStream.close();
-            if(this.exception == null) {
+            if (this.exception == null) {
                this.exception = new IOException("");
             }
          } catch (IOException var2) {
-            if(this.exception == null) {
+            if (this.exception == null) {
                this.exception = new IOException(var2);
             }
          }
@@ -85,31 +85,31 @@ public class BufferedSink implements Runnable {
       garbageValue = "0"
    )
    @Export("write")
-   void write(byte[] var1, int var2, int var3) throws IOException {
-      if(var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) {
+   void write(byte[] src, int srcIndex, int length) throws IOException {
+      if (length >= 0 && srcIndex >= 0 && length + srcIndex <= src.length) {
          synchronized(this) {
-            if(this.exception != null) {
+            if (this.exception != null) {
                throw new IOException(this.exception.toString());
             } else {
                int var5;
-               if(this.position <= this.limit) {
+               if (this.position <= this.limit) {
                   var5 = this.capacity - this.limit + this.position - 1;
                } else {
                   var5 = this.position - this.limit - 1;
                }
 
-               if(var5 < var3) {
+               if (var5 < length) {
                   throw new IOException("");
                } else {
-                  if(var3 + this.limit <= this.capacity) {
-                     System.arraycopy(var1, var2, this.buffer, this.limit, var3);
+                  if (length + this.limit <= this.capacity) {
+                     System.arraycopy(src, srcIndex, this.buffer, this.limit, length);
                   } else {
                      int var6 = this.capacity - this.limit;
-                     System.arraycopy(var1, var2, this.buffer, this.limit, var6);
-                     System.arraycopy(var1, var6 + var2, this.buffer, 0, var3 - var6);
+                     System.arraycopy(src, srcIndex, this.buffer, this.limit, var6);
+                     System.arraycopy(src, var6 + srcIndex, this.buffer, 0, length - var6);
                   }
 
-                  this.limit = (var3 + this.limit) % this.capacity;
+                  this.limit = (length + this.limit) % this.capacity;
                   this.notifyAll();
                }
             }
@@ -127,79 +127,92 @@ public class BufferedSink implements Runnable {
    @Export("close")
    void close() {
       synchronized(this) {
-         this.isClosed0 = true;
+         this.closed = true;
          this.notifyAll();
       }
 
       try {
          this.thread.join();
       } catch (InterruptedException var3) {
-         ;
       }
 
    }
 
-   @Export("run")
-   @ObfuscatedName("run")
    public void run() {
-      do {
-         int var1;
+      while (true) {
          synchronized(this) {
-            while(true) {
-               if(this.exception != null) {
+            ;
+         }
+
+         while (true) {
+            boolean var1 = false;
+
+            int var2;
+            try {
+               var1 = true;
+               if (this.exception != null) {
                   return;
                }
 
-               if(this.position <= this.limit) {
-                  var1 = this.limit - this.position;
+               if (this.position <= this.limit) {
+                  var2 = this.limit - this.position;
                } else {
-                  var1 = this.capacity - this.position + this.limit;
+                  var2 = this.capacity - this.position + this.limit;
                }
 
-               if(var1 > 0) {
-                  break;
+               if (var2 <= 0) {
+                  try {
+                     this.outputStream.flush();
+                  } catch (IOException var20) {
+                     this.exception = var20;
+                     return;
+                  }
+
+                  if (this.isClosed()) {
+                     return;
+                  }
+
+                  try {
+                     this.wait();
+                  } catch (InterruptedException var18) {
+                  }
+                  continue;
                }
 
-               try {
-                  this.outputStream.flush();
-               } catch (IOException var11) {
-                  this.exception = var11;
+               var1 = false;
+            } finally {
+               if (var1) {
+               }
+
+            }
+
+            try {
+               if (var2 + this.position <= this.capacity) {
+                  this.outputStream.write(this.buffer, this.position, var2);
+               } else {
+                  int var3 = this.capacity - this.position;
+                  this.outputStream.write(this.buffer, this.position, var3);
+                  this.outputStream.write(this.buffer, 0, var2 - var3);
+               }
+            } catch (IOException var17) {
+               IOException var4 = var17;
+               synchronized(this) {
+                  this.exception = var4;
                   return;
                }
-
-               if(this.isClosed()) {
-                  return;
-               }
-
-               try {
-                  this.wait();
-               } catch (InterruptedException var12) {
-                  ;
-               }
             }
-         }
 
-         try {
-            if(var1 + this.position <= this.capacity) {
-               this.outputStream.write(this.buffer, this.position, var1);
-            } else {
-               int var7 = this.capacity - this.position;
-               this.outputStream.write(this.buffer, this.position, var7);
-               this.outputStream.write(this.buffer, 0, var1 - var7);
-            }
-         } catch (IOException var10) {
-            IOException var2 = var10;
             synchronized(this) {
-               this.exception = var2;
-               return;
+               this.position = (var2 + this.position) % this.capacity;
             }
-         }
 
-         synchronized(this) {
-            this.position = (var1 + this.position) % this.capacity;
-         }
-      } while(!this.isClosed());
+            if (!this.isClosed()) {
+               break;
+            }
 
+            return;
+         }
+      }
    }
 
    @ObfuscatedName("m")
@@ -208,18 +221,18 @@ public class BufferedSink implements Runnable {
       garbageValue = "449588720"
    )
    static void method3603() {
-      Tiles.__bq_w = null;
-      Fonts.__kz_o = null;
-      class32.__ay_u = null;
-      class307.__kc_g = null;
-      Tiles.__bq_a = null;
-      Tiles.__bq_l = null;
-      Huffman.__gd_e = null;
-      class13.__i_x = null;
-      Formatting.__cy_d = null;
-      class214.__hf_k = null;
-      WorldMapSectionType.__h_n = null;
-      Message.__bm_i = null;
+      Tiles.field908 = ((byte[][][])null);
+      Fonts.field350 = ((byte[][][])null);
+      class32.field1157 = ((byte[][][])null);
+      class307.field1155 = ((byte[][][])null);
+      Tiles.field910 = ((int[][][])null);
+      Tiles.field909 = ((byte[][][])null);
+      Huffman.field398 = ((int[][])null);
+      class13.field1112 = null;
+      Formatting.field353 = null;
+      class214.field1131 = null;
+      WorldMapSectionType.field1104 = null;
+      Message.field490 = null;
    }
 
    @ObfuscatedName("e")
@@ -228,31 +241,31 @@ public class BufferedSink implements Runnable {
       garbageValue = "-1337774818"
    )
    static final void method3595(Widget var0, int var1, byte[] var2, byte[] var3) {
-      if(var0.__cf == null) {
-         if(var2 == null) {
+      if (var0.field966 == null) {
+         if (var2 == null) {
             return;
          }
 
-         var0.__cf = new byte[11][];
-         var0.__cp = new byte[11][];
-         var0.__cc = new int[11];
-         var0.__ci = new int[11];
+         var0.field966 = new byte[11][];
+         var0.field967 = new byte[11][];
+         var0.field968 = new int[11];
+         var0.field969 = new int[11];
       }
 
-      var0.__cf[var1] = var2;
-      if(var2 != null) {
-         var0.__cg = true;
+      var0.field966[var1] = var2;
+      if (var2 != null) {
+         var0.field965 = true;
       } else {
-         var0.__cg = false;
+         var0.field965 = false;
 
-         for(int var4 = 0; var4 < var0.__cf.length; ++var4) {
-            if(var0.__cf[var4] != null) {
-               var0.__cg = true;
+         for (int var4 = 0; var4 < var0.field966.length; ++var4) {
+            if (var0.field966[var4] != null) {
+               var0.field965 = true;
                break;
             }
          }
       }
 
-      var0.__cp[var1] = var3;
+      var0.field967[var1] = var3;
    }
 }
diff --git a/runescape-client/src/main/java/BufferedSource.java b/runescape-client/src/main/java/BufferedSource.java
index 5069205f88..c4371c89af 100644
--- a/runescape-client/src/main/java/BufferedSource.java
+++ b/runescape-client/src/main/java/BufferedSource.java
@@ -14,7 +14,7 @@ public class BufferedSource implements Runnable {
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   public static AbstractIndexCache __fh_x;
+   public static AbstractArchive field54;
    @ObfuscatedName("m")
    @Export("thread")
    Thread thread;
@@ -63,20 +63,20 @@ public class BufferedSource implements Runnable {
       garbageValue = "1727240458"
    )
    @Export("isAvailable")
-   boolean isAvailable(int var1) throws IOException {
-      if(var1 == 0) {
+   boolean isAvailable(int length) throws IOException {
+      if (length == 0) {
          return true;
-      } else if(var1 > 0 && var1 < this.capacity) {
+      } else if (length > 0 && length < this.capacity) {
          synchronized(this) {
             int var3;
-            if(this.position <= this.limit) {
+            if (this.position <= this.limit) {
                var3 = this.limit - this.position;
             } else {
                var3 = this.capacity - this.position + this.limit;
             }
 
-            if(var3 < var1) {
-               if(this.exception != null) {
+            if (var3 < length) {
+               if (this.exception != null) {
                   throw new IOException(this.exception.toString());
                } else {
                   this.notifyAll();
@@ -100,13 +100,13 @@ public class BufferedSource implements Runnable {
    int available() throws IOException {
       synchronized(this) {
          int var2;
-         if(this.position <= this.limit) {
+         if (this.position <= this.limit) {
             var2 = this.limit - this.position;
          } else {
             var2 = this.capacity - this.position + this.limit;
          }
 
-         if(var2 <= 0 && this.exception != null) {
+         if (var2 <= 0 && this.exception != null) {
             throw new IOException(this.exception.toString());
          } else {
             this.notifyAll();
@@ -123,8 +123,8 @@ public class BufferedSource implements Runnable {
    @Export("readUnsignedByte")
    int readUnsignedByte() throws IOException {
       synchronized(this) {
-         if(this.position == this.limit) {
-            if(this.exception != null) {
+         if (this.position == this.limit) {
+            if (this.exception != null) {
                throw new IOException(this.exception.toString());
             } else {
                return -1;
@@ -144,34 +144,34 @@ public class BufferedSource implements Runnable {
       garbageValue = "-37"
    )
    @Export("read")
-   int read(byte[] var1, int var2, int var3) throws IOException {
-      if(var3 >= 0 && var2 >= 0 && var3 + var2 <= var1.length) {
+   int read(byte[] dst, int dstIndex, int length) throws IOException {
+      if (length >= 0 && dstIndex >= 0 && length + dstIndex <= dst.length) {
          synchronized(this) {
             int var5;
-            if(this.position <= this.limit) {
+            if (this.position <= this.limit) {
                var5 = this.limit - this.position;
             } else {
                var5 = this.capacity - this.position + this.limit;
             }
 
-            if(var3 > var5) {
-               var3 = var5;
+            if (length > var5) {
+               length = var5;
             }
 
-            if(var3 == 0 && this.exception != null) {
+            if (length == 0 && this.exception != null) {
                throw new IOException(this.exception.toString());
             } else {
-               if(var3 + this.position <= this.capacity) {
-                  System.arraycopy(this.buffer, this.position, var1, var2, var3);
+               if (length + this.position <= this.capacity) {
+                  System.arraycopy(this.buffer, this.position, dst, dstIndex, length);
                } else {
                   int var6 = this.capacity - this.position;
-                  System.arraycopy(this.buffer, this.position, var1, var2, var6);
-                  System.arraycopy(this.buffer, 0, var1, var6 + var2, var3 - var6);
+                  System.arraycopy(this.buffer, this.position, dst, dstIndex, var6);
+                  System.arraycopy(this.buffer, 0, dst, var6 + dstIndex, length - var6);
                }
 
-               this.position = (var3 + this.position) % this.capacity;
+               this.position = (length + this.position) % this.capacity;
                this.notifyAll();
-               return var3;
+               return length;
             }
          }
       } else {
@@ -187,7 +187,7 @@ public class BufferedSource implements Runnable {
    @Export("close")
    void close() {
       synchronized(this) {
-         if(this.exception == null) {
+         if (this.exception == null) {
             this.exception = new IOException("");
          }
 
@@ -197,58 +197,54 @@ public class BufferedSource implements Runnable {
       try {
          this.thread.join();
       } catch (InterruptedException var3) {
-         ;
       }
 
    }
 
-   @Export("run")
-   @ObfuscatedName("run")
    public void run() {
-      while(true) {
+      while (true) {
          int var1;
          synchronized(this) {
-            while(true) {
-               if(this.exception != null) {
+            while (true) {
+               if (this.exception != null) {
                   return;
                }
 
-               if(this.position == 0) {
+               if (this.position == 0) {
                   var1 = this.capacity - this.limit - 1;
-               } else if(this.position <= this.limit) {
+               } else if (this.position <= this.limit) {
                   var1 = this.capacity - this.limit;
                } else {
                   var1 = this.position - this.limit - 1;
                }
 
-               if(var1 > 0) {
+               if (var1 > 0) {
                   break;
                }
 
                try {
                   this.wait();
                } catch (InterruptedException var10) {
-                  ;
                }
             }
          }
 
-         int var7;
+         int var2;
          try {
-            var7 = this.inputStream.read(this.buffer, this.limit, var1);
-            if(var7 == -1) {
+            var2 = this.inputStream.read(this.buffer, this.limit, var1);
+            if (var2 == -1) {
                throw new EOFException();
             }
          } catch (IOException var11) {
-            IOException var3 = var11;
+            IOException var4 = var11;
             synchronized(this) {
-               this.exception = var3;
+               this.exception = var4;
                return;
             }
          }
 
          synchronized(this) {
-            this.limit = (var7 + this.limit) % this.capacity;
+            this.limit = (var2 + this.limit) % this.capacity;
          }
       }
    }
@@ -259,23 +255,23 @@ public class BufferedSource implements Runnable {
       garbageValue = "6"
    )
    static final void method3423(boolean var0) {
-      for(int var1 = 0; var1 < Client.npcCount; ++var1) {
-         Npc var2 = Client.npcs[Client.npcIndices[var1]];
-         if(var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.__e_435()) {
+      for (int var1 = 0; var1 < Client.npcCount; ++var1) {
+         NPC var2 = Client.npcs[Client.npcIndices[var1]];
+         if (var2 != null && var2.isVisible() && var2.definition.isVisible == var0 && var2.definition.method229()) {
             int var3 = var2.x >> 7;
             int var4 = var2.y >> 7;
-            if(var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) {
-               if(var2.size == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) {
-                  if(Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) {
+            if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) {
+               if (var2.size == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) {
+                  if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) {
                      continue;
                   }
 
                   Client.tileLastDrawnActor[var3][var4] = Client.viewportDrawCount;
                }
 
-               long var5 = FontName.method5637(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]);
+               long var5 = FontName.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]);
                var2.playerCycle = Client.cycle;
-               class65.scene.__a_239(SoundSystem.plane, var2.x, var2.y, class32.getTileHeight(var2.size * 64 - 64 + var2.x, var2.size * 64 - 64 + var2.y, SoundSystem.plane), var2.size * 64 - 64 + 60, var2, var2.__ac, var5, var2.__ay);
+               class65.scene.method285(SoundSystem.plane, var2.x, var2.y, class32.getTileHeight(var2.size * 64 - 64 + var2.x, var2.size * 64 - 64 + var2.y, SoundSystem.plane), var2.size * 64 - 64 + 60, var2, var2.field9, var5, var2.field10);
             }
          }
       }
diff --git a/runescape-client/src/main/java/ByteArrayPool.java b/runescape-client/src/main/java/ByteArrayPool.java
index 8ac8278150..1135e87bb1 100644
--- a/runescape-client/src/main/java/ByteArrayPool.java
+++ b/runescape-client/src/main/java/ByteArrayPool.java
@@ -35,22 +35,13 @@ public class ByteArrayPool {
    @Export("ByteArrayPool_large")
    static byte[][] ByteArrayPool_large;
    @ObfuscatedName("g")
-   static int[] __gi_g;
+   static int[] field55;
    @ObfuscatedName("dz")
    @ObfuscatedSignature(
       signature = "Lit;"
    )
-   @Export("indexCache13")
-   static IndexCache indexCache13;
-
-   static {
-      ByteArrayPool_smallCount = 0;
-      ByteArrayPool_mediumCount = 0;
-      ByteArrayPool_largeCount = 0;
-      ByteArrayPool_small = new byte[1000][];
-      ByteArrayPool_medium = new byte[250][];
-      ByteArrayPool_large = new byte[50][];
-   }
+   @Export("archive13")
+   static Archive archive13;
 
    @ObfuscatedName("f")
    @ObfuscatedSignature(
@@ -60,46 +51,42 @@ public class ByteArrayPool {
    @Export("ByteArrayPool_get")
    static synchronized byte[] ByteArrayPool_get(int var0, boolean var1) {
       byte[] var2;
-      if(var0 != 100) {
-         if(var0 < 100) {
-            ;
+      if (var0 != 100) {
+         if (var0 < 100) {
          }
-      } else if(ByteArrayPool_smallCount > 0) {
+      } else if (ByteArrayPool_smallCount > 0) {
          var2 = ByteArrayPool_small[--ByteArrayPool_smallCount];
          ByteArrayPool_small[ByteArrayPool_smallCount] = null;
          return var2;
       }
 
-      if(var0 != 5000) {
-         if(var0 < 5000) {
-            ;
+      if (var0 != 5000) {
+         if (var0 < 5000) {
          }
-      } else if(ByteArrayPool_mediumCount > 0) {
+      } else if (ByteArrayPool_mediumCount > 0) {
          var2 = ByteArrayPool_medium[--ByteArrayPool_mediumCount];
          ByteArrayPool_medium[ByteArrayPool_mediumCount] = null;
          return var2;
       }
 
-      if(var0 != 30000) {
-         if(var0 < 30000) {
-            ;
+      if (var0 != 30000) {
+         if (var0 < 30000) {
          }
-      } else if(ByteArrayPool_largeCount > 0) {
+      } else if (ByteArrayPool_largeCount > 0) {
          var2 = ByteArrayPool_large[--ByteArrayPool_largeCount];
          ByteArrayPool_large[ByteArrayPool_largeCount] = null;
          return var2;
       }
 
-      if(RouteStrategy.__fe_e != null) {
-         for(int var4 = 0; var4 < __gi_g.length; ++var4) {
-            if(__gi_g[var4] != var0) {
-               if(var0 < __gi_g[var4]) {
-                  ;
+      if (RouteStrategy.field760 != null) {
+         for (int var3 = 0; var3 < field55.length; ++var3) {
+            if (field55[var3] != var0) {
+               if (var0 < field55[var3]) {
                }
-            } else if(WorldMapSection2.__ah_l[var4] > 0) {
-               byte[] var3 = RouteStrategy.__fe_e[var4][--WorldMapSection2.__ah_l[var4]];
-               RouteStrategy.__fe_e[var4][WorldMapSection2.__ah_l[var4]] = null;
-               return var3;
+            } else if (WorldMapSection0.field1082[var3] > 0) {
+               byte[] var4 = RouteStrategy.field760[var3][--WorldMapSection0.field1082[var3]];
+               RouteStrategy.field760[var3][WorldMapSection0.field1082[var3]] = null;
+               return var4;
             }
          }
       }
@@ -113,38 +100,47 @@ public class ByteArrayPool {
       garbageValue = "-399583759"
    )
    public static String method4001(int var0, boolean var1) {
-      if(var1 && var0 >= 0) {
-         int var3 = var0;
-         String var2;
-         if(var1 && var0 >= 0) {
+      if (var1 && var0 >= 0) {
+         int var2 = var0;
+         String var3;
+         if (var1 && var0 >= 0) {
             int var4 = 2;
 
-            for(int var5 = var0 / 10; var5 != 0; ++var4) {
+            for (int var5 = var0 / 10; var5 != 0; ++var4) {
                var5 /= 10;
             }
 
-            char[] var6 = new char[var4];
-            var6[0] = '+';
+            char[] var9 = new char[var4];
+            var9[0] = '+';
 
-            for(int var7 = var4 - 1; var7 > 0; --var7) {
-               int var8 = var3;
-               var3 /= 10;
-               int var9 = var8 - var3 * 10;
-               if(var9 >= 10) {
-                  var6[var7] = (char)(var9 + 87);
+            for (int var6 = var4 - 1; var6 > 0; --var6) {
+               int var7 = var2;
+               var2 /= 10;
+               int var8 = var7 - var2 * 10;
+               if (var8 >= 10) {
+                  var9[var6] = (char)(var8 + 87);
                } else {
-                  var6[var7] = (char)(var9 + 48);
+                  var9[var6] = (char)(var8 + 48);
                }
             }
 
-            var2 = new String(var6);
+            var3 = new String(var9);
          } else {
-            var2 = Integer.toString(var0, 10);
+            var3 = Integer.toString(var0, 10);
          }
 
-         return var2;
+         return var3;
       } else {
          return Integer.toString(var0);
       }
    }
+
+   static {
+      ByteArrayPool_smallCount = 0;
+      ByteArrayPool_mediumCount = 0;
+      ByteArrayPool_largeCount = 0;
+      ByteArrayPool_small = new byte[1000][];
+      ByteArrayPool_medium = new byte[250][];
+      ByteArrayPool_large = new byte[50][];
+   }
 }
diff --git a/runescape-client/src/main/java/Bzip2Decompressor.java b/runescape-client/src/main/java/Bzip2Decompressor.java
index b5cee0b5ba..e174e355e2 100644
--- a/runescape-client/src/main/java/Bzip2Decompressor.java
+++ b/runescape-client/src/main/java/Bzip2Decompressor.java
@@ -13,28 +13,24 @@ public final class Bzip2Decompressor {
    @Export("Bzip2Decompressor_state")
    static Bzip2State Bzip2Decompressor_state;
 
-   static {
-      Bzip2Decompressor_state = new Bzip2State();
-   }
-
    @ObfuscatedName("m")
    @Export("Bzip2Decompressor_decompress")
    public static int Bzip2Decompressor_decompress(byte[] var0, int var1, byte[] var2, int var3, int var4) {
       Bzip2State var5 = Bzip2Decompressor_state;
       synchronized(Bzip2Decompressor_state) {
-         Bzip2Decompressor_state.__g = var2;
-         Bzip2Decompressor_state.__l = var4;
-         Bzip2Decompressor_state.__x = var0;
-         Bzip2Decompressor_state.__d = 0;
-         Bzip2Decompressor_state.__k = var1;
-         Bzip2Decompressor_state.__j = 0;
-         Bzip2Decompressor_state.__z = 0;
-         Bzip2Decompressor_state.__e = 0;
-         Bzip2Decompressor_state.__n = 0;
+         Bzip2Decompressor_state.field62 = var2;
+         Bzip2Decompressor_state.field63 = var4;
+         Bzip2Decompressor_state.field65 = var0;
+         Bzip2Decompressor_state.field66 = 0;
+         Bzip2Decompressor_state.field67 = var1;
+         Bzip2Decompressor_state.field72 = 0;
+         Bzip2Decompressor_state.field71 = 0;
+         Bzip2Decompressor_state.field64 = 0;
+         Bzip2Decompressor_state.field68 = 0;
          method3725(Bzip2Decompressor_state);
-         var1 -= Bzip2Decompressor_state.__k;
-         Bzip2Decompressor_state.__g = null;
-         Bzip2Decompressor_state.__x = null;
+         var1 -= Bzip2Decompressor_state.field67;
+         Bzip2Decompressor_state.field62 = null;
+         Bzip2Decompressor_state.field65 = null;
          return var1;
       }
    }
@@ -44,131 +40,130 @@ public final class Bzip2Decompressor {
       signature = "(Lgt;)V"
    )
    static void method3705(Bzip2State var0) {
-      byte var2 = var0.__i;
-      int var3 = var0.__a;
-      int var4 = var0.__c;
-      int var5 = var0.__h;
-      int[] var6 = WorldMapSection0.__y_p;
-      int var7 = var0.__y;
-      byte[] var8 = var0.__x;
-      int var9 = var0.__d;
-      int var10 = var0.__k;
-      int var12 = var0.__ae + 1;
+      byte var1 = var0.field69;
+      int var2 = var0.field70;
+      int var3 = var0.field78;
+      int var4 = var0.field76;
+      int[] var5 = WorldMapSection3.field1056;
+      int var6 = var0.field75;
+      byte[] var7 = var0.field65;
+      int var8 = var0.field66;
+      int var9 = var0.field67;
+      int var10 = var0.field93 + 1;
 
       label65:
-      while(true) {
-         if(var3 > 0) {
-            while(true) {
-               if(var10 == 0) {
+      while (true) {
+         if (var2 > 0) {
+            while (true) {
+               if (var9 == 0) {
                   break label65;
                }
 
-               if(var3 == 1) {
-                  if(var10 == 0) {
-                     var3 = 1;
+               if (var2 == 1) {
+                  if (var9 == 0) {
+                     var2 = 1;
                      break label65;
                   }
 
-                  var8[var9] = var2;
-                  ++var9;
-                  --var10;
+                  var7[var8] = var1;
+                  ++var8;
+                  --var9;
                   break;
                }
 
-               var8[var9] = var2;
-               --var3;
-               ++var9;
-               --var10;
+               var7[var8] = var1;
+               --var2;
+               ++var8;
+               --var9;
             }
          }
 
-         boolean var14 = true;
+         boolean var11 = true;
 
-         byte var1;
-         while(var14) {
-            var14 = false;
-            if(var4 == var12) {
-               var3 = 0;
+         byte var12;
+         while (var11) {
+            var11 = false;
+            if (var3 == var10) {
+               var2 = 0;
                break label65;
             }
 
-            var2 = (byte)var5;
-            var7 = var6[var7];
-            var1 = (byte)(var7 & 255);
-            var7 >>= 8;
-            ++var4;
-            if(var1 != var5) {
-               var5 = var1;
-               if(var10 == 0) {
-                  var3 = 1;
+            var1 = (byte)var4;
+            var6 = var5[var6];
+            var12 = (byte)(var6 & 255);
+            var6 >>= 8;
+            ++var3;
+            if (var12 != var4) {
+               var4 = var12;
+               if (var9 == 0) {
+                  var2 = 1;
                   break label65;
                }
 
-               var8[var9] = var2;
-               ++var9;
-               --var10;
-               var14 = true;
-            } else if(var4 == var12) {
-               if(var10 == 0) {
-                  var3 = 1;
+               var7[var8] = var1;
+               ++var8;
+               --var9;
+               var11 = true;
+            } else if (var3 == var10) {
+               if (var9 == 0) {
+                  var2 = 1;
                   break label65;
                }
 
-               var8[var9] = var2;
-               ++var9;
-               --var10;
-               var14 = true;
+               var7[var8] = var1;
+               ++var8;
+               --var9;
+               var11 = true;
             }
          }
 
-         var3 = 2;
-         var7 = var6[var7];
-         var1 = (byte)(var7 & 255);
-         var7 >>= 8;
-         ++var4;
-         if(var4 != var12) {
-            if(var1 != var5) {
-               var5 = var1;
+         var2 = 2;
+         var6 = var5[var6];
+         var12 = (byte)(var6 & 255);
+         var6 >>= 8;
+         ++var3;
+         if (var3 != var10) {
+            if (var12 != var4) {
+               var4 = var12;
             } else {
-               var3 = 3;
-               var7 = var6[var7];
-               var1 = (byte)(var7 & 255);
-               var7 >>= 8;
-               ++var4;
-               if(var4 != var12) {
-                  if(var1 != var5) {
-                     var5 = var1;
+               var2 = 3;
+               var6 = var5[var6];
+               var12 = (byte)(var6 & 255);
+               var6 >>= 8;
+               ++var3;
+               if (var3 != var10) {
+                  if (var12 != var4) {
+                     var4 = var12;
                   } else {
-                     var7 = var6[var7];
-                     var1 = (byte)(var7 & 255);
-                     var7 >>= 8;
-                     ++var4;
-                     var3 = (var1 & 255) + 4;
-                     var7 = var6[var7];
-                     var5 = (byte)(var7 & 255);
-                     var7 >>= 8;
-                     ++var4;
+                     var6 = var5[var6];
+                     var12 = (byte)(var6 & 255);
+                     var6 >>= 8;
+                     ++var3;
+                     var2 = (var12 & 255) + 4;
+                     var6 = var5[var6];
+                     var4 = (byte)(var6 & 255);
+                     var6 >>= 8;
+                     ++var3;
                   }
                }
             }
          }
       }
 
-      int var13 = var0.__n;
-      var0.__n += var10 - var10;
-      if(var0.__n < var13) {
-         ;
+      int var13 = var0.field68;
+      var0.field68 += var9 - var9;
+      if (var0.field68 < var13) {
       }
 
-      var0.__i = var2;
-      var0.__a = var3;
-      var0.__c = var4;
-      var0.__h = var5;
-      WorldMapSection0.__y_p = var6;
-      var0.__y = var7;
-      var0.__x = var8;
-      var0.__d = var9;
-      var0.__k = var10;
+      var0.field69 = var1;
+      var0.field70 = var2;
+      var0.field78 = var3;
+      var0.field76 = var4;
+      WorldMapSection3.field1056 = var5;
+      var0.field75 = var6;
+      var0.field65 = var7;
+      var0.field66 = var8;
+      var0.field67 = var9;
    }
 
    @ObfuscatedName("q")
@@ -176,6 +171,9 @@ public final class Bzip2Decompressor {
       signature = "(Lgt;)V"
    )
    static void method3725(Bzip2State var0) {
+      boolean var1 = false;
+      boolean var2 = false;
+      boolean var3 = false;
       boolean var4 = false;
       boolean var5 = false;
       boolean var6 = false;
@@ -191,350 +189,351 @@ public final class Bzip2Decompressor {
       boolean var16 = false;
       boolean var17 = false;
       boolean var18 = false;
-      boolean var19 = false;
-      boolean var20 = false;
-      boolean var21 = false;
-      int var22 = 0;
-      int[] var23 = null;
-      int[] var24 = null;
-      int[] var25 = null;
-      var0.__s = 1;
-      if(WorldMapSection0.__y_p == null) {
-         WorldMapSection0.__y_p = new int[var0.__s * 100000];
+      int var19 = 0;
+      int[] var20 = null;
+      int[] var21 = null;
+      int[] var22 = null;
+      var0.field73 = 1;
+      if (WorldMapSection3.field1056 == null) {
+         WorldMapSection3.field1056 = new int[var0.field73 * 100000];
       }
 
-      boolean var26 = true;
+      boolean var23 = true;
 
-      while(true) {
-         while(var26) {
-            byte var1 = method3707(var0);
-            if(var1 == 23) {
+      while (true) {
+         while (var23) {
+            byte var24 = method3707(var0);
+            if (var24 == 23) {
                return;
             }
 
-            var1 = method3707(var0);
-            var1 = method3707(var0);
-            var1 = method3707(var0);
-            var1 = method3707(var0);
-            var1 = method3707(var0);
-            var1 = method3707(var0);
-            var1 = method3707(var0);
-            var1 = method3707(var0);
-            var1 = method3707(var0);
-            var1 = method3711(var0);
-            if(var1 != 0) {
-               ;
+            var24 = method3707(var0);
+            var24 = method3707(var0);
+            var24 = method3707(var0);
+            var24 = method3707(var0);
+            var24 = method3707(var0);
+            var24 = method3707(var0);
+            var24 = method3707(var0);
+            var24 = method3707(var0);
+            var24 = method3707(var0);
+            var24 = method3711(var0);
+            if (var24 != 0) {
             }
 
-            var0.__t = 0;
-            var1 = method3707(var0);
-            var0.__t = var0.__t << 8 | var1 & 255;
-            var1 = method3707(var0);
-            var0.__t = var0.__t << 8 | var1 & 255;
-            var1 = method3707(var0);
-            var0.__t = var0.__t << 8 | var1 & 255;
+            var0.field74 = 0;
+            var24 = method3707(var0);
+            var0.field74 = var0.field74 << 8 | var24 & 255;
+            var24 = method3707(var0);
+            var0.field74 = var0.field74 << 8 | var24 & 255;
+            var24 = method3707(var0);
+            var0.field74 = var0.field74 << 8 | var24 & 255;
 
-            int var36;
-            for(var36 = 0; var36 < 16; ++var36) {
-               var1 = method3711(var0);
-               if(var1 == 1) {
-                  var0.__aq[var36] = true;
+            int var25;
+            for (var25 = 0; var25 < 16; ++var25) {
+               var24 = method3711(var0);
+               if (var24 == 1) {
+                  var0.field82[var25] = true;
                } else {
-                  var0.__aq[var36] = false;
+                  var0.field82[var25] = false;
                }
             }
 
-            for(var36 = 0; var36 < 256; ++var36) {
-               var0.__ag[var36] = false;
+            for (var25 = 0; var25 < 256; ++var25) {
+               var0.field81[var25] = false;
             }
 
-            int var37;
-            for(var36 = 0; var36 < 16; ++var36) {
-               if(var0.__aq[var36]) {
-                  for(var37 = 0; var37 < 16; ++var37) {
-                     var1 = method3711(var0);
-                     if(var1 == 1) {
-                        var0.__ag[var37 + var36 * 16] = true;
+            int var26;
+            for (var25 = 0; var25 < 16; ++var25) {
+               if (var0.field82[var25]) {
+                  for (var26 = 0; var26 < 16; ++var26) {
+                     var24 = method3711(var0);
+                     if (var24 == 1) {
+                        var0.field81[var26 + var25 * 16] = true;
                      }
                   }
                }
             }
 
             method3710(var0);
-            int var39 = var0.__v + 2;
-            int var40 = method3708(3, var0);
-            int var41 = method3708(15, var0);
+            int var27 = var0.field80 + 2;
+            int var28 = method3708(3, var0);
+            int var29 = method3708(15, var0);
 
-            for(var36 = 0; var36 < var41; ++var36) {
-               var37 = 0;
+            for (var25 = 0; var25 < var29; ++var25) {
+               var26 = 0;
 
-               while(true) {
-                  var1 = method3711(var0);
-                  if(var1 == 0) {
-                     var0.__ay[var36] = (byte)var37;
+               while (true) {
+                  var24 = method3711(var0);
+                  if (var24 == 0) {
+                     var0.field87[var25] = (byte)var26;
                      break;
                   }
 
-                  ++var37;
+                  ++var26;
                }
             }
 
-            byte[] var27 = new byte[6];
+            byte[] var30 = new byte[6];
 
-            byte var29;
-            for(var29 = 0; var29 < var40; var27[var29] = var29++) {
-               ;
+            byte var31;
+            for (var31 = 0; var31 < var28; var30[var31] = var31++) {
             }
 
-            for(var36 = 0; var36 < var41; ++var36) {
-               var29 = var0.__ay[var36];
+            for (var25 = 0; var25 < var29; ++var25) {
+               var31 = var0.field87[var25];
 
-               byte var28;
-               for(var28 = var27[var29]; var29 > 0; --var29) {
-                  var27[var29] = var27[var29 - 1];
+               byte var32;
+               for (var32 = var30[var31]; var31 > 0; --var31) {
+                  var30[var31] = var30[var31 - 1];
                }
 
-               var27[0] = var28;
-               var0.__ac[var36] = var28;
+               var30[0] = var32;
+               var0.field86[var25] = var32;
             }
 
-            int var38;
-            for(var38 = 0; var38 < var40; ++var38) {
-               int var50 = method3708(5, var0);
+            int var33;
+            int var52;
+            for (var33 = 0; var33 < var28; ++var33) {
+               var52 = method3708(5, var0);
 
-               for(var36 = 0; var36 < var39; ++var36) {
-                  while(true) {
-                     var1 = method3711(var0);
-                     if(var1 == 0) {
-                        var0.__ah[var38][var36] = (byte)var50;
+               for (var25 = 0; var25 < var27; ++var25) {
+                  while (true) {
+                     var24 = method3711(var0);
+                     if (var24 == 0) {
+                        var0.field88[var33][var25] = (byte)var52;
                         break;
                      }
 
-                     var1 = method3711(var0);
-                     if(var1 == 0) {
-                        ++var50;
+                     var24 = method3711(var0);
+                     if (var24 == 0) {
+                        ++var52;
                      } else {
-                        --var50;
+                        --var52;
                      }
                   }
                }
             }
 
-            for(var38 = 0; var38 < var40; ++var38) {
-               byte var2 = 32;
-               byte var3 = 0;
+            for (var33 = 0; var33 < var28; ++var33) {
+               byte var34 = 32;
+               byte var35 = 0;
 
-               for(var36 = 0; var36 < var39; ++var36) {
-                  if(var0.__ah[var38][var36] > var3) {
-                     var3 = var0.__ah[var38][var36];
+               for (var25 = 0; var25 < var27; ++var25) {
+                  if (var0.field88[var33][var25] > var35) {
+                     var35 = var0.field88[var33][var25];
                   }
 
-                  if(var0.__ah[var38][var36] < var2) {
-                     var2 = var0.__ah[var38][var36];
+                  if (var0.field88[var33][var25] < var34) {
+                     var34 = var0.field88[var33][var25];
                   }
                }
 
-               method3706(var0.__ak[var38], var0.__aw[var38], var0.__al[var38], var0.__ah[var38], var2, var3, var39);
-               var0.__ab[var38] = var2;
+               method3706(var0.field89[var33], var0.field90[var33], var0.field91[var33], var0.field88[var33], var34, var35, var27);
+               var0.field92[var33] = var34;
             }
 
-            int var42 = var0.__v + 1;
-            int var43 = -1;
-            byte var44 = 0;
+            var52 = var0.field80 + 1;
+            int var53 = -1;
+            byte var54 = 0;
 
-            for(var36 = 0; var36 <= 255; ++var36) {
-               var0.__b[var36] = 0;
+            for (var25 = 0; var25 <= 255; ++var25) {
+               var0.field77[var25] = 0;
             }
 
-            int var56 = 4095;
+            int var36 = 4095;
 
-            int var35;
-            int var55;
-            for(var35 = 15; var35 >= 0; --var35) {
-               for(var55 = 15; var55 >= 0; --var55) {
-                  var0.__av[var56] = (byte)(var55 + var35 * 16);
-                  --var56;
+            int var37;
+            int var38;
+            for (var37 = 15; var37 >= 0; --var37) {
+               for (var38 = 15; var38 >= 0; --var38) {
+                  var0.field84[var36] = (byte)(var38 + var37 * 16);
+                  --var36;
                }
 
-               var0.__ar[var35] = var56 + 1;
+               var0.field85[var37] = var36 + 1;
             }
 
-            int var47 = 0;
-            byte var54;
-            if(var44 == 0) {
-               ++var43;
-               var44 = 50;
-               var54 = var0.__ac[var43];
-               var22 = var0.__ab[var54];
-               var23 = var0.__ak[var54];
-               var25 = var0.__al[var54];
-               var24 = var0.__aw[var54];
+            int var39 = 0;
+            byte var40;
+            if (var54 == 0) {
+               ++var53;
+               var54 = 50;
+               var40 = var0.field86[var53];
+               var19 = var0.field92[var40];
+               var20 = var0.field89[var40];
+               var22 = var0.field91[var40];
+               var21 = var0.field90[var40];
             }
 
-            int var45 = var44 - 1;
-            int var51 = var22;
+            int var41 = var54 - 1;
+            int var42 = var19;
 
-            int var52;
-            byte var53;
-            for(var52 = method3708(var22, var0); var52 > var23[var51]; var52 = var52 << 1 | var53) {
-               ++var51;
-               var53 = method3711(var0);
+            int var43;
+            byte var44;
+            for (var43 = method3708(var19, var0); var43 > var20[var42]; var43 = var43 << 1 | var44) {
+               ++var42;
+               var44 = method3711(var0);
             }
 
-            int var46 = var25[var52 - var24[var51]];
+            int var45 = var22[var43 - var21[var42]];
 
-            while(true) {
-               while(var46 != var42) {
-                  if(var46 != 0 && var46 != 1) {
-                     int var33 = var46 - 1;
-                     int var30;
-                     if(var33 < 16) {
-                        var30 = var0.__ar[0];
+            while (true) {
+               int[] var46;
+               int var48;
+               while (var45 != var52) {
+                  int var49;
+                  if (var45 != 0 && var45 != 1) {
+                     var48 = var45 - 1;
+                     int var10003;
+                     int var50;
+                     if (var48 < 16) {
+                        var49 = var0.field85[0];
 
-                        for(var1 = var0.__av[var30 + var33]; var33 > 3; var33 -= 4) {
-                           int var34 = var30 + var33;
-                           var0.__av[var34] = var0.__av[var34 - 1];
-                           var0.__av[var34 - 1] = var0.__av[var34 - 2];
-                           var0.__av[var34 - 2] = var0.__av[var34 - 3];
-                           var0.__av[var34 - 3] = var0.__av[var34 - 4];
+                        for (var24 = var0.field84[var49 + var48]; var48 > 3; var48 -= 4) {
+                           var50 = var49 + var48;
+                           var0.field84[var50] = var0.field84[var50 - 1];
+                           var0.field84[var50 - 1] = var0.field84[var50 - 2];
+                           var0.field84[var50 - 2] = var0.field84[var50 - 3];
+                           var0.field84[var50 - 3] = var0.field84[var50 - 4];
                         }
 
-                        while(var33 > 0) {
-                           var0.__av[var30 + var33] = var0.__av[var30 + var33 - 1];
-                           --var33;
+                        while (var48 > 0) {
+                           var0.field84[var49 + var48] = var0.field84[var49 + var48 - 1];
+                           --var48;
                         }
 
-                        var0.__av[var30] = var1;
+                        var0.field84[var49] = var24;
                      } else {
-                        int var31 = var33 / 16;
-                        int var32 = var33 % 16;
-                        var30 = var0.__ar[var31] + var32;
+                        var50 = var48 / 16;
+                        int var51 = var48 % 16;
+                        var49 = var0.field85[var50] + var51;
 
-                        for(var1 = var0.__av[var30]; var30 > var0.__ar[var31]; --var30) {
-                           var0.__av[var30] = var0.__av[var30 - 1];
+                        for (var24 = var0.field84[var49]; var49 > var0.field85[var50]; --var49) {
+                           var0.field84[var49] = var0.field84[var49 - 1];
                         }
 
-                        ++var0.__ar[var31];
-
-                        while(var31 > 0) {
-                           --var0.__ar[var31];
-                           var0.__av[var0.__ar[var31]] = var0.__av[var0.__ar[var31 - 1] + 16 - 1];
-                           --var31;
+                        for (var10003 = var0.field85[var50]++; var50 > 0; --var50) {
+                           var10003 = var0.field85[var50]--;
+                           var0.field84[var0.field85[var50]] = var0.field84[var0.field85[var50 - 1] + 16 - 1];
                         }
 
-                        --var0.__ar[0];
-                        var0.__av[var0.__ar[0]] = var1;
-                        if(var0.__ar[0] == 0) {
-                           var56 = 4095;
+                        var10003 = var0.field85[0]--;
+                        var0.field84[var0.field85[0]] = var24;
+                        if (var0.field85[0] == 0) {
+                           var36 = 4095;
 
-                           for(var35 = 15; var35 >= 0; --var35) {
-                              for(var55 = 15; var55 >= 0; --var55) {
-                                 var0.__av[var56] = var0.__av[var0.__ar[var35] + var55];
-                                 --var56;
+                           for (var37 = 15; var37 >= 0; --var37) {
+                              for (var38 = 15; var38 >= 0; --var38) {
+                                 var0.field84[var36] = var0.field84[var0.field85[var37] + var38];
+                                 --var36;
                               }
 
-                              var0.__ar[var35] = var56 + 1;
+                              var0.field85[var37] = var36 + 1;
                            }
                         }
                      }
 
-                     ++var0.__b[var0.__aj[var1 & 255] & 255];
-                     WorldMapSection0.__y_p[var47] = var0.__aj[var1 & 255] & 255;
-                     ++var47;
-                     if(var45 == 0) {
-                        ++var43;
-                        var45 = 50;
-                        var54 = var0.__ac[var43];
-                        var22 = var0.__ab[var54];
-                        var23 = var0.__ak[var54];
-                        var25 = var0.__al[var54];
-                        var24 = var0.__aw[var54];
+                     var10003 = var0.field77[var0.field83[var24 & 255] & 255]++;
+                     WorldMapSection3.field1056[var39] = var0.field83[var24 & 255] & 255;
+                     ++var39;
+                     if (var41 == 0) {
+                        ++var53;
+                        var41 = 50;
+                        var40 = var0.field86[var53];
+                        var19 = var0.field92[var40];
+                        var20 = var0.field89[var40];
+                        var22 = var0.field91[var40];
+                        var21 = var0.field90[var40];
                      }
 
-                     --var45;
-                     var51 = var22;
+                     --var41;
+                     var42 = var19;
 
-                     for(var52 = method3708(var22, var0); var52 > var23[var51]; var52 = var52 << 1 | var53) {
-                        ++var51;
-                        var53 = method3711(var0);
+                     for (var43 = method3708(var19, var0); var43 > var20[var42]; var43 = var43 << 1 | var44) {
+                        ++var42;
+                        var44 = method3711(var0);
                      }
 
-                     var46 = var25[var52 - var24[var51]];
+                     var45 = var22[var43 - var21[var42]];
                   } else {
-                     int var48 = -1;
-                     int var49 = 1;
+                     var48 = -1;
+                     var49 = 1;
 
                      do {
-                        if(var46 == 0) {
+                        if (var45 == 0) {
                            var48 += var49;
-                        } else if(var46 == 1) {
+                        } else if (var45 == 1) {
                            var48 += var49 * 2;
                         }
 
                         var49 *= 2;
-                        if(var45 == 0) {
-                           ++var43;
-                           var45 = 50;
-                           var54 = var0.__ac[var43];
-                           var22 = var0.__ab[var54];
-                           var23 = var0.__ak[var54];
-                           var25 = var0.__al[var54];
-                           var24 = var0.__aw[var54];
+                        if (var41 == 0) {
+                           ++var53;
+                           var41 = 50;
+                           var40 = var0.field86[var53];
+                           var19 = var0.field92[var40];
+                           var20 = var0.field89[var40];
+                           var22 = var0.field91[var40];
+                           var21 = var0.field90[var40];
                         }
 
-                        --var45;
-                        var51 = var22;
+                        --var41;
+                        var42 = var19;
 
-                        for(var52 = method3708(var22, var0); var52 > var23[var51]; var52 = var52 << 1 | var53) {
-                           ++var51;
-                           var53 = method3711(var0);
+                        for (var43 = method3708(var19, var0); var43 > var20[var42]; var43 = var43 << 1 | var44) {
+                           ++var42;
+                           var44 = method3711(var0);
                         }
 
-                        var46 = var25[var52 - var24[var51]];
-                     } while(var46 == 0 || var46 == 1);
+                        var45 = var22[var43 - var21[var42]];
+                     } while(var45 == 0 || var45 == 1);
 
                      ++var48;
-                     var1 = var0.__aj[var0.__av[var0.__ar[0]] & 255];
+                     var24 = var0.field83[var0.field84[var0.field85[0]] & 255];
+                     var46 = var0.field77;
 
-                     for(var0.__b[var1 & 255] += var48; var48 > 0; --var48) {
-                        WorldMapSection0.__y_p[var47] = var1 & 255;
-                        ++var47;
+                     for (var46[var24 & 255] += var48; var48 > 0; --var48) {
+                        WorldMapSection3.field1056[var39] = var24 & 255;
+                        ++var39;
                      }
                   }
                }
 
-               var0.__a = 0;
-               var0.__i = 0;
-               var0.__r[0] = 0;
+               var0.field70 = 0;
+               var0.field69 = 0;
+               var0.field79[0] = 0;
 
-               for(var36 = 1; var36 <= 256; ++var36) {
-                  var0.__r[var36] = var0.__b[var36 - 1];
+               for (var25 = 1; var25 <= 256; ++var25) {
+                  var0.field79[var25] = var0.field77[var25 - 1];
                }
 
-               for(var36 = 1; var36 <= 256; ++var36) {
-                  var0.__r[var36] += var0.__r[var36 - 1];
+               for (var25 = 1; var25 <= 256; ++var25) {
+                  var46 = var0.field79;
+                  var46[var25] += var0.field79[var25 - 1];
                }
 
-               for(var36 = 0; var36 < var47; ++var36) {
-                  var1 = (byte)(WorldMapSection0.__y_p[var36] & 255);
-                  WorldMapSection0.__y_p[var0.__r[var1 & 255]] |= var36 << 8;
-                  ++var0.__r[var1 & 255];
+               for (var25 = 0; var25 < var39; ++var25) {
+                  var24 = (byte)(WorldMapSection3.field1056[var25] & 255);
+                  var46 = WorldMapSection3.field1056;
+                  var48 = var0.field79[var24 & 255];
+                  var46[var48] |= var25 << 8;
+                  ++var0.field79[var24 & 255];
                }
 
-               var0.__y = WorldMapSection0.__y_p[var0.__t] >> 8;
-               var0.__c = 0;
-               var0.__y = WorldMapSection0.__y_p[var0.__y];
-               var0.__h = (byte)(var0.__y & 255);
-               var0.__y >>= 8;
-               ++var0.__c;
-               var0.__ae = var47;
+               var0.field75 = WorldMapSection3.field1056[var0.field74] >> 8;
+               var0.field78 = 0;
+               var0.field75 = WorldMapSection3.field1056[var0.field75];
+               var0.field76 = (byte)(var0.field75 & 255);
+               var0.field75 >>= 8;
+               ++var0.field78;
+               var0.field93 = var39;
                method3705(var0);
-               if(var0.__ae + 1 == var0.__c && var0.__a == 0) {
-                  var26 = true;
+               if (var0.field93 + 1 == var0.field78 && var0.field70 == 0) {
+                  var23 = true;
                   break;
                }
 
-               var26 = false;
+               var23 = false;
                break;
             }
          }
@@ -564,19 +563,18 @@ public final class Bzip2Decompressor {
       signature = "(ILgt;)I"
    )
    static int method3708(int var0, Bzip2State var1) {
-      while(var1.__j < var0) {
-         var1.__z = var1.__z << 8 | var1.__g[var1.__l] & 255;
-         var1.__j += 8;
-         ++var1.__l;
-         ++var1.__e;
-         if(var1.__e == 0) {
-            ;
+      while (var1.field72 < var0) {
+         var1.field71 = var1.field71 << 8 | var1.field62[var1.field63] & 255;
+         var1.field72 += 8;
+         ++var1.field63;
+         ++var1.field64;
+         if (var1.field64 == 0) {
          }
       }
 
-      int var3 = var1.__z >> var1.__j - var0 & (1 << var0) - 1;
-      var1.__j -= var0;
-      return var3;
+      int var2 = var1.field71 >> var1.field72 - var0 & (1 << var0) - 1;
+      var1.field72 -= var0;
+      return var2;
    }
 
    @ObfuscatedName("g")
@@ -584,12 +582,12 @@ public final class Bzip2Decompressor {
       signature = "(Lgt;)V"
    )
    static void method3710(Bzip2State var0) {
-      var0.__v = 0;
+      var0.field80 = 0;
 
-      for(int var1 = 0; var1 < 256; ++var1) {
-         if(var0.__ag[var1]) {
-            var0.__aj[var0.__v] = (byte)var1;
-            ++var0.__v;
+      for (int var1 = 0; var1 < 256; ++var1) {
+         if (var0.field81[var1]) {
+            var0.field83[var0.field80] = (byte)var1;
+            ++var0.field80;
          }
       }
 
@@ -600,42 +598,47 @@ public final class Bzip2Decompressor {
       int var7 = 0;
 
       int var8;
-      for(var8 = var4; var8 <= var5; ++var8) {
-         for(int var9 = 0; var9 < var6; ++var9) {
-            if(var8 == var3[var9]) {
+      int var9;
+      for (var8 = var4; var8 <= var5; ++var8) {
+         for (var9 = 0; var9 < var6; ++var9) {
+            if (var8 == var3[var9]) {
                var2[var7] = var9;
                ++var7;
             }
          }
       }
 
-      for(var8 = 0; var8 < 23; ++var8) {
+      for (var8 = 0; var8 < 23; ++var8) {
          var1[var8] = 0;
       }
 
-      for(var8 = 0; var8 < var6; ++var8) {
+      for (var8 = 0; var8 < var6; ++var8) {
          ++var1[var3[var8] + 1];
       }
 
-      for(var8 = 1; var8 < 23; ++var8) {
+      for (var8 = 1; var8 < 23; ++var8) {
          var1[var8] += var1[var8 - 1];
       }
 
-      for(var8 = 0; var8 < 23; ++var8) {
+      for (var8 = 0; var8 < 23; ++var8) {
          var0[var8] = 0;
       }
 
-      int var10 = 0;
+      var9 = 0;
 
-      for(var8 = var4; var8 <= var5; ++var8) {
-         var10 += var1[var8 + 1] - var1[var8];
-         var0[var8] = var10 - 1;
-         var10 <<= 1;
+      for (var8 = var4; var8 <= var5; ++var8) {
+         var9 += var1[var8 + 1] - var1[var8];
+         var0[var8] = var9 - 1;
+         var9 <<= 1;
       }
 
-      for(var8 = var4 + 1; var8 <= var5; ++var8) {
+      for (var8 = var4 + 1; var8 <= var5; ++var8) {
          var1[var8] = (var0[var8 - 1] + 1 << 1) - var1[var8];
       }
 
    }
+
+   static {
+      Bzip2Decompressor_state = new Bzip2State();
+   }
 }
diff --git a/runescape-client/src/main/java/Bzip2State.java b/runescape-client/src/main/java/Bzip2State.java
index 41c6b17ddc..8bc2fb66a7 100644
--- a/runescape-client/src/main/java/Bzip2State.java
+++ b/runescape-client/src/main/java/Bzip2State.java
@@ -1,4 +1,3 @@
-import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
@@ -7,149 +6,149 @@ import net.runelite.mapping.ObfuscatedName;
 @Implements("Bzip2State")
 public final class Bzip2State {
    @ObfuscatedName("m")
-   final int __m;
+   final int field56;
    @ObfuscatedName("f")
-   final int __f;
+   final int field57;
    @ObfuscatedName("q")
-   final int __q;
+   final int field58;
    @ObfuscatedName("w")
-   final int __w;
+   final int field59;
    @ObfuscatedName("o")
-   final int __o;
+   final int field60;
    @ObfuscatedName("u")
-   final int __u;
+   final int field61;
    @ObfuscatedName("g")
-   byte[] __g;
+   byte[] field62;
    @ObfuscatedName("l")
    @ObfuscatedGetter(
       intValue = -1510817847
    )
-   int __l;
+   int field63;
    @ObfuscatedName("e")
    @ObfuscatedGetter(
       intValue = -473971741
    )
-   int __e;
+   int field64;
    @ObfuscatedName("x")
-   byte[] __x;
+   byte[] field65;
    @ObfuscatedName("d")
    @ObfuscatedGetter(
       intValue = -861462251
    )
-   int __d;
+   int field66;
    @ObfuscatedName("k")
    @ObfuscatedGetter(
       intValue = 594179173
    )
-   int __k;
+   int field67;
    @ObfuscatedName("n")
    @ObfuscatedGetter(
       intValue = 1860254567
    )
-   int __n;
+   int field68;
    @ObfuscatedName("i")
-   byte __i;
+   byte field69;
    @ObfuscatedName("a")
    @ObfuscatedGetter(
       intValue = -1994129645
    )
-   int __a;
+   int field70;
    @ObfuscatedName("z")
    @ObfuscatedGetter(
       intValue = -1793367959
    )
-   int __z;
+   int field71;
    @ObfuscatedName("j")
    @ObfuscatedGetter(
       intValue = -1987934943
    )
-   int __j;
+   int field72;
    @ObfuscatedName("s")
    @ObfuscatedGetter(
       intValue = 1172102327
    )
-   int __s;
+   int field73;
    @ObfuscatedName("t")
    @ObfuscatedGetter(
       intValue = 1502359789
    )
-   int __t;
+   int field74;
    @ObfuscatedName("y")
    @ObfuscatedGetter(
       intValue = -953353963
    )
-   int __y;
+   int field75;
    @ObfuscatedName("h")
    @ObfuscatedGetter(
       intValue = -1981923611
    )
-   int __h;
+   int field76;
    @ObfuscatedName("b")
-   int[] __b;
+   int[] field77;
    @ObfuscatedName("c")
    @ObfuscatedGetter(
       intValue = -557334365
    )
-   int __c;
+   int field78;
    @ObfuscatedName("r")
-   int[] __r;
+   int[] field79;
    @ObfuscatedName("v")
    @ObfuscatedGetter(
       intValue = -886333045
    )
-   int __v;
+   int field80;
    @ObfuscatedName("ag")
-   boolean[] __ag;
+   boolean[] field81;
    @ObfuscatedName("aq")
-   boolean[] __aq;
+   boolean[] field82;
    @ObfuscatedName("aj")
-   byte[] __aj;
+   byte[] field83;
    @ObfuscatedName("av")
-   byte[] __av;
+   byte[] field84;
    @ObfuscatedName("ar")
-   int[] __ar;
+   int[] field85;
    @ObfuscatedName("ac")
-   byte[] __ac;
+   byte[] field86;
    @ObfuscatedName("ay")
-   byte[] __ay;
+   byte[] field87;
    @ObfuscatedName("ah")
-   byte[][] __ah;
+   byte[][] field88;
    @ObfuscatedName("ak")
-   int[][] __ak;
+   int[][] field89;
    @ObfuscatedName("aw")
-   int[][] __aw;
+   int[][] field90;
    @ObfuscatedName("al")
-   int[][] __al;
+   int[][] field91;
    @ObfuscatedName("ab")
-   int[] __ab;
+   int[] field92;
    @ObfuscatedName("ae")
    @ObfuscatedGetter(
       intValue = 444639767
    )
-   int __ae;
+   int field93;
 
    Bzip2State() {
-      this.__m = 4096;
-      this.__f = 16;
-      this.__q = 258;
-      this.__w = 6;
-      this.__o = 50;
-      this.__u = 18002;
-      this.__l = 0;
-      this.__d = 0;
-      this.__b = new int[256];
-      this.__r = new int[257];
-      this.__ag = new boolean[256];
-      this.__aq = new boolean[16];
-      this.__aj = new byte[256];
-      this.__av = new byte[4096];
-      this.__ar = new int[16];
-      this.__ac = new byte[18002];
-      this.__ay = new byte[18002];
-      this.__ah = new byte[6][258];
-      this.__ak = new int[6][258];
-      this.__aw = new int[6][258];
-      this.__al = new int[6][258];
-      this.__ab = new int[6];
+      this.field56 = 4096;
+      this.field57 = 16;
+      this.field58 = 258;
+      this.field59 = 6;
+      this.field60 = 50;
+      this.field61 = 18002;
+      this.field63 = 0;
+      this.field66 = 0;
+      this.field77 = new int[256];
+      this.field79 = new int[257];
+      this.field81 = new boolean[256];
+      this.field82 = new boolean[16];
+      this.field83 = new byte[256];
+      this.field84 = new byte[4096];
+      this.field85 = new int[16];
+      this.field86 = new byte[18002];
+      this.field87 = new byte[18002];
+      this.field88 = new byte[6][258];
+      this.field89 = new int[6][258];
+      this.field90 = new int[6][258];
+      this.field91 = new int[6][258];
+      this.field92 = new int[6];
    }
 }
diff --git a/runescape-client/src/main/java/class211.java b/runescape-client/src/main/java/Calendar.java
similarity index 59%
rename from runescape-client/src/main/java/class211.java
rename to runescape-client/src/main/java/Calendar.java
index 73bb469301..cb8ef7e634 100644
--- a/runescape-client/src/main/java/class211.java
+++ b/runescape-client/src/main/java/Calendar.java
@@ -1,31 +1,29 @@
-import java.util.Calendar;
 import java.util.Date;
 import java.util.TimeZone;
 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("hg")
-public class class211 {
+@Implements("Calendar")
+public class Calendar {
    @ObfuscatedName("m")
-   static final String[][] __hg_m;
+   @Export("MONTH_NAMES_ENGLISH_GERMAN")
+   static final String[][] MONTH_NAMES_ENGLISH_GERMAN;
    @ObfuscatedName("f")
-   static final String[] __hg_f;
+   @Export("DAYS_OF_THE_WEEK")
+   static final String[] DAYS_OF_THE_WEEK;
    @ObfuscatedName("q")
-   static Calendar __hg_q;
+   @Export("Calendar_calendar")
+   static java.util.Calendar Calendar_calendar;
    @ObfuscatedName("em")
    @ObfuscatedSignature(
       signature = "Llg;"
    )
    @Export("spriteIds")
-   static SpriteIds spriteIds;
-
-   static {
-      __hg_m = 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"}};
-      __hg_f = new String[]{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
-      Calendar.getInstance(TimeZone.getTimeZone("Europe/London"));
-      __hg_q = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
-   }
+   static GraphicsDefaults spriteIds;
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
@@ -44,154 +42,154 @@ public class class211 {
    static int method4103(int var0, Script var1, boolean var2) {
       String var3;
       int var4;
-      if(var0 == 4100) {
+      if (var0 == ScriptOpcodes.APPEND_NUM) {
          var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
          var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
          Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + var4;
          return 1;
       } else {
-         String var9;
-         if(var0 == 4101) {
+         String var5;
+         if (var0 == ScriptOpcodes.APPEND) {
             Interpreter.Interpreter_stringStackSize -= 2;
             var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize];
-            var9 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
-            Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + var9;
+            var5 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
+            Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + var5;
             return 1;
-         } else if(var0 == 4102) {
+         } else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) {
             var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
             var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
             Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + ByteArrayPool.method4001(var4, true);
             return 1;
-         } else if(var0 == 4103) {
+         } else if (var0 == ScriptOpcodes.LOWERCASE) {
             var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
             Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.toLowerCase();
             return 1;
          } else {
             int var6;
-            int var10;
-            if(var0 == 4104) {
-               var10 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-               long var11 = ((long)var10 + 11745L) * 86400000L;
-               Interpreter.Interpreter_calendar.setTime(new Date(var11));
+            int var7;
+            if (var0 == ScriptOpcodes.FROMDATE) {
+               var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+               long var14 = ((long)var7 + 11745L) * 86400000L;
+               Interpreter.Interpreter_calendar.setTime(new Date(var14));
                var6 = Interpreter.Interpreter_calendar.get(5);
-               int var16 = Interpreter.Interpreter_calendar.get(2);
-               int var8 = Interpreter.Interpreter_calendar.get(1);
-               Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.__bv_z[var16] + "-" + var8;
+               int var15 = Interpreter.Interpreter_calendar.get(2);
+               int var16 = Interpreter.Interpreter_calendar.get(1);
+               Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var15] + "-" + var16;
                return 1;
-            } else if(var0 != 4105) {
-               if(var0 == 4106) {
-                  var10 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Integer.toString(var10);
+            } else if (var0 != ScriptOpcodes.TEXT_GENDER) {
+               if (var0 == ScriptOpcodes.TOSTRING) {
+                  var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Integer.toString(var7);
                   return 1;
-               } else if(var0 == 4107) {
+               } else if (var0 == ScriptOpcodes.COMPARE) {
                   Interpreter.Interpreter_stringStackSize -= 2;
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WallDecoration.method3256(AttackOption.method2033(Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1], Client.language));
                   return 1;
                } else {
-                  int var5;
-                  byte[] var13;
-                  Font var14;
-                  if(var0 == 4108) {
+                  int var8;
+                  byte[] var9;
+                  Font var10;
+                  if (var0 == ScriptOpcodes.PARAHEIGHT) {
                      var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
                      RouteStrategy.Interpreter_intStackSize -= 2;
                      var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-                     var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-                     var13 = ByteArrayPool.indexCache13.takeRecord(var5, 0);
-                     var14 = new Font(var13);
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var14.lineCount(var3, var4);
+                     var8 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
+                     var9 = ByteArrayPool.archive13.takeFile(var8, 0);
+                     var10 = new Font(var9);
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var10.lineCount(var3, var4);
                      return 1;
-                  } else if(var0 == 4109) {
+                  } else if (var0 == ScriptOpcodes.PARAWIDTH) {
                      var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
                      RouteStrategy.Interpreter_intStackSize -= 2;
                      var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-                     var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-                     var13 = ByteArrayPool.indexCache13.takeRecord(var5, 0);
-                     var14 = new Font(var13);
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var14.lineWidth(var3, var4);
+                     var8 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
+                     var9 = ByteArrayPool.archive13.takeFile(var8, 0);
+                     var10 = new Font(var9);
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var10.lineWidth(var3, var4);
                      return 1;
-                  } else if(var0 == 4110) {
+                  } else if (var0 == ScriptOpcodes.TEXT_SWITCH) {
                      Interpreter.Interpreter_stringStackSize -= 2;
                      var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize];
-                     var9 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
-                     if(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1) {
+                     var5 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
+                     if (Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1) {
                         Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3;
                      } else {
-                        Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9;
+                        Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5;
                      }
 
                      return 1;
-                  } else if(var0 == 4111) {
+                  } else if (var0 == ScriptOpcodes.ESCAPE) {
                      var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
                      Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3);
                      return 1;
-                  } else if(var0 == 4112) {
+                  } else if (var0 == ScriptOpcodes.APPEND_CHAR) {
                      var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
                      var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
                      Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3 + (char)var4;
                      return 1;
-                  } else if(var0 == 4113) {
-                     var10 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ChatChannel.method2238((char)var10)?1:0;
+                  } else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) {
+                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ChatChannel.isCharPrintable((char)var7) ? 1 : 0;
                      return 1;
-                  } else if(var0 == 4114) {
-                     var10 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = VarcInt.isAlphaNumeric((char)var10)?1:0;
+                  } else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) {
+                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = VarcInt.isAlphaNumeric((char)var7) ? 1 : 0;
                      return 1;
-                  } else if(var0 == 4115) {
-                     var10 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = UrlRequest.method3271((char)var10)?1:0;
+                  } else if (var0 == ScriptOpcodes.CHAR_ISALPHA) {
+                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = UrlRequest.isCharAlphabetic((char)var7) ? 1 : 0;
                      return 1;
-                  } else if(var0 == 4116) {
-                     var10 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class159.method3394((char)var10)?1:0;
+                  } else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) {
+                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class159.isCharDigit((char)var7) ? 1 : 0;
                      return 1;
-                  } else if(var0 == 4117) {
+                  } else if (var0 == ScriptOpcodes.STRING_LENGTH) {
                      var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-                     if(var3 != null) {
+                     if (var3 != null) {
                         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.length();
                      } else {
                         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
                      }
 
                      return 1;
-                  } else if(var0 == 4118) {
+                  } else if (var0 == ScriptOpcodes.SUBSTRING) {
                      var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
                      RouteStrategy.Interpreter_intStackSize -= 2;
                      var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-                     var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-                     Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.substring(var4, var5);
+                     var8 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
+                     Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.substring(var4, var8);
                      return 1;
-                  } else if(var0 == 4119) {
+                  } else if (var0 == ScriptOpcodes.REMOVETAGS) {
                      var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-                     StringBuilder var17 = new StringBuilder(var3.length());
-                     boolean var15 = false;
+                     StringBuilder var11 = new StringBuilder(var3.length());
+                     boolean var12 = false;
 
-                     for(var6 = 0; var6 < var3.length(); ++var6) {
-                        char var7 = var3.charAt(var6);
-                        if(var7 == '<') {
-                           var15 = true;
-                        } else if(var7 == '>') {
-                           var15 = false;
-                        } else if(!var15) {
-                           var17.append(var7);
+                     for (var6 = 0; var6 < var3.length(); ++var6) {
+                        char var13 = var3.charAt(var6);
+                        if (var13 == '<') {
+                           var12 = true;
+                        } else if (var13 == '>') {
+                           var12 = false;
+                        } else if (!var12) {
+                           var11.append(var13);
                         }
                      }
 
-                     Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var17.toString();
+                     Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.toString();
                      return 1;
-                  } else if(var0 == 4120) {
+                  } else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) {
                      var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
                      var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
                      Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.indexOf(var4);
                      return 1;
-                  } else if(var0 == 4121) {
+                  } else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) {
                      Interpreter.Interpreter_stringStackSize -= 2;
                      var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize];
-                     var9 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
-                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.indexOf(var9, var5);
+                     var5 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
+                     var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.indexOf(var5, var8);
                      return 1;
-                  } else if(var0 == 4122) {
+                  } else if (var0 == ScriptOpcodes.UPPERCASE) {
                      var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
                      Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.toUpperCase();
                      return 1;
@@ -202,9 +200,9 @@ public class class211 {
             } else {
                Interpreter.Interpreter_stringStackSize -= 2;
                var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize];
-               var9 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
-               if(Canvas.localPlayer.appearance != null && Canvas.localPlayer.appearance.isFemale) {
-                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var9;
+               var5 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
+               if (Canvas.localPlayer.appearance != null && Canvas.localPlayer.appearance.isFemale) {
+                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5;
                } else {
                   Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3;
                }
@@ -214,4 +212,11 @@ public class class211 {
          }
       }
    }
+
+   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"}};
+      DAYS_OF_THE_WEEK = new String[]{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
+      java.util.Calendar.getInstance(TimeZone.getTimeZone("Europe/London"));
+      Calendar_calendar = java.util.Calendar.getInstance(TimeZone.getTimeZone("GMT"));
+   }
 }
diff --git a/runescape-client/src/main/java/Canvas.java b/runescape-client/src/main/java/Canvas.java
index ccea55acb9..2908ce3715 100644
--- a/runescape-client/src/main/java/Canvas.java
+++ b/runescape-client/src/main/java/Canvas.java
@@ -10,17 +10,18 @@ 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("ao")
 @Implements("Canvas")
 public final class Canvas extends java.awt.Canvas {
    @ObfuscatedName("s")
-   public static String[] __ao_s;
+   public static String[] field94;
    @ObfuscatedName("gk")
    @ObfuscatedGetter(
       intValue = -1131782991
    )
-   static int __ao_gk;
+   static int field95;
    @ObfuscatedName("jk")
    @ObfuscatedSignature(
       signature = "Lbr;"
@@ -54,7 +55,7 @@ public final class Canvas extends java.awt.Canvas {
    )
    static String method860(Throwable var0) throws IOException {
       String var1;
-      if(var0 instanceof RunException) {
+      if (var0 instanceof RunException) {
          RunException var2 = (RunException)var0;
          var1 = var2.string + " | ";
          var0 = var2.throwable;
@@ -70,20 +71,20 @@ public final class Canvas extends java.awt.Canvas {
       BufferedReader var5 = new BufferedReader(new StringReader(var4));
       String var6 = var5.readLine();
 
-      while(true) {
-         while(true) {
+      while (true) {
+         while (true) {
             String var7 = var5.readLine();
-            if(var7 == null) {
+            if (var7 == null) {
                var1 = var1 + "| " + var6;
                return var1;
             }
 
             int var8 = var7.indexOf(40);
             int var9 = var7.indexOf(41, var8 + 1);
-            if(var8 >= 0 && var9 >= 0) {
+            if (var8 >= 0 && var9 >= 0) {
                String var10 = var7.substring(var8 + 1, var9);
                int var11 = var10.indexOf(".java:");
-               if(var11 >= 0) {
+               if (var11 >= 0) {
                   var10 = var10.substring(0, var11) + var10.substring(var11 + 5);
                   var1 = var1 + var10 + ' ';
                   continue;
@@ -117,70 +118,71 @@ public final class Canvas extends java.awt.Canvas {
    static int method861(int var0, Script var1, boolean var2) {
       int var3;
       int var4;
-      if(var0 == 100) {
+      Widget var5;
+      if (var0 == ScriptOpcodes.CC_CREATE) {
          RouteStrategy.Interpreter_intStackSize -= 3;
          var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
          var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-         int var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
-         if(var4 == 0) {
+         int var9 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
+         if (var4 == 0) {
             throw new RuntimeException();
          } else {
-            Widget var6 = Huffman.getWidget(var3);
-            if(var6.children == null) {
-               var6.children = new Widget[var5 + 1];
+            var5 = Huffman.getWidget(var3);
+            if (var5.children == null) {
+               var5.children = new Widget[var9 + 1];
             }
 
-            if(var6.children.length <= var5) {
-               Widget[] var7 = new Widget[var5 + 1];
+            if (var5.children.length <= var9) {
+               Widget[] var7 = new Widget[var9 + 1];
 
-               for(int var8 = 0; var8 < var6.children.length; ++var8) {
-                  var7[var8] = var6.children[var8];
+               for (int var8 = 0; var8 < var5.children.length; ++var8) {
+                  var7[var8] = var5.children[var8];
                }
 
-               var6.children = var7;
+               var5.children = var7;
             }
 
-            if(var5 > 0 && var6.children[var5 - 1] == null) {
-               throw new RuntimeException("" + (var5 - 1));
+            if (var9 > 0 && var5.children[var9 - 1] == null) {
+               throw new RuntimeException("" + (var9 - 1));
             } else {
-               Widget var12 = new Widget();
-               var12.type = var4;
-               var12.parentId = var12.id = var6.id;
-               var12.childIndex = var5;
-               var12.isIf3 = true;
-               var6.children[var5] = var12;
-               if(var2) {
-                  WorldMapIcon1.__t_i = var12;
+               Widget var10 = new Widget();
+               var10.type = var4;
+               var10.parentId = var10.id = var5.id;
+               var10.childIndex = var9;
+               var10.isIf3 = true;
+               var5.children[var9] = var10;
+               if (var2) {
+                  WorldMapIcon1.field1030 = var10;
                } else {
-                  class12.__n_n = var12;
+                  GrandExchangeOfferAgeComparator.field1111 = var10;
                }
 
-               class22.method295(var6);
+               WorldMapRectangle.method295(var5);
                return 1;
             }
          }
       } else {
-         Widget var9;
-         if(var0 == 101) {
-            var9 = var2?WorldMapIcon1.__t_i:class12.__n_n;
-            Widget var10 = Huffman.getWidget(var9.id);
-            var10.children[var9.childIndex] = null;
-            class22.method295(var10);
+         Widget var6;
+         if (var0 == ScriptOpcodes.CC_DELETE) {
+            var6 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111;
+            var5 = Huffman.getWidget(var6.id);
+            var5.children[var6.childIndex] = null;
+            WorldMapRectangle.method295(var5);
             return 1;
-         } else if(var0 == 102) {
-            var9 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
-            var9.children = null;
-            class22.method295(var9);
+         } else if (var0 == ScriptOpcodes.CC_DELETEALL) {
+            var6 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
+            var6.children = null;
+            WorldMapRectangle.method295(var6);
             return 1;
-         } else if(var0 != 200) {
-            if(var0 == 201) {
-               var9 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
-               if(var9 != null) {
+         } else if (var0 != ScriptOpcodes.CC_FIND) {
+            if (var0 == ScriptOpcodes.IF_FIND) {
+               var6 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
+               if (var6 != null) {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1;
-                  if(var2) {
-                     WorldMapIcon1.__t_i = var9;
+                  if (var2) {
+                     WorldMapIcon1.field1030 = var6;
                   } else {
-                     class12.__n_n = var9;
+                     GrandExchangeOfferAgeComparator.field1111 = var6;
                   }
                } else {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
@@ -194,13 +196,13 @@ public final class Canvas extends java.awt.Canvas {
             RouteStrategy.Interpreter_intStackSize -= 2;
             var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
             var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-            Widget var11 = class204.getWidgetChild(var3, var4);
-            if(var11 != null && var4 != -1) {
+            var5 = class204.getWidgetChild(var3, var4);
+            if (var5 != null && var4 != -1) {
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1;
-               if(var2) {
-                  WorldMapIcon1.__t_i = var11;
+               if (var2) {
+                  WorldMapIcon1.field1030 = var5;
                } else {
-                  class12.__n_n = var11;
+                  GrandExchangeOfferAgeComparator.field1111 = var5;
                }
             } else {
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
@@ -216,16 +218,16 @@ public final class Canvas extends java.awt.Canvas {
       signature = "(ILir;Ljava/lang/String;Ljava/lang/String;IZS)V",
       garbageValue = "-9124"
    )
-   public static void method858(int var0, AbstractIndexCache var1, String var2, String var3, int var4, boolean var5) {
-      int var6 = var1.getArchiveId(var2);
-      int var7 = var1.getRecordId(var6, var3);
-      class214.__hf_o = 1;
-      class214.__hf_u = var1;
-      class30.musicTrackArchiveId = var6;
+   public static void method858(int var0, AbstractArchive var1, String groupName, String fileName, int var4, boolean var5) {
+      int var6 = var1.getGroupId(groupName);
+      int var7 = var1.getFileId(var6, fileName);
+      class214.field1129 = 1;
+      class214.field1130 = var1;
+      class30.musicTrackGroupId = var6;
       GrandExchangeOffer.musicTrackFileId = var7;
-      WorldMapLabel.__aj_e = var4;
+      WorldMapLabel.field1039 = var4;
       RectangleMode.musicTrackBoolean = var5;
-      FaceNormal.__el_x = var0;
+      FaceNormal.field344 = var0;
    }
 
    @ObfuscatedName("ha")
@@ -234,27 +236,27 @@ public final class Canvas extends java.awt.Canvas {
       garbageValue = "-1032035944"
    )
    static final void method855() {
-      for(class68 var0 = (class68)Client.__client_kh.last(); var0 != null; var0 = (class68)Client.__client_kh.previous()) {
-         if(var0.field910 > 0) {
-            --var0.field910;
+      for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) {
+         if (var0.hitpoints > 0) {
+            --var0.hitpoints;
          }
 
-         if(var0.field910 == 0) {
-            if(var0.field903 < 0 || VarbitDefinition.method4910(var0.field903, var0.field905)) {
-               ParamKeyDefinition.method4933(var0.field911, var0.field906, var0.field913, var0.field901, var0.field903, var0.field904, var0.field905);
+         if (var0.hitpoints == 0) {
+            if (var0.field903 < 0 || VarbitDefinition.method4910(var0.field903, var0.field905)) {
+               ParamDefinition.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.field903, var0.field904, var0.field905);
                var0.remove();
             }
          } else {
-            if(var0.field909 > 0) {
-               --var0.field909;
+            if (var0.delay > 0) {
+               --var0.delay;
             }
 
-            if(var0.field909 == 0 && var0.field913 >= 1 && var0.field901 >= 1 && var0.field913 <= 102 && var0.field901 <= 102 && (var0.field899 < 0 || VarbitDefinition.method4910(var0.field899, var0.field908))) {
-               ParamKeyDefinition.method4933(var0.field911, var0.field906, var0.field913, var0.field901, var0.field899, var0.field907, var0.field908);
-               var0.field909 = -1;
-               if(var0.field903 == var0.field899 && var0.field903 == -1) {
+            if (var0.delay == 0 && var0.x >= 1 && var0.y >= 1 && var0.x <= 102 && var0.y <= 102 && (var0.id < 0 || VarbitDefinition.method4910(var0.id, var0.field908))) {
+               ParamDefinition.addPendingSpawnToScene(var0.plane, var0.type, var0.x, var0.y, var0.id, var0.orientation, var0.field908);
+               var0.delay = -1;
+               if (var0.field903 == var0.id && var0.field903 == -1) {
                   var0.remove();
-               } else if(var0.field899 == var0.field903 && var0.field904 == var0.field907 && var0.field908 == var0.field905) {
+               } else if (var0.id == var0.field903 && var0.field904 == var0.orientation && var0.field908 == var0.field905) {
                   var0.remove();
                }
             }
diff --git a/runescape-client/src/main/java/ChatChannel.java b/runescape-client/src/main/java/ChatChannel.java
index 66e6aaea2f..a82d79c56d 100644
--- a/runescape-client/src/main/java/ChatChannel.java
+++ b/runescape-client/src/main/java/ChatChannel.java
@@ -30,25 +30,25 @@ public class ChatChannel {
       garbageValue = "463993373"
    )
    @Export("addMessage")
-   Message addMessage(int var1, String var2, String var3, String var4) {
+   Message addMessage(int type, String sender, String text, String prefix) {
       Message var5 = this.messages[99];
 
-      for(int var6 = this.count; var6 > 0; --var6) {
-         if(var6 != 100) {
+      for (int var6 = this.count; var6 > 0; --var6) {
+         if (var6 != 100) {
             this.messages[var6] = this.messages[var6 - 1];
          }
       }
 
-      if(var5 == null) {
-         var5 = new Message(var1, var2, var4, var3);
+      if (var5 == null) {
+         var5 = new Message(type, sender, prefix, text);
       } else {
          var5.remove();
          var5.removeDual();
-         var5.set(var1, var2, var4, var3);
+         var5.set(type, sender, prefix, text);
       }
 
       this.messages[0] = var5;
-      if(this.count < 100) {
+      if (this.count < 100) {
          ++this.count;
       }
 
@@ -61,8 +61,8 @@ public class ChatChannel {
       garbageValue = "-195254780"
    )
    @Export("getMessage")
-   Message getMessage(int var1) {
-      return var1 >= 0 && var1 < this.count?this.messages[var1]:null;
+   Message getMessage(int index) {
+      return index >= 0 && index < this.count ? this.messages[index] : null;
    }
 
    @ObfuscatedName("q")
@@ -80,8 +80,9 @@ public class ChatChannel {
       signature = "(CI)Z",
       garbageValue = "-1857344803"
    )
-   public static boolean method2238(char var0) {
-      return var0 >= ' ' && var0 <= '~'?true:(var0 >= 160 && var0 <= 255?true:var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376);
+   @Export("isCharPrintable")
+   public static boolean isCharPrintable(char var0) {
+      return var0 >= ' ' && var0 <= '~' ? true : (var0 >= 160 && var0 <= 255 ? true : var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376);
    }
 
    @ObfuscatedName("fk")
@@ -90,19 +91,19 @@ public class ChatChannel {
       garbageValue = "911583338"
    )
    static final void method2225(Actor var0) {
-      var0.__ay = false;
+      var0.field10 = false;
       SequenceDefinition var1;
-      if(var0.movementSequence != -1) {
+      if (var0.movementSequence != -1) {
          var1 = WorldMapAreaData.getSequenceDefinition(var0.movementSequence);
-         if(var1 != null && var1.frameIds != null) {
+         if (var1 != null && var1.frameIds != null) {
             ++var0.movementFrameCycle;
-            if(var0.movementFrame < var1.frameIds.length && var0.movementFrameCycle > var1.frameLengths[var0.movementFrame]) {
+            if (var0.movementFrame < var1.frameIds.length && var0.movementFrameCycle > var1.frameLengths[var0.movementFrame]) {
                var0.movementFrameCycle = 1;
                ++var0.movementFrame;
                Script.method2201(var1, var0.movementFrame, var0.x, var0.y);
             }
 
-            if(var0.movementFrame >= var1.frameIds.length) {
+            if (var0.movementFrame >= var1.frameIds.length) {
                var0.movementFrameCycle = 0;
                var0.movementFrame = 0;
                Script.method2201(var1, var0.movementFrame, var0.x, var0.y);
@@ -112,23 +113,23 @@ public class ChatChannel {
          }
       }
 
-      if(var0.spotAnimation != -1 && Client.cycle >= var0.__bt) {
-         if(var0.spotAnimationFrame < 0) {
+      if (var0.spotAnimation != -1 && Client.cycle >= var0.field14) {
+         if (var0.spotAnimationFrame < 0) {
             var0.spotAnimationFrame = 0;
          }
 
-         int var3 = class50.getSpotAnimationDefinition(var0.spotAnimation).sequence;
-         if(var3 != -1) {
-            SequenceDefinition var2 = WorldMapAreaData.getSequenceDefinition(var3);
-            if(var2 != null && var2.frameIds != null) {
+         int var2 = class50.getSpotAnimationDefinition(var0.spotAnimation).sequence;
+         if (var2 != -1) {
+            SequenceDefinition var3 = WorldMapAreaData.getSequenceDefinition(var2);
+            if (var3 != null && var3.frameIds != null) {
                ++var0.spotAnimationFrameCycle;
-               if(var0.spotAnimationFrame < var2.frameIds.length && var0.spotAnimationFrameCycle > var2.frameLengths[var0.spotAnimationFrame]) {
+               if (var0.spotAnimationFrame < var3.frameIds.length && var0.spotAnimationFrameCycle > var3.frameLengths[var0.spotAnimationFrame]) {
                   var0.spotAnimationFrameCycle = 1;
                   ++var0.spotAnimationFrame;
-                  Script.method2201(var2, var0.spotAnimationFrame, var0.x, var0.y);
+                  Script.method2201(var3, var0.spotAnimationFrame, var0.x, var0.y);
                }
 
-               if(var0.spotAnimationFrame >= var2.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var2.frameIds.length)) {
+               if (var0.spotAnimationFrame >= var3.frameIds.length && (var0.spotAnimationFrame < 0 || var0.spotAnimationFrame >= var3.frameIds.length)) {
                   var0.spotAnimation = -1;
                }
             } else {
@@ -139,43 +140,43 @@ public class ChatChannel {
          }
       }
 
-      if(var0.sequence != -1 && var0.sequenceDelay <= 1) {
+      if (var0.sequence != -1 && var0.sequenceDelay <= 1) {
          var1 = WorldMapAreaData.getSequenceDefinition(var0.sequence);
-         if(var1.__j == 1 && var0.__ch > 0 && var0.__bw <= Client.cycle && var0.__cr < Client.cycle) {
+         if (var1.field781 == 1 && var0.field25 > 0 && var0.field19 <= Client.cycle && var0.field20 < Client.cycle) {
             var0.sequenceDelay = 1;
             return;
          }
       }
 
-      if(var0.sequence != -1 && var0.sequenceDelay == 0) {
+      if (var0.sequence != -1 && var0.sequenceDelay == 0) {
          var1 = WorldMapAreaData.getSequenceDefinition(var0.sequence);
-         if(var1 != null && var1.frameIds != null) {
+         if (var1 != null && var1.frameIds != null) {
             ++var0.sequenceFrameCycle;
-            if(var0.sequenceFrame < var1.frameIds.length && var0.sequenceFrameCycle > var1.frameLengths[var0.sequenceFrame]) {
+            if (var0.sequenceFrame < var1.frameIds.length && var0.sequenceFrameCycle > var1.frameLengths[var0.sequenceFrame]) {
                var0.sequenceFrameCycle = 1;
                ++var0.sequenceFrame;
                Script.method2201(var1, var0.sequenceFrame, var0.x, var0.y);
             }
 
-            if(var0.sequenceFrame >= var1.frameIds.length) {
+            if (var0.sequenceFrame >= var1.frameIds.length) {
                var0.sequenceFrame -= var1.frameCount;
-               ++var0.__bj;
-               if(var0.__bj >= var1.__z) {
+               ++var0.field13;
+               if (var0.field13 >= var1.field780) {
                   var0.sequence = -1;
-               } else if(var0.sequenceFrame >= 0 && var0.sequenceFrame < var1.frameIds.length) {
+               } else if (var0.sequenceFrame >= 0 && var0.sequenceFrame < var1.frameIds.length) {
                   Script.method2201(var1, var0.sequenceFrame, var0.x, var0.y);
                } else {
                   var0.sequence = -1;
                }
             }
 
-            var0.__ay = var1.__k;
+            var0.field10 = var1.field778;
          } else {
             var0.sequence = -1;
          }
       }
 
-      if(var0.sequenceDelay > 0) {
+      if (var0.sequenceDelay > 0) {
          --var0.sequenceDelay;
       }
 
@@ -187,162 +188,163 @@ public class ChatChannel {
       garbageValue = "94"
    )
    static final void method2237(Widget var0, int var1, int var2) {
-      if(var0.buttonType == 1) {
+      if (var0.buttonType == 1) {
          Tiles.insertMenuItemNoShift(var0.buttonText, "", 24, 0, 0, var0.id);
       }
 
       String var3;
-      if(var0.buttonType == 2 && !Client.isSpellSelected) {
+      if (var0.buttonType == 2 && !Client.isSpellSelected) {
          var3 = class198.method3745(var0);
-         if(var3 != null) {
+         if (var3 != null) {
             Tiles.insertMenuItemNoShift(var3, BufferedFile.colorStartTag(65280) + var0.spellName, 25, 0, -1, var0.id);
          }
       }
 
-      if(var0.buttonType == 3) {
+      if (var0.buttonType == 3) {
          Tiles.insertMenuItemNoShift("Close", "", 26, 0, 0, var0.id);
       }
 
-      if(var0.buttonType == 4) {
+      if (var0.buttonType == 4) {
          Tiles.insertMenuItemNoShift(var0.buttonText, "", 28, 0, 0, var0.id);
       }
 
-      if(var0.buttonType == 5) {
+      if (var0.buttonType == 5) {
          Tiles.insertMenuItemNoShift(var0.buttonText, "", 29, 0, 0, var0.id);
       }
 
-      if(var0.buttonType == 6 && Client.__client_mo == null) {
+      if (var0.buttonType == 6 && Client.field127 == null) {
          Tiles.insertMenuItemNoShift(var0.buttonText, "", 30, 0, -1, var0.id);
       }
 
       int var4;
       int var5;
-      int var13;
-      if(var0.type == 2) {
-         var13 = 0;
+      int var6;
+      if (var0.type == 2) {
+         var6 = 0;
 
-         for(var4 = 0; var4 < var0.height; ++var4) {
-            for(var5 = 0; var5 < var0.width; ++var5) {
-               int var6 = (var0.paddingX + 32) * var5;
-               int var7 = (var0.paddingY + 32) * var4;
-               if(var13 < 20) {
-                  var6 += var0.inventoryXOffsets[var13];
-                  var7 += var0.inventoryYOffsets[var13];
+         for (var4 = 0; var4 < var0.height; ++var4) {
+            for (var5 = 0; var5 < var0.width; ++var5) {
+               int var7 = (var0.paddingX + 32) * var5;
+               int var8 = (var0.paddingY + 32) * var4;
+               if (var6 < 20) {
+                  var7 += var0.inventoryXOffsets[var6];
+                  var8 += var0.inventoryYOffsets[var6];
                }
 
-               if(var1 >= var6 && var2 >= var7 && var1 < var6 + 32 && var2 < var7 + 32) {
-                  Client.dragItemSlotDestination = var13;
-                  UserComparator6.__fg_jh = var0;
-                  if(var0.itemIds[var13] > 0) {
-                     ItemDefinition var8 = Skills.getItemDefinition(var0.itemIds[var13] - 1);
-                     if(Client.isItemSelected == 1 && WorldMapAreaData.method708(class1.getWidgetClickMask(var0))) {
-                        if(var0.id != ServerPacket.selectedItemWidget || var13 != HealthBarDefinition.selectedItemSlot) {
-                           Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + BufferedFile.colorStartTag(16748608) + var8.name, 31, var8.id, var13, var0.id);
+               if (var1 >= var7 && var2 >= var8 && var1 < var7 + 32 && var2 < var8 + 32) {
+                  Client.dragItemSlotDestination = var6;
+                  UserComparator6.field937 = var0;
+                  if (var0.itemIds[var6] > 0) {
+                     ItemDefinition var9 = Skills.getItemDefinition(var0.itemIds[var6] - 1);
+                     if (Client.isItemSelected == 1 && WorldMapAreaData.method708(class1.getWidgetClickMask(var0))) {
+                        if (var0.id != ServerPacket.selectedItemWidget || var6 != HealthBarDefinition.selectedItemSlot) {
+                           Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " -> " + BufferedFile.colorStartTag(16748608) + var9.name, 31, var9.id, var6, var0.id);
                         }
-                     } else if(Client.isSpellSelected && WorldMapAreaData.method708(class1.getWidgetClickMask(var0))) {
-                        if((FloorDecoration.selectedSpellFlags & 16) == 16) {
-                           Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + BufferedFile.colorStartTag(16748608) + var8.name, 32, var8.id, var13, var0.id);
+                     } else if (Client.isSpellSelected && WorldMapAreaData.method708(class1.getWidgetClickMask(var0))) {
+                        if ((FloorDecoration.selectedSpellFlags & 16) == 16) {
+                           Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + BufferedFile.colorStartTag(16748608) + var9.name, 32, var9.id, var6, var0.id);
                         }
                      } else {
-                        String[] var9 = var8.inventoryActions;
-                        int var10 = -1;
-                        if(Client.shiftClickDrop && WorldMapEvent.method779()) {
-                           var10 = var8.getShiftClickIndex();
+                        String[] var10 = var9.inventoryActions;
+                        int var11 = -1;
+                        if (Client.shiftClickDrop && WorldMapEvent.isShiftPressed()) {
+                           var11 = var9.getShiftClickIndex();
                         }
 
-                        int var11;
-                        if(WorldMapAreaData.method708(class1.getWidgetClickMask(var0))) {
-                           for(var11 = 4; var11 >= 3; --var11) {
-                              if(var10 != var11) {
-                                 AccessFile.addWidgetItemMenuItem(var0, var8, var13, var11, false);
+                        int var12;
+                        if (WorldMapAreaData.method708(class1.getWidgetClickMask(var0))) {
+                           for (var12 = 4; var12 >= 3; --var12) {
+                              if (var11 != var12) {
+                                 AccessFile.addWidgetItemMenuItem(var0, var9, var6, var12, false);
                               }
                            }
                         }
 
-                        if(SecureRandomFuture.method2101(class1.getWidgetClickMask(var0))) {
-                           Tiles.insertMenuItemNoShift("Use", BufferedFile.colorStartTag(16748608) + var8.name, 38, var8.id, var13, var0.id);
+                        if (SecureRandomFuture.method2101(class1.getWidgetClickMask(var0))) {
+                           Tiles.insertMenuItemNoShift("Use", BufferedFile.colorStartTag(16748608) + var9.name, 38, var9.id, var6, var0.id);
                         }
 
-                        if(WorldMapAreaData.method708(class1.getWidgetClickMask(var0))) {
-                           for(var11 = 2; var11 >= 0; --var11) {
-                              if(var11 != var10) {
-                                 AccessFile.addWidgetItemMenuItem(var0, var8, var13, var11, false);
+                        if (WorldMapAreaData.method708(class1.getWidgetClickMask(var0))) {
+                           for (var12 = 2; var12 >= 0; --var12) {
+                              if (var12 != var11) {
+                                 AccessFile.addWidgetItemMenuItem(var0, var9, var6, var12, false);
                               }
                            }
 
-                           if(var10 >= 0) {
-                              AccessFile.addWidgetItemMenuItem(var0, var8, var13, var10, true);
+                           if (var11 >= 0) {
+                              AccessFile.addWidgetItemMenuItem(var0, var9, var6, var11, true);
                            }
                         }
 
-                        var9 = var0.itemActions;
-                        if(var9 != null) {
-                           for(var11 = 4; var11 >= 0; --var11) {
-                              if(var9[var11] != null) {
-                                 byte var12 = 0;
-                                 if(var11 == 0) {
-                                    var12 = 39;
+                        var10 = var0.itemActions;
+                        if (var10 != null) {
+                           for (var12 = 4; var12 >= 0; --var12) {
+                              if (var10[var12] != null) {
+                                 byte var13 = 0;
+                                 if (var12 == 0) {
+                                    var13 = 39;
                                  }
 
-                                 if(var11 == 1) {
-                                    var12 = 40;
+                                 if (var12 == 1) {
+                                    var13 = 40;
                                  }
 
-                                 if(var11 == 2) {
-                                    var12 = 41;
+                                 if (var12 == 2) {
+                                    var13 = 41;
                                  }
 
-                                 if(var11 == 3) {
-                                    var12 = 42;
+                                 if (var12 == 3) {
+                                    var13 = 42;
                                  }
 
-                                 if(var11 == 4) {
-                                    var12 = 43;
+                                 if (var12 == 4) {
+                                    var13 = 43;
                                  }
 
-                                 Tiles.insertMenuItemNoShift(var9[var11], BufferedFile.colorStartTag(0xff9040) + var8.name, var12, var8.id, var13, var0.id);
+                                 Tiles.insertMenuItemNoShift(var10[var12], BufferedFile.colorStartTag(16748608) + var9.name, var13, var9.id, var6, var0.id);
                               }
                            }
                         }
 
-                        Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(0xff9040) + var8.name, 1005, var8.id, var13, var0.id);
+                        Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(16748608) + var9.name, 1005, var9.id, var6, var0.id);
                      }
                   }
                }
 
-               ++var13;
+               ++var6;
             }
          }
       }
 
-      if(var0.isIf3) {
-         if(Client.isSpellSelected) {
-            if(WorldComparator.method58(class1.getWidgetClickMask(var0)) && (FloorDecoration.selectedSpellFlags & 32) == 32) {
-               Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + var0.dataText, 58, 0, var0.childIndex, var0.id);
+      if (var0.isIf3) {
+         if (Client.isSpellSelected) {
+            if (GrandExchangeOfferWorldComparator.method58(class1.getWidgetClickMask(var0)) && (FloorDecoration.selectedSpellFlags & 32) == 32) {
+               Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + var0.dataText, 58, 0, var0.childIndex, var0.id);
             }
          } else {
-            for(var13 = 9; var13 >= 5; --var13) {
-               String var14 = GameShell.method1060(var0, var13);
-               if(var14 != null) {
-                  Tiles.insertMenuItemNoShift(var14, var0.dataText, 1007, var13 + 1, var0.childIndex, var0.id);
+            String var14;
+            for (var6 = 9; var6 >= 5; --var6) {
+               var14 = GameShell.method1060(var0, var6);
+               if (var14 != null) {
+                  Tiles.insertMenuItemNoShift(var14, var0.dataText, 1007, var6 + 1, var0.childIndex, var0.id);
                }
             }
 
             var3 = class198.method3745(var0);
-            if(var3 != null) {
+            if (var3 != null) {
                Tiles.insertMenuItemNoShift(var3, var0.dataText, 25, 0, var0.childIndex, var0.id);
             }
 
-            for(var4 = 4; var4 >= 0; --var4) {
-               String var15 = GameShell.method1060(var0, var4);
-               if(var15 != null) {
-                  class16.insertMenuItem(var15, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.__fz);
+            for (var4 = 4; var4 >= 0; --var4) {
+               var14 = GameShell.method1060(var0, var4);
+               if (var14 != null) {
+                  class16.insertMenuItem(var14, var0.dataText, 57, var4 + 1, var0.childIndex, var0.id, var0.field985);
                }
             }
 
             var5 = class1.getWidgetClickMask(var0);
-            boolean var16 = (var5 & 1) != 0;
-            if(var16) {
+            boolean var15 = (var5 & 1) != 0;
+            if (var15) {
                Tiles.insertMenuItemNoShift("Continue", "", 30, 0, var0.childIndex, var0.id);
             }
          }
diff --git a/runescape-client/src/main/java/ClanChat.java b/runescape-client/src/main/java/ClanChat.java
index 608c06c72c..8128276a66 100644
--- a/runescape-client/src/main/java/ClanChat.java
+++ b/runescape-client/src/main/java/ClanChat.java
@@ -26,7 +26,8 @@ public class ClanChat extends UserList {
    @Export("owner")
    public String owner;
    @ObfuscatedName("k")
-   public byte __k;
+   @Export("minKick")
+   public byte minKick;
    @ObfuscatedName("n")
    @ObfuscatedGetter(
       intValue = -1534670751
@@ -37,7 +38,7 @@ public class ClanChat extends UserList {
    @ObfuscatedGetter(
       intValue = 386706253
    )
-   int __i;
+   int field97;
 
    @ObfuscatedSignature(
       signature = "(Llx;Lky;)V"
@@ -46,7 +47,7 @@ public class ClanChat extends UserList {
       super(100);
       this.name = null;
       this.owner = null;
-      this.__i = 1;
+      this.field97 = 1;
       this.loginType = var1;
       this.localUser = var2;
    }
@@ -76,7 +77,7 @@ public class ClanChat extends UserList {
       signature = "(Ljava/lang/String;I)V",
       garbageValue = "242122326"
    )
-   final void __q_472(String var1) {
+   final void method76(String var1) {
       this.name = HealthBarUpdate.method1722(var1);
    }
 
@@ -85,7 +86,7 @@ public class ClanChat extends UserList {
       signature = "(Ljava/lang/String;B)V",
       garbageValue = "103"
    )
-   final void __x_473(String var1) {
+   final void method77(String var1) {
       this.owner = HealthBarUpdate.method1722(var1);
    }
 
@@ -95,52 +96,52 @@ public class ClanChat extends UserList {
       garbageValue = "455791964"
    )
    @Export("readUpdate")
-   public final void readUpdate(Buffer var1) {
-      this.__x_473(var1.readStringCp1252NullTerminated());
-      long var2 = var1.readLong();
-      long var5 = var2;
-      String var4;
+   public final void readUpdate(Buffer buffer) {
+      this.method77(buffer.readStringCp1252NullTerminated());
+      long var2 = buffer.readLong();
+      long var4 = var2;
+      String var6;
       int var7;
-      if(var2 > 0L && var2 < 6582952005840035281L) {
-         if(var2 % 37L == 0L) {
-            var4 = null;
+      if (var2 > 0L && var2 < 6582952005840035281L) {
+         if (var2 % 37L == 0L) {
+            var6 = null;
          } else {
             var7 = 0;
 
-            for(long var13 = var2; var13 != 0L; var13 /= 37L) {
+            for (long var8 = var2; var8 != 0L; var8 /= 37L) {
                ++var7;
             }
 
-            StringBuilder var15 = new StringBuilder(var7);
+            StringBuilder var11 = new StringBuilder(var7);
 
-            while(var5 != 0L) {
-               long var11 = var5;
-               var5 /= 37L;
-               var15.append(class306.base37Table[(int)(var11 - 37L * var5)]);
+            while (var4 != 0L) {
+               long var9 = var4;
+               var4 /= 37L;
+               var11.append(class306.base37Table[(int)(var9 - 37L * var4)]);
             }
 
-            var4 = var15.reverse().toString();
+            var6 = var11.reverse().toString();
          }
       } else {
-         var4 = null;
+         var6 = null;
       }
 
-      this.__q_472(var4);
-      this.__k = var1.readByte();
-      var7 = var1.readUnsignedByte();
-      if(var7 != 255) {
+      this.method76(var6);
+      this.minKick = buffer.readByte();
+      var7 = buffer.readUnsignedByte();
+      if (var7 != 255) {
          this.clear();
 
-         for(int var8 = 0; var8 < var7; ++var8) {
-            ClanMate var9 = (ClanMate)this.addLastNoPreviousUsername(new Username(var1.readStringCp1252NullTerminated(), this.loginType));
-            int var10 = var1.__ag_302();
-            var9.set(var10, ++this.__i - 1);
-            var9.rank = var1.readByte();
-            var1.readStringCp1252NullTerminated();
-            this.__cp_475(var9);
+         for (int var12 = 0; var12 < var7; ++var12) {
+            ClanMate var13 = (ClanMate)this.addLastNoPreviousUsername(new Username(buffer.readStringCp1252NullTerminated(), this.loginType));
+            int var10 = buffer.readUnsignedShort();
+            var13.set(var10, ++this.field97 - 1);
+            var13.rank = buffer.readByte();
+            buffer.readStringCp1252NullTerminated();
+            this.method79(var13);
          }
-
       }
+
    }
 
    @ObfuscatedName("a")
@@ -148,39 +149,39 @@ public class ClanChat extends UserList {
       signature = "(Lgr;B)V",
       garbageValue = "24"
    )
-   public final void __a_474(Buffer var1) {
+   public final void method78(Buffer var1) {
       Username var2 = new Username(var1.readStringCp1252NullTerminated(), this.loginType);
-      int var3 = var1.__ag_302();
+      int var3 = var1.readUnsignedShort();
       byte var4 = var1.readByte();
       boolean var5 = false;
-      if(var4 == -128) {
+      if (var4 == -128) {
          var5 = true;
       }
 
       ClanMate var6;
-      if(var5) {
-         if(this.size() == 0) {
+      if (var5) {
+         if (this.size() == 0) {
             return;
          }
 
          var6 = (ClanMate)this.getByCurrentUsername(var2);
-         if(var6 != null && var6.world() == var3) {
+         if (var6 != null && var6.getWorld() == var3) {
             this.remove(var6);
          }
       } else {
          var1.readStringCp1252NullTerminated();
          var6 = (ClanMate)this.getByCurrentUsername(var2);
-         if(var6 == null) {
-            if(this.size() > super.capacity) {
+         if (var6 == null) {
+            if (this.size() > super.capacity) {
                return;
             }
 
             var6 = (ClanMate)this.addLastNoPreviousUsername(var2);
          }
 
-         var6.set(var3, ++this.__i - 1);
+         var6.set(var3, ++this.field97 - 1);
          var6.rank = var4;
-         this.__cp_475(var6);
+         this.method79(var6);
       }
 
    }
@@ -192,7 +193,7 @@ public class ClanChat extends UserList {
    )
    @Export("clearFriends")
    public final void clearFriends() {
-      for(int var1 = 0; var1 < this.size(); ++var1) {
+      for (int var1 = 0; var1 < this.size(); ++var1) {
          ((ClanMate)this.get(var1)).clearIsFriend();
       }
 
@@ -205,7 +206,7 @@ public class ClanChat extends UserList {
    )
    @Export("clearIgnoreds")
    public final void clearIgnoreds() {
-      for(int var1 = 0; var1 < this.size(); ++var1) {
+      for (int var1 = 0; var1 < this.size(); ++var1) {
          ((ClanMate)this.get(var1)).clearIsIgnored();
       }
 
@@ -216,8 +217,8 @@ public class ClanChat extends UserList {
       signature = "(Ljk;I)V",
       garbageValue = "-128608554"
    )
-   final void __cp_475(ClanMate var1) {
-      if(var1.username().equals(this.localUser.username())) {
+   final void method79(ClanMate var1) {
+      if (var1.getUsername().equals(this.localUser.username())) {
          this.rank = var1.rank;
       }
 
diff --git a/runescape-client/src/main/java/ClanMate.java b/runescape-client/src/main/java/ClanMate.java
index 1939253721..0888815189 100644
--- a/runescape-client/src/main/java/ClanMate.java
+++ b/runescape-client/src/main/java/ClanMate.java
@@ -41,7 +41,7 @@ public class ClanMate extends Buddy {
    )
    @Export("isFriend")
    public final boolean isFriend() {
-      if(this.isFriend0 == TriBool.TriBool_unknown) {
+      if (this.isFriend0 == TriBool.TriBool_unknown) {
          this.fillIsFriend();
       }
 
@@ -55,7 +55,7 @@ public class ClanMate extends Buddy {
    )
    @Export("fillIsFriend")
    void fillIsFriend() {
-      this.isFriend0 = WorldMapArea.friendSystem.friendsList.contains(super.username0)?TriBool.TriBool_true:TriBool.TriBool_false;
+      this.isFriend0 = WorldMapArea.friendSystem.friendsList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false;
    }
 
    @ObfuscatedName("w")
@@ -75,7 +75,7 @@ public class ClanMate extends Buddy {
    )
    @Export("isIgnored")
    public final boolean isIgnored() {
-      if(this.isIgnored0 == TriBool.TriBool_unknown) {
+      if (this.isIgnored0 == TriBool.TriBool_unknown) {
          this.fillIsIgnored();
       }
 
@@ -89,6 +89,6 @@ public class ClanMate extends Buddy {
    )
    @Export("fillIsIgnored")
    void fillIsIgnored() {
-      this.isIgnored0 = WorldMapArea.friendSystem.ignoreList.contains(super.username0)?TriBool.TriBool_true:TriBool.TriBool_false;
+      this.isIgnored0 = WorldMapArea.friendSystem.ignoreList.contains(super.username) ? TriBool.TriBool_true : TriBool.TriBool_false;
    }
 }
diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java
index 413e46bf08..86bf250252 100644
--- a/runescape-client/src/main/java/Client.java
+++ b/runescape-client/src/main/java/Client.java
@@ -18,8 +18,8 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = -783816509
    )
-   @Export("rootWidgetGroup")
-   static int rootWidgetGroup;
+   @Export("rootInterface")
+   static int rootInterface;
    @ObfuscatedName("mc")
    @ObfuscatedSignature(
       signature = "Lho;"
@@ -30,7 +30,7 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = 1348053843
    )
-   static int __client_oo;
+   static int field98;
    @ObfuscatedName("os")
    @ObfuscatedGetter(
       intValue = -546798303
@@ -41,15 +41,15 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       longValue = 8818983958751331899L
    )
-   static long __client_oa;
+   static long field99;
    @ObfuscatedName("od")
-   static boolean[] __client_od;
+   static boolean[] field100;
    @ObfuscatedName("oq")
-   static boolean[] __client_oq;
+   static boolean[] field101;
    @ObfuscatedName("ot")
-   static boolean[] __client_ot;
+   static boolean[] field102;
    @ObfuscatedName("nt")
-   static boolean __client_nt;
+   static boolean field103;
    @ObfuscatedName("ng")
    @ObfuscatedGetter(
       intValue = -1379876433
@@ -63,16 +63,16 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = -451622431
    )
-   public static int __client_ss;
+   public static int field104;
    @ObfuscatedName("na")
    @ObfuscatedGetter(
       intValue = -934082817
    )
-   static int __client_na;
+   static int field105;
    @ObfuscatedName("nn")
-   static boolean __client_nn;
+   static boolean field106;
    @ObfuscatedName("qq")
-   static boolean __client_qq;
+   static boolean field107;
    @ObfuscatedName("mt")
    @ObfuscatedGetter(
       intValue = -1972775883
@@ -89,7 +89,7 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = -843739713
    )
-   static int __client_nw;
+   static int field108;
    @ObfuscatedName("mr")
    @ObfuscatedSignature(
       signature = "Lho;"
@@ -103,8 +103,8 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedSignature(
       signature = "Lld;"
    )
-   @Export("widgetGroupParents")
-   static NodeHashTable widgetGroupParents;
+   @Export("interfaceParents")
+   static NodeHashTable interfaceParents;
    @ObfuscatedName("oy")
    @Export("rootWidgetXs")
    static int[] rootWidgetXs;
@@ -112,7 +112,7 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = 1939745821
    )
-   static int __client_nl;
+   static int field109;
    @ObfuscatedName("mx")
    @ObfuscatedSignature(
       signature = "Lho;"
@@ -132,8 +132,8 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = 821563709
    )
-   @Export("rights")
-   static int rights;
+   @Export("staffModLevel")
+   static int staffModLevel;
    @ObfuscatedName("oi")
    @Export("rootWidgetYs")
    static int[] rootWidgetYs;
@@ -161,12 +161,12 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = 1019025247
    )
-   static int __client_nk;
+   static int field110;
    @ObfuscatedName("np")
    @ObfuscatedGetter(
       intValue = 1881890525
    )
-   static int __client_np;
+   static int field111;
    @ObfuscatedName("pd")
    @ObfuscatedGetter(
       intValue = -362336323
@@ -183,11 +183,11 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = -34294211
    )
-   static int __client_qy;
+   static int field112;
    @ObfuscatedName("tp")
-   static int[] __client_tp;
+   static int[] field113;
    @ObfuscatedName("th")
-   static int[] __client_th;
+   static int[] field114;
    @ObfuscatedName("ny")
    @Export("isDraggingWidget")
    static boolean isDraggingWidget;
@@ -219,24 +219,25 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = -818676431
    )
-   static int __client_qc;
+   static int field115;
    @ObfuscatedName("nz")
-   static int[] __client_nz;
+   static int[] field116;
    @ObfuscatedName("ns")
    @ObfuscatedGetter(
       intValue = 743073293
    )
-   static int __client_ns;
+   static int field117;
    @ObfuscatedName("sd")
    @ObfuscatedGetter(
       intValue = 944933439
    )
-   static int __client_sd;
+   static int field118;
    @ObfuscatedName("ru")
    @ObfuscatedSignature(
       signature = "Lhi;"
    )
-   static PlayerAppearance __client_ru;
+   @Export("playerAppearance")
+   static PlayerAppearance playerAppearance;
    @ObfuscatedName("qa")
    @ObfuscatedGetter(
       intValue = -1481002083
@@ -253,13 +254,13 @@ public final class Client extends GameShell implements Usernamed {
    @Export("soundEffectIds")
    static int[] soundEffectIds;
    @ObfuscatedName("sy")
-   @Export("indexCacheLoaders")
-   static ArrayList indexCacheLoaders;
+   @Export("archiveLoaders")
+   static ArrayList archiveLoaders;
    @ObfuscatedName("sl")
    @ObfuscatedGetter(
       intValue = -1605855913
    )
-   static int __client_sl;
+   static int field120;
    @ObfuscatedName("md")
    @ObfuscatedSignature(
       signature = "Lho;"
@@ -270,8 +271,8 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = -1546210597
    )
-   @Export("indexCacheLoaderIndex")
-   static int indexCacheLoaderIndex;
+   @Export("archiveLoaderArchive")
+   static int archiveLoaderArchive;
    @ObfuscatedName("qn")
    @Export("queuedSoundEffectLoops")
    static int[] queuedSoundEffectLoops;
@@ -279,22 +280,22 @@ public final class Client extends GameShell implements Usernamed {
    @Export("queuedSoundEffectDelays")
    static int[] queuedSoundEffectDelays;
    @ObfuscatedName("nr")
-   static int[] __client_nr;
+   static int[] field121;
    @ObfuscatedName("nv")
    @ObfuscatedGetter(
       intValue = -758575207
    )
-   static int __client_nv;
+   static int field122;
    @ObfuscatedName("nd")
    @ObfuscatedGetter(
       intValue = 760022015
    )
-   static int __client_nd;
+   static int field123;
    @ObfuscatedName("ni")
    @ObfuscatedGetter(
       intValue = 1990512261
    )
-   static int __client_ni;
+   static int field124;
    @ObfuscatedName("qe")
    @ObfuscatedSignature(
       signature = "[Lci;"
@@ -314,12 +315,12 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = 587773171
    )
-   static int __client_ph;
+   static int field125;
    @ObfuscatedName("pp")
    @ObfuscatedGetter(
       longValue = -1704358328771670975L
    )
-   static long __client_pp;
+   static long field126;
    @ObfuscatedName("sk")
    @ObfuscatedSignature(
       signature = "Llm;"
@@ -330,19 +331,19 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedSignature(
       signature = "Lho;"
    )
-   static Widget __client_mo;
+   static Widget field127;
    @ObfuscatedName("qf")
    @ObfuscatedGetter(
       intValue = 1365951359
    )
-   static int __client_qf;
+   static int field128;
    @ObfuscatedName("nh")
    @ObfuscatedGetter(
       intValue = -278874973
    )
-   static int __client_nh;
+   static int field129;
    @ObfuscatedName("rw")
-   static short __client_rw;
+   static short field130;
    @ObfuscatedName("qp")
    @ObfuscatedGetter(
       intValue = -1352723865
@@ -350,13 +351,13 @@ public final class Client extends GameShell implements Usernamed {
    @Export("soundEffectVolume")
    static int soundEffectVolume;
    @ObfuscatedName("rm")
-   static short __client_rm;
+   static short field131;
    @ObfuscatedName("rs")
-   static short __client_rs;
+   static short field132;
    @ObfuscatedName("rp")
-   static short __client_rp;
+   static short field133;
    @ObfuscatedName("ri")
-   static short __client_ri;
+   static short field134;
    @ObfuscatedName("pi")
    @ObfuscatedGetter(
       intValue = 864673321
@@ -370,7 +371,7 @@ public final class Client extends GameShell implements Usernamed {
    @Export("viewportZoom")
    static int viewportZoom;
    @ObfuscatedName("rv")
-   static short __client_rv;
+   static short field135;
    @ObfuscatedName("ry")
    @ObfuscatedGetter(
       intValue = 2035623995
@@ -405,7 +406,7 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = 1694810089
    )
-   static int __client_mb;
+   static int field136;
    @ObfuscatedName("rr")
    @ObfuscatedGetter(
       intValue = 386331251
@@ -422,14 +423,14 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = -460406997
    )
-   static int __client_pm;
+   static int field137;
    @ObfuscatedName("pl")
    @ObfuscatedGetter(
       intValue = -1362734353
    )
-   static int __client_pl;
+   static int field138;
    @ObfuscatedName("rh")
-   static boolean[] __client_rh;
+   static boolean[] field139;
    @ObfuscatedName("ml")
    @ObfuscatedGetter(
       intValue = 1602665191
@@ -446,50 +447,50 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = 206275573
    )
-   static int __client_sx;
+   static int field140;
    @ObfuscatedName("rd")
-   static int[] __client_rd;
+   static int[] field141;
    @ObfuscatedName("rl")
-   static int[] __client_rl;
+   static int[] field142;
    @ObfuscatedName("rj")
-   static int[] __client_rj;
+   static int[] field143;
    @ObfuscatedName("rk")
-   static int[] __client_rk;
+   static int[] field144;
    @ObfuscatedName("pn")
-   static int[] __client_pn;
+   static int[] field145;
    @ObfuscatedName("pq")
-   static int[] __client_pq;
+   static int[] field146;
    @ObfuscatedName("oh")
    @ObfuscatedSignature(
       signature = "Lje;"
    )
-   static NodeDeque __client_oh;
+   static NodeDeque field147;
    @ObfuscatedName("oc")
    @ObfuscatedSignature(
       signature = "Lje;"
    )
-   static NodeDeque __client_oc;
+   static NodeDeque field148;
    @ObfuscatedName("rb")
-   static short __client_rb;
+   static short field149;
    @ObfuscatedName("re")
-   static short __client_re;
+   static short field150;
    @ObfuscatedName("mf")
    @ObfuscatedGetter(
       intValue = -1715020411
    )
-   static int __client_mf;
+   static int field151;
    @ObfuscatedName("pu")
-   static long[] __client_pu;
+   static long[] field152;
    @ObfuscatedName("ms")
    @ObfuscatedGetter(
       intValue = 2128395635
    )
-   static int __client_ms;
+   static int field153;
    @ObfuscatedName("nc")
    @ObfuscatedGetter(
       intValue = 344308849
    )
-   static int __client_nc;
+   static int field154;
    @ObfuscatedName("nf")
    @Export("changedSkills")
    static int[] changedSkills;
@@ -500,12 +501,13 @@ public final class Client extends GameShell implements Usernamed {
    @Export("changedSkillsCount")
    static int changedSkillsCount;
    @ObfuscatedName("mn")
-   static boolean __client_mn;
+   @Export("playerMod")
+   static boolean playerMod;
    @ObfuscatedName("pb")
    @ObfuscatedGetter(
       intValue = 1230692157
    )
-   static int __client_pb;
+   static int field156;
    @ObfuscatedName("nq")
    @ObfuscatedGetter(
       intValue = 1467519791
@@ -516,16 +518,17 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = 535219347
    )
-   static int __client_mh;
+   static int field157;
    @ObfuscatedName("pz")
-   static String __client_pz;
+   static String field158;
    @ObfuscatedName("sj")
    @ObfuscatedSignature(
       signature = "Lbj;"
    )
-   static OwnWorldComparator __client_sj;
+   @Export("geOwnWorldComparator")
+   static GrandExchangeOfferOwnWorldComparator geOwnWorldComparator;
    @ObfuscatedName("pv")
-   static int[] __client_pv;
+   static int[] field160;
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "[Lfy;"
@@ -533,7 +536,7 @@ public final class Client extends GameShell implements Usernamed {
    @Export("collisionMaps")
    static CollisionMap[] collisionMaps;
    @ObfuscatedName("ai")
-   static boolean __client_ai;
+   static boolean field161;
    @ObfuscatedName("ba")
    @ObfuscatedGetter(
       intValue = 1412639841
@@ -571,7 +574,8 @@ public final class Client extends GameShell implements Usernamed {
    @Export("clientType")
    static int clientType;
    @ObfuscatedName("bl")
-   static boolean __client_bl;
+   @Export("onMobile")
+   static boolean onMobile;
    @ObfuscatedName("br")
    @ObfuscatedGetter(
       intValue = 244995961
@@ -597,19 +601,19 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = -1731573291
    )
-   static int __client_cn;
+   static int field163;
    @ObfuscatedName("cq")
    @ObfuscatedGetter(
       intValue = -1313705721
    )
-   static int __client_cq;
+   static int field164;
    @ObfuscatedName("ch")
    @ObfuscatedGetter(
       longValue = -6574384275386813769L
    )
-   static long __client_ch;
+   static long field165;
    @ObfuscatedName("cw")
-   static boolean __client_cw;
+   static boolean field166;
    @ObfuscatedName("cg")
    @Export("displayFps")
    static boolean displayFps;
@@ -695,7 +699,7 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = 1154760205
    )
-   static int __client_dp;
+   static int field167;
    @ObfuscatedName("ek")
    @ObfuscatedGetter(
       intValue = 1791955261
@@ -712,17 +716,17 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = 755300107
    )
-   static int __client_ex;
+   static int field168;
    @ObfuscatedName("ej")
    @ObfuscatedGetter(
       intValue = -964416527
    )
-   static int __client_ej;
+   static int field169;
    @ObfuscatedName("el")
    @ObfuscatedGetter(
       intValue = 689094231
    )
-   static int __client_el;
+   static int field170;
    @ObfuscatedName("en")
    @ObfuscatedSignature(
       signature = "Lfc;"
@@ -732,7 +736,7 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = -447055355
    )
-   static int __client_eo;
+   static int field171;
    @ObfuscatedName("ew")
    @Export("Login_isUsernameRemembered")
    static boolean Login_isUsernameRemembered;
@@ -743,13 +747,13 @@ public final class Client extends GameShell implements Usernamed {
    @Export("secureRandomFuture")
    static SecureRandomFuture secureRandomFuture;
    @ObfuscatedName("ev")
-   static byte[] __client_ev;
+   static byte[] field172;
    @ObfuscatedName("ez")
    @ObfuscatedSignature(
       signature = "[Lcv;"
    )
    @Export("npcs")
-   static Npc[] npcs;
+   static NPC[] npcs;
    @ObfuscatedName("ep")
    @ObfuscatedGetter(
       intValue = -1569269731
@@ -763,9 +767,9 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = 516059665
    )
-   static int __client_fw;
+   static int field173;
    @ObfuscatedName("fg")
-   static int[] __client_fg;
+   static int[] field174;
    @ObfuscatedName("fj")
    @ObfuscatedSignature(
       signature = "Lcl;"
@@ -776,9 +780,9 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = -1050480853
    )
-   static int __client_fd;
+   static int field175;
    @ObfuscatedName("fh")
-   static boolean __client_fh;
+   static boolean field176;
    @ObfuscatedName("fx")
    @Export("useBufferedSocket")
    static boolean useBufferedSocket;
@@ -795,27 +799,27 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = 829228151
    )
-   static int __client_fe;
+   static int field177;
    @ObfuscatedName("fn")
    @ObfuscatedGetter(
       intValue = -597100741
    )
-   static int __client_fn;
+   static int field178;
    @ObfuscatedName("fk")
    @ObfuscatedGetter(
       intValue = 8470625
    )
-   static int __client_fk;
+   static int field179;
    @ObfuscatedName("gp")
    @ObfuscatedGetter(
       intValue = 685418907
    )
-   static int __client_gp;
+   static int field180;
    @ObfuscatedName("gh")
    @ObfuscatedGetter(
       intValue = -1456975367
    )
-   static int __client_gh;
+   static int field181;
    @ObfuscatedName("gg")
    @Export("isInInstance")
    static boolean isInInstance;
@@ -823,71 +827,71 @@ public final class Client extends GameShell implements Usernamed {
    @Export("instanceChunkTemplates")
    static int[][][] instanceChunkTemplates;
    @ObfuscatedName("gd")
-   static final int[] __client_gd;
+   static final int[] field182;
    @ObfuscatedName("gy")
    @ObfuscatedGetter(
       intValue = -134014371
    )
-   static int __client_gy;
+   static int field183;
    @ObfuscatedName("hx")
    @ObfuscatedGetter(
       intValue = -1406125895
    )
-   static int __client_hx;
+   static int field184;
    @ObfuscatedName("hn")
    @ObfuscatedGetter(
       intValue = -516933613
    )
-   static int __client_hn;
+   static int field185;
    @ObfuscatedName("hr")
    @ObfuscatedGetter(
       intValue = 1664350313
    )
-   static int __client_hr;
+   static int field186;
    @ObfuscatedName("hg")
    @ObfuscatedGetter(
       intValue = 1658018867
    )
-   static int __client_hg;
+   static int field187;
    @ObfuscatedName("hh")
-   static boolean __client_hh;
+   static boolean field188;
    @ObfuscatedName("hd")
    @ObfuscatedGetter(
       intValue = 438998245
    )
-   static int __client_hd;
+   static int field189;
    @ObfuscatedName("hw")
    @ObfuscatedGetter(
       intValue = 410614005
    )
-   @Export("cameraPitchTarget")
-   static int cameraPitchTarget;
+   @Export("camAngleX")
+   static int camAngleX;
    @ObfuscatedName("hp")
    @ObfuscatedGetter(
       intValue = -1163038981
    )
-   @Export("minimapOrientation")
-   static int minimapOrientation;
+   @Export("camAngleY")
+   static int camAngleY;
    @ObfuscatedName("hv")
    @ObfuscatedGetter(
       intValue = 218086227
    )
-   static int __client_hv;
+   static int field190;
    @ObfuscatedName("hu")
    @ObfuscatedGetter(
       intValue = -480633777
    )
-   static int __client_hu;
+   static int field191;
    @ObfuscatedName("hi")
    @ObfuscatedGetter(
       intValue = 402871301
    )
-   static int __client_hi;
+   static int field192;
    @ObfuscatedName("ht")
    @ObfuscatedGetter(
       intValue = 1502058429
    )
-   static int __client_ht;
+   static int field193;
    @ObfuscatedName("hj")
    @ObfuscatedGetter(
       intValue = -1420078475
@@ -898,23 +902,23 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = 1005832199
    )
-   @Export("cameraFollowHeight")
-   static int cameraFollowHeight;
+   @Export("camFollowHeight")
+   static int camFollowHeight;
    @ObfuscatedName("hc")
    @ObfuscatedGetter(
       intValue = -441913785
    )
-   static int __client_hc;
+   static int field194;
    @ObfuscatedName("hk")
    @ObfuscatedGetter(
       intValue = -1149138989
    )
-   static int __client_hk;
+   static int field195;
    @ObfuscatedName("if")
    @ObfuscatedGetter(
       intValue = -952172003
    )
-   static int __client_if;
+   static int field196;
    @ObfuscatedName("ie")
    @ObfuscatedGetter(
       intValue = 236939601
@@ -925,26 +929,27 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = 351193663
    )
-   static int __client_in;
+   @Export("oculusOrbSlowedSpeed")
+   static int oculusOrbSlowedSpeed;
    @ObfuscatedName("il")
    @ObfuscatedGetter(
       intValue = -1063713523
    )
-   public static int __client_il;
+   public static int field198;
    @ObfuscatedName("ij")
-   static boolean __client_ij;
+   static boolean field199;
    @ObfuscatedName("iy")
    @ObfuscatedGetter(
       intValue = -1213062413
    )
-   static int __client_iy;
+   static int field200;
    @ObfuscatedName("is")
-   static boolean __client_is;
+   static boolean field201;
    @ObfuscatedName("ik")
    @ObfuscatedGetter(
       intValue = 910983131
    )
-   static int __client_ik;
+   static int field202;
    @ObfuscatedName("ir")
    @ObfuscatedGetter(
       intValue = 616180377
@@ -1036,12 +1041,12 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = 1691923909
    )
-   static int __client_ju;
+   static int field203;
    @ObfuscatedName("jz")
    @ObfuscatedGetter(
       intValue = -1267243587
    )
-   static int __client_jz;
+   static int field204;
    @ObfuscatedName("jp")
    @ObfuscatedGetter(
       intValue = 485534011
@@ -1052,12 +1057,12 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = 813973829
    )
-   static int __client_ja;
+   static int field205;
    @ObfuscatedName("je")
    @ObfuscatedGetter(
       intValue = 1959822241
    )
-   static int __client_je;
+   static int field206;
    @ObfuscatedName("jy")
    @ObfuscatedGetter(
       intValue = -836653679
@@ -1065,7 +1070,7 @@ public final class Client extends GameShell implements Usernamed {
    @Export("dragItemSlotDestination")
    static int dragItemSlotDestination;
    @ObfuscatedName("jl")
-   static boolean __client_jl;
+   static boolean field207;
    @ObfuscatedName("jt")
    @ObfuscatedGetter(
       intValue = 1486366835
@@ -1076,7 +1081,7 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = 1084498299
    )
-   static int __client_jc;
+   static int field208;
    @ObfuscatedName("jj")
    @Export("showLoadingMessages")
    static boolean showLoadingMessages;
@@ -1096,7 +1101,7 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = -836962805
    )
-   static int __client_jo;
+   static int field209;
    @ObfuscatedName("js")
    @Export("renderSelf")
    static boolean renderSelf;
@@ -1104,14 +1109,14 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = -1208823721
    )
-   static int __client_ke;
+   static int field210;
    @ObfuscatedName("ky")
    @ObfuscatedGetter(
       intValue = -64320473
    )
-   static int __client_ky;
+   static int field211;
    @ObfuscatedName("kd")
-   static int[] __client_kd;
+   static int[] field212;
    @ObfuscatedName("kp")
    @Export("playerMenuOpcodes")
    static final int[] playerMenuOpcodes;
@@ -1122,7 +1127,7 @@ public final class Client extends GameShell implements Usernamed {
    @Export("playerOptionsPriorities")
    static boolean[] playerOptionsPriorities;
    @ObfuscatedName("kn")
-   static int[] __client_kn;
+   static int[] field213;
    @ObfuscatedName("kx")
    @ObfuscatedGetter(
       intValue = -1309758309
@@ -1139,7 +1144,8 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedSignature(
       signature = "Lje;"
    )
-   static NodeDeque __client_kh;
+   @Export("pendingSpawns")
+   static NodeDeque pendingSpawns;
    @ObfuscatedName("kk")
    @ObfuscatedSignature(
       signature = "Lje;"
@@ -1165,7 +1171,7 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = -898263359
    )
-   static int __client_ku;
+   static int field215;
    @ObfuscatedName("kc")
    @Export("isMenuOpen")
    static boolean isMenuOpen;
@@ -1212,22 +1218,22 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = 26099827
    )
-   static int __client_lq;
+   static int field216;
    @ObfuscatedName("ln")
    @ObfuscatedGetter(
       intValue = 885052255
    )
-   static int __client_ln;
+   static int field217;
    @ObfuscatedName("lb")
    @ObfuscatedGetter(
       intValue = 699084605
    )
-   static int __client_lb;
+   static int field218;
    @ObfuscatedName("ls")
    @ObfuscatedGetter(
       intValue = -274968037
    )
-   static int __client_ls;
+   static int field219;
    @ObfuscatedName("lz")
    @ObfuscatedGetter(
       intValue = 1630772923
@@ -1241,296 +1247,18 @@ public final class Client extends GameShell implements Usernamed {
    @ObfuscatedGetter(
       intValue = 196309625
    )
-   static int __client_lc;
-
-   static {
-      __client_ai = true;
-      worldId = 1;
-      worldProperties = 0;
-      gameBuild = 0;
-      isMembersWorld = false;
-      isLowDetail = false;
-      language = 0;
-      clientType = -1;
-      __client_bl = false;
-      gameState = 0;
-      isLoading = true;
-      cycle = 0;
-      mouseLastLastPressedTimeMillis = 1L;
-      __client_cn = -1;
-      __client_cq = -1;
-      __client_ch = -1L;
-      __client_cw = true;
-      displayFps = false;
-      rebootTimer = 0;
-      hintArrowType = 0;
-      hintArrowNpcIndex = 0;
-      hintArrowPlayerIndex = 0;
-      hintArrowX = 0;
-      hintArrowY = 0;
-      hintArrowHeight = 0;
-      hintArrowSubX = 0;
-      hintArrowSubY = 0;
-      playerAttackOption = AttackOption.AttackOption_hidden;
-      npcAttackOption = AttackOption.AttackOption_hidden;
-      titleLoadingStage = 0;
-      js5ConnectState = 0;
-      __client_dp = 0;
-      js5Errors = 0;
-      loginState = 0;
-      __client_ex = 0;
-      __client_ej = 0;
-      __client_el = 0;
-      field658 = class159.field1985;
-      Login_isUsernameRemembered = false;
-      secureRandomFuture = new SecureRandomFuture();
-      __client_ev = null;
-      npcs = new Npc['耀'];
-      npcCount = 0;
-      npcIndices = new int['耀'];
-      __client_fw = 0;
-      __client_fg = new int[250];
-      packetWriter = new PacketWriter();
-      __client_fd = 0;
-      __client_fh = false;
-      useBufferedSocket = true;
-      timer = new Timer();
-      fontsMap = new HashMap();
-      __client_fe = 0;
-      __client_fn = 1;
-      __client_fk = 0;
-      __client_gp = 1;
-      __client_gh = 0;
-      collisionMaps = new CollisionMap[4];
-      isInInstance = false;
-      instanceChunkTemplates = new int[4][13][13];
-      __client_gd = 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};
-      __client_gy = 0;
-      __client_hx = 2301979;
-      __client_hn = 5063219;
-      __client_hr = 3353893;
-      __client_hg = 7759444;
-      __client_hh = false;
-      __client_hd = 0;
-      cameraPitchTarget = 128;
-      minimapOrientation = 0;
-      __client_hv = 0;
-      __client_hu = 0;
-      __client_hi = 0;
-      __client_ht = 0;
-      oculusOrbState = 0;
-      cameraFollowHeight = 50;
-      __client_hc = 0;
-      __client_hk = 0;
-      __client_if = 0;
-      oculusOrbNormalSpeed = 12;
-      __client_in = 6;
-      __client_il = 0;
-      __client_ij = false;
-      __client_iy = 0;
-      __client_is = false;
-      __client_ik = 0;
-      overheadTextCount = 0;
-      overheadTextLimit = 50;
-      overheadTextXs = new int[overheadTextLimit];
-      overheadTextYs = new int[overheadTextLimit];
-      overheadTextAscents = new int[overheadTextLimit];
-      overheadTextXOffsets = new int[overheadTextLimit];
-      overheadTextColors = new int[overheadTextLimit];
-      overheadTextEffects = new int[overheadTextLimit];
-      overheadTextCyclesRemaining = new int[overheadTextLimit];
-      overheadText = new String[overheadTextLimit];
-      tileLastDrawnActor = new int[104][104];
-      viewportDrawCount = 0;
-      viewportTempX = -1;
-      viewportTempY = -1;
-      mouseCrossX = 0;
-      mouseCrossY = 0;
-      mouseCrossState = 0;
-      mouseCrossColor = 0;
-      showMouseCross = true;
-      __client_ju = 0;
-      __client_jz = 0;
-      dragItemSlotSource = 0;
-      __client_ja = 0;
-      __client_je = 0;
-      dragItemSlotDestination = 0;
-      __client_jl = false;
-      itemDragDuration = 0;
-      __client_jc = 0;
-      showLoadingMessages = true;
-      players = new Player[2048];
-      localPlayerIndex = -1;
-      __client_jo = 0;
-      renderSelf = true;
-      __client_ke = 0;
-      __client_ky = 0;
-      __client_kd = new int[1000];
-      playerMenuOpcodes = new int[]{44, 45, 46, 47, 48, 49, 50, 51};
-      playerMenuActions = new String[8];
-      playerOptionsPriorities = new boolean[8];
-      __client_kn = new int[]{768, 1024, 1280, 512, 1536, 256, 0, 1792};
-      combatTargetPlayerIndex = -1;
-      groundItems = new NodeDeque[4][104][104];
-      __client_kh = new NodeDeque();
-      projectiles = new NodeDeque();
-      graphicsObjects = new NodeDeque();
-      currentLevels = new int[25];
-      levels = new int[25];
-      experience = new int[25];
-      __client_ku = 0;
-      isMenuOpen = false;
-      menuOptionsCount = 0;
-      menuArguments1 = new int[500];
-      menuArguments2 = new int[500];
-      menuOpcodes = new int[500];
-      menuArguments0 = new int[500];
-      menuActions = new String[500];
-      menuTargetNames = new String[500];
-      menuShiftClick = new boolean[500];
-      followerOpsLowPriority = false;
-      shiftClickDrop = false;
-      tapToDrop = false;
-      showMouseOverText = true;
-      __client_lq = -1;
-      __client_ln = -1;
-      __client_lb = 0;
-      __client_ls = 50;
-      isItemSelected = 0;
-      selectedItemName = null;
-      isSpellSelected = false;
-      __client_lc = -1;
-      __client_mh = -1;
-      selectedSpellActionName = null;
-      selectedSpellName = null;
-      rootWidgetGroup = -1;
-      widgetGroupParents = new NodeHashTable(8);
-      __client_mf = 0;
-      __client_ms = -1;
-      chatEffects = 0;
-      __client_mb = 0;
-      __client_mo = null;
-      runEnergy = 0;
-      weight = 0;
-      rights = 0;
-      followerIndex = -1;
-      __client_mn = false;
-      viewportWidget = null;
-      clickedWidget = null;
-      clickedWidgetParent = null;
-      widgetClickX = 0;
-      widgetClickY = 0;
-      draggedOnWidget = null;
-      __client_nn = false;
-      __client_nw = -1;
-      __client_nl = -1;
-      __client_nt = false;
-      __client_nk = -1;
-      __client_np = -1;
-      isDraggingWidget = false;
-      cycleCntr = 1;
-      __client_nr = new int[32];
-      __client_nd = 0;
-      __client_nz = new int[32];
-      __client_ns = 0;
-      changedSkills = new int[32];
-      changedSkillsCount = 0;
-      chatCycle = 0;
-      __client_na = 0;
-      __client_nh = 0;
-      __client_nv = 0;
-      __client_nc = 0;
-      __client_ni = 0;
-      mouseWheelRotation = 0;
-      scriptEvents = new NodeDeque();
-      __client_oh = new NodeDeque();
-      __client_oc = new NodeDeque();
-      widgetClickMasks = new NodeHashTable(512);
-      rootWidgetCount = 0;
-      __client_oo = -2;
-      __client_od = new boolean[100];
-      __client_ot = new boolean[100];
-      __client_oq = new boolean[100];
-      rootWidgetXs = new int[100];
-      rootWidgetYs = new int[100];
-      rootWidgetWidths = new int[100];
-      rootWidgetHeights = new int[100];
-      gameDrawingMode = 0;
-      __client_oa = 0L;
-      isResizable = true;
-      __client_pv = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215};
-      publicChatMode = 0;
-      __client_pl = 0;
-      __client_pz = "";
-      __client_pu = new long[100];
-      __client_pb = 0;
-      __client_pm = 0;
-      __client_pq = new int[128];
-      __client_pn = new int[128];
-      __client_pp = -1L;
-      __client_ph = -1;
-      mapIconCount = 0;
-      mapIconXs = new int[1000];
-      mapIconYs = new int[1000];
-      mapIcons = new Sprite[1000];
-      destinationX = 0;
-      destinationY = 0;
-      minimapState = 0;
-      __client_qf = 255;
-      __client_qy = -1;
-      __client_qq = false;
-      soundEffectVolume = 127;
-      __client_qc = 127;
-      soundEffectCount = 0;
-      soundEffectIds = new int[50];
-      queuedSoundEffectLoops = new int[50];
-	  queuedSoundEffectDelays = new int[50];
-      soundLocations = new int[50];
-      soundEffects = new SoundEffect[50];
-      isCameraLocked = false;
-      __client_rh = new boolean[5];
-      __client_rd = new int[5];
-      __client_rl = new int[5];
-      __client_rj = new int[5];
-      __client_rk = new int[5];
-      __client_rw = 256;
-      __client_rm = 205;
-      __client_re = 256;
-      __client_rb = 320;
-      __client_rv = 1;
-      __client_ri = 32767;
-      __client_rs = 1;
-      __client_rp = 32767;
-      viewportOffsetX = 0;
-      viewportOffsetY = 0;
-      viewportWidth = 0;
-      viewportHeight = 0;
-      viewportZoom = 0;
-      __client_ru = new PlayerAppearance();
-      __client_sd = -1;
-      __client_sl = -1;
-      platformInfoProvider = new DesktopPlatformInfoProvider();
-      grandExchangeOffers = new GrandExchangeOffer[8];
-      __client_sj = new OwnWorldComparator();
-      __client_ss = -1;
-      indexCacheLoaders = new ArrayList(10);
-      indexCacheLoaderIndex = 0;
-      __client_sx = 0;
-      field895 = new class65();
-      __client_tp = new int[50];
-      __client_th = new int[50];
-   }
+   static int field220;
 
    @ObfuscatedName("j")
    @ObfuscatedSignature(
       signature = "(I)V",
       garbageValue = "-1773624745"
    )
-   protected final void __j_113() {
-      __client_oa = class203.currentTimeMs() + 500L;
-      this.__ge_137();
-      if(rootWidgetGroup != -1) {
-         this.__iu_141(true);
+   protected final void vmethod107() {
+      field99 = class203.currentTimeMs() + 500L;
+      this.method84();
+      if (rootInterface != -1) {
+         this.method87(true);
       }
 
    }
@@ -1543,31 +1271,31 @@ public final class Client extends GameShell implements Usernamed {
    @Export("setUp")
    protected final void setUp() {
       WorldMapCacheName.method633(new int[]{20, 260, 10000}, new int[]{1000, 100, 500});
-      class2.port1 = gameBuild == 0?43594:worldId + 40000;
-      WorldMapArea.port2 = gameBuild == 0?443:worldId + 50000;
+      class2.port1 = gameBuild == 0 ? 43594 : worldId + 40000;
+      WorldMapArea.port2 = gameBuild == 0 ? 443 : worldId + 50000;
       class203.port3 = class2.port1;
-      PlayerAppearance.__hi_g = class226.__ht_m;
-      class229.__hz_l = class226.__ht_f;
-      class227.__hj_e = class226.__ht_q;
-      IndexCacheLoader.__bd_x = class226.__ht_w;
+      PlayerAppearance.field726 = class226.field1132;
+      class229.field1137 = class226.field1133;
+      class227.field1136 = class226.field1134;
+      ArchiveLoader.field406 = class226.field1135;
       TriBool.urlRequester = new UrlRequester();
       this.setUpKeyboard();
       this.setUpMouse();
       class16.mouseWheel = this.mouseWheel();
-      Fonts.indexStore255 = new IndexStore(255, class168.dat2File, class168.idx255File, 500000);
+      Fonts.masterDisk = new ArchiveDisk(255, class168.dat2File, class168.idx255File, 500000);
       ReflectionCheck.clientPreferences = class306.method5780();
       this.setUpClipboard();
-      String var2 = Ignored.__ks_at;
-      class50.__af_m = this;
-      if(var2 != null) {
-         class50.__af_f = var2;
+      String var1 = Ignored.field402;
+      class50.field1159 = this;
+      if (var1 != null) {
+         class50.field1160 = var1;
       }
 
-      if(gameBuild != 0) {
+      if (gameBuild != 0) {
          displayFps = true;
       }
 
-      GroundItem.method2095(ReflectionCheck.clientPreferences.windowMode);
+      GroundItem.setWindowedMode(ReflectionCheck.clientPreferences.windowMode);
       WorldMapArea.friendSystem = new FriendSystem(KeyHandler.loginType);
    }
 
@@ -1576,47 +1304,48 @@ public final class Client extends GameShell implements Usernamed {
       signature = "(I)V",
       garbageValue = "1445885427"
    )
-   protected final void __al_111() {
+   @Export("doCycle")
+   protected final void doCycle() {
       ++cycle;
       this.doCycleJs5();
       class3.method41();
 
       int var1;
       try {
-         if(class214.__hf_o == 1) {
-            var1 = class214.midiPcmStream.__f_341();
-            if(var1 > 0 && class214.midiPcmStream.isReady()) {
-               var1 -= FaceNormal.__el_x;
-               if(var1 < 0) {
+         if (class214.field1129 == 1) {
+            var1 = class214.midiPcmStream.method170();
+            if (var1 > 0 && class214.midiPcmStream.isReady()) {
+               var1 -= FaceNormal.field344;
+               if (var1 < 0) {
                   var1 = 0;
                }
 
-               class214.midiPcmStream.__m_340(var1);
+               class214.midiPcmStream.method169(var1);
             } else {
                class214.midiPcmStream.clear();
                class214.midiPcmStream.removeAll();
-               if(class214.__hf_u != null) {
-                  class214.__hf_o = 2;
+               if (class214.field1130 != null) {
+                  class214.field1129 = 2;
                } else {
-                  class214.__hf_o = 0;
+                  class214.field1129 = 0;
                }
 
                class13.musicTrack = null;
                class307.soundCache = null;
             }
          }
-      } catch (Exception var63) {
-         var63.printStackTrace();
+      } catch (Exception var55) {
+         var55.printStackTrace();
          class214.midiPcmStream.clear();
-         class214.__hf_o = 0;
+         class214.field1129 = 0;
          class13.musicTrack = null;
          class307.soundCache = null;
-         class214.__hf_u = null;
+         class214.field1130 = null;
       }
 
       class13.playPcmPlayers();
       class171.method3498();
-      MouseHandler var47 = MouseHandler.MouseHandler_instance;
+      MouseHandler var2 = MouseHandler.MouseHandler_instance;
       synchronized(MouseHandler.MouseHandler_instance) {
          MouseHandler.MouseHandler_currentButton = MouseHandler.MouseHandler_currentButton0;
          MouseHandler.MouseHandler_x = MouseHandler.MouseHandler_x0;
@@ -1629,108 +1358,110 @@ public final class Client extends GameShell implements Usernamed {
          MouseHandler.MouseHandler_lastButton0 = 0;
       }
 
-      if(class16.mouseWheel != null) {
+      if (class16.mouseWheel != null) {
          var1 = class16.mouseWheel.useRotation();
          mouseWheelRotation = var1;
       }
 
-      if(gameState == 0) {
+      if (gameState == 0) {
          class171.method3497();
-         class11.method145();
-      } else if(gameState == 5) {
+         GrandExchangeOfferNameComparator.method145();
+      } else if (gameState == 5) {
          class54.method1092(this);
          class171.method3497();
-         class11.method145();
-      } else if(gameState != 10 && gameState != 11) {
-         if(gameState == 20) {
+         GrandExchangeOfferNameComparator.method145();
+      } else if (gameState != 10 && gameState != 11) {
+         if (gameState == 20) {
             class54.method1092(this);
             this.doCycleLoggedOut();
-         } else if(gameState == 25) {
+         } else if (gameState == 25) {
             UserComparator10.method3352(false);
-            __client_fe = 0;
-            boolean var64 = true;
+            field177 = 0;
+            boolean var3 = true;
 
-            int var48;
-            for(var48 = 0; var48 < class40.regionLandArchives.length; ++var48) {
-               if(IndexCacheLoader.regionMapArchiveIds[var48] != -1 && class40.regionLandArchives[var48] == null) {
-                  class40.regionLandArchives[var48] = SecureRandomFuture.indexCache5.takeRecord(IndexCacheLoader.regionMapArchiveIds[var48], 0);
-                  if(class40.regionLandArchives[var48] == null) {
-                     var64 = false;
-                     ++__client_fe;
+            int var4;
+            for (var4 = 0; var4 < class40.regionLandArchives.length; ++var4) {
+               if (ArchiveLoader.regionMapArchiveIds[var4] != -1 && class40.regionLandArchives[var4] == null) {
+                  class40.regionLandArchives[var4] = SecureRandomFuture.archive5.takeFile(ArchiveLoader.regionMapArchiveIds[var4], 0);
+                  if (class40.regionLandArchives[var4] == null) {
+                     var3 = false;
+                     ++field177;
                   }
                }
 
-               if(MouseHandler.regionLandArchiveIds[var48] != -1 && HealthBarUpdate.regionMapArchives[var48] == null) {
-                  HealthBarUpdate.regionMapArchives[var48] = SecureRandomFuture.indexCache5.takeRecordEncrypted(MouseHandler.regionLandArchiveIds[var48], 0, class190.xteaKeys[var48]);
-                  if(HealthBarUpdate.regionMapArchives[var48] == null) {
-                     var64 = false;
-                     ++__client_fe;
+               if (MouseHandler.regionLandArchiveIds[var4] != -1 && HealthBarUpdate.regionMapArchives[var4] == null) {
+                  HealthBarUpdate.regionMapArchives[var4] = SecureRandomFuture.archive5.takeFileEncrypted(MouseHandler.regionLandArchiveIds[var4], 0, class190.xteaKeys[var4]);
+                  if (HealthBarUpdate.regionMapArchives[var4] == null) {
+                     var3 = false;
+                     ++field177;
                   }
                }
             }
 
-            if(!var64) {
-               __client_gh = 1;
+            if (!var3) {
+               field181 = 1;
             } else {
-               __client_fk = 0;
-               var64 = true;
+               field179 = 0;
+               var3 = true;
 
-               int var4;
                int var5;
-               for(var48 = 0; var48 < class40.regionLandArchives.length; ++var48) {
-                  byte[] var3 = HealthBarUpdate.regionMapArchives[var48];
-                  if(var3 != null) {
-                     var4 = (class308.regions[var48] >> 8) * 64 - class50.baseX;
-                     var5 = (class308.regions[var48] & 255) * 64 - GraphicsObject.baseY;
-                     if(isInInstance) {
-                        var4 = 10;
+               int var6;
+               for (var4 = 0; var4 < class40.regionLandArchives.length; ++var4) {
+                  byte[] var7 = HealthBarUpdate.regionMapArchives[var4];
+                  if (var7 != null) {
+                     var5 = (class308.regions[var4] >> 8) * 64 - class50.baseX;
+                     var6 = (class308.regions[var4] & 255) * 64 - GraphicsObject.baseY;
+                     if (isInInstance) {
                         var5 = 10;
+                        var6 = 10;
                      }
 
-                     var64 &= TextureProvider.method2774(var3, var4, var5);
+                     var3 &= TextureProvider.method2774(var7, var5, var6);
                   }
                }
 
-               if(!var64) {
-                  __client_gh = 2;
+               if (!var3) {
+                  field181 = 2;
                } else {
-                  if(__client_gh != 0) {
-                     class68.drawLoadingMessage("Loading - please wait." + "<br>" + " (" + 100 + "%" + ")", true);
+                  if (field181 != 0) {
+                     PendingSpawn.drawLoadingMessage("Loading - please wait.<br> (100%)", true);
                   }
 
                   class13.playPcmPlayers();
                   class65.scene.clear();
 
-                  for(var48 = 0; var48 < 4; ++var48) {
-                     collisionMaps[var48].clear();
+                  for (var4 = 0; var4 < 4; ++var4) {
+                     collisionMaps[var4].clear();
                   }
 
-                  int var49;
-                  for(var48 = 0; var48 < 4; ++var48) {
-                     for(var49 = 0; var49 < 104; ++var49) {
-                        for(var4 = 0; var4 < 104; ++var4) {
-                           Tiles.Tiles_renderFlags[var48][var49][var4] = 0;
+                  int var56;
+                  for (var4 = 0; var4 < 4; ++var4) {
+                     for (var56 = 0; var56 < 104; ++var56) {
+                        for (var5 = 0; var5 < 104; ++var5) {
+                           Tiles.Tiles_renderFlags[var4][var56][var5] = 0;
                         }
                      }
                   }
 
                   class13.playPcmPlayers();
                   Tiles.Tiles_minPlane = 99;
-                  Tiles.__bq_w = new byte[4][104][104];
-                  Fonts.__kz_o = new byte[4][104][104];
-                  class32.__ay_u = new byte[4][104][104];
-                  class307.__kc_g = new byte[4][104][104];
-                  Tiles.__bq_a = new int[4][105][105];
-                  Tiles.__bq_l = new byte[4][105][105];
-                  Huffman.__gd_e = new int[105][105];
-                  class13.__i_x = new int[104];
-                  Formatting.__cy_d = new int[104];
-                  class214.__hf_k = new int[104];
-                  WorldMapSectionType.__h_n = new int[104];
-                  Message.__bm_i = new int[104];
-                  var48 = class40.regionLandArchives.length;
+                  Tiles.field908 = new byte[4][104][104];
+                  Fonts.field350 = new byte[4][104][104];
+                  class32.field1157 = new byte[4][104][104];
+                  class307.field1155 = new byte[4][104][104];
+                  Tiles.field910 = new int[4][105][105];
+                  Tiles.field909 = new byte[4][105][105];
+                  Huffman.field398 = new int[105][105];
+                  class13.field1112 = new int[104];
+                  Formatting.field353 = new int[104];
+                  class214.field1131 = new int[104];
+                  WorldMapSectionType.field1104 = new int[104];
+                  Message.field490 = new int[104];
+                  var4 = class40.regionLandArchives.length;
                   SpriteMask.method4390();
                   UserComparator10.method3352(true);
+                  int var8;
+                  int var9;
                   int var10;
                   int var11;
                   int var12;
@@ -1743,79 +1474,77 @@ public final class Client extends GameShell implements Usernamed {
                   int var19;
                   int var20;
                   int var21;
-                  int var22;
-                  int var51;
-                  if(!isInInstance) {
-                     byte[] var6;
-                     for(var49 = 0; var49 < var48; ++var49) {
-                        var4 = (class308.regions[var49] >> 8) * 64 - class50.baseX;
-                        var5 = (class308.regions[var49] & 255) * 64 - GraphicsObject.baseY;
-                        var6 = class40.regionLandArchives[var49];
-                        if(var6 != null) {
+                  if (!isInInstance) {
+                     byte[] var22;
+                     for (var56 = 0; var56 < var4; ++var56) {
+                        var5 = (class308.regions[var56] >> 8) * 64 - class50.baseX;
+                        var6 = (class308.regions[var56] & 255) * 64 - GraphicsObject.baseY;
+                        var22 = class40.regionLandArchives[var56];
+                        if (var22 != null) {
                            class13.playPcmPlayers();
-                           Varcs.method2166(var6, var4, var5, GameObject.__eh_fy * 8 - 48, WorldMapLabelSize.__s_fi * 8 - 48, collisionMaps);
+                           Varcs.method2166(var22, var5, var6, GameObject.field359 * 8 - 48, WorldMapLabelSize.field1041 * 8 - 48, collisionMaps);
                         }
                      }
 
-                     for(var49 = 0; var49 < var48; ++var49) {
-                        var4 = (class308.regions[var49] >> 8) * 64 - class50.baseX;
-                        var5 = (class308.regions[var49] & 255) * 64 - GraphicsObject.baseY;
-                        var6 = class40.regionLandArchives[var49];
-                        if(var6 == null && WorldMapLabelSize.__s_fi < 800) {
+                     for (var56 = 0; var56 < var4; ++var56) {
+                        var5 = (class308.regions[var56] >> 8) * 64 - class50.baseX;
+                        var6 = (class308.regions[var56] & 255) * 64 - GraphicsObject.baseY;
+                        var22 = class40.regionLandArchives[var56];
+                        if (var22 == null && WorldMapLabelSize.field1041 < 800) {
                            class13.playPcmPlayers();
-                           UserComparator6.method3390(var4, var5, 64, 64);
+                           UserComparator6.method3390(var5, var6, 64, 64);
                         }
                      }
 
                      UserComparator10.method3352(true);
 
-                     for(var49 = 0; var49 < var48; ++var49) {
-                        byte[] var50 = HealthBarUpdate.regionMapArchives[var49];
-                        if(var50 != null) {
-                           var5 = (class308.regions[var49] >> 8) * 64 - class50.baseX;
-                           var51 = (class308.regions[var49] & 255) * 64 - GraphicsObject.baseY;
+                     for (var56 = 0; var56 < var4; ++var56) {
+                        byte[] var23 = HealthBarUpdate.regionMapArchives[var56];
+                        if (var23 != null) {
+                           var6 = (class308.regions[var56] >> 8) * 64 - class50.baseX;
+                           var21 = (class308.regions[var56] & 255) * 64 - GraphicsObject.baseY;
                            class13.playPcmPlayers();
-                           Scene var7 = class65.scene;
-                           CollisionMap[] var8 = collisionMaps;
-                           Buffer var9 = new Buffer(var50);
-                           var10 = -1;
+                           Scene var24 = class65.scene;
+                           CollisionMap[] var25 = collisionMaps;
+                           Buffer var26 = new Buffer(var23);
+                           var8 = -1;
 
-                           while(true) {
-                              var11 = var9.__at_308();
-                              if(var11 == 0) {
+                           while (true) {
+                              var9 = var26.method49();
+                              if (var9 == 0) {
                                  break;
                               }
 
-                              var10 += var11;
-                              var12 = 0;
+                              var8 += var9;
+                              var10 = 0;
 
-                              while(true) {
-                                 var13 = var9.__ae_307();
-                                 if(var13 == 0) {
+                              while (true) {
+                                 var11 = var26.readUShortSmart();
+                                 if (var11 == 0) {
                                     break;
                                  }
 
-                                 var12 += var13 - 1;
-                                 var14 = var12 & 63;
-                                 var15 = var12 >> 6 & 63;
-                                 var16 = var12 >> 12;
-                                 var17 = var9.readUnsignedByte();
-                                 var18 = var17 >> 2;
-                                 var19 = var17 & 3;
-                                 var20 = var5 + var15;
-                                 var21 = var14 + var51;
-                                 if(var20 > 0 && var21 > 0 && var20 < 103 && var21 < 103) {
-                                    var22 = var16;
-                                    if((Tiles.Tiles_renderFlags[1][var20][var21] & 2) == 2) {
-                                       var22 = var16 - 1;
+                                 var10 += var11 - 1;
+                                 var12 = var10 & 63;
+                                 var13 = var10 >> 6 & 63;
+                                 var14 = var10 >> 12;
+                                 var15 = var26.readUnsignedByte();
+                                 var16 = var15 >> 2;
+                                 var17 = var15 & 3;
+                                 var18 = var6 + var13;
+                                 var19 = var12 + var21;
+                                 if (var18 > 0 && var19 > 0 && var18 < 103 && var19 < 103) {
+                                    var20 = var14;
+                                    if ((Tiles.Tiles_renderFlags[1][var18][var19] & 2) == 2) {
+                                       var20 = var14 - 1;
                                     }
 
-                                    CollisionMap var23 = null;
-                                    if(var22 >= 0) {
-                                       var23 = var8[var22];
+                                    CollisionMap var27 = null;
+                                    if (var20 >= 0) {
+                                       var27 = var25[var20];
                                     }
 
-                                    class227.method4446(var16, var20, var21, var10, var19, var18, var7, var23);
+                                    class227.method4446(var14, var18, var19, var8, var17, var16, var24, var27);
                                  }
                               }
                            }
@@ -1823,47 +1552,47 @@ public final class Client extends GameShell implements Usernamed {
                      }
                   }
 
-                  int var52;
-                  int var53;
-                  int var54;
-                  if(isInInstance) {
-                     var49 = 0;
+                  int var57;
+                  int var58;
+                  int var59;
+                  if (isInInstance) {
+                     var56 = 0;
 
-                     label1186:
-                     while(true) {
-                        if(var49 >= 4) {
-                           for(var49 = 0; var49 < 13; ++var49) {
-                              for(var4 = 0; var4 < 13; ++var4) {
-                                 var5 = instanceChunkTemplates[0][var49][var4];
-                                 if(var5 == -1) {
-                                    UserComparator6.method3390(var49 * 8, var4 * 8, 8, 8);
+                     label998:
+                     while (true) {
+                        if (var56 >= 4) {
+                           for (var56 = 0; var56 < 13; ++var56) {
+                              for (var5 = 0; var5 < 13; ++var5) {
+                                 var6 = instanceChunkTemplates[0][var56][var5];
+                                 if (var6 == -1) {
+                                    UserComparator6.method3390(var56 * 8, var5 * 8, 8, 8);
                                  }
                               }
                            }
 
                            UserComparator10.method3352(true);
-                           var49 = 0;
+                           var56 = 0;
 
-                           while(true) {
-                              if(var49 >= 4) {
-                                 break label1186;
+                           while (true) {
+                              if (var56 >= 4) {
+                                 break label998;
                               }
 
                               class13.playPcmPlayers();
 
-                              for(var4 = 0; var4 < 13; ++var4) {
-                                 for(var5 = 0; var5 < 13; ++var5) {
-                                    var51 = instanceChunkTemplates[var49][var4][var5];
-                                    if(var51 != -1) {
-                                       var52 = var51 >> 24 & 3;
-                                       var53 = var51 >> 1 & 3;
-                                       var54 = var51 >> 14 & 1023;
-                                       var10 = var51 >> 3 & 2047;
-                                       var11 = (var54 / 8 << 8) + var10 / 8;
+                              for (var5 = 0; var5 < 13; ++var5) {
+                                 for (var6 = 0; var6 < 13; ++var6) {
+                                    var21 = instanceChunkTemplates[var56][var5][var6];
+                                    if (var21 != -1) {
+                                       var57 = var21 >> 24 & 3;
+                                       var58 = var21 >> 1 & 3;
+                                       var59 = var21 >> 14 & 1023;
+                                       var8 = var21 >> 3 & 2047;
+                                       var9 = (var59 / 8 << 8) + var8 / 8;
 
-                                       for(var12 = 0; var12 < class308.regions.length; ++var12) {
-                                          if(class308.regions[var12] == var11 && HealthBarUpdate.regionMapArchives[var12] != null) {
-                                             ServerPacket.method3662(HealthBarUpdate.regionMapArchives[var12], var49, var4 * 8, var5 * 8, var52, (var54 & 7) * 8, (var10 & 7) * 8, var53, class65.scene, collisionMaps);
+                                       for (var10 = 0; var10 < class308.regions.length; ++var10) {
+                                          if (class308.regions[var10] == var9 && HealthBarUpdate.regionMapArchives[var10] != null) {
+                                             ServerPacket.method3662(HealthBarUpdate.regionMapArchives[var10], var56, var5 * 8, var6 * 8, var57, (var59 & 7) * 8, (var8 & 7) * 8, var58, class65.scene, collisionMaps);
                                              break;
                                           }
                                        }
@@ -1871,335 +1600,347 @@ public final class Client extends GameShell implements Usernamed {
                                  }
                               }
 
-                              ++var49;
+                              ++var56;
                            }
                         }
 
                         class13.playPcmPlayers();
 
-                        for(var4 = 0; var4 < 13; ++var4) {
-                           for(var5 = 0; var5 < 13; ++var5) {
-                              boolean var72 = false;
-                              var52 = instanceChunkTemplates[var49][var4][var5];
-                              if(var52 != -1) {
-                                 var53 = var52 >> 24 & 3;
-                                 var54 = var52 >> 1 & 3;
-                                 var10 = var52 >> 14 & 1023;
-                                 var11 = var52 >> 3 & 2047;
-                                 var12 = (var10 / 8 << 8) + var11 / 8;
+                        for (var5 = 0; var5 < 13; ++var5) {
+                           for (var6 = 0; var6 < 13; ++var6) {
+                              boolean var60 = false;
+                              var57 = instanceChunkTemplates[var56][var5][var6];
+                              if (var57 != -1) {
+                                 var58 = var57 >> 24 & 3;
+                                 var59 = var57 >> 1 & 3;
+                                 var8 = var57 >> 14 & 1023;
+                                 var9 = var57 >> 3 & 2047;
+                                 var10 = (var8 / 8 << 8) + var9 / 8;
 
-                                 for(var13 = 0; var13 < class308.regions.length; ++var13) {
-                                    if(class308.regions[var13] == var12 && class40.regionLandArchives[var13] != null) {
-                                       class204.method4013(class40.regionLandArchives[var13], var49, var4 * 8, var5 * 8, var53, (var10 & 7) * 8, (var11 & 7) * 8, var54, collisionMaps);
-                                       var72 = true;
+                                 for (var11 = 0; var11 < class308.regions.length; ++var11) {
+                                    if (class308.regions[var11] == var10 && class40.regionLandArchives[var11] != null) {
+                                       class204.method4013(class40.regionLandArchives[var11], var56, var5 * 8, var6 * 8, var58, (var8 & 7) * 8, (var9 & 7) * 8, var59, collisionMaps);
+                                       var60 = true;
                                        break;
                                     }
                                  }
                               }
 
-                              if(!var72) {
-                                 var53 = var49;
-                                 var54 = var4 * 8;
-                                 var10 = var5 * 8;
+                              if (!var60) {
+                                 var58 = var56;
+                                 var59 = var5 * 8;
+                                 var8 = var6 * 8;
 
-                                 for(var11 = 0; var11 < 8; ++var11) {
-                                    for(var12 = 0; var12 < 8; ++var12) {
-                                       Tiles.Tiles_heights[var53][var11 + var54][var12 + var10] = 0;
+                                 for (var9 = 0; var9 < 8; ++var9) {
+                                    for (var10 = 0; var10 < 8; ++var10) {
+                                       Tiles.Tiles_heights[var58][var9 + var59][var10 + var8] = 0;
                                     }
                                  }
 
-                                 if(var54 > 0) {
-                                    for(var11 = 1; var11 < 8; ++var11) {
-                                       Tiles.Tiles_heights[var53][var54][var10 + var11] = Tiles.Tiles_heights[var53][var54 - 1][var10 + var11];
+                                 if (var59 > 0) {
+                                    for (var9 = 1; var9 < 8; ++var9) {
+                                       Tiles.Tiles_heights[var58][var59][var8 + var9] = Tiles.Tiles_heights[var58][var59 - 1][var8 + var9];
                                     }
                                  }
 
-                                 if(var10 > 0) {
-                                    for(var11 = 1; var11 < 8; ++var11) {
-                                       Tiles.Tiles_heights[var53][var54 + var11][var10] = Tiles.Tiles_heights[var53][var54 + var11][var10 - 1];
+                                 if (var8 > 0) {
+                                    for (var9 = 1; var9 < 8; ++var9) {
+                                       Tiles.Tiles_heights[var58][var59 + var9][var8] = Tiles.Tiles_heights[var58][var59 + var9][var8 - 1];
                                     }
                                  }
 
-                                 if(var54 > 0 && Tiles.Tiles_heights[var53][var54 - 1][var10] != 0) {
-                                    Tiles.Tiles_heights[var53][var54][var10] = Tiles.Tiles_heights[var53][var54 - 1][var10];
-                                 } else if(var10 > 0 && Tiles.Tiles_heights[var53][var54][var10 - 1] != 0) {
-                                    Tiles.Tiles_heights[var53][var54][var10] = Tiles.Tiles_heights[var53][var54][var10 - 1];
-                                 } else if(var54 > 0 && var10 > 0 && Tiles.Tiles_heights[var53][var54 - 1][var10 - 1] != 0) {
-                                    Tiles.Tiles_heights[var53][var54][var10] = Tiles.Tiles_heights[var53][var54 - 1][var10 - 1];
+                                 if (var59 > 0 && Tiles.Tiles_heights[var58][var59 - 1][var8] != 0) {
+                                    Tiles.Tiles_heights[var58][var59][var8] = Tiles.Tiles_heights[var58][var59 - 1][var8];
+                                 } else if (var8 > 0 && Tiles.Tiles_heights[var58][var59][var8 - 1] != 0) {
+                                    Tiles.Tiles_heights[var58][var59][var8] = Tiles.Tiles_heights[var58][var59][var8 - 1];
+                                 } else if (var59 > 0 && var8 > 0 && Tiles.Tiles_heights[var58][var59 - 1][var8 - 1] != 0) {
+                                    Tiles.Tiles_heights[var58][var59][var8] = Tiles.Tiles_heights[var58][var59 - 1][var8 - 1];
                                  }
                               }
                            }
                         }
 
-                        ++var49;
+                        ++var56;
                      }
                   }
 
                   UserComparator10.method3352(true);
                   class13.playPcmPlayers();
-                  Scene var65 = class65.scene;
-                  CollisionMap[] var71 = collisionMaps;
+                  Scene var61 = class65.scene;
+                  CollisionMap[] var62 = collisionMaps;
 
-                  for(var5 = 0; var5 < 4; ++var5) {
-                     for(var51 = 0; var51 < 104; ++var51) {
-                        for(var52 = 0; var52 < 104; ++var52) {
-                           if((Tiles.Tiles_renderFlags[var5][var51][var52] & 1) == 1) {
-                              var53 = var5;
-                              if((Tiles.Tiles_renderFlags[1][var51][var52] & 2) == 2) {
-                                 var53 = var5 - 1;
+                  for (var6 = 0; var6 < 4; ++var6) {
+                     for (var21 = 0; var21 < 104; ++var21) {
+                        for (var57 = 0; var57 < 104; ++var57) {
+                           if ((Tiles.Tiles_renderFlags[var6][var21][var57] & 1) == 1) {
+                              var58 = var6;
+                              if ((Tiles.Tiles_renderFlags[1][var21][var57] & 2) == 2) {
+                                 var58 = var6 - 1;
                               }
 
-                              if(var53 >= 0) {
-                                 var71[var53].__w_285(var51, var52);
+                              if (var58 >= 0) {
+                                 var62[var58].method92(var21, var57);
                               }
                            }
                         }
                      }
                   }
 
-                  Tiles.__bq_p += (int)(Math.random() * 5.0D) - 2;
-                  if(Tiles.__bq_p < -8) {
-                     Tiles.__bq_p = -8;
+                  Tiles.field917 += (int)(Math.random() * 5.0D) - 2;
+                  if (Tiles.field917 < -8) {
+                     Tiles.field917 = -8;
                   }
 
-                  if(Tiles.__bq_p > 8) {
-                     Tiles.__bq_p = 8;
+                  if (Tiles.field917 > 8) {
+                     Tiles.field917 = 8;
                   }
 
-                  Tiles.__bq_v += (int)(Math.random() * 5.0D) - 2;
-                  if(Tiles.__bq_v < -16) {
-                     Tiles.__bq_v = -16;
+                  Tiles.field918 += (int)(Math.random() * 5.0D) - 2;
+                  if (Tiles.field918 < -16) {
+                     Tiles.field918 = -16;
                   }
 
-                  if(Tiles.__bq_v > 16) {
-                     Tiles.__bq_v = 16;
+                  if (Tiles.field918 > 16) {
+                     Tiles.field918 = 16;
                   }
 
-                  for(var5 = 0; var5 < 4; ++var5) {
-                     byte[][] var66 = Tiles.__bq_l[var5];
-                     var12 = (int)Math.sqrt(5100.0D);
-                     var13 = var12 * 768 >> 8;
+                  int[] var63;
+                  for (var6 = 0; var6 < 4; ++var6) {
+                     byte[][] var28 = Tiles.field909[var6];
+                     var10 = (int)Math.sqrt(5100.0D);
+                     var11 = var10 * 768 >> 8;
 
-                     int var55;
-                     for(var14 = 1; var14 < 103; ++var14) {
-                        for(var15 = 1; var15 < 103; ++var15) {
-                           var16 = Tiles.Tiles_heights[var5][var15 + 1][var14] - Tiles.Tiles_heights[var5][var15 - 1][var14];
-                           var17 = Tiles.Tiles_heights[var5][var15][var14 + 1] - Tiles.Tiles_heights[var5][var15][var14 - 1];
-                           var18 = (int)Math.sqrt((double)(var17 * var17 + var16 * var16 + 65536));
-                           var19 = (var16 << 8) / var18;
-                           var20 = 65536 / var18;
-                           var21 = (var17 << 8) / var18;
-                           var22 = (var21 * -50 + var19 * -50 + var20 * -10) / var13 + 96;
-                           var55 = (var66[var15 - 1][var14] >> 2) + (var66[var15][var14 - 1] >> 2) + (var66[var15 + 1][var14] >> 3) + (var66[var15][var14 + 1] >> 3) + (var66[var15][var14] >> 1);
-                           Huffman.__gd_e[var15][var14] = var22 - var55;
+                     int var29;
+                     for (var12 = 1; var12 < 103; ++var12) {
+                        for (var13 = 1; var13 < 103; ++var13) {
+                           var14 = Tiles.Tiles_heights[var6][var13 + 1][var12] - Tiles.Tiles_heights[var6][var13 - 1][var12];
+                           var15 = Tiles.Tiles_heights[var6][var13][var12 + 1] - Tiles.Tiles_heights[var6][var13][var12 - 1];
+                           var16 = (int)Math.sqrt((double)(var15 * var15 + var14 * var14 + 65536));
+                           var17 = (var14 << 8) / var16;
+                           var18 = 65536 / var16;
+                           var19 = (var15 << 8) / var16;
+                           var20 = (var19 * -50 + var17 * -50 + var18 * -10) / var11 + 96;
+                           var29 = (var28[var13 - 1][var12] >> 2) + (var28[var13][var12 - 1] >> 2) + (var28[var13 + 1][var12] >> 3) + (var28[var13][var12 + 1] >> 3) + (var28[var13][var12] >> 1);
+                           Huffman.field398[var13][var12] = var20 - var29;
                         }
                      }
 
-                     for(var14 = 0; var14 < 104; ++var14) {
-                        class13.__i_x[var14] = 0;
-                        Formatting.__cy_d[var14] = 0;
-                        class214.__hf_k[var14] = 0;
-                        WorldMapSectionType.__h_n[var14] = 0;
-                        Message.__bm_i[var14] = 0;
+                     for (var12 = 0; var12 < 104; ++var12) {
+                        class13.field1112[var12] = 0;
+                        Formatting.field353[var12] = 0;
+                        class214.field1131[var12] = 0;
+                        WorldMapSectionType.field1104[var12] = 0;
+                        Message.field490[var12] = 0;
                      }
 
-                     for(var14 = -5; var14 < 109; ++var14) {
-                        for(var15 = 0; var15 < 104; ++var15) {
-                           var16 = var14 + 5;
-                           if(var16 >= 0 && var16 < 104) {
-                              var17 = Tiles.__bq_w[var5][var16][var15] & 255;
-                              if(var17 > 0) {
-                                 UnderlayDefinition var56 = StudioGame.method4550(var17 - 1);
-                                 class13.__i_x[var15] += var56.hue;
-                                 Formatting.__cy_d[var15] += var56.saturation;
-                                 class214.__hf_k[var15] += var56.lightness;
-                                 WorldMapSectionType.__h_n[var15] += var56.hueMultiplier;
-                                 ++Message.__bm_i[var15];
+                     for (var12 = -5; var12 < 109; ++var12) {
+                        for (var13 = 0; var13 < 104; ++var13) {
+                           var14 = var12 + 5;
+                           int var10003;
+                           FloorUnderlayDefinition var31;
+                           if (var14 >= 0 && var14 < 104) {
+                              var15 = Tiles.field908[var6][var14][var13] & 255;
+                              if (var15 > 0) {
+                                 var31 = StudioGame.method4550(var15 - 1);
+                                 var63 = class13.field1112;
+                                 var63[var13] += var31.hue;
+                                 var63 = Formatting.field353;
+                                 var63[var13] += var31.saturation;
+                                 var63 = class214.field1131;
+                                 var63[var13] += var31.lightness;
+                                 var63 = WorldMapSectionType.field1104;
+                                 var63[var13] += var31.hueMultiplier;
+                                 var10003 = Message.field490[var13]++;
                               }
                            }
 
-                           var17 = var14 - 5;
-                           if(var17 >= 0 && var17 < 104) {
-                              var18 = Tiles.__bq_w[var5][var17][var15] & 255;
-                              if(var18 > 0) {
-                                 UnderlayDefinition var57 = StudioGame.method4550(var18 - 1);
-                                 class13.__i_x[var15] -= var57.hue;
-                                 Formatting.__cy_d[var15] -= var57.saturation;
-                                 class214.__hf_k[var15] -= var57.lightness;
-                                 WorldMapSectionType.__h_n[var15] -= var57.hueMultiplier;
-                                 --Message.__bm_i[var15];
+                           var15 = var12 - 5;
+                           if (var15 >= 0 && var15 < 104) {
+                              var16 = Tiles.field908[var6][var15][var13] & 255;
+                              if (var16 > 0) {
+                                 var31 = StudioGame.method4550(var16 - 1);
+                                 var63 = class13.field1112;
+                                 var63[var13] -= var31.hue;
+                                 var63 = Formatting.field353;
+                                 var63[var13] -= var31.saturation;
+                                 var63 = class214.field1131;
+                                 var63[var13] -= var31.lightness;
+                                 var63 = WorldMapSectionType.field1104;
+                                 var63[var13] -= var31.hueMultiplier;
+                                 var10003 = Message.field490[var13]--;
                               }
                            }
                         }
 
-                        if(var14 >= 1 && var14 < 103) {
+                        if (var12 >= 1 && var12 < 103) {
+                           var13 = 0;
+                           var14 = 0;
                            var15 = 0;
                            var16 = 0;
                            var17 = 0;
-                           var18 = 0;
-                           var19 = 0;
 
-                           for(var20 = -5; var20 < 109; ++var20) {
-                              var21 = var20 + 5;
-                              if(var21 >= 0 && var21 < 104) {
-                                 var15 += class13.__i_x[var21];
-                                 var16 += Formatting.__cy_d[var21];
-                                 var17 += class214.__hf_k[var21];
-                                 var18 += WorldMapSectionType.__h_n[var21];
-                                 var19 += Message.__bm_i[var21];
+                           for (var18 = -5; var18 < 109; ++var18) {
+                              var19 = var18 + 5;
+                              if (var19 >= 0 && var19 < 104) {
+                                 var13 += class13.field1112[var19];
+                                 var14 += Formatting.field353[var19];
+                                 var15 += class214.field1131[var19];
+                                 var16 += WorldMapSectionType.field1104[var19];
+                                 var17 += Message.field490[var19];
                               }
 
-                              var22 = var20 - 5;
-                              if(var22 >= 0 && var22 < 104) {
-                                 var15 -= class13.__i_x[var22];
-                                 var16 -= Formatting.__cy_d[var22];
-                                 var17 -= class214.__hf_k[var22];
-                                 var18 -= WorldMapSectionType.__h_n[var22];
-                                 var19 -= Message.__bm_i[var22];
+                              var20 = var18 - 5;
+                              if (var20 >= 0 && var20 < 104) {
+                                 var13 -= class13.field1112[var20];
+                                 var14 -= Formatting.field353[var20];
+                                 var15 -= class214.field1131[var20];
+                                 var16 -= WorldMapSectionType.field1104[var20];
+                                 var17 -= Message.field490[var20];
                               }
 
-                              if(var20 >= 1 && var20 < 103 && (!isLowDetail || (Tiles.Tiles_renderFlags[0][var14][var20] & 2) != 0 || (Tiles.Tiles_renderFlags[var5][var14][var20] & 16) == 0)) {
-                                 if(var5 < Tiles.Tiles_minPlane) {
-                                    Tiles.Tiles_minPlane = var5;
+                              if (var18 >= 1 && var18 < 103 && (!isLowDetail || (Tiles.Tiles_renderFlags[0][var12][var18] & 2) != 0 || (Tiles.Tiles_renderFlags[var6][var12][var18] & 16) == 0)) {
+                                 if (var6 < Tiles.Tiles_minPlane) {
+                                    Tiles.Tiles_minPlane = var6;
                                  }
 
-                                 var55 = Tiles.__bq_w[var5][var14][var20] & 255;
-                                 int var24 = Fonts.__kz_o[var5][var14][var20] & 255;
-                                 if(var55 > 0 || var24 > 0) {
-                                    int var25 = Tiles.Tiles_heights[var5][var14][var20];
-                                    int var26 = Tiles.Tiles_heights[var5][var14 + 1][var20];
-                                    int var27 = Tiles.Tiles_heights[var5][var14 + 1][var20 + 1];
-                                    int var28 = Tiles.Tiles_heights[var5][var14][var20 + 1];
-                                    int var29 = Huffman.__gd_e[var14][var20];
-                                    int var30 = Huffman.__gd_e[var14 + 1][var20];
-                                    int var31 = Huffman.__gd_e[var14 + 1][var20 + 1];
-                                    int var32 = Huffman.__gd_e[var14][var20 + 1];
-                                    int var33 = -1;
-                                    int var34 = -1;
-                                    int var35;
-                                    int var36;
-                                    int var37;
-                                    if(var55 > 0) {
-                                       var35 = var15 * 256 / var18;
-                                       var36 = var16 / var19;
-                                       var37 = var17 / var19;
-                                       var33 = WorldMapAreaData.method712(var35, var36, var37);
-                                       var35 = var35 + Tiles.__bq_p & 255;
-                                       var37 += Tiles.__bq_v;
-                                       if(var37 < 0) {
-                                          var37 = 0;
-                                       } else if(var37 > 255) {
-                                          var37 = 255;
+                                 var29 = Tiles.field908[var6][var12][var18] & 255;
+                                 int var30 = Fonts.field350[var6][var12][var18] & 255;
+                                 if (var29 > 0 || var30 > 0) {
+                                    int var66 = Tiles.Tiles_heights[var6][var12][var18];
+                                    int var32 = Tiles.Tiles_heights[var6][var12 + 1][var18];
+                                    int var33 = Tiles.Tiles_heights[var6][var12 + 1][var18 + 1];
+                                    int var34 = Tiles.Tiles_heights[var6][var12][var18 + 1];
+                                    int var35 = Huffman.field398[var12][var18];
+                                    int var36 = Huffman.field398[var12 + 1][var18];
+                                    int var37 = Huffman.field398[var12 + 1][var18 + 1];
+                                    int var38 = Huffman.field398[var12][var18 + 1];
+                                    int var39 = -1;
+                                    int var40 = -1;
+                                    int var41;
+                                    int var42;
+                                    int var43;
+                                    if (var29 > 0) {
+                                       var41 = var13 * 256 / var16;
+                                       var42 = var14 / var17;
+                                       var43 = var15 / var17;
+                                       var39 = WorldMapAreaData.method712(var41, var42, var43);
+                                       var41 = var41 + Tiles.field917 & 255;
+                                       var43 += Tiles.field918;
+                                       if (var43 < 0) {
+                                          var43 = 0;
+                                       } else if (var43 > 255) {
+                                          var43 = 255;
                                        }
 
-                                       var34 = WorldMapAreaData.method712(var35, var36, var37);
+                                       var40 = WorldMapAreaData.method712(var41, var42, var43);
                                     }
 
-                                    OverlayDefinition var38;
-                                    if(var5 > 0) {
-                                       boolean var69 = true;
-                                       if(var55 == 0 && class32.__ay_u[var5][var14][var20] != 0) {
-                                          var69 = false;
+                                    FloorOverlayDefinition var44;
+                                    if (var6 > 0) {
+                                       boolean var45 = true;
+                                       if (var29 == 0 && class32.field1157[var6][var12][var18] != 0) {
+                                          var45 = false;
                                        }
 
-                                       if(var24 > 0) {
-                                          var37 = var24 - 1;
-                                          var38 = (OverlayDefinition)OverlayDefinition.__jf_f.get((long)var37);
-                                          OverlayDefinition var58;
-                                          if(var38 != null) {
-                                             var58 = var38;
+                                       if (var30 > 0) {
+                                          var43 = var30 - 1;
+                                          var44 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var43);
+                                          FloorOverlayDefinition var46;
+                                          if (var44 != null) {
+                                             var46 = var44;
                                           } else {
-                                             byte[] var39 = OverlayDefinition.__jf_m.takeRecord(4, var37);
-                                             var38 = new OverlayDefinition();
-                                             if(var39 != null) {
-                                                var38.read(new Buffer(var39), var37);
+                                             byte[] var47 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var43);
+                                             var44 = new FloorOverlayDefinition();
+                                             if (var47 != null) {
+                                                var44.decode(new Buffer(var47), var43);
                                              }
 
-                                             var38.init();
-                                             OverlayDefinition.__jf_f.put(var38, (long)var37);
-                                             var58 = var38;
+                                             var44.postDecode();
+                                             FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var44, (long)var43);
+                                             var46 = var44;
                                           }
 
-                                          if(!var58.__o) {
-                                             var69 = false;
+                                          if (!var46.field665) {
+                                             var45 = false;
                                           }
                                        }
 
-                                       if(var69 && var25 == var26 && var25 == var27 && var28 == var25) {
-                                          Tiles.__bq_a[var5][var14][var20] |= 2340;
+                                       if (var45 && var66 == var32 && var66 == var33 && var34 == var66) {
+                                          var63 = Tiles.field910[var6][var12];
+                                          var63[var18] |= 2340;
                                        }
                                     }
 
-                                    var35 = 0;
-                                    if(var34 != -1) {
-                                       var35 = Rasterizer3D.Rasterizer3D_colorPalette[class15.method183(var34, 96)];
+                                    var41 = 0;
+                                    if (var40 != -1) {
+                                       var41 = Rasterizer3D.Rasterizer3D_colorPalette[class15.method183(var40, 96)];
                                     }
 
-                                    if(var24 == 0) {
-                                       var65.addTile(var5, var14, var20, 0, 0, -1, var25, var26, var27, var28, class15.method183(var33, var29), class15.method183(var33, var30), class15.method183(var33, var31), class15.method183(var33, var32), 0, 0, 0, 0, var35, 0);
+                                    if (var30 == 0) {
+                                       var61.addTile(var6, var12, var18, 0, 0, -1, var66, var32, var33, var34, class15.method183(var39, var35), class15.method183(var39, var36), class15.method183(var39, var37), class15.method183(var39, var38), 0, 0, 0, 0, var41, 0);
                                     } else {
-                                       var36 = class32.__ay_u[var5][var14][var20] + 1;
-                                       byte var70 = class307.__kc_g[var5][var14][var20];
-                                       int var59 = var24 - 1;
-                                       OverlayDefinition var40 = (OverlayDefinition)OverlayDefinition.__jf_f.get((long)var59);
-                                       if(var40 != null) {
-                                          var38 = var40;
+                                       var42 = class32.field1157[var6][var12][var18] + 1;
+                                       byte var67 = class307.field1155[var6][var12][var18];
+                                       int var68 = var30 - 1;
+                                       FloorOverlayDefinition var69 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var68);
+                                       if (var69 != null) {
+                                          var44 = var69;
                                        } else {
-                                          byte[] var41 = OverlayDefinition.__jf_m.takeRecord(4, var59);
-                                          var40 = new OverlayDefinition();
-                                          if(var41 != null) {
-                                             var40.read(new Buffer(var41), var59);
+                                          byte[] var48 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var68);
+                                          var69 = new FloorOverlayDefinition();
+                                          if (var48 != null) {
+                                             var69.decode(new Buffer(var48), var68);
                                           }
 
-                                          var40.init();
-                                          OverlayDefinition.__jf_f.put(var40, (long)var59);
-                                          var38 = var40;
+                                          var69.postDecode();
+                                          FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var69, (long)var68);
+                                          var44 = var69;
                                        }
 
-                                       int var60 = var38.texture;
-                                       int var42;
-                                       int var43;
-                                       int var44;
-                                       int var45;
-                                       if(var60 >= 0) {
-                                          var43 = Rasterizer3D.Rasterizer3D_textureLoader.__w_213(var60);
-                                          var42 = -1;
-                                       } else if(var38.rgb == 16711935) {
-                                          var42 = -2;
-                                          var60 = -1;
-                                          var43 = -2;
+                                       int var70 = var44.texture;
+                                       int var49;
+                                       int var50;
+                                       int var51;
+                                       int var52;
+                                       if (var70 >= 0) {
+                                          var50 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var70);
+                                          var49 = -1;
+                                       } else if (var44.rgb == 16711935) {
+                                          var49 = -2;
+                                          var70 = -1;
+                                          var50 = -2;
                                        } else {
-                                          var42 = WorldMapAreaData.method712(var38.hue, var38.saturation, var38.lightness);
-                                          var44 = var38.hue + Tiles.__bq_p & 255;
-                                          var45 = var38.lightness + Tiles.__bq_v;
-                                          if(var45 < 0) {
-                                             var45 = 0;
-                                          } else if(var45 > 255) {
-                                             var45 = 255;
+                                          var49 = WorldMapAreaData.method712(var44.hue, var44.saturation, var44.lightness);
+                                          var51 = var44.hue + Tiles.field917 & 255;
+                                          var52 = var44.lightness + Tiles.field918;
+                                          if (var52 < 0) {
+                                             var52 = 0;
+                                          } else if (var52 > 255) {
+                                             var52 = 255;
                                           }
 
-                                          var43 = WorldMapAreaData.method712(var44, var38.saturation, var45);
+                                          var50 = WorldMapAreaData.method712(var51, var44.saturation, var52);
                                        }
 
-                                       var44 = 0;
-                                       if(var43 != -2) {
-                                          var44 = Rasterizer3D.Rasterizer3D_colorPalette[class25.method348(var43, 96)];
+                                       var51 = 0;
+                                       if (var50 != -2) {
+                                          var51 = Rasterizer3D.Rasterizer3D_colorPalette[WorldMapDecoration.method348(var50, 96)];
                                        }
 
-                                       if(var38.rgb2 != -1) {
-                                          var45 = var38.hue2 + Tiles.__bq_p & 255;
-                                          int var46 = var38.lightness2 + Tiles.__bq_v;
-                                          if(var46 < 0) {
-                                             var46 = 0;
-                                          } else if(var46 > 255) {
-                                             var46 = 255;
+                                       if (var44.rgb2 != -1) {
+                                          var52 = var44.hue2 + Tiles.field917 & 255;
+                                          int var53 = var44.lightness2 + Tiles.field918;
+                                          if (var53 < 0) {
+                                             var53 = 0;
+                                          } else if (var53 > 255) {
+                                             var53 = 255;
                                           }
 
-                                          var43 = WorldMapAreaData.method712(var45, var38.saturation2, var46);
-                                          var44 = Rasterizer3D.Rasterizer3D_colorPalette[class25.method348(var43, 96)];
+                                          var50 = WorldMapAreaData.method712(var52, var44.saturation2, var53);
+                                          var51 = Rasterizer3D.Rasterizer3D_colorPalette[WorldMapDecoration.method348(var50, 96)];
                                        }
 
-                                       var65.addTile(var5, var14, var20, var36, var70, var60, var25, var26, var27, var28, class15.method183(var33, var29), class15.method183(var33, var30), class15.method183(var33, var31), class15.method183(var33, var32), class25.method348(var42, var29), class25.method348(var42, var30), class25.method348(var42, var31), class25.method348(var42, var32), var35, var44);
+                                       var61.addTile(var6, var12, var18, var42, var67, var70, var66, var32, var33, var34, class15.method183(var39, var35), class15.method183(var39, var36), class15.method183(var39, var37), class15.method183(var39, var38), WorldMapDecoration.method348(var49, var35), WorldMapDecoration.method348(var49, var36), WorldMapDecoration.method348(var49, var37), WorldMapDecoration.method348(var49, var38), var41, var51);
                                     }
                                  }
                               }
@@ -2207,194 +1948,194 @@ public final class Client extends GameShell implements Usernamed {
                         }
                      }
 
-                     for(var14 = 1; var14 < 103; ++var14) {
-                        for(var15 = 1; var15 < 103; ++var15) {
-                           if((Tiles.Tiles_renderFlags[var5][var15][var14] & 8) != 0) {
-                              var20 = 0;
-                           } else if(var5 > 0 && (Tiles.Tiles_renderFlags[1][var15][var14] & 2) != 0) {
-                              var20 = var5 - 1;
+                     for (var12 = 1; var12 < 103; ++var12) {
+                        for (var13 = 1; var13 < 103; ++var13) {
+                           if ((Tiles.Tiles_renderFlags[var6][var13][var12] & 8) != 0) {
+                              var18 = 0;
+                           } else if (var6 > 0 && (Tiles.Tiles_renderFlags[1][var13][var12] & 2) != 0) {
+                              var18 = var6 - 1;
                            } else {
-                              var20 = var5;
+                              var18 = var6;
                            }
 
-                           var65.setTileMinPlane(var5, var15, var14, var20);
+                           var61.setTileMinPlane(var6, var13, var12, var18);
                         }
                      }
 
-                     Tiles.__bq_w[var5] = null;
-                     Fonts.__kz_o[var5] = null;
-                     class32.__ay_u[var5] = null;
-                     class307.__kc_g[var5] = null;
-                     Tiles.__bq_l[var5] = null;
+                     Tiles.field908[var6] = ((byte[][])null);
+                     Fonts.field350[var6] = ((byte[][])null);
+                     class32.field1157[var6] = ((byte[][])null);
+                     class307.field1155[var6] = ((byte[][])null);
+                     Tiles.field909[var6] = ((byte[][])null);
                   }
 
-                  var65.__aw_247(-50, -10, -50);
+                  var61.method293(-50, -10, -50);
 
-                  for(var5 = 0; var5 < 104; ++var5) {
-                     for(var51 = 0; var51 < 104; ++var51) {
-                        if((Tiles.Tiles_renderFlags[1][var5][var51] & 2) == 2) {
-                           var65.setLinkBelow(var5, var51);
+                  for (var6 = 0; var6 < 104; ++var6) {
+                     for (var21 = 0; var21 < 104; ++var21) {
+                        if ((Tiles.Tiles_renderFlags[1][var6][var21] & 2) == 2) {
+                           var61.setLinkBelow(var6, var21);
                         }
                      }
                   }
 
-                  var5 = 1;
-                  var51 = 2;
-                  var52 = 4;
+                  var6 = 1;
+                  var21 = 2;
+                  var57 = 4;
 
-                  for(var53 = 0; var53 < 4; ++var53) {
-                     if(var53 > 0) {
-                        var5 <<= 3;
-                        var51 <<= 3;
-                        var52 <<= 3;
+                  for (var58 = 0; var58 < 4; ++var58) {
+                     if (var58 > 0) {
+                        var6 <<= 3;
+                        var21 <<= 3;
+                        var57 <<= 3;
                      }
 
-                     for(var54 = 0; var54 <= var53; ++var54) {
-                        for(var10 = 0; var10 <= 104; ++var10) {
-                           for(var11 = 0; var11 <= 104; ++var11) {
-                              short var68;
-                              if((Tiles.__bq_a[var54][var11][var10] & var5) != 0) {
-                                 var12 = var10;
-                                 var13 = var10;
-                                 var14 = var54;
+                     for (var59 = 0; var59 <= var58; ++var59) {
+                        for (var8 = 0; var8 <= 104; ++var8) {
+                           for (var9 = 0; var9 <= 104; ++var9) {
+                              short var64;
+                              if ((Tiles.field910[var59][var9][var8] & var6) != 0) {
+                                 var10 = var8;
+                                 var11 = var8;
+                                 var12 = var59;
 
-                                 for(var15 = var54; var12 > 0 && (Tiles.__bq_a[var54][var11][var12 - 1] & var5) != 0; --var12) {
-                                    ;
+                                 for (var13 = var59; var10 > 0 && (Tiles.field910[var59][var9][var10 - 1] & var6) != 0; --var10) {
                                  }
 
-                                 while(var13 < 104 && (Tiles.__bq_a[var54][var11][var13 + 1] & var5) != 0) {
-                                    ++var13;
+                                 while (var11 < 104 && (Tiles.field910[var59][var9][var11 + 1] & var6) != 0) {
+                                    ++var11;
                                  }
 
-                                 label837:
-                                 while(var14 > 0) {
-                                    for(var16 = var12; var16 <= var13; ++var16) {
-                                       if((Tiles.__bq_a[var14 - 1][var11][var16] & var5) == 0) {
-                                          break label837;
-                                       }
-                                    }
-
-                                    --var14;
-                                 }
-
-                                 label826:
-                                 while(var15 < var53) {
-                                    for(var16 = var12; var16 <= var13; ++var16) {
-                                       if((Tiles.__bq_a[var15 + 1][var11][var16] & var5) == 0) {
-                                          break label826;
-                                       }
-                                    }
-
-                                    ++var15;
-                                 }
-
-                                 var16 = (var13 - var12 + 1) * (var15 + 1 - var14);
-                                 if(var16 >= 8) {
-                                    var68 = 240;
-                                    var18 = Tiles.Tiles_heights[var15][var11][var12] - var68;
-                                    var19 = Tiles.Tiles_heights[var14][var11][var12];
-                                    Scene.Scene_addOccluder(var53, 1, var11 * 128, var11 * 128, var12 * 128, var13 * 128 + 128, var18, var19);
-
-                                    for(var20 = var14; var20 <= var15; ++var20) {
-                                       for(var21 = var12; var21 <= var13; ++var21) {
-                                          Tiles.__bq_a[var20][var11][var21] &= ~var5;
-                                       }
-                                    }
-                                 }
-                              }
-
-                              if((Tiles.__bq_a[var54][var11][var10] & var51) != 0) {
-                                 var12 = var11;
-                                 var13 = var11;
-                                 var14 = var54;
-
-                                 for(var15 = var54; var12 > 0 && (Tiles.__bq_a[var54][var12 - 1][var10] & var51) != 0; --var12) {
-                                    ;
-                                 }
-
-                                 while(var13 < 104 && (Tiles.__bq_a[var54][var13 + 1][var10] & var51) != 0) {
-                                    ++var13;
-                                 }
-
-                                 label890:
-                                 while(var14 > 0) {
-                                    for(var16 = var12; var16 <= var13; ++var16) {
-                                       if((Tiles.__bq_a[var14 - 1][var16][var10] & var51) == 0) {
-                                          break label890;
-                                       }
-                                    }
-
-                                    --var14;
-                                 }
-
-                                 label879:
-                                 while(var15 < var53) {
-                                    for(var16 = var12; var16 <= var13; ++var16) {
-                                       if((Tiles.__bq_a[var15 + 1][var16][var10] & var51) == 0) {
-                                          break label879;
-                                       }
-                                    }
-
-                                    ++var15;
-                                 }
-
-                                 var16 = (var13 - var12 + 1) * (var15 + 1 - var14);
-                                 if(var16 >= 8) {
-                                    var68 = 240;
-                                    var18 = Tiles.Tiles_heights[var15][var12][var10] - var68;
-                                    var19 = Tiles.Tiles_heights[var14][var12][var10];
-                                    Scene.Scene_addOccluder(var53, 2, var12 * 128, var13 * 128 + 128, var10 * 128, var10 * 128, var18, var19);
-
-                                    for(var20 = var14; var20 <= var15; ++var20) {
-                                       for(var21 = var12; var21 <= var13; ++var21) {
-                                          Tiles.__bq_a[var20][var21][var10] &= ~var51;
-                                       }
-                                    }
-                                 }
-                              }
-
-                              if((Tiles.__bq_a[var54][var11][var10] & var52) != 0) {
-                                 var12 = var11;
-                                 var13 = var11;
-                                 var14 = var10;
-
-                                 for(var15 = var10; var14 > 0 && (Tiles.__bq_a[var54][var11][var14 - 1] & var52) != 0; --var14) {
-                                    ;
-                                 }
-
-                                 while(var15 < 104 && (Tiles.__bq_a[var54][var11][var15 + 1] & var52) != 0) {
-                                    ++var15;
-                                 }
-
-                                 label943:
-                                 while(var12 > 0) {
-                                    for(var16 = var14; var16 <= var15; ++var16) {
-                                       if((Tiles.__bq_a[var54][var12 - 1][var16] & var52) == 0) {
-                                          break label943;
+                                 label649:
+                                 while (var12 > 0) {
+                                    for (var14 = var10; var14 <= var11; ++var14) {
+                                       if ((Tiles.field910[var12 - 1][var9][var14] & var6) == 0) {
+                                          break label649;
                                        }
                                     }
 
                                     --var12;
                                  }
 
-                                 label932:
-                                 while(var13 < 104) {
-                                    for(var16 = var14; var16 <= var15; ++var16) {
-                                       if((Tiles.__bq_a[var54][var13 + 1][var16] & var52) == 0) {
-                                          break label932;
+                                 label638:
+                                 while (var13 < var58) {
+                                    for (var14 = var10; var14 <= var11; ++var14) {
+                                       if ((Tiles.field910[var13 + 1][var9][var14] & var6) == 0) {
+                                          break label638;
                                        }
                                     }
 
                                     ++var13;
                                  }
 
-                                 if((var15 - var14 + 1) * (var13 - var12 + 1) >= 4) {
-                                    var16 = Tiles.Tiles_heights[var54][var12][var14];
-                                    Scene.Scene_addOccluder(var53, 4, var12 * 128, var13 * 128 + 128, var14 * 128, var15 * 128 + 128, var16, var16);
+                                 var14 = (var11 - var10 + 1) * (var13 + 1 - var12);
+                                 if (var14 >= 8) {
+                                    var64 = 240;
+                                    var16 = Tiles.Tiles_heights[var13][var9][var10] - var64;
+                                    var17 = Tiles.Tiles_heights[var12][var9][var10];
+                                    Scene.Scene_addOccluder(var58, 1, var9 * 128, var9 * 128, var10 * 128, var11 * 128 + 128, var16, var17);
 
-                                    for(var17 = var12; var17 <= var13; ++var17) {
-                                       for(var18 = var14; var18 <= var15; ++var18) {
-                                          Tiles.__bq_a[var54][var17][var18] &= ~var52;
+                                    for (var18 = var12; var18 <= var13; ++var18) {
+                                       for (var19 = var10; var19 <= var11; ++var19) {
+                                          var63 = Tiles.field910[var18][var9];
+                                          var63[var19] &= ~var6;
+                                       }
+                                    }
+                                 }
+                              }
+
+                              if ((Tiles.field910[var59][var9][var8] & var21) != 0) {
+                                 var10 = var9;
+                                 var11 = var9;
+                                 var12 = var59;
+
+                                 for (var13 = var59; var10 > 0 && (Tiles.field910[var59][var10 - 1][var8] & var21) != 0; --var10) {
+                                 }
+
+                                 while (var11 < 104 && (Tiles.field910[var59][var11 + 1][var8] & var21) != 0) {
+                                    ++var11;
+                                 }
+
+                                 label702:
+                                 while (var12 > 0) {
+                                    for (var14 = var10; var14 <= var11; ++var14) {
+                                       if ((Tiles.field910[var12 - 1][var14][var8] & var21) == 0) {
+                                          break label702;
+                                       }
+                                    }
+
+                                    --var12;
+                                 }
+
+                                 label691:
+                                 while (var13 < var58) {
+                                    for (var14 = var10; var14 <= var11; ++var14) {
+                                       if ((Tiles.field910[var13 + 1][var14][var8] & var21) == 0) {
+                                          break label691;
+                                       }
+                                    }
+
+                                    ++var13;
+                                 }
+
+                                 var14 = (var11 - var10 + 1) * (var13 + 1 - var12);
+                                 if (var14 >= 8) {
+                                    var64 = 240;
+                                    var16 = Tiles.Tiles_heights[var13][var10][var8] - var64;
+                                    var17 = Tiles.Tiles_heights[var12][var10][var8];
+                                    Scene.Scene_addOccluder(var58, 2, var10 * 128, var11 * 128 + 128, var8 * 128, var8 * 128, var16, var17);
+
+                                    for (var18 = var12; var18 <= var13; ++var18) {
+                                       for (var19 = var10; var19 <= var11; ++var19) {
+                                          var63 = Tiles.field910[var18][var19];
+                                          var63[var8] &= ~var21;
+                                       }
+                                    }
+                                 }
+                              }
+
+                              if ((Tiles.field910[var59][var9][var8] & var57) != 0) {
+                                 var10 = var9;
+                                 var11 = var9;
+                                 var12 = var8;
+
+                                 for (var13 = var8; var12 > 0 && (Tiles.field910[var59][var9][var12 - 1] & var57) != 0; --var12) {
+                                 }
+
+                                 while (var13 < 104 && (Tiles.field910[var59][var9][var13 + 1] & var57) != 0) {
+                                    ++var13;
+                                 }
+
+                                 label755:
+                                 while (var10 > 0) {
+                                    for (var14 = var12; var14 <= var13; ++var14) {
+                                       if ((Tiles.field910[var59][var10 - 1][var14] & var57) == 0) {
+                                          break label755;
+                                       }
+                                    }
+
+                                    --var10;
+                                 }
+
+                                 label744:
+                                 while (var11 < 104) {
+                                    for (var14 = var12; var14 <= var13; ++var14) {
+                                       if ((Tiles.field910[var59][var11 + 1][var14] & var57) == 0) {
+                                          break label744;
+                                       }
+                                    }
+
+                                    ++var11;
+                                 }
+
+                                 if ((var13 - var12 + 1) * (var11 - var10 + 1) >= 4) {
+                                    var14 = Tiles.Tiles_heights[var59][var10][var12];
+                                    Scene.Scene_addOccluder(var58, 4, var10 * 128, var11 * 128 + 128, var12 * 128, var13 * 128 + 128, var14, var14);
+
+                                    for (var15 = var10; var15 <= var11; ++var15) {
+                                       for (var16 = var12; var16 <= var13; ++var16) {
+                                          var63 = Tiles.field910[var59][var15];
+                                          var63[var16] &= ~var57;
                                        }
                                     }
                                  }
@@ -2405,48 +2146,48 @@ public final class Client extends GameShell implements Usernamed {
                   }
 
                   UserComparator10.method3352(true);
-                  var5 = Tiles.Tiles_minPlane;
-                  if(var5 > SoundSystem.plane) {
-                     var5 = SoundSystem.plane;
+                  var6 = Tiles.Tiles_minPlane;
+                  if (var6 > SoundSystem.plane) {
+                     var6 = SoundSystem.plane;
                   }
 
-                  if(var5 < SoundSystem.plane - 1) {
-                     var5 = SoundSystem.plane - 1;
+                  if (var6 < SoundSystem.plane - 1) {
+                     var6 = SoundSystem.plane - 1;
                   }
 
-                  if(isLowDetail) {
+                  if (isLowDetail) {
                      class65.scene.init(Tiles.Tiles_minPlane);
                   } else {
                      class65.scene.init(0);
                   }
 
-                  for(var51 = 0; var51 < 104; ++var51) {
-                     for(var52 = 0; var52 < 104; ++var52) {
-                        TilePaint.method3061(var51, var52);
+                  for (var21 = 0; var21 < 104; ++var21) {
+                     for (var57 = 0; var57 < 104; ++var57) {
+                        TilePaint.updateItemPile(var21, var57);
                      }
                   }
 
                   class13.playPcmPlayers();
                   ScriptEvent.method1179();
-                  ObjectDefinition.__jr_o.clear();
-                  PacketBufferNode var67;
-                  if(TextureProvider.client.hasFrame()) {
-                     var67 = Interpreter.method1915(ClientPacket.__gs_x, packetWriter.isaacCipher);
-                     var67.packetBuffer.writeInt(1057001181);
-                     packetWriter.__q_167(var67);
+                  ObjectDefinition.field641.clear();
+                  PacketBufferNode var65;
+                  if (TextureProvider.client.hasFrame()) {
+                     var65 = Interpreter.method1915(ClientPacket.field231, packetWriter.isaacCipher);
+                     var65.packetBuffer.writeInt(1057001181);
+                     packetWriter.method241(var65);
                   }
 
-                  if(!isInInstance) {
-                     var51 = (GameObject.__eh_fy - 6) / 8;
-                     var52 = (GameObject.__eh_fy + 6) / 8;
-                     var53 = (WorldMapLabelSize.__s_fi - 6) / 8;
-                     var54 = (WorldMapLabelSize.__s_fi + 6) / 8;
+                  if (!isInInstance) {
+                     var21 = (GameObject.field359 - 6) / 8;
+                     var57 = (GameObject.field359 + 6) / 8;
+                     var58 = (WorldMapLabelSize.field1041 - 6) / 8;
+                     var59 = (WorldMapLabelSize.field1041 + 6) / 8;
 
-                     for(var10 = var51 - 1; var10 <= var52 + 1; ++var10) {
-                        for(var11 = var53 - 1; var11 <= var54 + 1; ++var11) {
-                           if(var10 < var51 || var10 > var52 || var11 < var53 || var11 > var54) {
-                              SecureRandomFuture.indexCache5.__ar_402("m" + var10 + "_" + var11);
-                              SecureRandomFuture.indexCache5.__ar_402("l" + var10 + "_" + var11);
+                     for (var8 = var21 - 1; var8 <= var57 + 1; ++var8) {
+                        for (var9 = var58 - 1; var9 <= var59 + 1; ++var9) {
+                           if (var8 < var21 || var8 > var57 || var9 < var58 || var9 > var59) {
+                              SecureRandomFuture.archive5.method10("m" + var8 + "_" + var9);
+                              SecureRandomFuture.archive5.method10("l" + var8 + "_" + var9);
                            }
                         }
                      }
@@ -2455,9 +2196,9 @@ public final class Client extends GameShell implements Usernamed {
                   GameShell.updateGameState(30);
                   class13.playPcmPlayers();
                   BufferedSink.method3603();
-                  var67 = Interpreter.method1915(ClientPacket.__gs_bv, packetWriter.isaacCipher);
-                  packetWriter.__q_167(var67);
-                  class11.method145();
+                  var65 = Interpreter.method1915(ClientPacket.field298, packetWriter.isaacCipher);
+                  packetWriter.method241(var65);
+                  GrandExchangeOfferNameComparator.method145();
                }
             }
          }
@@ -2465,9 +2206,9 @@ public final class Client extends GameShell implements Usernamed {
          class54.method1092(this);
       }
 
-      if(gameState == 30) {
+      if (gameState == 30) {
          this.doCycleLoggedIn();
-      } else if(gameState == 40 || gameState == 45) {
+      } else if (gameState == 40 || gameState == 45) {
          this.doCycleLoggedOut();
       }
 
@@ -2478,111 +2219,111 @@ public final class Client extends GameShell implements Usernamed {
       signature = "(ZI)V",
       garbageValue = "106302203"
    )
-   @Export("methodDraw")
-   protected final void methodDraw(boolean var1) {
+   @Export("draw")
+   protected final void draw(boolean var1) {
       boolean var2;
-      label166: {
+      label139: {
          try {
-            if(class214.__hf_o == 2) {
-               if(class13.musicTrack == null) {
-                  class13.musicTrack = MusicTrack.readTrack(class214.__hf_u, class30.musicTrackArchiveId, GrandExchangeOffer.musicTrackFileId);
-                  if(class13.musicTrack == null) {
+            if (class214.field1129 == 2) {
+               if (class13.musicTrack == null) {
+                  class13.musicTrack = MusicTrack.readTrack(class214.field1130, class30.musicTrackGroupId, GrandExchangeOffer.musicTrackFileId);
+                  if (class13.musicTrack == null) {
                      var2 = false;
-                     break label166;
+                     break label139;
                   }
                }
 
-               if(class307.soundCache == null) {
-                  class307.soundCache = new SoundCache(class214.__hf_q, class214.__hf_f);
+               if (class307.soundCache == null) {
+                  class307.soundCache = new SoundCache(class214.field1128, class214.field1127);
                }
 
-               if(class214.midiPcmStream.loadMusicTrack(class13.musicTrack, class1.__f_m, class307.soundCache, 22050)) {
+               if (class214.midiPcmStream.loadMusicTrack(class13.musicTrack, class1.field1105, class307.soundCache, 22050)) {
                   class214.midiPcmStream.clearAll();
-                  class214.midiPcmStream.__m_340(WorldMapLabel.__aj_e);
+                  class214.midiPcmStream.method169(WorldMapLabel.field1039);
                   class214.midiPcmStream.setMusicTrack(class13.musicTrack, RectangleMode.musicTrackBoolean);
-                  class214.__hf_o = 0;
+                  class214.field1129 = 0;
                   class13.musicTrack = null;
                   class307.soundCache = null;
-                  class214.__hf_u = null;
+                  class214.field1130 = null;
                   var2 = true;
-                  break label166;
+                  break label139;
                }
             }
-         } catch (Exception var6) {
-            var6.printStackTrace();
+         } catch (Exception var4) {
+            var4.printStackTrace();
             class214.midiPcmStream.clear();
-            class214.__hf_o = 0;
+            class214.field1129 = 0;
             class13.musicTrack = null;
             class307.soundCache = null;
-            class214.__hf_u = null;
+            class214.field1130 = null;
          }
 
          var2 = false;
       }
 
-      if(var2 && __client_qq && WorldMapCacheName.pcmPlayer0 != null) {
+      if (var2 && field107 && WorldMapCacheName.pcmPlayer0 != null) {
          WorldMapCacheName.pcmPlayer0.tryDiscard();
       }
 
-      if((gameState == 10 || gameState == 20 || gameState == 30) && __client_oa != 0L && class203.currentTimeMs() > __client_oa) {
-         GroundItem.method2095(SpotAnimationDefinition.method4822());
+      if ((gameState == 10 || gameState == 20 || gameState == 30) && field99 != 0L && class203.currentTimeMs() > field99) {
+         GroundItem.setWindowedMode(SpotAnimationDefinition.getWindowedMode());
       }
 
-      int var4;
-      if(var1) {
-         for(var4 = 0; var4 < 100; ++var4) {
-            __client_od[var4] = true;
+      int var3;
+      if (var1) {
+         for (var3 = 0; var3 < 100; ++var3) {
+            field100[var3] = true;
          }
       }
 
-      if(gameState == 0) {
+      if (gameState == 0) {
          this.drawInitial(Login.Login_loadingPercent, Login.Login_loadingText, var1);
-      } else if(gameState == 5) {
-         IndexCacheLoader.drawTitle(class2.fontBold12, ScriptEvent.fontPlain11, DevicePcmPlayerProvider.fontPlain12);
-      } else if(gameState != 10 && gameState != 11) {
-         if(gameState == 20) {
-            IndexCacheLoader.drawTitle(class2.fontBold12, ScriptEvent.fontPlain11, DevicePcmPlayerProvider.fontPlain12);
-         } else if(gameState == 25) {
-            if(__client_gh == 1) {
-               if(__client_fe > __client_fn) {
-                  __client_fn = __client_fe;
+      } else if (gameState == 5) {
+         ArchiveLoader.drawTitle(class2.fontBold12, ScriptEvent.fontPlain11, DevicePcmPlayerProvider.fontPlain12);
+      } else if (gameState != 10 && gameState != 11) {
+         if (gameState == 20) {
+            ArchiveLoader.drawTitle(class2.fontBold12, ScriptEvent.fontPlain11, DevicePcmPlayerProvider.fontPlain12);
+         } else if (gameState == 25) {
+            if (field181 == 1) {
+               if (field177 > field178) {
+                  field178 = field177;
                }
 
-               var4 = (__client_fn * 50 - __client_fe * 50) / __client_fn;
-               class68.drawLoadingMessage("Loading - please wait." + "<br>" + " (" + var4 + "%" + ")", false);
-            } else if(__client_gh == 2) {
-               if(__client_fk > __client_gp) {
-                  __client_gp = __client_fk;
+               var3 = (field178 * 50 - field177 * 50) / field178;
+               PendingSpawn.drawLoadingMessage("Loading - please wait.<br> (" + var3 + "%)", false);
+            } else if (field181 == 2) {
+               if (field179 > field180) {
+                  field180 = field179;
                }
 
-               var4 = (__client_gp * 50 - __client_fk * 50) / __client_gp + 50;
-               class68.drawLoadingMessage("Loading - please wait." + "<br>" + " (" + var4 + "%" + ")", false);
+               var3 = (field180 * 50 - field179 * 50) / field180 + 50;
+               PendingSpawn.drawLoadingMessage("Loading - please wait.<br> (" + var3 + "%)", false);
             } else {
-               class68.drawLoadingMessage("Loading - please wait.", false);
+               PendingSpawn.drawLoadingMessage("Loading - please wait.", false);
             }
-         } else if(gameState == 30) {
+         } else if (gameState == 30) {
             this.drawLoggedIn();
-         } else if(gameState == 40) {
-            class68.drawLoadingMessage("Connection lost" + "<br>" + "Please wait - attempting to reestablish", false);
-         } else if(gameState == 45) {
-            class68.drawLoadingMessage("Please wait...", false);
+         } else if (gameState == 40) {
+            PendingSpawn.drawLoadingMessage("Connection lost<br>Please wait - attempting to reestablish", false);
+         } else if (gameState == 45) {
+            PendingSpawn.drawLoadingMessage("Please wait...", false);
          }
       } else {
-         IndexCacheLoader.drawTitle(class2.fontBold12, ScriptEvent.fontPlain11, DevicePcmPlayerProvider.fontPlain12);
+         ArchiveLoader.drawTitle(class2.fontBold12, ScriptEvent.fontPlain11, DevicePcmPlayerProvider.fontPlain12);
       }
 
-      if(gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) {
-         for(var4 = 0; var4 < rootWidgetCount; ++var4) {
-            if(__client_ot[var4]) {
-               class197.rasterProvider.draw(rootWidgetXs[var4], rootWidgetYs[var4], rootWidgetWidths[var4], rootWidgetHeights[var4]);
-               __client_ot[var4] = false;
+      if (gameState == 30 && gameDrawingMode == 0 && !var1 && !isResizable) {
+         for (var3 = 0; var3 < rootWidgetCount; ++var3) {
+            if (field102[var3]) {
+               class197.rasterProvider.draw(rootWidgetXs[var3], rootWidgetYs[var3], rootWidgetWidths[var3], rootWidgetHeights[var3]);
+               field102[var3] = false;
             }
          }
-      } else if(gameState > 0) {
+      } else if (gameState > 0) {
          class197.rasterProvider.drawFull(0, 0);
 
-         for(var4 = 0; var4 < rootWidgetCount; ++var4) {
-            __client_ot[var4] = false;
+         for (var3 = 0; var3 < rootWidgetCount; ++var3) {
+            field102[var3] = false;
          }
       }
 
@@ -2595,24 +2336,24 @@ public final class Client extends GameShell implements Usernamed {
    )
    @Export("kill0")
    protected final void kill0() {
-      if(class196.varcs.hasUnwrittenChanges()) {
+      if (class196.varcs.hasUnwrittenChanges()) {
          class196.varcs.write();
       }
 
-      if(Projectile.mouseRecorder != null) {
+      if (Projectile.mouseRecorder != null) {
          Projectile.mouseRecorder.isRunning = false;
       }
 
       Projectile.mouseRecorder = null;
       packetWriter.close();
-      if(KeyHandler.KeyHandler_instance != null) {
+      if (KeyHandler.KeyHandler_instance != null) {
          KeyHandler var1 = KeyHandler.KeyHandler_instance;
          synchronized(KeyHandler.KeyHandler_instance) {
             KeyHandler.KeyHandler_instance = null;
          }
       }
 
-      if(MouseHandler.MouseHandler_instance != null) {
+      if (MouseHandler.MouseHandler_instance != null) {
          MouseHandler var8 = MouseHandler.MouseHandler_instance;
          synchronized(MouseHandler.MouseHandler_instance) {
             MouseHandler.MouseHandler_instance = null;
@@ -2620,20 +2361,20 @@ public final class Client extends GameShell implements Usernamed {
       }
 
       class16.mouseWheel = null;
-      if(WorldMapCacheName.pcmPlayer0 != null) {
+      if (WorldMapCacheName.pcmPlayer0 != null) {
          WorldMapCacheName.pcmPlayer0.shutdown();
       }
 
-      if(AbstractIndexCache.pcmPlayer1 != null) {
-         AbstractIndexCache.pcmPlayer1.shutdown();
+      if (AbstractArchive.pcmPlayer1 != null) {
+         AbstractArchive.pcmPlayer1.shutdown();
       }
 
-      if(NetCache.NetCache_socket != null) {
+      if (NetCache.NetCache_socket != null) {
          NetCache.NetCache_socket.close();
       }
 
       RunException.method3431();
-      if(TriBool.urlRequester != null) {
+      if (TriBool.urlRequester != null) {
          TriBool.urlRequester.close();
          TriBool.urlRequester = null;
       }
@@ -2641,14 +2382,13 @@ public final class Client extends GameShell implements Usernamed {
       try {
          class168.dat2File.close();
 
-         for(int var4 = 0; var4 < class168.idxCount; ++var4) {
-            IndexStoreAction.idxFiles[var4].close();
+         for (int var9 = 0; var9 < class168.idxCount; ++var9) {
+            ArchiveDiskAction.idxFiles[var9].close();
          }
 
          class168.idx255File.close();
          class168.randomDat.close();
       } catch (Exception var7) {
-         ;
       }
 
    }
@@ -2658,23 +2398,244 @@ public final class Client extends GameShell implements Usernamed {
       signature = "(I)V",
       garbageValue = "1860808291"
    )
-   protected final void __au_110() {
+   protected final void vmethod114() {
    }
 
    @ObfuscatedName("init")
-   public final void __init_109() {
+   @Export("init")
+   public final void init() {
       try {
-         if(this.checkHost()) {
+         if (this.checkHost()) {
             ClientParameter[] var1 = class4.method47();
+            int var2 = 0;
 
-            int var9;
-            for(int var2 = 0; var2 < var1.length; ++var2) {
-               ClientParameter var3 = var1[var2];
-               String var4 = this.getParameter(var3.id);
-               if(var4 != null) {
-                  switch(Integer.parseInt(var3.id)) {
+            while (true) {
+               int var3;
+               int var6;
+               if (var2 >= var1.length) {
+                  class237.method4539();
+                  class50.worldHost = this.getCodeBase().getHost();
+                  String var26 = class15.serverBuild.name;
+                  byte var27 = 0;
+
+                  try {
+                     class168.idxCount = 21;
+                     PacketBuffer.field667 = var27;
+
+                     try {
+                        HorizontalAlignment.osName = System.getProperty("os.name");
+                     } catch (Exception var21) {
+                        HorizontalAlignment.osName = "Unknown";
+                     }
+
+                     WorldMapSection1.osNameLowerCase = HorizontalAlignment.osName.toLowerCase();
+
+                     try {
+                        WorldMapSection2.userHomeDirectory = System.getProperty("user.home");
+                        if (WorldMapSection2.userHomeDirectory != null) {
+                           WorldMapSection2.userHomeDirectory = WorldMapSection2.userHomeDirectory + "/";
+                        }
+                     } catch (Exception var20) {
+                     }
+
+                     try {
+                        if (WorldMapSection1.osNameLowerCase.startsWith("win")) {
+                           if (WorldMapSection2.userHomeDirectory == null) {
+                              WorldMapSection2.userHomeDirectory = System.getenv("USERPROFILE");
+                           }
+                        } else if (WorldMapSection2.userHomeDirectory == null) {
+                           WorldMapSection2.userHomeDirectory = System.getenv("HOME");
+                        }
+
+                        if (WorldMapSection2.userHomeDirectory != null) {
+                           WorldMapSection2.userHomeDirectory = WorldMapSection2.userHomeDirectory + "/";
+                        }
+                     } catch (Exception var19) {
+                     }
+
+                     if (WorldMapSection2.userHomeDirectory == null) {
+                        WorldMapSection2.userHomeDirectory = "~/";
+                     }
+
+                     WorldMapSection0.cacheDirectoryLocations = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", WorldMapSection2.userHomeDirectory, "/tmp/", ""};
+                     Canvas.field94 = new String[]{".jagex_cache_" + PacketBuffer.field667, ".file_store_" + PacketBuffer.field667};
+                     var6 = 0;
+
+                     label256:
+                     while (var6 < 4) {
+                        String var28 = var6 == 0 ? "" : "" + var6;
+                        class337.clDat = new File(WorldMapSection2.userHomeDirectory, "jagex_cl_oldschool_" + var26 + var28 + ".dat");
+                        String var30 = null;
+                        String var31 = null;
+                        boolean var32 = false;
+                        int var11;
+                        File var12;
+                        if (class337.clDat.exists()) {
+                           try {
+                              AccessFile var13 = new AccessFile(class337.clDat, "rw", 10000L);
+
+                              int var14;
+                              Buffer var15;
+                              for (var15 = new Buffer((int)var13.length()); var15.index < var15.array.length; var15.index += var14) {
+                                 var14 = var13.read(var15.array, var15.index, var15.array.length - var15.index);
+                                 if (var14 == -1) {
+                                    throw new IOException();
+                                 }
+                              }
+
+                              var15.index = 0;
+                              var14 = var15.readUnsignedByte();
+                              if (var14 < 1 || var14 > 3) {
+                                 throw new IOException("" + var14);
+                              }
+
+                              var11 = 0;
+                              if (var14 > 1) {
+                                 var11 = var15.readUnsignedByte();
+                              }
+
+                              if (var14 <= 2) {
+                                 var30 = var15.readStringCp1252NullCircumfixed();
+                                 if (var11 == 1) {
+                                    var31 = var15.readStringCp1252NullCircumfixed();
+                                 }
+                              } else {
+                                 var30 = var15.readCESU8();
+                                 if (var11 == 1) {
+                                    var31 = var15.readCESU8();
+                                 }
+                              }
+
+                              var13.close();
+                           } catch (IOException var23) {
+                              var23.printStackTrace();
+                           }
+
+                           if (var30 != null) {
+                              var12 = new File(var30);
+                              if (!var12.exists()) {
+                                 var30 = null;
+                              }
+                           }
+
+                           if (var30 != null) {
+                              var12 = new File(var30, "test.dat");
+                              if (!DevicePcmPlayerProvider.method847(var12, true)) {
+                                 var30 = null;
+                              }
+                           }
+                        }
+
+                        File var36;
+                        if (var30 == null && var6 == 0) {
+                           label232:
+                           for (var3 = 0; var3 < Canvas.field94.length; ++var3) {
+                              for (int var34 = 0; var34 < WorldMapSection0.cacheDirectoryLocations.length; ++var34) {
+                                 var36 = new File(WorldMapSection0.cacheDirectoryLocations[var34] + Canvas.field94[var3] + File.separatorChar + "oldschool" + File.separatorChar);
+                                 if (var36.exists() && DevicePcmPlayerProvider.method847(new File(var36, "test.dat"), true)) {
+                                    var30 = var36.toString();
+                                    var32 = true;
+                                    break label232;
+                                 }
+                              }
+                           }
+                        }
+
+                        if (var30 == null) {
+                           var30 = WorldMapSection2.userHomeDirectory + File.separatorChar + "jagexcache" + var28 + File.separatorChar + "oldschool" + File.separatorChar + var26 + File.separatorChar;
+                           var32 = true;
+                        }
+
+                        File[] var16;
+                        File var35;
+                        File[] var37;
+                        if (var31 != null) {
+                           var36 = new File(var31);
+                           var12 = new File(var30);
+
+                           try {
+                              var37 = var36.listFiles();
+                              var16 = var37;
+
+                              for (var11 = 0; var11 < var16.length; ++var11) {
+                                 var35 = var16[var11];
+                                 File var17 = new File(var12, var35.getName());
+                                 boolean var18 = var35.renameTo(var17);
+                                 if (!var18) {
+                                    throw new IOException();
+                                 }
+                              }
+                           } catch (Exception var22) {
+                              var22.printStackTrace();
+                           }
+
+                           var32 = true;
+                        }
+
+                        if (var32) {
+                           class14.method167(new File(var30), (File)null);
+                        }
+
+                        var36 = new File(var30);
+                        class168.field1115 = var36;
+                        if (!class168.field1115.exists()) {
+                           class168.field1115.mkdirs();
+                        }
+
+                        var37 = class168.field1115.listFiles();
+                        if (var37 == null) {
+                           break;
+                        }
+
+                        var16 = var37;
+                        var11 = 0;
+
+                        while (true) {
+                           if (var11 >= var16.length) {
+                              break label256;
+                           }
+
+                           var35 = var16[var11];
+                           if (!DevicePcmPlayerProvider.method847(var35, false)) {
+                              ++var6;
+                              break;
+                           }
+
+                           ++var11;
+                        }
+                     }
+
+                     File var29 = class168.field1115;
+                     class171.field1118 = var29;
+                     if (!class171.field1118.exists()) {
+                        throw new RuntimeException("");
+                     }
+
+                     class171.field1117 = true;
+                     Interpreter.method1976();
+                     class168.dat2File = new BufferedFile(new AccessFile(WorldMapIcon2.method315("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0);
+                     class168.idx255File = new BufferedFile(new AccessFile(WorldMapIcon2.method315("main_file_cache.idx255"), "rw", 1048576L), 6000, 0);
+                     ArchiveDiskAction.idxFiles = new BufferedFile[class168.idxCount];
+
+                     for (int var33 = 0; var33 < class168.idxCount; ++var33) {
+                        ArchiveDiskAction.idxFiles[var33] = new BufferedFile(new AccessFile(WorldMapIcon2.method315("main_file_cache.idx" + var33), "rw", 1048576L), 6000, 0);
+                     }
+                  } catch (Exception var24) {
+                     NPCDefinition.sendStackTrace((String)null, var24);
+                  }
+
+                  TextureProvider.client = this;
+                  RunException.field761 = clientType;
+                  this.startThread(765, 503, 180);
+                  break;
+               }
+
+               ClientParameter var4 = var1[var2];
+               String var5 = this.getParameter(var4.id);
+               if (var5 != null) {
+                  switch(Integer.parseInt(var4.id)) {
                   case 1:
-                     useBufferedSocket = Integer.parseInt(var4) != 0;
+                     useBufferedSocket = Integer.parseInt(var5) != 0;
                   case 2:
                   case 11:
                   case 13:
@@ -2682,284 +2643,82 @@ public final class Client extends GameShell implements Usernamed {
                   default:
                      break;
                   case 3:
-                     if(var4.equalsIgnoreCase("true")) {
+                     if (var5.equalsIgnoreCase("true")) {
                         isMembersWorld = true;
                      } else {
                         isMembersWorld = false;
                      }
                      break;
                   case 4:
-                     if(clientType == -1) {
-                        clientType = Integer.parseInt(var4);
+                     if (clientType == -1) {
+                        clientType = Integer.parseInt(var5);
                      }
                      break;
                   case 5:
-                     worldProperties = Integer.parseInt(var4);
+                     worldProperties = Integer.parseInt(var5);
                      break;
                   case 6:
-                     language = Integer.parseInt(var4);
+                     language = Integer.parseInt(var5);
                      break;
                   case 7:
-                     int var6 = Integer.parseInt(var4);
-                     ServerBuild[] var7 = new ServerBuild[]{ServerBuild.__iy_q, ServerBuild.__iy_w, ServerBuild.__iy_m, ServerBuild.__iy_f};
+                     var6 = Integer.parseInt(var5);
+                     ServerBuild[] var7 = new ServerBuild[]{ServerBuild.field786, ServerBuild.field787, ServerBuild.field784, ServerBuild.field785};
                      ServerBuild[] var8 = var7;
-                     var9 = 0;
+                     var3 = 0;
 
-                     ServerBuild var5;
-                     while(true) {
-                        if(var9 >= var8.length) {
-                           var5 = null;
+                     ServerBuild var9;
+                     while (true) {
+                        if (var3 >= var8.length) {
+                           var9 = null;
                            break;
                         }
 
-                        ServerBuild var10 = var8[var9];
-                        if(var6 == var10.id) {
-                           var5 = var10;
+                        ServerBuild var10 = var8[var3];
+                        if (var6 == var10.id) {
+                           var9 = var10;
                            break;
                         }
 
-                        ++var9;
+                        ++var3;
                      }
 
-                     class15.serverBuild = var5;
+                     class15.serverBuild = var9;
                      break;
                   case 8:
-                     if(var4.equalsIgnoreCase("true")) {
-                        ;
+                     if (var5.equalsIgnoreCase("true")) {
                      }
                      break;
                   case 9:
-                     class21.__b_by = var4;
+                     class21.field1123 = var5;
                      break;
                   case 10:
-                     class22.studioGame = (StudioGame)ScriptFrame.findEnumerated(ClientPacket.method3664(), Integer.parseInt(var4));
-                     if(class22.studioGame == StudioGame.__is_u) {
-                        KeyHandler.loginType = LoginType.__lx_m;
+                     WorldMapRectangle.studioGame = (StudioGame)ScriptFrame.findEnumerated(ClientPacket.method3664(), Integer.parseInt(var5));
+                     if (WorldMapRectangle.studioGame == StudioGame.field892) {
+                        KeyHandler.loginType = LoginType.field479;
                      } else {
-                        KeyHandler.loginType = LoginType.__lx_e;
+                        KeyHandler.loginType = LoginType.field487;
                      }
                      break;
                   case 12:
-                     worldId = Integer.parseInt(var4);
+                     worldId = Integer.parseInt(var5);
                      break;
                   case 14:
-                     AbstractIndexCache.__ir_bu = Integer.parseInt(var4);
+                     AbstractArchive.field2 = Integer.parseInt(var5);
                      break;
                   case 15:
-                     gameBuild = Integer.parseInt(var4);
+                     gameBuild = Integer.parseInt(var5);
                      break;
                   case 17:
-                     ServerBuild.worldsUrl = var4;
+                     ServerBuild.worldsUrl = var5;
                   }
                }
+
+               ++var2;
             }
-
-            class237.method4539();
-            class50.worldHost = this.getCodeBase().getHost();
-            String var33 = class15.serverBuild.name;
-            byte var34 = 0;
-
-            try {
-               class168.idxCount = 21;
-               PacketBuffer.__hx_z = var34;
-
-               try {
-                  class266.osName = System.getProperty("os.name");
-               } catch (Exception var28) {
-                  class266.osName = "Unknown";
-               }
-
-               WorldMapSection3.osNameLowerCase = class266.osName.toLowerCase();
-
-               try {
-                  WorldMapSection1.userHomeDirectory = System.getProperty("user.home");
-                  if(WorldMapSection1.userHomeDirectory != null) {
-                     WorldMapSection1.userHomeDirectory = WorldMapSection1.userHomeDirectory + "/";
-                  }
-               } catch (Exception var27) {
-                  ;
-               }
-
-               try {
-                  if(WorldMapSection3.osNameLowerCase.startsWith("win")) {
-                     if(WorldMapSection1.userHomeDirectory == null) {
-                        WorldMapSection1.userHomeDirectory = System.getenv("USERPROFILE");
-                     }
-                  } else if(WorldMapSection1.userHomeDirectory == null) {
-                     WorldMapSection1.userHomeDirectory = System.getenv("HOME");
-                  }
-
-                  if(WorldMapSection1.userHomeDirectory != null) {
-                     WorldMapSection1.userHomeDirectory = WorldMapSection1.userHomeDirectory + "/";
-                  }
-               } catch (Exception var26) {
-                  ;
-               }
-
-               if(WorldMapSection1.userHomeDirectory == null) {
-                  WorldMapSection1.userHomeDirectory = "~/";
-               }
-
-               WorldMapSection2.cacheDirectoryLocations = new String[]{"c:/rscache/", "/rscache/", "c:/windows/", "c:/winnt/", "c:/", WorldMapSection1.userHomeDirectory, "/tmp/", ""};
-               Canvas.__ao_s = new String[]{".jagex_cache_" + PacketBuffer.__hx_z, ".file_store_" + PacketBuffer.__hx_z};
-               int var17 = 0;
-
-               label259:
-               while(var17 < 4) {
-                  String var37 = var17 == 0?"":"" + var17;
-                  class337.clDat = new File(WorldMapSection1.userHomeDirectory, "jagex_cl_oldschool_" + var33 + var37 + ".dat");
-                  String var18 = null;
-                  String var39 = null;
-                  boolean var19 = false;
-                  File var42;
-                  if(class337.clDat.exists()) {
-                     try {
-                        AccessFile var20 = new AccessFile(class337.clDat, "rw", 10000L);
-
-                        int var11;
-                        Buffer var41;
-                        for(var41 = new Buffer((int)var20.length()); var41.index < var41.array.length; var41.index += var11) {
-                           var11 = var20.read(var41.array, var41.index, var41.array.length - var41.index);
-                           if(var11 == -1) {
-                              throw new IOException();
-                           }
-                        }
-
-                        var41.index = 0;
-                        var11 = var41.readUnsignedByte();
-                        if(var11 < 1 || var11 > 3) {
-                           throw new IOException("" + var11);
-                        }
-
-                        int var12 = 0;
-                        if(var11 > 1) {
-                           var12 = var41.readUnsignedByte();
-                        }
-
-                        if(var11 <= 2) {
-                           var18 = var41.readStringCp1252NullCircumfixed();
-                           if(var12 == 1) {
-                              var39 = var41.readStringCp1252NullCircumfixed();
-                           }
-                        } else {
-                           var18 = var41.__aw_304();
-                           if(var12 == 1) {
-                              var39 = var41.__aw_304();
-                           }
-                        }
-
-                        var20.close();
-                     } catch (IOException var30) {
-                        var30.printStackTrace();
-                     }
-
-                     if(var18 != null) {
-                        var42 = new File(var18);
-                        if(!var42.exists()) {
-                           var18 = null;
-                        }
-                     }
-
-                     if(var18 != null) {
-                        var42 = new File(var18, "test.dat");
-                        if(!DevicePcmPlayerProvider.method847(var42, true)) {
-                           var18 = null;
-                        }
-                     }
-                  }
-
-                  if(var18 == null && var17 == 0) {
-                     label234:
-                     for(var9 = 0; var9 < Canvas.__ao_s.length; ++var9) {
-                        for(int var21 = 0; var21 < WorldMapSection2.cacheDirectoryLocations.length; ++var21) {
-                           File var22 = new File(WorldMapSection2.cacheDirectoryLocations[var21] + Canvas.__ao_s[var9] + File.separatorChar + "oldschool" + File.separatorChar);
-                           if(var22.exists() && DevicePcmPlayerProvider.method847(new File(var22, "test.dat"), true)) {
-                              var18 = var22.toString();
-                              var19 = true;
-                              break label234;
-                           }
-                        }
-                     }
-                  }
-
-                  if(var18 == null) {
-                     var18 = WorldMapSection1.userHomeDirectory + File.separatorChar + "jagexcache" + var37 + File.separatorChar + "oldschool" + File.separatorChar + var33 + File.separatorChar;
-                     var19 = true;
-                  }
-
-                  if(var39 != null) {
-                     File var43 = new File(var39);
-                     var42 = new File(var18);
-
-                     try {
-                        File[] var44 = var43.listFiles();
-                        File[] var23 = var44;
-
-                        for(int var13 = 0; var13 < var23.length; ++var13) {
-                           File var14 = var23[var13];
-                           File var15 = new File(var42, var14.getName());
-                           boolean var16 = var14.renameTo(var15);
-                           if(!var16) {
-                              throw new IOException();
-                           }
-                        }
-                     } catch (Exception var29) {
-                        var29.printStackTrace();
-                     }
-
-                     var19 = true;
-                  }
-
-                  if(var19) {
-                     class14.method167(new File(var18), (File)null);
-                  }
-
-                  File var36 = new File(var18);
-                  class168.__fs_o = var36;
-                  if(!class168.__fs_o.exists()) {
-                     class168.__fs_o.mkdirs();
-                  }
-
-                  File[] var38 = class168.__fs_o.listFiles();
-                  if(var38 != null) {
-                     File[] var45 = var38;
-
-                     for(int var24 = 0; var24 < var45.length; ++var24) {
-                        File var40 = var45[var24];
-                        if(!DevicePcmPlayerProvider.method847(var40, false)) {
-                           ++var17;
-                           continue label259;
-                        }
-                     }
-                  }
-                  break;
-               }
-
-               File var35 = class168.__fs_o;
-               class171.__fo_f = var35;
-               if(!class171.__fo_f.exists()) {
-                  throw new RuntimeException("");
-               }
-
-               class171.__fo_m = true;
-               Interpreter.method1976();
-               class168.dat2File = new BufferedFile(new AccessFile(WorldMapIcon2.method315("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0);
-               class168.idx255File = new BufferedFile(new AccessFile(WorldMapIcon2.method315("main_file_cache.idx255"), "rw", 1048576L), 6000, 0);
-               IndexStoreAction.idxFiles = new BufferedFile[class168.idxCount];
-
-               for(int var25 = 0; var25 < class168.idxCount; ++var25) {
-                  IndexStoreAction.idxFiles[var25] = new BufferedFile(new AccessFile(WorldMapIcon2.method315("main_file_cache.idx" + var25), "rw", 1048576L), 6000, 0);
-               }
-            } catch (Exception var31) {
-               NpcDefinition.sendStackTrace((String)null, var31);
-            }
-
-            TextureProvider.client = this;
-            RunException.__fx_w = clientType;
-            this.startThread(765, 503, 180);
          }
-      } catch (RuntimeException var32) {
-         throw Players.method2120(var32, "client.init(" + ')');
+
+      } catch (RuntimeException var25) {
+         throw Players.method2120(var25, "client.init()");
       }
    }
 
@@ -2970,30 +2729,30 @@ public final class Client extends GameShell implements Usernamed {
    )
    @Export("doCycleJs5")
    void doCycleJs5() {
-      if(gameState != 1000) {
-         long var2 = class203.currentTimeMs();
-         int var4 = (int)(var2 - NetCache.__iq_q);
-         NetCache.__iq_q = var2;
-         if(var4 > 200) {
-            var4 = 200;
+      if (gameState != 1000) {
+         long var1 = class203.currentTimeMs();
+         int var3 = (int)(var1 - NetCache.field629);
+         NetCache.field629 = var1;
+         if (var3 > 200) {
+            var3 = 200;
          }
 
-         NetCache.__iq_f += var4;
-         boolean var1;
-         if(NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) {
-            var1 = true;
-         } else if(NetCache.NetCache_socket == null) {
-            var1 = false;
+         NetCache.field628 += var3;
+         boolean var4;
+         if (NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) {
+            var4 = true;
+         } else if (NetCache.NetCache_socket == null) {
+            var4 = false;
          } else {
             try {
-               label242: {
-                  if(NetCache.__iq_f > 30000) {
+               label205: {
+                  if (NetCache.field628 > 30000) {
                      throw new IOException();
                   }
 
                   NetFileRequest var5;
                   Buffer var6;
-                  while(NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) {
+                  while (NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) {
                      var5 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.first();
                      var6 = new Buffer(4);
                      var6.writeByte(1);
@@ -3004,7 +2763,7 @@ public final class Client extends GameShell implements Usernamed {
                      ++NetCache.NetCache_pendingPriorityResponsesCount;
                   }
 
-                  while(NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) {
+                  while (NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) {
                      var5 = (NetFileRequest)NetCache.NetCache_pendingWritesQueue.last();
                      var6 = new Buffer(4);
                      var6.writeByte(0);
@@ -3016,175 +2775,182 @@ public final class Client extends GameShell implements Usernamed {
                      ++NetCache.NetCache_pendingResponsesCount;
                   }
 
-                  for(int var17 = 0; var17 < 100; ++var17) {
-                     int var18 = NetCache.NetCache_socket.available();
-                     if(var18 < 0) {
+                  for (int var7 = 0; var7 < 100; ++var7) {
+                     int var8 = NetCache.NetCache_socket.available();
+                     if (var8 < 0) {
                         throw new IOException();
                      }
 
-                     if(var18 == 0) {
+                     if (var8 == 0) {
                         break;
                      }
 
-                     NetCache.__iq_f = 0;
-                     byte var7 = 0;
-                     if(ModelData0.NetCache_currentResponse == null) {
-                        var7 = 8;
-                     } else if(NetCache.__iq_j == 0) {
-                        var7 = 1;
+                     NetCache.field628 = 0;
+                     byte var9 = 0;
+                     if (ModelData0.NetCache_currentResponse == null) {
+                        var9 = 8;
+                     } else if (NetCache.field630 == 0) {
+                        var9 = 1;
                      }
 
-                     int var8;
-                     int var9;
                      int var10;
+                     int var11;
                      int var12;
-                     if(var7 > 0) {
-                        var8 = var7 - NetCache.NetCache_responseHeaderBuffer.index;
-                        if(var8 > var18) {
-                           var8 = var18;
+                     int var13;
+                     byte[] var14;
+                     int var15;
+                     Buffer var16;
+                     if (var9 > 0) {
+                        var10 = var9 - NetCache.NetCache_responseHeaderBuffer.index;
+                        if (var10 > var8) {
+                           var10 = var8;
                         }
 
-                        NetCache.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.index, var8);
-                        if(NetCache.__iq_b != 0) {
-                           for(var9 = 0; var9 < var8; ++var9) {
-                              NetCache.NetCache_responseHeaderBuffer.array[NetCache.NetCache_responseHeaderBuffer.index + var9] ^= NetCache.__iq_b;
+                        NetCache.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.index, var10);
+                        if (NetCache.field631 != 0) {
+                           for (var11 = 0; var11 < var10; ++var11) {
+                              var14 = NetCache.NetCache_responseHeaderBuffer.array;
+                              var15 = NetCache.NetCache_responseHeaderBuffer.index + var11;
+                              var14[var15] ^= NetCache.field631;
                            }
                         }
 
-                        NetCache.NetCache_responseHeaderBuffer.index += var8;
-                        if(NetCache.NetCache_responseHeaderBuffer.index < var7) {
+                        var16 = NetCache.NetCache_responseHeaderBuffer;
+                        var16.index += var10;
+                        if (NetCache.NetCache_responseHeaderBuffer.index < var9) {
                            break;
                         }
 
-                        if(ModelData0.NetCache_currentResponse == null) {
+                        if (ModelData0.NetCache_currentResponse == null) {
                            NetCache.NetCache_responseHeaderBuffer.index = 0;
-                           var9 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte();
-                           var10 = NetCache.NetCache_responseHeaderBuffer.__ag_302();
-                           int var11 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte();
-                           var12 = NetCache.NetCache_responseHeaderBuffer.readInt();
-                           long var13 = (long)(var10 + (var9 << 16));
-                           NetFileRequest var15 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var13);
-                           WorldComparator.__u_n = true;
-                           if(var15 == null) {
-                              var15 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var13);
-                              WorldComparator.__u_n = false;
+                           var11 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte();
+                           var12 = NetCache.NetCache_responseHeaderBuffer.readUnsignedShort();
+                           int var17 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte();
+                           var13 = NetCache.NetCache_responseHeaderBuffer.readInt();
+                           long var18 = (long)(var12 + (var11 << 16));
+                           NetFileRequest var20 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var18);
+                           GrandExchangeOfferWorldComparator.field988 = true;
+                           if (var20 == null) {
+                              var20 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var18);
+                              GrandExchangeOfferWorldComparator.field988 = false;
                            }
 
-                           if(var15 == null) {
+                           if (var20 == null) {
                               throw new IOException();
                            }
 
-                           int var16 = var11 == 0?5:9;
-                           ModelData0.NetCache_currentResponse = var15;
-                           class22.NetCache_responseArchiveBuffer = new Buffer(var12 + var16 + ModelData0.NetCache_currentResponse.padding);
-                           class22.NetCache_responseArchiveBuffer.writeByte(var11);
-                           class22.NetCache_responseArchiveBuffer.writeInt(var12);
-                           NetCache.__iq_j = 8;
+                           int var21 = var17 == 0 ? 5 : 9;
+                           ModelData0.NetCache_currentResponse = var20;
+                           WorldMapRectangle.NetCache_responseArchiveBuffer = new Buffer(var13 + var21 + ModelData0.NetCache_currentResponse.padding);
+                           WorldMapRectangle.NetCache_responseArchiveBuffer.writeByte(var17);
+                           WorldMapRectangle.NetCache_responseArchiveBuffer.writeInt(var13);
+                           NetCache.field630 = 8;
                            NetCache.NetCache_responseHeaderBuffer.index = 0;
-                        } else if(NetCache.__iq_j == 0) {
-                           if(NetCache.NetCache_responseHeaderBuffer.array[0] == -1) {
-                              NetCache.__iq_j = 1;
+                        } else if (NetCache.field630 == 0) {
+                           if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) {
+                              NetCache.field630 = 1;
                               NetCache.NetCache_responseHeaderBuffer.index = 0;
                            } else {
                               ModelData0.NetCache_currentResponse = null;
                            }
                         }
                      } else {
-                        var8 = class22.NetCache_responseArchiveBuffer.array.length - ModelData0.NetCache_currentResponse.padding;
-                        var9 = 512 - NetCache.__iq_j;
-                        if(var9 > var8 - class22.NetCache_responseArchiveBuffer.index) {
-                           var9 = var8 - class22.NetCache_responseArchiveBuffer.index;
+                        var10 = WorldMapRectangle.NetCache_responseArchiveBuffer.array.length - ModelData0.NetCache_currentResponse.padding;
+                        var11 = 512 - NetCache.field630;
+                        if (var11 > var10 - WorldMapRectangle.NetCache_responseArchiveBuffer.index) {
+                           var11 = var10 - WorldMapRectangle.NetCache_responseArchiveBuffer.index;
                         }
 
-                        if(var9 > var18) {
-                           var9 = var18;
+                        if (var11 > var8) {
+                           var11 = var8;
                         }
 
-                        NetCache.NetCache_socket.read(class22.NetCache_responseArchiveBuffer.array, class22.NetCache_responseArchiveBuffer.index, var9);
-                        if(NetCache.__iq_b != 0) {
-                           for(var10 = 0; var10 < var9; ++var10) {
-                              class22.NetCache_responseArchiveBuffer.array[class22.NetCache_responseArchiveBuffer.index + var10] ^= NetCache.__iq_b;
+                        NetCache.NetCache_socket.read(WorldMapRectangle.NetCache_responseArchiveBuffer.array, WorldMapRectangle.NetCache_responseArchiveBuffer.index, var11);
+                        if (NetCache.field631 != 0) {
+                           for (var12 = 0; var12 < var11; ++var12) {
+                              var14 = WorldMapRectangle.NetCache_responseArchiveBuffer.array;
+                              var15 = WorldMapRectangle.NetCache_responseArchiveBuffer.index + var12;
+                              var14[var15] ^= NetCache.field631;
                            }
                         }
 
-                        class22.NetCache_responseArchiveBuffer.index += var9;
-                        NetCache.__iq_j += var9;
-                        if(var8 == class22.NetCache_responseArchiveBuffer.index) {
-                           if(16711935L == ModelData0.NetCache_currentResponse.key) {
-                              Players.NetCache_reference = class22.NetCache_responseArchiveBuffer;
+                        var16 = WorldMapRectangle.NetCache_responseArchiveBuffer;
+                        var16.index += var11;
+                        NetCache.field630 += var11;
+                        if (var10 == WorldMapRectangle.NetCache_responseArchiveBuffer.index) {
+                           if (16711935L == ModelData0.NetCache_currentResponse.key) {
+                              Players.NetCache_reference = WorldMapRectangle.NetCache_responseArchiveBuffer;
 
-                              for(var10 = 0; var10 < 256; ++var10) {
-                                 IndexCache var19 = NetCache.NetCache_indexCaches[var10];
-                                 if(var19 != null) {
-                                    Players.NetCache_reference.index = var10 * 8 + 5;
-                                    var12 = Players.NetCache_reference.readInt();
-                                    int var20 = Players.NetCache_reference.readInt();
-                                    var19.loadIndexReference(var12, var20);
+                              for (var12 = 0; var12 < 256; ++var12) {
+                                 Archive var25 = NetCache.NetCache_archives[var12];
+                                 if (var25 != null) {
+                                    Players.NetCache_reference.index = var12 * 8 + 5;
+                                    var13 = Players.NetCache_reference.readInt();
+                                    int var26 = Players.NetCache_reference.readInt();
+                                    var25.loadIndex(var13, var26);
                                  }
                               }
                            } else {
                               NetCache.NetCache_crc.reset();
-                              NetCache.NetCache_crc.update(class22.NetCache_responseArchiveBuffer.array, 0, var8);
-                              var10 = (int)NetCache.NetCache_crc.getValue();
-                              if(var10 != ModelData0.NetCache_currentResponse.crc) {
+                              NetCache.NetCache_crc.update(WorldMapRectangle.NetCache_responseArchiveBuffer.array, 0, var10);
+                              var12 = (int)NetCache.NetCache_crc.getValue();
+                              if (var12 != ModelData0.NetCache_currentResponse.crc) {
                                  try {
                                     NetCache.NetCache_socket.close();
                                  } catch (Exception var23) {
-                                    ;
                                  }
 
                                  ++NetCache.NetCache_crcMismatches;
                                  NetCache.NetCache_socket = null;
-                                 NetCache.__iq_b = (byte)((int)(Math.random() * 255.0D + 1.0D));
-                                 var1 = false;
-                                 break label242;
+                                 NetCache.field631 = (byte)((int)(Math.random() * 255.0D + 1.0D));
+                                 var4 = false;
+                                 break label205;
                               }
 
                               NetCache.NetCache_crcMismatches = 0;
                               NetCache.NetCache_ioExceptions = 0;
-                              ModelData0.NetCache_currentResponse.indexCache.write((int)(ModelData0.NetCache_currentResponse.key & 65535L), class22.NetCache_responseArchiveBuffer.array, 16711680L == (ModelData0.NetCache_currentResponse.key & 16711680L), WorldComparator.__u_n);
+                              ModelData0.NetCache_currentResponse.archive.write((int)(ModelData0.NetCache_currentResponse.key & 65535L), WorldMapRectangle.NetCache_responseArchiveBuffer.array, 16711680L == (ModelData0.NetCache_currentResponse.key & 16711680L), GrandExchangeOfferWorldComparator.field988);
                            }
 
                            ModelData0.NetCache_currentResponse.remove();
-                           if(WorldComparator.__u_n) {
+                           if (GrandExchangeOfferWorldComparator.field988) {
                               --NetCache.NetCache_pendingPriorityResponsesCount;
                            } else {
                               --NetCache.NetCache_pendingResponsesCount;
                            }
 
-                           NetCache.__iq_j = 0;
+                           NetCache.field630 = 0;
                            ModelData0.NetCache_currentResponse = null;
-                           class22.NetCache_responseArchiveBuffer = null;
+                           WorldMapRectangle.NetCache_responseArchiveBuffer = null;
                         } else {
-                           if(NetCache.__iq_j != 512) {
+                           if (NetCache.field630 != 512) {
                               break;
                            }
 
-                           NetCache.__iq_j = 0;
+                           NetCache.field630 = 0;
                         }
                      }
                   }
 
-                  var1 = true;
+                  var4 = true;
                }
             } catch (IOException var24) {
                try {
                   NetCache.NetCache_socket.close();
                } catch (Exception var22) {
-                  ;
                }
 
                ++NetCache.NetCache_ioExceptions;
                NetCache.NetCache_socket = null;
-               var1 = false;
+               var4 = false;
             }
          }
 
-         if(!var1) {
+         if (!var4) {
             this.doCycleJs5Connect();
          }
-
       }
+
    }
 
    @ObfuscatedName("ev")
@@ -3194,41 +2960,41 @@ public final class Client extends GameShell implements Usernamed {
    )
    @Export("doCycleJs5Connect")
    void doCycleJs5Connect() {
-      if(NetCache.NetCache_crcMismatches >= 4) {
+      if (NetCache.NetCache_crcMismatches >= 4) {
          this.error("js5crc");
          gameState = 1000;
       } else {
-         if(NetCache.NetCache_ioExceptions >= 4) {
-            if(gameState <= 5) {
+         if (NetCache.NetCache_ioExceptions >= 4) {
+            if (gameState <= 5) {
                this.error("js5io");
                gameState = 1000;
                return;
             }
 
-            __client_dp = 3000;
+            field167 = 3000;
             NetCache.NetCache_ioExceptions = 3;
          }
 
-         if(--__client_dp + 1 <= 0) {
+         if (--field167 + 1 <= 0) {
             try {
-               if(js5ConnectState == 0) {
+               if (js5ConnectState == 0) {
                   class210.js5SocketTask = GameShell.taskHandler.newSocketTask(class50.worldHost, class203.port3);
                   ++js5ConnectState;
                }
 
-               if(js5ConnectState == 1) {
-                  if(class210.js5SocketTask.status == 2) {
+               if (js5ConnectState == 1) {
+                  if (class210.js5SocketTask.status == 2) {
                      this.js5Error(-1);
                      return;
                   }
 
-                  if(class210.js5SocketTask.status == 1) {
+                  if (class210.js5SocketTask.status == 1) {
                      ++js5ConnectState;
                   }
                }
 
-               if(js5ConnectState == 2) {
-                  if(useBufferedSocket) {
+               if (js5ConnectState == 2) {
+                  if (useBufferedSocket) {
                      DynamicObject.js5Socket = BufferedFile.method2719((Socket)class210.js5SocketTask.result, 40000, 5000);
                   } else {
                      DynamicObject.js5Socket = new NetSocket((Socket)class210.js5SocketTask.result, GameShell.taskHandler, 5000);
@@ -3242,59 +3008,57 @@ public final class Client extends GameShell implements Usernamed {
                   GameObject.js5StartTimeMs = class203.currentTimeMs();
                }
 
-               if(js5ConnectState == 3) {
-                  if(DynamicObject.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) {
-                     int var5 = DynamicObject.js5Socket.readUnsignedByte();
-                     if(var5 != 0) {
-                        this.js5Error(var5);
+               if (js5ConnectState == 3) {
+                  if (DynamicObject.js5Socket.available() > 0 || !useBufferedSocket && gameState <= 5) {
+                     int var10 = DynamicObject.js5Socket.readUnsignedByte();
+                     if (var10 != 0) {
+                        this.js5Error(var10);
                         return;
                      }
 
                      ++js5ConnectState;
-                  } else if(class203.currentTimeMs() - GameObject.js5StartTimeMs > 30000L) {
+                  } else if (class203.currentTimeMs() - GameObject.js5StartTimeMs > 30000L) {
                      this.js5Error(-2);
                      return;
                   }
                }
 
-               if(js5ConnectState == 4) {
-                  AbstractSocket var10 = DynamicObject.js5Socket;
+               if (js5ConnectState == 4) {
+                  AbstractSocket var11 = DynamicObject.js5Socket;
                   boolean var2 = gameState > 20;
-                  if(NetCache.NetCache_socket != null) {
+                  if (NetCache.NetCache_socket != null) {
                      try {
                         NetCache.NetCache_socket.close();
                      } catch (Exception var8) {
-                        ;
                      }
 
                      NetCache.NetCache_socket = null;
                   }
 
-                  NetCache.NetCache_socket = var10;
+                  NetCache.NetCache_socket = var11;
                   UserComparator9.method3343(var2);
                   NetCache.NetCache_responseHeaderBuffer.index = 0;
                   ModelData0.NetCache_currentResponse = null;
-                  class22.NetCache_responseArchiveBuffer = null;
-                  NetCache.__iq_j = 0;
+                  WorldMapRectangle.NetCache_responseArchiveBuffer = null;
+                  NetCache.field630 = 0;
 
-                  while(true) {
+                  while (true) {
                      NetFileRequest var3 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.first();
-                     if(var3 == null) {
-                        while(true) {
+                     if (var3 == null) {
+                        while (true) {
                            var3 = (NetFileRequest)NetCache.NetCache_pendingResponses.first();
-                           if(var3 == null) {
-                              if(NetCache.__iq_b != 0) {
+                           if (var3 == null) {
+                              if (NetCache.field631 != 0) {
                                  try {
-                                    Buffer var11 = new Buffer(4);
-                                    var11.writeByte(4);
-                                    var11.writeByte(NetCache.__iq_b);
-                                    var11.writeShort(0);
-                                    NetCache.NetCache_socket.write(var11.array, 0, 4);
+                                    Buffer var4 = new Buffer(4);
+                                    var4.writeByte(4);
+                                    var4.writeByte(NetCache.field631);
+                                    var4.writeShort(0);
+                                    NetCache.NetCache_socket.write(var4.array, 0, 4);
                                  } catch (IOException var7) {
                                     try {
                                        NetCache.NetCache_socket.close();
                                     } catch (Exception var6) {
-                                       ;
                                     }
 
                                     ++NetCache.NetCache_ioExceptions;
@@ -3302,8 +3066,8 @@ public final class Client extends GameShell implements Usernamed {
                                  }
                               }
 
-                              NetCache.__iq_f = 0;
-                              NetCache.__iq_q = class203.currentTimeMs();
+                              NetCache.field628 = 0;
+                              NetCache.field629 = class203.currentTimeMs();
                               class210.js5SocketTask = null;
                               DynamicObject.js5Socket = null;
                               js5ConnectState = 0;
@@ -3326,9 +3090,9 @@ public final class Client extends GameShell implements Usernamed {
             } catch (IOException var9) {
                this.js5Error(-3);
             }
-
          }
       }
+
    }
 
    @ObfuscatedName("ea")
@@ -3337,34 +3101,34 @@ public final class Client extends GameShell implements Usernamed {
       garbageValue = "2348"
    )
    @Export("js5Error")
-   void js5Error(int var1) {
+   void js5Error(int code) {
       class210.js5SocketTask = null;
       DynamicObject.js5Socket = null;
       js5ConnectState = 0;
-      if(class2.port1 == class203.port3) {
+      if (class2.port1 == class203.port3) {
          class203.port3 = WorldMapArea.port2;
       } else {
          class203.port3 = class2.port1;
       }
 
       ++js5Errors;
-      if(js5Errors >= 2 && (var1 == 7 || var1 == 9)) {
-         if(gameState <= 5) {
-            this.error("js5connect_full");
+      if (js5Errors < 2 || code != 7 && code != 9) {
+         if (js5Errors >= 2 && code == 6) {
+            this.error("js5connect_outofdate");
             gameState = 1000;
-         } else {
-            __client_dp = 3000;
+         } else if (js5Errors >= 4) {
+            if (gameState <= 5) {
+               this.error("js5connect");
+               gameState = 1000;
+            } else {
+               field167 = 3000;
+            }
          }
-      } else if(js5Errors >= 2 && var1 == 6) {
-         this.error("js5connect_outofdate");
+      } else if (gameState <= 5) {
+         this.error("js5connect_full");
          gameState = 1000;
-      } else if(js5Errors >= 4) {
-         if(gameState <= 5) {
-            this.error("js5connect");
-            gameState = 1000;
-         } else {
-            __client_dp = 3000;
-         }
+      } else {
+         field167 = 3000;
       }
 
    }
@@ -3380,37 +3144,37 @@ public final class Client extends GameShell implements Usernamed {
       PacketBuffer var2 = packetWriter.packetBuffer;
 
       try {
-         if(loginState == 0) {
-            if(WorldMapIcon1.secureRandom == null && (secureRandomFuture.isDone() || __client_ex > 250)) {
+         if (loginState == 0) {
+            if (WorldMapIcon1.secureRandom == null && (secureRandomFuture.isDone() || field168 > 250)) {
                WorldMapIcon1.secureRandom = secureRandomFuture.get();
                secureRandomFuture.shutdown();
                secureRandomFuture = null;
             }
 
-            if(WorldMapIcon1.secureRandom != null) {
-               if(var1 != null) {
+            if (WorldMapIcon1.secureRandom != null) {
+               if (var1 != null) {
                   ((AbstractSocket)var1).close();
                   var1 = null;
                }
 
                UserComparator3.socketTask = null;
-               __client_fh = false;
-               __client_ex = 0;
+               field176 = false;
+               field168 = 0;
                loginState = 1;
             }
          }
 
-         if(loginState == 1) {
-            if(UserComparator3.socketTask == null) {
+         if (loginState == 1) {
+            if (UserComparator3.socketTask == null) {
                UserComparator3.socketTask = GameShell.taskHandler.newSocketTask(class50.worldHost, class203.port3);
             }
 
-            if(UserComparator3.socketTask.status == 2) {
+            if (UserComparator3.socketTask.status == 2) {
                throw new IOException();
             }
 
-            if(UserComparator3.socketTask.status == 1) {
-               if(useBufferedSocket) {
+            if (UserComparator3.socketTask.status == 1) {
+               if (useBufferedSocket) {
                   var1 = BufferedFile.method2719((Socket)UserComparator3.socketTask.result, 40000, 5000);
                } else {
                   var1 = new NetSocket((Socket)UserComparator3.socketTask.result, GameShell.taskHandler, 5000);
@@ -3422,53 +3186,53 @@ public final class Client extends GameShell implements Usernamed {
             }
          }
 
-         if(loginState == 2) {
-            packetWriter.__m_165();
-            PacketBufferNode var4;
-            if(PacketBufferNode.__gg_u == 0) {
-               var4 = new PacketBufferNode();
+         if (loginState == 2) {
+            packetWriter.method239();
+            PacketBufferNode var3;
+            if (PacketBufferNode.field668 == 0) {
+               var3 = new PacketBufferNode();
             } else {
-               var4 = PacketBufferNode.packetBufferNodes[--PacketBufferNode.__gg_u];
+               var3 = PacketBufferNode.packetBufferNodes[--PacketBufferNode.field668];
             }
 
-            var4.__m = null;
-            var4.__f = 0;
-            var4.packetBuffer = new PacketBuffer(5000);
-            var4.packetBuffer.writeByte(LoginPacket.__gl_m.id);
-            packetWriter.__q_167(var4);
-            packetWriter.__f_166();
+            var3.field669 = null;
+            var3.field670 = 0;
+            var3.packetBuffer = new PacketBuffer(5000);
+            var3.packetBuffer.writeByte(LoginPacket.field473.id);
+            packetWriter.method241(var3);
+            packetWriter.method240();
             var2.index = 0;
             loginState = 3;
          }
 
-         boolean var12;
-         int var13;
-         if(loginState == 3) {
-            if(WorldMapCacheName.pcmPlayer0 != null) {
-               WorldMapCacheName.pcmPlayer0.__ac_176();
+         boolean var4;
+         int var16;
+         if (loginState == 3) {
+            if (WorldMapCacheName.pcmPlayer0 != null) {
+               WorldMapCacheName.pcmPlayer0.method242();
             }
 
-            if(AbstractIndexCache.pcmPlayer1 != null) {
-               AbstractIndexCache.pcmPlayer1.__ac_176();
+            if (AbstractArchive.pcmPlayer1 != null) {
+               AbstractArchive.pcmPlayer1.method242();
             }
 
-            var12 = true;
-            if(useBufferedSocket && !((AbstractSocket)var1).isAvailable(1)) {
-               var12 = false;
+            var4 = true;
+            if (useBufferedSocket && !((AbstractSocket)var1).isAvailable(1)) {
+               var4 = false;
             }
 
-            if(var12) {
-               var13 = ((AbstractSocket)var1).readUnsignedByte();
-               if(WorldMapCacheName.pcmPlayer0 != null) {
-                  WorldMapCacheName.pcmPlayer0.__ac_176();
+            if (var4) {
+               var16 = ((AbstractSocket)var1).readUnsignedByte();
+               if (WorldMapCacheName.pcmPlayer0 != null) {
+                  WorldMapCacheName.pcmPlayer0.method242();
                }
 
-               if(AbstractIndexCache.pcmPlayer1 != null) {
-                  AbstractIndexCache.pcmPlayer1.__ac_176();
+               if (AbstractArchive.pcmPlayer1 != null) {
+                  AbstractArchive.pcmPlayer1.method242();
                }
 
-               if(var13 != 0) {
-                  IsaacCipher.method4093(var13);
+               if (var16 != 0) {
+                  IsaacCipher.method4093(var16);
                   return;
                }
 
@@ -3477,154 +3241,154 @@ public final class Client extends GameShell implements Usernamed {
             }
          }
 
-         int var25;
-         if(loginState == 4) {
-            if(var2.index < 8) {
-               var25 = ((AbstractSocket)var1).available();
-               if(var25 > 8 - var2.index) {
-                  var25 = 8 - var2.index;
+         int var5;
+         if (loginState == 4) {
+            if (var2.index < 8) {
+               var5 = ((AbstractSocket)var1).available();
+               if (var5 > 8 - var2.index) {
+                  var5 = 8 - var2.index;
                }
 
-               if(var25 > 0) {
-                  ((AbstractSocket)var1).read(var2.array, var2.index, var25);
-                  var2.index += var25;
+               if (var5 > 0) {
+                  ((AbstractSocket)var1).read(var2.array, var2.index, var5);
+                  var2.index += var5;
                }
             }
 
-            if(var2.index == 8) {
+            if (var2.index == 8) {
                var2.index = 0;
-               MusicPatchNode2.__hd_fc = var2.readLong();
+               MusicPatchNode2.field592 = var2.readLong();
                loginState = 5;
             }
          }
 
-         if(loginState == 5) {
+         if (loginState == 5) {
             packetWriter.packetBuffer.index = 0;
-            packetWriter.__m_165();
-            PacketBuffer var3 = new PacketBuffer(500);
-            int[] var20 = new int[]{WorldMapIcon1.secureRandom.nextInt(), WorldMapIcon1.secureRandom.nextInt(), WorldMapIcon1.secureRandom.nextInt(), WorldMapIcon1.secureRandom.nextInt()};
-            var3.index = 0;
-            var3.writeByte(1);
-            var3.writeInt(var20[0]);
-            var3.writeInt(var20[1]);
-            var3.writeInt(var20[2]);
-            var3.writeInt(var20[3]);
-            var3.writeLong(MusicPatchNode2.__hd_fc);
-            if(gameState == 40) {
-               var3.writeInt(Skills.__hc_ef[0]);
-               var3.writeInt(Skills.__hc_ef[1]);
-               var3.writeInt(Skills.__hc_ef[2]);
-               var3.writeInt(Skills.__hc_ef[3]);
+            packetWriter.method239();
+            PacketBuffer var6 = new PacketBuffer(500);
+            int[] var7 = new int[]{WorldMapIcon1.secureRandom.nextInt(), WorldMapIcon1.secureRandom.nextInt(), WorldMapIcon1.secureRandom.nextInt(), WorldMapIcon1.secureRandom.nextInt()};
+            var6.index = 0;
+            var6.writeByte(1);
+            var6.writeInt(var7[0]);
+            var6.writeInt(var7[1]);
+            var6.writeInt(var7[2]);
+            var6.writeInt(var7[3]);
+            var6.writeLong(MusicPatchNode2.field592);
+            if (gameState == 40) {
+               var6.writeInt(Skills.field875[0]);
+               var6.writeInt(Skills.field875[1]);
+               var6.writeInt(Skills.field875[2]);
+               var6.writeInt(Skills.field875[3]);
             } else {
-               var3.writeByte(field658.rsOrdinal());
+               var6.writeByte(field658.rsOrdinal());
                switch(field658.field1984) {
                case 0:
                case 3:
-                  var3.writeMedium(class13.otpInt);
-                  ++var3.index;
+                  var6.writeMedium(class13.otpInt);
+                  ++var6.index;
                   break;
                case 1:
-                  var3.index += 4;
+                  var6.index += 4;
                   break;
                case 2:
-                  var3.writeInt(((Integer)ReflectionCheck.clientPreferences.parameters.get(Integer.valueOf(class279.method5357(Login.Login_username)))).intValue());
+                  var6.writeInt((Integer)ReflectionCheck.clientPreferences.parameters.get(class279.method5357(Login.Login_username)));
                }
 
-               var3.writeByte(class313.field3834.rsOrdinal());
-               var3.writeStringCp1252NullTerminated(Login.Login_password);
+               var6.writeByte(class313.field3834.rsOrdinal());
+               var6.writeStringCp1252NullTerminated(Login.Login_password);
             }
 
-            var3.encryptRsa(class83.__cm_m, class83.__cm_f);
-            Skills.__hc_ef = var20;
-            PacketBufferNode var6;
-            if(PacketBufferNode.__gg_u == 0) {
-               var6 = new PacketBufferNode();
+            var6.encryptRsa(class83.field1165, class83.field1166);
+            Skills.field875 = var7;
+            PacketBufferNode var8;
+            if (PacketBufferNode.field668 == 0) {
+               var8 = new PacketBufferNode();
             } else {
-               var6 = PacketBufferNode.packetBufferNodes[--PacketBufferNode.__gg_u];
+               var8 = PacketBufferNode.packetBufferNodes[--PacketBufferNode.field668];
             }
 
-            var6.__m = null;
-            var6.__f = 0;
-            var6.packetBuffer = new PacketBuffer(5000);
-            var6.packetBuffer.index = 0;
-            if(gameState == 40) {
-               var6.packetBuffer.writeByte(LoginPacket.__gl_w.id);
+            var8.field669 = null;
+            var8.field670 = 0;
+            var8.packetBuffer = new PacketBuffer(5000);
+            var8.packetBuffer.index = 0;
+            if (gameState == 40) {
+               var8.packetBuffer.writeByte(LoginPacket.field476.id);
             } else {
-               var6.packetBuffer.writeByte(LoginPacket.__gl_q.id);
+               var8.packetBuffer.writeByte(LoginPacket.field475.id);
             }
 
-            var6.packetBuffer.writeShort(0);
-            int var14 = var6.packetBuffer.index;
-            var6.packetBuffer.writeInt(180);
-            var6.packetBuffer.writeInt(1);
-            var6.packetBuffer.writeByte(clientType);
-            var6.packetBuffer.__s_297(var3.array, 0, var3.index);
-            int var8 = var6.packetBuffer.index;
-            var6.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username);
-            var6.packetBuffer.writeByte((isResizable?1:0) << 1 | (isLowDetail?1:0));
-            var6.packetBuffer.writeShort(SoundCache.canvasWidth);
-            var6.packetBuffer.writeShort(Huffman.canvasHeight);
-            Varps.method4400(var6.packetBuffer);
-            var6.packetBuffer.writeStringCp1252NullTerminated(class21.__b_by);
-            var6.packetBuffer.writeInt(AbstractIndexCache.__ir_bu);
-            Buffer var9 = new Buffer(WorldMapLabelSize.platformInfo.size());
-            WorldMapLabelSize.platformInfo.write(var9);
-            var6.packetBuffer.__s_297(var9.array, 0, var9.array.length);
-            var6.packetBuffer.writeByte(clientType);
-            var6.packetBuffer.writeInt(0);
-            var6.packetBuffer.writeInt(AbstractIndexCache.indexCache0.hash);
-            var6.packetBuffer.writeInt(Skeleton.indexCache1.hash);
-            var6.packetBuffer.writeInt(ObjectSound.indexCache2.hash);
-            var6.packetBuffer.writeInt(WorldMapIcon1.indexCache3.hash);
-            var6.packetBuffer.writeInt(class25.indexCache4.hash);
-            var6.packetBuffer.writeInt(SecureRandomFuture.indexCache5.hash);
-            var6.packetBuffer.writeInt(UserComparator3.indexCache6.hash);
-            var6.packetBuffer.writeInt(class40.indexCache7.hash);
-            var6.packetBuffer.writeInt(WorldMapSection3.indexCache8.hash);
-            var6.packetBuffer.writeInt(class238.indexCache9.hash);
-            var6.packetBuffer.writeInt(class16.indexCache10.hash);
-            var6.packetBuffer.writeInt(Login.indexCache11.hash);
-            var6.packetBuffer.writeInt(Formatting.indexCache12.hash);
-            var6.packetBuffer.writeInt(ByteArrayPool.indexCache13.hash);
-            var6.packetBuffer.writeInt(class2.indexCache14.hash);
-            var6.packetBuffer.writeInt(WorldMapSection1.indexCache15.hash);
-            var6.packetBuffer.writeInt(0);
-            var6.packetBuffer.writeInt(class22.indexCache16.hash);
-            var6.packetBuffer.writeInt(WorldMapLabelSize.__s_dq.hash);
-            var6.packetBuffer.writeInt(ItemContainer.__bc_dm.hash);
-            var6.packetBuffer.writeInt(AbstractByteArrayCopier.__gu_et.hash);
-            var6.packetBuffer.xteaEncrypt(var20, var8, var6.packetBuffer.index);
-            var6.packetBuffer.__y_299(var6.packetBuffer.index - var14);
-            packetWriter.__q_167(var6);
-            packetWriter.__f_166();
-            packetWriter.isaacCipher = new IsaacCipher(var20);
-            int[] var10 = new int[4];
+            var8.packetBuffer.writeShort(0);
+            int var9 = var8.packetBuffer.index;
+            var8.packetBuffer.writeInt(180);
+            var8.packetBuffer.writeInt(1);
+            var8.packetBuffer.writeByte(clientType);
+            var8.packetBuffer.writeBytes(var6.array, 0, var6.index);
+            int var10 = var8.packetBuffer.index;
+            var8.packetBuffer.writeStringCp1252NullTerminated(Login.Login_username);
+            var8.packetBuffer.writeByte((isResizable ? 1 : 0) << 1 | (isLowDetail ? 1 : 0));
+            var8.packetBuffer.writeShort(SoundCache.canvasWidth);
+            var8.packetBuffer.writeShort(Huffman.canvasHeight);
+            Varps.method4400(var8.packetBuffer);
+            var8.packetBuffer.writeStringCp1252NullTerminated(class21.field1123);
+            var8.packetBuffer.writeInt(AbstractArchive.field2);
+            Buffer var11 = new Buffer(WorldMapLabelSize.platformInfo.size());
+            WorldMapLabelSize.platformInfo.write(var11);
+            var8.packetBuffer.writeBytes(var11.array, 0, var11.array.length);
+            var8.packetBuffer.writeByte(clientType);
+            var8.packetBuffer.writeInt(0);
+            var8.packetBuffer.writeInt(AbstractArchive.archive0.hash);
+            var8.packetBuffer.writeInt(Skeleton.archive1.hash);
+            var8.packetBuffer.writeInt(ObjectSound.archive2.hash);
+            var8.packetBuffer.writeInt(WorldMapIcon1.archive3.hash);
+            var8.packetBuffer.writeInt(WorldMapDecoration.archive4.hash);
+            var8.packetBuffer.writeInt(SecureRandomFuture.archive5.hash);
+            var8.packetBuffer.writeInt(UserComparator3.archive6.hash);
+            var8.packetBuffer.writeInt(class40.archive7.hash);
+            var8.packetBuffer.writeInt(WorldMapSection1.archive8.hash);
+            var8.packetBuffer.writeInt(class238.archive9.hash);
+            var8.packetBuffer.writeInt(class16.archive10.hash);
+            var8.packetBuffer.writeInt(Login.archive11.hash);
+            var8.packetBuffer.writeInt(Formatting.archive12.hash);
+            var8.packetBuffer.writeInt(ByteArrayPool.archive13.hash);
+            var8.packetBuffer.writeInt(class2.archive14.hash);
+            var8.packetBuffer.writeInt(WorldMapSection2.archive15.hash);
+            var8.packetBuffer.writeInt(0);
+            var8.packetBuffer.writeInt(WorldMapRectangle.archive17.hash);
+            var8.packetBuffer.writeInt(WorldMapLabelSize.archive18.hash);
+            var8.packetBuffer.writeInt(ItemContainer.archive19.hash);
+            var8.packetBuffer.writeInt(AbstractByteArrayCopier.archive20.hash);
+            var8.packetBuffer.xteaEncrypt(var7, var10, var8.packetBuffer.index);
+            var8.packetBuffer.writeLengthShort(var8.packetBuffer.index - var9);
+            packetWriter.method241(var8);
+            packetWriter.method240();
+            packetWriter.isaacCipher = new IsaacCipher(var7);
+            int[] var12 = new int[4];
 
-            for(int var11 = 0; var11 < 4; ++var11) {
-               var10[var11] = var20[var11] + 50;
+            for (int var13 = 0; var13 < 4; ++var13) {
+               var12[var13] = var7[var13] + 50;
             }
 
-            var2.newIsaacCipher(var10);
+            var2.newIsaacCipher(var12);
             loginState = 6;
          }
 
-         if(loginState == 6 && ((AbstractSocket)var1).available() > 0) {
-            var25 = ((AbstractSocket)var1).readUnsignedByte();
-            if(var25 == 21 && gameState == 20) {
+         if (loginState == 6 && ((AbstractSocket)var1).available() > 0) {
+            var5 = ((AbstractSocket)var1).readUnsignedByte();
+            if (var5 == 21 && gameState == 20) {
                loginState = 9;
-            } else if(var25 == 2) {
+            } else if (var5 == 2) {
                loginState = 11;
-            } else if(var25 == 15 && gameState == 40) {
+            } else if (var5 == 15 && gameState == 40) {
                packetWriter.serverPacket0Length = -1;
                loginState = 16;
-            } else if(var25 == 64) {
+            } else if (var5 == 64) {
                loginState = 7;
-            } else if(var25 == 23 && __client_ej < 1) {
-               ++__client_ej;
+            } else if (var5 == 23 && field169 < 1) {
+               ++field169;
                loginState = 0;
             } else {
-               if(var25 != 29) {
-                  IsaacCipher.method4093(var25);
+               if (var5 != 29) {
+                  IsaacCipher.method4093(var5);
                   return;
                }
 
@@ -3632,214 +3396,212 @@ public final class Client extends GameShell implements Usernamed {
             }
          }
 
-         if(loginState == 7 && ((AbstractSocket)var1).available() > 0) {
-            WorldMapSection1.__as_ey = ((AbstractSocket)var1).readUnsignedByte();
+         if (loginState == 7 && ((AbstractSocket)var1).available() > 0) {
+            WorldMapSection2.field1071 = ((AbstractSocket)var1).readUnsignedByte();
             loginState = 8;
          }
 
-         if(loginState == 8 && ((AbstractSocket)var1).available() >= WorldMapSection1.__as_ey) {
-            ((AbstractSocket)var1).read(var2.array, 0, WorldMapSection1.__as_ey);
+         if (loginState == 8 && ((AbstractSocket)var1).available() >= WorldMapSection2.field1071) {
+            ((AbstractSocket)var1).read(var2.array, 0, WorldMapSection2.field1071);
             var2.index = 0;
             loginState = 6;
          }
 
-         if(loginState == 9 && ((AbstractSocket)var1).available() > 0) {
-            __client_el = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60;
+         if (loginState == 9 && ((AbstractSocket)var1).available() > 0) {
+            field170 = (((AbstractSocket)var1).readUnsignedByte() + 3) * 60;
             loginState = 10;
          }
 
-         if(loginState == 10) {
-            __client_ex = 0;
-            class54.method1089("You have only just left another world.", "Your profile will be transferred in:", __client_el / 60 + " seconds.");
-            if(--__client_el <= 0) {
+         if (loginState == 10) {
+            field168 = 0;
+            class54.method1089("You have only just left another world.", "Your profile will be transferred in:", field170 / 60 + " seconds.");
+            if (--field170 <= 0) {
                loginState = 0;
             }
-
          } else {
-            if(loginState == 11 && ((AbstractSocket)var1).available() >= 1) {
-               __client_eo = ((AbstractSocket)var1).readUnsignedByte();
+            if (loginState == 11 && ((AbstractSocket)var1).available() >= 1) {
+               field171 = ((AbstractSocket)var1).readUnsignedByte();
                loginState = 12;
             }
 
-            if(loginState == 12 && ((AbstractSocket)var1).available() >= __client_eo) {
-               var12 = ((AbstractSocket)var1).readUnsignedByte() == 1;
+            if (loginState == 12 && ((AbstractSocket)var1).available() >= field171) {
+               var4 = ((AbstractSocket)var1).readUnsignedByte() == 1;
                ((AbstractSocket)var1).read(var2.array, 0, 4);
                var2.index = 0;
-               boolean var26 = false;
-               if(var12) {
-                  var13 = var2.readByteIsaac() << 24;
-                  var13 |= var2.readByteIsaac() << 16;
-                  var13 |= var2.readByteIsaac() << 8;
-                  var13 |= var2.readByteIsaac();
-                  int var15 = class279.method5357(Login.Login_username);
-                  if(ReflectionCheck.clientPreferences.parameters.size() >= 10 && !ReflectionCheck.clientPreferences.parameters.containsKey(Integer.valueOf(var15))) {
-                     Iterator var24 = ReflectionCheck.clientPreferences.parameters.entrySet().iterator();
-                     var24.next();
-                     var24.remove();
+               boolean var17 = false;
+               if (var4) {
+                  var16 = var2.readByteIsaac() << 24;
+                  var16 |= var2.readByteIsaac() << 16;
+                  var16 |= var2.readByteIsaac() << 8;
+                  var16 |= var2.readByteIsaac();
+                  int var20 = class279.method5357(Login.Login_username);
+                  if (ReflectionCheck.clientPreferences.parameters.size() >= 10 && !ReflectionCheck.clientPreferences.parameters.containsKey(var20)) {
+                     Iterator var23 = ReflectionCheck.clientPreferences.parameters.entrySet().iterator();
+                     var23.next();
+                     var23.remove();
                   }
 
-                  ReflectionCheck.clientPreferences.parameters.put(Integer.valueOf(var15), Integer.valueOf(var13));
+                  ReflectionCheck.clientPreferences.parameters.put(var20, var16);
                }
 
-               if(Login_isUsernameRemembered) {
+               if (Login_isUsernameRemembered) {
                   ReflectionCheck.clientPreferences.rememberedUsername = Login.Login_username;
                } else {
                   ReflectionCheck.clientPreferences.rememberedUsername = null;
                }
 
-               WorldMapSection0.savePreferences();
-               rights = ((AbstractSocket)var1).readUnsignedByte();
-               __client_mn = ((AbstractSocket)var1).readUnsignedByte() == 1;
+               WorldMapSection3.savePreferences();
+               staffModLevel = ((AbstractSocket)var1).readUnsignedByte();
+               playerMod = ((AbstractSocket)var1).readUnsignedByte() == 1;
                localPlayerIndex = ((AbstractSocket)var1).readUnsignedByte();
                localPlayerIndex <<= 8;
                localPlayerIndex += ((AbstractSocket)var1).readUnsignedByte();
-               __client_jo = ((AbstractSocket)var1).readUnsignedByte();
+               field209 = ((AbstractSocket)var1).readUnsignedByte();
                ((AbstractSocket)var1).read(var2.array, 0, 1);
                var2.index = 0;
-               ServerPacket[] var5 = class27.method429();
-               int var16 = var2.readSmartByteShortIsaac();
-               if(var16 < 0 || var16 >= var5.length) {
-                  throw new IOException(var16 + " " + var2.index);
+               ServerPacket[] var21 = class27.method429();
+               int var24 = var2.readSmartByteShortIsaac();
+               if (var24 < 0 || var24 >= var21.length) {
+                  throw new IOException(var24 + " " + var2.index);
                }
 
-               packetWriter.serverPacket0 = var5[var16];
+               packetWriter.serverPacket0 = var21[var24];
                packetWriter.serverPacket0Length = packetWriter.serverPacket0.length;
                ((AbstractSocket)var1).read(var2.array, 0, 2);
                var2.index = 0;
-               packetWriter.serverPacket0Length = var2.__ag_302();
+               packetWriter.serverPacket0Length = var2.readUnsignedShort();
 
                try {
-                  Client var7 = TextureProvider.client;
-                  JSObject.getWindow(var7).call("zap", (Object[])null);
-               } catch (Throwable var17) {
-                  ;
+                  Client var25 = TextureProvider.client;
+                  JSObject.getWindow(var25).call("zap", (Object[])null);
+               } catch (Throwable var14) {
                }
 
                loginState = 13;
             }
 
-            if(loginState == 13) {
-               if(((AbstractSocket)var1).available() >= packetWriter.serverPacket0Length) {
+            if (loginState == 13) {
+               if (((AbstractSocket)var1).available() >= packetWriter.serverPacket0Length) {
                   var2.index = 0;
                   ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacket0Length);
-                  timer.__w_456();
-                  WorldMapSection1.method808();
-                  class11.updatePlayer(var2);
-                  GameObject.__eh_fy = -1;
+                  timer.method332();
+                  WorldMapSection2.method808();
+                  GrandExchangeOfferNameComparator.updatePlayer(var2);
+                  GameObject.field359 = -1;
                   class50.loadRegions(false, var2);
                   packetWriter.serverPacket0 = null;
                }
-
             } else {
-               if(loginState == 14 && ((AbstractSocket)var1).available() >= 2) {
+               if (loginState == 14 && ((AbstractSocket)var1).available() >= 2) {
                   var2.index = 0;
                   ((AbstractSocket)var1).read(var2.array, 0, 2);
                   var2.index = 0;
-                  IndexCacheLoader.__bd_er = var2.__ag_302();
+                  ArchiveLoader.field407 = var2.readUnsignedShort();
                   loginState = 15;
                }
 
-               if(loginState == 15 && ((AbstractSocket)var1).available() >= IndexCacheLoader.__bd_er) {
+               if (loginState == 15 && ((AbstractSocket)var1).available() >= ArchiveLoader.field407) {
                   var2.index = 0;
-                  ((AbstractSocket)var1).read(var2.array, 0, IndexCacheLoader.__bd_er);
+                  ((AbstractSocket)var1).read(var2.array, 0, ArchiveLoader.field407);
                   var2.index = 0;
-                  String var19 = var2.readStringCp1252NullTerminated();
-                  String var21 = var2.readStringCp1252NullTerminated();
+                  String var18 = var2.readStringCp1252NullTerminated();
                   String var22 = var2.readStringCp1252NullTerminated();
-                  class54.method1089(var19, var21, var22);
+                  String var26 = var2.readStringCp1252NullTerminated();
+                  class54.method1089(var18, var22, var26);
                   GameShell.updateGameState(10);
                }
 
-               if(loginState != 16) {
-                  ++__client_ex;
-                  if(__client_ex > 2000) {
-                     if(__client_ej < 1) {
-                        if(class203.port3 == class2.port1) {
+               if (loginState != 16) {
+                  ++field168;
+                  if (field168 > 2000) {
+                     if (field169 < 1) {
+                        if (class203.port3 == class2.port1) {
                            class203.port3 = WorldMapArea.port2;
                         } else {
                            class203.port3 = class2.port1;
                         }
 
-                        ++__client_ej;
+                        ++field169;
                         loginState = 0;
                      } else {
                         IsaacCipher.method4093(-3);
                      }
                   }
                } else {
-                  if(packetWriter.serverPacket0Length == -1) {
-                     if(((AbstractSocket)var1).available() < 2) {
+                  if (packetWriter.serverPacket0Length == -1) {
+                     if (((AbstractSocket)var1).available() < 2) {
                         return;
                      }
 
                      ((AbstractSocket)var1).read(var2.array, 0, 2);
                      var2.index = 0;
-                     packetWriter.serverPacket0Length = var2.__ag_302();
+                     packetWriter.serverPacket0Length = var2.readUnsignedShort();
                   }
 
-                  if(((AbstractSocket)var1).available() >= packetWriter.serverPacket0Length) {
+                  if (((AbstractSocket)var1).available() >= packetWriter.serverPacket0Length) {
                      ((AbstractSocket)var1).read(var2.array, 0, packetWriter.serverPacket0Length);
                      var2.index = 0;
-                     var25 = packetWriter.serverPacket0Length;
-                     timer.__u_458();
-                     packetWriter.__m_165();
+                     var5 = packetWriter.serverPacket0Length;
+                     timer.method334();
+                     packetWriter.method239();
                      packetWriter.packetBuffer.index = 0;
                      packetWriter.serverPacket0 = null;
-                     packetWriter.__k = null;
-                     packetWriter.__n = null;
-                     packetWriter.__i = null;
+                     packetWriter.field676 = null;
+                     packetWriter.field677 = null;
+                     packetWriter.field678 = null;
                      packetWriter.serverPacket0Length = 0;
-                     packetWriter.__x = 0;
+                     packetWriter.field674 = 0;
                      rebootTimer = 0;
                      menuOptionsCount = 0;
                      isMenuOpen = false;
                      minimapState = 0;
                      destinationX = 0;
 
-                     for(var13 = 0; var13 < 2048; ++var13) {
-                        players[var13] = null;
+                     for (var16 = 0; var16 < 2048; ++var16) {
+                        players[var16] = null;
                      }
 
                      Canvas.localPlayer = null;
 
-                     for(var13 = 0; var13 < npcs.length; ++var13) {
-                        Npc var23 = npcs[var13];
-                        if(var23 != null) {
-                           var23.targetIndex = -1;
-                           var23.false0 = false;
+                     for (var16 = 0; var16 < npcs.length; ++var16) {
+                        NPC var19 = npcs[var16];
+                        if (var19 != null) {
+                           var19.targetIndex = -1;
+                           var19.false0 = false;
                         }
                      }
 
                      SpriteMask.method4389();
                      GameShell.updateGameState(30);
 
-                     for(var13 = 0; var13 < 100; ++var13) {
-                        __client_od[var13] = true;
+                     for (var16 = 0; var16 < 100; ++var16) {
+                        field100[var16] = true;
                      }
 
                      AbstractByteArrayCopier.method4024();
-                     class11.updatePlayer(var2);
-                     if(var25 != var2.index) {
+                     GrandExchangeOfferNameComparator.updatePlayer(var2);
+                     if (var5 != var2.index) {
                         throw new RuntimeException();
                      }
                   }
                }
             }
          }
-      } catch (IOException var18) {
-         if(__client_ej < 1) {
-            if(class2.port1 == class203.port3) {
+      } catch (IOException var15) {
+         if (field169 < 1) {
+            if (class2.port1 == class203.port3) {
                class203.port3 = WorldMapArea.port2;
             } else {
                class203.port3 = class2.port1;
             }
 
-            ++__client_ej;
+            ++field169;
             loginState = 0;
          } else {
             IsaacCipher.method4093(-2);
          }
       }
+
    }
 
    @ObfuscatedName("fx")
@@ -3849,666 +3611,669 @@ public final class Client extends GameShell implements Usernamed {
    )
    @Export("doCycleLoggedIn")
    final void doCycleLoggedIn() {
-      if(rebootTimer > 1) {
+      if (rebootTimer > 1) {
          --rebootTimer;
       }
 
-      if(__client_fd > 0) {
-         --__client_fd;
+      if (field175 > 0) {
+         --field175;
       }
 
-      if(__client_fh) {
-         __client_fh = false;
+      if (field176) {
+         field176 = false;
          class48.method868();
       } else {
-         if(!isMenuOpen) {
+         if (!isMenuOpen) {
             class30.resetMenuEntries();
          }
 
          int var1;
-         for(var1 = 0; var1 < 100 && this.__hg_138(packetWriter); ++var1) {
-            ;
+         for (var1 = 0; var1 < 100 && this.method85(packetWriter); ++var1) {
          }
 
-         if(gameState == 30) {
-            while(true) {
+         if (gameState == 30) {
+            while (true) {
                ReflectionCheck var2 = (ReflectionCheck)class322.reflectionChecks.last();
-               boolean var29;
-               if(var2 == null) {
-                  var29 = false;
+               boolean var3;
+               if (var2 == null) {
+                  var3 = false;
                } else {
-                  var29 = true;
+                  var3 = true;
                }
 
-               int var3;
-               PacketBufferNode var30;
-               if(!var29) {
-                  PacketBufferNode var14;
-                  int var15;
-                  if(timer.__q) {
-                     var14 = Interpreter.method1915(ClientPacket.__gs_o, packetWriter.isaacCipher);
-                     var14.packetBuffer.writeByte(0);
-                     var15 = var14.packetBuffer.index;
-                     timer.write(var14.packetBuffer);
-                     var14.packetBuffer.__h_300(var14.packetBuffer.index - var15);
-                     packetWriter.__q_167(var14);
-                     timer.__o_457();
+               int var4;
+               PacketBufferNode var5;
+               if (!var3) {
+                  PacketBufferNode var6;
+                  int var7;
+                  if (timer.field921) {
+                     var6 = Interpreter.method1915(ClientPacket.field226, packetWriter.isaacCipher);
+                     var6.packetBuffer.writeByte(0);
+                     var7 = var6.packetBuffer.index;
+                     timer.write(var6.packetBuffer);
+                     var6.packetBuffer.writeLengthByte(var6.packetBuffer.index - var7);
+                     packetWriter.method241(var6);
+                     timer.method333();
                   }
 
-                  Object var34 = Projectile.mouseRecorder.lock;
-                  int var4;
-                  int var5;
-                  int var6;
-                  int var7;
-                  int var8;
+                  Object var8 = Projectile.mouseRecorder.lock;
                   int var9;
                   int var10;
                   int var11;
                   int var12;
+                  int var13;
+                  int var14;
+                  int var15;
+                  int var16;
+                  int var17;
                   synchronized(Projectile.mouseRecorder.lock) {
-                     if(!__client_ai) {
+                     if (!field161) {
                         Projectile.mouseRecorder.index = 0;
-                     } else if(MouseHandler.MouseHandler_lastButton != 0 || Projectile.mouseRecorder.index >= 40) {
-                        var30 = null;
-                        var3 = 0;
+                     } else if (MouseHandler.MouseHandler_lastButton != 0 || Projectile.mouseRecorder.index >= 40) {
+                        var5 = null;
                         var4 = 0;
-                        var5 = 0;
-                        var6 = 0;
+                        var9 = 0;
+                        var10 = 0;
+                        var11 = 0;
 
-                        for(var7 = 0; var7 < Projectile.mouseRecorder.index && (var30 == null || var30.packetBuffer.index - var3 < 246); ++var7) {
-                           var4 = var7;
-                           var8 = Projectile.mouseRecorder.ys[var7];
-                           if(var8 < -1) {
-                              var8 = -1;
-                           } else if(var8 > 65534) {
-                              var8 = 65534;
+                        for (var12 = 0; var12 < Projectile.mouseRecorder.index && (var5 == null || var5.packetBuffer.index - var4 < 246); ++var12) {
+                           var9 = var12;
+                           var13 = Projectile.mouseRecorder.ys[var12];
+                           if (var13 < -1) {
+                              var13 = -1;
+                           } else if (var13 > 65534) {
+                              var13 = 65534;
                            }
 
-                           var9 = Projectile.mouseRecorder.xs[var7];
-                           if(var9 < -1) {
-                              var9 = -1;
-                           } else if(var9 > 65534) {
-                              var9 = 65534;
+                           var14 = Projectile.mouseRecorder.xs[var12];
+                           if (var14 < -1) {
+                              var14 = -1;
+                           } else if (var14 > 65534) {
+                              var14 = 65534;
                            }
 
-                           if(var9 != __client_cn || var8 != __client_cq) {
-                              if(var30 == null) {
-                                 var30 = Interpreter.method1915(ClientPacket.__gs_ak, packetWriter.isaacCipher);
-                                 var30.packetBuffer.writeByte(0);
-                                 var3 = var30.packetBuffer.index;
-                                 var30.packetBuffer.index += 2;
-                                 var5 = 0;
-                                 var6 = 0;
+                           if (var14 != field163 || var13 != field164) {
+                              if (var5 == null) {
+                                 var5 = Interpreter.method1915(ClientPacket.field256, packetWriter.isaacCipher);
+                                 var5.packetBuffer.writeByte(0);
+                                 var4 = var5.packetBuffer.index;
+                                 PacketBuffer var19 = var5.packetBuffer;
+                                 var19.index += 2;
+                                 var10 = 0;
+                                 var11 = 0;
                               }
 
-                              if(-1L != __client_ch) {
-                                 var10 = var9 - __client_cn;
-                                 var11 = var8 - __client_cq;
-                                 var12 = (int)((Projectile.mouseRecorder.millis[var7] - __client_ch) / 20L);
-                                 var5 = (int)((long)var5 + (Projectile.mouseRecorder.millis[var7] - __client_ch) % 20L);
+                              if (-1L != field165) {
+                                 var15 = var14 - field163;
+                                 var16 = var13 - field164;
+                                 var17 = (int)((Projectile.mouseRecorder.millis[var12] - field165) / 20L);
+                                 var10 = (int)((long)var10 + (Projectile.mouseRecorder.millis[var12] - field165) % 20L);
                               } else {
-                                 var10 = var9;
-                                 var11 = var8;
-                                 var12 = Integer.MAX_VALUE;
+                                 var15 = var14;
+                                 var16 = var13;
+                                 var17 = Integer.MAX_VALUE;
                               }
 
-                              __client_cn = var9;
-                              __client_cq = var8;
-                              if(var12 < 8 && var10 >= -32 && var10 <= 31 && var11 >= -32 && var11 <= 31) {
-                                 var10 += 32;
-                                 var11 += 32;
-                                 var30.packetBuffer.writeShort((var12 << 12) + var11 + (var10 << 6));
-                              } else if(var12 < 32 && var10 >= -128 && var10 <= 127 && var11 >= -128 && var11 <= 127) {
-                                 var10 += 128;
-                                 var11 += 128;
-                                 var30.packetBuffer.writeByte(var12 + 128);
-                                 var30.packetBuffer.writeShort(var11 + (var10 << 8));
-                              } else if(var12 < 32) {
-                                 var30.packetBuffer.writeByte(var12 + 192);
-                                 if(var9 != -1 && var8 != -1) {
-                                    var30.packetBuffer.writeInt(var9 | var8 << 16);
+                              field163 = var14;
+                              field164 = var13;
+                              if (var17 < 8 && var15 >= -32 && var15 <= 31 && var16 >= -32 && var16 <= 31) {
+                                 var15 += 32;
+                                 var16 += 32;
+                                 var5.packetBuffer.writeShort((var17 << 12) + var16 + (var15 << 6));
+                              } else if (var17 < 32 && var15 >= -128 && var15 <= 127 && var16 >= -128 && var16 <= 127) {
+                                 var15 += 128;
+                                 var16 += 128;
+                                 var5.packetBuffer.writeByte(var17 + 128);
+                                 var5.packetBuffer.writeShort(var16 + (var15 << 8));
+                              } else if (var17 < 32) {
+                                 var5.packetBuffer.writeByte(var17 + 192);
+                                 if (var14 != -1 && var13 != -1) {
+                                    var5.packetBuffer.writeInt(var14 | var13 << 16);
                                  } else {
-                                    var30.packetBuffer.writeInt(Integer.MIN_VALUE);
+                                    var5.packetBuffer.writeInt(Integer.MIN_VALUE);
                                  }
                               } else {
-                                 var30.packetBuffer.writeShort((var12 & 8191) + 57344);
-                                 if(var9 != -1 && var8 != -1) {
-                                    var30.packetBuffer.writeInt(var9 | var8 << 16);
+                                 var5.packetBuffer.writeShort((var17 & 8191) + 57344);
+                                 if (var14 != -1 && var13 != -1) {
+                                    var5.packetBuffer.writeInt(var14 | var13 << 16);
                                  } else {
-                                    var30.packetBuffer.writeInt(Integer.MIN_VALUE);
+                                    var5.packetBuffer.writeInt(Integer.MIN_VALUE);
                                  }
                               }
 
-                              ++var6;
-                              __client_ch = Projectile.mouseRecorder.millis[var7];
+                              ++var11;
+                              field165 = Projectile.mouseRecorder.millis[var12];
                            }
                         }
 
-                        if(var30 != null) {
-                           var30.packetBuffer.__h_300(var30.packetBuffer.index - var3);
-                           var7 = var30.packetBuffer.index;
-                           var30.packetBuffer.index = var3;
-                           var30.packetBuffer.writeByte(var5 / var6);
-                           var30.packetBuffer.writeByte(var5 % var6);
-                           var30.packetBuffer.index = var7;
-                           packetWriter.__q_167(var30);
+                        if (var5 != null) {
+                           var5.packetBuffer.writeLengthByte(var5.packetBuffer.index - var4);
+                           var12 = var5.packetBuffer.index;
+                           var5.packetBuffer.index = var4;
+                           var5.packetBuffer.writeByte(var10 / var11);
+                           var5.packetBuffer.writeByte(var10 % var11);
+                           var5.packetBuffer.index = var12;
+                           packetWriter.method241(var5);
                         }
 
-                        if(var4 >= Projectile.mouseRecorder.index) {
+                        if (var9 >= Projectile.mouseRecorder.index) {
                            Projectile.mouseRecorder.index = 0;
                         } else {
-                           Projectile.mouseRecorder.index -= var4;
-                           System.arraycopy(Projectile.mouseRecorder.xs, var4, Projectile.mouseRecorder.xs, 0, Projectile.mouseRecorder.index);
-                           System.arraycopy(Projectile.mouseRecorder.ys, var4, Projectile.mouseRecorder.ys, 0, Projectile.mouseRecorder.index);
-                           System.arraycopy(Projectile.mouseRecorder.millis, var4, Projectile.mouseRecorder.millis, 0, Projectile.mouseRecorder.index);
+                           MouseRecorder var32 = Projectile.mouseRecorder;
+                           var32.index -= var9;
+                           System.arraycopy(Projectile.mouseRecorder.xs, var9, Projectile.mouseRecorder.xs, 0, Projectile.mouseRecorder.index);
+                           System.arraycopy(Projectile.mouseRecorder.ys, var9, Projectile.mouseRecorder.ys, 0, Projectile.mouseRecorder.index);
+                           System.arraycopy(Projectile.mouseRecorder.millis, var9, Projectile.mouseRecorder.millis, 0, Projectile.mouseRecorder.index);
                         }
                      }
                   }
 
                   PacketBufferNode var18;
-                  if(MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) {
-                     long var16 = (MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis * -1L) / 50L;
-                     if(var16 > 4095L) {
-                        var16 = 4095L;
+                  long var33;
+                  if (MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_lastButton == 4 || MouseHandler.MouseHandler_lastButton == 2) {
+                     var33 = (MouseHandler.MouseHandler_lastPressedTimeMillis - mouseLastLastPressedTimeMillis * -1L) / 50L;
+                     if (var33 > 4095L) {
+                        var33 = 4095L;
                      }
 
                      mouseLastLastPressedTimeMillis = MouseHandler.MouseHandler_lastPressedTimeMillis * -1L;
-                     var3 = MouseHandler.MouseHandler_lastPressedY;
-                     if(var3 < 0) {
-                        var3 = 0;
-                     } else if(var3 > Huffman.canvasHeight) {
-                        var3 = Huffman.canvasHeight;
-                     }
-
-                     var4 = MouseHandler.MouseHandler_lastPressedX;
-                     if(var4 < 0) {
+                     var4 = MouseHandler.MouseHandler_lastPressedY;
+                     if (var4 < 0) {
                         var4 = 0;
-                     } else if(var4 > SoundCache.canvasWidth) {
-                        var4 = SoundCache.canvasWidth;
+                     } else if (var4 > Huffman.canvasHeight) {
+                        var4 = Huffman.canvasHeight;
                      }
 
-                     var5 = (int)var16;
-                     var18 = Interpreter.method1915(ClientPacket.__gs_ap, packetWriter.isaacCipher);
-                     var18.packetBuffer.writeShort((var5 << 1) + (MouseHandler.MouseHandler_lastButton == 2?1:0));
+                     var9 = MouseHandler.MouseHandler_lastPressedX;
+                     if (var9 < 0) {
+                        var9 = 0;
+                     } else if (var9 > SoundCache.canvasWidth) {
+                        var9 = SoundCache.canvasWidth;
+                     }
+
+                     var10 = (int)var33;
+                     var18 = Interpreter.method1915(ClientPacket.field263, packetWriter.isaacCipher);
+                     var18.packetBuffer.writeShort((var10 << 1) + (MouseHandler.MouseHandler_lastButton == 2 ? 1 : 0));
+                     var18.packetBuffer.writeShort(var9);
                      var18.packetBuffer.writeShort(var4);
-                     var18.packetBuffer.writeShort(var3);
-                     packetWriter.__q_167(var18);
+                     packetWriter.method241(var18);
                   }
 
-                  if(KeyHandler.__an_cl > 0) {
-                     var14 = Interpreter.method1915(ClientPacket.__gs_bj, packetWriter.isaacCipher);
-                     var14.packetBuffer.writeShort(0);
-                     var15 = var14.packetBuffer.index;
-                     long var19 = class203.currentTimeMs();
+                  if (KeyHandler.field452 > 0) {
+                     var6 = Interpreter.method1915(ClientPacket.field289, packetWriter.isaacCipher);
+                     var6.packetBuffer.writeShort(0);
+                     var7 = var6.packetBuffer.index;
+                     var33 = class203.currentTimeMs();
 
-                     for(var5 = 0; var5 < KeyHandler.__an_cl; ++var5) {
-                        long var21 = var19 - __client_pp;
-                        if(var21 > 16777215L) {
+                     for (var10 = 0; var10 < KeyHandler.field452; ++var10) {
+                        long var21 = var33 - field126;
+                        if (var21 > 16777215L) {
                            var21 = 16777215L;
                         }
 
-                        __client_pp = var19;
-                        var14.packetBuffer.__ai_315(KeyHandler.__an_cp[var5]);
-                        var14.packetBuffer.writeMedium((int)var21);
+                        field126 = var33;
+                        var6.packetBuffer.method56(KeyHandler.field451[var10]);
+                        var6.packetBuffer.writeMedium((int)var21);
                      }
 
-                     var14.packetBuffer.__y_299(var14.packetBuffer.index - var15);
-                     packetWriter.__q_167(var14);
+                     var6.packetBuffer.writeLengthShort(var6.packetBuffer.index - var7);
+                     packetWriter.method241(var6);
                   }
 
-                  if(__client_iy > 0) {
-                     --__client_iy;
+                  if (field200 > 0) {
+                     --field200;
                   }
 
-                  if(KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) {
-                     __client_is = true;
+                  if (KeyHandler.KeyHandler_pressedKeys[96] || KeyHandler.KeyHandler_pressedKeys[97] || KeyHandler.KeyHandler_pressedKeys[98] || KeyHandler.KeyHandler_pressedKeys[99]) {
+                     field201 = true;
                   }
 
-                  if(__client_is && __client_iy <= 0) {
-                     __client_iy = 20;
-                     __client_is = false;
-                     var14 = Interpreter.method1915(ClientPacket.__gs_at, packetWriter.isaacCipher);
-                     var14.packetBuffer.__bx_323(cameraPitchTarget);
-                     var14.packetBuffer.writeShortLE(minimapOrientation);
-                     packetWriter.__q_167(var14);
+                  if (field201 && field200 <= 0) {
+                     field200 = 20;
+                     field201 = false;
+                     var6 = Interpreter.method1915(ClientPacket.field261, packetWriter.isaacCipher);
+                     var6.packetBuffer.method64(camAngleX);
+                     var6.packetBuffer.writeShortLE(camAngleY);
+                     packetWriter.method241(var6);
                   }
 
-                  if(class230.__hy_az && !__client_cw) {
-                     __client_cw = true;
-                     var14 = Interpreter.method1915(ClientPacket.__gs_bf, packetWriter.isaacCipher);
-                     var14.packetBuffer.writeByte(1);
-                     packetWriter.__q_167(var14);
+                  if (class230.field1138 && !field166) {
+                     field166 = true;
+                     var6 = Interpreter.method1915(ClientPacket.field295, packetWriter.isaacCipher);
+                     var6.packetBuffer.writeByte(1);
+                     packetWriter.method241(var6);
                   }
 
-                  if(!class230.__hy_az && __client_cw) {
-                     __client_cw = false;
-                     var14 = Interpreter.method1915(ClientPacket.__gs_bf, packetWriter.isaacCipher);
-                     var14.packetBuffer.writeByte(0);
-                     packetWriter.__q_167(var14);
+                  if (!class230.field1138 && field166) {
+                     field166 = false;
+                     var6 = Interpreter.method1915(ClientPacket.field295, packetWriter.isaacCipher);
+                     var6.packetBuffer.writeByte(0);
+                     packetWriter.method241(var6);
                   }
 
-                  if(class60.worldMap0 != null) {
-                     class60.worldMap0.__f_518();
+                  if (class60.worldMap0 != null) {
+                     class60.worldMap0.method360();
                   }
 
-                  class266.method5120();
+                  HorizontalAlignment.method5120();
                   Message.method1228();
-                  if(gameState != 30) {
+                  if (gameState != 30) {
                      return;
                   }
 
                   Canvas.method855();
                   WorldMapIcon1.method212();
-                  ++packetWriter.__x;
-                  if(packetWriter.__x > 750) {
+                  ++packetWriter.field674;
+                  if (packetWriter.field674 > 750) {
                      class48.method868();
                      return;
                   }
 
                   var1 = Players.Players_count;
-                  int[] var31 = Players.Players_indices;
+                  int[] var34 = Players.Players_indices;
 
-                  for(var3 = 0; var3 < var1; ++var3) {
-                     Player var23 = players[var31[var3]];
-                     if(var23 != null) {
-                        class65.method1232(var23, 1);
+                  for (var4 = 0; var4 < var1; ++var4) {
+                     Player var22 = players[var34[var4]];
+                     if (var22 != null) {
+                        class65.method1232(var22, 1);
                      }
                   }
 
-                  for(var1 = 0; var1 < npcCount; ++var1) {
-                     var15 = npcIndices[var1];
-                     Npc var24 = npcs[var15];
-                     if(var24 != null) {
-                        class65.method1232(var24, var24.definition.size);
+                  for (var1 = 0; var1 < npcCount; ++var1) {
+                     var7 = npcIndices[var1];
+                     NPC var35 = npcs[var7];
+                     if (var35 != null) {
+                        class65.method1232(var35, var35.definition.size);
                      }
                   }
 
                   Buddy.processOverheadText();
-                  ++__client_gy;
-                  if(mouseCrossColor != 0) {
+                  ++field183;
+                  if (mouseCrossColor != 0) {
                      mouseCrossState += 20;
-                     if(mouseCrossState >= 400) {
+                     if (mouseCrossState >= 400) {
                         mouseCrossColor = 0;
                      }
                   }
 
-                  if(BoundaryObject.__ej_jv != null) {
-                     ++__client_ju;
-                     if(__client_ju >= 15) {
-                        class22.method295(BoundaryObject.__ej_jv);
-                        BoundaryObject.__ej_jv = null;
+                  if (BoundaryObject.field40 != null) {
+                     ++field203;
+                     if (field203 >= 15) {
+                        WorldMapRectangle.method295(BoundaryObject.field40);
+                        BoundaryObject.field40 = null;
                      }
                   }
 
-                  Widget var35 = Clock.mousedOverWidgetIf1;
-                  Widget var32 = AccessFile.__dk_lm;
+                  Widget var36 = Clock.mousedOverWidgetIf1;
+                  Widget var23 = AccessFile.field8;
                   Clock.mousedOverWidgetIf1 = null;
-                  AccessFile.__dk_lm = null;
+                  AccessFile.field8 = null;
                   draggedOnWidget = null;
-                  __client_nt = false;
-                  __client_nn = false;
-                  __client_pm = 0;
+                  field103 = false;
+                  field106 = false;
+                  field137 = 0;
 
-                  while(Decimator.method2490() && __client_pm < 128) {
-                     if(rights >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && IndexStoreAction.__ik_cn == 66) {
-                        String var37 = KeyHandler.method839();
-                        TextureProvider.client.clipboardSetString(var37);
-                     } else if(oculusOrbState != 1 || GzipDecompressor.__go_ck <= 0) {
-                        __client_pn[__client_pm] = IndexStoreAction.__ik_cn;
-                        __client_pq[__client_pm] = GzipDecompressor.__go_ck;
-                        ++__client_pm;
+                  while (Decimator.method2490() && field137 < 128) {
+                     if (staffModLevel >= 2 && KeyHandler.KeyHandler_pressedKeys[82] && ArchiveDiskAction.field411 == 66) {
+                        String var24 = KeyHandler.method839();
+                        TextureProvider.client.clipboardSetString(var24);
+                     } else if (oculusOrbState != 1 || GzipDecompressor.field378 <= 0) {
+                        field145[field137] = ArchiveDiskAction.field411;
+                        field146[field137] = GzipDecompressor.field378;
+                        ++field137;
                      }
                   }
 
-                  if(FriendSystem.jmodCheck() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) {
-                     var3 = Canvas.localPlayer.plane - mouseWheelRotation;
-                     if(var3 < 0) {
-                        var3 = 0;
-                     } else if(var3 > 3) {
-                        var3 = 3;
+                  if (FriendSystem.jmodCheck() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81] && mouseWheelRotation != 0) {
+                     var4 = Canvas.localPlayer.plane - mouseWheelRotation;
+                     if (var4 < 0) {
+                        var4 = 0;
+                     } else if (var4 > 3) {
+                        var4 = 3;
                      }
 
-                     if(var3 != Canvas.localPlayer.plane) {
-                        var4 = Canvas.localPlayer.pathX[0] + class50.baseX;
-                        var5 = Canvas.localPlayer.pathY[0] + GraphicsObject.baseY;
-                        var18 = Interpreter.method1915(ClientPacket.__gs_bx, packetWriter.isaacCipher);
+                     if (var4 != Canvas.localPlayer.plane) {
+                        var9 = Canvas.localPlayer.pathX[0] + class50.baseX;
+                        var10 = Canvas.localPlayer.pathY[0] + GraphicsObject.baseY;
+                        var18 = Interpreter.method1915(ClientPacket.field283, packetWriter.isaacCipher);
                         var18.packetBuffer.writeIntME(0);
-                        var18.packetBuffer.writeShortLE(var5);
-                        var18.packetBuffer.__ai_315(var3);
-                        var18.packetBuffer.writeShort(var4);
-                        packetWriter.__q_167(var18);
+                        var18.packetBuffer.writeShortLE(var10);
+                        var18.packetBuffer.method56(var4);
+                        var18.packetBuffer.writeShort(var9);
+                        packetWriter.method241(var18);
                      }
 
                      mouseWheelRotation = 0;
                   }
 
-                  if(rootWidgetGroup != -1) {
-                     class231.method4517(rootWidgetGroup, 0, 0, SoundCache.canvasWidth, Huffman.canvasHeight, 0, 0);
+                  if (rootInterface != -1) {
+                     WorldMapDecorationType.method4517(rootInterface, 0, 0, SoundCache.canvasWidth, Huffman.canvasHeight, 0, 0);
                   }
 
                   ++cycleCntr;
 
-                  while(true) {
-                     Widget var25;
-                     Widget var36;
-                     ScriptEvent var38;
+                  while (true) {
+                     ScriptEvent var25;
+                     Widget var26;
+                     Widget var37;
                      do {
-                        var38 = (ScriptEvent)__client_oh.removeLast();
-                        if(var38 == null) {
-                           while(true) {
+                        var25 = (ScriptEvent)field147.removeLast();
+                        if (var25 == null) {
+                           while (true) {
                               do {
-                                 var38 = (ScriptEvent)__client_oc.removeLast();
-                                 if(var38 == null) {
-                                    while(true) {
+                                 var25 = (ScriptEvent)field148.removeLast();
+                                 if (var25 == null) {
+                                    while (true) {
                                        do {
-                                          var38 = (ScriptEvent)scriptEvents.removeLast();
-                                          if(var38 == null) {
-                                             this.__hi_139();
+                                          var25 = (ScriptEvent)scriptEvents.removeLast();
+                                          if (var25 == null) {
+                                             this.method86();
                                              WorldMapSectionType.method254();
-                                             if(clickedWidget != null) {
-                                                this.__jh_142();
+                                             if (clickedWidget != null) {
+                                                this.method88();
                                              }
 
-                                             PacketBufferNode var40;
-                                             if(DevicePcmPlayerProvider.dragInventoryWidget != null) {
-                                                class22.method295(DevicePcmPlayerProvider.dragInventoryWidget);
+                                             PacketBufferNode var27;
+                                             if (DevicePcmPlayerProvider.dragInventoryWidget != null) {
+                                                WorldMapRectangle.method295(DevicePcmPlayerProvider.dragInventoryWidget);
                                                 ++itemDragDuration;
-                                                if(MouseHandler.MouseHandler_currentButton == 0) {
-                                                   if(__client_jl) {
-                                                      if(UserComparator6.__fg_jh == DevicePcmPlayerProvider.dragInventoryWidget && dragItemSlotSource != dragItemSlotDestination) {
-                                                         Widget var39 = DevicePcmPlayerProvider.dragInventoryWidget;
-                                                         byte var33 = 0;
-                                                         if(__client_mb == 1 && var39.contentType == 206) {
-                                                            var33 = 1;
+                                                if (MouseHandler.MouseHandler_currentButton == 0) {
+                                                   if (field207) {
+                                                      if (UserComparator6.field937 == DevicePcmPlayerProvider.dragInventoryWidget && dragItemSlotSource != dragItemSlotDestination) {
+                                                         Widget var28 = DevicePcmPlayerProvider.dragInventoryWidget;
+                                                         byte var29 = 0;
+                                                         if (field136 == 1 && var28.contentType == 206) {
+                                                            var29 = 1;
                                                          }
 
-                                                         if(var39.itemIds[dragItemSlotDestination] <= 0) {
-                                                            var33 = 0;
+                                                         if (var28.itemIds[dragItemSlotDestination] <= 0) {
+                                                            var29 = 0;
                                                          }
 
-                                                         if(class168.method3461(class1.getWidgetClickMask(var39))) {
-                                                            var5 = dragItemSlotSource;
-                                                            var6 = dragItemSlotDestination;
-                                                            var39.itemIds[var6] = var39.itemIds[var5];
-                                                            var39.itemQuantities[var6] = var39.itemQuantities[var5];
-                                                            var39.itemIds[var5] = -1;
-                                                            var39.itemQuantities[var5] = 0;
-                                                         } else if(var33 == 1) {
-                                                            var5 = dragItemSlotSource;
-                                                            var6 = dragItemSlotDestination;
+                                                         if (class168.method3461(class1.getWidgetClickMask(var28))) {
+                                                            var10 = dragItemSlotSource;
+                                                            var11 = dragItemSlotDestination;
+                                                            var28.itemIds[var11] = var28.itemIds[var10];
+                                                            var28.itemQuantities[var11] = var28.itemQuantities[var10];
+                                                            var28.itemIds[var10] = -1;
+                                                            var28.itemQuantities[var10] = 0;
+                                                         } else if (var29 == 1) {
+                                                            var10 = dragItemSlotSource;
+                                                            var11 = dragItemSlotDestination;
 
-                                                            while(var5 != var6) {
-                                                               if(var5 > var6) {
-                                                                  var39.swapItems(var5 - 1, var5);
-                                                                  --var5;
-                                                               } else if(var5 < var6) {
-                                                                  var39.swapItems(var5 + 1, var5);
-                                                                  ++var5;
+                                                            while (var10 != var11) {
+                                                               if (var10 > var11) {
+                                                                  var28.swapItems(var10 - 1, var10);
+                                                                  --var10;
+                                                               } else if (var10 < var11) {
+                                                                  var28.swapItems(var10 + 1, var10);
+                                                                  ++var10;
                                                                }
                                                             }
                                                          } else {
-                                                            var39.swapItems(dragItemSlotDestination, dragItemSlotSource);
+                                                            var28.swapItems(dragItemSlotDestination, dragItemSlotSource);
                                                          }
 
-                                                         var40 = Interpreter.method1915(ClientPacket.__gs_ce, packetWriter.isaacCipher);
-                                                         var40.packetBuffer.writeShort(dragItemSlotDestination);
-                                                         var40.packetBuffer.writeShortLE(dragItemSlotSource);
-                                                         var40.packetBuffer.writeInt(DevicePcmPlayerProvider.dragInventoryWidget.id);
-                                                         var40.packetBuffer.__ai_315(var33);
-                                                         packetWriter.__q_167(var40);
+                                                         var27 = Interpreter.method1915(ClientPacket.field302, packetWriter.isaacCipher);
+                                                         var27.packetBuffer.writeShort(dragItemSlotDestination);
+                                                         var27.packetBuffer.writeShortLE(dragItemSlotSource);
+                                                         var27.packetBuffer.writeInt(DevicePcmPlayerProvider.dragInventoryWidget.id);
+                                                         var27.packetBuffer.method56(var29);
+                                                         packetWriter.method241(var27);
                                                       }
-                                                   } else if(this.shouldLeftClickOpenMenu()) {
-                                                      this.openMenu(__client_ja, __client_je);
-                                                   } else if(menuOptionsCount > 0) {
-                                                      var3 = __client_ja;
-                                                      var4 = __client_je;
-                                                      class231.processTempMenuAction(UnitPriceComparator.tempMenuAction, var3, var4);
-                                                      UnitPriceComparator.tempMenuAction = null;
+                                                   } else if (this.shouldLeftClickOpenMenu()) {
+                                                      this.openMenu(field205, field206);
+                                                   } else if (menuOptionsCount > 0) {
+                                                      var4 = field205;
+                                                      var9 = field206;
+                                                      WorldMapDecorationType.processTempMenuAction(GrandExchangeOfferUnitPriceComparator.tempMenuAction, var4, var9);
+                                                      GrandExchangeOfferUnitPriceComparator.tempMenuAction = null;
                                                    }
 
-                                                   __client_ju = 10;
+                                                   field203 = 10;
                                                    MouseHandler.MouseHandler_lastButton = 0;
                                                    DevicePcmPlayerProvider.dragInventoryWidget = null;
-                                                } else if(itemDragDuration >= 5 && (MouseHandler.MouseHandler_x > __client_ja + 5 || MouseHandler.MouseHandler_x < __client_ja - 5 || MouseHandler.MouseHandler_y > __client_je + 5 || MouseHandler.MouseHandler_y < __client_je - 5)) {
-                                                   __client_jl = true;
+                                                } else if (itemDragDuration >= 5 && (MouseHandler.MouseHandler_x > field205 + 5 || MouseHandler.MouseHandler_x < field205 - 5 || MouseHandler.MouseHandler_y > field206 + 5 || MouseHandler.MouseHandler_y < field206 - 5)) {
+                                                   field207 = true;
                                                 }
                                              }
 
-                                             if(Scene.method3187()) {
-                                                var3 = Scene.Scene_selectedX;
-                                                var4 = Scene.Scene_selectedY;
-                                                var40 = Interpreter.method1915(ClientPacket.__gs_ct, packetWriter.isaacCipher);
-                                                var40.packetBuffer.writeByte(5);
-                                                var40.packetBuffer.__bo_322(var4 + GraphicsObject.baseY);
-                                                var40.packetBuffer.__bo_322(var3 + class50.baseX);
-                                                var40.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?(KeyHandler.KeyHandler_pressedKeys[81]?2:1):0);
-                                                packetWriter.__q_167(var40);
+                                             if (Scene.method3187()) {
+                                                var4 = Scene.Scene_selectedX;
+                                                var9 = Scene.Scene_selectedY;
+                                                var27 = Interpreter.method1915(ClientPacket.field318, packetWriter.isaacCipher);
+                                                var27.packetBuffer.writeByte(5);
+                                                var27.packetBuffer.method63(var9 + GraphicsObject.baseY);
+                                                var27.packetBuffer.method63(var4 + class50.baseX);
+                                                var27.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0);
+                                                packetWriter.method241(var27);
                                                 Scene.method3103();
                                                 mouseCrossX = MouseHandler.MouseHandler_lastPressedX;
                                                 mouseCrossY = MouseHandler.MouseHandler_lastPressedY;
                                                 mouseCrossColor = 1;
                                                 mouseCrossState = 0;
-                                                destinationX = var3;
-                                                destinationY = var4;
+                                                destinationX = var4;
+                                                destinationY = var9;
                                              }
 
-                                             if(var35 != Clock.mousedOverWidgetIf1) {
-                                                if(var35 != null) {
-                                                   class22.method295(var35);
+                                             if (var36 != Clock.mousedOverWidgetIf1) {
+                                                if (var36 != null) {
+                                                   WorldMapRectangle.method295(var36);
                                                 }
 
-                                                if(Clock.mousedOverWidgetIf1 != null) {
-                                                   class22.method295(Clock.mousedOverWidgetIf1);
+                                                if (Clock.mousedOverWidgetIf1 != null) {
+                                                   WorldMapRectangle.method295(Clock.mousedOverWidgetIf1);
                                                 }
                                              }
 
-                                             if(var32 != AccessFile.__dk_lm && __client_lb == __client_ls) {
-                                                if(var32 != null) {
-                                                   class22.method295(var32);
+                                             if (var23 != AccessFile.field8 && field218 == field219) {
+                                                if (var23 != null) {
+                                                   WorldMapRectangle.method295(var23);
                                                 }
 
-                                                if(AccessFile.__dk_lm != null) {
-                                                   class22.method295(AccessFile.__dk_lm);
+                                                if (AccessFile.field8 != null) {
+                                                   WorldMapRectangle.method295(AccessFile.field8);
                                                 }
                                              }
 
-                                             if(AccessFile.__dk_lm != null) {
-                                                if(__client_lb < __client_ls) {
-                                                   ++__client_lb;
-                                                   if(__client_ls == __client_lb) {
-                                                      class22.method295(AccessFile.__dk_lm);
+                                             if (AccessFile.field8 != null) {
+                                                if (field218 < field219) {
+                                                   ++field218;
+                                                   if (field219 == field218) {
+                                                      WorldMapRectangle.method295(AccessFile.field8);
                                                    }
                                                 }
-                                             } else if(__client_lb > 0) {
-                                                --__client_lb;
+                                             } else if (field218 > 0) {
+                                                --field218;
                                              }
 
                                              class54.method1091();
-                                             if(isCameraLocked) {
-                                                var3 = class3.__w_qs * 128 + 64;
-                                                var4 = MusicPatchPcmStream.__hq_qg * 128 + 64;
-                                                var5 = class32.getTileHeight(var3, var4, SoundSystem.plane) - AbstractWorldMapIcon.__ak_qj;
-                                                if(WorldMapSection1.cameraX < var3) {
-                                                   WorldMapSection1.cameraX = (var3 - WorldMapSection1.cameraX) * class30.__ar_qw / 1000 + WorldMapSection1.cameraX + ClientPacket.__gs_qh;
-                                                   if(WorldMapSection1.cameraX > var3) {
-                                                      WorldMapSection1.cameraX = var3;
+                                             if (isCameraLocked) {
+                                                var4 = class3.field1146 * 128 + 64;
+                                                var9 = MusicPatchPcmStream.field602 * 128 + 64;
+                                                var10 = class32.getTileHeight(var4, var9, SoundSystem.plane) - AbstractWorldMapIcon.field4;
+                                                if (WorldMapSection2.cameraX < var4) {
+                                                   WorldMapSection2.cameraX = (var4 - WorldMapSection2.cameraX) * class30.field1148 / 1000 + WorldMapSection2.cameraX + ClientPacket.field221;
+                                                   if (WorldMapSection2.cameraX > var4) {
+                                                      WorldMapSection2.cameraX = var4;
                                                    }
                                                 }
 
-                                                if(WorldMapSection1.cameraX > var3) {
-                                                   WorldMapSection1.cameraX -= class30.__ar_qw * (WorldMapSection1.cameraX - var3) / 1000 + ClientPacket.__gs_qh;
-                                                   if(WorldMapSection1.cameraX < var3) {
-                                                      WorldMapSection1.cameraX = var3;
+                                                if (WorldMapSection2.cameraX > var4) {
+                                                   WorldMapSection2.cameraX -= class30.field1148 * (WorldMapSection2.cameraX - var4) / 1000 + ClientPacket.field221;
+                                                   if (WorldMapSection2.cameraX < var4) {
+                                                      WorldMapSection2.cameraX = var4;
                                                    }
                                                 }
 
-                                                if(GrandExchangeEvents.cameraY < var5) {
-                                                   GrandExchangeEvents.cameraY = (var5 - GrandExchangeEvents.cameraY) * class30.__ar_qw / 1000 + GrandExchangeEvents.cameraY + ClientPacket.__gs_qh;
-                                                   if(GrandExchangeEvents.cameraY > var5) {
-                                                      GrandExchangeEvents.cameraY = var5;
+                                                if (GrandExchangeEvents.cameraY < var10) {
+                                                   GrandExchangeEvents.cameraY = (var10 - GrandExchangeEvents.cameraY) * class30.field1148 / 1000 + GrandExchangeEvents.cameraY + ClientPacket.field221;
+                                                   if (GrandExchangeEvents.cameraY > var10) {
+                                                      GrandExchangeEvents.cameraY = var10;
                                                    }
                                                 }
 
-                                                if(GrandExchangeEvents.cameraY > var5) {
-                                                   GrandExchangeEvents.cameraY -= class30.__ar_qw * (GrandExchangeEvents.cameraY - var5) / 1000 + ClientPacket.__gs_qh;
-                                                   if(GrandExchangeEvents.cameraY < var5) {
-                                                      GrandExchangeEvents.cameraY = var5;
+                                                if (GrandExchangeEvents.cameraY > var10) {
+                                                   GrandExchangeEvents.cameraY -= class30.field1148 * (GrandExchangeEvents.cameraY - var10) / 1000 + ClientPacket.field221;
+                                                   if (GrandExchangeEvents.cameraY < var10) {
+                                                      GrandExchangeEvents.cameraY = var10;
                                                    }
                                                 }
 
-                                                if(class11.cameraZ < var4) {
-                                                   class11.cameraZ = (var4 - class11.cameraZ) * class30.__ar_qw / 1000 + class11.cameraZ + ClientPacket.__gs_qh;
-                                                   if(class11.cameraZ > var4) {
-                                                      class11.cameraZ = var4;
+                                                if (GrandExchangeOfferNameComparator.cameraZ < var9) {
+                                                   GrandExchangeOfferNameComparator.cameraZ = (var9 - GrandExchangeOfferNameComparator.cameraZ) * class30.field1148 / 1000 + GrandExchangeOfferNameComparator.cameraZ + ClientPacket.field221;
+                                                   if (GrandExchangeOfferNameComparator.cameraZ > var9) {
+                                                      GrandExchangeOfferNameComparator.cameraZ = var9;
                                                    }
                                                 }
 
-                                                if(class11.cameraZ > var4) {
-                                                   class11.cameraZ -= class30.__ar_qw * (class11.cameraZ - var4) / 1000 + ClientPacket.__gs_qh;
-                                                   if(class11.cameraZ < var4) {
-                                                      class11.cameraZ = var4;
+                                                if (GrandExchangeOfferNameComparator.cameraZ > var9) {
+                                                   GrandExchangeOfferNameComparator.cameraZ -= class30.field1148 * (GrandExchangeOfferNameComparator.cameraZ - var9) / 1000 + ClientPacket.field221;
+                                                   if (GrandExchangeOfferNameComparator.cameraZ < var9) {
+                                                      GrandExchangeOfferNameComparator.cameraZ = var9;
                                                    }
                                                 }
 
-                                                var3 = GrandExchangeOffer.__x_rg * 128 + 64;
-                                                var4 = KeyHandler.__an_ra * 128 + 64;
-                                                var5 = class32.getTileHeight(var3, var4, SoundSystem.plane) - IndexStoreAction.__ik_rt;
-                                                var6 = var3 - WorldMapSection1.cameraX;
-                                                var7 = var5 - GrandExchangeEvents.cameraY;
-                                                var8 = var4 - class11.cameraZ;
-                                                var9 = (int)Math.sqrt((double)(var8 * var8 + var6 * var6));
-                                                var10 = (int)(Math.atan2((double)var7, (double)var9) * 325.949D) & 2047;
-                                                var11 = (int)(Math.atan2((double)var6, (double)var8) * -325.949D) & 2047;
-                                                if(var10 < 128) {
-                                                   var10 = 128;
+                                                var4 = GrandExchangeOffer.field376 * 128 + 64;
+                                                var9 = KeyHandler.field445 * 128 + 64;
+                                                var10 = class32.getTileHeight(var4, var9, SoundSystem.plane) - ArchiveDiskAction.field410;
+                                                var11 = var4 - WorldMapSection2.cameraX;
+                                                var12 = var10 - GrandExchangeEvents.cameraY;
+                                                var13 = var9 - GrandExchangeOfferNameComparator.cameraZ;
+                                                var14 = (int)Math.sqrt((double)(var13 * var13 + var11 * var11));
+                                                var15 = (int)(Math.atan2((double)var12, (double)var14) * 325.949D) & 2047;
+                                                var16 = (int)(Math.atan2((double)var11, (double)var13) * -325.949D) & 2047;
+                                                if (var15 < 128) {
+                                                   var15 = 128;
                                                 }
 
-                                                if(var10 > 383) {
-                                                   var10 = 383;
+                                                if (var15 > 383) {
+                                                   var15 = 383;
                                                 }
 
-                                                if(WorldMapIcon1.cameraPitch < var10) {
-                                                   WorldMapIcon1.cameraPitch = (var10 - WorldMapIcon1.cameraPitch) * class171.__fo_ro / 1000 + WorldMapIcon1.cameraPitch + VertexNormal.__dq_rq;
-                                                   if(WorldMapIcon1.cameraPitch > var10) {
-                                                      WorldMapIcon1.cameraPitch = var10;
+                                                if (WorldMapIcon1.cameraPitch < var15) {
+                                                   WorldMapIcon1.cameraPitch = (var15 - WorldMapIcon1.cameraPitch) * class171.field1116 / 1000 + WorldMapIcon1.cameraPitch + VertexNormal.field946;
+                                                   if (WorldMapIcon1.cameraPitch > var15) {
+                                                      WorldMapIcon1.cameraPitch = var15;
                                                    }
                                                 }
 
-                                                if(WorldMapIcon1.cameraPitch > var10) {
-                                                   WorldMapIcon1.cameraPitch -= class171.__fo_ro * (WorldMapIcon1.cameraPitch - var10) / 1000 + VertexNormal.__dq_rq;
-                                                   if(WorldMapIcon1.cameraPitch < var10) {
-                                                      WorldMapIcon1.cameraPitch = var10;
+                                                if (WorldMapIcon1.cameraPitch > var15) {
+                                                   WorldMapIcon1.cameraPitch -= class171.field1116 * (WorldMapIcon1.cameraPitch - var15) / 1000 + VertexNormal.field946;
+                                                   if (WorldMapIcon1.cameraPitch < var15) {
+                                                      WorldMapIcon1.cameraPitch = var15;
                                                    }
                                                 }
 
-                                                var12 = var11 - MusicPatchNode.cameraYaw;
-                                                if(var12 > 1024) {
-                                                   var12 -= 2048;
+                                                var17 = var16 - MusicPatchNode.cameraYaw;
+                                                if (var17 > 1024) {
+                                                   var17 -= 2048;
                                                 }
 
-                                                if(var12 < -1024) {
-                                                   var12 += 2048;
+                                                if (var17 < -1024) {
+                                                   var17 += 2048;
                                                 }
 
-                                                if(var12 > 0) {
-                                                   MusicPatchNode.cameraYaw = MusicPatchNode.cameraYaw + VertexNormal.__dq_rq + var12 * class171.__fo_ro / 1000;
+                                                if (var17 > 0) {
+                                                   MusicPatchNode.cameraYaw = MusicPatchNode.cameraYaw + VertexNormal.field946 + var17 * class171.field1116 / 1000;
                                                    MusicPatchNode.cameraYaw &= 2047;
                                                 }
 
-                                                if(var12 < 0) {
-                                                   MusicPatchNode.cameraYaw -= VertexNormal.__dq_rq + -var12 * class171.__fo_ro / 1000;
+                                                if (var17 < 0) {
+                                                   MusicPatchNode.cameraYaw -= VertexNormal.field946 + -var17 * class171.field1116 / 1000;
                                                    MusicPatchNode.cameraYaw &= 2047;
                                                 }
 
-                                                int var26 = var11 - MusicPatchNode.cameraYaw;
-                                                if(var26 > 1024) {
-                                                   var26 -= 2048;
+                                                int var38 = var16 - MusicPatchNode.cameraYaw;
+                                                if (var38 > 1024) {
+                                                   var38 -= 2048;
                                                 }
 
-                                                if(var26 < -1024) {
-                                                   var26 += 2048;
+                                                if (var38 < -1024) {
+                                                   var38 += 2048;
                                                 }
 
-                                                if(var26 < 0 && var12 > 0 || var26 > 0 && var12 < 0) {
-                                                   MusicPatchNode.cameraYaw = var11;
+                                                if (var38 < 0 && var17 > 0 || var38 > 0 && var17 < 0) {
+                                                   MusicPatchNode.cameraYaw = var16;
                                                 }
                                              }
 
-                                             for(var3 = 0; var3 < 5; ++var3) {
-                                                ++__client_rk[var3];
+                                             for (var4 = 0; var4 < 5; ++var4) {
+                                                int var10003 = field144[var4]++;
                                              }
 
                                              class196.varcs.tryWrite();
-                                             var3 = class22.method297();
-                                             var4 = KeyHandler.KeyHandler_idleCycles;
-                                             if(var3 > 15000 && var4 > 15000) {
-                                                __client_fd = 250;
+                                             var4 = WorldMapRectangle.method297();
+                                             var9 = KeyHandler.KeyHandler_idleCycles;
+                                             if (var4 > 15000 && var9 > 15000) {
+                                                field175 = 250;
                                                 MouseHandler.MouseHandler_idleCycles = 14500;
-                                                var18 = Interpreter.method1915(ClientPacket.__gs_ax, packetWriter.isaacCipher);
-                                                packetWriter.__q_167(var18);
+                                                var18 = Interpreter.method1915(ClientPacket.field271, packetWriter.isaacCipher);
+                                                packetWriter.method241(var18);
                                              }
 
-                                             WorldMapArea.friendSystem.__w_154();
-                                             ++packetWriter.__d;
-                                             if(packetWriter.__d > 50) {
-                                                var18 = Interpreter.method1915(ClientPacket.__gs_c, packetWriter.isaacCipher);
-                                                packetWriter.__q_167(var18);
+                                             WorldMapArea.friendSystem.method102();
+                                             ++packetWriter.field675;
+                                             if (packetWriter.field675 > 50) {
+                                                var18 = Interpreter.method1915(ClientPacket.field244, packetWriter.isaacCipher);
+                                                packetWriter.method241(var18);
                                              }
 
                                              try {
-                                                packetWriter.__f_166();
-                                             } catch (IOException var27) {
+                                                packetWriter.method240();
+                                             } catch (IOException var30) {
                                                 class48.method868();
                                              }
 
                                              return;
                                           }
 
-                                          var36 = var38.widget;
-                                          if(var36.childIndex < 0) {
+                                          var37 = var25.widget;
+                                          if (var37.childIndex < 0) {
                                              break;
                                           }
 
-                                          var25 = Huffman.getWidget(var36.parentId);
-                                       } while(var25 == null || var25.children == null || var36.childIndex >= var25.children.length || var36 != var25.children[var36.childIndex]);
+                                          var26 = Huffman.getWidget(var37.parentId);
+                                       } while(var26 == null || var26.children == null || var37.childIndex >= var26.children.length || var37 != var26.children[var37.childIndex]);
 
-                                       AbstractIndexCache.runScript(var38);
+                                       AbstractArchive.runScript(var25);
                                     }
                                  }
 
-                                 var36 = var38.widget;
-                                 if(var36.childIndex < 0) {
+                                 var37 = var25.widget;
+                                 if (var37.childIndex < 0) {
                                     break;
                                  }
 
-                                 var25 = Huffman.getWidget(var36.parentId);
-                              } while(var25 == null || var25.children == null || var36.childIndex >= var25.children.length || var36 != var25.children[var36.childIndex]);
+                                 var26 = Huffman.getWidget(var37.parentId);
+                              } while(var26 == null || var26.children == null || var37.childIndex >= var26.children.length || var37 != var26.children[var37.childIndex]);
 
-                              AbstractIndexCache.runScript(var38);
+                              AbstractArchive.runScript(var25);
                            }
                         }
 
-                        var36 = var38.widget;
-                        if(var36.childIndex < 0) {
+                        var37 = var25.widget;
+                        if (var37.childIndex < 0) {
                            break;
                         }
 
-                        var25 = Huffman.getWidget(var36.parentId);
-                     } while(var25 == null || var25.children == null || var36.childIndex >= var25.children.length || var36 != var25.children[var36.childIndex]);
+                        var26 = Huffman.getWidget(var37.parentId);
+                     } while(var26 == null || var26.children == null || var37.childIndex >= var26.children.length || var37 != var26.children[var37.childIndex]);
 
-                     AbstractIndexCache.runScript(var38);
+                     AbstractArchive.runScript(var25);
                   }
                }
 
-               var30 = Interpreter.method1915(ClientPacket.__gs_cw, packetWriter.isaacCipher);
-               var30.packetBuffer.writeByte(0);
-               var3 = var30.packetBuffer.index;
-               WorldMapLabel.method443(var30.packetBuffer);
-               var30.packetBuffer.__h_300(var30.packetBuffer.index - var3);
-               packetWriter.__q_167(var30);
+               var5 = Interpreter.method1915(ClientPacket.field313, packetWriter.isaacCipher);
+               var5.packetBuffer.writeByte(0);
+               var4 = var5.packetBuffer.index;
+               WorldMapLabel.method443(var5.packetBuffer);
+               var5.packetBuffer.writeLengthByte(var5.packetBuffer.index - var4);
+               packetWriter.method241(var5);
             }
          }
       }
+
    }
 
    @ObfuscatedName("ge")
@@ -4516,24 +4281,23 @@ public final class Client extends GameShell implements Usernamed {
       signature = "(I)V",
       garbageValue = "-1792846917"
    )
-   void __ge_137() {
+   void method84() {
       int var1 = SoundCache.canvasWidth;
       int var2 = Huffman.canvasHeight;
-      if(super.contentWidth < var1) {
+      if (super.contentWidth < var1) {
          var1 = super.contentWidth;
       }
 
-      if(super.contentHeight < var2) {
+      if (super.contentHeight < var2) {
          var2 = super.contentHeight;
       }
 
-      if(ReflectionCheck.clientPreferences != null) {
+      if (ReflectionCheck.clientPreferences != null) {
          try {
             Client var3 = TextureProvider.client;
-            Object[] var4 = new Object[]{Integer.valueOf(SpotAnimationDefinition.method4822())};
+            Object[] var4 = new Object[]{SpotAnimationDefinition.getWindowedMode()};
             JSObject.getWindow(var3).call("resize", var4);
          } catch (Throwable var5) {
-            ;
          }
       }
 
@@ -4546,36 +4310,36 @@ public final class Client extends GameShell implements Usernamed {
    )
    @Export("drawLoggedIn")
    final void drawLoggedIn() {
-      if(rootWidgetGroup != -1) {
-         ClientPreferences.method1809(rootWidgetGroup);
+      if (rootInterface != -1) {
+         ClientPreferences.method1809(rootInterface);
       }
 
       int var1;
-      for(var1 = 0; var1 < rootWidgetCount; ++var1) {
-         if(__client_od[var1]) {
-            __client_ot[var1] = true;
+      for (var1 = 0; var1 < rootWidgetCount; ++var1) {
+         if (field100[var1]) {
+            field102[var1] = true;
          }
 
-         __client_oq[var1] = __client_od[var1];
-         __client_od[var1] = false;
+         field101[var1] = field100[var1];
+         field100[var1] = false;
       }
 
-      __client_oo = cycle;
-      __client_lq = -1;
-      __client_ln = -1;
-      UserComparator6.__fg_jh = null;
-      if(rootWidgetGroup != -1) {
+      field98 = cycle;
+      field216 = -1;
+      field217 = -1;
+      UserComparator6.field937 = null;
+      if (rootInterface != -1) {
          rootWidgetCount = 0;
-         Interpreter.drawWidgets(rootWidgetGroup, 0, 0, SoundCache.canvasWidth, Huffman.canvasHeight, 0, 0, -1);
+         Interpreter.drawWidgets(rootInterface, 0, 0, SoundCache.canvasWidth, Huffman.canvasHeight, 0, 0, -1);
       }
 
       Rasterizer2D.Rasterizer2D_resetClip();
-      if(showMouseCross) {
-         if(mouseCrossColor == 1) {
+      if (showMouseCross) {
+         if (mouseCrossColor == 1) {
             KeyHandler.crossSprites[mouseCrossState / 100].drawAt2(mouseCrossX - 8, mouseCrossY - 8);
          }
 
-         if(mouseCrossColor == 2) {
+         if (mouseCrossColor == 2) {
             KeyHandler.crossSprites[mouseCrossState / 100 + 4].drawAt2(mouseCrossX - 8, mouseCrossY - 8);
          }
       }
@@ -4583,66 +4347,66 @@ public final class Client extends GameShell implements Usernamed {
       int var2;
       int var3;
       int var4;
+      int var5;
       int var6;
       int var7;
-      int var8;
-      if(!isMenuOpen) {
-         if(__client_lq != -1) {
-            class39.drawMenuActionTextAt(__client_lq, __client_ln);
+      if (!isMenuOpen) {
+         if (field216 != -1) {
+            class39.drawMenuActionTextAt(field216, field217);
          }
       } else {
-         var1 = class25.menuX;
+         var1 = WorldMapDecoration.menuX;
          var2 = GameShell.menuY;
          var3 = class214.menuWidth;
          var4 = AbstractWorldMapIcon.menuHeight;
-         int var5 = 0x5d5447;
-         Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, var5);
+         int var8 = 6116423;
+         Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, var8);
          Rasterizer2D.Rasterizer2D_fillRectangle(var1 + 1, var2 + 1, var3 - 2, 16, 0);
          Rasterizer2D.Rasterizer2D_drawRectangle(var1 + 1, var2 + 18, var3 - 2, var4 - 19, 0);
-         class2.fontBold12.draw("Choose Option", var1 + 3, var2 + 14, var5, -1);
-         var6 = MouseHandler.MouseHandler_x;
-         var7 = MouseHandler.MouseHandler_y;
+         class2.fontBold12.draw("Choose Option", var1 + 3, var2 + 14, var8, -1);
+         var5 = MouseHandler.MouseHandler_x;
+         var6 = MouseHandler.MouseHandler_y;
 
          int var9;
          int var10;
-         for(var8 = 0; var8 < menuOptionsCount; ++var8) {
-            var9 = var2 + (menuOptionsCount - 1 - var8) * 15 + 31;
-            var10 = 0xffffff;
-            if(var6 > var1 && var6 < var3 + var1 && var7 > var9 - 13 && var7 < var9 + 3) {
-               var10 = 0xffff00;
+         for (var7 = 0; var7 < menuOptionsCount; ++var7) {
+            var9 = var2 + (menuOptionsCount - 1 - var7) * 15 + 31;
+            var10 = 16777215;
+            if (var5 > var1 && var5 < var3 + var1 && var6 > var9 - 13 && var6 < var9 + 3) {
+               var10 = 16776960;
             }
 
             Font var11 = class2.fontBold12;
             String var12;
-            if(var8 < 0) {
+            if (var7 < 0) {
                var12 = "";
-            } else if(menuTargetNames[var8].length() > 0) {
-               var12 = menuActions[var8] + " " + menuTargetNames[var8];
+            } else if (menuTargetNames[var7].length() > 0) {
+               var12 = menuActions[var7] + " " + menuTargetNames[var7];
             } else {
-               var12 = menuActions[var8];
+               var12 = menuActions[var7];
             }
 
             var11.draw(var12, var1 + 3, var9, var10, 0);
          }
 
-         var8 = class25.menuX;
+         var7 = WorldMapDecoration.menuX;
          var9 = GameShell.menuY;
          var10 = class214.menuWidth;
-         int var13 = AbstractWorldMapIcon.menuHeight;
+         int var15 = AbstractWorldMapIcon.menuHeight;
 
-         for(int var14 = 0; var14 < rootWidgetCount; ++var14) {
-            if(rootWidgetXs[var14] + rootWidgetWidths[var14] > var8 && rootWidgetXs[var14] < var8 + var10 && rootWidgetYs[var14] + rootWidgetHeights[var14] > var9 && rootWidgetYs[var14] < var9 + var13) {
-               __client_ot[var14] = true;
+         for (int var18 = 0; var18 < rootWidgetCount; ++var18) {
+            if (rootWidgetXs[var18] + rootWidgetWidths[var18] > var7 && rootWidgetXs[var18] < var7 + var10 && rootWidgetYs[var18] + rootWidgetHeights[var18] > var9 && rootWidgetYs[var18] < var9 + var15) {
+               field102[var18] = true;
             }
          }
       }
 
-      if(gameDrawingMode == 3) {
-         for(var1 = 0; var1 < rootWidgetCount; ++var1) {
-            if(__client_oq[var1]) {
-               Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 0xff00ff, 128);
-            } else if(__client_ot[var1]) {
-               Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 0xff0000, 128);
+      if (gameDrawingMode == 3) {
+         for (var1 = 0; var1 < rootWidgetCount; ++var1) {
+            if (field101[var1]) {
+               Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711935, 128);
+            } else if (field102[var1]) {
+               Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 16711680, 128);
             }
          }
       }
@@ -4650,82 +4414,85 @@ public final class Client extends GameShell implements Usernamed {
       var1 = SoundSystem.plane;
       var2 = Canvas.localPlayer.x;
       var3 = Canvas.localPlayer.y;
-      var4 = __client_gy;
+      var4 = field183;
 
-      for(ObjectSound var15 = (ObjectSound)ObjectSound.objectSounds.last(); var15 != null; var15 = (ObjectSound)ObjectSound.objectSounds.previous()) {
-         if(var15.soundEffectId != -1 || var15.soundEffectIds != null) {
-            var6 = 0;
-            if(var2 > var15.__o) {
-               var6 += var2 - var15.__o;
-            } else if(var2 < var15.__q) {
-               var6 += var15.__q - var2;
+      for (ObjectSound var13 = (ObjectSound)ObjectSound.objectSounds.last(); var13 != null; var13 = (ObjectSound)ObjectSound.objectSounds.previous()) {
+         if (var13.soundEffectId != -1 || var13.soundEffectIds != null) {
+            var5 = 0;
+            if (var2 > var13.field650) {
+               var5 += var2 - var13.field650;
+            } else if (var2 < var13.field648) {
+               var5 += var13.field648 - var2;
             }
 
-            if(var3 > var15.__u) {
-               var6 += var3 - var15.__u;
-            } else if(var3 < var15.__w) {
-               var6 += var15.__w - var3;
+            if (var3 > var13.field651) {
+               var5 += var3 - var13.field651;
+            } else if (var3 < var13.field649) {
+               var5 += var13.field649 - var3;
             }
 
-            if(var6 - 64 <= var15.__g && __client_qc != 0 && var1 == var15.__f) {
-               var6 -= 64;
-               if(var6 < 0) {
-                  var6 = 0;
+            if (var5 - 64 <= var13.field652 && field115 != 0 && var1 == var13.field647) {
+               var5 -= 64;
+               if (var5 < 0) {
+                  var5 = 0;
                }
 
-               var7 = (var15.__g - var6) * __client_qc / var15.__g;
-               Object var10000;
-               if(var15.stream1 == null) {
-                  if(var15.soundEffectId >= 0) {
-                     var10000 = null;
-                     SoundEffect var16 = SoundEffect.readSoundEffect(class25.indexCache4, var15.soundEffectId, 0);
-                     if(var16 != null) {
-                        RawSound var17 = var16.toRawSound().resample(MilliClock.decimator);
-                        RawPcmStream var18 = RawPcmStream.createRawPcmStream(var17, 100, var7);
-                        var18.setNumLoops(-1);
-                        TaskHandler.pcmStreamMixer.addSubStream(var18);
-                        var15.stream1 = var18;
+               var6 = (var13.field652 - var5) * field115 / var13.field652;
+               Object var14;
+               SoundEffect var16;
+               RawSound var17;
+               RawPcmStream var19;
+               if (var13.stream1 == null) {
+                  if (var13.soundEffectId >= 0) {
+                     var14 = null;
+                     var16 = SoundEffect.readSoundEffect(WorldMapDecoration.archive4, var13.soundEffectId, 0);
+                     if (var16 != null) {
+                        var17 = var16.toRawSound().resample(MilliClock.decimator);
+                        var19 = RawPcmStream.createRawPcmStream(var17, 100, var6);
+                        var19.setNumLoops(-1);
+                        TaskHandler.pcmStreamMixer.addSubStream(var19);
+                        var13.stream1 = var19;
                      }
                   }
                } else {
-                  var15.stream1.__a_182(var7);
+                  var13.stream1.method265(var6);
                }
 
-               if(var15.stream2 == null) {
-                  if(var15.soundEffectIds != null && (var15.__n -= var4) <= 0) {
-                     var8 = (int)(Math.random() * (double)var15.soundEffectIds.length);
-                     var10000 = null;
-                     SoundEffect var20 = SoundEffect.readSoundEffect(class25.indexCache4, var15.soundEffectIds[var8], 0);
-                     if(var20 != null) {
-                        RawSound var21 = var20.toRawSound().resample(MilliClock.decimator);
-                        RawPcmStream var19 = RawPcmStream.createRawPcmStream(var21, 100, var7);
+               if (var13.stream2 == null) {
+                  if (var13.soundEffectIds != null && (var13.field655 -= var4) <= 0) {
+                     var7 = (int)(Math.random() * (double)var13.soundEffectIds.length);
+                     var14 = null;
+                     var16 = SoundEffect.readSoundEffect(WorldMapDecoration.archive4, var13.soundEffectIds[var7], 0);
+                     if (var16 != null) {
+                        var17 = var16.toRawSound().resample(MilliClock.decimator);
+                        var19 = RawPcmStream.createRawPcmStream(var17, 100, var6);
                         var19.setNumLoops(0);
                         TaskHandler.pcmStreamMixer.addSubStream(var19);
-                        var15.stream2 = var19;
-                        var15.__n = var15.__x + (int)(Math.random() * (double)(var15.__d - var15.__x));
+                        var13.stream2 = var19;
+                        var13.field655 = var13.field653 + (int)(Math.random() * (double)(var13.field654 - var13.field653));
                      }
                   }
                } else {
-                  var15.stream2.__a_182(var7);
-                  if(!var15.stream2.hasNext()) {
-                     var15.stream2 = null;
+                  var13.stream2.method265(var6);
+                  if (!var13.stream2.hasNext()) {
+                     var13.stream2 = null;
                   }
                }
             } else {
-               if(var15.stream1 != null) {
-                  TaskHandler.pcmStreamMixer.removeSubStream(var15.stream1);
-                  var15.stream1 = null;
+               if (var13.stream1 != null) {
+                  TaskHandler.pcmStreamMixer.removeSubStream(var13.stream1);
+                  var13.stream1 = null;
                }
 
-               if(var15.stream2 != null) {
-                  TaskHandler.pcmStreamMixer.removeSubStream(var15.stream2);
-                  var15.stream2 = null;
+               if (var13.stream2 != null) {
+                  TaskHandler.pcmStreamMixer.removeSubStream(var13.stream2);
+                  var13.stream2 = null;
                }
             }
          }
       }
 
-      __client_gy = 0;
+      field183 = 0;
    }
 
    @ObfuscatedName("hg")
@@ -4733,50 +4500,50 @@ public final class Client extends GameShell implements Usernamed {
       signature = "(Lcl;I)Z",
       garbageValue = "1488446149"
    )
-   final boolean __hg_138(PacketWriter var1) {
+   final boolean method85(PacketWriter var1) {
       AbstractSocket var2 = var1.getSocket();
       PacketBuffer var3 = var1.packetBuffer;
-      if(var2 == null) {
+      if (var2 == null) {
          return false;
       } else {
-         String var17;
-         int var18;
+         String var4;
+         int var5;
          try {
-            int var5;
-            if(var1.serverPacket0 == null) {
-               if(var1.__e) {
-                  if(!var2.isAvailable(1)) {
+            int var6;
+            if (var1.serverPacket0 == null) {
+               if (var1.field673) {
+                  if (!var2.isAvailable(1)) {
                      return false;
                   }
 
                   var2.read(var1.packetBuffer.array, 0, 1);
-                  var1.__x = 0;
-                  var1.__e = false;
+                  var1.field674 = 0;
+                  var1.field673 = false;
                }
 
                var3.index = 0;
-               if(var3.__ig_334()) {
-                  if(!var2.isAvailable(1)) {
+               if (var3.method236()) {
+                  if (!var2.isAvailable(1)) {
                      return false;
                   }
 
                   var2.read(var1.packetBuffer.array, 1, 1);
-                  var1.__x = 0;
+                  var1.field674 = 0;
                }
 
-               var1.__e = true;
-               ServerPacket[] var4 = class27.method429();
-               var5 = var3.readSmartByteShortIsaac();
-               if(var5 < 0 || var5 >= var4.length) {
-                  throw new IOException(var5 + " " + var3.index);
+               var1.field673 = true;
+               ServerPacket[] var7 = class27.method429();
+               var6 = var3.readSmartByteShortIsaac();
+               if (var6 < 0 || var6 >= var7.length) {
+                  throw new IOException(var6 + " " + var3.index);
                }
 
-               var1.serverPacket0 = var4[var5];
+               var1.serverPacket0 = var7[var6];
                var1.serverPacket0Length = var1.serverPacket0.length;
             }
 
-            if(var1.serverPacket0Length == -1) {
-               if(!var2.isAvailable(1)) {
+            if (var1.serverPacket0Length == -1) {
+               if (!var2.isAvailable(1)) {
                   return false;
                }
 
@@ -4784,61 +4551,61 @@ public final class Client extends GameShell implements Usernamed {
                var1.serverPacket0Length = var3.array[0] & 255;
             }
 
-            if(var1.serverPacket0Length == -2) {
-               if(!var2.isAvailable(2)) {
+            if (var1.serverPacket0Length == -2) {
+               if (!var2.isAvailable(2)) {
                   return false;
                }
 
                var1.getSocket().read(var3.array, 0, 2);
                var3.index = 0;
-               var1.serverPacket0Length = var3.__ag_302();
+               var1.serverPacket0Length = var3.readUnsignedShort();
             }
 
-            if(!var2.isAvailable(var1.serverPacket0Length)) {
+            if (!var2.isAvailable(var1.serverPacket0Length)) {
                return false;
             }
 
             var3.index = 0;
             var2.read(var3.array, 0, var1.serverPacket0Length);
-            var1.__x = 0;
-            timer.__m_453();
-            var1.__i = var1.__n;
-            var1.__n = var1.__k;
-            var1.__k = var1.serverPacket0;
-            if(ServerPacket.__ge_ax == var1.serverPacket0) {
+            var1.field674 = 0;
+            timer.method329();
+            var1.field678 = var1.field677;
+            var1.field677 = var1.field676;
+            var1.field676 = var1.serverPacket0;
+            if (ServerPacket.field838 == var1.serverPacket0) {
                class16.method189(class190.field2344);
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_be == var1.serverPacket0) {
+            if (ServerPacket.field864 == var1.serverPacket0) {
                isCameraLocked = true;
-               class3.__w_qs = var3.readUnsignedByte();
-               MusicPatchPcmStream.__hq_qg = var3.readUnsignedByte();
-               AbstractWorldMapIcon.__ak_qj = var3.__ag_302();
-               ClientPacket.__gs_qh = var3.readUnsignedByte();
-               class30.__ar_qw = var3.readUnsignedByte();
-               if(class30.__ar_qw >= 100) {
-                  WorldMapSection1.cameraX = class3.__w_qs * 128 + 64;
-                  class11.cameraZ = MusicPatchPcmStream.__hq_qg * 128 + 64;
-                  GrandExchangeEvents.cameraY = class32.getTileHeight(WorldMapSection1.cameraX, class11.cameraZ, SoundSystem.plane) - AbstractWorldMapIcon.__ak_qj;
+               class3.field1146 = var3.readUnsignedByte();
+               MusicPatchPcmStream.field602 = var3.readUnsignedByte();
+               AbstractWorldMapIcon.field4 = var3.readUnsignedShort();
+               ClientPacket.field221 = var3.readUnsignedByte();
+               class30.field1148 = var3.readUnsignedByte();
+               if (class30.field1148 >= 100) {
+                  WorldMapSection2.cameraX = class3.field1146 * 128 + 64;
+                  GrandExchangeOfferNameComparator.cameraZ = MusicPatchPcmStream.field602 * 128 + 64;
+                  GrandExchangeEvents.cameraY = class32.getTileHeight(WorldMapSection2.cameraX, GrandExchangeOfferNameComparator.cameraZ, SoundSystem.plane) - AbstractWorldMapIcon.field4;
                }
 
                var1.serverPacket0 = null;
                return true;
             }
 
-            int var16;
-            if(ServerPacket.__ge_aj == var1.serverPacket0) {
-               for(var16 = 0; var16 < players.length; ++var16) {
-                  if(players[var16] != null) {
-                     players[var16].sequence = -1;
+            int var38;
+            if (ServerPacket.field817 == var1.serverPacket0) {
+               for (var38 = 0; var38 < players.length; ++var38) {
+                  if (players[var38] != null) {
+                     players[var38].sequence = -1;
                   }
                }
 
-               for(var16 = 0; var16 < npcs.length; ++var16) {
-                  if(npcs[var16] != null) {
-                     npcs[var16].sequence = -1;
+               for (var38 = 0; var38 < npcs.length; ++var38) {
+                  if (npcs[var38] != null) {
+                     npcs[var38].sequence = -1;
                   }
                }
 
@@ -4846,399 +4613,399 @@ public final class Client extends GameShell implements Usernamed {
                return true;
             }
 
-            if(ServerPacket.__ge_s == var1.serverPacket0) {
-               Canvas.__ao_gk = var3.__bq_318();
-               WorldMapSection3.__p_go = var3.readUnsignedByteNegate();
+            if (ServerPacket.field806 == var1.serverPacket0) {
+               Canvas.field95 = var3.method59();
+               WorldMapSection1.field1089 = var3.readUnsignedByteNegate();
 
-               while(var3.index < var1.serverPacket0Length) {
-                  var16 = var3.readUnsignedByte();
-                  class190 var56 = RunException.method3430()[var16];
-                  class16.method189(var56);
+               while (var3.index < var1.serverPacket0Length) {
+                  var38 = var3.readUnsignedByte();
+                  class190 var39 = RunException.method3430()[var38];
+                  class16.method189(var39);
                }
 
                var1.serverPacket0 = null;
                return true;
             }
 
-            Widget var41;
-            if(ServerPacket.__ge_bx == var1.serverPacket0) {
-               var16 = var3.__aq_303();
-               var5 = var3.__bf_332();
-               var41 = Huffman.getWidget(var5);
-               if(var16 != var41.sequenceId || var16 == -1) {
-                  var41.sequenceId = var16;
-                  var41.modelFrame = 0;
-                  var41.modelFrameCycle = 0;
-                  class22.method295(var41);
+            Widget var8;
+            if (ServerPacket.field850 == var1.serverPacket0) {
+               var38 = var3.readShort();
+               var6 = var3.method73();
+               var8 = Huffman.getWidget(var6);
+               if (var38 != var8.sequenceId || var38 == -1) {
+                  var8.sequenceId = var38;
+                  var8.modelFrame = 0;
+                  var8.modelFrameCycle = 0;
+                  WorldMapRectangle.method295(var8);
                }
 
                var1.serverPacket0 = null;
                return true;
             }
 
-            Widget var52;
-            if(ServerPacket.__ge_ar == var1.serverPacket0) {
-               var16 = var3.__bf_332();
-               var52 = Huffman.getWidget(var16);
-               var52.modelType = 3;
-               var52.modelId = Canvas.localPlayer.appearance.getChatHeadId();
-               class22.method295(var52);
+            Widget var9;
+            if (ServerPacket.field819 == var1.serverPacket0) {
+               var38 = var3.method73();
+               var9 = Huffman.getWidget(var38);
+               var9.modelType = 3;
+               var9.modelId = Canvas.localPlayer.appearance.getChatHeadId();
+               WorldMapRectangle.method295(var9);
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_f == var1.serverPacket0) {
+            if (ServerPacket.field790 == var1.serverPacket0) {
                TextureProvider.method2773();
                var1.serverPacket0 = null;
                return false;
             }
 
-            if(ServerPacket.__ge_l == var1.serverPacket0) {
-               var16 = var3.__bp_331();
-               var52 = Huffman.getWidget(var16);
+            if (ServerPacket.field796 == var1.serverPacket0) {
+               var38 = var3.method72();
+               var9 = Huffman.getWidget(var38);
 
-               for(var18 = 0; var18 < var52.itemIds.length; ++var18) {
-                  var52.itemIds[var18] = -1;
-                  var52.itemIds[var18] = 0;
+               for (var5 = 0; var5 < var9.itemIds.length; ++var5) {
+                  var9.itemIds[var5] = -1;
+                  var9.itemIds[var5] = 0;
                }
 
-               class22.method295(var52);
+               WorldMapRectangle.method295(var9);
                var1.serverPacket0 = null;
                return true;
             }
 
-            int var7;
-            int var8;
-            int var9;
             int var10;
-            if(ServerPacket.__ge_bg == var1.serverPacket0) {
-               var16 = var3.readInt();
-               var5 = var3.__ag_302();
-               if(var16 < -70000) {
-                  var5 += 32768;
+            int var11;
+            int var12;
+            int var13;
+            if (ServerPacket.field859 == var1.serverPacket0) {
+               var38 = var3.readInt();
+               var6 = var3.readUnsignedShort();
+               if (var38 < -70000) {
+                  var6 += 32768;
                }
 
-               if(var16 >= 0) {
-                  var41 = Huffman.getWidget(var16);
+               if (var38 >= 0) {
+                  var8 = Huffman.getWidget(var38);
                } else {
-                  var41 = null;
+                  var8 = null;
                }
 
-               if(var41 != null) {
-                  for(var7 = 0; var7 < var41.itemIds.length; ++var7) {
-                     var41.itemIds[var7] = 0;
-                     var41.itemQuantities[var7] = 0;
+               if (var8 != null) {
+                  for (var10 = 0; var10 < var8.itemIds.length; ++var10) {
+                     var8.itemIds[var10] = 0;
+                     var8.itemQuantities[var10] = 0;
                   }
                }
 
-               PlayerType.clearItemContainer(var5);
-               var7 = var3.__ag_302();
+               PlayerType.clearItemContainer(var6);
+               var10 = var3.readUnsignedShort();
 
-               for(var8 = 0; var8 < var7; ++var8) {
-                  var9 = var3.__ag_302();
-                  var10 = var3.readUnsignedByte();
-                  if(var10 == 255) {
-                     var10 = var3.__bf_332();
+               for (var11 = 0; var11 < var10; ++var11) {
+                  var12 = var3.readUnsignedShort();
+                  var13 = var3.readUnsignedByte();
+                  if (var13 == 255) {
+                     var13 = var3.method73();
                   }
 
-                  if(var41 != null && var8 < var41.itemIds.length) {
-                     var41.itemIds[var8] = var9;
-                     var41.itemQuantities[var8] = var10;
+                  if (var8 != null && var11 < var8.itemIds.length) {
+                     var8.itemIds[var11] = var12;
+                     var8.itemQuantities[var11] = var13;
                   }
 
-                  WorldMapManager.itemContainerSetItem(var5, var8, var9 - 1, var10);
+                  WorldMapManager.itemContainerSetItem(var6, var11, var12 - 1, var13);
                }
 
-               if(var41 != null) {
-                  class22.method295(var41);
+               if (var8 != null) {
+                  WorldMapRectangle.method295(var8);
                }
 
-               class12.method159();
-               __client_nz[++__client_ns - 1 & 31] = var5 & 32767;
+               GrandExchangeOfferAgeComparator.method159();
+               field116[++field117 - 1 & 31] = var6 & 32767;
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_e == var1.serverPacket0) {
+            if (ServerPacket.field797 == var1.serverPacket0) {
                class16.method189(class190.field2341);
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_bb == var1.serverPacket0) {
+            if (ServerPacket.field842 == var1.serverPacket0) {
                UserComparator7.method3360(var3, var1.serverPacket0Length);
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_bm == var1.serverPacket0) {
-               WorldMapSection3.__p_go = var3.readUnsignedByteNegate();
-               Canvas.__ao_gk = var3.__bq_318();
+            if (ServerPacket.field853 == var1.serverPacket0) {
+               WorldMapSection1.field1089 = var3.readUnsignedByteNegate();
+               Canvas.field95 = var3.method59();
                var1.serverPacket0 = null;
                return true;
             }
 
-            boolean var47;
-            if(ServerPacket.__ge_b == var1.serverPacket0) {
-               var16 = var3.readInt();
-               var47 = var3.readUnsignedByte() == 1;
-               var41 = Huffman.getWidget(var16);
-               if(var47 != var41.isHidden) {
-                  var41.isHidden = var47;
-                  class22.method295(var41);
+            boolean var14;
+            if (ServerPacket.field810 == var1.serverPacket0) {
+               var38 = var3.readInt();
+               var14 = var3.readUnsignedByte() == 1;
+               var8 = Huffman.getWidget(var38);
+               if (var14 != var8.isHidden) {
+                  var8.isHidden = var14;
+                  WorldMapRectangle.method295(var8);
                }
 
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_bu == var1.serverPacket0) {
-               byte var60 = var3.__bn_319();
-               var5 = var3.__bu_325();
-               Varps.Varps_temp[var5] = var60;
-               if(Varps.Varps_main[var5] != var60) {
-                  Varps.Varps_main[var5] = var60;
+            if (ServerPacket.field852 == var1.serverPacket0) {
+               byte var40 = var3.method60();
+               var6 = var3.method66();
+               Varps.Varps_temp[var6] = var40;
+               if (Varps.Varps_main[var6] != var40) {
+                  Varps.Varps_main[var6] = var40;
                }
 
-               IndexCache.method4703(var5);
-               __client_nr[++__client_nd - 1 & 31] = var5;
+               Archive.method4703(var6);
+               field121[++field123 - 1 & 31] = var6;
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_a == var1.serverPacket0) {
+            if (ServerPacket.field803 == var1.serverPacket0) {
                class16.method189(class190.field2347);
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_bq == var1.serverPacket0) {
-               var16 = var3.readUnsignedByte();
-               if(var3.readUnsignedByte() == 0) {
-                  grandExchangeOffers[var16] = new GrandExchangeOffer();
+            if (ServerPacket.field844 == var1.serverPacket0) {
+               var38 = var3.readUnsignedByte();
+               if (var3.readUnsignedByte() == 0) {
+                  grandExchangeOffers[var38] = new GrandExchangeOffer();
                   var3.index += 18;
                } else {
                   --var3.index;
-                  grandExchangeOffers[var16] = new GrandExchangeOffer(var3, false);
+                  grandExchangeOffers[var38] = new GrandExchangeOffer(var3, false);
                }
 
-               __client_nv = cycleCntr;
+               field122 = cycleCntr;
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_cj == var1.serverPacket0) {
-               var16 = var3.__bm_326();
-               rootWidgetGroup = var16;
-               this.__iu_141(false);
-               DevicePcmPlayerProvider.method845(var16);
-               WorldMapSection3.runWidgetOnLoadListener(rootWidgetGroup);
+            if (ServerPacket.field873 == var1.serverPacket0) {
+               var38 = var3.method67();
+               rootInterface = var38;
+               this.method87(false);
+               DevicePcmPlayerProvider.method845(var38);
+               WorldMapSection1.runWidgetOnLoadListener(rootInterface);
 
-               for(var5 = 0; var5 < 100; ++var5) {
-                  __client_od[var5] = true;
+               for (var6 = 0; var6 < 100; ++var6) {
+                  field100[var6] = true;
                }
 
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_bo == var1.serverPacket0) {
-               class12.method159();
+            if (ServerPacket.field849 == var1.serverPacket0) {
+               GrandExchangeOfferAgeComparator.method159();
                runEnergy = var3.readUnsignedByte();
-               __client_ni = cycleCntr;
+               field124 = cycleCntr;
                var1.serverPacket0 = null;
                return true;
             }
 
-            Widget var19;
-            if(ServerPacket.__ge_af == var1.serverPacket0) {
-               var16 = var3.__bm_326();
-               var5 = var3.__bm_326();
-               var18 = var3.__bm_326();
-               var7 = var3.__bf_332();
-               var19 = Huffman.getWidget(var7);
-               if(var16 != var19.modelAngleX || var18 != var19.modelAngleY || var5 != var19.modelZoom) {
-                  var19.modelAngleX = var16;
-                  var19.modelAngleY = var18;
-                  var19.modelZoom = var5;
-                  class22.method295(var19);
+            Widget var15;
+            if (ServerPacket.field839 == var1.serverPacket0) {
+               var38 = var3.method67();
+               var6 = var3.method67();
+               var5 = var3.method67();
+               var10 = var3.method73();
+               var15 = Huffman.getWidget(var10);
+               if (var38 != var15.modelAngleX || var5 != var15.modelAngleY || var6 != var15.modelZoom) {
+                  var15.modelAngleX = var38;
+                  var15.modelAngleY = var5;
+                  var15.modelZoom = var6;
+                  WorldMapRectangle.method295(var15);
                }
 
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_al == var1.serverPacket0) {
+            if (ServerPacket.field825 == var1.serverPacket0) {
                hintArrowType = var3.readUnsignedByte();
-               if(hintArrowType == 1) {
-                  hintArrowNpcIndex = var3.__ag_302();
+               if (hintArrowType == 1) {
+                  hintArrowNpcIndex = var3.readUnsignedShort();
                }
 
-               if(hintArrowType >= 2 && hintArrowType <= 6) {
-                  if(hintArrowType == 2) {
+               if (hintArrowType >= 2 && hintArrowType <= 6) {
+                  if (hintArrowType == 2) {
                      hintArrowSubX = 64;
                      hintArrowSubY = 64;
                   }
 
-                  if(hintArrowType == 3) {
+                  if (hintArrowType == 3) {
                      hintArrowSubX = 0;
                      hintArrowSubY = 64;
                   }
 
-                  if(hintArrowType == 4) {
+                  if (hintArrowType == 4) {
                      hintArrowSubX = 128;
                      hintArrowSubY = 64;
                   }
 
-                  if(hintArrowType == 5) {
+                  if (hintArrowType == 5) {
                      hintArrowSubX = 64;
                      hintArrowSubY = 0;
                   }
 
-                  if(hintArrowType == 6) {
+                  if (hintArrowType == 6) {
                      hintArrowSubX = 64;
                      hintArrowSubY = 128;
                   }
 
                   hintArrowType = 2;
-                  hintArrowX = var3.__ag_302();
-                  hintArrowY = var3.__ag_302();
+                  hintArrowX = var3.readUnsignedShort();
+                  hintArrowY = var3.readUnsignedShort();
                   hintArrowHeight = var3.readUnsignedByte();
                }
 
-               if(hintArrowType == 10) {
-                  hintArrowPlayerIndex = var3.__ag_302();
+               if (hintArrowType == 10) {
+                  hintArrowPlayerIndex = var3.readUnsignedShort();
                }
 
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_cv == var1.serverPacket0) {
+            if (ServerPacket.field868 == var1.serverPacket0) {
                Skeleton.method3062(var3, var1.serverPacket0Length);
                ScriptFrame.method1138();
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_m == var1.serverPacket0) {
+            if (ServerPacket.field789 == var1.serverPacket0) {
                class50.loadRegions(false, var1.packetBuffer);
                var1.serverPacket0 = null;
                return true;
             }
 
-            Widget var58;
-            if(ServerPacket.__ge_ap == var1.serverPacket0) {
-               var16 = var3.__bu_325();
-               var5 = var3.__by_324();
-               var18 = var3.__bp_331();
-               var58 = Huffman.getWidget(var18);
-               var58.__bh = var16 + (var5 << 16);
+            Widget var16;
+            if (ServerPacket.field830 == var1.serverPacket0) {
+               var38 = var3.method66();
+               var6 = var3.method65();
+               var5 = var3.method72();
+               var16 = Huffman.getWidget(var5);
+               var16.field963 = var38 + (var6 << 16);
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_ba == var1.serverPacket0) {
-               if(rootWidgetGroup != -1) {
-                  GrandExchangeEvents.method74(rootWidgetGroup, 0);
+            if (ServerPacket.field841 == var1.serverPacket0) {
+               if (rootInterface != -1) {
+                  GrandExchangeEvents.method74(rootInterface, 0);
                }
 
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_h == var1.serverPacket0) {
-               var16 = var3.readInt();
-               var5 = var3.__ag_302();
-               if(var5 == 65535) {
-                  var5 = -1;
+            if (ServerPacket.field809 == var1.serverPacket0) {
+               var38 = var3.readInt();
+               var6 = var3.readUnsignedShort();
+               if (var6 == 65535) {
+                  var6 = -1;
                }
 
-               var18 = var3.__bf_332();
-               var58 = Huffman.getWidget(var16);
-               ItemDefinition var54;
-               if(!var58.isIf3) {
-                  if(var5 == -1) {
-                     var58.modelType = 0;
+               var5 = var3.method73();
+               var16 = Huffman.getWidget(var38);
+               ItemDefinition var41;
+               if (!var16.isIf3) {
+                  if (var6 == -1) {
+                     var16.modelType = 0;
                      var1.serverPacket0 = null;
                      return true;
                   }
 
-                  var54 = Skills.getItemDefinition(var5);
-                  var58.modelType = 4;
-                  var58.modelId = var5;
-                  var58.modelAngleX = var54.xan2d;
-                  var58.modelAngleY = var54.yan2d;
-                  var58.modelZoom = var54.zoom2d * 100 / var18;
-                  class22.method295(var58);
+                  var41 = Skills.getItemDefinition(var6);
+                  var16.modelType = 4;
+                  var16.modelId = var6;
+                  var16.modelAngleX = var41.xan2d;
+                  var16.modelAngleY = var41.yan2d;
+                  var16.modelZoom = var41.zoom2d * 100 / var5;
+                  WorldMapRectangle.method295(var16);
                } else {
-                  var58.itemId = var5;
-                  var58.itemQuantity = var18;
-                  var54 = Skills.getItemDefinition(var5);
-                  var58.modelAngleX = var54.xan2d;
-                  var58.modelAngleY = var54.yan2d;
-                  var58.modelAngleZ = var54.zan2d;
-                  var58.modelOffsetX = var54.offsetX2d;
-                  var58.modelOffsetY = var54.offsetY2d;
-                  var58.modelZoom = var54.zoom2d;
-                  if(var54.isStackable == 1) {
-                     var58.itemQuantityMode = 1;
+                  var16.itemId = var6;
+                  var16.itemQuantity = var5;
+                  var41 = Skills.getItemDefinition(var6);
+                  var16.modelAngleX = var41.xan2d;
+                  var16.modelAngleY = var41.yan2d;
+                  var16.modelAngleZ = var41.zan2d;
+                  var16.modelOffsetX = var41.offsetX2d;
+                  var16.modelOffsetY = var41.offsetY2d;
+                  var16.modelZoom = var41.zoom2d;
+                  if (var41.isStackable == 1) {
+                     var16.itemQuantityMode = 1;
                   } else {
-                     var58.itemQuantityMode = 2;
+                     var16.itemQuantityMode = 2;
                   }
 
-                  if(var58.__bf > 0) {
-                     var58.modelZoom = var58.modelZoom * 32 / var58.__bf;
-                  } else if(var58.rawWidth > 0) {
-                     var58.modelZoom = var58.modelZoom * 32 / var58.rawWidth;
+                  if (var16.field962 > 0) {
+                     var16.modelZoom = var16.modelZoom * 32 / var16.field962;
+                  } else if (var16.rawWidth > 0) {
+                     var16.modelZoom = var16.modelZoom * 32 / var16.rawWidth;
                   }
 
-                  class22.method295(var58);
+                  WorldMapRectangle.method295(var16);
                }
 
                var1.serverPacket0 = null;
                return true;
             }
 
-            String var6;
-            if(ServerPacket.__ge_w == var1.serverPacket0) {
-               var16 = var3.__ae_307();
-               var47 = var3.readUnsignedByte() == 1;
-               var6 = "";
-               boolean var44 = false;
-               if(var47) {
-                  var6 = var3.readStringCp1252NullTerminated();
-                  if(WorldMapArea.friendSystem.isIgnored(new Username(var6, KeyHandler.loginType))) {
-                     var44 = true;
+            String var17;
+            boolean var18;
+            if (ServerPacket.field792 == var1.serverPacket0) {
+               var38 = var3.readUShortSmart();
+               var14 = var3.readUnsignedByte() == 1;
+               var17 = "";
+               var18 = false;
+               if (var14) {
+                  var17 = var3.readStringCp1252NullTerminated();
+                  if (WorldMapArea.friendSystem.isIgnored(new Username(var17, KeyHandler.loginType))) {
+                     var18 = true;
                   }
                }
 
-               String var53 = var3.readStringCp1252NullTerminated();
-               if(!var44) {
-                  WorldMapIcon1.method219(var16, var6, var53);
+               String var42 = var3.readStringCp1252NullTerminated();
+               if (!var18) {
+                  WorldMapIcon1.addGameMessage(var38, var17, var42);
                }
 
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_bi == var1.serverPacket0) {
-               IndexCacheLoader.field512 = WorldMapElement.method4783(var3.readUnsignedByte());
+            if (ServerPacket.field857 == var1.serverPacket0) {
+               ArchiveLoader.field512 = WorldMapElement.method4783(var3.readUnsignedByte());
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_n == var1.serverPacket0) {
+            if (ServerPacket.field801 == var1.serverPacket0) {
                class16.method189(class190.field2345);
                var1.serverPacket0 = null;
                return true;
             }
 
-            boolean var55;
-            if(ServerPacket.__ge_j == var1.serverPacket0) {
-               var55 = var3.readBoolean();
-               if(var55) {
-                  if(ClientParameter.field3645 == null) {
+            if (ServerPacket.field805 == var1.serverPacket0) {
+               var18 = var3.readBoolean();
+               if (var18) {
+                  if (ClientParameter.field3645 == null) {
                      ClientParameter.field3645 = new class248();
                   }
                } else {
@@ -5249,43 +5016,43 @@ public final class Client extends GameShell implements Usernamed {
                return true;
             }
 
-            long var21;
-            if(ServerPacket.__ge_aa == var1.serverPacket0) {
-               var16 = var3.__bt_330();
-               var5 = var3.__bu_325();
-               if(var5 == 65535) {
-                  var5 = -1;
+            long var19;
+            if (ServerPacket.field837 == var1.serverPacket0) {
+               var38 = var3.method71();
+               var6 = var3.method66();
+               if (var6 == 65535) {
+                  var6 = -1;
                }
 
-               var18 = var3.__bf_332();
-               var7 = var3.__ag_302();
-               if(var7 == 65535) {
-                  var7 = -1;
+               var5 = var3.method73();
+               var10 = var3.readUnsignedShort();
+               if (var10 == 65535) {
+                  var10 = -1;
                }
 
-               for(var8 = var7; var8 <= var5; ++var8) {
-                  var21 = (long)var8 + ((long)var18 << 32);
-                  Node var45 = widgetClickMasks.get(var21);
-                  if(var45 != null) {
-                     var45.remove();
+               for (var11 = var10; var11 <= var6; ++var11) {
+                  var19 = (long)var11 + ((long)var5 << 32);
+                  Node var43 = widgetClickMasks.get(var19);
+                  if (var43 != null) {
+                     var43.remove();
                   }
 
-                  widgetClickMasks.put(new IntegerNode(var16), var21);
+                  widgetClickMasks.put(new IntegerNode(var38), var19);
                }
 
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_cy == var1.serverPacket0) {
+            if (ServerPacket.field870 == var1.serverPacket0) {
                class3.updateNpcs(true, var3);
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_az == var1.serverPacket0) {
-               if(PacketWriter.clanChat != null) {
-                  PacketWriter.clanChat.__a_474(var3);
+            if (ServerPacket.field834 == var1.serverPacket0) {
+               if (PacketWriter.clanChat != null) {
+                  PacketWriter.clanChat.method78(var3);
                }
 
                UserComparator8.method3349();
@@ -5293,53 +5060,53 @@ public final class Client extends GameShell implements Usernamed {
                return true;
             }
 
-            if(ServerPacket.__ge_z == var1.serverPacket0) {
+            if (ServerPacket.field804 == var1.serverPacket0) {
                class16.method189(class190.field2346);
                var1.serverPacket0 = null;
                return true;
             }
 
-            String var37;
-            if(ServerPacket.__ge_by == var1.serverPacket0) {
-               var37 = var3.readStringCp1252NullTerminated();
-               Object[] var51 = new Object[var37.length() + 1];
+            String var21;
+            if (ServerPacket.field851 == var1.serverPacket0) {
+               var21 = var3.readStringCp1252NullTerminated();
+               Object[] var47 = new Object[var21.length() + 1];
 
-               for(var18 = var37.length() - 1; var18 >= 0; --var18) {
-                  if(var37.charAt(var18) == 's') {
-                     var51[var18 + 1] = var3.readStringCp1252NullTerminated();
+               for (var5 = var21.length() - 1; var5 >= 0; --var5) {
+                  if (var21.charAt(var5) == 's') {
+                     var47[var5 + 1] = var3.readStringCp1252NullTerminated();
                   } else {
-                     var51[var18 + 1] = new Integer(var3.readInt());
+                     var47[var5 + 1] = new Integer(var3.readInt());
                   }
                }
 
-               var51[0] = new Integer(var3.readInt());
-               ScriptEvent var43 = new ScriptEvent();
-               var43.args0 = var51;
-               AbstractIndexCache.runScript(var43);
+               var47[0] = new Integer(var3.readInt());
+               ScriptEvent var50 = new ScriptEvent();
+               var50.args0 = var47;
+               AbstractArchive.runScript(var50);
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_ag == var1.serverPacket0) {
+            if (ServerPacket.field815 == var1.serverPacket0) {
                class16.method189(class190.field2343);
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_i == var1.serverPacket0) {
+            if (ServerPacket.field802 == var1.serverPacket0) {
                class16.method189(class190.field2350);
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_bj == var1.serverPacket0) {
+            if (ServerPacket.field856 == var1.serverPacket0) {
                destinationX = var3.readUnsignedByte();
-               if(destinationX == 255) {
+               if (destinationX == 255) {
                   destinationX = 0;
                }
 
                destinationY = var3.readUnsignedByte();
-               if(destinationY == 255) {
+               if (destinationY == 255) {
                   destinationY = 0;
                }
 
@@ -5347,84 +5114,84 @@ public final class Client extends GameShell implements Usernamed {
                return true;
             }
 
-            if(ServerPacket.__ge_cr == var1.serverPacket0) {
-               for(var16 = 0; var16 < VarpDefinition.__ix_f; ++var16) {
-                  VarpDefinition var50 = SecureRandomCallable.method1140(var16);
-                  if(var50 != null) {
-                     Varps.Varps_temp[var16] = 0;
-                     Varps.Varps_main[var16] = 0;
+            if (ServerPacket.field867 == var1.serverPacket0) {
+               for (var38 = 0; var38 < VarpDefinition.field944; ++var38) {
+                  VarpDefinition var45 = SecureRandomCallable.method1140(var38);
+                  if (var45 != null) {
+                     Varps.Varps_temp[var38] = 0;
+                     Varps.Varps_main[var38] = 0;
                   }
                }
 
-               class12.method159();
-               __client_nd += 32;
+               GrandExchangeOfferAgeComparator.method159();
+               field123 += 32;
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_an == var1.serverPacket0) {
-               var16 = var3.readInt();
-               var5 = var3.__ag_302();
-               if(var16 < -70000) {
-                  var5 += 32768;
+            if (ServerPacket.field833 == var1.serverPacket0) {
+               var38 = var3.readInt();
+               var6 = var3.readUnsignedShort();
+               if (var38 < -70000) {
+                  var6 += 32768;
                }
 
-               if(var16 >= 0) {
-                  var41 = Huffman.getWidget(var16);
+               if (var38 >= 0) {
+                  var8 = Huffman.getWidget(var38);
                } else {
-                  var41 = null;
+                  var8 = null;
                }
 
-               for(; var3.index < var1.serverPacket0Length; WorldMapManager.itemContainerSetItem(var5, var7, var8 - 1, var9)) {
-                  var7 = var3.__ae_307();
-                  var8 = var3.__ag_302();
-                  var9 = 0;
-                  if(var8 != 0) {
-                     var9 = var3.readUnsignedByte();
-                     if(var9 == 255) {
-                        var9 = var3.readInt();
+               for (; var3.index < var1.serverPacket0Length; WorldMapManager.itemContainerSetItem(var6, var10, var11 - 1, var12)) {
+                  var10 = var3.readUShortSmart();
+                  var11 = var3.readUnsignedShort();
+                  var12 = 0;
+                  if (var11 != 0) {
+                     var12 = var3.readUnsignedByte();
+                     if (var12 == 255) {
+                        var12 = var3.readInt();
                      }
                   }
 
-                  if(var41 != null && var7 >= 0 && var7 < var41.itemIds.length) {
-                     var41.itemIds[var7] = var8;
-                     var41.itemQuantities[var7] = var9;
+                  if (var8 != null && var10 >= 0 && var10 < var8.itemIds.length) {
+                     var8.itemIds[var10] = var11;
+                     var8.itemQuantities[var10] = var12;
                   }
                }
 
-               if(var41 != null) {
-                  class22.method295(var41);
+               if (var8 != null) {
+                  WorldMapRectangle.method295(var8);
                }
 
-               class12.method159();
-               __client_nz[++__client_ns - 1 & 31] = var5 & 32767;
+               GrandExchangeOfferAgeComparator.method159();
+               field116[++field117 - 1 & 31] = var6 & 32767;
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_bl == var1.serverPacket0) {
-               var16 = var3.__ag_302();
-               var5 = var3.readUnsignedByte();
-               var18 = var3.__ag_302();
-               Ignored.queueSoundEffect(var16, var5, var18);
+            if (ServerPacket.field854 == var1.serverPacket0) {
+               var38 = var3.readUnsignedShort();
+               var6 = var3.readUnsignedByte();
+               var5 = var3.readUnsignedShort();
+               Ignored.queueSoundEffect(var38, var6, var5);
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_bc == var1.serverPacket0) {
-               var16 = var3.__bp_331();
-               var5 = var3.__br_328();
-               var18 = var3.__bl_327();
-               var58 = Huffman.getWidget(var16);
-               if(var18 != var58.rawX || var5 != var58.rawY || var58.xAlignment != 0 || var58.yAlignment != 0) {
-                  var58.rawX = var18;
-                  var58.rawY = var5;
-                  var58.xAlignment = 0;
-                  var58.yAlignment = 0;
-                  class22.method295(var58);
-                  this.alignWidget(var58);
-                  if(var58.type == 0) {
-                     class39.revalidateWidgetScroll(Widget.widgets[var16 >> 16], var58, false);
+            if (ServerPacket.field848 == var1.serverPacket0) {
+               var38 = var3.method72();
+               var6 = var3.method69();
+               var5 = var3.method68();
+               var16 = Huffman.getWidget(var38);
+               if (var5 != var16.rawX || var6 != var16.rawY || var16.xAlignment != 0 || var16.yAlignment != 0) {
+                  var16.rawX = var5;
+                  var16.rawY = var6;
+                  var16.xAlignment = 0;
+                  var16.yAlignment = 0;
+                  WorldMapRectangle.method295(var16);
+                  this.alignWidget(var16);
+                  if (var16.type == 0) {
+                     class39.revalidateWidgetScroll(Widget.interfaceComponents[var38 >> 16], var16, false);
                   }
                }
 
@@ -5432,143 +5199,143 @@ public final class Client extends GameShell implements Usernamed {
                return true;
             }
 
-            if(ServerPacket.__ge_aw == var1.serverPacket0) {
-               var16 = var3.__bm_326();
-               var5 = var3.__bf_332();
-               var41 = Huffman.getWidget(var5);
-               if(var41.modelType != 2 || var16 != var41.modelId) {
-                  var41.modelType = 2;
-                  var41.modelId = var16;
-                  class22.method295(var41);
+            if (ServerPacket.field824 == var1.serverPacket0) {
+               var38 = var3.method67();
+               var6 = var3.method73();
+               var8 = Huffman.getWidget(var6);
+               if (var8.modelType != 2 || var38 != var8.modelId) {
+                  var8.modelType = 2;
+                  var8.modelId = var38;
+                  WorldMapRectangle.method295(var8);
                }
 
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_ao == var1.serverPacket0) {
-               World var40 = new World();
-               var40.host = var3.readStringCp1252NullTerminated();
-               var40.id = var3.__ag_302();
-               var5 = var3.readInt();
-               var40.properties = var5;
+            if (ServerPacket.field836 == var1.serverPacket0) {
+               World var44 = new World();
+               var44.host = var3.readStringCp1252NullTerminated();
+               var44.id = var3.readUnsignedShort();
+               var6 = var3.readInt();
+               var44.properties = var6;
                GameShell.updateGameState(45);
                var2.close();
                var2 = null;
-               class31.changeWorld(var40);
+               class31.changeWorld(var44);
                var1.serverPacket0 = null;
                return false;
             }
 
-            if(ServerPacket.__ge_ay == var1.serverPacket0) {
+            if (ServerPacket.field821 == var1.serverPacket0) {
                WorldMapArea.friendSystem.ignoreList.read(var3, var1.serverPacket0Length);
                class229.method4512();
-               __client_na = cycleCntr;
+               field105 = cycleCntr;
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_ah == var1.serverPacket0) {
+            if (ServerPacket.field822 == var1.serverPacket0) {
                class3.updateNpcs(false, var3);
                var1.serverPacket0 = null;
                return true;
             }
 
-            WidgetGroupParent var20;
-            if(ServerPacket.__ge_cs == var1.serverPacket0) {
-               var16 = var3.readInt();
-               var5 = var3.readInt();
-               WidgetGroupParent var42 = (WidgetGroupParent)widgetGroupParents.get((long)var5);
-               var20 = (WidgetGroupParent)widgetGroupParents.get((long)var16);
-               if(var20 != null) {
-                  MenuAction.closeWidgetGroup(var20, var42 == null || var42.group != var20.group);
+            InterfaceParent var22;
+            if (ServerPacket.field871 == var1.serverPacket0) {
+               var38 = var3.readInt();
+               var6 = var3.readInt();
+               InterfaceParent var49 = (InterfaceParent)interfaceParents.get((long)var6);
+               var22 = (InterfaceParent)interfaceParents.get((long)var38);
+               if (var22 != null) {
+                  MenuAction.closeInterface(var22, var49 == null || var49.group != var22.group);
                }
 
-               if(var42 != null) {
-                  var42.remove();
-                  widgetGroupParents.put(var42, (long)var16);
+               if (var49 != null) {
+                  var49.remove();
+                  interfaceParents.put(var49, (long)var38);
                }
 
-               var19 = Huffman.getWidget(var5);
-               if(var19 != null) {
-                  class22.method295(var19);
+               var15 = Huffman.getWidget(var6);
+               if (var15 != null) {
+                  WorldMapRectangle.method295(var15);
                }
 
-               var19 = Huffman.getWidget(var16);
-               if(var19 != null) {
-                  class22.method295(var19);
-                  class39.revalidateWidgetScroll(Widget.widgets[var19.id >>> 16], var19, true);
+               var15 = Huffman.getWidget(var38);
+               if (var15 != null) {
+                  WorldMapRectangle.method295(var15);
+                  class39.revalidateWidgetScroll(Widget.interfaceComponents[var15.id >>> 16], var15, true);
                }
 
-               if(rootWidgetGroup != -1) {
-                  GrandExchangeEvents.method74(rootWidgetGroup, 1);
+               if (rootInterface != -1) {
+                  GrandExchangeEvents.method74(rootInterface, 1);
                }
 
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_p == var1.serverPacket0) {
-               var16 = var3.__bp_331();
-               var5 = var3.__bu_325();
-               var18 = var5 >> 10 & 31;
-               var7 = var5 >> 5 & 31;
-               var8 = var5 & 31;
-               var9 = (var7 << 11) + (var18 << 19) + (var8 << 3);
-               Widget var59 = Huffman.getWidget(var16);
-               if(var9 != var59.color) {
-                  var59.color = var9;
-                  class22.method295(var59);
+            if (ServerPacket.field813 == var1.serverPacket0) {
+               var38 = var3.method72();
+               var6 = var3.method66();
+               var5 = var6 >> 10 & 31;
+               var10 = var6 >> 5 & 31;
+               var11 = var6 & 31;
+               var12 = (var10 << 11) + (var5 << 19) + (var11 << 3);
+               Widget var48 = Huffman.getWidget(var38);
+               if (var12 != var48.color) {
+                  var48.color = var12;
+                  WorldMapRectangle.method295(var48);
                }
 
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_at == var1.serverPacket0) {
-               var16 = var3.readUnsignedByte();
+            if (ServerPacket.field828 == var1.serverPacket0) {
+               var38 = var3.readUnsignedByte();
+               var6 = var3.readUnsignedByte();
                var5 = var3.readUnsignedByte();
-               var18 = var3.readUnsignedByte();
-               var7 = var3.readUnsignedByte();
-               __client_rh[var16] = true;
-               __client_rd[var16] = var5;
-               __client_rl[var16] = var18;
-               __client_rj[var16] = var7;
-               __client_rk[var16] = 0;
+               var10 = var3.readUnsignedByte();
+               field139[var38] = true;
+               field141[var38] = var6;
+               field142[var38] = var5;
+               field143[var38] = var10;
+               field144[var38] = 0;
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_ce == var1.serverPacket0) {
-               __client_pl = var3.readUnsignedByteNegate();
+            if (ServerPacket.field869 == var1.serverPacket0) {
+               field138 = var3.readUnsignedByteNegate();
                publicChatMode = var3.readUnsignedByteNegate();
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_bp == var1.serverPacket0) {
-               rebootTimer = var3.__ag_302() * 30;
-               __client_ni = cycleCntr;
+            if (ServerPacket.field861 == var1.serverPacket0) {
+               rebootTimer = var3.readUnsignedShort() * 30;
+               field124 = cycleCntr;
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_v == var1.serverPacket0) {
-               Canvas.__ao_gk = var3.readUnsignedByteNegate();
-               WorldMapSection3.__p_go = var3.readUnsignedByte();
+            if (ServerPacket.field814 == var1.serverPacket0) {
+               Canvas.field95 = var3.readUnsignedByteNegate();
+               WorldMapSection1.field1089 = var3.readUnsignedByte();
 
-               for(var16 = WorldMapSection3.__p_go; var16 < WorldMapSection3.__p_go + 8; ++var16) {
-                  for(var5 = Canvas.__ao_gk; var5 < Canvas.__ao_gk + 8; ++var5) {
-                     if(groundItems[SoundSystem.plane][var16][var5] != null) {
-                        groundItems[SoundSystem.plane][var16][var5] = null;
-                        TilePaint.method3061(var16, var5);
+               for (var38 = WorldMapSection1.field1089; var38 < WorldMapSection1.field1089 + 8; ++var38) {
+                  for (var6 = Canvas.field95; var6 < Canvas.field95 + 8; ++var6) {
+                     if (groundItems[SoundSystem.plane][var38][var6] != null) {
+                        groundItems[SoundSystem.plane][var38][var6] = null;
+                        TilePaint.updateItemPile(var38, var6);
                      }
                   }
                }
 
-               for(class68 var39 = (class68)__client_kh.last(); var39 != null; var39 = (class68)__client_kh.previous()) {
-                  if(var39.field913 >= WorldMapSection3.__p_go && var39.field913 < WorldMapSection3.__p_go + 8 && var39.field901 >= Canvas.__ao_gk && var39.field901 < Canvas.__ao_gk + 8 && var39.field911 == SoundSystem.plane) {
-                     var39.field910 = 0;
+               for (PendingSpawn var46 = (PendingSpawn)pendingSpawns.last(); var46 != null; var46 = (PendingSpawn)pendingSpawns.previous()) {
+                  if (var46.x >= WorldMapSection1.field1089 && var46.x < WorldMapSection1.field1089 + 8 && var46.y >= Canvas.field95 && var46.y < Canvas.field95 + 8 && var46.plane == SoundSystem.plane) {
+                     var46.hitpoints = 0;
                   }
                }
 
@@ -5576,58 +5343,60 @@ public final class Client extends GameShell implements Usernamed {
                return true;
             }
 
-            if(ServerPacket.__ge_ac == var1.serverPacket0) {
-               var16 = var3.__bf_332();
-               var5 = var3.__bm_326();
-               var41 = Huffman.getWidget(var16);
-               if(var41.modelType != 1 || var5 != var41.modelId) {
-                  var41.modelType = 1;
-                  var41.modelId = var5;
-                  class22.method295(var41);
+            if (ServerPacket.field820 == var1.serverPacket0) {
+               var38 = var3.method73();
+               var6 = var3.method67();
+               var8 = Huffman.getWidget(var38);
+               if (var8.modelType != 1 || var6 != var8.modelId) {
+                  var8.modelType = 1;
+                  var8.modelId = var6;
+                  WorldMapRectangle.method295(var8);
                }
 
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_ak == var1.serverPacket0) {
-               var16 = var3.readUnsignedByte();
-               BufferedNetSocket.method3500(var16);
+            if (ServerPacket.field823 == var1.serverPacket0) {
+               var38 = var3.readUnsignedByte();
+               BufferedNetSocket.method3500(var38);
                var1.serverPacket0 = null;
                return true;
             }
 
-            long var12;
-            long var24;
-            long var26;
-            if(ServerPacket.__ge_bs == var1.serverPacket0) {
-               var37 = var3.readStringCp1252NullTerminated();
-               var24 = var3.readLong();
-               var26 = (long)var3.__ag_302();
-               var21 = (long)var3.readMedium();
-               PlayerType var11 = (PlayerType)ScriptFrame.findEnumerated(class48.method865(), var3.readUnsignedByte());
-               var12 = (var26 << 32) + var21;
-               boolean var46 = false;
+            long var23;
+            long var25;
+            long var27;
+            PlayerType var29;
+            int var51;
+            if (ServerPacket.field843 == var1.serverPacket0) {
+               var21 = var3.readStringCp1252NullTerminated();
+               var25 = var3.readLong();
+               var27 = (long)var3.readUnsignedShort();
+               var19 = (long)var3.readMedium();
+               var29 = (PlayerType)ScriptFrame.findEnumerated(class48.method865(), var3.readUnsignedByte());
+               var23 = (var27 << 32) + var19;
+               boolean var55 = false;
 
-               for(int var15 = 0; var15 < 100; ++var15) {
-                  if(__client_pu[var15] == var12) {
-                     var46 = true;
+               for (var51 = 0; var51 < 100; ++var51) {
+                  if (field152[var51] == var23) {
+                     var55 = true;
                      break;
                   }
                }
 
-               if(var11.isUser && WorldMapArea.friendSystem.isIgnored(new Username(var37, KeyHandler.loginType))) {
-                  var46 = true;
+               if (var29.isUser && WorldMapArea.friendSystem.isIgnored(new Username(var21, KeyHandler.loginType))) {
+                  var55 = true;
                }
 
-               if(!var46 && __client_jc == 0) {
-                  __client_pu[__client_pb] = var12;
-                  __client_pb = (__client_pb + 1) % 100;
-                  String var28 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(var3)));
-                  if(var11.modIcon != -1) {
-                     GrandExchangeEvents.addChatMessage(9, ItemContainer.method1170(var11.modIcon) + var37, var28, Clock.method3534(var24));
+               if (!var55 && field208 == 0) {
+                  field152[field156] = var23;
+                  field156 = (field156 + 1) % 100;
+                  String var56 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(var3)));
+                  if (var29.modIcon != -1) {
+                     GrandExchangeEvents.addChatMessage(9, ItemContainer.method1170(var29.modIcon) + var21, var56, Clock.method3534(var25));
                   } else {
-                     GrandExchangeEvents.addChatMessage(9, var37, var28, Clock.method3534(var24));
+                     GrandExchangeEvents.addChatMessage(9, var21, var56, Clock.method3534(var25));
                   }
                }
 
@@ -5635,64 +5404,64 @@ public final class Client extends GameShell implements Usernamed {
                return true;
             }
 
-            if(ServerPacket.__ge_as == var1.serverPacket0) {
+            if (ServerPacket.field831 == var1.serverPacket0) {
                class16.method189(class190.field2342);
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_y == var1.serverPacket0) {
-               var16 = var3.readInt();
-               var17 = var3.readStringCp1252NullTerminated();
-               var41 = Huffman.getWidget(var16);
-               if(!var17.equals(var41.text)) {
-                  var41.text = var17;
-                  class22.method295(var41);
+            if (ServerPacket.field808 == var1.serverPacket0) {
+               var38 = var3.readInt();
+               var4 = var3.readStringCp1252NullTerminated();
+               var8 = Huffman.getWidget(var38);
+               if (!var4.equals(var8.text)) {
+                  var8.text = var4;
+                  WorldMapRectangle.method295(var8);
                }
 
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_ai == var1.serverPacket0) {
+            if (ServerPacket.field840 == var1.serverPacket0) {
                class50.loadRegions(true, var1.packetBuffer);
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_q == var1.serverPacket0) {
+            if (ServerPacket.field791 == var1.serverPacket0) {
                isCameraLocked = false;
 
-               for(var16 = 0; var16 < 5; ++var16) {
-                  __client_rh[var16] = false;
+               for (var38 = 0; var38 < 5; ++var38) {
+                  field139[var38] = false;
                }
 
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_cm == var1.serverPacket0) {
+            if (ServerPacket.field872 == var1.serverPacket0) {
                isCameraLocked = true;
-               GrandExchangeOffer.__x_rg = var3.readUnsignedByte();
-               KeyHandler.__an_ra = var3.readUnsignedByte();
-               IndexStoreAction.__ik_rt = var3.__ag_302();
-               VertexNormal.__dq_rq = var3.readUnsignedByte();
-               class171.__fo_ro = var3.readUnsignedByte();
-               if(class171.__fo_ro >= 100) {
-                  var16 = GrandExchangeOffer.__x_rg * 128 + 64;
-                  var5 = KeyHandler.__an_ra * 128 + 64;
-                  var18 = class32.getTileHeight(var16, var5, SoundSystem.plane) - IndexStoreAction.__ik_rt;
-                  var7 = var16 - WorldMapSection1.cameraX;
-                  var8 = var18 - GrandExchangeEvents.cameraY;
-                  var9 = var5 - class11.cameraZ;
-                  var10 = (int)Math.sqrt((double)(var9 * var9 + var7 * var7));
-                  WorldMapIcon1.cameraPitch = (int)(Math.atan2((double)var8, (double)var10) * 325.949D) & 2047;
-                  MusicPatchNode.cameraYaw = (int)(Math.atan2((double)var7, (double)var9) * -325.949D) & 2047;
-                  if(WorldMapIcon1.cameraPitch < 128) {
+               GrandExchangeOffer.field376 = var3.readUnsignedByte();
+               KeyHandler.field445 = var3.readUnsignedByte();
+               ArchiveDiskAction.field410 = var3.readUnsignedShort();
+               VertexNormal.field946 = var3.readUnsignedByte();
+               class171.field1116 = var3.readUnsignedByte();
+               if (class171.field1116 >= 100) {
+                  var38 = GrandExchangeOffer.field376 * 128 + 64;
+                  var6 = KeyHandler.field445 * 128 + 64;
+                  var5 = class32.getTileHeight(var38, var6, SoundSystem.plane) - ArchiveDiskAction.field410;
+                  var10 = var38 - WorldMapSection2.cameraX;
+                  var11 = var5 - GrandExchangeEvents.cameraY;
+                  var12 = var6 - GrandExchangeOfferNameComparator.cameraZ;
+                  var13 = (int)Math.sqrt((double)(var12 * var12 + var10 * var10));
+                  WorldMapIcon1.cameraPitch = (int)(Math.atan2((double)var11, (double)var13) * 325.949D) & 2047;
+                  MusicPatchNode.cameraYaw = (int)(Math.atan2((double)var10, (double)var12) * -325.949D) & 2047;
+                  if (WorldMapIcon1.cameraPitch < 128) {
                      WorldMapIcon1.cameraPitch = 128;
                   }
 
-                  if(WorldMapIcon1.cameraPitch > 383) {
+                  if (WorldMapIcon1.cameraPitch > 383) {
                      WorldMapIcon1.cameraPitch = 383;
                   }
                }
@@ -5701,22 +5470,22 @@ public final class Client extends GameShell implements Usernamed {
                return true;
             }
 
-            if(ServerPacket.__ge_bv == var1.serverPacket0) {
-               var16 = var3.__bf_332();
-               var5 = var3.__bm_326();
-               var41 = Huffman.getWidget(var16);
-               if(var41 != null && var41.type == 0) {
-                  if(var5 > var41.scrollHeight - var41.height) {
-                     var5 = var41.scrollHeight - var41.height;
+            if (ServerPacket.field865 == var1.serverPacket0) {
+               var38 = var3.method73();
+               var6 = var3.method67();
+               var8 = Huffman.getWidget(var38);
+               if (var8 != null && var8.type == 0) {
+                  if (var6 > var8.scrollHeight - var8.height) {
+                     var6 = var8.scrollHeight - var8.height;
                   }
 
-                  if(var5 < 0) {
-                     var5 = 0;
+                  if (var6 < 0) {
+                     var6 = 0;
                   }
 
-                  if(var5 != var41.scrollY) {
-                     var41.scrollY = var5;
-                     class22.method295(var41);
+                  if (var6 != var8.scrollY) {
+                     var8.scrollY = var6;
+                     WorldMapRectangle.method295(var8);
                   }
                }
 
@@ -5724,17 +5493,17 @@ public final class Client extends GameShell implements Usernamed {
                return true;
             }
 
-            if(ServerPacket.__ge_au == var1.serverPacket0) {
-               var16 = var3.__by_324();
-               Script.method2216(var16);
-               __client_nz[++__client_ns - 1 & 31] = var16 & 32767;
+            if (ServerPacket.field835 == var1.serverPacket0) {
+               var38 = var3.method65();
+               Script.method2216(var38);
+               field116[++field117 - 1 & 31] = var38 & 32767;
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_bk == var1.serverPacket0) {
+            if (ServerPacket.field846 == var1.serverPacket0) {
                var3.index += 28;
-               if(var3.__ax_313()) {
+               if (var3.checkCrc()) {
                   class234.method4535(var3, var3.index - 28);
                }
 
@@ -5742,135 +5511,135 @@ public final class Client extends GameShell implements Usernamed {
                return true;
             }
 
-            if(ServerPacket.__ge_c == var1.serverPacket0) {
-               class12.method159();
-               var16 = var3.__bt_330();
-               var5 = var3.readUnsignedByteNegate();
-               var18 = var3.readUnsignedByte();
-               experience[var5] = var16;
-               currentLevels[var5] = var18;
-               levels[var5] = 1;
+            if (ServerPacket.field811 == var1.serverPacket0) {
+               GrandExchangeOfferAgeComparator.method159();
+               var38 = var3.method71();
+               var6 = var3.readUnsignedByteNegate();
+               var5 = var3.readUnsignedByte();
+               experience[var6] = var38;
+               currentLevels[var6] = var5;
+               levels[var6] = 1;
 
-               for(var7 = 0; var7 < 98; ++var7) {
-                  if(var16 >= Skills.Skills_experienceTable[var7]) {
-                     levels[var5] = var7 + 2;
+               for (var10 = 0; var10 < 98; ++var10) {
+                  if (var38 >= Skills.Skills_experienceTable[var10]) {
+                     levels[var6] = var10 + 2;
                   }
                }
 
-               changedSkills[++changedSkillsCount - 1 & 31] = var5;
+               changedSkills[++changedSkillsCount - 1 & 31] = var6;
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_bz == var1.serverPacket0) {
-               var16 = var3.readInt();
-               var5 = var3.readInt();
-               var18 = DynamicObject.method2222();
-               PacketBufferNode var57 = Interpreter.method1915(ClientPacket.__gs_k, packetWriter.isaacCipher);
-               var57.packetBuffer.__ai_315(var18);
-               var57.packetBuffer.writeByte(GameShell.fps);
-               var57.packetBuffer.writeIntME(var16);
-               var57.packetBuffer.writeIntLE(var5);
-               packetWriter.__q_167(var57);
+            if (ServerPacket.field858 == var1.serverPacket0) {
+               var38 = var3.readInt();
+               var6 = var3.readInt();
+               var5 = DynamicObject.method2222();
+               PacketBufferNode var54 = Interpreter.method1915(ClientPacket.field233, packetWriter.isaacCipher);
+               var54.packetBuffer.method56(var5);
+               var54.packetBuffer.writeByte(GameShell.fps);
+               var54.packetBuffer.writeIntME(var38);
+               var54.packetBuffer.writeIntLE(var6);
+               packetWriter.method241(var54);
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_bt == var1.serverPacket0) {
-               class12.method159();
-               weight = var3.__aq_303();
-               __client_ni = cycleCntr;
+            if (ServerPacket.field860 == var1.serverPacket0) {
+               GrandExchangeOfferAgeComparator.method159();
+               weight = var3.readShort();
+               field124 = cycleCntr;
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_aq == var1.serverPacket0) {
-               var55 = var3.readUnsignedByte() == 1;
-               if(var55) {
-                  class15.__z_si = class203.currentTimeMs() - var3.readLong();
+            if (ServerPacket.field816 == var1.serverPacket0) {
+               var18 = var3.readUnsignedByte() == 1;
+               if (var18) {
+                  class15.field1113 = class203.currentTimeMs() - var3.readLong();
                   FloorDecoration.grandExchangeEvents = new GrandExchangeEvents(var3, true);
                } else {
                   FloorDecoration.grandExchangeEvents = null;
                }
 
-               __client_nc = cycleCntr;
+               field154 = cycleCntr;
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_av == var1.serverPacket0) {
-               WorldMapArea.friendSystem.__f_152();
-               __client_na = cycleCntr;
+            if (ServerPacket.field818 == var1.serverPacket0) {
+               WorldMapArea.friendSystem.method100();
+               field105 = cycleCntr;
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_t == var1.serverPacket0) {
-               byte[] var38 = new byte[var1.serverPacket0Length];
-               var3.__jb_335(var38, 0, var38.length);
-               Buffer var49 = new Buffer(var38);
-               var6 = var49.readStringCp1252NullTerminated();
-               WorldMapCacheName.method635(var6, true, false);
+            if (ServerPacket.field807 == var1.serverPacket0) {
+               byte[] var52 = new byte[var1.serverPacket0Length];
+               var3.method237(var52, 0, var52.length);
+               Buffer var53 = new Buffer(var52);
+               var17 = var53.readStringCp1252NullTerminated();
+               WorldMapCacheName.openURL(var17, true, false);
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_k == var1.serverPacket0) {
+            if (ServerPacket.field800 == var1.serverPacket0) {
                class16.method189(class190.field2352);
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_bn == var1.serverPacket0) {
-               var16 = var3.index + var1.serverPacket0Length;
-               var5 = var3.__ag_302();
-               var18 = var3.__ag_302();
-               if(var5 != rootWidgetGroup) {
-                  rootWidgetGroup = var5;
-                  this.__iu_141(false);
-                  DevicePcmPlayerProvider.method845(rootWidgetGroup);
-                  WorldMapSection3.runWidgetOnLoadListener(rootWidgetGroup);
+            InterfaceParent var30;
+            if (ServerPacket.field845 == var1.serverPacket0) {
+               var38 = var3.index + var1.serverPacket0Length;
+               var6 = var3.readUnsignedShort();
+               var5 = var3.readUnsignedShort();
+               if (var6 != rootInterface) {
+                  rootInterface = var6;
+                  this.method87(false);
+                  DevicePcmPlayerProvider.method845(rootInterface);
+                  WorldMapSection1.runWidgetOnLoadListener(rootInterface);
 
-                  for(var7 = 0; var7 < 100; ++var7) {
-                     __client_od[var7] = true;
+                  for (var10 = 0; var10 < 100; ++var10) {
+                     field100[var10] = true;
                   }
                }
 
-               WidgetGroupParent var23;
-               for(; var18-- > 0; var23.keep = true) {
-                  var7 = var3.readInt();
-                  var8 = var3.__ag_302();
-                  var9 = var3.readUnsignedByte();
-                  var23 = (WidgetGroupParent)widgetGroupParents.get((long)var7);
-                  if(var23 != null && var8 != var23.group) {
-                     MenuAction.closeWidgetGroup(var23, true);
-                     var23 = null;
+               for (; var5-- > 0; var30.keep = true) {
+                  var10 = var3.readInt();
+                  var11 = var3.readUnsignedShort();
+                  var12 = var3.readUnsignedByte();
+                  var30 = (InterfaceParent)interfaceParents.get((long)var10);
+                  if (var30 != null && var11 != var30.group) {
+                     MenuAction.closeInterface(var30, true);
+                     var30 = null;
                   }
 
-                  if(var23 == null) {
-                     var23 = SecureRandomCallable.method1143(var7, var8, var9);
+                  if (var30 == null) {
+                     var30 = SecureRandomCallable.method1143(var10, var11, var12);
                   }
                }
 
-               for(var20 = (WidgetGroupParent)widgetGroupParents.first(); var20 != null; var20 = (WidgetGroupParent)widgetGroupParents.next()) {
-                  if(var20.keep) {
-                     var20.keep = false;
+               for (var22 = (InterfaceParent)interfaceParents.first(); var22 != null; var22 = (InterfaceParent)interfaceParents.next()) {
+                  if (var22.keep) {
+                     var22.keep = false;
                   } else {
-                     MenuAction.closeWidgetGroup(var20, true);
+                     MenuAction.closeInterface(var22, true);
                   }
                }
 
                widgetClickMasks = new NodeHashTable(512);
 
-               while(var3.index < var16) {
-                  var7 = var3.readInt();
-                  var8 = var3.__ag_302();
-                  var9 = var3.__ag_302();
+               while (var3.index < var38) {
                   var10 = var3.readInt();
+                  var11 = var3.readUnsignedShort();
+                  var12 = var3.readUnsignedShort();
+                  var13 = var3.readInt();
 
-                  for(int var29 = var8; var29 <= var9; ++var29) {
-                     var12 = (long)var29 + ((long)var7 << 32);
-                     widgetClickMasks.put(new IntegerNode(var10), var12);
+                  for (var51 = var11; var51 <= var12; ++var51) {
+                     var23 = (long)var51 + ((long)var10 << 32);
+                     widgetClickMasks.put(new IntegerNode(var13), var23);
                   }
                }
 
@@ -5878,34 +5647,34 @@ public final class Client extends GameShell implements Usernamed {
                return true;
             }
 
-            if(ServerPacket.__ge_br == var1.serverPacket0) {
-               var16 = var3.__bb_317();
-               var5 = var3.__bb_317();
-               var6 = var3.readStringCp1252NullTerminated();
-               if(var5 >= 1 && var5 <= 8) {
-                  if(var6.equalsIgnoreCase("null")) {
-                     var6 = null;
+            if (ServerPacket.field855 == var1.serverPacket0) {
+               var38 = var3.method58();
+               var6 = var3.method58();
+               var17 = var3.readStringCp1252NullTerminated();
+               if (var6 >= 1 && var6 <= 8) {
+                  if (var17.equalsIgnoreCase("null")) {
+                     var17 = null;
                   }
 
-                  playerMenuActions[var5 - 1] = var6;
-                  playerOptionsPriorities[var5 - 1] = var16 == 0;
+                  playerMenuActions[var6 - 1] = var17;
+                  playerOptionsPriorities[var6 - 1] = var38 == 0;
                }
 
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_ab == var1.serverPacket0) {
+            if (ServerPacket.field826 == var1.serverPacket0) {
                Clock.method3533(var3.readStringCp1252NullTerminated());
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_am == var1.serverPacket0) {
-               if(var1.serverPacket0Length == 0) {
+            if (ServerPacket.field832 == var1.serverPacket0) {
+               if (var1.serverPacket0Length == 0) {
                   PacketWriter.clanChat = null;
                } else {
-                  if(PacketWriter.clanChat == null) {
+                  if (PacketWriter.clanChat == null) {
                      PacketWriter.clanChat = new ClanChat(KeyHandler.loginType, TextureProvider.client);
                   }
 
@@ -5917,48 +5686,48 @@ public final class Client extends GameShell implements Usernamed {
                return true;
             }
 
-            if(ServerPacket.__ge_o == var1.serverPacket0) {
-               var16 = var3.__ag_302();
-               var5 = var3.readInt();
-               Varps.Varps_temp[var16] = var5;
-               if(Varps.Varps_main[var16] != var5) {
-                  Varps.Varps_main[var16] = var5;
+            if (ServerPacket.field793 == var1.serverPacket0) {
+               var38 = var3.readUnsignedShort();
+               var6 = var3.readInt();
+               Varps.Varps_temp[var38] = var6;
+               if (Varps.Varps_main[var38] != var6) {
+                  Varps.Varps_main[var38] = var6;
                }
 
-               IndexCache.method4703(var16);
-               __client_nr[++__client_nd - 1 & 31] = var16;
+               Archive.method4703(var38);
+               field121[++field123 - 1 & 31] = var38;
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_g == var1.serverPacket0) {
+            if (ServerPacket.field795 == var1.serverPacket0) {
                class16.method189(class190.field2349);
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_x == var1.serverPacket0) {
-               var16 = var3.readInt();
-               WidgetGroupParent var48 = (WidgetGroupParent)widgetGroupParents.get((long)var16);
-               if(var48 != null) {
-                  MenuAction.closeWidgetGroup(var48, true);
+            if (ServerPacket.field798 == var1.serverPacket0) {
+               var38 = var3.readInt();
+               var30 = (InterfaceParent)interfaceParents.get((long)var38);
+               if (var30 != null) {
+                  MenuAction.closeInterface(var30, true);
                }
 
-               if(__client_mo != null) {
-                  class22.method295(__client_mo);
-                  __client_mo = null;
+               if (field127 != null) {
+                  WorldMapRectangle.method295(field127);
+                  field127 = null;
                }
 
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_bf == var1.serverPacket0) {
-               for(var16 = 0; var16 < Varps.Varps_main.length; ++var16) {
-                  if(Varps.Varps_temp[var16] != Varps.Varps_main[var16]) {
-                     Varps.Varps_main[var16] = Varps.Varps_temp[var16];
-                     IndexCache.method4703(var16);
-                     __client_nr[++__client_nd - 1 & 31] = var16;
+            if (ServerPacket.field862 == var1.serverPacket0) {
+               for (var38 = 0; var38 < Varps.Varps_main.length; ++var38) {
+                  if (Varps.Varps_temp[var38] != Varps.Varps_main[var38]) {
+                     Varps.Varps_main[var38] = Varps.Varps_temp[var38];
+                     Archive.method4703(var38);
+                     field121[++field123 - 1 & 31] = var38;
                   }
                }
 
@@ -5966,84 +5735,84 @@ public final class Client extends GameShell implements Usernamed {
                return true;
             }
 
-            if(ServerPacket.__ge_bd == var1.serverPacket0) {
-               WorldMapArea.friendSystem.__q_153(var3, var1.serverPacket0Length);
-               __client_na = cycleCntr;
+            if (ServerPacket.field847 == var1.serverPacket0) {
+               WorldMapArea.friendSystem.method101(var3, var1.serverPacket0Length);
+               field105 = cycleCntr;
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_r == var1.serverPacket0) {
-               var16 = var3.__bm_326();
-               if(var16 == 65535) {
-                  var16 = -1;
+            if (ServerPacket.field812 == var1.serverPacket0) {
+               var38 = var3.method67();
+               if (var38 == 65535) {
+                  var38 = -1;
                }
 
-               AbstractUserComparator.method5437(var16);
+               AbstractUserComparator.method5437(var38);
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_ad == var1.serverPacket0) {
-               var16 = var3.__bj_329();
-               var5 = var3.__bu_325();
-               if(var5 == 65535) {
-                  var5 = -1;
+            if (ServerPacket.field829 == var1.serverPacket0) {
+               var38 = var3.method70();
+               var6 = var3.method66();
+               if (var6 == 65535) {
+                  var6 = -1;
                }
 
-               HealthBar.method1994(var5, var16);
+               HealthBar.method1994(var6, var38);
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_bw == var1.serverPacket0) {
-               var16 = var3.__bb_317();
-               var5 = var3.__bp_331();
-               var18 = var3.__bm_326();
-               var20 = (WidgetGroupParent)widgetGroupParents.get((long)var5);
-               if(var20 != null) {
-                  MenuAction.closeWidgetGroup(var20, var18 != var20.group);
+            if (ServerPacket.field866 == var1.serverPacket0) {
+               var38 = var3.method58();
+               var6 = var3.method72();
+               var5 = var3.method67();
+               var22 = (InterfaceParent)interfaceParents.get((long)var6);
+               if (var22 != null) {
+                  MenuAction.closeInterface(var22, var5 != var22.group);
                }
 
-               SecureRandomCallable.method1143(var5, var18, var16);
+               SecureRandomCallable.method1143(var6, var5, var38);
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_d == var1.serverPacket0) {
-               var37 = var3.readStringCp1252NullTerminated();
-               var24 = (long)var3.__ag_302();
-               var26 = (long)var3.readMedium();
-               PlayerType var30 = (PlayerType)ScriptFrame.findEnumerated(class48.method865(), var3.readUnsignedByte());
-               long var31 = (var24 << 32) + var26;
+            if (ServerPacket.field799 == var1.serverPacket0) {
+               var21 = var3.readStringCp1252NullTerminated();
+               var25 = (long)var3.readUnsignedShort();
+               var27 = (long)var3.readMedium();
+               var29 = (PlayerType)ScriptFrame.findEnumerated(class48.method865(), var3.readUnsignedByte());
+               long var31 = (var25 << 32) + var27;
                boolean var33 = false;
 
-               for(int var13 = 0; var13 < 100; ++var13) {
-                  if(var31 == __client_pu[var13]) {
+               for (int var34 = 0; var34 < 100; ++var34) {
+                  if (var31 == field152[var34]) {
                      var33 = true;
                      break;
                   }
                }
 
-               if(WorldMapArea.friendSystem.isIgnored(new Username(var37, KeyHandler.loginType))) {
+               if (WorldMapArea.friendSystem.isIgnored(new Username(var21, KeyHandler.loginType))) {
                   var33 = true;
                }
 
-               if(!var33 && __client_jc == 0) {
-                  __client_pu[__client_pb] = var31;
-                  __client_pb = (__client_pb + 1) % 100;
-                  String var34 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(var3)));
-                  byte var14;
-                  if(var30.isPrivileged) {
-                     var14 = 7;
+               if (!var33 && field208 == 0) {
+                  field152[field156] = var31;
+                  field156 = (field156 + 1) % 100;
+                  String var57 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(var3)));
+                  byte var35;
+                  if (var29.isPrivileged) {
+                     var35 = 7;
                   } else {
-                     var14 = 3;
+                     var35 = 3;
                   }
 
-                  if(var30.modIcon != -1) {
-                     WorldMapIcon1.method219(var14, ItemContainer.method1170(var30.modIcon) + var37, var34);
+                  if (var29.modIcon != -1) {
+                     WorldMapIcon1.addGameMessage(var35, ItemContainer.method1170(var29.modIcon) + var21, var57);
                   } else {
-                     WorldMapIcon1.method219(var14, var37, var34);
+                     WorldMapIcon1.addGameMessage(var35, var21, var57);
                   }
                }
 
@@ -6051,10 +5820,10 @@ public final class Client extends GameShell implements Usernamed {
                return true;
             }
 
-            if(ServerPacket.__ge_u == var1.serverPacket0) {
-               var16 = var3.readInt();
-               if(var16 != __client_il) {
-                  __client_il = var16;
+            if (ServerPacket.field794 == var1.serverPacket0) {
+               var38 = var3.readInt();
+               if (var38 != field198) {
+                  field198 = var38;
                   WorldMapArea.method428();
                }
 
@@ -6062,32 +5831,32 @@ public final class Client extends GameShell implements Usernamed {
                return true;
             }
 
-            if(ServerPacket.__ge_bh == var1.serverPacket0) {
+            if (ServerPacket.field863 == var1.serverPacket0) {
                minimapState = var3.readUnsignedByte();
                var1.serverPacket0 = null;
                return true;
             }
 
-            if(ServerPacket.__ge_ae == var1.serverPacket0) {
-               var37 = var3.readStringCp1252NullTerminated();
-               var17 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(var3)));
-               WorldMapIcon1.method219(6, var37, var17);
+            if (ServerPacket.field827 == var1.serverPacket0) {
+               var21 = var3.readStringCp1252NullTerminated();
+               var4 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(var3)));
+               WorldMapIcon1.addGameMessage(6, var21, var4);
                var1.serverPacket0 = null;
                return true;
             }
 
-            NpcDefinition.sendStackTrace("" + (var1.serverPacket0 != null?var1.serverPacket0.id:-1) + "," + (var1.__n != null?var1.__n.id:-1) + "," + (var1.__i != null?var1.__i.id:-1) + "," + var1.serverPacket0Length, (Throwable)null);
+            NPCDefinition.sendStackTrace("" + (var1.serverPacket0 != null ? var1.serverPacket0.id : -1) + "," + (var1.field677 != null ? var1.field677.id : -1) + "," + (var1.field678 != null ? var1.field678.id : -1) + "," + var1.serverPacket0Length, (Throwable)null);
             TextureProvider.method2773();
-         } catch (IOException var35) {
+         } catch (IOException var36) {
             class48.method868();
-         } catch (Exception var36) {
-            var17 = "" + (var1.serverPacket0 != null?var1.serverPacket0.id:-1) + "," + (var1.__n != null?var1.__n.id:-1) + "," + (var1.__i != null?var1.__i.id:-1) + "," + var1.serverPacket0Length + "," + (Canvas.localPlayer.pathX[0] + class50.baseX) + "," + (Canvas.localPlayer.pathY[0] + GraphicsObject.baseY) + ",";
+         } catch (Exception var37) {
+            var4 = "" + (var1.serverPacket0 != null ? var1.serverPacket0.id : -1) + "," + (var1.field677 != null ? var1.field677.id : -1) + "," + (var1.field678 != null ? var1.field678.id : -1) + "," + var1.serverPacket0Length + "," + (Canvas.localPlayer.pathX[0] + class50.baseX) + "," + (Canvas.localPlayer.pathY[0] + GraphicsObject.baseY) + ",";
 
-            for(var18 = 0; var18 < var1.serverPacket0Length && var18 < 50; ++var18) {
-               var17 = var17 + var3.array[var18] + ",";
+            for (var5 = 0; var5 < var1.serverPacket0Length && var5 < 50; ++var5) {
+               var4 = var4 + var3.array[var5] + ",";
             }
 
-            NpcDefinition.sendStackTrace(var17, var36);
+            NPCDefinition.sendStackTrace(var4, var37);
             TextureProvider.method2773();
          }
 
@@ -6100,34 +5869,34 @@ public final class Client extends GameShell implements Usernamed {
       signature = "(I)V",
       garbageValue = "-387903382"
    )
-   final void __hi_139() {
+   final void method86() {
       boolean var1 = false;
 
       int var2;
-      int var5;
-      while(!var1) {
+      int var3;
+      while (!var1) {
          var1 = true;
 
-         for(var2 = 0; var2 < menuOptionsCount - 1; ++var2) {
-            if(menuOpcodes[var2] < 1000 && menuOpcodes[var2 + 1] > 1000) {
-               String var3 = menuTargetNames[var2];
+         for (var2 = 0; var2 < menuOptionsCount - 1; ++var2) {
+            if (menuOpcodes[var2] < 1000 && menuOpcodes[var2 + 1] > 1000) {
+               String var4 = menuTargetNames[var2];
                menuTargetNames[var2] = menuTargetNames[var2 + 1];
-               menuTargetNames[var2 + 1] = var3;
-               String var4 = menuActions[var2];
+               menuTargetNames[var2 + 1] = var4;
+               String var5 = menuActions[var2];
                menuActions[var2] = menuActions[var2 + 1];
-               menuActions[var2 + 1] = var4;
-               var5 = menuOpcodes[var2];
+               menuActions[var2 + 1] = var5;
+               var3 = menuOpcodes[var2];
                menuOpcodes[var2] = menuOpcodes[var2 + 1];
-               menuOpcodes[var2 + 1] = var5;
-               var5 = menuArguments1[var2];
+               menuOpcodes[var2 + 1] = var3;
+               var3 = menuArguments1[var2];
                menuArguments1[var2] = menuArguments1[var2 + 1];
-               menuArguments1[var2 + 1] = var5;
-               var5 = menuArguments2[var2];
+               menuArguments1[var2 + 1] = var3;
+               var3 = menuArguments2[var2];
                menuArguments2[var2] = menuArguments2[var2 + 1];
-               menuArguments2[var2 + 1] = var5;
-               var5 = menuArguments0[var2];
+               menuArguments2[var2 + 1] = var3;
+               var3 = menuArguments0[var2];
                menuArguments0[var2] = menuArguments0[var2 + 1];
-               menuArguments0[var2 + 1] = var5;
+               menuArguments0[var2 + 1] = var3;
                boolean var6 = menuShiftClick[var2];
                menuShiftClick[var2] = menuShiftClick[var2 + 1];
                menuShiftClick[var2 + 1] = var6;
@@ -6136,112 +5905,112 @@ public final class Client extends GameShell implements Usernamed {
          }
       }
 
-      if(DevicePcmPlayerProvider.dragInventoryWidget == null) {
-         if(clickedWidget == null) {
-            int var16;
-            label279: {
-               int var15 = MouseHandler.MouseHandler_lastButton;
-               int var9;
-               int var13;
-               if(isMenuOpen) {
-                  int var12;
-                  if(var15 != 1 && (AbstractRasterProvider.mouseCam || var15 != 4)) {
-                     var2 = MouseHandler.MouseHandler_x;
-                     var12 = MouseHandler.MouseHandler_y;
-                     if(var2 < class25.menuX - 10 || var2 > class25.menuX + class214.menuWidth + 10 || var12 < GameShell.menuY - 10 || var12 > AbstractWorldMapIcon.menuHeight + GameShell.menuY + 10) {
-                        isMenuOpen = false;
-                        Players.method2112(class25.menuX, GameShell.menuY, class214.menuWidth, AbstractWorldMapIcon.menuHeight);
-                     }
+      if (DevicePcmPlayerProvider.dragInventoryWidget == null && clickedWidget == null) {
+         int var11 = MouseHandler.MouseHandler_lastButton;
+         int var7;
+         int var12;
+         int var13;
+         if (isMenuOpen) {
+            int var14;
+            if (var11 != 1 && (AbstractRasterProvider.mouseCam || var11 != 4)) {
+               var2 = MouseHandler.MouseHandler_x;
+               var14 = MouseHandler.MouseHandler_y;
+               if (var2 < WorldMapDecoration.menuX - 10 || var2 > WorldMapDecoration.menuX + class214.menuWidth + 10 || var14 < GameShell.menuY - 10 || var14 > AbstractWorldMapIcon.menuHeight + GameShell.menuY + 10) {
+                  isMenuOpen = false;
+                  Players.method2112(WorldMapDecoration.menuX, GameShell.menuY, class214.menuWidth, AbstractWorldMapIcon.menuHeight);
+               }
+            }
+
+            if (var11 == 1 || !AbstractRasterProvider.mouseCam && var11 == 4) {
+               var2 = WorldMapDecoration.menuX;
+               var14 = GameShell.menuY;
+               var12 = class214.menuWidth;
+               var3 = MouseHandler.MouseHandler_lastPressedX;
+               var13 = MouseHandler.MouseHandler_lastPressedY;
+               int var15 = -1;
+
+               for (int var16 = 0; var16 < menuOptionsCount; ++var16) {
+                  var7 = (menuOptionsCount - 1 - var16) * 15 + var14 + 31;
+                  if (var3 > var2 && var3 < var12 + var2 && var13 > var7 - 13 && var13 < var7 + 3) {
+                     var15 = var16;
                   }
+               }
 
-                  if(var15 == 1 || !AbstractRasterProvider.mouseCam && var15 == 4) {
-                     var2 = class25.menuX;
-                     var12 = GameShell.menuY;
-                     var13 = class214.menuWidth;
-                     var5 = MouseHandler.MouseHandler_lastPressedX;
-                     var16 = MouseHandler.MouseHandler_lastPressedY;
-                     int var7 = -1;
+               if (var15 != -1) {
+                  WorldMapSection3.method245(var15);
+               }
 
-                     for(int var17 = 0; var17 < menuOptionsCount; ++var17) {
-                        var9 = (menuOptionsCount - 1 - var17) * 15 + var12 + 31;
-                        if(var5 > var2 && var5 < var13 + var2 && var16 > var9 - 13 && var16 < var9 + 3) {
-                           var7 = var17;
-                        }
+               isMenuOpen = false;
+               Players.method2112(WorldMapDecoration.menuX, GameShell.menuY, class214.menuWidth, AbstractWorldMapIcon.menuHeight);
+            }
+         } else {
+            label219: {
+               var2 = menuOptionsCount - 1;
+               if ((var11 == 1 || !AbstractRasterProvider.mouseCam && var11 == 4) && var2 >= 0) {
+                  var12 = menuOpcodes[var2];
+                  if (var12 == 39 || var12 == 40 || var12 == 41 || var12 == 42 || var12 == 43 || var12 == 33 || var12 == 34 || var12 == 35 || var12 == 36 || var12 == 37 || var12 == 38 || var12 == 1005) {
+                     var3 = menuArguments1[var2];
+                     var13 = menuArguments2[var2];
+                     Widget var8 = Huffman.getWidget(var13);
+                     var7 = class1.getWidgetClickMask(var8);
+                     boolean var9 = (var7 >> 28 & 1) != 0;
+                     if (var9) {
+                        break label219;
                      }
 
-                     if(var7 != -1) {
-                        WorldMapSection0.method245(var7);
-                     }
-
-                     isMenuOpen = false;
-                     Players.method2112(class25.menuX, GameShell.menuY, class214.menuWidth, AbstractWorldMapIcon.menuHeight);
-                  }
-               } else {
-                  var2 = menuOptionsCount - 1;
-                  if((var15 == 1 || !AbstractRasterProvider.mouseCam && var15 == 4) && var2 >= 0) {
-                     var13 = menuOpcodes[var2];
-                     if(var13 == 39 || var13 == 40 || var13 == 41 || var13 == 42 || var13 == 43 || var13 == 33 || var13 == 34 || var13 == 35 || var13 == 36 || var13 == 37 || var13 == 38 || var13 == 1005) {
-                        var5 = menuArguments1[var2];
-                        var16 = menuArguments2[var2];
-                        Widget var14 = Huffman.getWidget(var16);
-                        var9 = class1.getWidgetClickMask(var14);
-                        boolean var8 = (var9 >> 28 & 1) != 0;
-                        if(var8) {
-                           break label279;
-                        }
-
-                        Object var10000 = null;
-                        if(class168.method3461(class1.getWidgetClickMask(var14))) {
-                           break label279;
-                        }
+                     Object var10 = null;
+                     if (class168.method3461(class1.getWidgetClickMask(var8))) {
+                        break label219;
                      }
                   }
+               }
 
-                  if((var15 == 1 || !AbstractRasterProvider.mouseCam && var15 == 4) && this.shouldLeftClickOpenMenu()) {
-                     var15 = 2;
-                  }
+               if ((var11 == 1 || !AbstractRasterProvider.mouseCam && var11 == 4) && this.shouldLeftClickOpenMenu()) {
+                  var11 = 2;
+               }
 
-                  if((var15 == 1 || !AbstractRasterProvider.mouseCam && var15 == 4) && menuOptionsCount > 0) {
-                     WorldMapSection0.method245(var2);
-                  }
+               if ((var11 == 1 || !AbstractRasterProvider.mouseCam && var11 == 4) && menuOptionsCount > 0) {
+                  WorldMapSection3.method245(var2);
+               }
 
-                  if(var15 == 2 && menuOptionsCount > 0) {
-                     this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY);
-                  }
+               if (var11 == 2 && menuOptionsCount > 0) {
+                  this.openMenu(MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY);
                }
 
                return;
             }
 
-            if(DevicePcmPlayerProvider.dragInventoryWidget != null && !__client_jl && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) {
-               int var10 = __client_ja;
-               int var11 = __client_je;
-               class231.processTempMenuAction(UnitPriceComparator.tempMenuAction, var10, var11);
-               UnitPriceComparator.tempMenuAction = null;
+            if (DevicePcmPlayerProvider.dragInventoryWidget != null && !field207 && menuOptionsCount > 0 && !this.shouldLeftClickOpenMenu()) {
+               var11 = field205;
+               var7 = field206;
+               WorldMapDecorationType.processTempMenuAction(GrandExchangeOfferUnitPriceComparator.tempMenuAction, var11, var7);
+               GrandExchangeOfferUnitPriceComparator.tempMenuAction = null;
             }
 
-            __client_jl = false;
+            field207 = false;
             itemDragDuration = 0;
-            if(DevicePcmPlayerProvider.dragInventoryWidget != null) {
-               class22.method295(DevicePcmPlayerProvider.dragInventoryWidget);
+            if (DevicePcmPlayerProvider.dragInventoryWidget != null) {
+               WorldMapRectangle.method295(DevicePcmPlayerProvider.dragInventoryWidget);
             }
 
-            DevicePcmPlayerProvider.dragInventoryWidget = Huffman.getWidget(var16);
-            dragItemSlotSource = var5;
-            __client_ja = MouseHandler.MouseHandler_lastPressedX;
-            __client_je = MouseHandler.MouseHandler_lastPressedY;
-            if(var2 >= 0) {
-               UnitPriceComparator.tempMenuAction = new MenuAction();
-               UnitPriceComparator.tempMenuAction.argument1 = menuArguments1[var2];
-               UnitPriceComparator.tempMenuAction.argument2 = menuArguments2[var2];
-               UnitPriceComparator.tempMenuAction.opcode = menuOpcodes[var2];
-               UnitPriceComparator.tempMenuAction.argument0 = menuArguments0[var2];
-               UnitPriceComparator.tempMenuAction.action = menuActions[var2];
+            DevicePcmPlayerProvider.dragInventoryWidget = Huffman.getWidget(var13);
+            dragItemSlotSource = var3;
+            field205 = MouseHandler.MouseHandler_lastPressedX;
+            field206 = MouseHandler.MouseHandler_lastPressedY;
+            if (var2 >= 0) {
+               GrandExchangeOfferUnitPriceComparator.tempMenuAction = new MenuAction();
+               GrandExchangeOfferUnitPriceComparator.tempMenuAction.argument1 = menuArguments1[var2];
+               GrandExchangeOfferUnitPriceComparator.tempMenuAction.argument2 = menuArguments2[var2];
+               GrandExchangeOfferUnitPriceComparator.tempMenuAction.opcode = menuOpcodes[var2];
+               GrandExchangeOfferUnitPriceComparator.tempMenuAction.argument0 = menuArguments0[var2];
+               GrandExchangeOfferUnitPriceComparator.tempMenuAction.action = menuActions[var2];
             }
 
-            class22.method295(DevicePcmPlayerProvider.dragInventoryWidget);
+            WorldMapRectangle.method295(DevicePcmPlayerProvider.dragInventoryWidget);
+            return;
          }
       }
+
    }
 
    @ObfuscatedName("ht")
@@ -6252,7 +6021,7 @@ public final class Client extends GameShell implements Usernamed {
    @Export("shouldLeftClickOpenMenu")
    final boolean shouldLeftClickOpenMenu() {
       int var1 = menuOptionsCount - 1;
-      return (__client_ku == 1 && menuOptionsCount > 2 || UserComparator7.method3364(var1)) && !menuShiftClick[var1];
+      return (field215 == 1 && menuOptionsCount > 2 || UserComparator7.method3364(var1)) && !menuShiftClick[var1];
    }
 
    @ObfuscatedName("hj")
@@ -6261,52 +6030,52 @@ public final class Client extends GameShell implements Usernamed {
       garbageValue = "1"
    )
    @Export("openMenu")
-   final void openMenu(int var1, int var2) {
+   final void openMenu(int x, int y) {
       int var3 = class2.fontBold12.stringWidth("Choose Option");
 
       int var4;
-      for(var4 = 0; var4 < menuOptionsCount; ++var4) {
+      for (var4 = 0; var4 < menuOptionsCount; ++var4) {
          Font var5 = class2.fontBold12;
          String var6;
-         if(var4 < 0) {
+         if (var4 < 0) {
             var6 = "";
-         } else if(menuTargetNames[var4].length() > 0) {
+         } else if (menuTargetNames[var4].length() > 0) {
             var6 = menuActions[var4] + " " + menuTargetNames[var4];
          } else {
             var6 = menuActions[var4];
          }
 
          int var7 = var5.stringWidth(var6);
-         if(var7 > var3) {
+         if (var7 > var3) {
             var3 = var7;
          }
       }
 
       var3 += 8;
       var4 = menuOptionsCount * 15 + 22;
-      int var8 = var1 - var3 / 2;
-      if(var3 + var8 > SoundCache.canvasWidth) {
+      int var8 = x - var3 / 2;
+      if (var3 + var8 > SoundCache.canvasWidth) {
          var8 = SoundCache.canvasWidth - var3;
       }
 
-      if(var8 < 0) {
+      if (var8 < 0) {
          var8 = 0;
       }
 
-      int var9 = var2;
-      if(var4 + var2 > Huffman.canvasHeight) {
+      int var9 = y;
+      if (var4 + y > Huffman.canvasHeight) {
          var9 = Huffman.canvasHeight - var4;
       }
 
-      if(var9 < 0) {
+      if (var9 < 0) {
          var9 = 0;
       }
 
-      class25.menuX = var8;
+      WorldMapDecoration.menuX = var8;
       GameShell.menuY = var9;
       class214.menuWidth = var3;
       AbstractWorldMapIcon.menuHeight = menuOptionsCount * 15 + 22;
-      class65.scene.menuOpen(SoundSystem.plane, var1, var2, false);
+      class65.scene.menuOpen(SoundSystem.plane, x, y, false);
       isMenuOpen = true;
    }
 
@@ -6315,12 +6084,12 @@ public final class Client extends GameShell implements Usernamed {
       signature = "(ZI)V",
       garbageValue = "-271438207"
    )
-   final void __iu_141(boolean var1) {
-      int var2 = rootWidgetGroup;
+   final void method87(boolean var1) {
+      int var2 = rootInterface;
       int var3 = SoundCache.canvasWidth;
       int var4 = Huffman.canvasHeight;
-      if(GroundItemPile.loadWidgetGroup(var2)) {
-         WorldMapRegion.notRevalidateWidgetScroll(Widget.widgets[var2], -1, var3, var4, var1);
+      if (GroundItemPile.loadInterface(var2)) {
+         WorldMapRegion.notRevalidateWidgetScroll(Widget.interfaceComponents[var2], -1, var3, var4, var1);
       }
 
    }
@@ -6331,11 +6100,11 @@ public final class Client extends GameShell implements Usernamed {
       garbageValue = "0"
    )
    @Export("alignWidget")
-   void alignWidget(Widget var1) {
-      Widget var2 = var1.parentId == -1?null:Huffman.getWidget(var1.parentId);
+   void alignWidget(Widget component) {
+      Widget var2 = component.parentId == -1 ? null : Huffman.getWidget(component.parentId);
       int var3;
       int var4;
-      if(var2 == null) {
+      if (var2 == null) {
          var3 = SoundCache.canvasWidth;
          var4 = Huffman.canvasHeight;
       } else {
@@ -6343,8 +6112,8 @@ public final class Client extends GameShell implements Usernamed {
          var4 = var2.height;
       }
 
-      WorldMapSection3.alignWidgetSize(var1, var3, var4, false);
-      OverlayDefinition.alignWidgetPosition(var1, var3, var4);
+      WorldMapSection1.alignWidgetSize(component, var3, var4, false);
+      FloorOverlayDefinition.alignWidgetPosition(component, var3, var4);
    }
 
    @ObfuscatedName("jh")
@@ -6352,115 +6121,113 @@ public final class Client extends GameShell implements Usernamed {
       signature = "(I)V",
       garbageValue = "715978124"
    )
-   final void __jh_142() {
-      class22.method295(clickedWidget);
+   final void method88() {
+      WorldMapRectangle.method295(clickedWidget);
       ++MouseRecorder.widgetDragDuration;
-      if(__client_nt && __client_nn) {
+      if (field103 && field106) {
          int var1 = MouseHandler.MouseHandler_x;
          int var2 = MouseHandler.MouseHandler_y;
          var1 -= widgetClickX;
          var2 -= widgetClickY;
-         if(var1 < __client_nw) {
-            var1 = __client_nw;
+         if (var1 < field108) {
+            var1 = field108;
          }
 
-         if(var1 + clickedWidget.width > __client_nw + clickedWidgetParent.width) {
-            var1 = __client_nw + clickedWidgetParent.width - clickedWidget.width;
+         if (var1 + clickedWidget.width > field108 + clickedWidgetParent.width) {
+            var1 = field108 + clickedWidgetParent.width - clickedWidget.width;
          }
 
-         if(var2 < __client_nl) {
-            var2 = __client_nl;
+         if (var2 < field109) {
+            var2 = field109;
          }
 
-         if(var2 + clickedWidget.height > __client_nl + clickedWidgetParent.height) {
-            var2 = __client_nl + clickedWidgetParent.height - clickedWidget.height;
+         if (var2 + clickedWidget.height > field109 + clickedWidgetParent.height) {
+            var2 = field109 + clickedWidgetParent.height - clickedWidget.height;
          }
 
-         int var3 = var1 - __client_nk;
-         int var4 = var2 - __client_np;
+         int var3 = var1 - field110;
+         int var4 = var2 - field111;
          int var5 = clickedWidget.dragZoneSize;
-         if(MouseRecorder.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) {
+         if (MouseRecorder.widgetDragDuration > clickedWidget.dragThreshold && (var3 > var5 || var3 < -var5 || var4 > var5 || var4 < -var5)) {
             isDraggingWidget = true;
          }
 
-         int var6 = var1 - __client_nw + clickedWidgetParent.scrollX;
-         int var7 = var2 - __client_nl + clickedWidgetParent.scrollY;
+         int var6 = var1 - field108 + clickedWidgetParent.scrollX;
+         int var7 = var2 - field109 + clickedWidgetParent.scrollY;
          ScriptEvent var8;
-         if(clickedWidget.onDrag != null && isDraggingWidget) {
+         if (clickedWidget.onDrag != null && isDraggingWidget) {
             var8 = new ScriptEvent();
             var8.widget = clickedWidget;
             var8.mouseX = var6;
             var8.mouseY = var7;
             var8.args0 = clickedWidget.onDrag;
-            AbstractIndexCache.runScript(var8);
+            AbstractArchive.runScript(var8);
          }
 
-         if(MouseHandler.MouseHandler_currentButton == 0) {
-            if(isDraggingWidget) {
-               if(clickedWidget.onDragComplete != null) {
+         if (MouseHandler.MouseHandler_currentButton == 0) {
+            int var9;
+            if (isDraggingWidget) {
+               if (clickedWidget.onDragComplete != null) {
                   var8 = new ScriptEvent();
                   var8.widget = clickedWidget;
                   var8.mouseX = var6;
                   var8.mouseY = var7;
                   var8.dragTarget = draggedOnWidget;
                   var8.args0 = clickedWidget.onDragComplete;
-                  AbstractIndexCache.runScript(var8);
+                  AbstractArchive.runScript(var8);
                }
 
-               if(draggedOnWidget != null) {
-                  Widget var9 = clickedWidget;
-                  int var10 = WorldMapRegion.method568(class1.getWidgetClickMask(var9));
-                  Widget var15;
-                  if(var10 == 0) {
-                     var15 = null;
+               if (draggedOnWidget != null) {
+                  Widget var13 = clickedWidget;
+                  var9 = WorldMapRegion.method568(class1.getWidgetClickMask(var13));
+                  Widget var11;
+                  if (var9 == 0) {
+                     var11 = null;
                   } else {
-                     int var11 = 0;
+                     int var12 = 0;
 
-                     while(true) {
-                        if(var11 >= var10) {
-                           var15 = var9;
+                     while (true) {
+                        if (var12 >= var9) {
+                           var11 = var13;
                            break;
                         }
 
-                        var9 = Huffman.getWidget(var9.parentId);
-                        if(var9 == null) {
-                           var15 = null;
+                        var13 = Huffman.getWidget(var13.parentId);
+                        if (var13 == null) {
+                           var11 = null;
                            break;
                         }
 
-                        ++var11;
+                        ++var12;
                      }
                   }
 
-                  if(var15 != null) {
-                     PacketBufferNode var12 = Interpreter.method1915(ClientPacket.__gs_bk, packetWriter.isaacCipher);
-                     var12.packetBuffer.__bo_322(clickedWidget.childIndex);
-                     var12.packetBuffer.__bo_322(draggedOnWidget.itemId);
-                     var12.packetBuffer.writeShort(draggedOnWidget.childIndex);
-                     var12.packetBuffer.writeIntLE(clickedWidget.id);
-                     var12.packetBuffer.writeIntME(draggedOnWidget.id);
-                     var12.packetBuffer.writeShort(clickedWidget.itemId);
-                     packetWriter.__q_167(var12);
+                  if (var11 != null) {
+                     PacketBufferNode var14 = Interpreter.method1915(ClientPacket.field279, packetWriter.isaacCipher);
+                     var14.packetBuffer.method63(clickedWidget.childIndex);
+                     var14.packetBuffer.method63(draggedOnWidget.itemId);
+                     var14.packetBuffer.writeShort(draggedOnWidget.childIndex);
+                     var14.packetBuffer.writeIntLE(clickedWidget.id);
+                     var14.packetBuffer.writeIntME(draggedOnWidget.id);
+                     var14.packetBuffer.writeShort(clickedWidget.itemId);
+                     packetWriter.method241(var14);
                   }
                }
-            } else if(this.shouldLeftClickOpenMenu()) {
-               this.openMenu(__client_nk + widgetClickX, __client_np + widgetClickY);
-            } else if(menuOptionsCount > 0) {
-               int var13 = widgetClickX + __client_nk;
-               int var14 = widgetClickY + __client_np;
-               class231.processTempMenuAction(UnitPriceComparator.tempMenuAction, var13, var14);
-               UnitPriceComparator.tempMenuAction = null;
+            } else if (this.shouldLeftClickOpenMenu()) {
+               this.openMenu(field110 + widgetClickX, field111 + widgetClickY);
+            } else if (menuOptionsCount > 0) {
+               int var10 = widgetClickX + field110;
+               var9 = widgetClickY + field111;
+               WorldMapDecorationType.processTempMenuAction(GrandExchangeOfferUnitPriceComparator.tempMenuAction, var10, var9);
+               GrandExchangeOfferUnitPriceComparator.tempMenuAction = null;
             }
 
             clickedWidget = null;
          }
-
-      } else {
-         if(MouseRecorder.widgetDragDuration > 1) {
-            clickedWidget = null;
-         }
-
+      } else if (MouseRecorder.widgetDragDuration > 1) {
+         clickedWidget = null;
       }
+
    }
 
    @ObfuscatedName("kr")
@@ -6470,7 +6237,7 @@ public final class Client extends GameShell implements Usernamed {
    )
    @Export("username")
    public Username username() {
-      return Canvas.localPlayer != null?Canvas.localPlayer.username:null;
+      return Canvas.localPlayer != null ? Canvas.localPlayer.username : null;
    }
 
    @ObfuscatedName("l")
@@ -6479,12 +6246,12 @@ public final class Client extends GameShell implements Usernamed {
       garbageValue = "-1464358697"
    )
    @Export("hashString")
-   public static int hashString(CharSequence var0) {
-      int var1 = var0.length();
+   public static int hashString(CharSequence chars) {
+      int var1 = chars.length();
       int var2 = 0;
 
-      for(int var3 = 0; var3 < var1; ++var3) {
-         var2 = (var2 << 5) - var2 + HealthBar.charToByteCp1252(var0.charAt(var3));
+      for (int var3 = 0; var3 < var1; ++var3) {
+         var2 = (var2 << 5) - var2 + HealthBar.charToByteCp1252(chars.charAt(var3));
       }
 
       return var2;
@@ -6498,4 +6265,282 @@ public final class Client extends GameShell implements Usernamed {
    public static int method1692(String var0) {
       return var0.length() + 2;
    }
+
+   static {
+      field161 = true;
+      worldId = 1;
+      worldProperties = 0;
+      gameBuild = 0;
+      isMembersWorld = false;
+      isLowDetail = false;
+      language = 0;
+      clientType = -1;
+      onMobile = false;
+      gameState = 0;
+      isLoading = true;
+      cycle = 0;
+      mouseLastLastPressedTimeMillis = 1L;
+      field163 = -1;
+      field164 = -1;
+      field165 = -1L;
+      field166 = true;
+      displayFps = false;
+      rebootTimer = 0;
+      hintArrowType = 0;
+      hintArrowNpcIndex = 0;
+      hintArrowPlayerIndex = 0;
+      hintArrowX = 0;
+      hintArrowY = 0;
+      hintArrowHeight = 0;
+      hintArrowSubX = 0;
+      hintArrowSubY = 0;
+      playerAttackOption = AttackOption.AttackOption_hidden;
+      npcAttackOption = AttackOption.AttackOption_hidden;
+      titleLoadingStage = 0;
+      js5ConnectState = 0;
+      field167 = 0;
+      js5Errors = 0;
+      loginState = 0;
+      field168 = 0;
+      field169 = 0;
+      field170 = 0;
+      field658 = class159.field1985;
+      Login_isUsernameRemembered = false;
+      secureRandomFuture = new SecureRandomFuture();
+      field172 = null;
+      npcs = new NPC[32768];
+      npcCount = 0;
+      npcIndices = new int[32768];
+      field173 = 0;
+      field174 = new int[250];
+      packetWriter = new PacketWriter();
+      field175 = 0;
+      field176 = false;
+      useBufferedSocket = true;
+      timer = new Timer();
+      fontsMap = new HashMap();
+      field177 = 0;
+      field178 = 1;
+      field179 = 0;
+      field180 = 1;
+      field181 = 0;
+      collisionMaps = new CollisionMap[4];
+      isInInstance = false;
+      instanceChunkTemplates = new int[4][13][13];
+      field182 = 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};
+      field183 = 0;
+      field184 = 2301979;
+      field185 = 5063219;
+      field186 = 3353893;
+      field187 = 7759444;
+      field188 = false;
+      field189 = 0;
+      camAngleX = 128;
+      camAngleY = 0;
+      field190 = 0;
+      field191 = 0;
+      field192 = 0;
+      field193 = 0;
+      oculusOrbState = 0;
+      camFollowHeight = 50;
+      field194 = 0;
+      field195 = 0;
+      field196 = 0;
+      oculusOrbNormalSpeed = 12;
+      oculusOrbSlowedSpeed = 6;
+      field198 = 0;
+      field199 = false;
+      field200 = 0;
+      field201 = false;
+      field202 = 0;
+      overheadTextCount = 0;
+      overheadTextLimit = 50;
+      overheadTextXs = new int[overheadTextLimit];
+      overheadTextYs = new int[overheadTextLimit];
+      overheadTextAscents = new int[overheadTextLimit];
+      overheadTextXOffsets = new int[overheadTextLimit];
+      overheadTextColors = new int[overheadTextLimit];
+      overheadTextEffects = new int[overheadTextLimit];
+      overheadTextCyclesRemaining = new int[overheadTextLimit];
+      overheadText = new String[overheadTextLimit];
+      tileLastDrawnActor = new int[104][104];
+      viewportDrawCount = 0;
+      viewportTempX = -1;
+      viewportTempY = -1;
+      mouseCrossX = 0;
+      mouseCrossY = 0;
+      mouseCrossState = 0;
+      mouseCrossColor = 0;
+      showMouseCross = true;
+      field203 = 0;
+      field204 = 0;
+      dragItemSlotSource = 0;
+      field205 = 0;
+      field206 = 0;
+      dragItemSlotDestination = 0;
+      field207 = false;
+      itemDragDuration = 0;
+      field208 = 0;
+      showLoadingMessages = true;
+      players = new Player[2048];
+      localPlayerIndex = -1;
+      field209 = 0;
+      renderSelf = true;
+      field210 = 0;
+      field211 = 0;
+      field212 = new int[1000];
+      playerMenuOpcodes = new int[]{44, 45, 46, 47, 48, 49, 50, 51};
+      playerMenuActions = new String[8];
+      playerOptionsPriorities = new boolean[8];
+      field213 = new int[]{768, 1024, 1280, 512, 1536, 256, 0, 1792};
+      combatTargetPlayerIndex = -1;
+      groundItems = new NodeDeque[4][104][104];
+      pendingSpawns = new NodeDeque();
+      projectiles = new NodeDeque();
+      graphicsObjects = new NodeDeque();
+      currentLevels = new int[25];
+      levels = new int[25];
+      experience = new int[25];
+      field215 = 0;
+      isMenuOpen = false;
+      menuOptionsCount = 0;
+      menuArguments1 = new int[500];
+      menuArguments2 = new int[500];
+      menuOpcodes = new int[500];
+      menuArguments0 = new int[500];
+      menuActions = new String[500];
+      menuTargetNames = new String[500];
+      menuShiftClick = new boolean[500];
+      followerOpsLowPriority = false;
+      shiftClickDrop = false;
+      tapToDrop = false;
+      showMouseOverText = true;
+      field216 = -1;
+      field217 = -1;
+      field218 = 0;
+      field219 = 50;
+      isItemSelected = 0;
+      selectedItemName = null;
+      isSpellSelected = false;
+      field220 = -1;
+      field157 = -1;
+      selectedSpellActionName = null;
+      selectedSpellName = null;
+      rootInterface = -1;
+      interfaceParents = new NodeHashTable(8);
+      field151 = 0;
+      field153 = -1;
+      chatEffects = 0;
+      field136 = 0;
+      field127 = null;
+      runEnergy = 0;
+      weight = 0;
+      staffModLevel = 0;
+      followerIndex = -1;
+      playerMod = false;
+      viewportWidget = null;
+      clickedWidget = null;
+      clickedWidgetParent = null;
+      widgetClickX = 0;
+      widgetClickY = 0;
+      draggedOnWidget = null;
+      field106 = false;
+      field108 = -1;
+      field109 = -1;
+      field103 = false;
+      field110 = -1;
+      field111 = -1;
+      isDraggingWidget = false;
+      cycleCntr = 1;
+      field121 = new int[32];
+      field123 = 0;
+      field116 = new int[32];
+      field117 = 0;
+      changedSkills = new int[32];
+      changedSkillsCount = 0;
+      chatCycle = 0;
+      field105 = 0;
+      field129 = 0;
+      field122 = 0;
+      field154 = 0;
+      field124 = 0;
+      mouseWheelRotation = 0;
+      scriptEvents = new NodeDeque();
+      field147 = new NodeDeque();
+      field148 = new NodeDeque();
+      widgetClickMasks = new NodeHashTable(512);
+      rootWidgetCount = 0;
+      field98 = -2;
+      field100 = new boolean[100];
+      field102 = new boolean[100];
+      field101 = new boolean[100];
+      rootWidgetXs = new int[100];
+      rootWidgetYs = new int[100];
+      rootWidgetWidths = new int[100];
+      rootWidgetHeights = new int[100];
+      gameDrawingMode = 0;
+      field99 = 0L;
+      isResizable = true;
+      field160 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215};
+      publicChatMode = 0;
+      field138 = 0;
+      field158 = "";
+      field152 = new long[100];
+      field156 = 0;
+      field137 = 0;
+      field146 = new int[128];
+      field145 = new int[128];
+      field126 = -1L;
+      field125 = -1;
+      mapIconCount = 0;
+      mapIconXs = new int[1000];
+      mapIconYs = new int[1000];
+      mapIcons = new Sprite[1000];
+      destinationX = 0;
+      destinationY = 0;
+      minimapState = 0;
+      field128 = 255;
+      field112 = -1;
+      field107 = false;
+      soundEffectVolume = 127;
+      field115 = 127;
+      soundEffectCount = 0;
+      soundEffectIds = new int[50];
+      queuedSoundEffectLoops = new int[50];
+      queuedSoundEffectDelays = new int[50];
+      soundLocations = new int[50];
+      soundEffects = new SoundEffect[50];
+      isCameraLocked = false;
+      field139 = new boolean[5];
+      field141 = new int[5];
+      field142 = new int[5];
+      field143 = new int[5];
+      field144 = new int[5];
+      field130 = 256;
+      field131 = 205;
+      field150 = 256;
+      field149 = 320;
+      field135 = 1;
+      field134 = 32767;
+      field132 = 1;
+      field133 = 32767;
+      viewportOffsetX = 0;
+      viewportOffsetY = 0;
+      viewportWidth = 0;
+      viewportHeight = 0;
+      viewportZoom = 0;
+      playerAppearance = new PlayerAppearance();
+      field118 = -1;
+      field120 = -1;
+      platformInfoProvider = new DesktopPlatformInfoProvider();
+      grandExchangeOffers = new GrandExchangeOffer[8];
+      geOwnWorldComparator = new GrandExchangeOfferOwnWorldComparator();
+      field104 = -1;
+      archiveLoaders = new ArrayList(10);
+      archiveLoaderArchive = 0;
+      field140 = 0;
+      field895 = new class65();
+      field113 = new int[50];
+      field114 = new int[50];
+   }
 }
diff --git a/runescape-client/src/main/java/ClientPacket.java b/runescape-client/src/main/java/ClientPacket.java
index cf9ef3997d..cc684eabd8 100644
--- a/runescape-client/src/main/java/ClientPacket.java
+++ b/runescape-client/src/main/java/ClientPacket.java
@@ -11,507 +11,507 @@ public class ClientPacket implements ClientPacketMarker {
    @ObfuscatedGetter(
       intValue = 1076448827
    )
-   static int __gs_qh;
+   static int field221;
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_m;
+   public static final ClientPacket field222;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_f;
+   public static final ClientPacket field223;
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_q;
+   public static final ClientPacket field224;
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_w;
+   public static final ClientPacket field225;
    @ObfuscatedName("o")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_o;
+   public static final ClientPacket field226;
    @ObfuscatedName("u")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_u;
+   public static final ClientPacket field227;
    @ObfuscatedName("g")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_g;
+   public static final ClientPacket field228;
    @ObfuscatedName("l")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_l;
+   public static final ClientPacket field229;
    @ObfuscatedName("e")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_e;
+   public static final ClientPacket field230;
    @ObfuscatedName("x")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_x;
+   public static final ClientPacket field231;
    @ObfuscatedName("d")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_d;
+   public static final ClientPacket field232;
    @ObfuscatedName("k")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_k;
+   public static final ClientPacket field233;
    @ObfuscatedName("n")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_n;
+   public static final ClientPacket field234;
    @ObfuscatedName("i")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_i;
+   public static final ClientPacket field235;
    @ObfuscatedName("a")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_a;
+   public static final ClientPacket field236;
    @ObfuscatedName("z")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_z;
+   public static final ClientPacket field237;
    @ObfuscatedName("j")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_j;
+   public static final ClientPacket field238;
    @ObfuscatedName("s")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_s;
+   public static final ClientPacket field239;
    @ObfuscatedName("t")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_t;
+   public static final ClientPacket field240;
    @ObfuscatedName("y")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_y;
+   public static final ClientPacket field241;
    @ObfuscatedName("h")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_h;
+   public static final ClientPacket field242;
    @ObfuscatedName("b")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_b;
+   public static final ClientPacket field243;
    @ObfuscatedName("c")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_c;
+   public static final ClientPacket field244;
    @ObfuscatedName("r")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_r;
+   public static final ClientPacket field245;
    @ObfuscatedName("p")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_p;
+   public static final ClientPacket field246;
    @ObfuscatedName("v")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_v;
+   public static final ClientPacket field247;
    @ObfuscatedName("ag")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_ag;
+   public static final ClientPacket field248;
    @ObfuscatedName("aq")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_aq;
+   public static final ClientPacket field249;
    @ObfuscatedName("aj")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_aj;
+   public static final ClientPacket field250;
    @ObfuscatedName("av")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_av;
+   public static final ClientPacket field251;
    @ObfuscatedName("ar")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_ar;
+   public static final ClientPacket field252;
    @ObfuscatedName("ac")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_ac;
+   public static final ClientPacket field253;
    @ObfuscatedName("ay")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_ay;
+   public static final ClientPacket field254;
    @ObfuscatedName("ah")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_ah;
+   public static final ClientPacket field255;
    @ObfuscatedName("ak")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_ak;
+   public static final ClientPacket field256;
    @ObfuscatedName("aw")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_aw;
+   public static final ClientPacket field257;
    @ObfuscatedName("al")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_al;
+   public static final ClientPacket field258;
    @ObfuscatedName("ab")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_ab;
+   public static final ClientPacket field259;
    @ObfuscatedName("ae")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_ae;
+   public static final ClientPacket field260;
    @ObfuscatedName("at")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_at;
+   public static final ClientPacket field261;
    @ObfuscatedName("ad")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_ad;
+   public static final ClientPacket field262;
    @ObfuscatedName("ap")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_ap;
+   public static final ClientPacket field263;
    @ObfuscatedName("as")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_as;
+   public static final ClientPacket field264;
    @ObfuscatedName("am")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   static final ClientPacket __gs_am;
+   static final ClientPacket field265;
    @ObfuscatedName("an")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_an;
+   public static final ClientPacket field266;
    @ObfuscatedName("az")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_az;
+   public static final ClientPacket field267;
    @ObfuscatedName("au")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_au;
+   public static final ClientPacket field268;
    @ObfuscatedName("ao")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_ao;
+   public static final ClientPacket field269;
    @ObfuscatedName("aa")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_aa;
+   public static final ClientPacket field270;
    @ObfuscatedName("ax")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_ax;
+   public static final ClientPacket field271;
    @ObfuscatedName("af")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_af;
+   public static final ClientPacket field272;
    @ObfuscatedName("ai")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_ai;
+   public static final ClientPacket field273;
    @ObfuscatedName("ba")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_ba;
+   public static final ClientPacket field274;
    @ObfuscatedName("bb")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_bb;
+   public static final ClientPacket field275;
    @ObfuscatedName("bs")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_bs;
+   public static final ClientPacket field276;
    @ObfuscatedName("bq")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_bq;
+   public static final ClientPacket field277;
    @ObfuscatedName("bn")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_bn;
+   public static final ClientPacket field278;
    @ObfuscatedName("bk")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_bk;
+   public static final ClientPacket field279;
    @ObfuscatedName("bd")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_bd;
+   public static final ClientPacket field280;
    @ObfuscatedName("bc")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_bc;
+   public static final ClientPacket field281;
    @ObfuscatedName("bo")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_bo;
+   public static final ClientPacket field282;
    @ObfuscatedName("bx")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_bx;
+   public static final ClientPacket field283;
    @ObfuscatedName("by")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_by;
+   public static final ClientPacket field284;
    @ObfuscatedName("bu")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_bu;
+   public static final ClientPacket field285;
    @ObfuscatedName("bm")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_bm;
+   public static final ClientPacket field286;
    @ObfuscatedName("bl")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_bl;
+   public static final ClientPacket field287;
    @ObfuscatedName("br")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_br;
+   public static final ClientPacket field288;
    @ObfuscatedName("bj")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_bj;
+   public static final ClientPacket field289;
    @ObfuscatedName("bi")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_bi;
+   public static final ClientPacket field290;
    @ObfuscatedName("bz")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_bz;
+   public static final ClientPacket field291;
    @ObfuscatedName("bg")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_bg;
+   public static final ClientPacket field292;
    @ObfuscatedName("bt")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_bt;
+   public static final ClientPacket field293;
    @ObfuscatedName("bp")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_bp;
+   public static final ClientPacket field294;
    @ObfuscatedName("bf")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_bf;
+   public static final ClientPacket field295;
    @ObfuscatedName("bh")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_bh;
+   public static final ClientPacket field296;
    @ObfuscatedName("be")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_be;
+   public static final ClientPacket field297;
    @ObfuscatedName("bv")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_bv;
+   public static final ClientPacket field298;
    @ObfuscatedName("bw")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_bw;
+   public static final ClientPacket field299;
    @ObfuscatedName("cr")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_cr;
+   public static final ClientPacket field300;
    @ObfuscatedName("cv")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_cv;
+   public static final ClientPacket field301;
    @ObfuscatedName("ce")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_ce;
+   public static final ClientPacket field302;
    @ObfuscatedName("cy")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_cy;
+   public static final ClientPacket field303;
    @ObfuscatedName("cs")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_cs;
+   public static final ClientPacket field304;
    @ObfuscatedName("cm")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_cm;
+   public static final ClientPacket field305;
    @ObfuscatedName("cj")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_cj;
+   public static final ClientPacket field306;
    @ObfuscatedName("cu")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_cu;
+   public static final ClientPacket field307;
    @ObfuscatedName("cb")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_cb;
+   public static final ClientPacket field308;
    @ObfuscatedName("ck")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_ck;
+   public static final ClientPacket field309;
    @ObfuscatedName("cn")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_cn;
+   public static final ClientPacket field310;
    @ObfuscatedName("cq")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_cq;
+   public static final ClientPacket field311;
    @ObfuscatedName("ch")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_ch;
+   public static final ClientPacket field312;
    @ObfuscatedName("cw")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_cw;
+   public static final ClientPacket field313;
    @ObfuscatedName("cg")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_cg;
+   public static final ClientPacket field314;
    @ObfuscatedName("cf")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_cf;
+   public static final ClientPacket field315;
    @ObfuscatedName("cp")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_cp;
+   public static final ClientPacket field316;
    @ObfuscatedName("cl")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_cl;
+   public static final ClientPacket field317;
    @ObfuscatedName("ct")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_ct;
+   public static final ClientPacket field318;
    @ObfuscatedName("cz")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_cz;
+   public static final ClientPacket field319;
    @ObfuscatedName("cc")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public static final ClientPacket __gs_cc;
+   public static final ClientPacket field320;
    @ObfuscatedName("ci")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   static final ClientPacket __gs_ci;
+   static final ClientPacket field321;
    @ObfuscatedName("cd")
    @ObfuscatedGetter(
       intValue = -286923745
@@ -525,109 +525,6 @@ public class ClientPacket implements ClientPacketMarker {
    @Export("length")
    final int length;
 
-   static {
-      __gs_m = new ClientPacket(0, 8);
-      __gs_f = new ClientPacket(1, 3);
-      __gs_q = new ClientPacket(2, 14);
-      __gs_w = new ClientPacket(3, 7);
-      __gs_o = new ClientPacket(4, -1);
-      __gs_u = new ClientPacket(5, 7);
-      __gs_g = new ClientPacket(6, 7);
-      __gs_l = new ClientPacket(7, 8);
-      __gs_e = new ClientPacket(8, -1);
-      __gs_x = new ClientPacket(9, 4);
-      __gs_d = new ClientPacket(10, 7);
-      __gs_k = new ClientPacket(11, 10);
-      __gs_n = new ClientPacket(12, 13);
-      __gs_i = new ClientPacket(13, -1);
-      __gs_a = new ClientPacket(14, 8);
-      __gs_z = new ClientPacket(15, 3);
-      __gs_j = new ClientPacket(16, -2);
-      __gs_s = new ClientPacket(17, 4);
-      __gs_t = new ClientPacket(18, 15);
-      __gs_y = new ClientPacket(19, 8);
-      __gs_h = new ClientPacket(20, 0);
-      __gs_b = new ClientPacket(21, 8);
-      __gs_c = new ClientPacket(22, 0);
-      __gs_r = new ClientPacket(23, 11);
-      __gs_p = new ClientPacket(24, 2);
-      __gs_v = new ClientPacket(25, -2);
-      __gs_ag = new ClientPacket(26, 8);
-      __gs_aq = new ClientPacket(27, 3);
-      __gs_aj = new ClientPacket(28, -1);
-      __gs_av = new ClientPacket(29, 7);
-      __gs_ar = new ClientPacket(30, 2);
-      __gs_ac = new ClientPacket(31, 3);
-      __gs_ay = new ClientPacket(32, 8);
-      __gs_ah = new ClientPacket(33, 3);
-      __gs_ak = new ClientPacket(34, -1);
-      __gs_aw = new ClientPacket(35, 5);
-      __gs_al = new ClientPacket(36, 2);
-      __gs_ab = new ClientPacket(37, 0);
-      __gs_ae = new ClientPacket(38, -1);
-      __gs_at = new ClientPacket(39, 4);
-      __gs_ad = new ClientPacket(40, 8);
-      __gs_ap = new ClientPacket(41, 6);
-      __gs_as = new ClientPacket(42, 2);
-      __gs_am = new ClientPacket(43, -1);
-      __gs_an = new ClientPacket(44, 15);
-      __gs_az = new ClientPacket(45, 4);
-      __gs_au = new ClientPacket(46, 8);
-      __gs_ao = new ClientPacket(47, 3);
-      __gs_aa = new ClientPacket(48, 8);
-      __gs_ax = new ClientPacket(49, 0);
-      __gs_af = new ClientPacket(50, 3);
-      __gs_ai = new ClientPacket(51, 7);
-      __gs_ba = new ClientPacket(52, -1);
-      __gs_bb = new ClientPacket(53, 13);
-      __gs_bs = new ClientPacket(54, -1);
-      __gs_bq = new ClientPacket(55, 9);
-      __gs_bn = new ClientPacket(56, 3);
-      __gs_bk = new ClientPacket(57, 16);
-      __gs_bd = new ClientPacket(58, 8);
-      __gs_bc = new ClientPacket(59, 3);
-      __gs_bo = new ClientPacket(60, -1);
-      __gs_bx = new ClientPacket(61, 9);
-      __gs_by = new ClientPacket(62, 3);
-      __gs_bu = new ClientPacket(63, 16);
-      __gs_bm = new ClientPacket(64, 8);
-      __gs_bl = new ClientPacket(65, 8);
-      __gs_br = new ClientPacket(66, 8);
-      __gs_bj = new ClientPacket(67, -2);
-      __gs_bi = new ClientPacket(68, 8);
-      __gs_bz = new ClientPacket(69, 4);
-      __gs_bg = new ClientPacket(70, 6);
-      __gs_bt = new ClientPacket(71, 3);
-      __gs_bp = new ClientPacket(72, 8);
-      __gs_bf = new ClientPacket(73, 1);
-      __gs_bh = new ClientPacket(74, 7);
-      __gs_be = new ClientPacket(75, 3);
-      __gs_bv = new ClientPacket(76, 0);
-      __gs_bw = new ClientPacket(77, -1);
-      __gs_cr = new ClientPacket(78, -1);
-      __gs_cv = new ClientPacket(79, 7);
-      __gs_ce = new ClientPacket(80, 9);
-      __gs_cy = new ClientPacket(81, 11);
-      __gs_cs = new ClientPacket(82, 16);
-      __gs_cm = new ClientPacket(83, 3);
-      __gs_cj = new ClientPacket(84, 8);
-      __gs_cu = new ClientPacket(85, 8);
-      __gs_cb = new ClientPacket(86, 9);
-      __gs_ck = new ClientPacket(87, 8);
-      __gs_cn = new ClientPacket(88, -1);
-      __gs_cq = new ClientPacket(89, 7);
-      __gs_ch = new ClientPacket(90, -1);
-      __gs_cw = new ClientPacket(91, -1);
-      __gs_cg = new ClientPacket(92, 13);
-      __gs_cf = new ClientPacket(93, 3);
-      __gs_cp = new ClientPacket(94, 7);
-      __gs_cl = new ClientPacket(95, -1);
-      __gs_ct = new ClientPacket(96, -1);
-      __gs_cz = new ClientPacket(97, -1);
-      __gs_cc = new ClientPacket(98, 8);
-      __gs_ci = new ClientPacket(99, 7);
-   }
-
    ClientPacket(int var1, int var2) {
       this.id = var1;
       this.length = var2;
@@ -639,7 +536,7 @@ public class ClientPacket implements ClientPacketMarker {
       garbageValue = "-26"
    )
    public static StudioGame[] method3664() {
-      return new StudioGame[]{StudioGame.__is_q, StudioGame.__is_m, StudioGame.__is_o, StudioGame.__is_u, StudioGame.__is_f, StudioGame.__is_w};
+      return new StudioGame[]{StudioGame.field889, StudioGame.field887, StudioGame.field891, StudioGame.field892, StudioGame.field888, StudioGame.field890};
    }
 
    @ObfuscatedName("m")
@@ -650,4 +547,107 @@ public class ClientPacket implements ClientPacketMarker {
    static AttackOption[] method3665() {
       return new AttackOption[]{AttackOption.AttackOption_hidden, AttackOption.AttackOption_leftClickWhereAvailable, AttackOption.AttackOption_alwaysRightClick, AttackOption.AttackOption_dependsOnCombatLevels};
    }
+
+   static {
+      field222 = new ClientPacket(0, 8);
+      field223 = new ClientPacket(1, 3);
+      field224 = new ClientPacket(2, 14);
+      field225 = new ClientPacket(3, 7);
+      field226 = new ClientPacket(4, -1);
+      field227 = new ClientPacket(5, 7);
+      field228 = new ClientPacket(6, 7);
+      field229 = new ClientPacket(7, 8);
+      field230 = new ClientPacket(8, -1);
+      field231 = new ClientPacket(9, 4);
+      field232 = new ClientPacket(10, 7);
+      field233 = new ClientPacket(11, 10);
+      field234 = new ClientPacket(12, 13);
+      field235 = new ClientPacket(13, -1);
+      field236 = new ClientPacket(14, 8);
+      field237 = new ClientPacket(15, 3);
+      field238 = new ClientPacket(16, -2);
+      field239 = new ClientPacket(17, 4);
+      field240 = new ClientPacket(18, 15);
+      field241 = new ClientPacket(19, 8);
+      field242 = new ClientPacket(20, 0);
+      field243 = new ClientPacket(21, 8);
+      field244 = new ClientPacket(22, 0);
+      field245 = new ClientPacket(23, 11);
+      field246 = new ClientPacket(24, 2);
+      field247 = new ClientPacket(25, -2);
+      field248 = new ClientPacket(26, 8);
+      field249 = new ClientPacket(27, 3);
+      field250 = new ClientPacket(28, -1);
+      field251 = new ClientPacket(29, 7);
+      field252 = new ClientPacket(30, 2);
+      field253 = new ClientPacket(31, 3);
+      field254 = new ClientPacket(32, 8);
+      field255 = new ClientPacket(33, 3);
+      field256 = new ClientPacket(34, -1);
+      field257 = new ClientPacket(35, 5);
+      field258 = new ClientPacket(36, 2);
+      field259 = new ClientPacket(37, 0);
+      field260 = new ClientPacket(38, -1);
+      field261 = new ClientPacket(39, 4);
+      field262 = new ClientPacket(40, 8);
+      field263 = new ClientPacket(41, 6);
+      field264 = new ClientPacket(42, 2);
+      field265 = new ClientPacket(43, -1);
+      field266 = new ClientPacket(44, 15);
+      field267 = new ClientPacket(45, 4);
+      field268 = new ClientPacket(46, 8);
+      field269 = new ClientPacket(47, 3);
+      field270 = new ClientPacket(48, 8);
+      field271 = new ClientPacket(49, 0);
+      field272 = new ClientPacket(50, 3);
+      field273 = new ClientPacket(51, 7);
+      field274 = new ClientPacket(52, -1);
+      field275 = new ClientPacket(53, 13);
+      field276 = new ClientPacket(54, -1);
+      field277 = new ClientPacket(55, 9);
+      field278 = new ClientPacket(56, 3);
+      field279 = new ClientPacket(57, 16);
+      field280 = new ClientPacket(58, 8);
+      field281 = new ClientPacket(59, 3);
+      field282 = new ClientPacket(60, -1);
+      field283 = new ClientPacket(61, 9);
+      field284 = new ClientPacket(62, 3);
+      field285 = new ClientPacket(63, 16);
+      field286 = new ClientPacket(64, 8);
+      field287 = new ClientPacket(65, 8);
+      field288 = new ClientPacket(66, 8);
+      field289 = new ClientPacket(67, -2);
+      field290 = new ClientPacket(68, 8);
+      field291 = new ClientPacket(69, 4);
+      field292 = new ClientPacket(70, 6);
+      field293 = new ClientPacket(71, 3);
+      field294 = new ClientPacket(72, 8);
+      field295 = new ClientPacket(73, 1);
+      field296 = new ClientPacket(74, 7);
+      field297 = new ClientPacket(75, 3);
+      field298 = new ClientPacket(76, 0);
+      field299 = new ClientPacket(77, -1);
+      field300 = new ClientPacket(78, -1);
+      field301 = new ClientPacket(79, 7);
+      field302 = new ClientPacket(80, 9);
+      field303 = new ClientPacket(81, 11);
+      field304 = new ClientPacket(82, 16);
+      field305 = new ClientPacket(83, 3);
+      field306 = new ClientPacket(84, 8);
+      field307 = new ClientPacket(85, 8);
+      field308 = new ClientPacket(86, 9);
+      field309 = new ClientPacket(87, 8);
+      field310 = new ClientPacket(88, -1);
+      field311 = new ClientPacket(89, 7);
+      field312 = new ClientPacket(90, -1);
+      field313 = new ClientPacket(91, -1);
+      field314 = new ClientPacket(92, 13);
+      field315 = new ClientPacket(93, 3);
+      field316 = new ClientPacket(94, 7);
+      field317 = new ClientPacket(95, -1);
+      field318 = new ClientPacket(96, -1);
+      field319 = new ClientPacket(97, -1);
+      field320 = new ClientPacket(98, 8);
+      field321 = new ClientPacket(99, 7);
+   }
 }
diff --git a/runescape-client/src/main/java/ClientParameter.java b/runescape-client/src/main/java/ClientParameter.java
index 19961d5bed..85eddcd51d 100644
--- a/runescape-client/src/main/java/ClientParameter.java
+++ b/runescape-client/src/main/java/ClientParameter.java
@@ -16,128 +16,106 @@ public class ClientParameter {
    @ObfuscatedSignature(
       signature = "Lji;"
    )
-   static final ClientParameter __ji_m;
+   static final ClientParameter field322;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Lji;"
    )
-   static final ClientParameter __ji_f;
+   static final ClientParameter field323;
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Lji;"
    )
-   static final ClientParameter __ji_q;
+   static final ClientParameter field324;
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "Lji;"
    )
-   static final ClientParameter __ji_w;
+   static final ClientParameter field325;
    @ObfuscatedName("o")
    @ObfuscatedSignature(
       signature = "Lji;"
    )
-   static final ClientParameter __ji_o;
+   static final ClientParameter field326;
    @ObfuscatedName("u")
    @ObfuscatedSignature(
       signature = "Lji;"
    )
-   static final ClientParameter __ji_u;
+   static final ClientParameter field327;
    @ObfuscatedName("g")
    @ObfuscatedSignature(
       signature = "Lji;"
    )
-   static final ClientParameter __ji_g;
+   static final ClientParameter field328;
    @ObfuscatedName("l")
    @ObfuscatedSignature(
       signature = "Lji;"
    )
-   static final ClientParameter __ji_l;
+   static final ClientParameter field329;
    @ObfuscatedName("e")
    @ObfuscatedSignature(
       signature = "Lji;"
    )
-   static final ClientParameter __ji_e;
+   static final ClientParameter field330;
    @ObfuscatedName("x")
    @ObfuscatedSignature(
       signature = "Lji;"
    )
-   static final ClientParameter __ji_x;
+   static final ClientParameter field331;
    @ObfuscatedName("d")
    @ObfuscatedSignature(
       signature = "Lji;"
    )
-   static final ClientParameter __ji_d;
+   static final ClientParameter field332;
    @ObfuscatedName("k")
    @ObfuscatedSignature(
       signature = "Lji;"
    )
-   static final ClientParameter __ji_k;
+   static final ClientParameter field333;
    @ObfuscatedName("n")
    @ObfuscatedSignature(
       signature = "Lji;"
    )
-   public static final ClientParameter __ji_n;
+   public static final ClientParameter field334;
    @ObfuscatedName("i")
    @ObfuscatedSignature(
       signature = "Lji;"
    )
-   public static final ClientParameter __ji_i;
+   public static final ClientParameter field335;
    @ObfuscatedName("a")
    @ObfuscatedSignature(
       signature = "Lji;"
    )
-   static final ClientParameter __ji_a;
+   static final ClientParameter field336;
    @ObfuscatedName("z")
    @ObfuscatedSignature(
       signature = "Lji;"
    )
-   static final ClientParameter __ji_z;
+   static final ClientParameter field337;
    @ObfuscatedName("j")
    @ObfuscatedSignature(
       signature = "Lji;"
    )
-   static final ClientParameter __ji_j;
+   static final ClientParameter field338;
    @ObfuscatedName("s")
    @ObfuscatedSignature(
       signature = "Lji;"
    )
-   static final ClientParameter __ji_s;
+   static final ClientParameter field339;
    @ObfuscatedName("t")
    @ObfuscatedSignature(
       signature = "Lji;"
    )
-   static final ClientParameter __ji_t;
+   static final ClientParameter field340;
    @ObfuscatedName("fp")
    @ObfuscatedSignature(
       signature = "Lfu;"
    )
-   static AbstractSocket __ji_fp;
+   static AbstractSocket field341;
    @ObfuscatedName("y")
    @Export("id")
    public final String id;
 
-   static {
-      __ji_m = new ClientParameter("8", "8");
-      __ji_f = new ClientParameter("15", "15");
-      __ji_q = new ClientParameter("7", "7");
-      __ji_w = new ClientParameter("10", "10");
-      __ji_o = new ClientParameter("16", "16");
-      __ji_u = new ClientParameter("12", "12");
-      __ji_g = new ClientParameter("3", "3");
-      __ji_l = new ClientParameter("6", "6");
-      __ji_e = new ClientParameter("17", "17");
-      __ji_x = new ClientParameter("5", "5");
-      __ji_d = new ClientParameter("9", "9");
-      __ji_k = new ClientParameter("14", "14");
-      __ji_n = new ClientParameter("18", "18");
-      __ji_i = new ClientParameter("13", "13");
-      __ji_a = new ClientParameter("4", "4");
-      __ji_z = new ClientParameter("1", "1");
-      __ji_j = new ClientParameter("11", "11");
-      __ji_s = new ClientParameter("2", "2");
-      __ji_t = new ClientParameter("19", "19");
-   }
-
    ClientParameter(String var1, String var2) {
       this.id = var2;
    }
@@ -150,35 +128,57 @@ public class ClientParameter {
    @Export("loadWorlds")
    static boolean loadWorlds() {
       try {
-         if(FriendLoginUpdate.__kn_x == null) {
-            FriendLoginUpdate.__kn_x = TriBool.urlRequester.request(new URL(ServerBuild.worldsUrl));
-         } else if(FriendLoginUpdate.__kn_x.isDone()) {
-            byte[] var0 = FriendLoginUpdate.__kn_x.getResponse();
+         if (FriendLoginUpdate.field356 == null) {
+            FriendLoginUpdate.field356 = TriBool.urlRequester.request(new URL(ServerBuild.worldsUrl));
+         } else if (FriendLoginUpdate.field356.isDone()) {
+            byte[] var0 = FriendLoginUpdate.field356.getResponse();
             Buffer var1 = new Buffer(var0);
             var1.readInt();
-            World.worldsCount = var1.__ag_302();
+            World.worldsCount = var1.readUnsignedShort();
             ItemContainer.worlds = new World[World.worldsCount];
 
-            World var3;
-            for(int var2 = 0; var2 < World.worldsCount; var3.index = var2++) {
-               var3 = ItemContainer.worlds[var2] = new World();
-               var3.id = var1.__ag_302();
-               var3.properties = var1.readInt();
-               var3.host = var1.readStringCp1252NullTerminated();
-               var3.activity = var1.readStringCp1252NullTerminated();
-               var3.location = var1.readUnsignedByte();
-               var3.population = var1.__aq_303();
+            World var2;
+            for (int var3 = 0; var3 < World.worldsCount; var2.index = var3++) {
+               var2 = ItemContainer.worlds[var3] = new World();
+               var2.id = var1.readUnsignedShort();
+               var2.properties = var1.readInt();
+               var2.host = var1.readStringCp1252NullTerminated();
+               var2.activity = var1.readStringCp1252NullTerminated();
+               var2.location = var1.readUnsignedByte();
+               var2.population = var1.readShort();
             }
 
-            MilliClock.method3400(ItemContainer.worlds, 0, ItemContainer.worlds.length - 1, World.sortOption1, World.sortOption2);
-            FriendLoginUpdate.__kn_x = null;
+            MilliClock.sortWorlds(ItemContainer.worlds, 0, ItemContainer.worlds.length - 1, World.sortOption1, World.sortOption2);
+            FriendLoginUpdate.field356 = null;
             return true;
          }
       } catch (Exception var4) {
          var4.printStackTrace();
-         FriendLoginUpdate.__kn_x = null;
+         FriendLoginUpdate.field356 = null;
       }
 
       return false;
    }
+
+   static {
+      field322 = new ClientParameter("8", "8");
+      field323 = new ClientParameter("15", "15");
+      field324 = new ClientParameter("7", "7");
+      field325 = new ClientParameter("10", "10");
+      field326 = new ClientParameter("16", "16");
+      field327 = new ClientParameter("12", "12");
+      field328 = new ClientParameter("3", "3");
+      field329 = new ClientParameter("6", "6");
+      field330 = new ClientParameter("17", "17");
+      field331 = new ClientParameter("5", "5");
+      field332 = new ClientParameter("9", "9");
+      field333 = new ClientParameter("14", "14");
+      field334 = new ClientParameter("18", "18");
+      field335 = new ClientParameter("13", "13");
+      field336 = new ClientParameter("4", "4");
+      field337 = new ClientParameter("1", "1");
+      field338 = new ClientParameter("11", "11");
+      field339 = new ClientParameter("2", "2");
+      field340 = new ClientParameter("19", "19");
+   }
 }
diff --git a/runescape-client/src/main/java/ClientPreferences.java b/runescape-client/src/main/java/ClientPreferences.java
index 33ece76295..3abd42b636 100644
--- a/runescape-client/src/main/java/ClientPreferences.java
+++ b/runescape-client/src/main/java/ClientPreferences.java
@@ -14,7 +14,7 @@ public class ClientPreferences {
    @ObfuscatedGetter(
       intValue = 1548448409
    )
-   static int __bf_m;
+   static int field342;
    @ObfuscatedName("gr")
    @ObfuscatedSignature(
       signature = "[Lln;"
@@ -43,16 +43,12 @@ public class ClientPreferences {
    @Export("parameters")
    LinkedHashMap parameters;
 
-   static {
-      __bf_m = 6;
-   }
-
    ClientPreferences() {
       this.windowMode = 1;
       this.rememberedUsername = null;
       this.hideUsername = false;
       this.parameters = new LinkedHashMap();
-      this.__m_150(true);
+      this.method89(true);
    }
 
    @ObfuscatedSignature(
@@ -63,43 +59,43 @@ public class ClientPreferences {
       this.rememberedUsername = null;
       this.hideUsername = false;
       this.parameters = new LinkedHashMap();
-      if(var1 != null && var1.array != null) {
+      if (var1 != null && var1.array != null) {
          int var2 = var1.readUnsignedByte();
-         if(var2 >= 0 && var2 <= __bf_m) {
-            if(var1.readUnsignedByte() == 1) {
+         if (var2 >= 0 && var2 <= field342) {
+            if (var1.readUnsignedByte() == 1) {
                this.roofsHidden = true;
             }
 
-            if(var2 > 1) {
+            if (var2 > 1) {
                this.titleMusicDisabled = var1.readUnsignedByte() == 1;
             }
 
-            if(var2 > 3) {
+            if (var2 > 3) {
                this.windowMode = var1.readUnsignedByte();
             }
 
-            if(var2 > 2) {
+            if (var2 > 2) {
                int var3 = var1.readUnsignedByte();
 
-               for(int var4 = 0; var4 < var3; ++var4) {
+               for (int var4 = 0; var4 < var3; ++var4) {
                   int var5 = var1.readInt();
                   int var6 = var1.readInt();
-                  this.parameters.put(Integer.valueOf(var5), Integer.valueOf(var6));
+                  this.parameters.put(var5, var6);
                }
             }
 
-            if(var2 > 4) {
+            if (var2 > 4) {
                this.rememberedUsername = var1.readStringCp1252NullTerminatedOrNull();
             }
 
-            if(var2 > 5) {
+            if (var2 > 5) {
                this.hideUsername = var1.readBoolean();
             }
          } else {
-            this.__m_150(true);
+            this.method89(true);
          }
       } else {
-         this.__m_150(true);
+         this.method89(true);
       }
 
    }
@@ -109,7 +105,7 @@ public class ClientPreferences {
       signature = "(ZI)V",
       garbageValue = "1213718182"
    )
-   void __m_150(boolean var1) {
+   void method89(boolean var1) {
    }
 
    @ObfuscatedName("f")
@@ -120,20 +116,20 @@ public class ClientPreferences {
    @Export("toBuffer")
    Buffer toBuffer() {
       Buffer var1 = new Buffer(100);
-      var1.writeByte(__bf_m);
-      var1.writeByte(this.roofsHidden?1:0);
-      var1.writeByte(this.titleMusicDisabled?1:0);
+      var1.writeByte(field342);
+      var1.writeByte(this.roofsHidden ? 1 : 0);
+      var1.writeByte(this.titleMusicDisabled ? 1 : 0);
       var1.writeByte(this.windowMode);
       var1.writeByte(this.parameters.size());
       Iterator var2 = this.parameters.entrySet().iterator();
 
-      while(var2.hasNext()) {
+      while (var2.hasNext()) {
          Entry var3 = (Entry)var2.next();
-         var1.writeInt(((Integer)var3.getKey()).intValue());
-         var1.writeInt(((Integer)var3.getValue()).intValue());
+         var1.writeInt((Integer)var3.getKey());
+         var1.writeInt((Integer)var3.getValue());
       }
 
-      var1.writeStringCp1252NullTerminated(this.rememberedUsername != null?this.rememberedUsername:"");
+      var1.writeStringCp1252NullTerminated(this.rememberedUsername != null ? this.rememberedUsername : "");
       var1.writeBoolean(this.hideUsername);
       return var1;
    }
@@ -153,8 +149,13 @@ public class ClientPreferences {
       garbageValue = "0"
    )
    static final void method1809(int var0) {
-      if(GroundItemPile.loadWidgetGroup(var0)) {
-         NetFileRequest.method4555(Widget.widgets[var0], -1);
+      if (GroundItemPile.loadInterface(var0)) {
+         NetFileRequest.method4555(Widget.interfaceComponents[var0], -1);
       }
+
+   }
+
+   static {
+      field342 = 6;
    }
 }
diff --git a/runescape-client/src/main/java/Clock.java b/runescape-client/src/main/java/Clock.java
index b814aa2d99..58fa98ed08 100644
--- a/runescape-client/src/main/java/Clock.java
+++ b/runescape-client/src/main/java/Clock.java
@@ -27,36 +27,36 @@ public abstract class Clock {
       garbageValue = "-126803683"
    )
    @Export("wait")
-   public abstract int wait(int var1, int var2);
+   public abstract int wait(int cycleMs, int minSleepMs);
 
    @ObfuscatedName("m")
    public static String method3534(long var0) {
-      if(var0 > 0L && var0 < 6582952005840035281L) {
-         if(0L == var0 % 37L) {
+      if (var0 > 0L && var0 < 6582952005840035281L) {
+         if (0L == var0 % 37L) {
             return null;
          } else {
             int var2 = 0;
 
-            for(long var3 = var0; var3 != 0L; var3 /= 37L) {
+            for (long var3 = var0; var3 != 0L; var3 /= 37L) {
                ++var2;
             }
 
-            StringBuilder var5;
+            StringBuilder var4;
             char var8;
-            for(var5 = new StringBuilder(var2); var0 != 0L; var5.append(var8)) {
-               long var6 = var0;
+            for (var4 = new StringBuilder(var2); var0 != 0L; var4.append(var8)) {
+               long var5 = var0;
                var0 /= 37L;
-               var8 = class306.base37Table[(int)(var6 - 37L * var0)];
-               if(var8 == '_') {
-                  int var9 = var5.length() - 1;
-                  var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9)));
+               var8 = class306.base37Table[(int)(var5 - 37L * var0)];
+               if (var8 == '_') {
+                  int var7 = var4.length() - 1;
+                  var4.setCharAt(var7, Character.toUpperCase(var4.charAt(var7)));
                   var8 = 160;
                }
             }
 
-            var5.reverse();
-            var5.setCharAt(0, Character.toUpperCase(var5.charAt(0)));
-            return var5.toString();
+            var4.reverse();
+            var4.setCharAt(0, Character.toUpperCase(var4.charAt(0)));
+            return var4.toString();
          }
       } else {
          return null;
@@ -69,13 +69,13 @@ public abstract class Clock {
       garbageValue = "-1555959688"
    )
    static void method3533(String var0) {
-      class21.__b_by = var0;
+      class21.field1123 = var0;
 
       try {
-         String var1 = TextureProvider.client.getParameter(ClientParameter.__ji_n.id);
-         String var2 = TextureProvider.client.getParameter(ClientParameter.__ji_i.id);
+         String var1 = TextureProvider.client.getParameter(ClientParameter.field334.id);
+         String var2 = TextureProvider.client.getParameter(ClientParameter.field335.id);
          String var3 = var1 + "settings=" + var0 + "; version=1; path=/; domain=" + var2;
-         if(var0.length() == 0) {
+         if (var0.length() == 0) {
             var3 = var3 + "; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0";
          } else {
             var3 = var3 + "; Expires=" + WorldMapSectionType.method252(class203.currentTimeMs() + 94608000000L) + "; Max-Age=" + 94608000L;
@@ -83,7 +83,6 @@ public abstract class Clock {
 
          class46.method850(TextureProvider.client, "document.cookie=\"" + var3 + "\"");
       } catch (Throwable var4) {
-         ;
       }
 
    }
diff --git a/runescape-client/src/main/java/CollisionMap.java b/runescape-client/src/main/java/CollisionMap.java
index a55c80bc1b..07d8425e12 100644
--- a/runescape-client/src/main/java/CollisionMap.java
+++ b/runescape-client/src/main/java/CollisionMap.java
@@ -51,9 +51,9 @@ public class CollisionMap {
    )
    @Export("clear")
    public void clear() {
-      for(int var1 = 0; var1 < this.xSize; ++var1) {
-         for(int var2 = 0; var2 < this.ySize; ++var2) {
-            if(var1 != 0 && var2 != 0 && var1 < this.xSize - 5 && var2 < this.ySize - 5) {
+      for (int var1 = 0; var1 < this.xSize; ++var1) {
+         for (int var2 = 0; var2 < this.ySize; ++var2) {
+            if (var1 != 0 && var2 != 0 && var1 < this.xSize - 5 && var2 < this.ySize - 5) {
                this.flags[var1][var2] = 16777216;
             } else {
                this.flags[var1][var2] = 16777215;
@@ -68,147 +68,147 @@ public class CollisionMap {
       signature = "(IIIIZB)V",
       garbageValue = "2"
    )
-   public void __f_283(int var1, int var2, int var3, int var4, boolean var5) {
+   public void method90(int var1, int var2, int var3, int var4, boolean var5) {
       var1 -= this.xInset;
       var2 -= this.yInset;
-      if(var3 == 0) {
-         if(var4 == 0) {
-            this.__u_287(var1, var2, 128);
-            this.__u_287(var1 - 1, var2, 8);
+      if (var3 == 0) {
+         if (var4 == 0) {
+            this.method94(var1, var2, 128);
+            this.method94(var1 - 1, var2, 8);
          }
 
-         if(var4 == 1) {
-            this.__u_287(var1, var2, 2);
-            this.__u_287(var1, var2 + 1, 32);
+         if (var4 == 1) {
+            this.method94(var1, var2, 2);
+            this.method94(var1, var2 + 1, 32);
          }
 
-         if(var4 == 2) {
-            this.__u_287(var1, var2, 8);
-            this.__u_287(var1 + 1, var2, 128);
+         if (var4 == 2) {
+            this.method94(var1, var2, 8);
+            this.method94(var1 + 1, var2, 128);
          }
 
-         if(var4 == 3) {
-            this.__u_287(var1, var2, 32);
-            this.__u_287(var1, var2 - 1, 2);
+         if (var4 == 3) {
+            this.method94(var1, var2, 32);
+            this.method94(var1, var2 - 1, 2);
          }
       }
 
-      if(var3 == 1 || var3 == 3) {
-         if(var4 == 0) {
-            this.__u_287(var1, var2, 1);
-            this.__u_287(var1 - 1, var2 + 1, 16);
+      if (var3 == 1 || var3 == 3) {
+         if (var4 == 0) {
+            this.method94(var1, var2, 1);
+            this.method94(var1 - 1, var2 + 1, 16);
          }
 
-         if(var4 == 1) {
-            this.__u_287(var1, var2, 4);
-            this.__u_287(var1 + 1, var2 + 1, 64);
+         if (var4 == 1) {
+            this.method94(var1, var2, 4);
+            this.method94(var1 + 1, var2 + 1, 64);
          }
 
-         if(var4 == 2) {
-            this.__u_287(var1, var2, 16);
-            this.__u_287(var1 + 1, var2 - 1, 1);
+         if (var4 == 2) {
+            this.method94(var1, var2, 16);
+            this.method94(var1 + 1, var2 - 1, 1);
          }
 
-         if(var4 == 3) {
-            this.__u_287(var1, var2, 64);
-            this.__u_287(var1 - 1, var2 - 1, 4);
+         if (var4 == 3) {
+            this.method94(var1, var2, 64);
+            this.method94(var1 - 1, var2 - 1, 4);
          }
       }
 
-      if(var3 == 2) {
-         if(var4 == 0) {
-            this.__u_287(var1, var2, 130);
-            this.__u_287(var1 - 1, var2, 8);
-            this.__u_287(var1, var2 + 1, 32);
+      if (var3 == 2) {
+         if (var4 == 0) {
+            this.method94(var1, var2, 130);
+            this.method94(var1 - 1, var2, 8);
+            this.method94(var1, var2 + 1, 32);
          }
 
-         if(var4 == 1) {
-            this.__u_287(var1, var2, 10);
-            this.__u_287(var1, var2 + 1, 32);
-            this.__u_287(var1 + 1, var2, 128);
+         if (var4 == 1) {
+            this.method94(var1, var2, 10);
+            this.method94(var1, var2 + 1, 32);
+            this.method94(var1 + 1, var2, 128);
          }
 
-         if(var4 == 2) {
-            this.__u_287(var1, var2, 40);
-            this.__u_287(var1 + 1, var2, 128);
-            this.__u_287(var1, var2 - 1, 2);
+         if (var4 == 2) {
+            this.method94(var1, var2, 40);
+            this.method94(var1 + 1, var2, 128);
+            this.method94(var1, var2 - 1, 2);
          }
 
-         if(var4 == 3) {
-            this.__u_287(var1, var2, 160);
-            this.__u_287(var1, var2 - 1, 2);
-            this.__u_287(var1 - 1, var2, 8);
+         if (var4 == 3) {
+            this.method94(var1, var2, 160);
+            this.method94(var1, var2 - 1, 2);
+            this.method94(var1 - 1, var2, 8);
          }
       }
 
-      if(var5) {
-         if(var3 == 0) {
-            if(var4 == 0) {
-               this.__u_287(var1, var2, 65536);
-               this.__u_287(var1 - 1, var2, 4096);
+      if (var5) {
+         if (var3 == 0) {
+            if (var4 == 0) {
+               this.method94(var1, var2, 65536);
+               this.method94(var1 - 1, var2, 4096);
             }
 
-            if(var4 == 1) {
-               this.__u_287(var1, var2, 1024);
-               this.__u_287(var1, var2 + 1, 16384);
+            if (var4 == 1) {
+               this.method94(var1, var2, 1024);
+               this.method94(var1, var2 + 1, 16384);
             }
 
-            if(var4 == 2) {
-               this.__u_287(var1, var2, 4096);
-               this.__u_287(var1 + 1, var2, 65536);
+            if (var4 == 2) {
+               this.method94(var1, var2, 4096);
+               this.method94(var1 + 1, var2, 65536);
             }
 
-            if(var4 == 3) {
-               this.__u_287(var1, var2, 16384);
-               this.__u_287(var1, var2 - 1, 1024);
+            if (var4 == 3) {
+               this.method94(var1, var2, 16384);
+               this.method94(var1, var2 - 1, 1024);
             }
          }
 
-         if(var3 == 1 || var3 == 3) {
-            if(var4 == 0) {
-               this.__u_287(var1, var2, 512);
-               this.__u_287(var1 - 1, var2 + 1, 8192);
+         if (var3 == 1 || var3 == 3) {
+            if (var4 == 0) {
+               this.method94(var1, var2, 512);
+               this.method94(var1 - 1, var2 + 1, 8192);
             }
 
-            if(var4 == 1) {
-               this.__u_287(var1, var2, 2048);
-               this.__u_287(var1 + 1, var2 + 1, 32768);
+            if (var4 == 1) {
+               this.method94(var1, var2, 2048);
+               this.method94(var1 + 1, var2 + 1, 32768);
             }
 
-            if(var4 == 2) {
-               this.__u_287(var1, var2, 8192);
-               this.__u_287(var1 + 1, var2 - 1, 512);
+            if (var4 == 2) {
+               this.method94(var1, var2, 8192);
+               this.method94(var1 + 1, var2 - 1, 512);
             }
 
-            if(var4 == 3) {
-               this.__u_287(var1, var2, 32768);
-               this.__u_287(var1 - 1, var2 - 1, 2048);
+            if (var4 == 3) {
+               this.method94(var1, var2, 32768);
+               this.method94(var1 - 1, var2 - 1, 2048);
             }
          }
 
-         if(var3 == 2) {
-            if(var4 == 0) {
-               this.__u_287(var1, var2, 66560);
-               this.__u_287(var1 - 1, var2, 4096);
-               this.__u_287(var1, var2 + 1, 16384);
+         if (var3 == 2) {
+            if (var4 == 0) {
+               this.method94(var1, var2, 66560);
+               this.method94(var1 - 1, var2, 4096);
+               this.method94(var1, var2 + 1, 16384);
             }
 
-            if(var4 == 1) {
-               this.__u_287(var1, var2, 5120);
-               this.__u_287(var1, var2 + 1, 16384);
-               this.__u_287(var1 + 1, var2, 65536);
+            if (var4 == 1) {
+               this.method94(var1, var2, 5120);
+               this.method94(var1, var2 + 1, 16384);
+               this.method94(var1 + 1, var2, 65536);
             }
 
-            if(var4 == 2) {
-               this.__u_287(var1, var2, 20480);
-               this.__u_287(var1 + 1, var2, 65536);
-               this.__u_287(var1, var2 - 1, 1024);
+            if (var4 == 2) {
+               this.method94(var1, var2, 20480);
+               this.method94(var1 + 1, var2, 65536);
+               this.method94(var1, var2 - 1, 1024);
             }
 
-            if(var4 == 3) {
-               this.__u_287(var1, var2, 81920);
-               this.__u_287(var1, var2 - 1, 1024);
-               this.__u_287(var1 - 1, var2, 4096);
+            if (var4 == 3) {
+               this.method94(var1, var2, 81920);
+               this.method94(var1, var2 - 1, 1024);
+               this.method94(var1 - 1, var2, 4096);
             }
          }
       }
@@ -220,20 +220,20 @@ public class CollisionMap {
       signature = "(IIIIZI)V",
       garbageValue = "1813281219"
    )
-   public void __q_284(int var1, int var2, int var3, int var4, boolean var5) {
+   public void method91(int var1, int var2, int var3, int var4, boolean var5) {
       int var6 = 256;
-      if(var5) {
+      if (var5) {
          var6 += 131072;
       }
 
       var1 -= this.xInset;
       var2 -= this.yInset;
 
-      for(int var7 = var1; var7 < var3 + var1; ++var7) {
-         if(var7 >= 0 && var7 < this.xSize) {
-            for(int var8 = var2; var8 < var2 + var4; ++var8) {
-               if(var8 >= 0 && var8 < this.ySize) {
-                  this.__u_287(var7, var8, var6);
+      for (int var7 = var1; var7 < var3 + var1; ++var7) {
+         if (var7 >= 0 && var7 < this.xSize) {
+            for (int var8 = var2; var8 < var2 + var4; ++var8) {
+               if (var8 >= 0 && var8 < this.ySize) {
+                  this.method94(var7, var8, var6);
                }
             }
          }
@@ -246,10 +246,11 @@ public class CollisionMap {
       signature = "(III)V",
       garbageValue = "1082834717"
    )
-   public void __w_285(int var1, int var2) {
+   public void method92(int var1, int var2) {
       var1 -= this.xInset;
       var2 -= this.yInset;
-      this.flags[var1][var2] |= 2097152;
+      int[] var3 = this.flags[var1];
+      var3[var2] |= 2097152;
    }
 
    @ObfuscatedName("o")
@@ -257,10 +258,11 @@ public class CollisionMap {
       signature = "(III)V",
       garbageValue = "2022671149"
    )
-   public void __o_286(int var1, int var2) {
+   public void method93(int var1, int var2) {
       var1 -= this.xInset;
       var2 -= this.yInset;
-      this.flags[var1][var2] |= 262144;
+      int[] var3 = this.flags[var1];
+      var3[var2] |= 262144;
    }
 
    @ObfuscatedName("u")
@@ -268,8 +270,9 @@ public class CollisionMap {
       signature = "(IIII)V",
       garbageValue = "953350100"
    )
-   void __u_287(int var1, int var2, int var3) {
-      this.flags[var1][var2] |= var3;
+   void method94(int var1, int var2, int var3) {
+      int[] var4 = this.flags[var1];
+      var4[var2] |= var3;
    }
 
    @ObfuscatedName("g")
@@ -277,147 +280,147 @@ public class CollisionMap {
       signature = "(IIIIZB)V",
       garbageValue = "54"
    )
-   public void __g_288(int var1, int var2, int var3, int var4, boolean var5) {
+   public void method95(int var1, int var2, int var3, int var4, boolean var5) {
       var1 -= this.xInset;
       var2 -= this.yInset;
-      if(var3 == 0) {
-         if(var4 == 0) {
-            this.__e_290(var1, var2, 128);
-            this.__e_290(var1 - 1, var2, 8);
+      if (var3 == 0) {
+         if (var4 == 0) {
+            this.method97(var1, var2, 128);
+            this.method97(var1 - 1, var2, 8);
          }
 
-         if(var4 == 1) {
-            this.__e_290(var1, var2, 2);
-            this.__e_290(var1, var2 + 1, 32);
+         if (var4 == 1) {
+            this.method97(var1, var2, 2);
+            this.method97(var1, var2 + 1, 32);
          }
 
-         if(var4 == 2) {
-            this.__e_290(var1, var2, 8);
-            this.__e_290(var1 + 1, var2, 128);
+         if (var4 == 2) {
+            this.method97(var1, var2, 8);
+            this.method97(var1 + 1, var2, 128);
          }
 
-         if(var4 == 3) {
-            this.__e_290(var1, var2, 32);
-            this.__e_290(var1, var2 - 1, 2);
+         if (var4 == 3) {
+            this.method97(var1, var2, 32);
+            this.method97(var1, var2 - 1, 2);
          }
       }
 
-      if(var3 == 1 || var3 == 3) {
-         if(var4 == 0) {
-            this.__e_290(var1, var2, 1);
-            this.__e_290(var1 - 1, var2 + 1, 16);
+      if (var3 == 1 || var3 == 3) {
+         if (var4 == 0) {
+            this.method97(var1, var2, 1);
+            this.method97(var1 - 1, var2 + 1, 16);
          }
 
-         if(var4 == 1) {
-            this.__e_290(var1, var2, 4);
-            this.__e_290(var1 + 1, var2 + 1, 64);
+         if (var4 == 1) {
+            this.method97(var1, var2, 4);
+            this.method97(var1 + 1, var2 + 1, 64);
          }
 
-         if(var4 == 2) {
-            this.__e_290(var1, var2, 16);
-            this.__e_290(var1 + 1, var2 - 1, 1);
+         if (var4 == 2) {
+            this.method97(var1, var2, 16);
+            this.method97(var1 + 1, var2 - 1, 1);
          }
 
-         if(var4 == 3) {
-            this.__e_290(var1, var2, 64);
-            this.__e_290(var1 - 1, var2 - 1, 4);
+         if (var4 == 3) {
+            this.method97(var1, var2, 64);
+            this.method97(var1 - 1, var2 - 1, 4);
          }
       }
 
-      if(var3 == 2) {
-         if(var4 == 0) {
-            this.__e_290(var1, var2, 130);
-            this.__e_290(var1 - 1, var2, 8);
-            this.__e_290(var1, var2 + 1, 32);
+      if (var3 == 2) {
+         if (var4 == 0) {
+            this.method97(var1, var2, 130);
+            this.method97(var1 - 1, var2, 8);
+            this.method97(var1, var2 + 1, 32);
          }
 
-         if(var4 == 1) {
-            this.__e_290(var1, var2, 10);
-            this.__e_290(var1, var2 + 1, 32);
-            this.__e_290(var1 + 1, var2, 128);
+         if (var4 == 1) {
+            this.method97(var1, var2, 10);
+            this.method97(var1, var2 + 1, 32);
+            this.method97(var1 + 1, var2, 128);
          }
 
-         if(var4 == 2) {
-            this.__e_290(var1, var2, 40);
-            this.__e_290(var1 + 1, var2, 128);
-            this.__e_290(var1, var2 - 1, 2);
+         if (var4 == 2) {
+            this.method97(var1, var2, 40);
+            this.method97(var1 + 1, var2, 128);
+            this.method97(var1, var2 - 1, 2);
          }
 
-         if(var4 == 3) {
-            this.__e_290(var1, var2, 160);
-            this.__e_290(var1, var2 - 1, 2);
-            this.__e_290(var1 - 1, var2, 8);
+         if (var4 == 3) {
+            this.method97(var1, var2, 160);
+            this.method97(var1, var2 - 1, 2);
+            this.method97(var1 - 1, var2, 8);
          }
       }
 
-      if(var5) {
-         if(var3 == 0) {
-            if(var4 == 0) {
-               this.__e_290(var1, var2, 65536);
-               this.__e_290(var1 - 1, var2, 4096);
+      if (var5) {
+         if (var3 == 0) {
+            if (var4 == 0) {
+               this.method97(var1, var2, 65536);
+               this.method97(var1 - 1, var2, 4096);
             }
 
-            if(var4 == 1) {
-               this.__e_290(var1, var2, 1024);
-               this.__e_290(var1, var2 + 1, 16384);
+            if (var4 == 1) {
+               this.method97(var1, var2, 1024);
+               this.method97(var1, var2 + 1, 16384);
             }
 
-            if(var4 == 2) {
-               this.__e_290(var1, var2, 4096);
-               this.__e_290(var1 + 1, var2, 65536);
+            if (var4 == 2) {
+               this.method97(var1, var2, 4096);
+               this.method97(var1 + 1, var2, 65536);
             }
 
-            if(var4 == 3) {
-               this.__e_290(var1, var2, 16384);
-               this.__e_290(var1, var2 - 1, 1024);
+            if (var4 == 3) {
+               this.method97(var1, var2, 16384);
+               this.method97(var1, var2 - 1, 1024);
             }
          }
 
-         if(var3 == 1 || var3 == 3) {
-            if(var4 == 0) {
-               this.__e_290(var1, var2, 512);
-               this.__e_290(var1 - 1, var2 + 1, 8192);
+         if (var3 == 1 || var3 == 3) {
+            if (var4 == 0) {
+               this.method97(var1, var2, 512);
+               this.method97(var1 - 1, var2 + 1, 8192);
             }
 
-            if(var4 == 1) {
-               this.__e_290(var1, var2, 2048);
-               this.__e_290(var1 + 1, var2 + 1, 32768);
+            if (var4 == 1) {
+               this.method97(var1, var2, 2048);
+               this.method97(var1 + 1, var2 + 1, 32768);
             }
 
-            if(var4 == 2) {
-               this.__e_290(var1, var2, 8192);
-               this.__e_290(var1 + 1, var2 - 1, 512);
+            if (var4 == 2) {
+               this.method97(var1, var2, 8192);
+               this.method97(var1 + 1, var2 - 1, 512);
             }
 
-            if(var4 == 3) {
-               this.__e_290(var1, var2, 32768);
-               this.__e_290(var1 - 1, var2 - 1, 2048);
+            if (var4 == 3) {
+               this.method97(var1, var2, 32768);
+               this.method97(var1 - 1, var2 - 1, 2048);
             }
          }
 
-         if(var3 == 2) {
-            if(var4 == 0) {
-               this.__e_290(var1, var2, 66560);
-               this.__e_290(var1 - 1, var2, 4096);
-               this.__e_290(var1, var2 + 1, 16384);
+         if (var3 == 2) {
+            if (var4 == 0) {
+               this.method97(var1, var2, 66560);
+               this.method97(var1 - 1, var2, 4096);
+               this.method97(var1, var2 + 1, 16384);
             }
 
-            if(var4 == 1) {
-               this.__e_290(var1, var2, 5120);
-               this.__e_290(var1, var2 + 1, 16384);
-               this.__e_290(var1 + 1, var2, 65536);
+            if (var4 == 1) {
+               this.method97(var1, var2, 5120);
+               this.method97(var1, var2 + 1, 16384);
+               this.method97(var1 + 1, var2, 65536);
             }
 
-            if(var4 == 2) {
-               this.__e_290(var1, var2, 20480);
-               this.__e_290(var1 + 1, var2, 65536);
-               this.__e_290(var1, var2 - 1, 1024);
+            if (var4 == 2) {
+               this.method97(var1, var2, 20480);
+               this.method97(var1 + 1, var2, 65536);
+               this.method97(var1, var2 - 1, 1024);
             }
 
-            if(var4 == 3) {
-               this.__e_290(var1, var2, 81920);
-               this.__e_290(var1, var2 - 1, 1024);
-               this.__e_290(var1 - 1, var2, 4096);
+            if (var4 == 3) {
+               this.method97(var1, var2, 81920);
+               this.method97(var1, var2 - 1, 1024);
+               this.method97(var1 - 1, var2, 4096);
             }
          }
       }
@@ -429,26 +432,26 @@ public class CollisionMap {
       signature = "(IIIIIZB)V",
       garbageValue = "23"
    )
-   public void __l_289(int var1, int var2, int var3, int var4, int var5, boolean var6) {
+   public void method96(int var1, int var2, int var3, int var4, int var5, boolean var6) {
       int var7 = 256;
-      if(var6) {
+      if (var6) {
          var7 += 131072;
       }
 
       var1 -= this.xInset;
       var2 -= this.yInset;
       int var8;
-      if(var5 == 1 || var5 == 3) {
+      if (var5 == 1 || var5 == 3) {
          var8 = var3;
          var3 = var4;
          var4 = var8;
       }
 
-      for(var8 = var1; var8 < var3 + var1; ++var8) {
-         if(var8 >= 0 && var8 < this.xSize) {
-            for(int var9 = var2; var9 < var2 + var4; ++var9) {
-               if(var9 >= 0 && var9 < this.ySize) {
-                  this.__e_290(var8, var9, var7);
+      for (var8 = var1; var8 < var3 + var1; ++var8) {
+         if (var8 >= 0 && var8 < this.xSize) {
+            for (int var9 = var2; var9 < var2 + var4; ++var9) {
+               if (var9 >= 0 && var9 < this.ySize) {
+                  this.method97(var8, var9, var7);
                }
             }
          }
@@ -461,8 +464,9 @@ public class CollisionMap {
       signature = "(IIII)V",
       garbageValue = "52290294"
    )
-   void __e_290(int var1, int var2, int var3) {
-      this.flags[var1][var2] &= ~var3;
+   void method97(int var1, int var2, int var3) {
+      int[] var4 = this.flags[var1];
+      var4[var2] &= ~var3;
    }
 
    @ObfuscatedName("x")
@@ -470,10 +474,11 @@ public class CollisionMap {
       signature = "(IIB)V",
       garbageValue = "37"
    )
-   public void __x_291(int var1, int var2) {
+   public void method98(int var1, int var2) {
       var1 -= this.xInset;
       var2 -= this.yInset;
-      this.flags[var1][var2] &= -262145;
+      int[] var3 = this.flags[var1];
+      var3[var2] &= -262145;
    }
 
    @ObfuscatedName("m")
@@ -483,7 +488,7 @@ public class CollisionMap {
    )
    public static int method3632(int var0, int var1, int var2) {
       var2 &= 3;
-      return var2 == 0?var0:(var2 == 1?var1:(var2 == 2?7 - var0:7 - var1));
+      return var2 == 0 ? var0 : (var2 == 1 ? var1 : (var2 == 2 ? 7 - var0 : 7 - var1));
    }
 
    @ObfuscatedName("q")
@@ -493,7 +498,7 @@ public class CollisionMap {
    )
    static int method3631(char var0, int var1) {
       int var2 = var0 << 4;
-      if(Character.isUpperCase(var0) || Character.isTitleCase(var0)) {
+      if (Character.isUpperCase(var0) || Character.isTitleCase(var0)) {
          var0 = Character.toLowerCase(var0);
          var2 = (var0 << 4) + 1;
       }
diff --git a/runescape-client/src/main/java/TileLocation.java b/runescape-client/src/main/java/Coord.java
similarity index 62%
rename from runescape-client/src/main/java/TileLocation.java
rename to runescape-client/src/main/java/Coord.java
index 35e6007294..b50902a475 100644
--- a/runescape-client/src/main/java/TileLocation.java
+++ b/runescape-client/src/main/java/Coord.java
@@ -5,8 +5,8 @@ import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("hu")
-@Implements("TileLocation")
-public class TileLocation {
+@Implements("Coord")
+public class Coord {
    @ObfuscatedName("m")
    @ObfuscatedGetter(
       intValue = 503621925
@@ -29,20 +29,20 @@ public class TileLocation {
    @ObfuscatedSignature(
       signature = "(Lhu;)V"
    )
-   public TileLocation(TileLocation var1) {
+   public Coord(Coord var1) {
       this.plane = var1.plane;
       this.x = var1.x;
       this.y = var1.y;
    }
 
-   public TileLocation(int var1, int var2, int var3) {
+   public Coord(int var1, int var2, int var3) {
       this.plane = var1;
       this.x = var2;
       this.y = var3;
    }
 
-   public TileLocation(int var1) {
-      if(var1 == -1) {
+   public Coord(int var1) {
+      if (var1 == -1) {
          this.plane = -1;
       } else {
          this.plane = var1 >> 28 & 3;
@@ -67,9 +67,9 @@ public class TileLocation {
       signature = "(Lhu;B)Z",
       garbageValue = "-1"
    )
-   @Export("equals0")
-   boolean equals0(TileLocation var1) {
-      return this.plane != var1.plane?false:(this.x != var1.x?false:this.y == var1.y);
+   @Export("equalsCoord")
+   boolean equalsCoord(Coord other) {
+      return this.plane != other.plane ? false : (this.x != other.x ? false : this.y == other.y);
    }
 
    @ObfuscatedName("q")
@@ -77,23 +77,20 @@ public class TileLocation {
       signature = "(Ljava/lang/String;I)Ljava/lang/String;",
       garbageValue = "997364398"
    )
-   @Export("toString0")
-   String toString0(String var1) {
-      return this.plane + var1 + (this.x >> 6) + var1 + (this.y >> 6) + var1 + (this.x & 63) + var1 + (this.y & 63);
+   @Export("toString")
+   String toString(String separator) {
+      return this.plane + separator + (this.x >> 6) + separator + (this.y >> 6) + separator + (this.x & 63) + separator + (this.y & 63);
    }
 
-   @ObfuscatedName("equals")
-   public boolean __equals_382(Object var1) {
-      return this == var1?true:(!(var1 instanceof TileLocation)?false:this.equals0((TileLocation)var1));
+   public boolean equals(Object var1) {
+      return this == var1 ? true : (!(var1 instanceof Coord) ? false : this.equalsCoord((Coord)var1));
    }
 
-   @ObfuscatedName("hashCode")
-   public int __hashCode_383() {
+   public int hashCode() {
       return this.packed();
    }
 
-   @ObfuscatedName("toString")
-   public String __toString_384() {
-      return this.toString0(",");
+   public String toString() {
+      return this.toString(",");
    }
 }
diff --git a/runescape-client/src/main/java/Decimator.java b/runescape-client/src/main/java/Decimator.java
index 1d376b3d10..3a8f3dd9e9 100644
--- a/runescape-client/src/main/java/Decimator.java
+++ b/runescape-client/src/main/java/Decimator.java
@@ -3,6 +3,7 @@ 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("dp")
 @Implements("Decimator")
@@ -24,52 +25,53 @@ public class Decimator {
    int[][] table;
 
    public Decimator(int var1, int var2) {
-      if(var2 != var1) {
-         int var4 = var1;
-         int var5 = var2;
-         if(var2 > var1) {
-            var4 = var2;
-            var5 = var1;
+      if (var2 != var1) {
+         int var3 = var1;
+         int var4 = var2;
+         if (var2 > var1) {
+            var3 = var2;
+            var4 = var1;
          }
 
-         while(var5 != 0) {
-            int var6 = var4 % var5;
+         int var5;
+         while (var4 != 0) {
+            var5 = var3 % var4;
+            var3 = var4;
             var4 = var5;
-            var5 = var6;
          }
 
-         var1 /= var4;
-         var2 /= var4;
+         var1 /= var3;
+         var2 /= var3;
          this.inputRate = var1;
          this.outputRate = var2;
          this.table = new int[var1][14];
 
-         for(int var7 = 0; var7 < var1; ++var7) {
-            int[] var8 = this.table[var7];
-            double var9 = (double)var7 / (double)var1 + 6.0D;
-            int var11 = (int)Math.floor(var9 - 7.0D + 1.0D);
-            if(var11 < 0) {
-               var11 = 0;
+         for (var5 = 0; var5 < var1; ++var5) {
+            int[] var6 = this.table[var5];
+            double var7 = (double)var5 / (double)var1 + 6.0D;
+            int var9 = (int)Math.floor(var7 - 7.0D + 1.0D);
+            if (var9 < 0) {
+               var9 = 0;
             }
 
-            int var12 = (int)Math.ceil(var9 + 7.0D);
-            if(var12 > 14) {
-               var12 = 14;
+            int var10 = (int)Math.ceil(var7 + 7.0D);
+            if (var10 > 14) {
+               var10 = 14;
             }
 
-            for(double var13 = (double)var2 / (double)var1; var11 < var12; ++var11) {
-               double var15 = ((double)var11 - var9) * 3.141592653589793D;
-               double var17 = var13;
-               if(var15 < -1.0E-4D || var15 > 1.0E-4D) {
-                  var17 = var13 * (Math.sin(var15) / var15);
+            for (double var11 = (double)var2 / (double)var1; var9 < var10; ++var9) {
+               double var13 = ((double)var9 - var7) * 3.141592653589793D;
+               double var15 = var11;
+               if (var13 < -1.0E-4D || var13 > 1.0E-4D) {
+                  var15 = var11 * (Math.sin(var13) / var13);
                }
 
-               var17 *= 0.54D + 0.46D * Math.cos(((double)var11 - var9) * 0.2243994752564138D);
-               var8[var11] = (int)Math.floor(0.5D + var17 * 65536.0D);
+               var15 *= 0.54D + 0.46D * Math.cos(((double)var9 - var7) * 0.2243994752564138D);
+               var6[var9] = (int)Math.floor(0.5D + var15 * 65536.0D);
             }
          }
-
       }
+
    }
 
    @ObfuscatedName("m")
@@ -79,19 +81,19 @@ public class Decimator {
    )
    @Export("resample")
    byte[] resample(byte[] var1) {
-      if(this.table != null) {
+      if (this.table != null) {
          int var2 = (int)((long)var1.length * (long)this.outputRate / (long)this.inputRate) + 14;
          int[] var3 = new int[var2];
          int var4 = 0;
          int var5 = 0;
 
          int var6;
-         for(var6 = 0; var6 < var1.length; ++var6) {
+         for (var6 = 0; var6 < var1.length; ++var6) {
             byte var7 = var1[var6];
             int[] var8 = this.table[var5];
 
             int var9;
-            for(var9 = 0; var9 < 14; ++var9) {
+            for (var9 = 0; var9 < 14; ++var9) {
                var3[var9 + var4] += var8[var9] * var7;
             }
 
@@ -103,11 +105,11 @@ public class Decimator {
 
          var1 = new byte[var2];
 
-         for(var6 = 0; var6 < var2; ++var6) {
+         for (var6 = 0; var6 < var2; ++var6) {
             int var10 = var3[var6] + 32768 >> 16;
-            if(var10 < -128) {
+            if (var10 < -128) {
                var1[var6] = -128;
-            } else if(var10 > 127) {
+            } else if (var10 > 127) {
                var1[var6] = 127;
             } else {
                var1[var6] = (byte)var10;
@@ -124,12 +126,12 @@ public class Decimator {
       garbageValue = "-1419232405"
    )
    @Export("scaleRate")
-   int scaleRate(int var1) {
-      if(this.table != null) {
-         var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate);
+   int scaleRate(int rate) {
+      if (this.table != null) {
+         rate = (int)((long)this.outputRate * (long)rate / (long)this.inputRate);
       }
 
-      return var1;
+      return rate;
    }
 
    @ObfuscatedName("q")
@@ -138,12 +140,12 @@ public class Decimator {
       garbageValue = "25"
    )
    @Export("scalePosition")
-   int scalePosition(int var1) {
-      if(this.table != null) {
-         var1 = (int)((long)this.outputRate * (long)var1 / (long)this.inputRate) + 6;
+   int scalePosition(int position) {
+      if (this.table != null) {
+         position = (int)((long)this.outputRate * (long)position / (long)this.inputRate) + 6;
       }
 
-      return var1;
+      return position;
    }
 
    @ObfuscatedName("f")
@@ -154,12 +156,12 @@ public class Decimator {
    public static final boolean method2490() {
       KeyHandler var0 = KeyHandler.KeyHandler_instance;
       synchronized(KeyHandler.KeyHandler_instance) {
-         if(KeyHandler.__an_ct == KeyHandler.__an_cc) {
+         if (KeyHandler.field453 == KeyHandler.field455) {
             return false;
          } else {
-            IndexStoreAction.__ik_cn = KeyHandler.__an_cf[KeyHandler.__an_ct];
-            GzipDecompressor.__go_ck = KeyHandler.__an_cg[KeyHandler.__an_ct];
-            KeyHandler.__an_ct = KeyHandler.__an_ct + 1 & 127;
+            ArchiveDiskAction.field411 = KeyHandler.field450[KeyHandler.field453];
+            GzipDecompressor.field378 = KeyHandler.field449[KeyHandler.field453];
+            KeyHandler.field453 = KeyHandler.field453 + 1 & 127;
             return true;
          }
       }
@@ -170,63 +172,64 @@ public class Decimator {
       signature = "(Ldu;IIII)Z",
       garbageValue = "555449756"
    )
-   static final boolean method2491(Model var0, int var1, int var2, int var3) {
+   @Export("boundingBoxCheck")
+   static final boolean boundingBoxCheck(Model model, int x, int y, int z) {
       boolean var4 = ViewportMouse.ViewportMouse_isInViewport;
-      if(!var4) {
+      if (!var4) {
          return false;
       } else {
          int var5;
          int var6;
          int var7;
          int var8;
+         int var9;
+         int var10;
          int var11;
          int var12;
          int var13;
-         int var16;
-         int var17;
-         if(!ViewportMouse.ViewportMouse_false0) {
+         if (!ViewportMouse.ViewportMouse_false0) {
             var5 = Scene.Scene_cameraPitchSine;
             var6 = Scene.Scene_cameraPitchCosine;
             var7 = Scene.Scene_cameraYawSine;
             var8 = Scene.Scene_cameraYawCosine;
-            byte clickboxClose = 50;
-            short clickboxFar = 3500;
-            var11 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * clickboxClose / Rasterizer3D.Rasterizer3D_zoom;
-            var12 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * clickboxClose / Rasterizer3D.Rasterizer3D_zoom;
-            var13 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * clickboxFar / Rasterizer3D.Rasterizer3D_zoom;
-            int var14 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * clickboxFar / Rasterizer3D.Rasterizer3D_zoom;
-            int var15 = Rasterizer3D.rot1(var12, clickboxClose, var6, var5);
-            var16 = Rasterizer3D.rot2(var12, clickboxClose, var6, var5);
-            var12 = var15;
-            var15 = Rasterizer3D.rot1(var14, clickboxFar, var6, var5);
-            var17 = Rasterizer3D.rot2(var14, clickboxFar, var6, var5);
-            var14 = var15;
-            var15 = Rasterizer3D.rot3(var11, var16, var8, var7);
-            var16 = Rasterizer3D.rot4(var11, var16, var8, var7);
-            var11 = var15;
-            var15 = Rasterizer3D.rot3(var13, var17, var8, var7);
-            var17 = Rasterizer3D.rot4(var13, var17, var8, var7);
-            AccessFile.__dk_o = (var11 + var15) / 2;
-            ViewportMouse.__dm_u = (var14 + var12) / 2;
-            ViewportMouse.__dm_g = (var17 + var16) / 2;
-            ViewportMouse.__dm_l = (var15 - var11) / 2;
-            class311.__ka_e = (var14 - var12) / 2;
-            Skeleton.__ek_x = (var17 - var16) / 2;
-            GraphicsObject.__bw_d = Math.abs(ViewportMouse.__dm_l);
-            ViewportMouse.__dm_k = Math.abs(class311.__ka_e);
-            class248.__iu_n = Math.abs(Skeleton.__ek_x);
+            byte var14 = 50;
+            short var15 = 3500;
+            var9 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var14 / Rasterizer3D.Rasterizer3D_zoom;
+            var10 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var14 / Rasterizer3D.Rasterizer3D_zoom;
+            var11 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var15 / Rasterizer3D.Rasterizer3D_zoom;
+            int var16 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var15 / Rasterizer3D.Rasterizer3D_zoom;
+            int var17 = Rasterizer3D.rot1(var10, var14, var6, var5);
+            var12 = Rasterizer3D.rot2(var10, var14, var6, var5);
+            var10 = var17;
+            var17 = Rasterizer3D.rot1(var16, var15, var6, var5);
+            var13 = Rasterizer3D.rot2(var16, var15, var6, var5);
+            var16 = var17;
+            var17 = Rasterizer3D.rot3(var9, var12, var8, var7);
+            var12 = Rasterizer3D.rot4(var9, var12, var8, var7);
+            var9 = var17;
+            var17 = Rasterizer3D.rot3(var11, var13, var8, var7);
+            var13 = Rasterizer3D.rot4(var11, var13, var8, var7);
+            AccessFile.field7 = (var9 + var17) / 2;
+            ViewportMouse.field951 = (var16 + var10) / 2;
+            ViewportMouse.field952 = (var13 + var12) / 2;
+            ViewportMouse.field953 = (var17 - var9) / 2;
+            DefaultsGroup.field1156 = (var16 - var10) / 2;
+            Skeleton.field874 = (var13 - var12) / 2;
+            GraphicsObject.field377 = Math.abs(ViewportMouse.field953);
+            ViewportMouse.field954 = Math.abs(DefaultsGroup.field1156);
+            class248.field1142 = Math.abs(Skeleton.field874);
          }
 
-         var5 = var0.xMid + var1;
-         var6 = var2 + var0.yMid;
-         var7 = var3 + var0.zMid;
-         var8 = var0.xMidOffset;
-         var16 = var0.yMidOffset;
-         var17 = var0.zMidOffset;
-         var11 = AccessFile.__dk_o - var5;
-         var12 = ViewportMouse.__dm_u - var6;
-         var13 = ViewportMouse.__dm_g - var7;
-         return Math.abs(var11) > var8 + GraphicsObject.__bw_d?false:(Math.abs(var12) > var16 + ViewportMouse.__dm_k?false:(Math.abs(var13) > var17 + class248.__iu_n?false:(Math.abs(var13 * class311.__ka_e - var12 * Skeleton.__ek_x) > var17 * ViewportMouse.__dm_k + var16 * class248.__iu_n?false:(Math.abs(var11 * Skeleton.__ek_x - var13 * ViewportMouse.__dm_l) > var8 * class248.__iu_n + var17 * GraphicsObject.__bw_d?false:Math.abs(var12 * ViewportMouse.__dm_l - var11 * class311.__ka_e) <= var8 * ViewportMouse.__dm_k + var16 * GraphicsObject.__bw_d))));
+         var5 = model.xMid + x;
+         var6 = y + model.yMid;
+         var7 = z + model.zMid;
+         var8 = model.xMidOffset;
+         var12 = model.yMidOffset;
+         var13 = model.zMidOffset;
+         var9 = AccessFile.field7 - var5;
+         var10 = ViewportMouse.field951 - var6;
+         var11 = ViewportMouse.field952 - var7;
+         return Math.abs(var9) > var8 + GraphicsObject.field377 ? false : (Math.abs(var10) > var12 + ViewportMouse.field954 ? false : (Math.abs(var11) > var13 + class248.field1142 ? false : (Math.abs(var11 * DefaultsGroup.field1156 - var10 * Skeleton.field874) > var13 * ViewportMouse.field954 + var12 * class248.field1142 ? false : (Math.abs(var9 * Skeleton.field874 - var11 * ViewportMouse.field953) > var8 * class248.field1142 + var13 * GraphicsObject.field377 ? false : Math.abs(var10 * ViewportMouse.field953 - var9 * DefaultsGroup.field1156) <= var8 * ViewportMouse.field954 + var12 * GraphicsObject.field377))));
       }
    }
 
@@ -236,8 +239,8 @@ public class Decimator {
       garbageValue = "-858740470"
    )
    static int method2492(int var0, Script var1, boolean var2) {
-      if(var0 == 5630) {
-         Client.__client_fd = 250;
+      if (var0 == ScriptOpcodes.LOGOUT) {
+         Client.field175 = 250;
          return 1;
       } else {
          return 2;
diff --git a/runescape-client/src/main/java/class311.java b/runescape-client/src/main/java/DefaultsGroup.java
similarity index 57%
rename from runescape-client/src/main/java/class311.java
rename to runescape-client/src/main/java/DefaultsGroup.java
index e5f27d2836..03f11c56c7 100644
--- a/runescape-client/src/main/java/class311.java
+++ b/runescape-client/src/main/java/DefaultsGroup.java
@@ -1,32 +1,32 @@
 import net.runelite.mapping.Export;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("ka")
-public class class311 {
+@Implements("DefaultsGroup")
+public class DefaultsGroup {
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "Lka;"
    )
-   static final class311 field3810;
+   @Export("DefaultsGroup_graphics")
+   static final DefaultsGroup DefaultsGroup_graphics;
    @ObfuscatedName("e")
    @ObfuscatedGetter(
       intValue = -2077113503
    )
-   static int __ka_e;
+   static int field1156;
    @ObfuscatedName("f")
    @ObfuscatedGetter(
       intValue = -800980069
    )
-   final int field3809;
+   @Export("group")
+   final int group;
 
-   static {
-      field3810 = new class311(3);
-   }
-
-   class311(int var1) {
-      this.field3809 = var1;
+   DefaultsGroup(int var1) {
+      this.group = var1;
    }
 
    @ObfuscatedName("m")
@@ -35,6 +35,10 @@ public class class311 {
       garbageValue = "-2017595575"
    )
    public static RectangleMode[] method5822() {
-      return new RectangleMode[]{RectangleMode.__lj_f, RectangleMode.__lj_m, RectangleMode.__lj_q};
+      return new RectangleMode[]{RectangleMode.GRADIENT_COLOR, RectangleMode.SOLID, RectangleMode.GRADIENT_ALPHA};
+   }
+
+   static {
+      DefaultsGroup_graphics = new DefaultsGroup(3);
    }
 }
diff --git a/runescape-client/src/main/java/DemotingHashTable.java b/runescape-client/src/main/java/DemotingHashTable.java
index 58ac1934ac..0ff369a59b 100644
--- a/runescape-client/src/main/java/DemotingHashTable.java
+++ b/runescape-client/src/main/java/DemotingHashTable.java
@@ -31,8 +31,7 @@ public final class DemotingHashTable {
       this.remaining = var1;
 
       int var3;
-      for(var3 = 1; var3 + var3 < var1 && var3 < var2; var3 += var3) {
-         ;
+      for (var3 = 1; var3 + var3 < var1 && var3 < var2; var3 += var3) {
       }
 
       this.hashTable = new IterableNodeHashTable(var3);
@@ -40,19 +39,19 @@ public final class DemotingHashTable {
 
    @ObfuscatedName("m")
    @Export("get")
-   public Object get(long var1) {
-      Wrapper var3 = (Wrapper)this.hashTable.get(var1);
-      if(var3 == null) {
+   public Object get(long key) {
+      Wrapper var3 = (Wrapper)this.hashTable.get(key);
+      if (var3 == null) {
          return null;
       } else {
          Object var4 = var3.get();
-         if(var4 == null) {
+         if (var4 == null) {
             var3.remove();
             var3.removeDual();
             this.remaining += var3.size;
             return null;
          } else {
-            if(var3.isSoft()) {
+            if (var3.isSoft()) {
                DirectWrapper var5 = new DirectWrapper(var4, var3.size);
                this.hashTable.put(var5, var3.key);
                this.queue.add(var5);
@@ -71,8 +70,8 @@ public final class DemotingHashTable {
 
    @ObfuscatedName("f")
    @Export("remove")
-   void remove(long var1) {
-      Wrapper var3 = (Wrapper)this.hashTable.get(var1);
+   void remove(long key) {
+      Wrapper var3 = (Wrapper)this.hashTable.get(key);
       this.removeWrapper(var3);
    }
 
@@ -81,31 +80,31 @@ public final class DemotingHashTable {
       signature = "(Leu;)V"
    )
    @Export("removeWrapper")
-   void removeWrapper(Wrapper var1) {
-      if(var1 != null) {
-         var1.remove();
-         var1.removeDual();
-         this.remaining += var1.size;
+   void removeWrapper(Wrapper wrapper) {
+      if (wrapper != null) {
+         wrapper.remove();
+         wrapper.removeDual();
+         this.remaining += wrapper.size;
       }
 
    }
 
    @ObfuscatedName("w")
    @Export("put")
-   public void put(Object var1, long var2, int var4) {
-      if(var4 > this.capacity) {
+   public void put(Object value, long key, int size) {
+      if (size > this.capacity) {
          throw new IllegalStateException();
       } else {
-         this.remove(var2);
-         this.remaining -= var4;
+         this.remove(key);
+         this.remaining -= size;
 
-         while(this.remaining < 0) {
-            Wrapper var5 = (Wrapper)this.queue.__q_448();
+         while (this.remaining < 0) {
+            Wrapper var5 = (Wrapper)this.queue.removeLast();
             this.removeWrapper(var5);
          }
 
-         DirectWrapper var6 = new DirectWrapper(var1, var4);
-         this.hashTable.put(var6, var2);
+         DirectWrapper var6 = new DirectWrapper(value, size);
+         this.hashTable.put(var6, key);
          this.queue.add(var6);
          var6.keyDual = 0L;
       }
@@ -113,18 +112,18 @@ public final class DemotingHashTable {
 
    @ObfuscatedName("o")
    @Export("demote")
-   public void demote(int var1) {
-      for(Wrapper var2 = (Wrapper)this.queue.__w_449(); var2 != null; var2 = (Wrapper)this.queue.__u_451()) {
-         if(var2.isSoft()) {
-            if(var2.get() == null) {
+   public void demote(int softeningLevel) {
+      for (Wrapper var2 = (Wrapper)this.queue.last(); var2 != null; var2 = (Wrapper)this.queue.previous()) {
+         if (var2.isSoft()) {
+            if (var2.get() == null) {
                var2.remove();
                var2.removeDual();
                this.remaining += var2.size;
             }
-         } else if(++var2.keyDual > (long)var1) {
+         } else if (++var2.keyDual > (long)softeningLevel) {
             SoftWrapper var3 = new SoftWrapper(var2.get(), var2.size);
             this.hashTable.put(var3, var2.key);
-            DualNodeDeque.method5220(var3, var2);
+            DualNodeDeque.DualNodeDeque_addBefore(var3, var2);
             var2.remove();
             var2.removeDual();
          }
diff --git a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java
index b04a824018..0bf9ad7997 100644
--- a/runescape-client/src/main/java/DesktopPlatformInfoProvider.java
+++ b/runescape-client/src/main/java/DesktopPlatformInfoProvider.java
@@ -15,11 +15,11 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
    @Export("get")
    public PlatformInfo get() {
       byte var1;
-      if(WorldMapSection3.osNameLowerCase.startsWith("win")) {
+      if (WorldMapSection1.osNameLowerCase.startsWith("win")) {
          var1 = 1;
-      } else if(WorldMapSection3.osNameLowerCase.startsWith("mac")) {
+      } else if (WorldMapSection1.osNameLowerCase.startsWith("mac")) {
          var1 = 2;
-      } else if(WorldMapSection3.osNameLowerCase.startsWith("linux")) {
+      } else if (WorldMapSection1.osNameLowerCase.startsWith("linux")) {
          var1 = 3;
       } else {
          var1 = 4;
@@ -28,14 +28,14 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
       String var2;
       try {
          var2 = System.getProperty("os.arch").toLowerCase();
-      } catch (Exception var35) {
+      } catch (Exception var25) {
          var2 = "";
       }
 
       String var3;
       try {
          var3 = System.getProperty("os.version").toLowerCase();
-      } catch (Exception var34) {
+      } catch (Exception var24) {
          var3 = "";
       }
 
@@ -45,74 +45,73 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
       try {
          var4 = System.getProperty("java.vendor");
          var5 = System.getProperty("java.version");
-      } catch (Exception var33) {
-         ;
+      } catch (Exception var23) {
       }
 
-      boolean var29;
-      if(!var2.startsWith("amd64") && !var2.startsWith("x86_64")) {
-         var29 = false;
+      boolean var6;
+      if (!var2.startsWith("amd64") && !var2.startsWith("x86_64")) {
+         var6 = false;
       } else {
-         var29 = true;
+         var6 = true;
       }
 
       byte var7 = 0;
-      if(var1 == 1) {
-         if(var3.indexOf("4.0") != -1) {
+      if (var1 == 1) {
+         if (var3.indexOf("4.0") != -1) {
             var7 = 1;
-         } else if(var3.indexOf("4.1") != -1) {
+         } else if (var3.indexOf("4.1") != -1) {
             var7 = 2;
-         } else if(var3.indexOf("4.9") != -1) {
+         } else if (var3.indexOf("4.9") != -1) {
             var7 = 3;
-         } else if(var3.indexOf("5.0") != -1) {
+         } else if (var3.indexOf("5.0") != -1) {
             var7 = 4;
-         } else if(var3.indexOf("5.1") != -1) {
+         } else if (var3.indexOf("5.1") != -1) {
             var7 = 5;
-         } else if(var3.indexOf("5.2") != -1) {
+         } else if (var3.indexOf("5.2") != -1) {
             var7 = 8;
-         } else if(var3.indexOf("6.0") != -1) {
+         } else if (var3.indexOf("6.0") != -1) {
             var7 = 6;
-         } else if(var3.indexOf("6.1") != -1) {
+         } else if (var3.indexOf("6.1") != -1) {
             var7 = 7;
-         } else if(var3.indexOf("6.2") != -1) {
+         } else if (var3.indexOf("6.2") != -1) {
             var7 = 9;
-         } else if(var3.indexOf("6.3") != -1) {
+         } else if (var3.indexOf("6.3") != -1) {
             var7 = 10;
-         } else if(var3.indexOf("10.0") != -1) {
+         } else if (var3.indexOf("10.0") != -1) {
             var7 = 11;
          }
-      } else if(var1 == 2) {
-         if(var3.indexOf("10.4") != -1) {
+      } else if (var1 == 2) {
+         if (var3.indexOf("10.4") != -1) {
             var7 = 20;
-         } else if(var3.indexOf("10.5") != -1) {
+         } else if (var3.indexOf("10.5") != -1) {
             var7 = 21;
-         } else if(var3.indexOf("10.6") != -1) {
+         } else if (var3.indexOf("10.6") != -1) {
             var7 = 22;
-         } else if(var3.indexOf("10.7") != -1) {
+         } else if (var3.indexOf("10.7") != -1) {
             var7 = 23;
-         } else if(var3.indexOf("10.8") != -1) {
+         } else if (var3.indexOf("10.8") != -1) {
             var7 = 24;
-         } else if(var3.indexOf("10.9") != -1) {
+         } else if (var3.indexOf("10.9") != -1) {
             var7 = 25;
-         } else if(var3.indexOf("10.10") != -1) {
+         } else if (var3.indexOf("10.10") != -1) {
             var7 = 26;
-         } else if(var3.indexOf("10.11") != -1) {
+         } else if (var3.indexOf("10.11") != -1) {
             var7 = 27;
-         } else if(var3.indexOf("10.12") != -1) {
+         } else if (var3.indexOf("10.12") != -1) {
             var7 = 28;
-         } else if(var3.indexOf("10.13") != -1) {
+         } else if (var3.indexOf("10.13") != -1) {
             var7 = 29;
          }
       }
 
       byte var8;
-      if(var4.toLowerCase().indexOf("sun") != -1) {
+      if (var4.toLowerCase().indexOf("sun") != -1) {
          var8 = 1;
-      } else if(var4.toLowerCase().indexOf("microsoft") != -1) {
+      } else if (var4.toLowerCase().indexOf("microsoft") != -1) {
          var8 = 2;
-      } else if(var4.toLowerCase().indexOf("apple") != -1) {
+      } else if (var4.toLowerCase().indexOf("apple") != -1) {
          var8 = 3;
-      } else if(var4.toLowerCase().indexOf("oracle") != -1) {
+      } else if (var4.toLowerCase().indexOf("oracle") != -1) {
          var8 = 5;
       } else {
          var8 = 4;
@@ -122,72 +121,69 @@ public class DesktopPlatformInfoProvider implements PlatformInfoProvider {
       int var10 = 0;
 
       try {
-         while(var9 < var5.length()) {
+         while (var9 < var5.length()) {
             char var11 = var5.charAt(var9);
-            if(var11 < '0' || var11 > '9') {
+            if (var11 < '0' || var11 > '9') {
                break;
             }
 
             var10 = var10 * 10 + (var11 - '0');
             ++var9;
          }
-      } catch (Exception var38) {
-         ;
+      } catch (Exception var28) {
       }
 
-      int var39 = var10;
+      int var29 = var10;
       var9 = var5.indexOf(46, 2) + 1;
       var10 = 0;
 
       try {
-         while(var9 < var5.length()) {
+         while (var9 < var5.length()) {
             char var12 = var5.charAt(var9);
-            if(var12 < '0' || var12 > '9') {
+            if (var12 < '0' || var12 > '9') {
                break;
             }
 
             var10 = var12 - '0' + var10 * 10;
             ++var9;
          }
-      } catch (Exception var37) {
-         ;
+      } catch (Exception var27) {
       }
 
-      int var40 = var10;
+      int var30 = var10;
       var9 = var5.indexOf(95, 4) + 1;
       var10 = 0;
 
       try {
-         while(var9 < var5.length()) {
+         while (var9 < var5.length()) {
             char var13 = var5.charAt(var9);
-            if(var13 < '0' || var13 > '9') {
+            if (var13 < '0' || var13 > '9') {
                break;
             }
 
             var10 = var13 - '0' + var10 * 10;
             ++var9;
          }
-      } catch (Exception var36) {
-         ;
+      } catch (Exception var26) {
       }
 
       Runtime.getRuntime();
-      int var15 = (int)((long)((new Random()).nextInt(31457280) + 230686720) / 1048576L) + 1;
-      int var16;
-      if(var39 > 3) {
-         var16 = Runtime.getRuntime().availableProcessors();
+      int var31 = (int)((long)((new Random()).nextInt(31457280) + 230686720) / 1048576L) + 1;
+      int var14;
+      if (var29 > 3) {
+         var14 = Runtime.getRuntime().availableProcessors();
       } else {
-         var16 = 0;
+         var14 = 0;
       }
 
-      byte var17 = 0;
+      byte var15 = 0;
+      String var16 = "";
+      String var17 = "";
       String var18 = "";
       String var19 = "";
       String var20 = "";
       String var21 = "";
-      String var22 = "";
-      String var23 = "";
-      int[] var28 = new int[3];
-      return new PlatformInfo(var1, var29, var7, var8, var39, var40, var10, false, var15, var16, var17, 0, var18, var19, var20, var21, 0, 0, 0, 0, var22, var23, var28, 0, "");
+      int[] var22 = new int[3];
+      return new PlatformInfo(var1, var6, var7, var8, var29, var30, var10, false, var31, var14, var15, 0, var16, var17, var18, var19, 0, 0, 0, 0, var20, var21, var22, 0, "");
    }
 }
diff --git a/runescape-client/src/main/java/DevicePcmPlayer.java b/runescape-client/src/main/java/DevicePcmPlayer.java
index b76b322285..e3d9693070 100644
--- a/runescape-client/src/main/java/DevicePcmPlayer.java
+++ b/runescape-client/src/main/java/DevicePcmPlayer.java
@@ -1,8 +1,8 @@
 import javax.sound.sampled.AudioFormat;
 import javax.sound.sampled.AudioSystem;
-import javax.sound.sampled.DataLine.Info;
 import javax.sound.sampled.LineUnavailableException;
 import javax.sound.sampled.SourceDataLine;
+import javax.sound.sampled.DataLine.Info;
 import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
@@ -35,8 +35,8 @@ public class DevicePcmPlayer extends PcmPlayer {
    )
    @Export("init")
    protected void init() {
-      this.format = new AudioFormat((float)class309.PcmPlayer_sampleRate, 16, PcmPlayer.isStereo?2:1, true, false);
-      this.byteSamples = new byte[256 << (PcmPlayer.isStereo?2:1)];
+      this.format = new AudioFormat((float)class309.PcmPlayer_sampleRate, 16, PcmPlayer.isStereo ? 2 : 1, true, false);
+      this.byteSamples = new byte[256 << (PcmPlayer.isStereo ? 2 : 1)];
    }
 
    @ObfuscatedName("f")
@@ -45,27 +45,28 @@ public class DevicePcmPlayer extends PcmPlayer {
       garbageValue = "-1738349775"
    )
    @Export("open")
-   protected void open(int var1) throws LineUnavailableException {
+   protected void open(int bufferSize) throws LineUnavailableException {
       try {
-         Info var2 = new Info(SourceDataLine.class, this.format, var1 << (PcmPlayer.isStereo?2:1));
+         Info var2 = new Info(SourceDataLine.class, this.format, bufferSize << (PcmPlayer.isStereo ? 2 : 1));
          this.line = (SourceDataLine)AudioSystem.getLine(var2);
          this.line.open();
          this.line.start();
-         this.capacity2 = var1;
+         this.capacity2 = bufferSize;
       } catch (LineUnavailableException var5) {
-         int var4 = (var1 >>> 1 & 1431655765) + (var1 & 1431655765);
-         var4 = (var4 >>> 2 & 858993459) + (var4 & 858993459);
-         var4 = (var4 >>> 4) + var4 & 252645135;
-         var4 += var4 >>> 8;
-         var4 += var4 >>> 16;
-         int var3 = var4 & 255;
-         if(var3 != 1) {
-            this.open(World.method1759(var1));
-         } else {
+         int var3 = (bufferSize >>> 1 & 1431655765) + (bufferSize & 1431655765);
+         var3 = (var3 >>> 2 & 858993459) + (var3 & 858993459);
+         var3 = (var3 >>> 4) + var3 & 252645135;
+         var3 += var3 >>> 8;
+         var3 += var3 >>> 16;
+         int var4 = var3 & 255;
+         if (var4 == 1) {
             this.line = null;
             throw var5;
          }
+
+         this.open(World.method1759(bufferSize));
       }
+
    }
 
    @ObfuscatedName("q")
@@ -75,20 +76,20 @@ public class DevicePcmPlayer extends PcmPlayer {
    )
    @Export("position")
    protected int position() {
-      return this.capacity2 - (this.line.available() >> (PcmPlayer.isStereo?2:1));
+      return this.capacity2 - (this.line.available() >> (PcmPlayer.isStereo ? 2 : 1));
    }
 
    @ObfuscatedName("w")
    @Export("write")
    protected void write() {
       int var1 = 256;
-      if(PcmPlayer.isStereo) {
+      if (PcmPlayer.isStereo) {
          var1 <<= 1;
       }
 
-      for(int var2 = 0; var2 < var1; ++var2) {
+      for (int var2 = 0; var2 < var1; ++var2) {
          int var3 = super.samples[var2];
-         if((var3 + 8388608 & -16777216) != 0) {
+         if ((var3 + 8388608 & -16777216) != 0) {
             var3 = 8388607 ^ var3 >> 31;
          }
 
@@ -106,7 +107,7 @@ public class DevicePcmPlayer extends PcmPlayer {
    )
    @Export("close")
    protected void close() {
-      if(this.line != null) {
+      if (this.line != null) {
          this.line.close();
          this.line = null;
       }
diff --git a/runescape-client/src/main/java/DevicePcmPlayerProvider.java b/runescape-client/src/main/java/DevicePcmPlayerProvider.java
index 91034e8a5c..86dcbb5f66 100644
--- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java
+++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java
@@ -44,7 +44,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
          var2.write(var3);
          var2.seek(0L);
          var2.close();
-         if(var1) {
+         if (var1) {
             var0.delete();
          }
 
@@ -72,47 +72,47 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
    static void decodeSprite(byte[] var0) {
       Buffer var1 = new Buffer(var0);
       var1.index = var0.length - 2;
-      class328.indexedSpriteCount = var1.__ag_302();
+      class328.indexedSpriteCount = var1.readUnsignedShort();
       class328.indexedSpriteOffsetXs = new int[class328.indexedSpriteCount];
       class328.indexedSpriteOffsetYs = new int[class328.indexedSpriteCount];
       VarbitDefinition.indexedSpriteWidths = new int[class328.indexedSpriteCount];
       SecureRandomCallable.indexedSpriteHeights = new int[class328.indexedSpriteCount];
       class328.spritePixels = new byte[class328.indexedSpriteCount][];
       var1.index = var0.length - 7 - class328.indexedSpriteCount * 8;
-      class328.indexedSpriteWidth = var1.__ag_302();
-      class328.indexedSpriteHeight = var1.__ag_302();
+      class328.indexedSpriteWidth = var1.readUnsignedShort();
+      class328.indexedSpriteHeight = var1.readUnsignedShort();
       int var2 = (var1.readUnsignedByte() & 255) + 1;
 
       int var3;
-      for(var3 = 0; var3 < class328.indexedSpriteCount; ++var3) {
-         class328.indexedSpriteOffsetXs[var3] = var1.__ag_302();
+      for (var3 = 0; var3 < class328.indexedSpriteCount; ++var3) {
+         class328.indexedSpriteOffsetXs[var3] = var1.readUnsignedShort();
       }
 
-      for(var3 = 0; var3 < class328.indexedSpriteCount; ++var3) {
-         class328.indexedSpriteOffsetYs[var3] = var1.__ag_302();
+      for (var3 = 0; var3 < class328.indexedSpriteCount; ++var3) {
+         class328.indexedSpriteOffsetYs[var3] = var1.readUnsignedShort();
       }
 
-      for(var3 = 0; var3 < class328.indexedSpriteCount; ++var3) {
-         VarbitDefinition.indexedSpriteWidths[var3] = var1.__ag_302();
+      for (var3 = 0; var3 < class328.indexedSpriteCount; ++var3) {
+         VarbitDefinition.indexedSpriteWidths[var3] = var1.readUnsignedShort();
       }
 
-      for(var3 = 0; var3 < class328.indexedSpriteCount; ++var3) {
-         SecureRandomCallable.indexedSpriteHeights[var3] = var1.__ag_302();
+      for (var3 = 0; var3 < class328.indexedSpriteCount; ++var3) {
+         SecureRandomCallable.indexedSpriteHeights[var3] = var1.readUnsignedShort();
       }
 
       var1.index = var0.length - 7 - class328.indexedSpriteCount * 8 - (var2 - 1) * 3;
       class328.indexedSpritePalette = new int[var2];
 
-      for(var3 = 1; var3 < var2; ++var3) {
+      for (var3 = 1; var3 < var2; ++var3) {
          class328.indexedSpritePalette[var3] = var1.readMedium();
-         if(class328.indexedSpritePalette[var3] == 0) {
+         if (class328.indexedSpritePalette[var3] == 0) {
             class328.indexedSpritePalette[var3] = 1;
          }
       }
 
       var1.index = 0;
 
-      for(var3 = 0; var3 < class328.indexedSpriteCount; ++var3) {
+      for (var3 = 0; var3 < class328.indexedSpriteCount; ++var3) {
          int var4 = VarbitDefinition.indexedSpriteWidths[var3];
          int var5 = SecureRandomCallable.indexedSpriteHeights[var3];
          int var6 = var4 * var5;
@@ -120,13 +120,13 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
          class328.spritePixels[var3] = var7;
          int var8 = var1.readUnsignedByte();
          int var9;
-         if(var8 == 0) {
-            for(var9 = 0; var9 < var6; ++var9) {
+         if (var8 == 0) {
+            for (var9 = 0; var9 < var6; ++var9) {
                var7[var9] = var1.readByte();
             }
-         } else if(var8 == 1) {
-            for(var9 = 0; var9 < var4; ++var9) {
-               for(int var10 = 0; var10 < var5; ++var10) {
+         } else if (var8 == 1) {
+            for (var9 = 0; var9 < var4; ++var9) {
+               for (int var10 = 0; var10 < var5; ++var10) {
                   var7[var9 + var10 * var4] = var1.readByte();
                }
             }
@@ -149,16 +149,16 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
       signature = "([Lho;IIIIIIIII)V",
       garbageValue = "-1516599170"
    )
-   @Export("drawWidgetGroup")
-   static final void drawWidgetGroup(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
-      Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
-      Rasterizer3D.Rasterizer3D_method1();
+   @Export("drawInterface")
+   static final void drawInterface(Widget[] components, int interfaceID, int xStart, int yStart, int xEnd, int yEnd, int var6, int var7, int var8) {
+      Rasterizer2D.Rasterizer2D_setClip(xStart, yStart, xEnd, yEnd);
+      Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D();
 
-      for(int var9 = 0; var9 < var0.length; ++var9) {
-         Widget var10 = var0[var9];
-         if(var10 != null && (var10.parentId == var1 || var1 == -1412584499 && var10 == Client.clickedWidget)) {
+      for (int var9 = 0; var9 < components.length; ++var9) {
+         Widget var10 = components[var9];
+         if (var10 != null && (var10.parentId == interfaceID || interfaceID == 0xabcdabcd && var10 == Client.clickedWidget)) {
             int var11;
-            if(var8 == -1) {
+            if (var8 == -1) {
                Client.rootWidgetXs[Client.rootWidgetCount] = var10.x + var6;
                Client.rootWidgetYs[Client.rootWidgetCount] = var7 + var10.y;
                Client.rootWidgetWidths[Client.rootWidgetCount] = var10.width;
@@ -170,8 +170,8 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
 
             var10.rootIndex = var11;
             var10.cycle = Client.cycle;
-            if(!var10.isIf3 || !PacketBufferNode.method3673(var10)) {
-               if(var10.contentType > 0) {
+            if (!var10.isIf3 || !PacketBufferNode.isComponentHidden(var10)) {
+               if (var10.contentType > 0) {
                   class15.method186(var10);
                }
 
@@ -180,587 +180,587 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
                int var14 = var10.transparency;
                int var15;
                int var16;
-               if(var10 == Client.clickedWidget) {
-                  if(var1 != -1412584499 && !var10.isScrollBar) {
-                     class279.__jx_ne = var0;
-                     class54.__bs_nb = var6;
-                     class157.__fw_nm = var7;
+               if (var10 == Client.clickedWidget) {
+                  if (interfaceID != -1412584499 && !var10.isScrollBar) {
+                     class279.field1145 = components;
+                     class54.field1161 = var6;
+                     BuddyRankComparator.field1114 = var7;
                      continue;
                   }
 
-                  if(Client.isDraggingWidget && Client.__client_nn) {
+                  if (Client.isDraggingWidget && Client.field106) {
                      var15 = MouseHandler.MouseHandler_x;
                      var16 = MouseHandler.MouseHandler_y;
                      var15 -= Client.widgetClickX;
                      var16 -= Client.widgetClickY;
-                     if(var15 < Client.__client_nw) {
-                        var15 = Client.__client_nw;
+                     if (var15 < Client.field108) {
+                        var15 = Client.field108;
                      }
 
-                     if(var15 + var10.width > Client.__client_nw + Client.clickedWidgetParent.width) {
-                        var15 = Client.__client_nw + Client.clickedWidgetParent.width - var10.width;
+                     if (var15 + var10.width > Client.field108 + Client.clickedWidgetParent.width) {
+                        var15 = Client.field108 + Client.clickedWidgetParent.width - var10.width;
                      }
 
-                     if(var16 < Client.__client_nl) {
-                        var16 = Client.__client_nl;
+                     if (var16 < Client.field109) {
+                        var16 = Client.field109;
                      }
 
-                     if(var16 + var10.height > Client.__client_nl + Client.clickedWidgetParent.height) {
-                        var16 = Client.__client_nl + Client.clickedWidgetParent.height - var10.height;
+                     if (var16 + var10.height > Client.field109 + Client.clickedWidgetParent.height) {
+                        var16 = Client.field109 + Client.clickedWidgetParent.height - var10.height;
                      }
 
                      var12 = var15;
                      var13 = var16;
                   }
 
-                  if(!var10.isScrollBar) {
+                  if (!var10.isScrollBar) {
                      var14 = 128;
                   }
                }
 
                int var17;
                int var18;
+               int var19;
                int var20;
                int var21;
                int var22;
-               int var30;
-               if(var10.type == 2) {
-                  var15 = var2;
-                  var16 = var3;
-                  var17 = var4;
-                  var18 = var5;
-               } else if(var10.type == 9) {
-                  var30 = var12;
-                  var20 = var13;
-                  var21 = var12 + var10.width;
-                  var22 = var13 + var10.height;
-                  if(var21 < var12) {
-                     var30 = var21;
-                     var21 = var12;
+               if (var10.type == 2) {
+                  var15 = xStart;
+                  var16 = yStart;
+                  var17 = xEnd;
+                  var18 = yEnd;
+               } else if (var10.type == 9) {
+                  var22 = var12;
+                  var19 = var13;
+                  var20 = var12 + var10.width;
+                  var21 = var13 + var10.height;
+                  if (var20 < var12) {
+                     var22 = var20;
+                     var20 = var12;
                   }
 
-                  if(var22 < var13) {
-                     var20 = var22;
-                     var22 = var13;
+                  if (var21 < var13) {
+                     var19 = var21;
+                     var21 = var13;
                   }
 
+                  ++var20;
                   ++var21;
-                  ++var22;
-                  var15 = var30 > var2?var30:var2;
-                  var16 = var20 > var3?var20:var3;
-                  var17 = var21 < var4?var21:var4;
-                  var18 = var22 < var5?var22:var5;
+                  var15 = var22 > xStart ? var22 : xStart;
+                  var16 = var19 > yStart ? var19 : yStart;
+                  var17 = var20 < xEnd ? var20 : xEnd;
+                  var18 = var21 < yEnd ? var21 : yEnd;
                } else {
-                  var30 = var12 + var10.width;
-                  var20 = var13 + var10.height;
-                  var15 = var12 > var2?var12:var2;
-                  var16 = var13 > var3?var13:var3;
-                  var17 = var30 < var4?var30:var4;
-                  var18 = var20 < var5?var20:var5;
+                  var22 = var12 + var10.width;
+                  var19 = var13 + var10.height;
+                  var15 = var12 > xStart ? var12 : xStart;
+                  var16 = var13 > yStart ? var13 : yStart;
+                  var17 = var22 < xEnd ? var22 : xEnd;
+                  var18 = var19 < yEnd ? var19 : yEnd;
                }
 
-               if(!var10.isIf3 || var15 < var17 && var16 < var18) {
-                  if(var10.contentType != 0) {
-                     if(var10.contentType == 1336) {
-                        if(Client.displayFps) {
+               if (!var10.isIf3 || var15 < var17 && var16 < var18) {
+                  if (var10.contentType != 0) {
+                     if (var10.contentType == 1336) {
+                        if (Client.displayFps) {
                            var13 += 15;
                            fontPlain12.drawRightAligned("Fps:" + GameShell.fps, var12 + var10.width, var13, 16776960, -1);
                            var13 += 15;
-                           Runtime var38 = Runtime.getRuntime();
-                           var20 = (int)((var38.totalMemory() - var38.freeMemory()) / 1024L);
-                           var21 = 16776960;
-                           if(var20 > 327680 && !Client.isLowDetail) {
-                              var21 = 16711680;
+                           Runtime var34 = Runtime.getRuntime();
+                           var19 = (int)((var34.totalMemory() - var34.freeMemory()) / 1024L);
+                           var20 = 16776960;
+                           if (var19 > 327680 && !Client.isLowDetail) {
+                              var20 = 16711680;
                            }
 
-                           fontPlain12.drawRightAligned("Mem:" + var20 + "k", var12 + var10.width, var13, var21, -1);
+                           fontPlain12.drawRightAligned("Mem:" + var19 + "k", var12 + var10.width, var13, var20, -1);
                            var13 += 15;
                         }
                         continue;
                      }
 
-                     if(var10.contentType == 1337) {
-                        Client.__client_lq = var12;
-                        Client.__client_ln = var13;
+                     if (var10.contentType == 1337) {
+                        Client.field216 = var12;
+                        Client.field217 = var13;
                         class40.drawEntities(var12, var13, var10.width, var10.height);
-                        Client.__client_od[var10.rootIndex] = true;
-                        Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
+                        Client.field100[var10.rootIndex] = true;
+                        Rasterizer2D.Rasterizer2D_setClip(xStart, yStart, xEnd, yEnd);
                         continue;
                      }
 
-                     if(var10.contentType == 1338) {
+                     if (var10.contentType == 1338) {
                         MouseRecorder.method1189(var10, var12, var13, var11);
-                        Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
+                        Rasterizer2D.Rasterizer2D_setClip(xStart, yStart, xEnd, yEnd);
                         continue;
                      }
 
-                     if(var10.contentType == 1339) {
-                        class22.method296(var10, var12, var13, var11);
-                        Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
+                     if (var10.contentType == 1339) {
+                        WorldMapRectangle.method296(var10, var12, var13, var11);
+                        Rasterizer2D.Rasterizer2D_setClip(xStart, yStart, xEnd, yEnd);
                         continue;
                      }
 
-                     if(var10.contentType == 1400) {
+                     if (var10.contentType == 1400) {
                         class60.worldMap0.draw(var12, var13, var10.width, var10.height, Client.cycle);
                      }
 
-                     if(var10.contentType == 1401) {
+                     if (var10.contentType == 1401) {
                         class60.worldMap0.drawOverview(var12, var13, var10.width, var10.height);
                      }
 
-                     if(var10.contentType == 1402) {
+                     if (var10.contentType == 1402) {
                         class16.loginScreenRunesAnimation.method1782(var12, Client.cycle);
                      }
                   }
 
-                  if(var10.type == 0) {
-                     if(!var10.isIf3 && PacketBufferNode.method3673(var10) && var10 != Clock.mousedOverWidgetIf1) {
+                  if (var10.type == 0) {
+                     if (!var10.isIf3 && PacketBufferNode.isComponentHidden(var10) && var10 != Clock.mousedOverWidgetIf1) {
                         continue;
                      }
 
-                     if(!var10.isIf3) {
-                        if(var10.scrollY > var10.scrollHeight - var10.height) {
+                     if (!var10.isIf3) {
+                        if (var10.scrollY > var10.scrollHeight - var10.height) {
                            var10.scrollY = var10.scrollHeight - var10.height;
                         }
 
-                        if(var10.scrollY < 0) {
+                        if (var10.scrollY < 0) {
                            var10.scrollY = 0;
                         }
                      }
 
-                     drawWidgetGroup(var0, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11);
-                     if(var10.children != null) {
-                        drawWidgetGroup(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11);
+                     drawInterface(components, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11);
+                     if (var10.children != null) {
+                        drawInterface(var10.children, var10.id, var15, var16, var17, var18, var12 - var10.scrollX, var13 - var10.scrollY, var11);
                      }
 
-                     WidgetGroupParent var19 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var10.id);
-                     if(var19 != null) {
-                        Interpreter.drawWidgets(var19.group, var15, var16, var17, var18, var12, var13, var11);
+                     InterfaceParent var23 = (InterfaceParent)Client.interfaceParents.get((long)var10.id);
+                     if (var23 != null) {
+                        Interpreter.drawWidgets(var23.group, var15, var16, var17, var18, var12, var13, var11);
                      }
 
-                     Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
-                     Rasterizer3D.Rasterizer3D_method1();
+                     Rasterizer2D.Rasterizer2D_setClip(xStart, yStart, xEnd, yEnd);
+                     Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D();
                   }
 
-                  if(Client.isResizable || Client.__client_oq[var11] || Client.gameDrawingMode > 1) {
-                     if(var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) {
-                        class11.method148(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight);
+                  if (Client.isResizable || Client.field101[var11] || Client.gameDrawingMode > 1) {
+                     if (var10.type == 0 && !var10.isIf3 && var10.scrollHeight > var10.height) {
+                        GrandExchangeOfferNameComparator.method148(var12 + var10.width, var13, var10.scrollY, var10.height, var10.scrollHeight);
                      }
 
-                     if(var10.type != 1) {
-                        int var23;
+                     if (var10.type != 1) {
                         int var24;
                         int var25;
                         int var26;
-                        if(var10.type == 2) {
-                           var30 = 0;
+                        int var33;
+                        if (var10.type == 2) {
+                           var22 = 0;
 
-                           for(var20 = 0; var20 < var10.rawHeight; ++var20) {
-                              for(var21 = 0; var21 < var10.rawWidth; ++var21) {
-                                 var22 = var12 + var21 * (var10.paddingX + 32);
-                                 var23 = var13 + var20 * (var10.paddingY + 32);
-                                 if(var30 < 20) {
-                                    var22 += var10.inventoryXOffsets[var30];
-                                    var23 += var10.inventoryYOffsets[var30];
+                           for (var19 = 0; var19 < var10.rawHeight; ++var19) {
+                              for (var20 = 0; var20 < var10.rawWidth; ++var20) {
+                                 var21 = var12 + var20 * (var10.paddingX + 32);
+                                 var26 = var13 + var19 * (var10.paddingY + 32);
+                                 if (var22 < 20) {
+                                    var21 += var10.inventoryXOffsets[var22];
+                                    var26 += var10.inventoryYOffsets[var22];
                                  }
 
-                                 if(var10.itemIds[var30] <= 0) {
-                                    if(var10.inventorySprites != null && var30 < 20) {
-                                       Sprite var42 = var10.getInventorySprite(var30);
-                                       if(var42 != null) {
-                                          var42.drawAt2(var22, var23);
-                                       } else if(Widget.__ho_j) {
-                                          class22.method295(var10);
+                                 if (var10.itemIds[var22] <= 0) {
+                                    if (var10.inventorySprites != null && var22 < 20) {
+                                       Sprite var36 = var10.getInventorySprite(var22);
+                                       if (var36 != null) {
+                                          var36.drawAt2(var21, var26);
+                                       } else if (Widget.field957) {
+                                          WorldMapRectangle.method295(var10);
                                        }
                                     }
                                  } else {
-                                    boolean var39 = false;
-                                    boolean var40 = false;
-                                    var26 = var10.itemIds[var30] - 1;
-                                    if(var22 + 32 > var2 && var22 < var4 && var23 + 32 > var3 && var23 < var5 || var10 == dragInventoryWidget && var30 == Client.dragItemSlotSource) {
-                                       Sprite var27;
-                                       if(Client.isItemSelected == 1 && var30 == HealthBarDefinition.selectedItemSlot && var10.id == ServerPacket.selectedItemWidget) {
-                                          var27 = class226.getItemSprite(var26, var10.itemQuantities[var30], 2, 0, 2, false);
+                                    boolean var35 = false;
+                                    boolean var46 = false;
+                                    var25 = var10.itemIds[var22] - 1;
+                                    if (var21 + 32 > xStart && var21 < xEnd && var26 + 32 > yStart && var26 < yEnd || var10 == dragInventoryWidget && var22 == Client.dragItemSlotSource) {
+                                       Sprite var42;
+                                       if (Client.isItemSelected == 1 && var22 == HealthBarDefinition.selectedItemSlot && var10.id == ServerPacket.selectedItemWidget) {
+                                          var42 = class226.getItemSprite(var25, var10.itemQuantities[var22], 2, 0, 2, false);
                                        } else {
-                                          var27 = class226.getItemSprite(var26, var10.itemQuantities[var30], 1, 3153952, 2, false);
+                                          var42 = class226.getItemSprite(var25, var10.itemQuantities[var22], 1, 3153952, 2, false);
                                        }
 
-                                       if(var27 != null) {
-                                          if(var10 == dragInventoryWidget && var30 == Client.dragItemSlotSource) {
-                                             var24 = MouseHandler.MouseHandler_x - Client.__client_ja;
-                                             var25 = MouseHandler.MouseHandler_y - Client.__client_je;
-                                             if(var24 < 5 && var24 > -5) {
+                                       if (var42 != null) {
+                                          if (var10 == dragInventoryWidget && var22 == Client.dragItemSlotSource) {
+                                             var33 = MouseHandler.MouseHandler_x - Client.field205;
+                                             var24 = MouseHandler.MouseHandler_y - Client.field206;
+                                             if (var33 < 5 && var33 > -5) {
+                                                var33 = 0;
+                                             }
+
+                                             if (var24 < 5 && var24 > -5) {
                                                 var24 = 0;
                                              }
 
-                                             if(var25 < 5 && var25 > -5) {
-                                                var25 = 0;
-                                             }
-
-                                             if(Client.itemDragDuration < 5) {
+                                             if (Client.itemDragDuration < 5) {
+                                                var33 = 0;
                                                 var24 = 0;
-                                                var25 = 0;
                                              }
 
-                                             var27.__h_508(var22 + var24, var23 + var25, 128);
-                                             if(var1 != -1) {
-                                                Widget var28 = var0[var1 & 65535];
-                                                int var29;
-                                                if(var23 + var25 < Rasterizer2D.Rasterizer2D_yClipStart && var28.scrollY > 0) {
-                                                   var29 = (Rasterizer2D.Rasterizer2D_yClipStart - var23 - var25) * Client.__client_gy / 3;
-                                                   if(var29 > Client.__client_gy * 10) {
-                                                      var29 = Client.__client_gy * 10;
+                                             var42.method310(var21 + var33, var26 + var24, 128);
+                                             if (interfaceID != -1) {
+                                                Widget var47 = components[interfaceID & 65535];
+                                                int var45;
+                                                if (var26 + var24 < Rasterizer2D.Rasterizer2D_yClipStart && var47.scrollY > 0) {
+                                                   var45 = (Rasterizer2D.Rasterizer2D_yClipStart - var26 - var24) * Client.field183 / 3;
+                                                   if (var45 > Client.field183 * 10) {
+                                                      var45 = Client.field183 * 10;
                                                    }
 
-                                                   if(var29 > var28.scrollY) {
-                                                      var29 = var28.scrollY;
+                                                   if (var45 > var47.scrollY) {
+                                                      var45 = var47.scrollY;
                                                    }
 
-                                                   var28.scrollY -= var29;
-                                                   Client.__client_je += var29;
-                                                   class22.method295(var28);
+                                                   var47.scrollY -= var45;
+                                                   Client.field206 += var45;
+                                                   WorldMapRectangle.method295(var47);
                                                 }
 
-                                                if(var25 + var23 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var28.scrollY < var28.scrollHeight - var28.height) {
-                                                   var29 = (var23 + var25 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.__client_gy / 3;
-                                                   if(var29 > Client.__client_gy * 10) {
-                                                      var29 = Client.__client_gy * 10;
+                                                if (var24 + var26 + 32 > Rasterizer2D.Rasterizer2D_yClipEnd && var47.scrollY < var47.scrollHeight - var47.height) {
+                                                   var45 = (var26 + var24 + 32 - Rasterizer2D.Rasterizer2D_yClipEnd) * Client.field183 / 3;
+                                                   if (var45 > Client.field183 * 10) {
+                                                      var45 = Client.field183 * 10;
                                                    }
 
-                                                   if(var29 > var28.scrollHeight - var28.height - var28.scrollY) {
-                                                      var29 = var28.scrollHeight - var28.height - var28.scrollY;
+                                                   if (var45 > var47.scrollHeight - var47.height - var47.scrollY) {
+                                                      var45 = var47.scrollHeight - var47.height - var47.scrollY;
                                                    }
 
-                                                   var28.scrollY += var29;
-                                                   Client.__client_je -= var29;
-                                                   class22.method295(var28);
+                                                   var47.scrollY += var45;
+                                                   Client.field206 -= var45;
+                                                   WorldMapRectangle.method295(var47);
                                                 }
                                              }
-                                          } else if(var10 == BoundaryObject.__ej_jv && var30 == Client.__client_jz) {
-                                             var27.__h_508(var22, var23, 128);
+                                          } else if (var10 == BoundaryObject.field40 && var22 == Client.field204) {
+                                             var42.method310(var21, var26, 128);
                                           } else {
-                                             var27.drawAt2(var22, var23);
+                                             var42.drawAt2(var21, var26);
                                           }
                                        } else {
-                                          class22.method295(var10);
+                                          WorldMapRectangle.method295(var10);
                                        }
                                     }
                                  }
 
-                                 ++var30;
+                                 ++var22;
                               }
                            }
-                        } else if(var10.type == 3) {
-                           if(class238.runCs1(var10)) {
-                              var30 = var10.color2;
-                              if(var10 == Clock.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) {
-                                 var30 = var10.mouseOverColor2;
+                        } else if (var10.type == 3) {
+                           if (class238.runCs1(var10)) {
+                              var22 = var10.color2;
+                              if (var10 == Clock.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) {
+                                 var22 = var10.mouseOverColor2;
                               }
                            } else {
-                              var30 = var10.color;
-                              if(var10 == Clock.mousedOverWidgetIf1 && var10.mouseOverColor != 0) {
-                                 var30 = var10.mouseOverColor;
+                              var22 = var10.color;
+                              if (var10 == Clock.mousedOverWidgetIf1 && var10.mouseOverColor != 0) {
+                                 var22 = var10.mouseOverColor;
                               }
                            }
 
-                           if(var10.fill) {
-                              switch(var10.rectangleMode.id) {
+                           if (var10.fill) {
+                              switch(var10.rectangleMode.value) {
                               case 1:
-                                 Rasterizer2D.drawGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2);
+                                 Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2);
                                  break;
                               case 2:
-                                 Rasterizer2D.drawGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparency & 255), 255 - (var10.__af & 255));
+                                 Rasterizer2D.Rasterizer2D_fillRectangleGradientAlpha(var12, var13, var10.width, var10.height, var10.color, var10.color2, 255 - (var10.transparency & 255), 255 - (var10.field960 & 255));
                                  break;
                               default:
-                                 if(var14 == 0) {
-                                    Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var30);
+                                 if (var14 == 0) {
+                                    Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var22);
                                  } else {
-                                    Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var30, 256 - (var14 & 255));
+                                    Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var22, 256 - (var14 & 255));
                                  }
                               }
-                           } else if(var14 == 0) {
-                              Rasterizer2D.Rasterizer2D_drawRectangle(var12, var13, var10.width, var10.height, var30);
+                           } else if (var14 == 0) {
+                              Rasterizer2D.Rasterizer2D_drawRectangle(var12, var13, var10.width, var10.height, var22);
                            } else {
-                              Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var30, 256 - (var14 & 255));
+                              Rasterizer2D.Rasterizer2D_drawRectangleAlpha(var12, var13, var10.width, var10.height, var22, 256 - (var14 & 255));
                            }
                         } else {
-                           Font var36;
-                           if(var10.type == 4) {
-                              var36 = var10.getFont();
-                              if(var36 == null) {
-                                 if(Widget.__ho_j) {
-                                    class22.method295(var10);
+                           Font var27;
+                           if (var10.type == 4) {
+                              var27 = var10.getFont();
+                              if (var27 == null) {
+                                 if (Widget.field957) {
+                                    WorldMapRectangle.method295(var10);
                                  }
                               } else {
-                                 String var45 = var10.text;
-                                 if(class238.runCs1(var10)) {
-                                    var20 = var10.color2;
-                                    if(var10 == Clock.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) {
-                                       var20 = var10.mouseOverColor2;
+                                 String var38 = var10.text;
+                                 if (class238.runCs1(var10)) {
+                                    var19 = var10.color2;
+                                    if (var10 == Clock.mousedOverWidgetIf1 && var10.mouseOverColor2 != 0) {
+                                       var19 = var10.mouseOverColor2;
                                     }
 
-                                    if(var10.text2.length() > 0) {
-                                       var45 = var10.text2;
+                                    if (var10.text2.length() > 0) {
+                                       var38 = var10.text2;
                                     }
                                  } else {
-                                    var20 = var10.color;
-                                    if(var10 == Clock.mousedOverWidgetIf1 && var10.mouseOverColor != 0) {
-                                       var20 = var10.mouseOverColor;
+                                    var19 = var10.color;
+                                    if (var10 == Clock.mousedOverWidgetIf1 && var10.mouseOverColor != 0) {
+                                       var19 = var10.mouseOverColor;
                                     }
                                  }
 
-                                 if(var10.isIf3 && var10.itemId != -1) {
-                                    ItemDefinition var46 = Skills.getItemDefinition(var10.itemId);
-                                    var45 = var46.name;
-                                    if(var45 == null) {
-                                       var45 = "null";
+                                 if (var10.isIf3 && var10.itemId != -1) {
+                                    ItemDefinition var41 = Skills.getItemDefinition(var10.itemId);
+                                    var38 = var41.name;
+                                    if (var38 == null) {
+                                       var38 = "null";
                                     }
 
-                                    if((var46.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) {
-                                       var45 = BufferedFile.colorStartTag(16748608) + var45 + "</col>" + " " + 'x' + GrandExchangeEvent.method88(var10.itemQuantity);
+                                    if ((var41.isStackable == 1 || var10.itemQuantity != 1) && var10.itemQuantity != -1) {
+                                       var38 = BufferedFile.colorStartTag(16748608) + var38 + "</col> " + 'x' + GrandExchangeEvent.method88(var10.itemQuantity);
                                     }
                                  }
 
-                                 if(var10 == Client.__client_mo) {
-                                    var45 = "Please wait...";
-                                    var20 = var10.color;
+                                 if (var10 == Client.field127) {
+                                    var38 = "Please wait...";
+                                    var19 = var10.color;
                                  }
 
-                                 if(!var10.isIf3) {
-                                    var45 = MouseRecorder.method1194(var45, var10);
+                                 if (!var10.isIf3) {
+                                    var38 = MouseRecorder.method1194(var38, var10);
                                  }
 
-                                 var36.drawLines(var45, var12, var13, var10.width, var10.height, var20, var10.textShadowed?0:-1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight);
+                                 var27.drawLines(var38, var12, var13, var10.width, var10.height, var19, var10.textShadowed ? 0 : -1, var10.textXAlignment, var10.textYAlignment, var10.textLineHeight);
                               }
-                           } else if(var10.type == 5) {
+                           } else if (var10.type == 5) {
                               Sprite var37;
-                              if(!var10.isIf3) {
+                              if (!var10.isIf3) {
                                  var37 = var10.getSprite(class238.runCs1(var10));
-                                 if(var37 != null) {
+                                 if (var37 != null) {
                                     var37.drawAt2(var12, var13);
-                                 } else if(Widget.__ho_j) {
-                                    class22.method295(var10);
+                                 } else if (Widget.field957) {
+                                    WorldMapRectangle.method295(var10);
                                  }
                               } else {
-                                 if(var10.itemId != -1) {
+                                 if (var10.itemId != -1) {
                                     var37 = class226.getItemSprite(var10.itemId, var10.itemQuantity, var10.outline, var10.spriteShadow, var10.itemQuantityMode, false);
                                  } else {
                                     var37 = var10.getSprite(false);
                                  }
 
-                                 if(var37 == null) {
-                                    if(Widget.__ho_j) {
-                                       class22.method295(var10);
+                                 if (var37 == null) {
+                                    if (Widget.field957) {
+                                       WorldMapRectangle.method295(var10);
                                     }
                                  } else {
-                                    var20 = var37.width;
-                                    var21 = var37.height;
-                                    if(!var10.spriteTiling) {
-                                       var22 = var10.width * 4096 / var20;
-                                       if(var10.spriteAngle != 0) {
-                                          var37.__ak_515(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var22);
-                                       } else if(var14 != 0) {
-                                          var37.__c_509(var12, var13, var10.width, var10.height, 256 - (var14 & 255));
-                                       } else if(var20 == var10.width && var21 == var10.height) {
+                                    var19 = var37.width;
+                                    var20 = var37.height;
+                                    if (!var10.spriteTiling) {
+                                       var21 = var10.width * 4096 / var19;
+                                       if (var10.spriteAngle != 0) {
+                                          var37.method317(var10.width / 2 + var12, var10.height / 2 + var13, var10.spriteAngle, var21);
+                                       } else if (var14 != 0) {
+                                          var37.method311(var12, var13, var10.width, var10.height, 256 - (var14 & 255));
+                                       } else if (var19 == var10.width && var20 == var10.height) {
                                           var37.drawAt2(var12, var13);
                                        } else {
-                                          var37.__j_506(var12, var13, var10.width, var10.height);
+                                          var37.method309(var12, var13, var10.width, var10.height);
                                        }
                                     } else {
                                        Rasterizer2D.Rasterizer2D_expandClip(var12, var13, var12 + var10.width, var13 + var10.height);
-                                       var22 = (var20 - 1 + var10.width) / var20;
-                                       var23 = (var21 - 1 + var10.height) / var21;
+                                       var21 = (var19 - 1 + var10.width) / var19;
+                                       var26 = (var20 - 1 + var10.height) / var20;
 
-                                       for(var24 = 0; var24 < var22; ++var24) {
-                                          for(var25 = 0; var25 < var23; ++var25) {
-                                             if(var10.spriteAngle != 0) {
-                                                var37.__ak_515(var20 / 2 + var12 + var20 * var24, var21 / 2 + var13 + var25 * var21, var10.spriteAngle, 4096);
-                                             } else if(var14 != 0) {
-                                                var37.__h_508(var12 + var20 * var24, var13 + var21 * var25, 256 - (var14 & 255));
+                                       for (var33 = 0; var33 < var21; ++var33) {
+                                          for (var24 = 0; var24 < var26; ++var24) {
+                                             if (var10.spriteAngle != 0) {
+                                                var37.method317(var19 / 2 + var12 + var19 * var33, var20 / 2 + var13 + var24 * var20, var10.spriteAngle, 4096);
+                                             } else if (var14 != 0) {
+                                                var37.method310(var12 + var19 * var33, var13 + var20 * var24, 256 - (var14 & 255));
                                              } else {
-                                                var37.drawAt2(var12 + var20 * var24, var13 + var25 * var21);
+                                                var37.drawAt2(var12 + var19 * var33, var13 + var24 * var20);
                                              }
                                           }
                                        }
 
-                                       Rasterizer2D.Rasterizer2D_setClip(var2, var3, var4, var5);
+                                       Rasterizer2D.Rasterizer2D_setClip(xStart, yStart, xEnd, yEnd);
                                     }
                                  }
                               }
                            } else {
-                              ItemDefinition var34;
-                              if(var10.type == 6) {
-                                 boolean var43 = class238.runCs1(var10);
-                                 if(var43) {
-                                    var20 = var10.sequenceId2;
+                              ItemDefinition var28;
+                              if (var10.type == 6) {
+                                 boolean var40 = class238.runCs1(var10);
+                                 if (var40) {
+                                    var19 = var10.sequenceId2;
                                  } else {
-                                    var20 = var10.sequenceId;
+                                    var19 = var10.sequenceId;
                                  }
 
-                                 Model var41 = null;
-                                 var22 = 0;
-                                 if(var10.itemId != -1) {
-                                    var34 = Skills.getItemDefinition(var10.itemId);
-                                    if(var34 != null) {
-                                       var34 = var34.__x_430(var10.itemQuantity);
-                                       var41 = var34.getModel(1);
-                                       if(var41 != null) {
-                                          var41.calculateBoundsCylinder();
-                                          var22 = var41.height / 2;
+                                 Model var43 = null;
+                                 var21 = 0;
+                                 if (var10.itemId != -1) {
+                                    var28 = Skills.getItemDefinition(var10.itemId);
+                                    if (var28 != null) {
+                                       var28 = var28.getCountObj(var10.itemQuantity);
+                                       var43 = var28.getModel(1);
+                                       if (var43 != null) {
+                                          var43.calculateBoundsCylinder();
+                                          var21 = var43.height / 2;
                                        } else {
-                                          class22.method295(var10);
+                                          WorldMapRectangle.method295(var10);
                                        }
                                     }
-                                 } else if(var10.modelType == 5) {
-                                    if(var10.modelId == 0) {
-                                       var41 = Client.__client_ru.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1);
+                                 } else if (var10.modelType == 5) {
+                                    if (var10.modelId == 0) {
+                                       var43 = Client.playerAppearance.getModel((SequenceDefinition)null, -1, (SequenceDefinition)null, -1);
                                     } else {
-                                       var41 = Canvas.localPlayer.getModel();
+                                       var43 = Canvas.localPlayer.getModel();
                                     }
-                                 } else if(var20 == -1) {
-                                    var41 = var10.getModel((SequenceDefinition)null, -1, var43, Canvas.localPlayer.appearance);
-                                    if(var41 == null && Widget.__ho_j) {
-                                       class22.method295(var10);
+                                 } else if (var19 == -1) {
+                                    var43 = var10.getModel((SequenceDefinition)null, -1, var40, Canvas.localPlayer.appearance);
+                                    if (var43 == null && Widget.field957) {
+                                       WorldMapRectangle.method295(var10);
                                     }
                                  } else {
-                                    SequenceDefinition var47 = WorldMapAreaData.getSequenceDefinition(var20);
-                                    var41 = var10.getModel(var47, var10.modelFrame, var43, Canvas.localPlayer.appearance);
-                                    if(var41 == null && Widget.__ho_j) {
-                                       class22.method295(var10);
+                                    SequenceDefinition var44 = WorldMapAreaData.getSequenceDefinition(var19);
+                                    var43 = var10.getModel(var44, var10.modelFrame, var40, Canvas.localPlayer.appearance);
+                                    if (var43 == null && Widget.field957) {
+                                       WorldMapRectangle.method295(var10);
                                     }
                                  }
 
                                  Rasterizer3D.method2989(var10.width / 2 + var12, var10.height / 2 + var13);
-                                 var23 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16;
-                                 var24 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16;
-                                 if(var41 != null) {
-                                    if(!var10.isIf3) {
-                                       var41.__c_234(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var23, var24);
+                                 var26 = Rasterizer3D.Rasterizer3D_sine[var10.modelAngleX] * var10.modelZoom >> 16;
+                                 var33 = Rasterizer3D.Rasterizer3D_cosine[var10.modelAngleX] * var10.modelZoom >> 16;
+                                 if (var43 != null) {
+                                    if (!var10.isIf3) {
+                                       var43.method199(0, var10.modelAngleY, 0, var10.modelAngleX, 0, var26, var33);
                                     } else {
-                                       var41.calculateBoundsCylinder();
-                                       if(var10.modelOrthog) {
-                                          var41.__p_235(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var22 + var23 + var10.modelOffsetY, var24 + var10.modelOffsetY, var10.modelZoom);
+                                       var43.calculateBoundsCylinder();
+                                       if (var10.modelOrthog) {
+                                          var43.method200(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var21 + var26 + var10.modelOffsetY, var33 + var10.modelOffsetY, var10.modelZoom);
                                        } else {
-                                          var41.__c_234(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var23 + var22 + var10.modelOffsetY, var24 + var10.modelOffsetY);
+                                          var43.method199(0, var10.modelAngleY, var10.modelAngleZ, var10.modelAngleX, var10.modelOffsetX, var26 + var21 + var10.modelOffsetY, var33 + var10.modelOffsetY);
                                        }
                                     }
                                  }
 
                                  Rasterizer3D.Rasterizer3D_method3();
                               } else {
-                                 if(var10.type == 7) {
-                                    var36 = var10.getFont();
-                                    if(var36 == null) {
-                                       if(Widget.__ho_j) {
-                                          class22.method295(var10);
+                                 if (var10.type == 7) {
+                                    var27 = var10.getFont();
+                                    if (var27 == null) {
+                                       if (Widget.field957) {
+                                          WorldMapRectangle.method295(var10);
                                        }
                                        continue;
                                     }
 
-                                    var20 = 0;
+                                    var19 = 0;
 
-                                    for(var21 = 0; var21 < var10.rawHeight; ++var21) {
-                                       for(var22 = 0; var22 < var10.rawWidth; ++var22) {
-                                          if(var10.itemIds[var20] > 0) {
-                                             var34 = Skills.getItemDefinition(var10.itemIds[var20] - 1);
-                                             String var31;
-                                             if(var34.isStackable != 1 && var10.itemQuantities[var20] == 1) {
-                                                var31 = BufferedFile.colorStartTag(16748608) + var34.name + "</col>";
+                                    for (var20 = 0; var20 < var10.rawHeight; ++var20) {
+                                       for (var21 = 0; var21 < var10.rawWidth; ++var21) {
+                                          if (var10.itemIds[var19] > 0) {
+                                             var28 = Skills.getItemDefinition(var10.itemIds[var19] - 1);
+                                             String var29;
+                                             if (var28.isStackable != 1 && var10.itemQuantities[var19] == 1) {
+                                                var29 = BufferedFile.colorStartTag(16748608) + var28.name + "</col>";
                                              } else {
-                                                var31 = BufferedFile.colorStartTag(16748608) + var34.name + "</col>" + " " + 'x' + GrandExchangeEvent.method88(var10.itemQuantities[var20]);
+                                                var29 = BufferedFile.colorStartTag(16748608) + var28.name + "</col> " + 'x' + GrandExchangeEvent.method88(var10.itemQuantities[var19]);
                                              }
 
-                                             var25 = var22 * (var10.paddingX + 115) + var12;
-                                             var26 = var21 * (var10.paddingY + 12) + var13;
-                                             if(var10.textXAlignment == 0) {
-                                                var36.draw(var31, var25, var26, var10.color, var10.textShadowed?0:-1);
-                                             } else if(var10.textXAlignment == 1) {
-                                                var36.drawCentered(var31, var10.width / 2 + var25, var26, var10.color, var10.textShadowed?0:-1);
+                                             var24 = var21 * (var10.paddingX + 115) + var12;
+                                             var25 = var20 * (var10.paddingY + 12) + var13;
+                                             if (var10.textXAlignment == 0) {
+                                                var27.draw(var29, var24, var25, var10.color, var10.textShadowed ? 0 : -1);
+                                             } else if (var10.textXAlignment == 1) {
+                                                var27.drawCentered(var29, var10.width / 2 + var24, var25, var10.color, var10.textShadowed ? 0 : -1);
                                              } else {
-                                                var36.drawRightAligned(var31, var25 + var10.width - 1, var26, var10.color, var10.textShadowed?0:-1);
+                                                var27.drawRightAligned(var29, var24 + var10.width - 1, var25, var10.color, var10.textShadowed ? 0 : -1);
                                              }
                                           }
 
-                                          ++var20;
+                                          ++var19;
                                        }
                                     }
                                  }
 
-                                 if(var10.type == 8 && var10 == AccessFile.__dk_lm && Client.__client_ls == Client.__client_lb) {
-                                    var30 = 0;
-                                    var20 = 0;
-                                    Font var32 = fontPlain12;
-                                    String var33 = var10.text;
+                                 if (var10.type == 8 && var10 == AccessFile.field8 && Client.field219 == Client.field218) {
+                                    var22 = 0;
+                                    var19 = 0;
+                                    Font var39 = fontPlain12;
+                                    String var30 = var10.text;
 
-                                    String var44;
-                                    for(var33 = MouseRecorder.method1194(var33, var10); var33.length() > 0; var20 = var20 + var32.ascent + 1) {
-                                       var24 = var33.indexOf("<br>");
-                                       if(var24 != -1) {
-                                          var44 = var33.substring(0, var24);
-                                          var33 = var33.substring(var24 + 4);
+                                    String var31;
+                                    for (var30 = MouseRecorder.method1194(var30, var10); var30.length() > 0; var19 = var19 + var39.ascent + 1) {
+                                       var33 = var30.indexOf("<br>");
+                                       if (var33 != -1) {
+                                          var31 = var30.substring(0, var33);
+                                          var30 = var30.substring(var33 + 4);
                                        } else {
-                                          var44 = var33;
-                                          var33 = "";
+                                          var31 = var30;
+                                          var30 = "";
                                        }
 
-                                       var25 = var32.stringWidth(var44);
-                                       if(var25 > var30) {
-                                          var30 = var25;
+                                       var24 = var39.stringWidth(var31);
+                                       if (var24 > var22) {
+                                          var22 = var24;
                                        }
                                     }
 
-                                    var30 += 6;
-                                    var20 += 7;
-                                    var24 = var12 + var10.width - 5 - var30;
-                                    var25 = var13 + var10.height + 5;
-                                    if(var24 < var12 + 5) {
-                                       var24 = var12 + 5;
+                                    var22 += 6;
+                                    var19 += 7;
+                                    var33 = var12 + var10.width - 5 - var22;
+                                    var24 = var13 + var10.height + 5;
+                                    if (var33 < var12 + 5) {
+                                       var33 = var12 + 5;
                                     }
 
-                                    if(var30 + var24 > var4) {
-                                       var24 = var4 - var30;
+                                    if (var22 + var33 > xEnd) {
+                                       var33 = xEnd - var22;
                                     }
 
-                                    if(var25 + var20 > var5) {
-                                       var25 = var5 - var20;
+                                    if (var24 + var19 > yEnd) {
+                                       var24 = yEnd - var19;
                                     }
 
-                                    Rasterizer2D.Rasterizer2D_fillRectangle(var24, var25, var30, var20, 16777120);
-                                    Rasterizer2D.Rasterizer2D_drawRectangle(var24, var25, var30, var20, 0);
-                                    var33 = var10.text;
-                                    var26 = var25 + var32.ascent + 2;
+                                    Rasterizer2D.Rasterizer2D_fillRectangle(var33, var24, var22, var19, 16777120);
+                                    Rasterizer2D.Rasterizer2D_drawRectangle(var33, var24, var22, var19, 0);
+                                    var30 = var10.text;
+                                    var25 = var24 + var39.ascent + 2;
 
-                                    for(var33 = MouseRecorder.method1194(var33, var10); var33.length() > 0; var26 = var26 + var32.ascent + 1) {
-                                       int var35 = var33.indexOf("<br>");
-                                       if(var35 != -1) {
-                                          var44 = var33.substring(0, var35);
-                                          var33 = var33.substring(var35 + 4);
+                                    for (var30 = MouseRecorder.method1194(var30, var10); var30.length() > 0; var25 = var25 + var39.ascent + 1) {
+                                       int var32 = var30.indexOf("<br>");
+                                       if (var32 != -1) {
+                                          var31 = var30.substring(0, var32);
+                                          var30 = var30.substring(var32 + 4);
                                        } else {
-                                          var44 = var33;
-                                          var33 = "";
+                                          var31 = var30;
+                                          var30 = "";
                                        }
 
-                                       var32.draw(var44, var24 + 3, var26, 0, -1);
+                                       var39.draw(var31, var33 + 3, var25, 0, -1);
                                     }
                                  }
 
-                                 if(var10.type == 9) {
-                                    if(var10.__ba) {
-                                       var30 = var12;
-                                       var20 = var13 + var10.height;
-                                       var21 = var12 + var10.width;
-                                       var22 = var13;
+                                 if (var10.type == 9) {
+                                    if (var10.field961) {
+                                       var22 = var12;
+                                       var19 = var13 + var10.height;
+                                       var20 = var12 + var10.width;
+                                       var21 = var13;
                                     } else {
-                                       var30 = var12;
-                                       var20 = var13;
-                                       var21 = var12 + var10.width;
-                                       var22 = var13 + var10.height;
+                                       var22 = var12;
+                                       var19 = var13;
+                                       var20 = var12 + var10.width;
+                                       var21 = var13 + var10.height;
                                     }
 
-                                    if(var10.lineWid == 1) {
-                                       Rasterizer2D.Rasterizer2D_drawLine(var30, var20, var21, var22, var10.color);
+                                    if (var10.lineWid == 1) {
+                                       Rasterizer2D.Rasterizer2D_drawLine(var22, var19, var20, var21, var10.color);
                                     } else {
-                                       class190.method3669(var30, var20, var21, var22, var10.color, var10.lineWid);
+                                       class190.method3669(var22, var19, var20, var21, var10.color, var10.lineWid);
                                     }
                                  }
                               }
@@ -781,17 +781,17 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider {
       garbageValue = "-1666917204"
    )
    static final void method845(int var0) {
-      if(GroundItemPile.loadWidgetGroup(var0)) {
-         Widget[] var1 = Widget.widgets[var0];
+      if (GroundItemPile.loadInterface(var0)) {
+         Widget[] var1 = Widget.interfaceComponents[var0];
 
-         for(int var2 = 0; var2 < var1.length; ++var2) {
+         for (int var2 = 0; var2 < var1.length; ++var2) {
             Widget var3 = var1[var2];
-            if(var3 != null) {
+            if (var3 != null) {
                var3.modelFrame = 0;
                var3.modelFrameCycle = 0;
             }
          }
-
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/DirectByteArrayCopier.java b/runescape-client/src/main/java/DirectByteArrayCopier.java
index 0bf9f0d78a..e0280788db 100644
--- a/runescape-client/src/main/java/DirectByteArrayCopier.java
+++ b/runescape-client/src/main/java/DirectByteArrayCopier.java
@@ -30,9 +30,9 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier {
       garbageValue = "-2034091753"
    )
    @Export("set")
-   void set(byte[] var1) {
-      this.directBuffer = ByteBuffer.allocateDirect(var1.length);
+   void set(byte[] array) {
+      this.directBuffer = ByteBuffer.allocateDirect(array.length);
       this.directBuffer.position(0);
-      this.directBuffer.put(var1);
+      this.directBuffer.put(array);
    }
 }
diff --git a/runescape-client/src/main/java/DualNode.java b/runescape-client/src/main/java/DualNode.java
index 434d68ecff..640d22b969 100644
--- a/runescape-client/src/main/java/DualNode.java
+++ b/runescape-client/src/main/java/DualNode.java
@@ -25,11 +25,12 @@ public class DualNode extends Node {
    @ObfuscatedName("cg")
    @Export("removeDual")
    public void removeDual() {
-      if(this.nextDual != null) {
+      if (this.nextDual != null) {
          this.nextDual.previousDual = this.previousDual;
          this.previousDual.nextDual = this.nextDual;
          this.previousDual = null;
          this.nextDual = null;
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/DualNodeDeque.java b/runescape-client/src/main/java/DualNodeDeque.java
index b84ff91bd3..38ead2b123 100644
--- a/runescape-client/src/main/java/DualNodeDeque.java
+++ b/runescape-client/src/main/java/DualNodeDeque.java
@@ -25,7 +25,7 @@ public final class DualNodeDeque {
    )
    @Export("addFirst")
    public void addFirst(DualNode var1) {
-      if(var1.nextDual != null) {
+      if (var1.nextDual != null) {
          var1.removeDual();
       }
 
@@ -41,7 +41,7 @@ public final class DualNodeDeque {
    )
    @Export("addLast")
    public void addLast(DualNode var1) {
-      if(var1.nextDual != null) {
+      if (var1.nextDual != null) {
          var1.removeDual();
       }
 
@@ -58,7 +58,7 @@ public final class DualNodeDeque {
    @Export("removeLast")
    public DualNode removeLast() {
       DualNode var1 = this.sentinel.previousDual;
-      if(var1 == this.sentinel) {
+      if (var1 == this.sentinel) {
          return null;
       } else {
          var1.removeDual();
@@ -73,15 +73,15 @@ public final class DualNodeDeque {
    @Export("last")
    public DualNode last() {
       DualNode var1 = this.sentinel.previousDual;
-      return var1 == this.sentinel?null:var1;
+      return var1 == this.sentinel ? null : var1;
    }
 
    @ObfuscatedName("u")
    @Export("clear")
    public void clear() {
-      while(true) {
+      while (true) {
          DualNode var1 = this.sentinel.previousDual;
-         if(var1 == this.sentinel) {
+         if (var1 == this.sentinel) {
             return;
          }
 
@@ -93,8 +93,9 @@ public final class DualNodeDeque {
    @ObfuscatedSignature(
       signature = "(Lfn;Lfn;)V"
    )
-   public static void method5220(DualNode var0, DualNode var1) {
-      if(var0.nextDual != null) {
+   @Export("DualNodeDeque_addBefore")
+   public static void DualNodeDeque_addBefore(DualNode var0, DualNode var1) {
+      if (var0.nextDual != null) {
          var0.removeDual();
       }
 
diff --git a/runescape-client/src/main/java/DynamicObject.java b/runescape-client/src/main/java/DynamicObject.java
index af0b3ff97a..c467592e44 100644
--- a/runescape-client/src/main/java/DynamicObject.java
+++ b/runescape-client/src/main/java/DynamicObject.java
@@ -6,6 +6,7 @@ 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("cf")
 @Implements("DynamicObject")
@@ -74,27 +75,27 @@ public class DynamicObject extends Entity {
    @ObfuscatedSignature(
       signature = "(IIIIIIIZLex;)V"
    )
-   DynamicObject(int var1, int var2, int var3, int var4, int var5, int var6, int animationID, boolean var8, Entity var9) {
+   DynamicObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, boolean var8, Entity var9) {
       this.id = var1;
       this.type = var2;
       this.orientation = var3;
       this.plane = var4;
       this.x = var5;
       this.y = var6;
-      if(animationID != -1) {
-         this.sequenceDefinition = WorldMapAreaData.getSequenceDefinition(animationID);
+      if (var7 != -1) {
+         this.sequenceDefinition = WorldMapAreaData.getSequenceDefinition(var7);
          this.frame = 0;
          this.cycleStart = Client.cycle - 1;
-         if(this.sequenceDefinition.__t == 0 && var9 != null && var9 instanceof DynamicObject) {
+         if (this.sequenceDefinition.field783 == 0 && var9 != null && var9 instanceof DynamicObject) {
             DynamicObject var10 = (DynamicObject)var9;
-            if(this.sequenceDefinition == var10.sequenceDefinition) {
+            if (this.sequenceDefinition == var10.sequenceDefinition) {
                this.frame = var10.frame;
                this.cycleStart = var10.cycleStart;
                return;
             }
          }
 
-         if(var8 && this.sequenceDefinition.frameCount != -1) {
+         if (var8 && this.sequenceDefinition.frameCount != -1) {
             this.frame = (int)(Math.random() * (double)this.sequenceDefinition.frameIds.length);
             this.cycleStart -= (int)(Math.random() * (double)this.sequenceDefinition.frameLengths[this.frame]);
          }
@@ -109,17 +110,17 @@ public class DynamicObject extends Entity {
    )
    @Export("getModel")
    protected final Model getModel() {
-      if(this.sequenceDefinition != null) {
+      if (this.sequenceDefinition != null) {
          int var1 = Client.cycle - this.cycleStart;
-         if(var1 > 100 && this.sequenceDefinition.frameCount > 0) {
+         if (var1 > 100 && this.sequenceDefinition.frameCount > 0) {
             var1 = 100;
          }
 
-         label55: {
+         label47: {
             do {
                do {
-                  if(var1 <= this.sequenceDefinition.frameLengths[this.frame]) {
-                     break label55;
+                  if (var1 <= this.sequenceDefinition.frameLengths[this.frame]) {
+                     break label47;
                   }
 
                   var1 -= this.sequenceDefinition.frameLengths[this.frame];
@@ -136,16 +137,16 @@ public class DynamicObject extends Entity {
       }
 
       ObjectDefinition var12 = class50.getObjectDefinition(this.id);
-      if(var12.transforms != null) {
+      if (var12.transforms != null) {
          var12 = var12.transform();
       }
 
-      if(var12 == null) {
+      if (var12 == null) {
          return null;
       } else {
          int var2;
          int var3;
-         if(this.orientation != 1 && this.orientation != 3) {
+         if (this.orientation != 1 && this.orientation != 3) {
             var2 = var12.sizeX;
             var3 = var12.sizeY;
          } else {
@@ -171,7 +172,7 @@ public class DynamicObject extends Entity {
       garbageValue = "1172859329"
    )
    static void method2218(String[] var0, short[] var1, int var2, int var3) {
-      if(var2 < var3) {
+      if (var2 < var3) {
          int var4 = (var3 + var2) / 2;
          int var5 = var2;
          String var6 = var0[var4];
@@ -181,8 +182,8 @@ public class DynamicObject extends Entity {
          var1[var4] = var1[var3];
          var1[var3] = var7;
 
-         for(int var8 = var2; var8 < var3; ++var8) {
-            if(var6 == null || var0[var8] != null && var0[var8].compareTo(var6) < (var8 & 1)) {
+         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;
@@ -208,53 +209,54 @@ public class DynamicObject extends Entity {
       garbageValue = "-83"
    )
    static int method2223(int var0, Script var1, boolean var2) {
-      if(var0 == 5000) {
+      if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.publicChatMode;
          return 1;
-      } else if(var0 == 5001) {
+      } else if (var0 == ScriptOpcodes.CHAT_SETFILTER) {
          RouteStrategy.Interpreter_intStackSize -= 3;
          Client.publicChatMode = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-         IndexCacheLoader.field512 = WorldMapElement.method4783(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]);
-         if(IndexCacheLoader.field512 == null) {
-            IndexCacheLoader.field512 = class310.field3805;
+         ArchiveLoader.field512 = WorldMapElement.method4783(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]);
+         if (ArchiveLoader.field512 == null) {
+            ArchiveLoader.field512 = class310.field3805;
          }
 
-         Client.__client_pl = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
-         PacketBufferNode var18 = Interpreter.method1915(ClientPacket.__gs_z, Client.packetWriter.isaacCipher);
-         var18.packetBuffer.writeByte(Client.publicChatMode);
-         var18.packetBuffer.writeByte(IndexCacheLoader.field512.field3804);
-         var18.packetBuffer.writeByte(Client.__client_pl);
-         Client.packetWriter.__q_167(var18);
+         Client.field138 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
+         PacketBufferNode var15 = Interpreter.method1915(ClientPacket.field237, Client.packetWriter.isaacCipher);
+         var15.packetBuffer.writeByte(Client.publicChatMode);
+         var15.packetBuffer.writeByte(ArchiveLoader.field512.field3804);
+         var15.packetBuffer.writeByte(Client.field138);
+         Client.packetWriter.method241(var15);
          return 1;
       } else {
          String var3;
          int var4;
-         if(var0 == 5002) {
+         int var5;
+         if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) {
             var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
             RouteStrategy.Interpreter_intStackSize -= 2;
             var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-            int var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-            PacketBufferNode var6 = Interpreter.method1915(ClientPacket.__gs_ae, Client.packetWriter.isaacCipher);
-            var6.packetBuffer.writeByte(WorldMapRegion.method550(var3) + 2);
-            var6.packetBuffer.writeStringCp1252NullTerminated(var3);
-            var6.packetBuffer.writeByte(var4 - 1);
-            var6.packetBuffer.writeByte(var5);
-            Client.packetWriter.__q_167(var6);
+            var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
+            PacketBufferNode var12 = Interpreter.method1915(ClientPacket.field260, Client.packetWriter.isaacCipher);
+            var12.packetBuffer.writeByte(WorldMapRegion.stringCp1252NullTerminatedByteSize(var3) + 2);
+            var12.packetBuffer.writeStringCp1252NullTerminated(var3);
+            var12.packetBuffer.writeByte(var4 - 1);
+            var12.packetBuffer.writeByte(var5);
+            Client.packetWriter.method241(var12);
             return 1;
          } else {
-            int var10;
-            if(var0 == 5003) {
+            Message var6;
+            if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) {
                RouteStrategy.Interpreter_intStackSize -= 2;
-               var10 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
+               var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
                var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-               Message var15 = Message.method1226(var10, var4);
-               if(var15 != null) {
-                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var15.count;
-                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var15.cycle;
-                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var15.sender != null?var15.sender:"";
-                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var15.prefix != null?var15.prefix:"";
-                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var15.text != null?var15.text:"";
-                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var15.isFromFriend()?1:(var15.isFromIgnored()?2:0);
+               var6 = Message.method1226(var5, var4);
+               if (var6 != null) {
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.count;
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.cycle;
+                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.sender != null ? var6.sender : "";
+                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.prefix != null ? var6.prefix : "";
+                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.text != null ? var6.text : "";
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.isFromFriend() ? 1 : (var6.isFromIgnored() ? 2 : 0);
                } else {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
@@ -265,16 +267,16 @@ public class DynamicObject extends Entity {
                }
 
                return 1;
-            } else if(var0 == 5004) {
-               var10 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-               Message var16 = NetCache.method4708(var10);
-               if(var16 != null) {
-                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var16.type;
-                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var16.cycle;
-                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16.sender != null?var16.sender:"";
-                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16.prefix != null?var16.prefix:"";
-                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16.text != null?var16.text:"";
-                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var16.isFromFriend()?1:(var16.isFromIgnored()?2:0);
+            } else if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) {
+               var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+               var6 = NetCache.method4708(var5);
+               if (var6 != null) {
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.type;
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.cycle;
+                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.sender != null ? var6.sender : "";
+                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.prefix != null ? var6.prefix : "";
+                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.text != null ? var6.text : "";
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.isFromFriend() ? 1 : (var6.isFromIgnored() ? 2 : 0);
                } else {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
@@ -285,195 +287,198 @@ public class DynamicObject extends Entity {
                }
 
                return 1;
-            } else if(var0 == 5005) {
-               if(IndexCacheLoader.field512 == null) {
+            } else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) {
+               if (ArchiveLoader.field512 == null) {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                } else {
-                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = IndexCacheLoader.field512.field3804;
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ArchiveLoader.field512.field3804;
                }
 
                return 1;
-            } else if(var0 == 5008) {
-               var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-               var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-               String var14 = var3.toLowerCase();
-               byte var17 = 0;
-               if(var14.startsWith("yellow:")) {
-                  var17 = 0;
-                  var3 = var3.substring("yellow:".length());
-               } else if(var14.startsWith("red:")) {
-                  var17 = 1;
-                  var3 = var3.substring("red:".length());
-               } else if(var14.startsWith("green:")) {
-                  var17 = 2;
-                  var3 = var3.substring("green:".length());
-               } else if(var14.startsWith("cyan:")) {
-                  var17 = 3;
-                  var3 = var3.substring("cyan:".length());
-               } else if(var14.startsWith("purple:")) {
-                  var17 = 4;
-                  var3 = var3.substring("purple:".length());
-               } else if(var14.startsWith("white:")) {
-                  var17 = 5;
-                  var3 = var3.substring("white:".length());
-               } else if(var14.startsWith("flash1:")) {
-                  var17 = 6;
-                  var3 = var3.substring("flash1:".length());
-               } else if(var14.startsWith("flash2:")) {
-                  var17 = 7;
-                  var3 = var3.substring("flash2:".length());
-               } else if(var14.startsWith("flash3:")) {
-                  var17 = 8;
-                  var3 = var3.substring("flash3:".length());
-               } else if(var14.startsWith("glow1:")) {
-                  var17 = 9;
-                  var3 = var3.substring("glow1:".length());
-               } else if(var14.startsWith("glow2:")) {
-                  var17 = 10;
-                  var3 = var3.substring("glow2:".length());
-               } else if(var14.startsWith("glow3:")) {
-                  var17 = 11;
-                  var3 = var3.substring("glow3:".length());
-               } else if(Client.language != 0) {
-                  if(var14.startsWith("yellow:")) {
-                     var17 = 0;
-                     var3 = var3.substring("yellow:".length());
-                  } else if(var14.startsWith("red:")) {
-                     var17 = 1;
-                     var3 = var3.substring("red:".length());
-                  } else if(var14.startsWith("green:")) {
-                     var17 = 2;
-                     var3 = var3.substring("green:".length());
-                  } else if(var14.startsWith("cyan:")) {
-                     var17 = 3;
-                     var3 = var3.substring("cyan:".length());
-                  } else if(var14.startsWith("purple:")) {
-                     var17 = 4;
-                     var3 = var3.substring("purple:".length());
-                  } else if(var14.startsWith("white:")) {
-                     var17 = 5;
-                     var3 = var3.substring("white:".length());
-                  } else if(var14.startsWith("flash1:")) {
-                     var17 = 6;
-                     var3 = var3.substring("flash1:".length());
-                  } else if(var14.startsWith("flash2:")) {
-                     var17 = 7;
-                     var3 = var3.substring("flash2:".length());
-                  } else if(var14.startsWith("flash3:")) {
-                     var17 = 8;
-                     var3 = var3.substring("flash3:".length());
-                  } else if(var14.startsWith("glow1:")) {
-                     var17 = 9;
-                     var3 = var3.substring("glow1:".length());
-                  } else if(var14.startsWith("glow2:")) {
-                     var17 = 10;
-                     var3 = var3.substring("glow2:".length());
-                  } else if(var14.startsWith("glow3:")) {
-                     var17 = 11;
-                     var3 = var3.substring("glow3:".length());
-                  }
-               }
-
-               var14 = var3.toLowerCase();
-               byte var7 = 0;
-               if(var14.startsWith("wave:")) {
-                  var7 = 1;
-                  var3 = var3.substring("wave:".length());
-               } else if(var14.startsWith("wave2:")) {
-                  var7 = 2;
-                  var3 = var3.substring("wave2:".length());
-               } else if(var14.startsWith("shake:")) {
-                  var7 = 3;
-                  var3 = var3.substring("shake:".length());
-               } else if(var14.startsWith("scroll:")) {
-                  var7 = 4;
-                  var3 = var3.substring("scroll:".length());
-               } else if(var14.startsWith("slide:")) {
-                  var7 = 5;
-                  var3 = var3.substring("slide:".length());
-               } else if(Client.language != 0) {
-                  if(var14.startsWith("wave:")) {
-                     var7 = 1;
-                     var3 = var3.substring("wave:".length());
-                  } else if(var14.startsWith("wave2:")) {
-                     var7 = 2;
-                     var3 = var3.substring("wave2:".length());
-                  } else if(var14.startsWith("shake:")) {
-                     var7 = 3;
-                     var3 = var3.substring("shake:".length());
-                  } else if(var14.startsWith("scroll:")) {
-                     var7 = 4;
-                     var3 = var3.substring("scroll:".length());
-                  } else if(var14.startsWith("slide:")) {
-                     var7 = 5;
-                     var3 = var3.substring("slide:".length());
-                  }
-               }
-
-               PacketBufferNode var8 = Interpreter.method1915(ClientPacket.__gs_cz, Client.packetWriter.isaacCipher);
-               var8.packetBuffer.writeByte(0);
-               int var9 = var8.packetBuffer.index;
-               var8.packetBuffer.writeByte(var4);
-               var8.packetBuffer.writeByte(var17);
-               var8.packetBuffer.writeByte(var7);
-               TextureProvider.method2777(var8.packetBuffer, var3);
-               var8.packetBuffer.__h_300(var8.packetBuffer.index - var9);
-               Client.packetWriter.__q_167(var8);
-               return 1;
-            } else if(var0 == 5009) {
-               Interpreter.Interpreter_stringStackSize -= 2;
-               var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize];
-               String var12 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
-               PacketBufferNode var11 = Interpreter.method1915(ClientPacket.__gs_v, Client.packetWriter.isaacCipher);
-               var11.packetBuffer.writeShort(0);
-               int var13 = var11.packetBuffer.index;
-               var11.packetBuffer.writeStringCp1252NullTerminated(var3);
-               TextureProvider.method2777(var11.packetBuffer, var12);
-               var11.packetBuffer.__y_299(var11.packetBuffer.index - var13);
-               Client.packetWriter.__q_167(var11);
-               return 1;
-            } else if(var0 != 5015) {
-               if(var0 == 5016) {
-                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.__client_pl;
-                  return 1;
-               } else if(var0 == 5017) {
-                  var10 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WidgetGroupParent.method1174(var10);
-                  return 1;
-               } else if(var0 == 5018) {
-                  var10 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class12.method161(var10);
-                  return 1;
-               } else if(var0 == 5019) {
-                  var10 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = SpriteMask.method4391(var10);
-                  return 1;
-               } else if(var0 == 5020) {
-                  var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-                  BoundaryObject.doCheat(var3);
-                  return 1;
-               } else if(var0 == 5021) {
-                  Client.__client_pz = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize].toLowerCase().trim();
-                  return 1;
-               } else if(var0 == 5022) {
-                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Client.__client_pz;
-                  return 1;
-               } else if(var0 == 5023) {
-                  var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-                  System.out.println(var3);
-                  return 1;
-               } else {
-                  return 2;
-               }
             } else {
-               if(Canvas.localPlayer != null && Canvas.localPlayer.username != null) {
-                  var3 = Canvas.localPlayer.username.getName();
-               } else {
-                  var3 = "";
-               }
+               String var7;
+               if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) {
+                  var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+                  var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+                  var7 = var3.toLowerCase();
+                  byte var13 = 0;
+                  if (var7.startsWith("yellow:")) {
+                     var13 = 0;
+                     var3 = var3.substring("yellow:".length());
+                  } else if (var7.startsWith("red:")) {
+                     var13 = 1;
+                     var3 = var3.substring("red:".length());
+                  } else if (var7.startsWith("green:")) {
+                     var13 = 2;
+                     var3 = var3.substring("green:".length());
+                  } else if (var7.startsWith("cyan:")) {
+                     var13 = 3;
+                     var3 = var3.substring("cyan:".length());
+                  } else if (var7.startsWith("purple:")) {
+                     var13 = 4;
+                     var3 = var3.substring("purple:".length());
+                  } else if (var7.startsWith("white:")) {
+                     var13 = 5;
+                     var3 = var3.substring("white:".length());
+                  } else if (var7.startsWith("flash1:")) {
+                     var13 = 6;
+                     var3 = var3.substring("flash1:".length());
+                  } else if (var7.startsWith("flash2:")) {
+                     var13 = 7;
+                     var3 = var3.substring("flash2:".length());
+                  } else if (var7.startsWith("flash3:")) {
+                     var13 = 8;
+                     var3 = var3.substring("flash3:".length());
+                  } else if (var7.startsWith("glow1:")) {
+                     var13 = 9;
+                     var3 = var3.substring("glow1:".length());
+                  } else if (var7.startsWith("glow2:")) {
+                     var13 = 10;
+                     var3 = var3.substring("glow2:".length());
+                  } else if (var7.startsWith("glow3:")) {
+                     var13 = 11;
+                     var3 = var3.substring("glow3:".length());
+                  } else if (Client.language != 0) {
+                     if (var7.startsWith("yellow:")) {
+                        var13 = 0;
+                        var3 = var3.substring("yellow:".length());
+                     } else if (var7.startsWith("red:")) {
+                        var13 = 1;
+                        var3 = var3.substring("red:".length());
+                     } else if (var7.startsWith("green:")) {
+                        var13 = 2;
+                        var3 = var3.substring("green:".length());
+                     } else if (var7.startsWith("cyan:")) {
+                        var13 = 3;
+                        var3 = var3.substring("cyan:".length());
+                     } else if (var7.startsWith("purple:")) {
+                        var13 = 4;
+                        var3 = var3.substring("purple:".length());
+                     } else if (var7.startsWith("white:")) {
+                        var13 = 5;
+                        var3 = var3.substring("white:".length());
+                     } else if (var7.startsWith("flash1:")) {
+                        var13 = 6;
+                        var3 = var3.substring("flash1:".length());
+                     } else if (var7.startsWith("flash2:")) {
+                        var13 = 7;
+                        var3 = var3.substring("flash2:".length());
+                     } else if (var7.startsWith("flash3:")) {
+                        var13 = 8;
+                        var3 = var3.substring("flash3:".length());
+                     } else if (var7.startsWith("glow1:")) {
+                        var13 = 9;
+                        var3 = var3.substring("glow1:".length());
+                     } else if (var7.startsWith("glow2:")) {
+                        var13 = 10;
+                        var3 = var3.substring("glow2:".length());
+                     } else if (var7.startsWith("glow3:")) {
+                        var13 = 11;
+                        var3 = var3.substring("glow3:".length());
+                     }
+                  }
 
-               Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3;
-               return 1;
+                  var7 = var3.toLowerCase();
+                  byte var14 = 0;
+                  if (var7.startsWith("wave:")) {
+                     var14 = 1;
+                     var3 = var3.substring("wave:".length());
+                  } else if (var7.startsWith("wave2:")) {
+                     var14 = 2;
+                     var3 = var3.substring("wave2:".length());
+                  } else if (var7.startsWith("shake:")) {
+                     var14 = 3;
+                     var3 = var3.substring("shake:".length());
+                  } else if (var7.startsWith("scroll:")) {
+                     var14 = 4;
+                     var3 = var3.substring("scroll:".length());
+                  } else if (var7.startsWith("slide:")) {
+                     var14 = 5;
+                     var3 = var3.substring("slide:".length());
+                  } else if (Client.language != 0) {
+                     if (var7.startsWith("wave:")) {
+                        var14 = 1;
+                        var3 = var3.substring("wave:".length());
+                     } else if (var7.startsWith("wave2:")) {
+                        var14 = 2;
+                        var3 = var3.substring("wave2:".length());
+                     } else if (var7.startsWith("shake:")) {
+                        var14 = 3;
+                        var3 = var3.substring("shake:".length());
+                     } else if (var7.startsWith("scroll:")) {
+                        var14 = 4;
+                        var3 = var3.substring("scroll:".length());
+                     } else if (var7.startsWith("slide:")) {
+                        var14 = 5;
+                        var3 = var3.substring("slide:".length());
+                     }
+                  }
+
+                  PacketBufferNode var10 = Interpreter.method1915(ClientPacket.field319, Client.packetWriter.isaacCipher);
+                  var10.packetBuffer.writeByte(0);
+                  int var11 = var10.packetBuffer.index;
+                  var10.packetBuffer.writeByte(var4);
+                  var10.packetBuffer.writeByte(var13);
+                  var10.packetBuffer.writeByte(var14);
+                  TextureProvider.method2777(var10.packetBuffer, var3);
+                  var10.packetBuffer.writeLengthByte(var10.packetBuffer.index - var11);
+                  Client.packetWriter.method241(var10);
+                  return 1;
+               } else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) {
+                  Interpreter.Interpreter_stringStackSize -= 2;
+                  var3 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize];
+                  var7 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
+                  PacketBufferNode var8 = Interpreter.method1915(ClientPacket.field247, Client.packetWriter.isaacCipher);
+                  var8.packetBuffer.writeShort(0);
+                  int var9 = var8.packetBuffer.index;
+                  var8.packetBuffer.writeStringCp1252NullTerminated(var3);
+                  TextureProvider.method2777(var8.packetBuffer, var7);
+                  var8.packetBuffer.writeLengthShort(var8.packetBuffer.index - var9);
+                  Client.packetWriter.method241(var8);
+                  return 1;
+               } else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) {
+                  if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) {
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.field138;
+                     return 1;
+                  } else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = InterfaceParent.method1174(var5);
+                     return 1;
+                  } else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = GrandExchangeOfferAgeComparator.method161(var5);
+                     return 1;
+                  } else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = SpriteMask.method4391(var5);
+                     return 1;
+                  } else if (var0 == ScriptOpcodes.DOCHEAT) {
+                     var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+                     BoundaryObject.doCheat(var3);
+                     return 1;
+                  } else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) {
+                     Client.field158 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize].toLowerCase().trim();
+                     return 1;
+                  } else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) {
+                     Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Client.field158;
+                     return 1;
+                  } else if (var0 == 5023) {
+                     var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+                     System.out.println(var3);
+                     return 1;
+                  } else {
+                     return 2;
+                  }
+               } else {
+                  if (Canvas.localPlayer != null && Canvas.localPlayer.username != null) {
+                     var3 = Canvas.localPlayer.username.getName();
+                  } else {
+                     var3 = "";
+                  }
+
+                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3;
+                  return 1;
+               }
             }
          }
       }
@@ -486,36 +491,35 @@ public class DynamicObject extends Entity {
    )
    protected static int method2222() {
       int var0 = 0;
-      if(AbstractIndexCache.garbageCollector == null || !AbstractIndexCache.garbageCollector.isValid()) {
+      if (AbstractArchive.garbageCollector == null || !AbstractArchive.garbageCollector.isValid()) {
          try {
             Iterator var1 = ManagementFactory.getGarbageCollectorMXBeans().iterator();
 
-            while(var1.hasNext()) {
+            while (var1.hasNext()) {
                GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next();
-               if(var2.isValid()) {
-                  AbstractIndexCache.garbageCollector = var2;
+               if (var2.isValid()) {
+                  AbstractArchive.garbageCollector = var2;
                   GameShell.garbageCollectorLastCheckTimeMs = -1L;
                   GameShell.garbageCollectorLastCollectionTime = -1L;
                }
             }
-         } catch (Throwable var11) {
-            ;
+         } catch (Throwable var9) {
          }
       }
 
-      if(AbstractIndexCache.garbageCollector != null) {
-         long var9 = class203.currentTimeMs();
-         long var3 = AbstractIndexCache.garbageCollector.getCollectionTime();
-         if(GameShell.garbageCollectorLastCollectionTime != -1L) {
+      if (AbstractArchive.garbageCollector != null) {
+         long var10 = class203.currentTimeMs();
+         long var3 = AbstractArchive.garbageCollector.getCollectionTime();
+         if (GameShell.garbageCollectorLastCollectionTime != -1L) {
             long var5 = var3 - GameShell.garbageCollectorLastCollectionTime;
-            long var7 = var9 - GameShell.garbageCollectorLastCheckTimeMs;
-            if(0L != var7) {
+            long var7 = var10 - GameShell.garbageCollectorLastCheckTimeMs;
+            if (0L != var7) {
                var0 = (int)(var5 * 100L / var7);
             }
          }
 
          GameShell.garbageCollectorLastCollectionTime = var3;
-         GameShell.garbageCollectorLastCheckTimeMs = var9;
+         GameShell.garbageCollectorLastCheckTimeMs = var10;
       }
 
       return var0;
@@ -527,11 +531,11 @@ public class DynamicObject extends Entity {
       garbageValue = "2072073729"
    )
    static final void method2224(int var0, int var1, boolean var2) {
-      if(!var2 || var0 != GameObject.__eh_fy || WorldMapLabelSize.__s_fi != var1) {
-         GameObject.__eh_fy = var0;
-         WorldMapLabelSize.__s_fi = var1;
+      if (!var2 || var0 != GameObject.field359 || WorldMapLabelSize.field1041 != var1) {
+         GameObject.field359 = var0;
+         WorldMapLabelSize.field1041 = var1;
          GameShell.updateGameState(25);
-         class68.drawLoadingMessage("Loading - please wait.", true);
+         PendingSpawn.drawLoadingMessage("Loading - please wait.", true);
          int var3 = class50.baseX;
          int var4 = GraphicsObject.baseY;
          class50.baseX = (var0 - 6) * 8;
@@ -542,26 +546,31 @@ public class DynamicObject extends Entity {
          var4 = GraphicsObject.baseY;
 
          int var7;
-         int var9;
-         for(var7 = 0; var7 < 32768; ++var7) {
-            Npc var8 = Client.npcs[var7];
-            if(var8 != null) {
-               for(var9 = 0; var9 < 10; ++var9) {
-                  var8.pathX[var9] -= var5;
-                  var8.pathY[var9] -= var6;
+         int var8;
+         int[] var9;
+         for (var7 = 0; var7 < 32768; ++var7) {
+            NPC var10 = Client.npcs[var7];
+            if (var10 != null) {
+               for (var8 = 0; var8 < 10; ++var8) {
+                  var9 = var10.pathX;
+                  var9[var8] -= var5;
+                  var9 = var10.pathY;
+                  var9[var8] -= var6;
                }
 
-               var8.x -= var5 * 128;
-               var8.y -= var6 * 128;
+               var10.x -= var5 * 128;
+               var10.y -= var6 * 128;
             }
          }
 
-         for(var7 = 0; var7 < 2048; ++var7) {
+         for (var7 = 0; var7 < 2048; ++var7) {
             Player var21 = Client.players[var7];
-            if(var21 != null) {
-               for(var9 = 0; var9 < 10; ++var9) {
-                  var21.pathX[var9] -= var5;
-                  var21.pathY[var9] -= var6;
+            if (var21 != null) {
+               for (var8 = 0; var8 < 10; ++var8) {
+                  var9 = var21.pathX;
+                  var9[var8] -= var5;
+                  var9 = var21.pathY;
+                  var9[var8] -= var6;
                }
 
                var21.x -= var5 * 128;
@@ -569,67 +578,67 @@ public class DynamicObject extends Entity {
             }
          }
 
-         byte var20 = 0;
-         byte var18 = 104;
-         byte var22 = 1;
-         if(var5 < 0) {
-            var20 = 103;
-            var18 = -1;
-            var22 = -1;
-         }
-
-         byte var10 = 0;
+         byte var22 = 0;
          byte var11 = 104;
          byte var12 = 1;
-         if(var6 < 0) {
-            var10 = 103;
+         if (var5 < 0) {
+            var22 = 103;
             var11 = -1;
             var12 = -1;
          }
 
-         int var14;
-         for(int var13 = var20; var13 != var18; var13 += var22) {
-            for(var14 = var10; var11 != var14; var14 += var12) {
-               int var15 = var13 + var5;
-               int var16 = var14 + var6;
+         byte var13 = 0;
+         byte var14 = 104;
+         byte var15 = 1;
+         if (var6 < 0) {
+            var13 = 103;
+            var14 = -1;
+            var15 = -1;
+         }
 
-               for(int var17 = 0; var17 < 4; ++var17) {
-                  if(var15 >= 0 && var16 >= 0 && var15 < 104 && var16 < 104) {
-                     Client.groundItems[var17][var13][var14] = Client.groundItems[var17][var15][var16];
+         int var16;
+         for (int var17 = var22; var17 != var11; var17 += var12) {
+            for (var16 = var13; var14 != var16; var16 += var15) {
+               int var18 = var17 + var5;
+               int var19 = var16 + var6;
+
+               for (int var20 = 0; var20 < 4; ++var20) {
+                  if (var18 >= 0 && var19 >= 0 && var18 < 104 && var19 < 104) {
+                     Client.groundItems[var20][var17][var16] = Client.groundItems[var20][var18][var19];
                   } else {
-                     Client.groundItems[var17][var13][var14] = null;
+                     Client.groundItems[var20][var17][var16] = null;
                   }
                }
             }
          }
 
-         for(class68 var19 = (class68)Client.__client_kh.last(); var19 != null; var19 = (class68)Client.__client_kh.previous()) {
-            var19.field913 -= var5;
-            var19.field901 -= var6;
-            if(var19.field913 < 0 || var19.field901 < 0 || var19.field913 >= 104 || var19.field901 >= 104) {
-               var19.remove();
+         for (PendingSpawn var23 = (PendingSpawn)Client.pendingSpawns.last(); var23 != null; var23 = (PendingSpawn)Client.pendingSpawns.previous()) {
+            var23.x -= var5;
+            var23.y -= var6;
+            if (var23.x < 0 || var23.y < 0 || var23.x >= 104 || var23.y >= 104) {
+               var23.remove();
             }
          }
 
-         if(Client.destinationX != 0) {
+         if (Client.destinationX != 0) {
             Client.destinationX -= var5;
             Client.destinationY -= var6;
          }
 
          Client.soundEffectCount = 0;
          Client.isCameraLocked = false;
-         WorldMapSection1.cameraX -= var5 << 7;
-         class11.cameraZ -= var6 << 7;
+         WorldMapSection2.cameraX -= var5 << 7;
+         GrandExchangeOfferNameComparator.cameraZ -= var6 << 7;
          MouseHandler.oculusOrbFocalPointX -= var5 << 7;
          ScriptEvent.oculusOrbFocalPointY -= var6 << 7;
-         Client.__client_ph = -1;
+         Client.field125 = -1;
          Client.graphicsObjects.clear();
          Client.projectiles.clear();
 
-         for(var14 = 0; var14 < 4; ++var14) {
-            Client.collisionMaps[var14].clear();
+         for (var16 = 0; var16 < 4; ++var16) {
+            Client.collisionMaps[var16].clear();
          }
-
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/Entity.java b/runescape-client/src/main/java/Entity.java
index e1b55d193e..556d76c21a 100644
--- a/runescape-client/src/main/java/Entity.java
+++ b/runescape-client/src/main/java/Entity.java
@@ -29,12 +29,12 @@ public abstract class Entity extends DualNode {
    }
 
    @ObfuscatedName("cy")
-   @Export("renderDraw")
-   void renderDraw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) {
+   @Export("draw")
+   void draw(int yaw, int cameraPitchSine, int cameraPitchCosine, int cameraYawSine, int cameraYawCosine, int x, int y, int var8, long tag) {
       Model var11 = this.getModel();
-      if(var11 != null) {
+      if (var11 != null) {
          this.height = var11.height;
-         var11.renderDraw(var1, var2, var3, var4, var5, var6, var7, var8, var9);
+         var11.draw(yaw, cameraPitchSine, cameraPitchCosine, cameraYawSine, cameraYawCosine, x, y, var8, tag);
       }
 
    }
diff --git a/runescape-client/src/main/java/EnumDefinition.java b/runescape-client/src/main/java/EnumDefinition.java
index 28d6576ba4..428f82137e 100644
--- a/runescape-client/src/main/java/EnumDefinition.java
+++ b/runescape-client/src/main/java/EnumDefinition.java
@@ -11,8 +11,8 @@ public class EnumDefinition extends DualNode {
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   @Export("EnumDefinition_indexCache")
-   public static AbstractIndexCache EnumDefinition_indexCache;
+   @Export("EnumDefinition_archive")
+   public static AbstractArchive EnumDefinition_archive;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Ler;"
@@ -20,14 +20,14 @@ public class EnumDefinition extends DualNode {
    @Export("EnumDefinition_cached")
    static EvictingDualNodeHashTable EnumDefinition_cached;
    @ObfuscatedName("q")
-   @Export("keyType")
-   public char keyType;
+   @Export("inputType")
+   public char inputType;
    @ObfuscatedName("w")
-   @Export("valType")
-   public char valType;
+   @Export("outputType")
+   public char outputType;
    @ObfuscatedName("o")
-   @Export("defaultString")
-   public String defaultString;
+   @Export("defaultStr")
+   public String defaultStr;
    @ObfuscatedName("u")
    @ObfuscatedGetter(
       intValue = 1948115527
@@ -38,8 +38,8 @@ public class EnumDefinition extends DualNode {
    @ObfuscatedGetter(
       intValue = -12324053
    )
-   @Export("size0")
-   public int size0;
+   @Export("outputCount")
+   public int outputCount;
    @ObfuscatedName("l")
    @Export("keys")
    public int[] keys;
@@ -47,16 +47,12 @@ public class EnumDefinition extends DualNode {
    @Export("intVals")
    public int[] intVals;
    @ObfuscatedName("x")
-   @Export("stringVals")
-   public String[] stringVals;
-
-   static {
-      EnumDefinition_cached = new EvictingDualNodeHashTable(64);
-   }
+   @Export("strVals")
+   public String[] strVals;
 
    EnumDefinition() {
-      this.defaultString = "null";
-      this.size0 = 0;
+      this.defaultStr = "null";
+      this.outputCount = 0;
    }
 
    @ObfuscatedName("f")
@@ -64,15 +60,15 @@ public class EnumDefinition extends DualNode {
       signature = "(Lgr;I)V",
       garbageValue = "-230039710"
    )
-   @Export("read")
-   void read(Buffer var1) {
-      while(true) {
+   @Export("decode")
+   void decode(Buffer var1) {
+      while (true) {
          int var2 = var1.readUnsignedByte();
-         if(var2 == 0) {
+         if (var2 == 0) {
             return;
          }
 
-         this.readNext(var1, var2);
+         this.decodeNext(var1, var2);
       }
    }
 
@@ -81,33 +77,33 @@ public class EnumDefinition extends DualNode {
       signature = "(Lgr;II)V",
       garbageValue = "-1255400805"
    )
-   @Export("readNext")
-   void readNext(Buffer var1, int var2) {
-      if(var2 == 1) {
-         this.keyType = (char)var1.readUnsignedByte();
-      } else if(var2 == 2) {
-         this.valType = (char)var1.readUnsignedByte();
-      } else if(var2 == 3) {
-         this.defaultString = var1.readStringCp1252NullTerminated();
-      } else if(var2 == 4) {
+   @Export("decodeNext")
+   void decodeNext(Buffer var1, int var2) {
+      if (var2 == 1) {
+         this.inputType = (char)var1.readUnsignedByte();
+      } else if (var2 == 2) {
+         this.outputType = (char)var1.readUnsignedByte();
+      } else if (var2 == 3) {
+         this.defaultStr = var1.readStringCp1252NullTerminated();
+      } else if (var2 == 4) {
          this.defaultInt = var1.readInt();
       } else {
          int var3;
-         if(var2 == 5) {
-            this.size0 = var1.__ag_302();
-            this.keys = new int[this.size0];
-            this.stringVals = new String[this.size0];
+         if (var2 == 5) {
+            this.outputCount = var1.readUnsignedShort();
+            this.keys = new int[this.outputCount];
+            this.strVals = new String[this.outputCount];
 
-            for(var3 = 0; var3 < this.size0; ++var3) {
+            for (var3 = 0; var3 < this.outputCount; ++var3) {
                this.keys[var3] = var1.readInt();
-               this.stringVals[var3] = var1.readStringCp1252NullTerminated();
+               this.strVals[var3] = var1.readStringCp1252NullTerminated();
             }
-         } else if(var2 == 6) {
-            this.size0 = var1.__ag_302();
-            this.keys = new int[this.size0];
-            this.intVals = new int[this.size0];
+         } else if (var2 == 6) {
+            this.outputCount = var1.readUnsignedShort();
+            this.keys = new int[this.outputCount];
+            this.intVals = new int[this.outputCount];
 
-            for(var3 = 0; var3 < this.size0; ++var3) {
+            for (var3 = 0; var3 < this.outputCount; ++var3) {
                this.keys[var3] = var1.readInt();
                this.intVals[var3] = var1.readInt();
             }
@@ -123,6 +119,10 @@ public class EnumDefinition extends DualNode {
    )
    @Export("size")
    public int size() {
-      return this.size0;
+      return this.outputCount;
+   }
+
+   static {
+      EnumDefinition_cached = new EvictingDualNodeHashTable(64);
    }
 }
diff --git a/runescape-client/src/main/java/EvictingDualNodeHashTable.java b/runescape-client/src/main/java/EvictingDualNodeHashTable.java
index c655b8180b..9ab1d0b28a 100644
--- a/runescape-client/src/main/java/EvictingDualNodeHashTable.java
+++ b/runescape-client/src/main/java/EvictingDualNodeHashTable.java
@@ -10,7 +10,7 @@ public final class EvictingDualNodeHashTable {
    @ObfuscatedSignature(
       signature = "Lfn;"
    )
-   DualNode __m;
+   DualNode field343;
    @ObfuscatedName("f")
    @Export("capacity")
    int capacity;
@@ -31,14 +31,13 @@ public final class EvictingDualNodeHashTable {
    DualNodeDeque deque;
 
    public EvictingDualNodeHashTable(int var1) {
-      this.__m = new DualNode();
+      this.field343 = new DualNode();
       this.deque = new DualNodeDeque();
       this.capacity = var1;
       this.remainingCapacity = var1;
 
       int var2;
-      for(var2 = 1; var2 + var2 < var1; var2 += var2) {
-         ;
+      for (var2 = 1; var2 + var2 < var1; var2 += var2) {
       }
 
       this.hashTable = new NodeHashTable(var2);
@@ -49,9 +48,9 @@ public final class EvictingDualNodeHashTable {
       signature = "(J)Lfn;"
    )
    @Export("get")
-   public DualNode get(long var1) {
-      DualNode var3 = (DualNode)this.hashTable.get(var1);
-      if(var3 != null) {
+   public DualNode get(long key) {
+      DualNode var3 = (DualNode)this.hashTable.get(key);
+      if (var3 != null) {
          this.deque.addFirst(var3);
       }
 
@@ -60,9 +59,9 @@ public final class EvictingDualNodeHashTable {
 
    @ObfuscatedName("f")
    @Export("remove")
-   public void remove(long var1) {
-      DualNode var3 = (DualNode)this.hashTable.get(var1);
-      if(var3 != null) {
+   public void remove(long key) {
+      DualNode var3 = (DualNode)this.hashTable.get(key);
+      if (var3 != null) {
          var3.remove();
          var3.removeDual();
          ++this.remainingCapacity;
@@ -75,12 +74,12 @@ public final class EvictingDualNodeHashTable {
       signature = "(Lfn;J)V"
    )
    @Export("put")
-   public void put(DualNode var1, long var2) {
-      if(this.remainingCapacity == 0) {
+   public void put(DualNode value, long key) {
+      if (this.remainingCapacity == 0) {
          DualNode var4 = this.deque.removeLast();
          var4.remove();
          var4.removeDual();
-         if(var4 == this.__m) {
+         if (var4 == this.field343) {
             var4 = this.deque.removeLast();
             var4.remove();
             var4.removeDual();
@@ -89,8 +88,8 @@ public final class EvictingDualNodeHashTable {
          --this.remainingCapacity;
       }
 
-      this.hashTable.put(var1, var2);
-      this.deque.addFirst(var1);
+      this.hashTable.put(value, key);
+      this.deque.addFirst(value);
    }
 
    @ObfuscatedName("w")
@@ -98,7 +97,7 @@ public final class EvictingDualNodeHashTable {
    public void clear() {
       this.deque.clear();
       this.hashTable.clear();
-      this.__m = new DualNode();
+      this.field343 = new DualNode();
       this.remainingCapacity = this.capacity;
    }
 }
diff --git a/runescape-client/src/main/java/FaceNormal.java b/runescape-client/src/main/java/FaceNormal.java
index 88ab031bd5..a2cfb61b8c 100644
--- a/runescape-client/src/main/java/FaceNormal.java
+++ b/runescape-client/src/main/java/FaceNormal.java
@@ -1,6 +1,5 @@
 import java.applet.Applet;
 import java.net.URL;
-import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
@@ -14,27 +13,27 @@ public class FaceNormal {
    @ObfuscatedGetter(
       intValue = 422473713
    )
-   public static int __el_x;
+   public static int field344;
    @ObfuscatedName("gm")
    @ObfuscatedSignature(
       signature = "Lln;"
    )
-   static Sprite __el_gm;
+   static Sprite field345;
    @ObfuscatedName("m")
    @ObfuscatedGetter(
       intValue = -2074333261
    )
-   int __m;
+   int field346;
    @ObfuscatedName("f")
    @ObfuscatedGetter(
       intValue = -1376860893
    )
-   int __f;
+   int field347;
    @ObfuscatedName("q")
    @ObfuscatedGetter(
       intValue = 2619977
    )
-   int __q;
+   int field348;
 
    @ObfuscatedName("f")
    @ObfuscatedSignature(
@@ -42,14 +41,14 @@ public class FaceNormal {
       garbageValue = "-1788849120"
    )
    static Script method3236(int var0, int var1, int var2) {
-      int var3 = UnitPriceComparator.method125(var1, var0);
-      Script var4 = WidgetGroupParent.method1175(var3, var0);
-      if(var4 != null) {
+      int var3 = GrandExchangeOfferUnitPriceComparator.method125(var1, var0);
+      Script var4 = InterfaceParent.method1175(var3, var0);
+      if (var4 != null) {
          return var4;
       } else {
          var3 = PacketBuffer.method4081(var2, var0);
-         var4 = WidgetGroupParent.method1175(var3, var0);
-         return var4 != null?var4:null;
+         var4 = InterfaceParent.method1175(var3, var0);
+         return var4 != null ? var4 : null;
       }
    }
 
@@ -59,17 +58,17 @@ public class FaceNormal {
       garbageValue = "-1495992318"
    )
    static boolean method3237(String var0, int var1, String var2) {
-      if(var1 == 0) {
+      if (var1 == 0) {
          try {
-            if(!class50.__af_f.startsWith("win")) {
+            if (!class50.field1160.startsWith("win")) {
                throw new Exception();
-            } else if(!var0.startsWith("http://") && !var0.startsWith("https://")) {
+            } else if (!var0.startsWith("http://") && !var0.startsWith("https://")) {
                throw new Exception();
             } else {
-               String var13 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*";
+               String var11 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*";
 
-               for(int var4 = 0; var4 < var0.length(); ++var4) {
-                  if(var13.indexOf(var0.charAt(var4)) == -1) {
+               for (int var12 = 0; var12 < var0.length(); ++var12) {
+                  if (var11.indexOf(var0.charAt(var12)) == -1) {
                      throw new Exception();
                   }
                }
@@ -77,36 +76,35 @@ public class FaceNormal {
                Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\"");
                return true;
             }
-         } catch (Throwable var8) {
+         } catch (Throwable var6) {
             return false;
          }
-      } else if(var1 == 1) {
+      } else if (var1 == 1) {
          try {
-            Applet var7 = class50.__af_m;
-            Object[] var5 = new Object[]{(new URL(class50.__af_m.getCodeBase(), var0)).toString()};
-            Object var3 = JSObject.getWindow(var7).call(var2, var5);
-            return var3 != null;
-         } catch (Throwable var9) {
+            Applet var3 = class50.field1159;
+            Object[] var4 = new Object[]{(new URL(class50.field1159.getCodeBase(), var0)).toString()};
+            Object var5 = JSObject.getWindow(var3).call(var2, var4);
+            return var5 != null;
+         } catch (Throwable var7) {
             return false;
          }
-      } else if(var1 == 2) {
+      } else if (var1 == 2) {
          try {
-            class50.__af_m.getAppletContext().showDocument(new URL(class50.__af_m.getCodeBase(), var0), "_blank");
+            class50.field1159.getAppletContext().showDocument(new URL(class50.field1159.getCodeBase(), var0), "_blank");
             return true;
-         } catch (Exception var10) {
+         } catch (Exception var8) {
             return false;
          }
-      } else if(var1 == 3) {
+      } else if (var1 == 3) {
          try {
-            class46.method851(class50.__af_m, "loggedout");
-         } catch (Throwable var12) {
-            ;
+            class46.method851(class50.field1159, "loggedout");
+         } catch (Throwable var10) {
          }
 
          try {
-            class50.__af_m.getAppletContext().showDocument(new URL(class50.__af_m.getCodeBase(), var0), "_top");
+            class50.field1159.getAppletContext().showDocument(new URL(class50.field1159.getCodeBase(), var0), "_top");
             return true;
-         } catch (Exception var11) {
+         } catch (Exception var9) {
             return false;
          }
       } else {
diff --git a/runescape-client/src/main/java/FloorDecoration.java b/runescape-client/src/main/java/FloorDecoration.java
index da05438d44..b5f03505cc 100644
--- a/runescape-client/src/main/java/FloorDecoration.java
+++ b/runescape-client/src/main/java/FloorDecoration.java
@@ -61,57 +61,57 @@ public final class FloorDecoration {
       signature = "(Lir;Lir;I)I",
       garbageValue = "-1749538901"
    )
-   static int method2853(AbstractIndexCache var0, AbstractIndexCache var1) {
+   static int method2853(AbstractArchive var0, AbstractArchive var1) {
       int var2 = 0;
-      if(var0.tryLoadRecordByNames("title.jpg", "")) {
+      if (var0.tryLoadFileByNames("title.jpg", "")) {
          ++var2;
       }
 
-      if(var1.tryLoadRecordByNames("logo", "")) {
+      if (var1.tryLoadFileByNames("logo", "")) {
          ++var2;
       }
 
-      if(var1.tryLoadRecordByNames("logo_deadman_mode", "")) {
+      if (var1.tryLoadFileByNames("logo_deadman_mode", "")) {
          ++var2;
       }
 
-      if(var1.tryLoadRecordByNames("titlebox", "")) {
+      if (var1.tryLoadFileByNames("titlebox", "")) {
          ++var2;
       }
 
-      if(var1.tryLoadRecordByNames("titlebutton", "")) {
+      if (var1.tryLoadFileByNames("titlebutton", "")) {
          ++var2;
       }
 
-      if(var1.tryLoadRecordByNames("runes", "")) {
+      if (var1.tryLoadFileByNames("runes", "")) {
          ++var2;
       }
 
-      if(var1.tryLoadRecordByNames("title_mute", "")) {
+      if (var1.tryLoadFileByNames("title_mute", "")) {
          ++var2;
       }
 
-      if(var1.tryLoadRecordByNames("options_radio_buttons,0", "")) {
+      if (var1.tryLoadFileByNames("options_radio_buttons,0", "")) {
          ++var2;
       }
 
-      if(var1.tryLoadRecordByNames("options_radio_buttons,2", "")) {
+      if (var1.tryLoadFileByNames("options_radio_buttons,2", "")) {
          ++var2;
       }
 
-      if(var1.tryLoadRecordByNames("options_radio_buttons,4", "")) {
+      if (var1.tryLoadFileByNames("options_radio_buttons,4", "")) {
          ++var2;
       }
 
-      if(var1.tryLoadRecordByNames("options_radio_buttons,6", "")) {
+      if (var1.tryLoadFileByNames("options_radio_buttons,6", "")) {
          ++var2;
       }
 
-      var1.tryLoadRecordByNames("sl_back", "");
-      var1.tryLoadRecordByNames("sl_flags", "");
-      var1.tryLoadRecordByNames("sl_arrows", "");
-      var1.tryLoadRecordByNames("sl_stars", "");
-      var1.tryLoadRecordByNames("sl_button", "");
+      var1.tryLoadFileByNames("sl_back", "");
+      var1.tryLoadFileByNames("sl_flags", "");
+      var1.tryLoadFileByNames("sl_arrows", "");
+      var1.tryLoadFileByNames("sl_stars", "");
+      var1.tryLoadFileByNames("sl_button", "");
       return var2;
    }
 }
diff --git a/runescape-client/src/main/java/OverlayDefinition.java b/runescape-client/src/main/java/FloorOverlayDefinition.java
similarity index 54%
rename from runescape-client/src/main/java/OverlayDefinition.java
rename to runescape-client/src/main/java/FloorOverlayDefinition.java
index 89a966d8dc..79c2455a5b 100644
--- a/runescape-client/src/main/java/OverlayDefinition.java
+++ b/runescape-client/src/main/java/FloorOverlayDefinition.java
@@ -5,18 +5,20 @@ import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("jf")
-@Implements("OverlayDefinition")
-public class OverlayDefinition extends DualNode {
+@Implements("FloorOverlayDefinition")
+public class FloorOverlayDefinition extends DualNode {
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   public static AbstractIndexCache __jf_m;
+   @Export("FloorOverlayDefinition_archive")
+   public static AbstractArchive FloorOverlayDefinition_archive;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Ler;"
    )
-   public static EvictingDualNodeHashTable __jf_f;
+   @Export("FloorOverlayDefinition_cached")
+   public static EvictingDualNodeHashTable FloorOverlayDefinition_cached;
    @ObfuscatedName("q")
    @ObfuscatedGetter(
       intValue = -111851793
@@ -30,7 +32,7 @@ public class OverlayDefinition extends DualNode {
    @Export("texture")
    public int texture;
    @ObfuscatedName("o")
-   public boolean __o;
+   public boolean field665;
    @ObfuscatedName("u")
    @ObfuscatedGetter(
       intValue = 528865753
@@ -74,14 +76,10 @@ public class OverlayDefinition extends DualNode {
    @Export("lightness2")
    public int lightness2;
 
-   static {
-      __jf_f = new EvictingDualNodeHashTable(64);
-   }
-
-   public OverlayDefinition() {
+   public FloorOverlayDefinition() {
       this.rgb = 0;
       this.texture = -1;
-      this.__o = true;
+      this.field665 = true;
       this.rgb2 = -1;
    }
 
@@ -90,9 +88,9 @@ public class OverlayDefinition extends DualNode {
       signature = "(I)V",
       garbageValue = "867788548"
    )
-   @Export("init")
-   public void init() {
-      if(this.rgb2 != -1) {
+   @Export("postDecode")
+   public void postDecode() {
+      if (this.rgb2 != -1) {
          this.setHsl(this.rgb2);
          this.hue2 = this.hue;
          this.saturation2 = this.saturation;
@@ -107,15 +105,15 @@ public class OverlayDefinition extends DualNode {
       signature = "(Lgr;II)V",
       garbageValue = "-424203051"
    )
-   @Export("read")
-   public void read(Buffer var1, int var2) {
-      while(true) {
+   @Export("decode")
+   public void decode(Buffer var1, int var2) {
+      while (true) {
          int var3 = var1.readUnsignedByte();
-         if(var3 == 0) {
+         if (var3 == 0) {
             return;
          }
 
-         this.readNext(var1, var3, var2);
+         this.decodeNext(var1, var3, var2);
       }
    }
 
@@ -124,18 +122,17 @@ public class OverlayDefinition extends DualNode {
       signature = "(Lgr;III)V",
       garbageValue = "2094105763"
    )
-   @Export("readNext")
-   void readNext(Buffer var1, int var2, int var3) {
-      if(var2 == 1) {
+   @Export("decodeNext")
+   void decodeNext(Buffer var1, int var2, int var3) {
+      if (var2 == 1) {
          this.rgb = var1.readMedium();
-      } else if(var2 == 2) {
+      } else if (var2 == 2) {
          this.texture = var1.readUnsignedByte();
-      } else if(var2 == 5) {
-         this.__o = false;
-      } else if(var2 == 7) {
+      } else if (var2 == 5) {
+         this.field665 = false;
+      } else if (var2 == 7) {
          this.rgb2 = var1.readMedium();
-      } else if(var2 == 8) {
-         ;
+      } else if (var2 == 8) {
       }
 
    }
@@ -146,45 +143,45 @@ public class OverlayDefinition extends DualNode {
       garbageValue = "489697731"
    )
    @Export("setHsl")
-   void setHsl(int var1) {
-      double var2 = (double)(var1 >> 16 & 255) / 256.0D;
-      double var4 = (double)(var1 >> 8 & 255) / 256.0D;
-      double var6 = (double)(var1 & 255) / 256.0D;
+   void setHsl(int rgb) {
+      double var2 = (double)(rgb >> 16 & 255) / 256.0D;
+      double var4 = (double)(rgb >> 8 & 255) / 256.0D;
+      double var6 = (double)(rgb & 255) / 256.0D;
       double var8 = var2;
-      if(var4 < var2) {
+      if (var4 < var2) {
          var8 = var4;
       }
 
-      if(var6 < var8) {
+      if (var6 < var8) {
          var8 = var6;
       }
 
       double var10 = var2;
-      if(var4 > var2) {
+      if (var4 > var2) {
          var10 = var4;
       }
 
-      if(var6 > var10) {
+      if (var6 > var10) {
          var10 = var6;
       }
 
       double var12 = 0.0D;
       double var14 = 0.0D;
       double var16 = (var10 + var8) / 2.0D;
-      if(var8 != var10) {
-         if(var16 < 0.5D) {
+      if (var8 != var10) {
+         if (var16 < 0.5D) {
             var14 = (var10 - var8) / (var8 + var10);
          }
 
-         if(var16 >= 0.5D) {
+         if (var16 >= 0.5D) {
             var14 = (var10 - var8) / (2.0D - var10 - var8);
          }
 
-         if(var10 == var2) {
+         if (var10 == var2) {
             var12 = (var4 - var6) / (var10 - var8);
-         } else if(var10 == var4) {
+         } else if (var10 == var4) {
             var12 = (var6 - var2) / (var10 - var8) + 2.0D;
-         } else if(var10 == var6) {
+         } else if (var10 == var6) {
             var12 = (var2 - var4) / (var10 - var8) + 4.0D;
          }
       }
@@ -193,15 +190,15 @@ public class OverlayDefinition extends DualNode {
       this.hue = (int)(var12 * 256.0D);
       this.saturation = (int)(256.0D * var14);
       this.lightness = (int)(var16 * 256.0D);
-      if(this.saturation < 0) {
+      if (this.saturation < 0) {
          this.saturation = 0;
-      } else if(this.saturation > 255) {
+      } else if (this.saturation > 255) {
          this.saturation = 255;
       }
 
-      if(this.lightness < 0) {
+      if (this.lightness < 0) {
          this.lightness = 0;
-      } else if(this.lightness > 255) {
+      } else if (this.lightness > 255) {
          this.lightness = 255;
       }
 
@@ -213,34 +210,38 @@ public class OverlayDefinition extends DualNode {
       garbageValue = "30"
    )
    @Export("alignWidgetPosition")
-   static void alignWidgetPosition(Widget var0, int var1, int var2) {
-      if(var0.xAlignment == 0) {
-         var0.x = var0.rawX;
-      } else if(var0.xAlignment == 1) {
-         var0.x = var0.rawX + (var1 - var0.width) / 2;
-      } else if(var0.xAlignment == 2) {
-         var0.x = var1 - var0.width - var0.rawX;
-      } else if(var0.xAlignment == 3) {
-         var0.x = var0.rawX * var1 >> 14;
-      } else if(var0.xAlignment == 4) {
-         var0.x = (var0.rawX * var1 >> 14) + (var1 - var0.width) / 2;
+   static void alignWidgetPosition(Widget component, int parentWidth, int parentHeight) {
+      if (component.xAlignment == 0) {
+         component.x = component.rawX;
+      } else if (component.xAlignment == 1) {
+         component.x = component.rawX + (parentWidth - component.width) / 2;
+      } else if (component.xAlignment == 2) {
+         component.x = parentWidth - component.width - component.rawX;
+      } else if (component.xAlignment == 3) {
+         component.x = component.rawX * parentWidth >> 14;
+      } else if (component.xAlignment == 4) {
+         component.x = (component.rawX * parentWidth >> 14) + (parentWidth - component.width) / 2;
       } else {
-         var0.x = var1 - var0.width - (var0.rawX * var1 >> 14);
+         component.x = parentWidth - component.width - (component.rawX * parentWidth >> 14);
       }
 
-      if(var0.yAlignment == 0) {
-         var0.y = var0.rawY;
-      } else if(var0.yAlignment == 1) {
-         var0.y = (var2 - var0.height) / 2 + var0.rawY;
-      } else if(var0.yAlignment == 2) {
-         var0.y = var2 - var0.height - var0.rawY;
-      } else if(var0.yAlignment == 3) {
-         var0.y = var2 * var0.rawY >> 14;
-      } else if(var0.yAlignment == 4) {
-         var0.y = (var2 * var0.rawY >> 14) + (var2 - var0.height) / 2;
+      if (component.yAlignment == 0) {
+         component.y = component.rawY;
+      } else if (component.yAlignment == 1) {
+         component.y = (parentHeight - component.height) / 2 + component.rawY;
+      } else if (component.yAlignment == 2) {
+         component.y = parentHeight - component.height - component.rawY;
+      } else if (component.yAlignment == 3) {
+         component.y = parentHeight * component.rawY >> 14;
+      } else if (component.yAlignment == 4) {
+         component.y = (parentHeight * component.rawY >> 14) + (parentHeight - component.height) / 2;
       } else {
-         var0.y = var2 - var0.height - (var2 * var0.rawY >> 14);
+         component.y = parentHeight - component.height - (parentHeight * component.rawY >> 14);
       }
 
    }
+
+   static {
+      FloorOverlayDefinition_cached = new EvictingDualNodeHashTable(64);
+   }
 }
diff --git a/runescape-client/src/main/java/UnderlayDefinition.java b/runescape-client/src/main/java/FloorUnderlayDefinition.java
similarity index 65%
rename from runescape-client/src/main/java/UnderlayDefinition.java
rename to runescape-client/src/main/java/FloorUnderlayDefinition.java
index 67346653c6..e4c30b8774 100644
--- a/runescape-client/src/main/java/UnderlayDefinition.java
+++ b/runescape-client/src/main/java/FloorUnderlayDefinition.java
@@ -5,20 +5,20 @@ import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("ih")
-@Implements("UnderlayDefinition")
-public class UnderlayDefinition extends DualNode {
+@Implements("FloorUnderlayDefinition")
+public class FloorUnderlayDefinition extends DualNode {
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   @Export("UnderlayDefinition_indexCache")
-   static AbstractIndexCache UnderlayDefinition_indexCache;
+   @Export("FloorUnderlayDefinition_archive")
+   static AbstractArchive FloorUnderlayDefinition_archive;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Ler;"
    )
-   @Export("UnderlayDefinition_cached")
-   static EvictingDualNodeHashTable UnderlayDefinition_cached;
+   @Export("FloorUnderlayDefinition_cached")
+   static EvictingDualNodeHashTable FloorUnderlayDefinition_cached;
    @ObfuscatedName("q")
    @ObfuscatedGetter(
       intValue = -635678213
@@ -50,11 +50,7 @@ public class UnderlayDefinition extends DualNode {
    @Export("hueMultiplier")
    public int hueMultiplier;
 
-   static {
-      UnderlayDefinition_cached = new EvictingDualNodeHashTable(64);
-   }
-
-   UnderlayDefinition() {
+   FloorUnderlayDefinition() {
       this.rgb = 0;
    }
 
@@ -63,8 +59,8 @@ public class UnderlayDefinition extends DualNode {
       signature = "(I)V",
       garbageValue = "-782326269"
    )
-   @Export("init")
-   void init() {
+   @Export("postDecode")
+   void postDecode() {
       this.setHsl(this.rgb);
    }
 
@@ -73,15 +69,15 @@ public class UnderlayDefinition extends DualNode {
       signature = "(Lgr;II)V",
       garbageValue = "-336010991"
    )
-   @Export("read")
-   void read(Buffer var1, int var2) {
-      while(true) {
+   @Export("decode")
+   void decode(Buffer var1, int var2) {
+      while (true) {
          int var3 = var1.readUnsignedByte();
-         if(var3 == 0) {
+         if (var3 == 0) {
             return;
          }
 
-         this.readNext(var1, var3, var2);
+         this.decodeNext(var1, var3, var2);
       }
    }
 
@@ -90,9 +86,9 @@ public class UnderlayDefinition extends DualNode {
       signature = "(Lgr;III)V",
       garbageValue = "137131494"
    )
-   @Export("readNext")
-   void readNext(Buffer var1, int var2, int var3) {
-      if(var2 == 1) {
+   @Export("decodeNext")
+   void decodeNext(Buffer var1, int var2, int var3) {
+      if (var2 == 1) {
          this.rgb = var1.readMedium();
       }
 
@@ -104,45 +100,45 @@ public class UnderlayDefinition extends DualNode {
       garbageValue = "-107"
    )
    @Export("setHsl")
-   void setHsl(int var1) {
-      double var2 = (double)(var1 >> 16 & 255) / 256.0D;
-      double var4 = (double)(var1 >> 8 & 255) / 256.0D;
-      double var6 = (double)(var1 & 255) / 256.0D;
+   void setHsl(int rgb) {
+      double var2 = (double)(rgb >> 16 & 255) / 256.0D;
+      double var4 = (double)(rgb >> 8 & 255) / 256.0D;
+      double var6 = (double)(rgb & 255) / 256.0D;
       double var8 = var2;
-      if(var4 < var2) {
+      if (var4 < var2) {
          var8 = var4;
       }
 
-      if(var6 < var8) {
+      if (var6 < var8) {
          var8 = var6;
       }
 
       double var10 = var2;
-      if(var4 > var2) {
+      if (var4 > var2) {
          var10 = var4;
       }
 
-      if(var6 > var10) {
+      if (var6 > var10) {
          var10 = var6;
       }
 
       double var12 = 0.0D;
       double var14 = 0.0D;
       double var16 = (var10 + var8) / 2.0D;
-      if(var10 != var8) {
-         if(var16 < 0.5D) {
+      if (var10 != var8) {
+         if (var16 < 0.5D) {
             var14 = (var10 - var8) / (var10 + var8);
          }
 
-         if(var16 >= 0.5D) {
+         if (var16 >= 0.5D) {
             var14 = (var10 - var8) / (2.0D - var10 - var8);
          }
 
-         if(var2 == var10) {
+         if (var2 == var10) {
             var12 = (var4 - var6) / (var10 - var8);
-         } else if(var4 == var10) {
+         } else if (var4 == var10) {
             var12 = 2.0D + (var6 - var2) / (var10 - var8);
-         } else if(var10 == var6) {
+         } else if (var10 == var6) {
             var12 = (var2 - var4) / (var10 - var8) + 4.0D;
          }
       }
@@ -150,25 +146,25 @@ public class UnderlayDefinition extends DualNode {
       var12 /= 6.0D;
       this.saturation = (int)(256.0D * var14);
       this.lightness = (int)(256.0D * var16);
-      if(this.saturation < 0) {
+      if (this.saturation < 0) {
          this.saturation = 0;
-      } else if(this.saturation > 255) {
+      } else if (this.saturation > 255) {
          this.saturation = 255;
       }
 
-      if(this.lightness < 0) {
+      if (this.lightness < 0) {
          this.lightness = 0;
-      } else if(this.lightness > 255) {
+      } else if (this.lightness > 255) {
          this.lightness = 255;
       }
 
-      if(var16 > 0.5D) {
+      if (var16 > 0.5D) {
          this.hueMultiplier = (int)(var14 * (1.0D - var16) * 512.0D);
       } else {
          this.hueMultiplier = (int)(var16 * var14 * 512.0D);
       }
 
-      if(this.hueMultiplier < 1) {
+      if (this.hueMultiplier < 1) {
          this.hueMultiplier = 1;
       }
 
@@ -180,7 +176,11 @@ public class UnderlayDefinition extends DualNode {
       signature = "(I)[Lip;",
       garbageValue = "618327716"
    )
-   static class249[] method4839() {
-      return new class249[]{class249.field3277, class249.field3273, class249.field3274};
+   static VerticalAlignment[] method4839() {
+      return new VerticalAlignment[]{VerticalAlignment.field3277, VerticalAlignment.field3273, VerticalAlignment.field3274};
+   }
+
+   static {
+      FloorUnderlayDefinition_cached = new EvictingDualNodeHashTable(64);
    }
 }
diff --git a/runescape-client/src/main/java/Font.java b/runescape-client/src/main/java/Font.java
index 55ef8f5fe3..ca70b027cd 100644
--- a/runescape-client/src/main/java/Font.java
+++ b/runescape-client/src/main/java/Font.java
@@ -21,7 +21,7 @@ public final class Font extends AbstractFont {
       int var9 = 0;
       int var10 = 0;
       int var11;
-      if(var3 < Rasterizer2D.Rasterizer2D_yClipStart) {
+      if (var3 < Rasterizer2D.Rasterizer2D_yClipStart) {
          var11 = Rasterizer2D.Rasterizer2D_yClipStart - var3;
          var5 -= var11;
          var3 = Rasterizer2D.Rasterizer2D_yClipStart;
@@ -29,11 +29,11 @@ public final class Font extends AbstractFont {
          var7 += var11 * Rasterizer2D.Rasterizer2D_width;
       }
 
-      if(var3 + var5 > Rasterizer2D.Rasterizer2D_yClipEnd) {
+      if (var3 + var5 > Rasterizer2D.Rasterizer2D_yClipEnd) {
          var5 -= var3 + var5 - Rasterizer2D.Rasterizer2D_yClipEnd;
       }
 
-      if(var2 < Rasterizer2D.Rasterizer2D_xClipStart) {
+      if (var2 < Rasterizer2D.Rasterizer2D_xClipStart) {
          var11 = Rasterizer2D.Rasterizer2D_xClipStart - var2;
          var4 -= var11;
          var2 = Rasterizer2D.Rasterizer2D_xClipStart;
@@ -43,16 +43,17 @@ public final class Font extends AbstractFont {
          var8 += var11;
       }
 
-      if(var2 + var4 > Rasterizer2D.Rasterizer2D_xClipEnd) {
+      if (var2 + var4 > Rasterizer2D.Rasterizer2D_xClipEnd) {
          var11 = var2 + var4 - Rasterizer2D.Rasterizer2D_xClipEnd;
          var4 -= var11;
          var9 += var11;
          var8 += var11;
       }
 
-      if(var4 > 0 && var5 > 0) {
+      if (var4 > 0 && var5 > 0) {
          AbstractFont.AbstractFont_placeGlyph(Rasterizer2D.Rasterizer2D_pixels, var1, var6, var10, var7, var4, var5, var8, var9);
       }
+
    }
 
    @ObfuscatedName("f")
@@ -63,7 +64,7 @@ public final class Font extends AbstractFont {
       int var10 = 0;
       int var11 = 0;
       int var12;
-      if(var3 < Rasterizer2D.Rasterizer2D_yClipStart) {
+      if (var3 < Rasterizer2D.Rasterizer2D_yClipStart) {
          var12 = Rasterizer2D.Rasterizer2D_yClipStart - var3;
          var5 -= var12;
          var3 = Rasterizer2D.Rasterizer2D_yClipStart;
@@ -71,11 +72,11 @@ public final class Font extends AbstractFont {
          var8 += var12 * Rasterizer2D.Rasterizer2D_width;
       }
 
-      if(var3 + var5 > Rasterizer2D.Rasterizer2D_yClipEnd) {
+      if (var3 + var5 > Rasterizer2D.Rasterizer2D_yClipEnd) {
          var5 -= var3 + var5 - Rasterizer2D.Rasterizer2D_yClipEnd;
       }
 
-      if(var2 < Rasterizer2D.Rasterizer2D_xClipStart) {
+      if (var2 < Rasterizer2D.Rasterizer2D_xClipStart) {
          var12 = Rasterizer2D.Rasterizer2D_xClipStart - var2;
          var4 -= var12;
          var2 = Rasterizer2D.Rasterizer2D_xClipStart;
@@ -85,15 +86,16 @@ public final class Font extends AbstractFont {
          var9 += var12;
       }
 
-      if(var2 + var4 > Rasterizer2D.Rasterizer2D_xClipEnd) {
+      if (var2 + var4 > Rasterizer2D.Rasterizer2D_xClipEnd) {
          var12 = var2 + var4 - Rasterizer2D.Rasterizer2D_xClipEnd;
          var4 -= var12;
          var10 += var12;
          var9 += var12;
       }
 
-      if(var4 > 0 && var5 > 0) {
+      if (var4 > 0 && var5 > 0) {
          AbstractFont.AbstractFont_placeGlyphAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, var11, var8, var4, var5, var9, var10, var7);
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/FontName.java b/runescape-client/src/main/java/FontName.java
index 89099885cc..71f2f3b9d8 100644
--- a/runescape-client/src/main/java/FontName.java
+++ b/runescape-client/src/main/java/FontName.java
@@ -2,6 +2,7 @@ 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("kx")
 @Implements("FontName")
@@ -43,19 +44,10 @@ public class FontName {
    @Export("FontName_verdana15")
    public static final FontName FontName_verdana15;
    @ObfuscatedName("g")
-   String __g;
-
-   static {
-      FontName_plain11 = new FontName("p11_full");
-      FontName_plain12 = new FontName("p12_full");
-      FontName_bold12 = new FontName("b12_full");
-      FontName_verdana11 = new FontName("verdana_11pt_regular");
-      FontName_verdana13 = new FontName("verdana_13pt_regular");
-      FontName_verdana15 = new FontName("verdana_15pt_regular");
-   }
+   String field349;
 
    FontName(String var1) {
-      this.__g = var1;
+      this.field349 = var1;
    }
 
    @ObfuscatedName("u")
@@ -63,9 +55,10 @@ public class FontName {
       signature = "(IIIZII)J",
       garbageValue = "1039369805"
    )
-   public static long method5637(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;
-      if(var3) {
+   @Export("calculateTag")
+   public static long calculateTag(int x, int y, int type, boolean isNotInteractable, int identifier) {
+      long var5 = (long)((x & 127) << 0 | (y & 127) << 7 | (type & 3) << 14) | ((long)identifier & 4294967295L) << 17;
+      if (isNotInteractable) {
          var5 |= 65536L;
       }
 
@@ -91,11 +84,11 @@ public class FontName {
       garbageValue = "-871458249"
    )
    static final void method5638(String var0, int var1) {
-      PacketBufferNode var2 = Interpreter.method1915(ClientPacket.__gs_bw, Client.packetWriter.isaacCipher);
-      var2.packetBuffer.writeByte(WorldMapRegion.method550(var0) + 1);
+      PacketBufferNode var2 = Interpreter.method1915(ClientPacket.field299, Client.packetWriter.isaacCipher);
+      var2.packetBuffer.writeByte(WorldMapRegion.stringCp1252NullTerminatedByteSize(var0) + 1);
       var2.packetBuffer.writeStringCp1252NullTerminated(var0);
       var2.packetBuffer.writeByte(var1);
-      Client.packetWriter.__q_167(var2);
+      Client.packetWriter.method241(var2);
    }
 
    @ObfuscatedName("av")
@@ -104,10 +97,10 @@ public class FontName {
       garbageValue = "-1336396061"
    )
    static int method5639(int var0, Script var1, boolean var2) {
-      if(var0 == 3600) {
-         if(WorldMapArea.friendSystem.__g == 0) {
+      if (var0 == ScriptOpcodes.FRIEND_COUNT) {
+         if (WorldMapArea.friendSystem.field357 == 0) {
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -2;
-         } else if(WorldMapArea.friendSystem.__g == 1) {
+         } else if (WorldMapArea.friendSystem.field357 == 1) {
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
          } else {
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapArea.friendSystem.friendsList.size();
@@ -116,30 +109,30 @@ public class FontName {
          return 1;
       } else {
          int var3;
-         if(var0 == 3601) {
+         if (var0 == ScriptOpcodes.FRIEND_GETNAME) {
             var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-            if(WorldMapArea.friendSystem.__m_151() && var3 >= 0 && var3 < WorldMapArea.friendSystem.friendsList.size()) {
-               Friend var8 = (Friend)WorldMapArea.friendSystem.friendsList.get(var3);
-               Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.name();
-               Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.previousName();
+            if (WorldMapArea.friendSystem.method99() && var3 >= 0 && var3 < WorldMapArea.friendSystem.friendsList.size()) {
+               Friend var6 = (Friend)WorldMapArea.friendSystem.friendsList.get(var3);
+               Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.getName();
+               Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.getPreviousName();
             } else {
                Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
                Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
             }
 
             return 1;
-         } else if(var0 == 3602) {
+         } else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) {
             var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-            if(WorldMapArea.friendSystem.__m_151() && var3 >= 0 && var3 < WorldMapArea.friendSystem.friendsList.size()) {
-               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ((Buddy)WorldMapArea.friendSystem.friendsList.get(var3)).world0;
+            if (WorldMapArea.friendSystem.method99() && var3 >= 0 && var3 < WorldMapArea.friendSystem.friendsList.size()) {
+               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ((Buddy)WorldMapArea.friendSystem.friendsList.get(var3)).world;
             } else {
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
             }
 
             return 1;
-         } else if(var0 == 3603) {
+         } else if (var0 == ScriptOpcodes.FRIEND_GETRANK) {
             var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-            if(WorldMapArea.friendSystem.__m_151() && var3 >= 0 && var3 < WorldMapArea.friendSystem.friendsList.size()) {
+            if (WorldMapArea.friendSystem.method99() && var3 >= 0 && var3 < WorldMapArea.friendSystem.friendsList.size()) {
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ((Buddy)WorldMapArea.friendSystem.friendsList.get(var3)).rank;
             } else {
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
@@ -147,297 +140,297 @@ public class FontName {
 
             return 1;
          } else {
-            String var5;
-            if(var0 == 3604) {
-               var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-               int var6 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-               method5638(var5, var6);
+            String var4;
+            if (var0 == ScriptOpcodes.FRIEND_SETRANK) {
+               var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+               int var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+               method5638(var4, var8);
                return 1;
-            } else if(var0 == 3605) {
-               var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-               WorldMapArea.friendSystem.__l_157(var5);
+            } else if (var0 == ScriptOpcodes.FRIEND_ADD) {
+               var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+               WorldMapArea.friendSystem.addFriend(var4);
                return 1;
-            } else if(var0 == 3606) {
-               var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-               WorldMapArea.friendSystem.removeFriend(var5);
+            } else if (var0 == ScriptOpcodes.FRIEND_DEL) {
+               var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+               WorldMapArea.friendSystem.removeFriend(var4);
                return 1;
-            } else if(var0 == 3607) {
-               var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-               WorldMapArea.friendSystem.__x_159(var5);
+            } else if (var0 == ScriptOpcodes.IGNORE_ADD) {
+               var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+               WorldMapArea.friendSystem.addIgnore(var4);
                return 1;
-            } else if(var0 == 3608) {
-               var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-               WorldMapArea.friendSystem.removeIgnore(var5);
+            } else if (var0 == ScriptOpcodes.IGNORE_DEL) {
+               var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+               WorldMapArea.friendSystem.removeIgnore(var4);
                return 1;
-            } else if(var0 == 3609) {
-               var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-               var5 = NpcDefinition.method5161(var5);
-               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapArea.friendSystem.isFriended(new Username(var5, KeyHandler.loginType), false)?1:0;
+            } else if (var0 == ScriptOpcodes.FRIEND_TEST) {
+               var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+               var4 = NPCDefinition.method5161(var4);
+               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapArea.friendSystem.isFriended(new Username(var4, KeyHandler.loginType), false) ? 1 : 0;
                return 1;
-            } else if(var0 == 3611) {
-               if(PacketWriter.clanChat != null) {
+            } else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) {
+               if (PacketWriter.clanChat != null) {
                   Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = PacketWriter.clanChat.name;
                } else {
                   Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
                }
 
                return 1;
-            } else if(var0 == 3612) {
-               if(PacketWriter.clanChat != null) {
+            } else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) {
+               if (PacketWriter.clanChat != null) {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = PacketWriter.clanChat.size();
                } else {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
                }
 
                return 1;
-            } else if(var0 == 3613) {
+            } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) {
                var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-               if(PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size()) {
-                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = PacketWriter.clanChat.get(var3).username().getName();
+               if (PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size()) {
+                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = PacketWriter.clanChat.get(var3).getUsername().getName();
                } else {
                   Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
                }
 
                return 1;
-            } else if(var0 == 3614) {
+            } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) {
                var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-               if(PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size()) {
-                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ((Buddy)PacketWriter.clanChat.get(var3)).world();
+               if (PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size()) {
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ((Buddy)PacketWriter.clanChat.get(var3)).getWorld();
                } else {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
                }
 
                return 1;
-            } else if(var0 == 3615) {
+            } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) {
                var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-               if(PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size()) {
+               if (PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size()) {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ((Buddy)PacketWriter.clanChat.get(var3)).rank;
                } else {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
                }
 
                return 1;
-            } else if(var0 == 3616) {
-               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = PacketWriter.clanChat != null?PacketWriter.clanChat.__k:0;
+            } else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) {
+               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = PacketWriter.clanChat != null ? PacketWriter.clanChat.minKick : 0;
                return 1;
-            } else if(var0 == 3617) {
-               var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-               IndexStoreActionHandler.method4655(var5);
+            } else if (var0 == ScriptOpcodes.CLAN_KICKUSER) {
+               var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+               ArchiveDiskActionHandler.clanKickUser(var4);
                return 1;
-            } else if(var0 == 3618) {
-               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = PacketWriter.clanChat != null?PacketWriter.clanChat.rank:0;
+            } else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) {
+               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = PacketWriter.clanChat != null ? PacketWriter.clanChat.rank : 0;
                return 1;
-            } else if(var0 == 3619) {
-               var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-               class31.method574(var5);
+            } else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) {
+               var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+               class31.method574(var4);
                return 1;
-            } else if(var0 == 3620) {
-               class12.method158();
+            } else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) {
+               GrandExchangeOfferAgeComparator.method158();
                return 1;
-            } else if(var0 == 3621) {
-               if(!WorldMapArea.friendSystem.__m_151()) {
+            } else if (var0 == ScriptOpcodes.IGNORE_COUNT) {
+               if (!WorldMapArea.friendSystem.method99()) {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                } else {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapArea.friendSystem.ignoreList.size();
                }
 
                return 1;
-            } else if(var0 == 3622) {
+            } else if (var0 == ScriptOpcodes.IGNORE_GETNAME) {
                var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-               if(WorldMapArea.friendSystem.__m_151() && var3 >= 0 && var3 < WorldMapArea.friendSystem.ignoreList.size()) {
-                  Ignored var4 = (Ignored)WorldMapArea.friendSystem.ignoreList.get(var3);
-                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.name();
-                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.previousName();
+               if (WorldMapArea.friendSystem.method99() && var3 >= 0 && var3 < WorldMapArea.friendSystem.ignoreList.size()) {
+                  Ignored var7 = (Ignored)WorldMapArea.friendSystem.ignoreList.get(var3);
+                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.getName();
+                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.getPreviousName();
                } else {
                   Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
                   Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
                }
 
                return 1;
-            } else if(var0 == 3623) {
-               var5 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-               var5 = NpcDefinition.method5161(var5);
-               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapArea.friendSystem.isIgnored(new Username(var5, KeyHandler.loginType))?1:0;
+            } else if (var0 == ScriptOpcodes.IGNORE_TEST) {
+               var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+               var4 = NPCDefinition.method5161(var4);
+               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapArea.friendSystem.isIgnored(new Username(var4, KeyHandler.loginType)) ? 1 : 0;
                return 1;
-            } else if(var0 == 3624) {
+            } else if (var0 == ScriptOpcodes.CLAN_ISSELF) {
                var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-               if(PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size() && PacketWriter.clanChat.get(var3).username().equals(Canvas.localPlayer.username)) {
+               if (PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size() && PacketWriter.clanChat.get(var3).getUsername().equals(Canvas.localPlayer.username)) {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1;
                } else {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
                }
 
                return 1;
-            } else if(var0 == 3625) {
-               if(PacketWriter.clanChat != null && PacketWriter.clanChat.owner != null) {
+            } else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) {
+               if (PacketWriter.clanChat != null && PacketWriter.clanChat.owner != null) {
                   Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = PacketWriter.clanChat.owner;
                } else {
                   Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
                }
 
                return 1;
-            } else if(var0 == 3626) {
+            } else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) {
                var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-               if(PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size() && ((ClanMate)PacketWriter.clanChat.get(var3)).isFriend()) {
+               if (PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size() && ((ClanMate)PacketWriter.clanChat.get(var3)).isFriend()) {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1;
                } else {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
                }
 
                return 1;
-            } else if(var0 != 3627) {
-               if(var0 == 3628) {
+            } else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) {
+               if (var0 == 3628) {
                   WorldMapArea.friendSystem.friendsList.removeComparator();
                   return 1;
                } else {
-                  boolean var7;
-                  if(var0 == 3629) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator1(var7));
+                  boolean var5;
+                  if (var0 == 3629) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator1(var5));
                      return 1;
-                  } else if(var0 == 3630) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator2(var7));
+                  } else if (var0 == 3630) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator2(var5));
                      return 1;
-                  } else if(var0 == 3631) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator3(var7));
+                  } else if (var0 == 3631) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator3(var5));
                      return 1;
-                  } else if(var0 == 3632) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator4(var7));
+                  } else if (var0 == 3632) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator4(var5));
                      return 1;
-                  } else if(var0 == 3633) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator5(var7));
+                  } else if (var0 == 3633) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator5(var5));
                      return 1;
-                  } else if(var0 == 3634) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator6(var7));
+                  } else if (var0 == 3634) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator6(var5));
                      return 1;
-                  } else if(var0 == 3635) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator7(var7));
+                  } else if (var0 == 3635) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator7(var5));
                      return 1;
-                  } else if(var0 == 3636) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator8(var7));
+                  } else if (var0 == 3636) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator8(var5));
                      return 1;
-                  } else if(var0 == 3637) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator9(var7));
+                  } else if (var0 == 3637) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator9(var5));
                      return 1;
-                  } else if(var0 == 3638) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator10(var7));
+                  } else if (var0 == 3638) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     WorldMapArea.friendSystem.friendsList.addComparator(new UserComparator10(var5));
                      return 1;
-                  } else if(var0 == 3639) {
+                  } else if (var0 == 3639) {
                      WorldMapArea.friendSystem.friendsList.sort();
                      return 1;
-                  } else if(var0 == 3640) {
+                  } else if (var0 == 3640) {
                      WorldMapArea.friendSystem.ignoreList.removeComparator();
                      return 1;
-                  } else if(var0 == 3641) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     WorldMapArea.friendSystem.ignoreList.addComparator(new UserComparator1(var7));
+                  } else if (var0 == 3641) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     WorldMapArea.friendSystem.ignoreList.addComparator(new UserComparator1(var5));
                      return 1;
-                  } else if(var0 == 3642) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     WorldMapArea.friendSystem.ignoreList.addComparator(new UserComparator2(var7));
+                  } else if (var0 == 3642) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     WorldMapArea.friendSystem.ignoreList.addComparator(new UserComparator2(var5));
                      return 1;
-                  } else if(var0 == 3643) {
+                  } else if (var0 == 3643) {
                      WorldMapArea.friendSystem.ignoreList.sort();
                      return 1;
-                  } else if(var0 == 3644) {
-                     if(PacketWriter.clanChat != null) {
+                  } else if (var0 == 3644) {
+                     if (PacketWriter.clanChat != null) {
                         PacketWriter.clanChat.removeComparator();
                      }
 
                      return 1;
-                  } else if(var0 == 3645) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     if(PacketWriter.clanChat != null) {
-                        PacketWriter.clanChat.addComparator(new UserComparator1(var7));
+                  } else if (var0 == 3645) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     if (PacketWriter.clanChat != null) {
+                        PacketWriter.clanChat.addComparator(new UserComparator1(var5));
                      }
 
                      return 1;
-                  } else if(var0 == 3646) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     if(PacketWriter.clanChat != null) {
-                        PacketWriter.clanChat.addComparator(new UserComparator2(var7));
+                  } else if (var0 == 3646) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     if (PacketWriter.clanChat != null) {
+                        PacketWriter.clanChat.addComparator(new UserComparator2(var5));
                      }
 
                      return 1;
-                  } else if(var0 == 3647) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     if(PacketWriter.clanChat != null) {
-                        PacketWriter.clanChat.addComparator(new UserComparator3(var7));
+                  } else if (var0 == 3647) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     if (PacketWriter.clanChat != null) {
+                        PacketWriter.clanChat.addComparator(new UserComparator3(var5));
                      }
 
                      return 1;
-                  } else if(var0 == 3648) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     if(PacketWriter.clanChat != null) {
-                        PacketWriter.clanChat.addComparator(new UserComparator4(var7));
+                  } else if (var0 == 3648) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     if (PacketWriter.clanChat != null) {
+                        PacketWriter.clanChat.addComparator(new UserComparator4(var5));
                      }
 
                      return 1;
-                  } else if(var0 == 3649) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     if(PacketWriter.clanChat != null) {
-                        PacketWriter.clanChat.addComparator(new UserComparator5(var7));
+                  } else if (var0 == 3649) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     if (PacketWriter.clanChat != null) {
+                        PacketWriter.clanChat.addComparator(new UserComparator5(var5));
                      }
 
                      return 1;
-                  } else if(var0 == 3650) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     if(PacketWriter.clanChat != null) {
-                        PacketWriter.clanChat.addComparator(new UserComparator6(var7));
+                  } else if (var0 == 3650) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     if (PacketWriter.clanChat != null) {
+                        PacketWriter.clanChat.addComparator(new UserComparator6(var5));
                      }
 
                      return 1;
-                  } else if(var0 == 3651) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     if(PacketWriter.clanChat != null) {
-                        PacketWriter.clanChat.addComparator(new UserComparator7(var7));
+                  } else if (var0 == 3651) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     if (PacketWriter.clanChat != null) {
+                        PacketWriter.clanChat.addComparator(new UserComparator7(var5));
                      }
 
                      return 1;
-                  } else if(var0 == 3652) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     if(PacketWriter.clanChat != null) {
-                        PacketWriter.clanChat.addComparator(new UserComparator8(var7));
+                  } else if (var0 == 3652) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     if (PacketWriter.clanChat != null) {
+                        PacketWriter.clanChat.addComparator(new UserComparator8(var5));
                      }
 
                      return 1;
-                  } else if(var0 == 3653) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     if(PacketWriter.clanChat != null) {
-                        PacketWriter.clanChat.addComparator(new UserComparator9(var7));
+                  } else if (var0 == 3653) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     if (PacketWriter.clanChat != null) {
+                        PacketWriter.clanChat.addComparator(new UserComparator9(var5));
                      }
 
                      return 1;
-                  } else if(var0 == 3654) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     if(PacketWriter.clanChat != null) {
-                        PacketWriter.clanChat.addComparator(new UserComparator10(var7));
+                  } else if (var0 == 3654) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     if (PacketWriter.clanChat != null) {
+                        PacketWriter.clanChat.addComparator(new UserComparator10(var5));
                      }
 
                      return 1;
-                  } else if(var0 == 3655) {
-                     if(PacketWriter.clanChat != null) {
+                  } else if (var0 == 3655) {
+                     if (PacketWriter.clanChat != null) {
                         PacketWriter.clanChat.sort();
                      }
 
                      return 1;
-                  } else if(var0 == 3656) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     WorldMapArea.friendSystem.friendsList.addComparator(new class157(var7));
+                  } else if (var0 == 3656) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     WorldMapArea.friendSystem.friendsList.addComparator(new BuddyRankComparator(var5));
                      return 1;
-                  } else if(var0 == 3657) {
-                     var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     if(PacketWriter.clanChat != null) {
-                        PacketWriter.clanChat.addComparator(new class157(var7));
+                  } else if (var0 == 3657) {
+                     var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                     if (PacketWriter.clanChat != null) {
+                        PacketWriter.clanChat.addComparator(new BuddyRankComparator(var5));
                      }
 
                      return 1;
@@ -447,7 +440,7 @@ public class FontName {
                }
             } else {
                var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-               if(PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size() && ((ClanMate)PacketWriter.clanChat.get(var3)).isIgnored()) {
+               if (PacketWriter.clanChat != null && var3 < PacketWriter.clanChat.size() && ((ClanMate)PacketWriter.clanChat.get(var3)).isIgnored()) {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1;
                } else {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
@@ -472,31 +465,31 @@ public class FontName {
       WorldMapLabel.method440();
       LoginScreenAnimation.method1780();
       SequenceDefinition.SequenceDefinition_cached.clear();
-      SequenceDefinition.__jh_o.clear();
+      SequenceDefinition.field775.clear();
       UserComparator3.method3379();
       VarbitDefinition.VarbitDefinition_cached.clear();
       VarpDefinition.VarpDefinition_cached.clear();
       GrandExchangeEvents.method69();
       Buffer.clearHealthbarCaches();
-      StructDefinition.__jq_f.clear();
+      StructDefinition.StructDefinition_cached.clear();
       InvDefinition.method4754();
       Projectile.method2089();
       PlayerAppearance.PlayerAppearance_cachedModels.clear();
-      class157.method3382();
+      BuddyRankComparator.method3382();
       ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear();
       Script.Script_cached.clear();
-      AbstractIndexCache.indexCache0.__b_400();
-      Skeleton.indexCache1.__b_400();
-      WorldMapIcon1.indexCache3.__b_400();
-      class25.indexCache4.__b_400();
-      SecureRandomFuture.indexCache5.__b_400();
-      UserComparator3.indexCache6.__b_400();
-      class40.indexCache7.__b_400();
-      WorldMapSection3.indexCache8.__b_400();
-      class238.indexCache9.__b_400();
-      class16.indexCache10.__b_400();
-      Login.indexCache11.__b_400();
-      Formatting.indexCache12.__b_400();
+      AbstractArchive.archive0.method8();
+      Skeleton.archive1.method8();
+      WorldMapIcon1.archive3.method8();
+      WorldMapDecoration.archive4.method8();
+      SecureRandomFuture.archive5.method8();
+      UserComparator3.archive6.method8();
+      class40.archive7.method8();
+      WorldMapSection1.archive8.method8();
+      class238.archive9.method8();
+      class16.archive10.method8();
+      Login.archive11.method8();
+      Formatting.archive12.method8();
    }
 
    @ObfuscatedName("gg")
@@ -505,72 +498,72 @@ public class FontName {
       garbageValue = "-2003105831"
    )
    @Export("setViewportShape")
-   static final void setViewportShape(int var0, int var1, int var2, int var3, boolean var4) {
-      if(var2 < 1) {
-         var2 = 1;
+   static final void setViewportShape(int x, int y, int width, int height, boolean clear) {
+      if (width < 1) {
+         width = 1;
       }
 
-      if(var3 < 1) {
-         var3 = 1;
+      if (height < 1) {
+         height = 1;
       }
 
-      int var5 = var3 - 334;
+      int var5 = height - 334;
       int var6;
-      if(var5 < 0) {
-         var6 = Client.__client_rw;
-      } else if(var5 >= 100) {
-         var6 = Client.__client_rm;
+      if (var5 < 0) {
+         var6 = Client.field130;
+      } else if (var5 >= 100) {
+         var6 = Client.field131;
       } else {
-         var6 = (Client.__client_rm - Client.__client_rw) * var5 / 100 + Client.__client_rw;
+         var6 = (Client.field131 - Client.field130) * var5 / 100 + Client.field130;
       }
 
-      int var7 = var3 * var6 * 512 / (var2 * 334);
+      int var7 = height * var6 * 512 / (width * 334);
       int var8;
       int var9;
       short var10;
-      if(var7 < Client.__client_rs) {
-         var10 = Client.__client_rs;
-         var6 = var10 * var2 * 334 / (var3 * 512);
-         if(var6 > Client.__client_ri) {
-            var6 = Client.__client_ri;
-            var8 = var3 * var6 * 512 / (var10 * 334);
-            var9 = (var2 - var8) / 2;
-            if(var4) {
+      if (var7 < Client.field132) {
+         var10 = Client.field132;
+         var6 = var10 * width * 334 / (height * 512);
+         if (var6 > Client.field134) {
+            var6 = Client.field134;
+            var8 = height * var6 * 512 / (var10 * 334);
+            var9 = (width - var8) / 2;
+            if (clear) {
                Rasterizer2D.Rasterizer2D_resetClip();
-               Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var9, var3, -16777216);
-               Rasterizer2D.Rasterizer2D_fillRectangle(var0 + var2 - var9, var1, var9, var3, -16777216);
+               Rasterizer2D.Rasterizer2D_fillRectangle(x, y, var9, height, -16777216);
+               Rasterizer2D.Rasterizer2D_fillRectangle(x + width - var9, y, var9, height, -16777216);
             }
 
-            var0 += var9;
-            var2 -= var9 * 2;
+            x += var9;
+            width -= var9 * 2;
          }
-      } else if(var7 > Client.__client_rp) {
-         var10 = Client.__client_rp;
-         var6 = var10 * var2 * 334 / (var3 * 512);
-         if(var6 < Client.__client_rv) {
-            var6 = Client.__client_rv;
-            var8 = var10 * var2 * 334 / (var6 * 512);
-            var9 = (var3 - var8) / 2;
-            if(var4) {
+      } else if (var7 > Client.field133) {
+         var10 = Client.field133;
+         var6 = var10 * width * 334 / (height * 512);
+         if (var6 < Client.field135) {
+            var6 = Client.field135;
+            var8 = var10 * width * 334 / (var6 * 512);
+            var9 = (height - var8) / 2;
+            if (clear) {
                Rasterizer2D.Rasterizer2D_resetClip();
-               Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var9, -16777216);
-               Rasterizer2D.Rasterizer2D_fillRectangle(var0, var3 + var1 - var9, var2, var9, -16777216);
+               Rasterizer2D.Rasterizer2D_fillRectangle(x, y, width, var9, -16777216);
+               Rasterizer2D.Rasterizer2D_fillRectangle(x, height + y - var9, width, var9, -16777216);
             }
 
-            var1 += var9;
-            var3 -= var9 * 2;
+            y += var9;
+            height -= var9 * 2;
          }
       }
 
-      Client.viewportZoom = var3 * var6 / 334;
-      if(var2 != Client.viewportWidth || var3 != Client.viewportHeight) {
-         ScriptEvent.method1183(var2, var3);
+      Client.viewportZoom = height * var6 / 334;
+      if (width != Client.viewportWidth || height != Client.viewportHeight) {
+         ScriptEvent.method1183(width, height);
       }
 
-      Client.viewportOffsetX = var0;
-      Client.viewportOffsetY = var1;
-      Client.viewportWidth = var2;
-      Client.viewportHeight = var3;
+      Client.viewportOffsetX = x;
+      Client.viewportOffsetY = y;
+      Client.viewportWidth = width;
+      Client.viewportHeight = height;
    }
 
    @ObfuscatedName("km")
@@ -579,10 +572,19 @@ public class FontName {
       garbageValue = "51"
    )
    static final void method5635() {
-      for(int var0 = 0; var0 < Players.Players_count; ++var0) {
+      for (int var0 = 0; var0 < Players.Players_count; ++var0) {
          Player var1 = Client.players[Players.Players_indices[var0]];
          var1.clearIsInClanChat();
       }
 
    }
+
+   static {
+      FontName_plain11 = new FontName("p11_full");
+      FontName_plain12 = new FontName("p12_full");
+      FontName_bold12 = new FontName("b12_full");
+      FontName_verdana11 = new FontName("verdana_11pt_regular");
+      FontName_verdana13 = new FontName("verdana_13pt_regular");
+      FontName_verdana15 = new FontName("verdana_15pt_regular");
+   }
 }
diff --git a/runescape-client/src/main/java/Fonts.java b/runescape-client/src/main/java/Fonts.java
index 98f2077878..d081332b56 100644
--- a/runescape-client/src/main/java/Fonts.java
+++ b/runescape-client/src/main/java/Fonts.java
@@ -11,10 +11,10 @@ public class Fonts {
    @ObfuscatedSignature(
       signature = "Lff;"
    )
-   @Export("indexStore255")
-   static IndexStore indexStore255;
+   @Export("masterDisk")
+   static ArchiveDisk masterDisk;
    @ObfuscatedName("o")
-   static byte[][][] __kz_o;
+   static byte[][][] field350;
    @ObfuscatedName("l")
    @ObfuscatedSignature(
       signature = "Lln;"
@@ -25,12 +25,12 @@ public class Fonts {
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   AbstractIndexCache __m;
+   AbstractArchive field351;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   AbstractIndexCache __f;
+   AbstractArchive field352;
    @ObfuscatedName("q")
    @Export("map")
    HashMap map;
@@ -38,9 +38,9 @@ public class Fonts {
    @ObfuscatedSignature(
       signature = "(Lir;Lir;)V"
    )
-   public Fonts(AbstractIndexCache var1, AbstractIndexCache var2) {
-      this.__m = var1;
-      this.__f = var2;
+   public Fonts(AbstractArchive var1, AbstractArchive var2) {
+      this.field351 = var1;
+      this.field352 = var2;
       this.map = new HashMap();
    }
 
@@ -54,20 +54,20 @@ public class Fonts {
       HashMap var2 = new HashMap();
       FontName[] var3 = var1;
 
-      for(int var4 = 0; var4 < var3.length; ++var4) {
+      for (int var4 = 0; var4 < var3.length; ++var4) {
          FontName var5 = var3[var4];
-         if(this.map.containsKey(var5)) {
+         if (this.map.containsKey(var5)) {
             var2.put(var5, this.map.get(var5));
          } else {
-            AbstractIndexCache var7 = this.__m;
-            AbstractIndexCache var8 = this.__f;
-            String var9 = var5.__g;
-            int var10 = var7.getArchiveId(var9);
-            int var11 = var7.getRecordId(var10, "");
-            Font var6 = SpriteIds.method5823(var7, var8, var10, var11);
-            if(var6 != null) {
-               this.map.put(var5, var6);
-               var2.put(var5, var6);
+            AbstractArchive var6 = this.field351;
+            AbstractArchive var7 = this.field352;
+            String var8 = var5.field349;
+            int var9 = var6.getGroupId(var8);
+            int var10 = var6.getFileId(var9, "");
+            Font var11 = GraphicsDefaults.method5823(var6, var7, var9, var10);
+            if (var11 != null) {
+               this.map.put(var5, var11);
+               var2.put(var5, var11);
             }
          }
       }
@@ -80,7 +80,8 @@ public class Fonts {
       signature = "(I)Lbt;",
       garbageValue = "2102006478"
    )
-   static World method5647() {
-      return World.__bt_g < World.worldsCount?ItemContainer.worlds[++World.__bt_g - 1]:null;
+   @Export("getNextWorldListWorld")
+   static World getNextWorldListWorld() {
+      return World.worldListWorldCount < World.worldsCount ? ItemContainer.worlds[++World.worldListWorldCount - 1] : null;
    }
 }
diff --git a/runescape-client/src/main/java/Formatting.java b/runescape-client/src/main/java/Formatting.java
index 1a656b9e0a..e70709cc5a 100644
--- a/runescape-client/src/main/java/Formatting.java
+++ b/runescape-client/src/main/java/Formatting.java
@@ -2,18 +2,19 @@ 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("cy")
 @Implements("Formatting")
 public class Formatting {
    @ObfuscatedName("d")
-   static int[] __cy_d;
+   static int[] field353;
    @ObfuscatedName("dh")
    @ObfuscatedSignature(
       signature = "Lit;"
    )
-   @Export("indexCache12")
-   static IndexCache indexCache12;
+   @Export("archive12")
+   static Archive archive12;
 
    @ObfuscatedName("s")
    @ObfuscatedSignature(
@@ -21,19 +22,19 @@ public class Formatting {
       garbageValue = "1654486766"
    )
    static int method2023(int var0, Script var1, boolean var2) {
-      Widget var3 = var2?WorldMapIcon1.__t_i:class12.__n_n;
-      if(var0 == 1700) {
+      Widget var3 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111;
+      if (var0 == ScriptOpcodes.CC_GETINVOBJECT) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.itemId;
          return 1;
-      } else if(var0 == 1701) {
-         if(var3.itemId != -1) {
+      } else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) {
+         if (var3.itemId != -1) {
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.itemQuantity;
          } else {
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
          }
 
          return 1;
-      } else if(var0 == 1702) {
+      } else if (var0 == ScriptOpcodes.CC_GETID) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.childIndex;
          return 1;
       } else {
@@ -49,34 +50,34 @@ public class Formatting {
    static int method2022(int var0, Script var1, boolean var2) {
       int var3;
       int var4;
-      int var6;
-      if(var0 == 3400) {
+      int var5;
+      EnumDefinition var6;
+      if (var0 == ScriptOpcodes.ENUM_STRING) {
          RouteStrategy.Interpreter_intStackSize -= 2;
          var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
          var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-         EnumDefinition var5 = Interpreter.getEnum(var3);
-         if(var5.valType != 's') {
-            ;
+         var6 = Interpreter.getEnum(var3);
+         if (var6.outputType != 's') {
          }
 
-         for(var6 = 0; var6 < var5.size0; ++var6) {
-            if(var4 == var5.keys[var6]) {
-               Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.stringVals[var6];
-               var5 = null;
+         for (var5 = 0; var5 < var6.outputCount; ++var5) {
+            if (var4 == var6.keys[var5]) {
+               Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.strVals[var5];
+               var6 = null;
                break;
             }
          }
 
-         if(var5 != null) {
-            Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.defaultString;
+         if (var6 != null) {
+            Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.defaultStr;
          }
 
          return 1;
-      } else if(var0 != 3408) {
-         if(var0 == 3411) {
+      } else if (var0 != ScriptOpcodes.ENUM) {
+         if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) {
             var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-            EnumDefinition var10 = Interpreter.getEnum(var3);
-            Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var10.size();
+            var6 = Interpreter.getEnum(var3);
+            Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.size();
             return 1;
          } else {
             return 2;
@@ -85,34 +86,34 @@ public class Formatting {
          RouteStrategy.Interpreter_intStackSize -= 4;
          var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
          var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-         int var9 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
-         var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3];
-         EnumDefinition var7 = Interpreter.getEnum(var9);
-         if(var3 == var7.keyType && var4 == var7.valType) {
-            for(int var8 = 0; var8 < var7.size0; ++var8) {
-               if(var6 == var7.keys[var8]) {
-                  if(var4 == 115) {
-                     Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.stringVals[var8];
+         int var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
+         var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3];
+         EnumDefinition var8 = Interpreter.getEnum(var7);
+         if (var3 == var8.inputType && var4 == var8.outputType) {
+            for (int var9 = 0; var9 < var8.outputCount; ++var9) {
+               if (var5 == var8.keys[var9]) {
+                  if (var4 == 115) {
+                     Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.strVals[var9];
                   } else {
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var7.intVals[var8];
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var8.intVals[var9];
                   }
 
-                  var7 = null;
+                  var8 = null;
                   break;
                }
             }
 
-            if(var7 != null) {
-               if(var4 == 115) {
-                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var7.defaultString;
+            if (var8 != null) {
+               if (var4 == 115) {
+                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var8.defaultStr;
                } else {
-                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var7.defaultInt;
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var8.defaultInt;
                }
             }
 
             return 1;
          } else {
-            if(var4 == 115) {
+            if (var4 == 115) {
                Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "null";
             } else {
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
diff --git a/runescape-client/src/main/java/Frames.java b/runescape-client/src/main/java/Frames.java
index cca71579cf..21657bfe05 100644
--- a/runescape-client/src/main/java/Frames.java
+++ b/runescape-client/src/main/java/Frames.java
@@ -7,8 +7,8 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("Frames")
 public class Frames extends DualNode {
    @ObfuscatedName("o")
-   @Export("IndexStoreActionHandler_thread")
-   static Thread IndexStoreActionHandler_thread;
+   @Export("ArchiveDiskActionHandler_thread")
+   static Thread ArchiveDiskActionHandler_thread;
    @ObfuscatedName("bc")
    @ObfuscatedSignature(
       signature = "[Llq;"
@@ -26,26 +26,26 @@ public class Frames extends DualNode {
       signature = "(Lir;Lir;IZ)V",
       garbageValue = "0"
    )
-   public Frames(AbstractIndexCache var1, AbstractIndexCache var2, int var3, boolean var4) {
+   public Frames(AbstractArchive var1, AbstractArchive var2, int var3, boolean var4) {
       NodeDeque var5 = new NodeDeque();
-      int var6 = var1.__s_396(var3);
+      int var6 = var1.getGroupFileCount(var3);
       this.frames = new Animation[var6];
-      int[] var7 = var1.__j_395(var3);
+      int[] var7 = var1.method3(var3);
 
-      for(int var8 = 0; var8 < var7.length; ++var8) {
-         byte[] var9 = var1.takeRecord(var3, var7[var8]);
+      for (int var8 = 0; var8 < var7.length; ++var8) {
+         byte[] var9 = var1.takeFile(var3, var7[var8]);
          Skeleton var10 = null;
          int var11 = (var9[0] & 255) << 8 | var9[1] & 255;
 
-         for(Skeleton var12 = (Skeleton)var5.last(); var12 != null; var12 = (Skeleton)var5.previous()) {
-            if(var11 == var12.id) {
+         for (Skeleton var12 = (Skeleton)var5.last(); var12 != null; var12 = (Skeleton)var5.previous()) {
+            if (var11 == var12.id) {
                var10 = var12;
                break;
             }
          }
 
-         if(var10 == null) {
-            byte[] var13 = var2.getRecord(var11, 0);
+         if (var10 == null) {
+            byte[] var13 = var2.getFile(var11, 0);
             var10 = new Skeleton(var11, var13);
             var5.addFirst(var10);
          }
@@ -61,8 +61,8 @@ public class Frames extends DualNode {
       garbageValue = "-1018278334"
    )
    @Export("hasAlphaTransform")
-   public boolean hasAlphaTransform(int var1) {
-      return this.frames[var1].hasAlphaTransform;
+   public boolean hasAlphaTransform(int frame) {
+      return this.frames[frame].hasAlphaTransform;
    }
 
    @ObfuscatedName("m")
@@ -70,8 +70,8 @@ public class Frames extends DualNode {
       signature = "(Lir;I)V",
       garbageValue = "1204337492"
    )
-   public static void method3241(AbstractIndexCache var0) {
-      VarcInt.__iw_m = var0;
+   public static void method3241(AbstractArchive var0) {
+      VarcInt.field942 = var0;
    }
 
    @ObfuscatedName("f")
@@ -80,11 +80,11 @@ public class Frames extends DualNode {
       garbageValue = "1776656760"
    )
    static String method3238(IterableNodeHashTable var0, int var1, String var2) {
-      if(var0 == null) {
+      if (var0 == null) {
          return var2;
       } else {
          ObjectNode var3 = (ObjectNode)var0.get((long)var1);
-         return var3 == null?var2:(String)var3.obj;
+         return var3 == null ? var2 : (String)var3.obj;
       }
    }
 }
diff --git a/runescape-client/src/main/java/Friend.java b/runescape-client/src/main/java/Friend.java
index 946be4825c..4203d642d2 100644
--- a/runescape-client/src/main/java/Friend.java
+++ b/runescape-client/src/main/java/Friend.java
@@ -11,18 +11,18 @@ public class Friend extends Buddy {
    @Export("soundSystemExecutor")
    static ScheduledExecutorService soundSystemExecutor;
    @ObfuscatedName("m")
-   boolean __m;
+   boolean field354;
    @ObfuscatedName("f")
-   boolean __f;
+   boolean field355;
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "(Lkq;I)I",
       garbageValue = "-1559116693"
    )
-   @Export("compareTo00")
-   int compareTo00(Friend var1) {
-      return super.world0 == Client.worldId && Client.worldId != var1.world0?-1:(Client.worldId == var1.world0 && super.world0 != Client.worldId?1:(super.world0 != 0 && var1.world0 == 0?-1:(var1.world0 != 0 && super.world0 == 0?1:(this.__m && !var1.__m?-1:(!this.__m && var1.__m?1:(this.__f && !var1.__f?-1:(!this.__f && var1.__f?1:(super.world0 != 0?super.int2 - var1.int2:var1.int2 - super.int2))))))));
+   @Export("compareToFriend")
+   int compareToFriend(Friend other) {
+      return super.world == Client.worldId && Client.worldId != other.world ? -1 : (Client.worldId == other.world && super.world != Client.worldId ? 1 : (super.world != 0 && other.world == 0 ? -1 : (other.world != 0 && super.world == 0 ? 1 : (this.field354 && !other.field354 ? -1 : (!this.field354 && other.field354 ? 1 : (this.field355 && !other.field355 ? -1 : (!this.field355 && other.field355 ? 1 : (super.world != 0 ? super.int2 - other.int2 : other.int2 - super.int2))))))));
    }
 
    @ObfuscatedName("aj")
@@ -30,12 +30,12 @@ public class Friend extends Buddy {
       signature = "(Ljs;I)I",
       garbageValue = "1627362569"
    )
-   public int compareTo0(User var1) {
-      return this.compareTo00((Friend)var1);
+   @Export("compareToUser")
+   public int compareToUser(User var1) {
+      return this.compareToFriend((Friend)var1);
    }
 
-   @ObfuscatedName("compareTo")
    public int compareTo(Object var1) {
-      return this.compareTo00((Friend)var1);
+      return this.compareToFriend((Friend)var1);
    }
 }
diff --git a/runescape-client/src/main/java/FriendLoginUpdate.java b/runescape-client/src/main/java/FriendLoginUpdate.java
index 8745b5bdc2..19b191955c 100644
--- a/runescape-client/src/main/java/FriendLoginUpdate.java
+++ b/runescape-client/src/main/java/FriendLoginUpdate.java
@@ -11,7 +11,7 @@ public class FriendLoginUpdate extends Link {
    @ObfuscatedSignature(
       signature = "Ley;"
    )
-   static UrlRequest __kn_x;
+   static UrlRequest field356;
    @ObfuscatedName("q")
    @ObfuscatedGetter(
       intValue = -1390885889
diff --git a/runescape-client/src/main/java/FriendSystem.java b/runescape-client/src/main/java/FriendSystem.java
index 908cc6f100..9976c7a2e0 100644
--- a/runescape-client/src/main/java/FriendSystem.java
+++ b/runescape-client/src/main/java/FriendSystem.java
@@ -3,6 +3,7 @@ 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("bh")
 @Implements("FriendSystem")
@@ -29,13 +30,13 @@ public class FriendSystem {
    @ObfuscatedGetter(
       intValue = 1477282369
    )
-   int __g;
+   int field357;
 
    @ObfuscatedSignature(
       signature = "(Llx;)V"
    )
    FriendSystem(LoginType var1) {
-      this.__g = 0;
+      this.field357 = 0;
       this.loginType = var1;
       this.friendsList = new FriendsList(var1);
       this.ignoreList = new IgnoreList(var1);
@@ -46,8 +47,8 @@ public class FriendSystem {
       signature = "(B)Z",
       garbageValue = "-114"
    )
-   boolean __m_151() {
-      return this.__g == 2;
+   boolean method99() {
+      return this.field357 == 2;
    }
 
    @ObfuscatedName("f")
@@ -55,8 +56,8 @@ public class FriendSystem {
       signature = "(I)V",
       garbageValue = "-2125539725"
    )
-   final void __f_152() {
-      this.__g = 1;
+   final void method100() {
+      this.field357 = 1;
    }
 
    @ObfuscatedName("q")
@@ -64,9 +65,9 @@ public class FriendSystem {
       signature = "(Lgr;II)V",
       garbageValue = "-1440726810"
    )
-   final void __q_153(Buffer var1, int var2) {
+   final void method101(Buffer var1, int var2) {
       this.friendsList.read(var1, var2);
-      this.__g = 2;
+      this.field357 = 2;
       GrandExchangeOffer.method121();
    }
 
@@ -75,15 +76,15 @@ public class FriendSystem {
       signature = "(I)V",
       garbageValue = "-1408945788"
    )
-   final void __w_154() {
-      for(FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.__f_438(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.__q_439()) {
-         if((long)var1.time < class203.currentTimeMs() / 1000L - 5L) {
-            if(var1.world > 0) {
-               WorldMapIcon1.method219(5, "", var1.username + " has logged in.");
+   final void method102() {
+      for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) {
+         if ((long)var1.time < class203.currentTimeMs() / 1000L - 5L) {
+            if (var1.world > 0) {
+               WorldMapIcon1.addGameMessage(5, "", var1.username + " has logged in.");
             }
 
-            if(var1.world == 0) {
-               WorldMapIcon1.method219(5, "", var1.username + " has logged out.");
+            if (var1.world == 0) {
+               WorldMapIcon1.addGameMessage(5, "", var1.username + " has logged out.");
             }
 
             var1.remove();
@@ -99,7 +100,7 @@ public class FriendSystem {
    )
    @Export("clear")
    final void clear() {
-      this.__g = 0;
+      this.field357 = 0;
       this.friendsList.clear();
       this.ignoreList.clear();
    }
@@ -129,43 +130,45 @@ public class FriendSystem {
       signature = "(Ljava/lang/String;I)V",
       garbageValue = "-1721017960"
    )
-   final void __l_157(String var1) {
-      if(var1 != null) {
+   @Export("addFriend")
+   final void addFriend(String var1) {
+      if (var1 != null) {
          Username var2 = new Username(var1, this.loginType);
-         if(var2.hasCleanName()) {
-            StringBuilder var10000;
+         if (var2.hasCleanName()) {
+            StringBuilder var3;
             String var4;
-            if(this.__e_158()) {
-               var10000 = null;
+            if (this.canAddFriend()) {
+               var3 = null;
                var4 = "Your friend list is full. Max of 200 for free users, and 400 for members";
-               WorldMapIcon1.method219(30, "", var4);
-            } else if(Canvas.localPlayer.username.equals(var2)) {
-               var10000 = null;
-               var4 = "You can\'t add yourself to your own friend list";
-               WorldMapIcon1.method219(30, "", var4);
+               WorldMapIcon1.addGameMessage(30, "", var4);
+            } else if (Canvas.localPlayer.username.equals(var2)) {
+               var3 = null;
+               var4 = "You can't add yourself to your own friend list";
+               WorldMapIcon1.addGameMessage(30, "", var4);
             } else {
-               Object var10001;
-               if(this.isFriended(var2, false)) {
-                  var10000 = (new StringBuilder()).append(var1);
-                  var10001 = null;
-                  var4 = var10000.append(" is already on your friend list").toString();
-                  WorldMapIcon1.method219(30, "", var4);
-               } else if(this.isIgnored(var2)) {
-                  var10000 = new StringBuilder();
-                  var10001 = null;
-                  var10000 = var10000.append("Please remove ").append(var1);
-                  var10001 = null;
-                  var4 = var10000.append(" from your ignore list first").toString();
-                  WorldMapIcon1.method219(30, "", var4);
+               Object var5;
+               if (this.isFriended(var2, false)) {
+                  var3 = (new StringBuilder()).append(var1);
+                  var5 = null;
+                  var4 = var3.append(" is already on your friend list").toString();
+                  WorldMapIcon1.addGameMessage(30, "", var4);
+               } else if (this.isIgnored(var2)) {
+                  var3 = new StringBuilder();
+                  var5 = null;
+                  var3 = var3.append("Please remove ").append(var1);
+                  var5 = null;
+                  var4 = var3.append(" from your ignore list first").toString();
+                  WorldMapIcon1.addGameMessage(30, "", var4);
                } else {
-                  PacketBufferNode var3 = Interpreter.method1915(ClientPacket.__gs_cn, Client.packetWriter.isaacCipher);
-                  var3.packetBuffer.writeByte(WorldMapRegion.method550(var1));
-                  var3.packetBuffer.writeStringCp1252NullTerminated(var1);
-                  Client.packetWriter.__q_167(var3);
+                  PacketBufferNode var6 = Interpreter.method1915(ClientPacket.field310, Client.packetWriter.isaacCipher);
+                  var6.packetBuffer.writeByte(WorldMapRegion.stringCp1252NullTerminatedByteSize(var1));
+                  var6.packetBuffer.writeStringCp1252NullTerminated(var1);
+                  Client.packetWriter.method241(var6);
                }
             }
          }
       }
+
    }
 
    @ObfuscatedName("e")
@@ -173,8 +176,9 @@ public class FriendSystem {
       signature = "(B)Z",
       garbageValue = "57"
    )
-   final boolean __e_158() {
-      return this.friendsList.isFull() || this.friendsList.size() >= 200 && Client.__client_jo != 1;
+   @Export("canAddFriend")
+   final boolean canAddFriend() {
+      return this.friendsList.isFull() || this.friendsList.size() >= 200 && Client.field209 != 1;
    }
 
    @ObfuscatedName("x")
@@ -182,37 +186,42 @@ public class FriendSystem {
       signature = "(Ljava/lang/String;B)V",
       garbageValue = "30"
    )
-   final void __x_159(String var1) {
-      if(var1 != null) {
+   @Export("addIgnore")
+   final void addIgnore(String var1) {
+      if (var1 != null) {
          Username var2 = new Username(var1, this.loginType);
-         if(var2.hasCleanName()) {
-            StringBuilder var10000;
+         if (var2.hasCleanName()) {
+            StringBuilder var3;
             String var4;
-            if(this.__a_160()) {
-               var10000 = null;
+            if (this.canAddIgnore()) {
+               var3 = null;
                var4 = "Your ignore list is full. Max of 100 for free users, and 400 for members";
-               WorldMapIcon1.method219(30, "", var4);
-            } else if(Canvas.localPlayer.username.equals(var2)) {
-               var10000 = null;
-               var4 = "You can\'t add yourself to your own ignore list";
-               WorldMapIcon1.method219(30, "", var4);
-            } else if(this.isIgnored(var2)) {
-               class22.method294(var1);
-            } else if(this.isFriended(var2, false)) {
-               var10000 = new StringBuilder();
-               Object var10001 = null;
-               var10000 = var10000.append("Please remove ").append(var1);
-               var10001 = null;
-               var4 = var10000.append(" from your friend list first").toString();
-               WorldMapIcon1.method219(30, "", var4);
+               WorldMapIcon1.addGameMessage(30, "", var4);
+            } else if (Canvas.localPlayer.username.equals(var2)) {
+               var3 = null;
+               var4 = "You can't add yourself to your own ignore list";
+               WorldMapIcon1.addGameMessage(30, "", var4);
+            } else if (this.isIgnored(var2)) {
+               WorldMapRectangle.method294(var1);
             } else {
-               PacketBufferNode var3 = Interpreter.method1915(ClientPacket.__gs_ch, Client.packetWriter.isaacCipher);
-               var3.packetBuffer.writeByte(WorldMapRegion.method550(var1));
-               var3.packetBuffer.writeStringCp1252NullTerminated(var1);
-               Client.packetWriter.__q_167(var3);
+               PacketBufferNode var5;
+               if (this.isFriended(var2, false)) {
+                  var3 = new StringBuilder();
+                  var5 = null;
+                  var3 = var3.append("Please remove ").append(var1);
+                  var5 = null;
+                  var4 = var3.append(" from your friend list first").toString();
+                  WorldMapIcon1.addGameMessage(30, "", var4);
+               } else {
+                  var5 = Interpreter.method1915(ClientPacket.field312, Client.packetWriter.isaacCipher);
+                  var5.packetBuffer.writeByte(WorldMapRegion.stringCp1252NullTerminatedByteSize(var1));
+                  var5.packetBuffer.writeStringCp1252NullTerminated(var1);
+                  Client.packetWriter.method241(var5);
+               }
             }
          }
       }
+
    }
 
    @ObfuscatedName("a")
@@ -220,8 +229,9 @@ public class FriendSystem {
       signature = "(B)Z",
       garbageValue = "120"
    )
-   final boolean __a_160() {
-      return this.ignoreList.isFull() || this.ignoreList.size() >= 100 && Client.__client_jo != 1;
+   @Export("canAddIgnore")
+   final boolean canAddIgnore() {
+      return this.ignoreList.isFull() || this.ignoreList.size() >= 100 && Client.field209 != 1;
    }
 
    @ObfuscatedName("z")
@@ -230,21 +240,22 @@ public class FriendSystem {
       garbageValue = "-2122207917"
    )
    @Export("removeFriend")
-   final void removeFriend(String var1) {
-      if(var1 != null) {
-         Username var2 = new Username(var1, this.loginType);
-         if(var2.hasCleanName()) {
-            if(this.friendsList.removeByUsername(var2)) {
+   final void removeFriend(String name) {
+      if (name != null) {
+         Username var2 = new Username(name, this.loginType);
+         if (var2.hasCleanName()) {
+            if (this.friendsList.removeByUsername(var2)) {
                WorldMapManager.method668();
-               PacketBufferNode var3 = Interpreter.method1915(ClientPacket.__gs_bs, Client.packetWriter.isaacCipher);
-               var3.packetBuffer.writeByte(WorldMapRegion.method550(var1));
-               var3.packetBuffer.writeStringCp1252NullTerminated(var1);
-               Client.packetWriter.__q_167(var3);
+               PacketBufferNode var3 = Interpreter.method1915(ClientPacket.field276, Client.packetWriter.isaacCipher);
+               var3.packetBuffer.writeByte(WorldMapRegion.stringCp1252NullTerminatedByteSize(name));
+               var3.packetBuffer.writeStringCp1252NullTerminated(name);
+               Client.packetWriter.method241(var3);
             }
 
             GrandExchangeOffer.method121();
          }
       }
+
    }
 
    @ObfuscatedName("j")
@@ -253,21 +264,22 @@ public class FriendSystem {
       garbageValue = "-1673636127"
    )
    @Export("removeIgnore")
-   final void removeIgnore(String var1) {
-      if(var1 != null) {
-         Username var2 = new Username(var1, this.loginType);
-         if(var2.hasCleanName()) {
-            if(this.ignoreList.removeByUsername(var2)) {
+   final void removeIgnore(String name) {
+      if (name != null) {
+         Username var2 = new Username(name, this.loginType);
+         if (var2.hasCleanName()) {
+            if (this.ignoreList.removeByUsername(var2)) {
                WorldMapManager.method668();
-               PacketBufferNode var3 = Interpreter.method1915(ClientPacket.__gs_aj, Client.packetWriter.isaacCipher);
-               var3.packetBuffer.writeByte(WorldMapRegion.method550(var1));
-               var3.packetBuffer.writeStringCp1252NullTerminated(var1);
-               Client.packetWriter.__q_167(var3);
+               PacketBufferNode var3 = Interpreter.method1915(ClientPacket.field250, Client.packetWriter.isaacCipher);
+               var3.packetBuffer.writeByte(WorldMapRegion.stringCp1252NullTerminatedByteSize(name));
+               var3.packetBuffer.writeStringCp1252NullTerminated(name);
+               Client.packetWriter.method241(var3);
             }
 
             class229.method4512();
          }
       }
+
    }
 
    @ObfuscatedName("t")
@@ -288,23 +300,23 @@ public class FriendSystem {
    )
    static int method1867(int var0, Script var1, boolean var2) {
       Widget var3;
-      if(var0 >= 2000) {
+      if (var0 >= 2000) {
          var0 -= 1000;
          var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
       } else {
-         var3 = var2?WorldMapIcon1.__t_i:class12.__n_n;
+         var3 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111;
       }
 
-      if(var0 == 1927) {
-         if(Interpreter.__bv_y >= 10) {
+      if (var0 == ScriptOpcodes.CC_CALLONRESIZE) {
+         if (Interpreter.field425 >= 10) {
             throw new RuntimeException();
-         } else if(var3.__ee == null) {
+         } else if (var3.onResize == null) {
             return 0;
          } else {
             ScriptEvent var4 = new ScriptEvent();
             var4.widget = var3;
-            var4.args0 = var3.__ee;
-            var4.__d = Interpreter.__bv_y + 1;
+            var4.args0 = var3.onResize;
+            var4.field772 = Interpreter.field425 + 1;
             Client.scriptEvents.addFirst(var4);
             return 1;
          }
@@ -320,6 +332,6 @@ public class FriendSystem {
    )
    @Export("jmodCheck")
    public static boolean jmodCheck() {
-      return Client.rights >= 2;
+      return Client.staffModLevel >= 2;
    }
 }
diff --git a/runescape-client/src/main/java/FriendsList.java b/runescape-client/src/main/java/FriendsList.java
index b39fda53a7..c9fbb3601f 100644
--- a/runescape-client/src/main/java/FriendsList.java
+++ b/runescape-client/src/main/java/FriendsList.java
@@ -17,7 +17,7 @@ public class FriendsList extends UserList {
    @ObfuscatedGetter(
       intValue = -217526077
    )
-   int __x;
+   int field358;
    @ObfuscatedName("d")
    @ObfuscatedSignature(
       signature = "Ljy;"
@@ -30,7 +30,7 @@ public class FriendsList extends UserList {
    )
    public FriendsList(LoginType var1) {
       super(400);
-      this.__x = 1;
+      this.field358 = 1;
       this.friendLoginUpdates = new LinkDeque();
       this.loginType = var1;
    }
@@ -63,7 +63,7 @@ public class FriendsList extends UserList {
    @Export("isFriended")
    public boolean isFriended(Username var1, boolean var2) {
       Friend var3 = (Friend)this.getByUsername(var1);
-      return var3 != null && (!var2 || var3.world0 != 0);
+      return var3 != null && (!var2 || var3.world != 0);
    }
 
    @ObfuscatedName("x")
@@ -72,30 +72,30 @@ public class FriendsList extends UserList {
       garbageValue = "-11"
    )
    @Export("read")
-   public void read(Buffer var1, int var2) {
-      while(true) {
-         if(var1.index < var2) {
-            boolean var3 = var1.readUnsignedByte() == 1;
-            Username var4 = new Username(var1.readStringCp1252NullTerminated(), this.loginType);
-            Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType);
-            int var6 = var1.__ag_302();
-            int var7 = var1.readUnsignedByte();
-            int var8 = var1.readUnsignedByte();
+   public void read(Buffer buffer, int var2) {
+      while (true) {
+         if (buffer.index < var2) {
+            boolean var3 = buffer.readUnsignedByte() == 1;
+            Username var4 = new Username(buffer.readStringCp1252NullTerminated(), this.loginType);
+            Username var5 = new Username(buffer.readStringCp1252NullTerminated(), this.loginType);
+            int var6 = buffer.readUnsignedShort();
+            int var7 = buffer.readUnsignedByte();
+            int var8 = buffer.readUnsignedByte();
             boolean var9 = (var8 & 2) != 0;
             boolean var10 = (var8 & 1) != 0;
-            if(var6 > 0) {
-               var1.readStringCp1252NullTerminated();
-               var1.readUnsignedByte();
-               var1.readInt();
+            if (var6 > 0) {
+               buffer.readStringCp1252NullTerminated();
+               buffer.readUnsignedByte();
+               buffer.readInt();
             }
 
-            var1.readStringCp1252NullTerminated();
-            if(var4 != null && var4.hasCleanName()) {
+            buffer.readStringCp1252NullTerminated();
+            if (var4 != null && var4.hasCleanName()) {
                Friend var11 = (Friend)this.getByCurrentUsername(var4);
-               if(var3) {
+               if (var3) {
                   Friend var12 = (Friend)this.getByCurrentUsername(var5);
-                  if(var12 != null && var12 != var11) {
-                     if(var11 != null) {
+                  if (var12 != null && var12 != var11) {
+                     if (var11 != null) {
                         this.remove(var12);
                      } else {
                         var11 = var12;
@@ -103,47 +103,47 @@ public class FriendsList extends UserList {
                   }
                }
 
-               if(var11 != null) {
+               if (var11 != null) {
                   this.changeName(var11, var4, var5);
-                  if(var6 != var11.world0) {
+                  if (var6 != var11.world) {
                      boolean var14 = true;
 
-                     for(FriendLoginUpdate var13 = (FriendLoginUpdate)this.friendLoginUpdates.__f_438(); var13 != null; var13 = (FriendLoginUpdate)this.friendLoginUpdates.__q_439()) {
-                        if(var13.username.equals(var4)) {
-                           if(var6 != 0 && var13.world == 0) {
+                     for (FriendLoginUpdate var13 = (FriendLoginUpdate)this.friendLoginUpdates.last(); var13 != null; var13 = (FriendLoginUpdate)this.friendLoginUpdates.previous()) {
+                        if (var13.username.equals(var4)) {
+                           if (var6 != 0 && var13.world == 0) {
                               var13.remove();
                               var14 = false;
-                           } else if(var6 == 0 && var13.world != 0) {
+                           } else if (var6 == 0 && var13.world != 0) {
                               var13.remove();
                               var14 = false;
                            }
                         }
                      }
 
-                     if(var14) {
-                        this.friendLoginUpdates.__m_437(new FriendLoginUpdate(var4, var6));
+                     if (var14) {
+                        this.friendLoginUpdates.addFirst(new FriendLoginUpdate(var4, var6));
                      }
                   }
                } else {
-                  if(this.size() >= 400) {
+                  if (this.size() >= 400) {
                      continue;
                   }
 
                   var11 = (Friend)this.addLast(var4, var5);
                }
 
-               if(var6 != var11.world0) {
-                  var11.int2 = ++this.__x - 1;
-                  if(var11.world0 == -1 && var6 == 0) {
+               if (var6 != var11.world) {
+                  var11.int2 = ++this.field358 - 1;
+                  if (var11.world == -1 && var6 == 0) {
                      var11.int2 = -(var11.int2 * -1377538447) * 120689297;
                   }
 
-                  var11.world0 = var6;
+                  var11.world = var6;
                }
 
                var11.rank = var7;
-               var11.__m = var9;
-               var11.__f = var10;
+               var11.field354 = var9;
+               var11.field355 = var10;
                continue;
             }
 
diff --git a/runescape-client/src/main/java/GameObject.java b/runescape-client/src/main/java/GameObject.java
index 8bb9660616..48cdc5d053 100644
--- a/runescape-client/src/main/java/GameObject.java
+++ b/runescape-client/src/main/java/GameObject.java
@@ -17,7 +17,7 @@ public final class GameObject {
    @ObfuscatedGetter(
       intValue = -457229589
    )
-   static int __eh_fy;
+   static int field359;
    @ObfuscatedName("m")
    @ObfuscatedGetter(
       intValue = 1393658667
@@ -82,7 +82,7 @@ public final class GameObject {
    @ObfuscatedGetter(
       intValue = 1941106389
    )
-   int __d;
+   int field360;
    @ObfuscatedName("k")
    @ObfuscatedGetter(
       intValue = -1043687633
diff --git a/runescape-client/src/main/java/GameShell.java b/runescape-client/src/main/java/GameShell.java
index dad3bf2500..1aaea20dfb 100644
--- a/runescape-client/src/main/java/GameShell.java
+++ b/runescape-client/src/main/java/GameShell.java
@@ -43,7 +43,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
    @ObfuscatedGetter(
       intValue = -281664295
    )
-   static int __ba_q;
+   static int field361;
    @ObfuscatedName("o")
    @ObfuscatedGetter(
       longValue = 5666519919949401915L
@@ -57,17 +57,17 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
    @ObfuscatedGetter(
       intValue = -1179083285
    )
-   static int __ba_l;
+   static int field362;
    @ObfuscatedName("e")
    @ObfuscatedGetter(
       intValue = -1698831905
    )
-   static int __ba_e;
+   static int field363;
    @ObfuscatedName("d")
    @ObfuscatedGetter(
       intValue = 425367827
    )
-   static int __ba_d;
+   static int field364;
    @ObfuscatedName("k")
    @ObfuscatedGetter(
       intValue = 1789653893
@@ -75,19 +75,19 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
    @Export("fps")
    protected static int fps;
    @ObfuscatedName("a")
-   static long[] __ba_a;
+   static long[] field365;
    @ObfuscatedName("j")
-   static long[] __ba_j;
+   static long[] field366;
    @ObfuscatedName("s")
    @ObfuscatedGetter(
       intValue = -2078849253
    )
-   static int __ba_s;
+   static int field367;
    @ObfuscatedName("aw")
    @ObfuscatedGetter(
       intValue = -1042005999
    )
-   static int __ba_aw;
+   static int field368;
    @ObfuscatedName("an")
    @Export("hasFocus")
    static volatile boolean hasFocus;
@@ -167,7 +167,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
    @Export("canvas")
    java.awt.Canvas canvas;
    @ObfuscatedName("ah")
-   volatile boolean __ah;
+   volatile boolean field369;
    @ObfuscatedName("al")
    @Export("resizeCanvasNextFrame")
    boolean resizeCanvasNextFrame;
@@ -193,27 +193,11 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
    @Export("eventQueue")
    final EventQueue eventQueue;
 
-   static {
-      gameShell = null;
-      __ba_q = 0;
-      stopTimeMs = 0L;
-      isKilled = false;
-      __ba_e = 20;
-      __ba_d = 1;
-      fps = 0;
-      __ba_a = new long[32];
-      __ba_j = new long[32];
-      __ba_aw = 500;
-      hasFocus = true;
-      garbageCollectorLastCollectionTime = -1L;
-      garbageCollectorLastCheckTimeMs = -1L;
-   }
-
    protected GameShell() {
       this.hasErrored = false;
       this.canvasX = 0;
       this.canvasY = 0;
-      this.__ah = true;
+      this.field369 = true;
       this.resizeCanvasNextFrame = false;
       this.isCanvasInvalid = false;
       this.canvasSetTimeMs = 0L;
@@ -222,7 +206,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
       try {
          var1 = Toolkit.getDefaultToolkit().getSystemEventQueue();
       } catch (Throwable var3) {
-         ;
       }
 
       this.eventQueue = var1;
@@ -237,8 +220,8 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
    )
    @Export("setMaxCanvasSize")
    protected final void setMaxCanvasSize(int var1, int var2) {
-      if(this.maxCanvasWidth != var1 || var2 != this.maxCanvasHeight) {
-         this.__ay_96();
+      if (this.maxCanvasWidth != var1 || var2 != this.maxCanvasHeight) {
+         this.method111();
       }
 
       this.maxCanvasWidth = var1;
@@ -252,16 +235,16 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
    )
    @Export("post")
    final void post(Object var1) {
-      if(this.eventQueue != null) {
-         for(int var2 = 0; var2 < 50 && this.eventQueue.peekEvent() != null; ++var2) {
+      if (this.eventQueue != null) {
+         for (int var2 = 0; var2 < 50 && this.eventQueue.peekEvent() != null; ++var2) {
             class203.method4010(1L);
          }
 
-         if(var1 != null) {
+         if (var1 != null) {
             this.eventQueue.postEvent(new ActionEvent(var1, 1001, "dummy"));
          }
-
       }
+
    }
 
    @ObfuscatedName("l")
@@ -271,7 +254,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
    )
    @Export("mouseWheel")
    protected MouseWheel mouseWheel() {
-      if(this.mouseWheelHandler == null) {
+      if (this.mouseWheelHandler == null) {
          this.mouseWheelHandler = new MouseWheelHandler();
          this.mouseWheelHandler.addTo(this.canvas);
       }
@@ -306,7 +289,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
    )
    @Export("setUpKeyboard")
    protected final void setUpKeyboard() {
-      if(TaskHandler.javaVendor.toLowerCase().indexOf("microsoft") != -1) {
+      if (TaskHandler.javaVendor.toLowerCase().indexOf("microsoft") != -1) {
          KeyHandler.KeyHandler_keyCodes[186] = 57;
          KeyHandler.KeyHandler_keyCodes[187] = 27;
          KeyHandler.KeyHandler_keyCodes[188] = 71;
@@ -361,15 +344,15 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
    @Export("resizeCanvas")
    final void resizeCanvas() {
       Container var1 = this.container();
-      if(var1 != null) {
+      if (var1 != null) {
          Bounds var2 = this.getFrameContentBounds();
-         this.contentWidth = Math.max(var2.__q, this.contentWidth0);
-         this.contentHeight = Math.max(var2.__w, this.contentHeight0);
-         if(this.contentWidth <= 0) {
+         this.contentWidth = Math.max(var2.field43, this.contentWidth0);
+         this.contentHeight = Math.max(var2.field44, this.contentHeight0);
+         if (this.contentWidth <= 0) {
             this.contentWidth = 1;
          }
 
-         if(this.contentHeight <= 0) {
+         if (this.contentHeight <= 0) {
             this.contentHeight = 1;
          }
 
@@ -379,16 +362,17 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
          this.canvasY = 0;
          this.canvas.setSize(SoundCache.canvasWidth, Huffman.canvasHeight);
          class197.rasterProvider = new RasterProvider(SoundCache.canvasWidth, Huffman.canvasHeight, this.canvas);
-         if(var1 == this.frame) {
+         if (var1 == this.frame) {
             Insets var3 = this.frame.getInsets();
             this.canvas.setLocation(this.canvasX + var3.left, var3.top + this.canvasY);
          } else {
             this.canvas.setLocation(this.canvasX, this.canvasY);
          }
 
-         this.__ah = true;
-         this.__j_113();
+         this.field369 = true;
+         this.vmethod107();
       }
+
    }
 
    @ObfuscatedName("j")
@@ -396,7 +380,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
       signature = "(I)V",
       garbageValue = "-1773624745"
    )
-   protected abstract void __j_113();
+   protected abstract void vmethod107();
 
    @ObfuscatedName("p")
    @ObfuscatedSignature(
@@ -409,12 +393,12 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
       int var2 = this.canvasY;
       int var3 = this.contentWidth - SoundCache.canvasWidth - var1;
       int var4 = this.contentHeight - Huffman.canvasHeight - var2;
-      if(var1 > 0 || var3 > 0 || var2 > 0 || var4 > 0) {
+      if (var1 > 0 || var3 > 0 || var2 > 0 || var4 > 0) {
          try {
             Container var5 = this.container();
             int var6 = 0;
             int var7 = 0;
-            if(var5 == this.frame) {
+            if (var5 == this.frame) {
                Insets var8 = this.frame.getInsets();
                var6 = var8.left;
                var7 = var8.top;
@@ -422,23 +406,22 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
 
             Graphics var10 = var5.getGraphics();
             var10.setColor(Color.black);
-            if(var1 > 0) {
+            if (var1 > 0) {
                var10.fillRect(var6, var7, var1, this.contentHeight);
             }
 
-            if(var2 > 0) {
+            if (var2 > 0) {
                var10.fillRect(var6, var7, this.contentWidth, var2);
             }
 
-            if(var3 > 0) {
+            if (var3 > 0) {
                var10.fillRect(var6 + this.contentWidth - var3, var7, var3, this.contentHeight);
             }
 
-            if(var4 > 0) {
+            if (var4 > 0) {
                var10.fillRect(var6, var7 + this.contentHeight - var4, this.contentWidth, var4);
             }
          } catch (Exception var9) {
-            ;
          }
       }
 
@@ -454,13 +437,13 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
       java.awt.Canvas var1 = this.canvas;
       var1.removeKeyListener(KeyHandler.KeyHandler_instance);
       var1.removeFocusListener(KeyHandler.KeyHandler_instance);
-      KeyHandler.__an_cw = -1;
+      KeyHandler.field448 = -1;
       java.awt.Canvas var2 = this.canvas;
       var2.removeMouseListener(MouseHandler.MouseHandler_instance);
       var2.removeMouseMotionListener(MouseHandler.MouseHandler_instance);
       var2.removeFocusListener(MouseHandler.MouseHandler_instance);
       MouseHandler.MouseHandler_currentButton0 = 0;
-      if(this.mouseWheelHandler != null) {
+      if (this.mouseWheelHandler != null) {
          this.mouseWheelHandler.removeFrom(this.canvas);
       }
 
@@ -473,11 +456,11 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
       var4.addMouseListener(MouseHandler.MouseHandler_instance);
       var4.addMouseMotionListener(MouseHandler.MouseHandler_instance);
       var4.addFocusListener(MouseHandler.MouseHandler_instance);
-      if(this.mouseWheelHandler != null) {
+      if (this.mouseWheelHandler != null) {
          this.mouseWheelHandler.addTo(this.canvas);
       }
 
-      this.__ay_96();
+      this.method111();
    }
 
    @ObfuscatedName("ag")
@@ -486,11 +469,11 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
       garbageValue = "559367680"
    )
    @Export("startThread")
-   protected final void startThread(int var1, int var2, int var3) {
+   protected final void startThread(int width, int height, int revision) {
       try {
-         if(gameShell != null) {
-            ++__ba_q;
-            if(__ba_q >= 3) {
+         if (gameShell != null) {
+            ++field361;
+            if (field361 >= 3) {
                this.error("alreadyloaded");
                return;
             }
@@ -500,17 +483,17 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
          }
 
          gameShell = this;
-         SoundCache.canvasWidth = var1;
-         Huffman.canvasHeight = var2;
-         RunException.revision = var3;
+         SoundCache.canvasWidth = width;
+         Huffman.canvasHeight = height;
+         RunException.revision = revision;
          RunException.applet = this;
-         if(taskHandler == null) {
+         if (taskHandler == null) {
             taskHandler = new TaskHandler();
          }
 
          taskHandler.newThreadTask(this, 1);
       } catch (Exception var5) {
-         NpcDefinition.sendStackTrace((String)null, var5);
+         NPCDefinition.sendStackTrace((String)null, var5);
          this.error("crash");
       }
 
@@ -524,7 +507,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
    @Export("addCanvas")
    final synchronized void addCanvas() {
       Container var1 = this.container();
-      if(this.canvas != null) {
+      if (this.canvas != null) {
          this.canvas.removeFocusListener(this);
          var1.remove(this.canvas);
       }
@@ -532,7 +515,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
       SoundCache.canvasWidth = Math.max(var1.getWidth(), this.contentWidth0);
       Huffman.canvasHeight = Math.max(var1.getHeight(), this.contentHeight0);
       Insets var2;
-      if(this.frame != null) {
+      if (this.frame != null) {
          var2 = this.frame.getInsets();
          SoundCache.canvasWidth -= var2.right + var2.left;
          Huffman.canvasHeight -= var2.top + var2.bottom;
@@ -545,7 +528,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
       this.canvas.setSize(SoundCache.canvasWidth, Huffman.canvasHeight);
       this.canvas.setVisible(true);
       this.canvas.setBackground(Color.BLACK);
-      if(var1 == this.frame) {
+      if (var1 == this.frame) {
          var2 = this.frame.getInsets();
          this.canvas.setLocation(var2.left + this.canvasX, var2.top + this.canvasY);
       } else {
@@ -554,8 +537,8 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
 
       this.canvas.addFocusListener(this);
       this.canvas.requestFocus();
-      this.__ah = true;
-      if(class197.rasterProvider != null && SoundCache.canvasWidth == class197.rasterProvider.width && Huffman.canvasHeight == class197.rasterProvider.height) {
+      this.field369 = true;
+      if (class197.rasterProvider != null && SoundCache.canvasWidth == class197.rasterProvider.width && Huffman.canvasHeight == class197.rasterProvider.height) {
          ((RasterProvider)class197.rasterProvider).setComponent(this.canvas);
          class197.rasterProvider.drawFull(0, 0);
       } else {
@@ -574,16 +557,16 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
    @Export("checkHost")
    protected final boolean checkHost() {
       String var1 = this.getDocumentBase().getHost().toLowerCase();
-      if(!var1.equals("jagex.com") && !var1.endsWith(".jagex.com")) {
-         if(!var1.equals("runescape.com") && !var1.endsWith(".runescape.com")) {
-            if(var1.endsWith("127.0.0.1")) {
+      if (!var1.equals("jagex.com") && !var1.endsWith(".jagex.com")) {
+         if (!var1.equals("runescape.com") && !var1.endsWith(".runescape.com")) {
+            if (var1.endsWith("127.0.0.1")) {
                return true;
             } else {
-               while(var1.length() > 0 && var1.charAt(var1.length() - 1) >= '0' && var1.charAt(var1.length() - 1) <= '9') {
+               while (var1.length() > 0 && var1.charAt(var1.length() - 1) >= '0' && var1.charAt(var1.length() - 1) <= '9') {
                   var1 = var1.substring(0, var1.length() - 1);
                }
 
-               if(var1.endsWith("192.168.1.")) {
+               if (var1.endsWith("192.168.1.")) {
                   return true;
                } else {
                   this.error("invalidhost");
@@ -603,20 +586,19 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
       signature = "(B)V",
       garbageValue = "0"
    )
-   void __av_93() {
+   void method108() {
       long var1 = class203.currentTimeMs();
-      long var3 = __ba_j[__ba_s];
-      __ba_j[__ba_s] = var1;
-      __ba_s = __ba_s + 1 & 31;
-      if(var3 != 0L && var1 > var3) {
-         ;
+      long var3 = field366[field367];
+      field366[field367] = var1;
+      field367 = field367 + 1 & 31;
+      if (var3 != 0L && var1 > var3) {
       }
 
       synchronized(this) {
-         class230.__hy_az = hasFocus;
+         class230.field1138 = hasFocus;
       }
 
-      this.__al_111();
+      this.doCycle();
    }
 
    @ObfuscatedName("ar")
@@ -624,23 +606,23 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
       signature = "(B)V",
       garbageValue = "-2"
    )
-   void __ar_94() {
+   void method109() {
       Container var1 = this.container();
       long var2 = class203.currentTimeMs();
-      long var4 = __ba_a[GrandExchangeEvents.__g_z];
-      __ba_a[GrandExchangeEvents.__g_z] = var2;
-      GrandExchangeEvents.__g_z = GrandExchangeEvents.__g_z + 1 & 31;
-      if(var4 != 0L && var2 > var4) {
+      long var4 = field365[GrandExchangeEvents.field375];
+      field365[GrandExchangeEvents.field375] = var2;
+      GrandExchangeEvents.field375 = GrandExchangeEvents.field375 + 1 & 31;
+      if (var4 != 0L && var2 > var4) {
          int var6 = (int)(var2 - var4);
          fps = ((var6 >> 1) + 32000) / var6;
       }
 
-      if(++__ba_aw - 1 > 50) {
-         __ba_aw -= 50;
-         this.__ah = true;
+      if (++field368 - 1 > 50) {
+         field368 -= 50;
+         this.field369 = true;
          this.canvas.setSize(SoundCache.canvasWidth, Huffman.canvasHeight);
          this.canvas.setVisible(true);
-         if(var1 == this.frame) {
+         if (var1 == this.frame) {
             Insets var7 = this.frame.getInsets();
             this.canvas.setLocation(var7.left + this.canvasX, this.canvasY + var7.top);
          } else {
@@ -648,17 +630,17 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
          }
       }
 
-      if(this.isCanvasInvalid) {
+      if (this.isCanvasInvalid) {
          this.replaceCanvas();
       }
 
-      this.__ac_95();
-      this.methodDraw(this.__ah);
-      if(this.__ah) {
+      this.method110();
+      this.draw(this.field369);
+      if (this.field369) {
          this.clearBackground();
       }
 
-      this.__ah = false;
+      this.field369 = false;
    }
 
    @ObfuscatedName("ac")
@@ -666,9 +648,9 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
       signature = "(I)V",
       garbageValue = "-1999661001"
    )
-   final void __ac_95() {
+   final void method110() {
       Bounds var1 = this.getFrameContentBounds();
-      if(var1.__q != this.contentWidth || this.contentHeight != var1.__w || this.resizeCanvasNextFrame) {
+      if (var1.field43 != this.contentWidth || this.contentHeight != var1.field44 || this.resizeCanvasNextFrame) {
          this.resizeCanvas();
          this.resizeCanvasNextFrame = false;
       }
@@ -680,7 +662,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
       signature = "(I)V",
       garbageValue = "1147427427"
    )
-   final void __ay_96() {
+   final void method111() {
       this.resizeCanvasNextFrame = true;
    }
 
@@ -691,39 +673,36 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
    )
    @Export("kill")
    final synchronized void kill() {
-      if(!isKilled) {
+      if (!isKilled) {
          isKilled = true;
 
          try {
             this.canvas.removeFocusListener(this);
          } catch (Exception var5) {
-            ;
          }
 
          try {
             this.kill0();
          } catch (Exception var4) {
-            ;
          }
 
-         if(this.frame != null) {
+         if (this.frame != null) {
             try {
                System.exit(0);
             } catch (Throwable var3) {
-               ;
             }
          }
 
-         if(taskHandler != null) {
+         if (taskHandler != null) {
             try {
                taskHandler.close();
             } catch (Exception var2) {
-               ;
             }
          }
 
-         this.__au_110();
+         this.vmethod114();
       }
+
    }
 
    @ObfuscatedName("aw")
@@ -739,15 +718,16 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
       signature = "(I)V",
       garbageValue = "1445885427"
    )
-   protected abstract void __al_111();
+   @Export("doCycle")
+   protected abstract void doCycle();
 
    @ObfuscatedName("ab")
    @ObfuscatedSignature(
       signature = "(ZI)V",
       garbageValue = "106302203"
    )
-   @Export("methodDraw")
-   protected abstract void methodDraw(boolean var1);
+   @Export("draw")
+   protected abstract void draw(boolean var1);
 
    @ObfuscatedName("ae")
    @ObfuscatedSignature(
@@ -766,12 +746,12 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
    protected final void drawInitial(int var1, String var2, boolean var3) {
       try {
          Graphics var4 = this.canvas.getGraphics();
-         if(class231.__hb_av == null) {
-            class231.__hb_av = new java.awt.Font("Helvetica", 1, 13);
-            class60.__bo_ar = this.canvas.getFontMetrics(class231.__hb_av);
+         if (WorldMapDecorationType.field1140 == null) {
+            WorldMapDecorationType.field1140 = new java.awt.Font("Helvetica", 1, 13);
+            class60.field1162 = this.canvas.getFontMetrics(WorldMapDecorationType.field1140);
          }
 
-         if(var3) {
+         if (var3) {
             var4.setColor(Color.black);
             var4.fillRect(0, 0, SoundCache.canvasWidth, Huffman.canvasHeight);
          }
@@ -779,21 +759,21 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
          Color var5 = new Color(140, 17, 17);
 
          try {
-            if(PlayerType.__ij_ak == null) {
-               PlayerType.__ij_ak = this.canvas.createImage(304, 34);
+            if (PlayerType.field730 == null) {
+               PlayerType.field730 = this.canvas.createImage(304, 34);
             }
 
-            Graphics var6 = PlayerType.__ij_ak.getGraphics();
+            Graphics var6 = PlayerType.field730.getGraphics();
             var6.setColor(var5);
             var6.drawRect(0, 0, 303, 33);
             var6.fillRect(2, 2, var1 * 3, 30);
             var6.setColor(Color.black);
             var6.drawRect(1, 1, 301, 31);
             var6.fillRect(var1 * 3 + 2, 2, 300 - var1 * 3, 30);
-            var6.setFont(class231.__hb_av);
+            var6.setFont(WorldMapDecorationType.field1140);
             var6.setColor(Color.white);
-            var6.drawString(var2, (304 - class60.__bo_ar.stringWidth(var2)) / 2, 22);
-            var4.drawImage(PlayerType.__ij_ak, SoundCache.canvasWidth / 2 - 152, Huffman.canvasHeight / 2 - 18, (ImageObserver)null);
+            var6.drawString(var2, (304 - class60.field1162.stringWidth(var2)) / 2, 22);
+            var4.drawImage(PlayerType.field730, SoundCache.canvasWidth / 2 - 152, Huffman.canvasHeight / 2 - 18, (ImageObserver)null);
          } catch (Exception var9) {
             int var7 = SoundCache.canvasWidth / 2 - 152;
             int var8 = Huffman.canvasHeight / 2 - 18;
@@ -803,9 +783,9 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
             var4.setColor(Color.black);
             var4.drawRect(var7 + 1, var8 + 1, 301, 31);
             var4.fillRect(var1 * 3 + var7 + 2, var8 + 2, 300 - var1 * 3, 30);
-            var4.setFont(class231.__hb_av);
+            var4.setFont(WorldMapDecorationType.field1140);
             var4.setColor(Color.white);
-            var4.drawString(var2, var7 + (304 - class60.__bo_ar.stringWidth(var2)) / 2, var8 + 22);
+            var4.drawString(var2, var7 + (304 - class60.field1162.stringWidth(var2)) / 2, var8 + 22);
          }
       } catch (Exception var10) {
          this.canvas.repaint();
@@ -818,10 +798,10 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
       signature = "(I)V",
       garbageValue = "-1283386969"
    )
-   protected final void __ad_108() {
-      PlayerType.__ij_ak = null;
-      class231.__hb_av = null;
-      class60.__bo_ar = null;
+   protected final void method113() {
+      PlayerType.field730 = null;
+      WorldMapDecorationType.field1140 = null;
+      class60.field1162 = null;
    }
 
    @ObfuscatedName("ap")
@@ -830,18 +810,17 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
       garbageValue = "39"
    )
    @Export("error")
-   protected void error(String var1) {
-      if(!this.hasErrored) {
+   protected void error(String type) {
+      if (!this.hasErrored) {
          this.hasErrored = true;
-         System.out.println("error_game_" + var1);
+         System.out.println("error_game_" + type);
 
          try {
-            this.getAppletContext().showDocument(new URL(this.getCodeBase(), "error_game_" + var1 + ".ws"), "_self");
+            this.getAppletContext().showDocument(new URL(this.getCodeBase(), "error_game_" + type + ".ws"), "_self");
          } catch (Exception var3) {
-            ;
          }
-
       }
+
    }
 
    @ObfuscatedName("as")
@@ -851,7 +830,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
    )
    @Export("container")
    Container container() {
-      return (Container)(this.frame != null?this.frame:this);
+      return (Container)(this.frame != null ? this.frame : this);
    }
 
    @ObfuscatedName("am")
@@ -864,7 +843,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
       Container var1 = this.container();
       int var2 = Math.max(var1.getWidth(), this.contentWidth0);
       int var3 = Math.max(var1.getHeight(), this.contentHeight0);
-      if(this.frame != null) {
+      if (this.frame != null) {
          Insets var4 = this.frame.getInsets();
          var2 -= var4.right + var4.left;
          var3 -= var4.bottom + var4.top;
@@ -888,59 +867,54 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
       signature = "(I)V",
       garbageValue = "1860808291"
    )
-   protected abstract void __au_110();
+   protected abstract void vmethod114();
 
-   @ObfuscatedName("destroy")
-   public final void __destroy_99() {
-      if(this == gameShell && !isKilled) {
+   public final void destroy() {
+      if (this == gameShell && !isKilled) {
          stopTimeMs = class203.currentTimeMs();
          class203.method4010(5000L);
          this.kill();
       }
+
    }
 
-   @Export("paint")
-   @ObfuscatedName("paint")
    public final synchronized void paint(Graphics var1) {
-      if(this == gameShell && !isKilled) {
-         this.__ah = true;
-         if(class203.currentTimeMs() - this.canvasSetTimeMs > 1000L) {
+      if (this == gameShell && !isKilled) {
+         this.field369 = true;
+         if (class203.currentTimeMs() - this.canvasSetTimeMs > 1000L) {
             Rectangle var2 = var1.getClipBounds();
-            if(var2 == null || var2.width >= SoundCache.canvasWidth && var2.height >= Huffman.canvasHeight) {
+            if (var2 == null || var2.width >= SoundCache.canvasWidth && var2.height >= Huffman.canvasHeight) {
                this.isCanvasInvalid = true;
             }
          }
-
       }
+
    }
 
-   @Export("run")
-   @ObfuscatedName("run")
    public void run() {
       try {
-         if(TaskHandler.javaVendor != null) {
+         if (TaskHandler.javaVendor != null) {
             String var1 = TaskHandler.javaVendor.toLowerCase();
-            if(var1.indexOf("sun") != -1 || var1.indexOf("apple") != -1) {
+            if (var1.indexOf("sun") != -1 || var1.indexOf("apple") != -1) {
                String var2 = TaskHandler.javaVersion;
-               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")) {
+               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")) {
                   this.error("wrongjava");
                   return;
                }
 
-               if(var2.startsWith("1.6.0_")) {
+               if (var2.startsWith("1.6.0_")) {
                   int var3;
-                  for(var3 = 6; var3 < var2.length() && class159.method3394(var2.charAt(var3)); ++var3) {
-                     ;
+                  for (var3 = 6; var3 < var2.length() && class159.isCharDigit(var2.charAt(var3)); ++var3) {
                   }
 
                   String var4 = var2.substring(6, var3);
-                  if(UserComparator4.method3336(var4) && MouseHandler.method1085(var4) < 10) {
+                  if (UserComparator4.method3336(var4) && MouseHandler.method1085(var4) < 10) {
                      this.error("wrongjava");
                      return;
                   }
                }
 
-               __ba_d = 5;
+               field364 = 5;
             }
          }
 
@@ -948,101 +922,80 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
          this.addCanvas();
          this.setUp();
 
-         Object var8;
+         Object var7;
          try {
-            var8 = new NanoClock();
-         } catch (Throwable var6) {
-            var8 = new MilliClock();
+            var7 = new NanoClock();
+         } catch (Throwable var5) {
+            var7 = new MilliClock();
          }
 
-         UserComparator6.clock = (Clock)var8;
+         UserComparator6.clock = (Clock)var7;
 
-         while(0L == stopTimeMs || class203.currentTimeMs() < stopTimeMs) {
-            __ba_l = UserComparator6.clock.wait(__ba_e, __ba_d);
+         while (0L == stopTimeMs || class203.currentTimeMs() < stopTimeMs) {
+            field362 = UserComparator6.clock.wait(field363, field364);
 
-            for(int var5 = 0; var5 < __ba_l; ++var5) {
-               this.__av_93();
+            for (int var8 = 0; var8 < field362; ++var8) {
+               this.method108();
             }
 
-            this.__ar_94();
+            this.method109();
             this.post(this.canvas);
          }
-      } catch (Exception var7) {
-         NpcDefinition.sendStackTrace((String)null, var7);
+      } catch (Exception var6) {
+         NPCDefinition.sendStackTrace((String)null, var6);
          this.error("crash");
       }
 
       this.kill();
    }
 
-   @ObfuscatedName("start")
-   public final void __start_97() {
-      if(this == gameShell && !isKilled) {
+   public final void start() {
+      if (this == gameShell && !isKilled) {
          stopTimeMs = 0L;
       }
+
    }
 
-   @Export("update")
-   @ObfuscatedName("update")
    public final void update(Graphics var1) {
       this.paint(var1);
    }
 
-   @Export("focusGained")
-   @ObfuscatedName("focusGained")
    public final void focusGained(FocusEvent var1) {
       hasFocus = true;
-      this.__ah = true;
+      this.field369 = true;
    }
 
-   @Export("windowActivated")
-   @ObfuscatedName("windowActivated")
    public final void windowActivated(WindowEvent var1) {
    }
 
-   @Export("windowClosed")
-   @ObfuscatedName("windowClosed")
    public final void windowClosed(WindowEvent var1) {
    }
 
-   @Export("windowClosing")
-   @ObfuscatedName("windowClosing")
    public final void windowClosing(WindowEvent var1) {
-      this.__destroy_99();
+      this.destroy();
    }
 
-   @Export("windowDeiconified")
-   @ObfuscatedName("windowDeiconified")
    public final void windowDeiconified(WindowEvent var1) {
    }
 
-   @Export("windowOpened")
-   @ObfuscatedName("windowOpened")
    public final void windowOpened(WindowEvent var1) {
    }
 
-   @ObfuscatedName("init")
-   public abstract void __init_109();
+   public abstract void init();
 
-   @ObfuscatedName("stop")
-   public final void __stop_98() {
-      if(this == gameShell && !isKilled) {
+   public final void stop() {
+      if (this == gameShell && !isKilled) {
          stopTimeMs = class203.currentTimeMs() + 4000L;
       }
+
    }
 
-   @Export("windowIconified")
-   @ObfuscatedName("windowIconified")
    public final void windowIconified(WindowEvent var1) {
    }
 
-   @Export("windowDeactivated")
-   @ObfuscatedName("windowDeactivated")
    public final void windowDeactivated(WindowEvent var1) {
    }
 
-   @Export("focusLost")
-   @ObfuscatedName("focusLost")
    public final void focusLost(FocusEvent var1) {
       hasFocus = false;
    }
@@ -1053,49 +1006,50 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
       garbageValue = "17"
    )
    @Export("updateGameState")
-   static void updateGameState(int var0) {
-      if(var0 != Client.gameState) {
-         if(Client.gameState == 0) {
-            TextureProvider.client.__ad_108();
+   static void updateGameState(int gameState) {
+      if (gameState != Client.gameState) {
+         if (Client.gameState == 0) {
+            TextureProvider.client.method113();
          }
 
-         if(var0 == 20 || var0 == 40 || var0 == 45) {
+         if (gameState == 20 || gameState == 40 || gameState == 45) {
             Client.loginState = 0;
-            Client.__client_ex = 0;
-            Client.__client_ej = 0;
-            Client.timer.__q_455(var0);
-            if(var0 != 20) {
+            Client.field168 = 0;
+            Client.field169 = 0;
+            Client.timer.method331(gameState);
+            if (gameState != 20) {
                class15.method184(false);
             }
          }
 
-         if(var0 != 20 && var0 != 40 && ClientParameter.__ji_fp != null) {
-            ClientParameter.__ji_fp.close();
-            ClientParameter.__ji_fp = null;
+         if (gameState != 20 && gameState != 40 && ClientParameter.field341 != null) {
+            ClientParameter.field341.close();
+            ClientParameter.field341 = null;
          }
 
-         if(Client.gameState == 25) {
-            Client.__client_gh = 0;
-            Client.__client_fe = 0;
-            Client.__client_fn = 1;
-            Client.__client_fk = 0;
-            Client.__client_gp = 1;
+         if (Client.gameState == 25) {
+            Client.field181 = 0;
+            Client.field177 = 0;
+            Client.field178 = 1;
+            Client.field179 = 0;
+            Client.field180 = 1;
          }
 
-         if(var0 != 5 && var0 != 10) {
-            if(var0 == 20) {
-               class2.method27(class16.indexCache10, WorldMapSection3.indexCache8, true, Client.gameState == 11?4:0);
-            } else if(var0 == 11) {
-               class2.method27(class16.indexCache10, WorldMapSection3.indexCache8, false, 4);
+         if (gameState != 5 && gameState != 10) {
+            if (gameState == 20) {
+               class2.method27(class16.archive10, WorldMapSection1.archive8, true, Client.gameState == 11 ? 4 : 0);
+            } else if (gameState == 11) {
+               class2.method27(class16.archive10, WorldMapSection1.archive8, false, 4);
             } else {
                class80.method2015();
             }
          } else {
-            class2.method27(class16.indexCache10, WorldMapSection3.indexCache8, true, 0);
+            class2.method27(class16.archive10, WorldMapSection1.archive8, true, 0);
          }
 
-         Client.gameState = var0;
+         Client.gameState = gameState;
       }
+
    }
 
    @ObfuscatedName("kv")
@@ -1104,8 +1058,24 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
       garbageValue = "2016931356"
    )
    static String method1060(Widget var0, int var1) {
-      int var3 = class1.getWidgetClickMask(var0);
-      boolean var2 = (var3 >> var1 + 1 & 1) != 0;
-      return !var2 && var0.onOp == null?null:(var0.actions != null && var0.actions.length > var1 && var0.actions[var1] != null && var0.actions[var1].trim().length() != 0?var0.actions[var1]:null);
+      int var2 = class1.getWidgetClickMask(var0);
+      boolean var3 = (var2 >> var1 + 1 & 1) != 0;
+      return !var3 && var0.onOp == null ? null : (var0.actions != null && var0.actions.length > var1 && var0.actions[var1] != null && var0.actions[var1].trim().length() != 0 ? var0.actions[var1] : null);
+   }
+
+   static {
+      gameShell = null;
+      field361 = 0;
+      stopTimeMs = 0L;
+      isKilled = false;
+      field363 = 20;
+      field364 = 1;
+      fps = 0;
+      field365 = new long[32];
+      field366 = new long[32];
+      field368 = 500;
+      hasFocus = true;
+      garbageCollectorLastCollectionTime = -1L;
+      garbageCollectorLastCheckTimeMs = -1L;
    }
 }
diff --git a/runescape-client/src/main/java/GrandExchangeEvent.java b/runescape-client/src/main/java/GrandExchangeEvent.java
index 07f41da157..0ea9e315c3 100644
--- a/runescape-client/src/main/java/GrandExchangeEvent.java
+++ b/runescape-client/src/main/java/GrandExchangeEvent.java
@@ -3,6 +3,7 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
 @ObfuscatedName("l")
 @Implements("GrandExchangeEvent")
@@ -17,7 +18,7 @@ public class GrandExchangeEvent {
    @ObfuscatedGetter(
       longValue = -6503890758391257651L
    )
-   public final long __f;
+   public final long field370;
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Lx;"
@@ -25,25 +26,25 @@ public class GrandExchangeEvent {
    @Export("grandExchangeOffer")
    public final GrandExchangeOffer grandExchangeOffer;
    @ObfuscatedName("w")
-   @Export("string1")
-   String string1;
+   @Export("offerName")
+   String offerName;
    @ObfuscatedName("o")
-   @Export("string2")
-   String string2;
+   @Export("previousOfferName")
+   String previousOfferName;
 
    @ObfuscatedSignature(
       signature = "(Lgr;BI)V"
    )
    GrandExchangeEvent(Buffer var1, byte var2, int var3) {
-      this.string1 = var1.readStringCp1252NullTerminated();
-      this.string2 = var1.readStringCp1252NullTerminated();
-      this.world = var1.__ag_302();
-      this.__f = var1.readLong();
+      this.offerName = var1.readStringCp1252NullTerminated();
+      this.previousOfferName = var1.readStringCp1252NullTerminated();
+      this.world = var1.readUnsignedShort();
+      this.field370 = var1.readLong();
       int var4 = var1.readInt();
       int var5 = var1.readInt();
       this.grandExchangeOffer = new GrandExchangeOffer();
-      this.grandExchangeOffer.__o_9(2);
-      this.grandExchangeOffer.__u_10(var2);
+      this.grandExchangeOffer.method121(2);
+      this.grandExchangeOffer.method122(var2);
       this.grandExchangeOffer.unitPrice = var4;
       this.grandExchangeOffer.totalQuantity = var5;
       this.grandExchangeOffer.currentQuantity = 0;
@@ -56,8 +57,9 @@ public class GrandExchangeEvent {
       signature = "(I)Ljava/lang/String;",
       garbageValue = "1672323214"
    )
-   public String __m_3() {
-      return this.string1;
+   @Export("getOfferName")
+   public String getOfferName() {
+      return this.offerName;
    }
 
    @ObfuscatedName("f")
@@ -65,8 +67,9 @@ public class GrandExchangeEvent {
       signature = "(I)Ljava/lang/String;",
       garbageValue = "-271438207"
    )
-   public String __f_4() {
-      return this.string2;
+   @Export("getPreviousOfferName")
+   public String getPreviousOfferName() {
+      return this.previousOfferName;
    }
 
    @ObfuscatedName("f")
@@ -75,111 +78,111 @@ public class GrandExchangeEvent {
       garbageValue = "-1003049523"
    )
    @Export("runScript0")
-   static void runScript0(ScriptEvent var0, int var1) {
-      Object[] var2 = var0.args0;
+   static void runScript0(ScriptEvent scriptEvent, int var1) {
+      Object[] var2 = scriptEvent.args0;
       Script var3;
-      int var17;
-      if(class12.method162(var0.type0)) {
+      int var4;
+      if (GrandExchangeOfferAgeComparator.method162(scriptEvent.type0)) {
          class15.worldMapEvent = (WorldMapEvent)var2[0];
-         WorldMapElement var4 = ViewportMouse.getWorldMapElement(class15.worldMapEvent.mapElement);
-         var3 = FaceNormal.method3236(var0.type0, var4.__o, var4.category);
+         WorldMapElement var5 = ViewportMouse.getWorldMapElement(class15.worldMapEvent.mapElement);
+         var3 = FaceNormal.method3236(scriptEvent.type0, var5.field1020, var5.category);
       } else {
-         var17 = ((Integer)var2[0]).intValue();
-         var3 = SoundSystem.method2451(var17);
+         var4 = (Integer)var2[0];
+         var3 = SoundSystem.method2451(var4);
       }
 
-      if(var3 != null) {
+      if (var3 != null) {
          RouteStrategy.Interpreter_intStackSize = 0;
          Interpreter.Interpreter_stringStackSize = 0;
-         var17 = -1;
-         int[] var5 = var3.opcodes;
+         var4 = -1;
+         int[] var25 = var3.opcodes;
          int[] var6 = var3.intOperands;
          byte var7 = -1;
          Interpreter.Interpreter_frameDepth = 0;
-         Interpreter.__bv_s = false;
+         Interpreter.field423 = false;
 
          try {
-            int var10;
+            int var8;
             try {
                Username.Interpreter_intLocals = new int[var3.localIntCount];
-               int var8 = 0;
-               Interpreter.Interpreter_stringLocals = new String[var3.localStringCount];
                int var9 = 0;
+               Interpreter.Interpreter_stringLocals = new String[var3.localStringCount];
+               int var26 = 0;
 
                int var11;
-               String var18;
-               for(var10 = 1; var10 < var2.length; ++var10) {
-                  if(var2[var10] instanceof Integer) {
-                     var11 = ((Integer)var2[var10]).intValue();
-                     if(var11 == -2147483647) {
-                        var11 = var0.mouseX;
+               String var12;
+               for (var8 = 1; var8 < var2.length; ++var8) {
+                  if (var2[var8] instanceof Integer) {
+                     var11 = (Integer)var2[var8];
+                     if (var11 == -2147483647) {
+                        var11 = scriptEvent.mouseX;
                      }
 
-                     if(var11 == -2147483646) {
-                        var11 = var0.mouseY;
+                     if (var11 == -2147483646) {
+                        var11 = scriptEvent.mouseY;
                      }
 
-                     if(var11 == -2147483645) {
-                        var11 = var0.widget != null?var0.widget.id:-1;
+                     if (var11 == -2147483645) {
+                        var11 = scriptEvent.widget != null ? scriptEvent.widget.id : -1;
                      }
 
-                     if(var11 == -2147483644) {
-                        var11 = var0.opIndex;
+                     if (var11 == -2147483644) {
+                        var11 = scriptEvent.opIndex;
                      }
 
-                     if(var11 == -2147483643) {
-                        var11 = var0.widget != null?var0.widget.childIndex:-1;
+                     if (var11 == -2147483643) {
+                        var11 = scriptEvent.widget != null ? scriptEvent.widget.childIndex : -1;
                      }
 
-                     if(var11 == -2147483642) {
-                        var11 = var0.dragTarget != null?var0.dragTarget.id:-1;
+                     if (var11 == -2147483642) {
+                        var11 = scriptEvent.dragTarget != null ? scriptEvent.dragTarget.id : -1;
                      }
 
-                     if(var11 == -2147483641) {
-                        var11 = var0.dragTarget != null?var0.dragTarget.childIndex:-1;
+                     if (var11 == -2147483641) {
+                        var11 = scriptEvent.dragTarget != null ? scriptEvent.dragTarget.childIndex : -1;
                      }
 
-                     if(var11 == -2147483640) {
-                        var11 = var0.keyTyped;
+                     if (var11 == -2147483640) {
+                        var11 = scriptEvent.keyTyped;
                      }
 
-                     if(var11 == -2147483639) {
-                        var11 = var0.keyPressed;
+                     if (var11 == -2147483639) {
+                        var11 = scriptEvent.keyPressed;
                      }
 
-                     Username.Interpreter_intLocals[var8++] = var11;
-                  } else if(var2[var10] instanceof String) {
-                     var18 = (String)var2[var10];
-                     if(var18.equals("event_opbase")) {
-                        var18 = var0.targetName;
+                     Username.Interpreter_intLocals[var9++] = var11;
+                  } else if (var2[var8] instanceof String) {
+                     var12 = (String)var2[var8];
+                     if (var12.equals("event_opbase")) {
+                        var12 = scriptEvent.targetName;
                      }
 
-                     Interpreter.Interpreter_stringLocals[var9++] = var18;
+                     Interpreter.Interpreter_stringLocals[var26++] = var12;
                   }
                }
 
-               var10 = 0;
-               Interpreter.__bv_y = var0.__d;
+               var8 = 0;
+               Interpreter.field425 = scriptEvent.field772;
 
-               while(true) {
-                  ++var10;
-                  if(var10 > var1) {
+               while (true) {
+                  ++var8;
+                  if (var8 > var1) {
                      throw new RuntimeException();
                   }
 
-                  ++var17;
-                  int var29 = var5[var17];
-                  int var20;
-                  if(var29 >= 100) {
+                  ++var4;
+                  int var13 = var25[var4];
+                  int var14;
+                  if (var13 >= 100) {
                      boolean var32;
-                     if(var3.intOperands[var17] == 1) {
+                     if (var3.intOperands[var4] == 1) {
                         var32 = true;
                      } else {
                         var32 = false;
                      }
 
-                     var20 = class196.method3736(var29, var3, var32);
-                     switch(var20) {
+                     var14 = class196.method3736(var13, var3, var32);
+                     switch(var14) {
                      case 0:
                         return;
                      case 1:
@@ -188,198 +191,198 @@ public class GrandExchangeEvent {
                      case 2:
                         throw new IllegalStateException();
                      }
-                  } else if(var29 == 0) {
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6[var17];
-                  } else if(var29 == 1) {
-                     var11 = var6[var17];
+                  } else if (var13 == 0) {
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6[var4];
+                  } else if (var13 == ScriptOpcodes.GET_VARP) {
+                     var11 = var6[var4];
                      Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Varps.Varps_main[var11];
-                  } else if(var29 == 2) {
-                     var11 = var6[var17];
+                  } else if (var13 == ScriptOpcodes.SET_VARP) {
+                     var11 = var6[var4];
                      Varps.Varps_main[var11] = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                     IndexCache.method4703(var11);
-                  } else if(var29 == 3) {
-                     Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.stringOperands[var17];
-                  } else if(var29 == 6) {
-                     var17 += var6[var17];
-                  } else if(var29 == 7) {
+                     Archive.method4703(var11);
+                  } else if (var13 == ScriptOpcodes.SCONST) {
+                     Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.stringOperands[var4];
+                  } else if (var13 == ScriptOpcodes.JUMP) {
+                     var4 += var6[var4];
+                  } else if (var13 == ScriptOpcodes.IF_ICMPNE) {
                      RouteStrategy.Interpreter_intStackSize -= 2;
-                     if(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) {
-                        var17 += var6[var17];
+                     if (Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] != Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) {
+                        var4 += var6[var4];
                      }
-                  } else if(var29 == 8) {
+                  } else if (var13 == ScriptOpcodes.IF_ICMPEQ) {
                      RouteStrategy.Interpreter_intStackSize -= 2;
-                     if(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) {
-                        var17 += var6[var17];
+                     if (Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] == Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) {
+                        var4 += var6[var4];
                      }
-                  } else if(var29 == 9) {
+                  } else if (var13 == ScriptOpcodes.IF_ICMPLT) {
                      RouteStrategy.Interpreter_intStackSize -= 2;
-                     if(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) {
-                        var17 += var6[var17];
+                     if (Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] < Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) {
+                        var4 += var6[var4];
                      }
-                  } else if(var29 == 10) {
+                  } else if (var13 == ScriptOpcodes.IF_ICMPGT) {
                      RouteStrategy.Interpreter_intStackSize -= 2;
-                     if(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) {
-                        var17 += var6[var17];
+                     if (Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] > Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) {
+                        var4 += var6[var4];
                      }
-                  } else if(var29 == 21) {
-                     if(Interpreter.Interpreter_frameDepth == 0) {
+                  } else if (var13 == ScriptOpcodes.RETURN) {
+                     if (Interpreter.Interpreter_frameDepth == 0) {
                         return;
                      }
 
-                     ScriptFrame var34 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth];
-                     var3 = var34.script;
-                     var5 = var3.opcodes;
+                     ScriptFrame var30 = Interpreter.Interpreter_frames[--Interpreter.Interpreter_frameDepth];
+                     var3 = var30.script;
+                     var25 = var3.opcodes;
                      var6 = var3.intOperands;
-                     var17 = var34.pc;
-                     Username.Interpreter_intLocals = var34.intLocals;
-                     Interpreter.Interpreter_stringLocals = var34.stringLocals;
-                  } else if(var29 == 25) {
-                     var11 = var6[var17];
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapSection2.getVarbit(var11);
-                  } else if(var29 == 27) {
-                     var11 = var6[var17];
-                     class68.method1695(var11, Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
-                  } else if(var29 == 31) {
+                     var4 = var30.pc;
+                     Username.Interpreter_intLocals = var30.intLocals;
+                     Interpreter.Interpreter_stringLocals = var30.stringLocals;
+                  } else if (var13 == ScriptOpcodes.GET_VARBIT) {
+                     var11 = var6[var4];
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapSection0.getVarbit(var11);
+                  } else if (var13 == ScriptOpcodes.SET_VARBIT) {
+                     var11 = var6[var4];
+                     PendingSpawn.method1695(var11, Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
+                  } else if (var13 == ScriptOpcodes.IF_ICMPLE) {
                      RouteStrategy.Interpreter_intStackSize -= 2;
-                     if(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) {
-                        var17 += var6[var17];
+                     if (Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] <= Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) {
+                        var4 += var6[var4];
                      }
-                  } else if(var29 == 32) {
+                  } else if (var13 == ScriptOpcodes.IF_ICMPGE) {
                      RouteStrategy.Interpreter_intStackSize -= 2;
-                     if(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) {
-                        var17 += var6[var17];
+                     if (Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] >= Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]) {
+                        var4 += var6[var4];
                      }
-                  } else if(var29 == 33) {
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Username.Interpreter_intLocals[var6[var17]];
-                  } else if(var29 == 34) {
-                     Username.Interpreter_intLocals[var6[var17]] = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                  } else if(var29 == 35) {
-                     Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Interpreter.Interpreter_stringLocals[var6[var17]];
-                  } else if(var29 == 36) {
-                     Interpreter.Interpreter_stringLocals[var6[var17]] = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-                  } else if(var29 == 37) {
-                     var11 = var6[var17];
+                  } else if (var13 == ScriptOpcodes.ILOAD) {
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Username.Interpreter_intLocals[var6[var4]];
+                  } else if (var13 == ScriptOpcodes.ISTORE) {
+                     Username.Interpreter_intLocals[var6[var4]] = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+                  } else if (var13 == ScriptOpcodes.SLOAD) {
+                     Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Interpreter.Interpreter_stringLocals[var6[var4]];
+                  } else if (var13 == ScriptOpcodes.SSTORE) {
+                     Interpreter.Interpreter_stringLocals[var6[var4]] = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+                  } else if (var13 == ScriptOpcodes.JOIN_STRING) {
+                     var11 = var6[var4];
                      Interpreter.Interpreter_stringStackSize -= var11;
-                     String var31 = class277.method5356(Interpreter.Interpreter_stringStack, Interpreter.Interpreter_stringStackSize, var11);
-                     Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var31;
-                  } else if(var29 == 38) {
+                     String var29 = class277.method5356(Interpreter.Interpreter_stringStack, Interpreter.Interpreter_stringStackSize, var11);
+                     Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var29;
+                  } else if (var13 == ScriptOpcodes.POP_INT) {
                      --RouteStrategy.Interpreter_intStackSize;
-                  } else if(var29 == 39) {
+                  } else if (var13 == ScriptOpcodes.POP_STRING) {
                      --Interpreter.Interpreter_stringStackSize;
                   } else {
                      int var15;
-                     if(var29 != 40) {
-                        if(var29 == 42) {
-                           Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class196.varcs.getInt(var6[var17]);
-                        } else if(var29 == 43) {
-                           class196.varcs.setInt(var6[var17], Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
-                        } else if(var29 == 44) {
-                           var11 = var6[var17] >> 16;
-                           var20 = var6[var17] & 65535;
-                           int var21 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                           if(var21 < 0 || var21 > 5000) {
+                     if (var13 != ScriptOpcodes.INVOKE) {
+                        if (var13 == ScriptOpcodes.GET_VARC_INT) {
+                           Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class196.varcs.getInt(var6[var4]);
+                        } else if (var13 == ScriptOpcodes.SET_VARC_INT) {
+                           class196.varcs.setInt(var6[var4], Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
+                        } else if (var13 == ScriptOpcodes.DEFINE_ARRAY) {
+                           var11 = var6[var4] >> 16;
+                           var14 = var6[var4] & 65535;
+                           int var28 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+                           if (var28 < 0 || var28 > 5000) {
                               throw new RuntimeException();
                            }
 
-                           Interpreter.Interpreter_arrayLengths[var11] = var21;
-                           byte var22 = -1;
-                           if(var20 == 105) {
-                              var22 = 0;
+                           Interpreter.Interpreter_arrayLengths[var11] = var28;
+                           byte var33 = -1;
+                           if (var14 == 105) {
+                              var33 = 0;
                            }
 
-                           for(var15 = 0; var15 < var21; ++var15) {
-                              Interpreter.Interpreter_arrays[var11][var15] = var22;
+                           for (var15 = 0; var15 < var28; ++var15) {
+                              Interpreter.Interpreter_arrays[var11][var15] = var33;
                            }
-                        } else if(var29 == 45) {
-                           var11 = var6[var17];
-                           var20 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                           if(var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) {
+                        } else if (var13 == ScriptOpcodes.GET_ARRAY_INT) {
+                           var11 = var6[var4];
+                           var14 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+                           if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var11]) {
                               throw new RuntimeException();
                            }
 
-                           Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var11][var20];
-                        } else if(var29 == 46) {
-                           var11 = var6[var17];
+                           Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Interpreter.Interpreter_arrays[var11][var14];
+                        } else if (var13 == ScriptOpcodes.SET_ARRAY_INT) {
+                           var11 = var6[var4];
                            RouteStrategy.Interpreter_intStackSize -= 2;
-                           var20 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-                           if(var20 < 0 || var20 >= Interpreter.Interpreter_arrayLengths[var11]) {
+                           var14 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
+                           if (var14 < 0 || var14 >= Interpreter.Interpreter_arrayLengths[var11]) {
                               throw new RuntimeException();
                            }
 
-                           Interpreter.Interpreter_arrays[var11][var20] = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-                        } else if(var29 == 47) {
-                           var18 = class196.varcs.getStringOld(var6[var17]);
-                           if(var18 == null) {
-                              var18 = "null";
+                           Interpreter.Interpreter_arrays[var11][var14] = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
+                        } else if (var13 == ScriptOpcodes.GET_VARC_STRING_OLD) {
+                           var12 = class196.varcs.getStringOld(var6[var4]);
+                           if (var12 == null) {
+                              var12 = "null";
                            }
 
-                           Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var18;
-                        } else if(var29 == 48) {
-                           class196.varcs.setStringOld(var6[var17], Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]);
-                        } else if(var29 == 49) {
-                           var18 = class196.varcs.getString(var6[var17]);
-                           Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var18;
-                        } else if(var29 == 50) {
-                           class196.varcs.setString(var6[var17], Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]);
+                           Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var12;
+                        } else if (var13 == ScriptOpcodes.SET_VARC_STRING_OLD) {
+                           class196.varcs.setStringOld(var6[var4], Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]);
+                        } else if (var13 == ScriptOpcodes.GET_VARC_STRING) {
+                           var12 = class196.varcs.getString(var6[var4]);
+                           Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var12;
+                        } else if (var13 == ScriptOpcodes.SET_VARC_STRING) {
+                           class196.varcs.setString(var6[var4], Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]);
                         } else {
-                           if(var29 != 60) {
+                           if (var13 != ScriptOpcodes.SWITCH) {
                               throw new IllegalStateException();
                            }
 
-                           IterableNodeHashTable var33 = var3.switches[var6[var17]];
-                           IntegerNode var30 = (IntegerNode)var33.get((long)Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
-                           if(var30 != null) {
-                              var17 += var30.integer;
+                           IterableNodeHashTable var27 = var3.switches[var6[var4]];
+                           IntegerNode var31 = (IntegerNode)var27.get((long)Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
+                           if (var31 != null) {
+                              var4 += var31.integer;
                            }
                         }
                      } else {
-                        var11 = var6[var17];
-                        Script var12 = SoundSystem.method2451(var11);
-                        int[] var13 = new int[var12.localIntCount];
-                        String[] var14 = new String[var12.localStringCount];
+                        var11 = var6[var4];
+                        Script var16 = SoundSystem.method2451(var11);
+                        int[] var17 = new int[var16.localIntCount];
+                        String[] var18 = new String[var16.localStringCount];
 
-                        for(var15 = 0; var15 < var12.intArgumentCount; ++var15) {
-                           var13[var15] = Interpreter.Interpreter_intStack[var15 + (RouteStrategy.Interpreter_intStackSize - var12.intArgumentCount)];
+                        for (var15 = 0; var15 < var16.intArgumentCount; ++var15) {
+                           var17[var15] = Interpreter.Interpreter_intStack[var15 + (RouteStrategy.Interpreter_intStackSize - var16.intArgumentCount)];
                         }
 
-                        for(var15 = 0; var15 < var12.stringArgumentCount; ++var15) {
-                           var14[var15] = Interpreter.Interpreter_stringStack[var15 + (Interpreter.Interpreter_stringStackSize - var12.stringArgumentCount)];
+                        for (var15 = 0; var15 < var16.stringArgumentCount; ++var15) {
+                           var18[var15] = Interpreter.Interpreter_stringStack[var15 + (Interpreter.Interpreter_stringStackSize - var16.stringArgumentCount)];
                         }
 
-                        RouteStrategy.Interpreter_intStackSize -= var12.intArgumentCount;
-                        Interpreter.Interpreter_stringStackSize -= var12.stringArgumentCount;
+                        RouteStrategy.Interpreter_intStackSize -= var16.intArgumentCount;
+                        Interpreter.Interpreter_stringStackSize -= var16.stringArgumentCount;
                         ScriptFrame var19 = new ScriptFrame();
                         var19.script = var3;
-                        var19.pc = var17;
+                        var19.pc = var4;
                         var19.intLocals = Username.Interpreter_intLocals;
                         var19.stringLocals = Interpreter.Interpreter_stringLocals;
                         Interpreter.Interpreter_frames[++Interpreter.Interpreter_frameDepth - 1] = var19;
-                        var3 = var12;
-                        var5 = var12.opcodes;
-                        var6 = var12.intOperands;
-                        var17 = -1;
-                        Username.Interpreter_intLocals = var13;
-                        Interpreter.Interpreter_stringLocals = var14;
+                        var3 = var16;
+                        var25 = var16.opcodes;
+                        var6 = var16.intOperands;
+                        var4 = -1;
+                        Username.Interpreter_intLocals = var17;
+                        Interpreter.Interpreter_stringLocals = var18;
                      }
                   }
                }
-            } catch (Exception var27) {
-               StringBuilder var24 = new StringBuilder(30);
-               var24.append("").append(var3.key).append(" ");
+            } catch (Exception var23) {
+               StringBuilder var10 = new StringBuilder(30);
+               var10.append("").append(var3.key).append(" ");
 
-               for(var10 = Interpreter.Interpreter_frameDepth - 1; var10 >= 0; --var10) {
-                  var24.append("").append(Interpreter.Interpreter_frames[var10].script.key).append(" ");
+               for (var8 = Interpreter.Interpreter_frameDepth - 1; var8 >= 0; --var8) {
+                  var10.append("").append(Interpreter.Interpreter_frames[var8].script.key).append(" ");
                }
 
-               var24.append("").append(var7);
-               NpcDefinition.sendStackTrace(var24.toString(), var27);
+               var10.append("").append(var7);
+               NPCDefinition.sendStackTrace(var10.toString(), var23);
             }
          } finally {
-            if(Interpreter.__bv_s) {
-               Interpreter.__bv_t = true;
+            if (Interpreter.field423) {
+               Interpreter.field424 = true;
                WorldMapLabelSize.method198();
-               Interpreter.__bv_t = false;
-               Interpreter.__bv_s = false;
+               Interpreter.field424 = false;
+               Interpreter.field423 = false;
             }
 
          }
@@ -392,9 +395,9 @@ public class GrandExchangeEvent {
       garbageValue = "1404"
    )
    public static int method80(int var0) {
-      long var2 = ViewportMouse.ViewportMouse_entityTags[var0];
-      int var1 = (int)(var2 >>> 14 & 3L);
-      return var1;
+      long var1 = ViewportMouse.ViewportMouse_entityTags[var0];
+      int var3 = (int)(var1 >>> 14 & 3L);
+      return var3;
    }
 
    @ObfuscatedName("w")
@@ -404,7 +407,7 @@ public class GrandExchangeEvent {
    )
    public static int method87(int var0, int var1) {
       int var2;
-      for(var2 = 0; var1 > 0; --var1) {
+      for (var2 = 0; var1 > 0; --var1) {
          var2 = var2 << 1 | var0 & 1;
          var0 >>>= 1;
       }
@@ -420,10 +423,10 @@ public class GrandExchangeEvent {
    static final String method88(int var0) {
       String var1 = Integer.toString(var0);
 
-      for(int var2 = var1.length() - 3; var2 > 0; var2 -= 3) {
+      for (int var2 = var1.length() - 3; var2 > 0; var2 -= 3) {
          var1 = var1.substring(0, var2) + "," + var1.substring(var2);
       }
 
-      return var1.length() > 9?" " + BufferedFile.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + "</col>":(var1.length() > 6?" " + BufferedFile.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "</col>":" " + BufferedFile.colorStartTag(16776960) + var1 + "</col>");
+      return var1.length() > 9 ? " " + BufferedFile.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M  (" + var1 + ")</col>" : (var1.length() > 6 ? " " + BufferedFile.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K  (" + var1 + ")</col>" : " " + BufferedFile.colorStartTag(16776960) + var1 + "</col>");
    }
 }
diff --git a/runescape-client/src/main/java/GrandExchangeEvents.java b/runescape-client/src/main/java/GrandExchangeEvents.java
index fba00b388a..8043c86470 100644
--- a/runescape-client/src/main/java/GrandExchangeEvents.java
+++ b/runescape-client/src/main/java/GrandExchangeEvents.java
@@ -7,23 +7,28 @@ 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("g")
 @Implements("GrandExchangeEvents")
 public class GrandExchangeEvents {
    @ObfuscatedName("f")
-   public static Comparator __g_f;
+   @Export("geAgeComparator")
+   public static Comparator geAgeComparator;
    @ObfuscatedName("q")
-   public static Comparator __g_q;
+   @Export("geUnitPriceComparator")
+   public static Comparator geUnitPriceComparator;
    @ObfuscatedName("w")
-   public static Comparator __g_w;
+   @Export("geItemNameComparator")
+   public static Comparator geItemNameComparator;
    @ObfuscatedName("o")
-   public static Comparator __g_o;
+   @Export("geTotalQuantityComparator")
+   public static Comparator geTotalQuantityComparator;
    @ObfuscatedName("z")
    @ObfuscatedGetter(
       intValue = -1605454211
    )
-   static int __g_z;
+   static int field375;
    @ObfuscatedName("hs")
    @ObfuscatedGetter(
       intValue = 1326137897
@@ -34,32 +39,24 @@ public class GrandExchangeEvents {
    @Export("events")
    public final List events;
 
-   static {
-      __g_f = new class12();
-      new WorldComparator();
-      __g_q = new UnitPriceComparator();
-      __g_w = new class11();
-      __g_o = new TotalQuantityComparator();
-   }
-
    @ObfuscatedSignature(
       signature = "(Lgr;Z)V",
       garbageValue = "1"
    )
    public GrandExchangeEvents(Buffer var1, boolean var2) {
-      int var3 = var1.__ag_302();
+      int var3 = var1.readUnsignedShort();
       boolean var4 = var1.readUnsignedByte() == 1;
       byte var5;
-      if(var4) {
+      if (var4) {
          var5 = 1;
       } else {
          var5 = 0;
       }
 
-      int var6 = var1.__ag_302();
+      int var6 = var1.readUnsignedShort();
       this.events = new ArrayList(var6);
 
-      for(int var7 = 0; var7 < var6; ++var7) {
+      for (int var7 = 0; var7 < var6; ++var7) {
          this.events.add(new GrandExchangeEvent(var1, var5, var3));
       }
 
@@ -72,7 +69,7 @@ public class GrandExchangeEvents {
    )
    @Export("sort")
    public void sort(Comparator var1, boolean var2) {
-      if(var2) {
+      if (var2) {
          Collections.sort(this.events, var1);
       } else {
          Collections.sort(this.events, Collections.reverseOrder(var1));
@@ -86,14 +83,14 @@ public class GrandExchangeEvents {
       garbageValue = "1601363438"
    )
    @Export("addChatMessage")
-   static void addChatMessage(int var0, String var1, String var2, String var3) {
-      ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(Integer.valueOf(var0));
-      if(var4 == null) {
+   static void addChatMessage(int type, String sender, String text, String prefix) {
+      ChatChannel var4 = (ChatChannel)Messages.Messages_channels.get(type);
+      if (var4 == null) {
          var4 = new ChatChannel();
-         Messages.Messages_channels.put(Integer.valueOf(var0), var4);
+         Messages.Messages_channels.put(type, var4);
       }
 
-      Message var5 = var4.addMessage(var0, var1, var2, var3);
+      Message var5 = var4.addMessage(type, sender, text, prefix);
       Messages.Messages_hashTable.put(var5, (long)var5.count);
       Messages.Messages_queue.add(var5);
       Client.chatCycle = Client.cycleCntr;
@@ -106,7 +103,7 @@ public class GrandExchangeEvents {
    )
    public static void method69() {
       HitSplatDefinition.HitSplatDefinition_cached.clear();
-      HitSplatDefinition.__jm_o.clear();
+      HitSplatDefinition.field385.clear();
       HitSplatDefinition.HitSplatDefinition_cachedFonts.clear();
    }
 
@@ -117,50 +114,50 @@ public class GrandExchangeEvents {
    )
    static int method75(int var0, Script var1, boolean var2) {
       Widget var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
-      if(var0 == 2600) {
+      if (var0 == ScriptOpcodes.IF_GETSCROLLX) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollX;
          return 1;
-      } else if(var0 == 2601) {
+      } else if (var0 == ScriptOpcodes.IF_GETSCROLLY) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollY;
          return 1;
-      } else if(var0 == 2602) {
+      } else if (var0 == ScriptOpcodes.IF_GETTEXT) {
          Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.text;
          return 1;
-      } else if(var0 == 2603) {
+      } else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollWidth;
          return 1;
-      } else if(var0 == 2604) {
+      } else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollHeight;
          return 1;
-      } else if(var0 == 2605) {
+      } else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelZoom;
          return 1;
-      } else if(var0 == 2606) {
+      } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelAngleX;
          return 1;
-      } else if(var0 == 2607) {
+      } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelAngleZ;
          return 1;
-      } else if(var0 == 2608) {
+      } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelAngleY;
          return 1;
-      } else if(var0 == 2609) {
+      } else if (var0 == ScriptOpcodes.IF_GETTRANS) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.transparency;
          return 1;
-      } else if(var0 == 2610) {
-         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.__af;
+      } else if (var0 == 2610) {
+         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.field960;
          return 1;
-      } else if(var0 == 2611) {
+      } else if (var0 == ScriptOpcodes.IF_GETCOLOUR) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.color;
          return 1;
-      } else if(var0 == 2612) {
+      } else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.color2;
          return 1;
-      } else if(var0 == 2613) {
+      } else if (var0 == 2613) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.rectangleMode.rsOrdinal();
          return 1;
-      } else if(var0 == 2614) {
-         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.__bv?1:0;
+      } else if (var0 == 2614) {
+         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0;
          return 1;
       } else {
          return 2;
@@ -173,8 +170,17 @@ public class GrandExchangeEvents {
       garbageValue = "-635606409"
    )
    static final void method74(int var0, int var1) {
-      if(GroundItemPile.loadWidgetGroup(var0)) {
-         class30.method570(Widget.widgets[var0], var1);
+      if (GroundItemPile.loadInterface(var0)) {
+         class30.method570(Widget.interfaceComponents[var0], var1);
       }
+
+   }
+
+   static {
+      geAgeComparator = new GrandExchangeOfferAgeComparator();
+      new GrandExchangeOfferWorldComparator();
+      geUnitPriceComparator = new GrandExchangeOfferUnitPriceComparator();
+      geItemNameComparator = new GrandExchangeOfferNameComparator();
+      geTotalQuantityComparator = new GrandExchangeOfferTotalQuantityComparator();
    }
 }
diff --git a/runescape-client/src/main/java/GrandExchangeOffer.java b/runescape-client/src/main/java/GrandExchangeOffer.java
index 07df2e51e1..89fec173ad 100644
--- a/runescape-client/src/main/java/GrandExchangeOffer.java
+++ b/runescape-client/src/main/java/GrandExchangeOffer.java
@@ -12,7 +12,7 @@ public class GrandExchangeOffer {
    @ObfuscatedGetter(
       intValue = -1286287981
    )
-   static int __x_rg;
+   static int field376;
    @ObfuscatedName("l")
    @ObfuscatedGetter(
       intValue = -812708185
@@ -62,7 +62,7 @@ public class GrandExchangeOffer {
    )
    public GrandExchangeOffer(Buffer var1, boolean var2) {
       this.state = var1.readByte();
-      this.id = var1.__ag_302();
+      this.id = var1.readUnsignedShort();
       this.unitPrice = var1.readInt();
       this.totalQuantity = var1.readInt();
       this.currentQuantity = var1.readInt();
@@ -86,7 +86,7 @@ public class GrandExchangeOffer {
    )
    @Export("type")
    public int type() {
-      return (this.state & 8) == 8?1:0;
+      return (this.state & 8) == 8 ? 1 : 0;
    }
 
    @ObfuscatedName("o")
@@ -94,7 +94,7 @@ public class GrandExchangeOffer {
       signature = "(II)V",
       garbageValue = "1339285061"
    )
-   void __o_9(int var1) {
+   void method121(int var1) {
       this.state &= -8;
       this.state = (byte)(this.state | var1 & 7);
    }
@@ -104,9 +104,9 @@ public class GrandExchangeOffer {
       signature = "(II)V",
       garbageValue = "743094900"
    )
-   void __u_10(int var1) {
+   void method122(int var1) {
       this.state &= -9;
-      if(var1 == 1) {
+      if (var1 == 1) {
          this.state = (byte)(this.state | 8);
       }
 
@@ -120,11 +120,11 @@ public class GrandExchangeOffer {
    static int method105(PacketBuffer var0) {
       int var1 = var0.readBits(2);
       int var2;
-      if(var1 == 0) {
+      if (var1 == 0) {
          var2 = 0;
-      } else if(var1 == 1) {
+      } else if (var1 == 1) {
          var2 = var0.readBits(5);
-      } else if(var1 == 2) {
+      } else if (var1 == 2) {
          var2 = var0.readBits(8);
       } else {
          var2 = var0.readBits(11);
@@ -139,14 +139,14 @@ public class GrandExchangeOffer {
       garbageValue = "50"
    )
    static int method101() {
-      if(Client.indexCacheLoaders != null && Client.indexCacheLoaderIndex < Client.indexCacheLoaders.size()) {
+      if (Client.archiveLoaders != null && Client.archiveLoaderArchive < Client.archiveLoaders.size()) {
          int var0 = 0;
 
-         for(int var1 = 0; var1 <= Client.indexCacheLoaderIndex; ++var1) {
-            var0 += ((IndexCacheLoader)Client.indexCacheLoaders.get(var1)).__w;
+         for (int var1 = 0; var1 <= Client.archiveLoaderArchive; ++var1) {
+            var0 += ((ArchiveLoader)Client.archiveLoaders.get(var1)).loadedCount;
          }
 
-         return var0 * 10000 / Client.__client_sx;
+         return var0 * 10000 / Client.field140;
       } else {
          return 10000;
       }
@@ -158,19 +158,19 @@ public class GrandExchangeOffer {
       garbageValue = "-304562381"
    )
    static final void method121() {
-      for(int var0 = 0; var0 < Players.Players_count; ++var0) {
+      for (int var0 = 0; var0 < Players.Players_count; ++var0) {
          Player var1 = Client.players[Players.Players_indices[var0]];
          var1.clearIsFriend();
       }
 
       Iterator var2 = Messages.Messages_hashTable.iterator();
 
-      while(var2.hasNext()) {
+      while (var2.hasNext()) {
          Message var3 = (Message)var2.next();
          var3.clearIsFromFriend();
       }
 
-      if(PacketWriter.clanChat != null) {
+      if (PacketWriter.clanChat != null) {
          PacketWriter.clanChat.clearFriends();
       }
 
diff --git a/runescape-client/src/main/java/class12.java b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java
similarity index 57%
rename from runescape-client/src/main/java/class12.java
rename to runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java
index f3808368eb..4d54ab3c6b 100644
--- a/runescape-client/src/main/java/class12.java
+++ b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java
@@ -1,23 +1,26 @@
 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("n")
-final class class12 implements Comparator {
+@Implements("GrandExchangeOfferAgeComparator")
+final class GrandExchangeOfferAgeComparator implements Comparator {
    @ObfuscatedName("n")
    @ObfuscatedSignature(
       signature = "Lho;"
    )
-   static Widget __n_n;
+   static Widget field1111;
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "(Ll;Ll;B)I",
       garbageValue = "-86"
    )
-   int method149(GrandExchangeEvent var1, GrandExchangeEvent var2) {
-      return var1.__f < var2.__f?-1:(var1.__f == var2.__f?0:1);
+   @Export("compareTyped")
+   int compareTyped(GrandExchangeEvent var1, GrandExchangeEvent var2) {
+      return var1.field370 < var2.field370 ? -1 : (var1.field370 == var2.field370 ? 0 : 1);
    }
 
    public boolean equals(Object var1) {
@@ -25,7 +28,7 @@ final class class12 implements Comparator {
    }
 
    public int compare(Object var1, Object var2) {
-      return this.method149((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
+      return this.compareTyped((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
    }
 
    @ObfuscatedName("m")
@@ -43,69 +46,69 @@ final class class12 implements Comparator {
       garbageValue = "1632289577"
    )
    static char method155(char var0, int var1) {
-      if(var0 >= 192 && var0 <= 255) {
-         if(var0 >= 192 && var0 <= 198) {
+      if (var0 >= 192 && var0 <= 255) {
+         if (var0 >= 192 && var0 <= 198) {
             return 'A';
          }
 
-         if(var0 == 199) {
+         if (var0 == 199) {
             return 'C';
          }
 
-         if(var0 >= 200 && var0 <= 203) {
+         if (var0 >= 200 && var0 <= 203) {
             return 'E';
          }
 
-         if(var0 >= 204 && var0 <= 207) {
+         if (var0 >= 204 && var0 <= 207) {
             return 'I';
          }
 
-         if(var0 >= 210 && var0 <= 214) {
+         if (var0 >= 210 && var0 <= 214) {
             return 'O';
          }
 
-         if(var0 >= 217 && var0 <= 220) {
+         if (var0 >= 217 && var0 <= 220) {
             return 'U';
          }
 
-         if(var0 == 221) {
+         if (var0 == 221) {
             return 'Y';
          }
 
-         if(var0 == 223) {
+         if (var0 == 223) {
             return 's';
          }
 
-         if(var0 >= 224 && var0 <= 230) {
+         if (var0 >= 224 && var0 <= 230) {
             return 'a';
          }
 
-         if(var0 == 231) {
+         if (var0 == 231) {
             return 'c';
          }
 
-         if(var0 >= 232 && var0 <= 235) {
+         if (var0 >= 232 && var0 <= 235) {
             return 'e';
          }
 
-         if(var0 >= 236 && var0 <= 239) {
+         if (var0 >= 236 && var0 <= 239) {
             return 'i';
          }
 
-         if(var0 >= 242 && var0 <= 246) {
+         if (var0 >= 242 && var0 <= 246) {
             return 'o';
          }
 
-         if(var0 >= 249 && var0 <= 252) {
+         if (var0 >= 249 && var0 <= 252) {
             return 'u';
          }
 
-         if(var0 == 253 || var0 == 255) {
+         if (var0 == 253 || var0 == 255) {
             return 'y';
          }
       }
 
-      return var0 == 338?'O':(var0 == 339?'o':(var0 == 376?'Y':var0));
+      return var0 == 338 ? 'O' : (var0 == 339 ? 'o' : (var0 == 376 ? 'Y' : var0));
    }
 
    @ObfuscatedName("e")
@@ -115,7 +118,7 @@ final class class12 implements Comparator {
    )
    static int method161(int var0) {
       Message var1 = (Message)Messages.Messages_hashTable.get((long)var0);
-      return var1 == null?-1:(var1.previousDual == Messages.Messages_queue.sentinel?-1:((Message)var1.previousDual).count);
+      return var1 == null ? -1 : (var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count);
    }
 
    @ObfuscatedName("ja")
@@ -124,25 +127,25 @@ final class class12 implements Comparator {
       garbageValue = "1731524026"
    )
    static void method159() {
-      for(WidgetGroupParent var0 = (WidgetGroupParent)Client.widgetGroupParents.first(); var0 != null; var0 = (WidgetGroupParent)Client.widgetGroupParents.next()) {
+      for (InterfaceParent var0 = (InterfaceParent)Client.interfaceParents.first(); var0 != null; var0 = (InterfaceParent)Client.interfaceParents.next()) {
          int var1 = var0.group;
-         if(GroundItemPile.loadWidgetGroup(var1)) {
+         if (GroundItemPile.loadInterface(var1)) {
             boolean var2 = true;
-            Widget[] var3 = Widget.widgets[var1];
+            Widget[] var3 = Widget.interfaceComponents[var1];
 
             int var4;
-            for(var4 = 0; var4 < var3.length; ++var4) {
-               if(var3[var4] != null) {
+            for (var4 = 0; var4 < var3.length; ++var4) {
+               if (var3[var4] != null) {
                   var2 = var3[var4].isIf3;
                   break;
                }
             }
 
-            if(!var2) {
+            if (!var2) {
                var4 = (int)var0.key;
                Widget var5 = Huffman.getWidget(var4);
-               if(var5 != null) {
-                  class22.method295(var5);
+               if (var5 != null) {
+                  WorldMapRectangle.method295(var5);
                }
             }
          }
@@ -156,8 +159,8 @@ final class class12 implements Comparator {
       garbageValue = "-7"
    )
    static final void method158() {
-      PacketBufferNode var0 = Interpreter.method1915(ClientPacket.__gs_cr, Client.packetWriter.isaacCipher);
+      PacketBufferNode var0 = Interpreter.method1915(ClientPacket.field300, Client.packetWriter.isaacCipher);
       var0.packetBuffer.writeByte(0);
-      Client.packetWriter.__q_167(var0);
+      Client.packetWriter.method241(var0);
    }
 }
diff --git a/runescape-client/src/main/java/class11.java b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java
similarity index 60%
rename from runescape-client/src/main/java/class11.java
rename to runescape-client/src/main/java/GrandExchangeOfferNameComparator.java
index 48df6ff7e3..41dae69c39 100644
--- a/runescape-client/src/main/java/class11.java
+++ b/runescape-client/src/main/java/GrandExchangeOfferNameComparator.java
@@ -1,11 +1,14 @@
 import java.util.Comparator;
 import net.runelite.mapping.Export;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
 @ObfuscatedName("k")
-final class class11 implements Comparator {
+@Implements("GrandExchangeOfferNameComparator")
+final class GrandExchangeOfferNameComparator implements Comparator {
    @ObfuscatedName("hl")
    @ObfuscatedGetter(
       intValue = -1945589829
@@ -18,8 +21,9 @@ final class class11 implements Comparator {
       signature = "(Ll;Ll;B)I",
       garbageValue = "1"
    )
-   int method138(GrandExchangeEvent var1, GrandExchangeEvent var2) {
-      return var1.__m_3().compareTo(var2.__m_3());
+   @Export("compareTyped")
+   int compareTyped(GrandExchangeEvent var1, GrandExchangeEvent var2) {
+      return var1.getOfferName().compareTo(var2.getOfferName());
    }
 
    public boolean equals(Object var1) {
@@ -27,7 +31,7 @@ final class class11 implements Comparator {
    }
 
    public int compare(Object var1, Object var2) {
-      return this.method138((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
+      return this.compareTyped((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
    }
 
    @ObfuscatedName("m")
@@ -50,17 +54,17 @@ final class class11 implements Comparator {
       var2.pathY[0] = var6 - GraphicsObject.baseY;
       var2.y = (var2.pathY[0] << 7) + (var2.transformedSize() << 6);
       SoundSystem.plane = var2.plane = var4;
-      if(Players.__cq_o[var1] != null) {
-         var2.read(Players.__cq_o[var1]);
+      if (Players.field733[var1] != null) {
+         var2.read(Players.field733[var1]);
       }
 
       Players.Players_count = 0;
       Players.Players_indices[++Players.Players_count - 1] = var1;
-      Players.__cq_q[var1] = 0;
-      Players.__cq_l = 0;
+      Players.field731[var1] = 0;
+      Players.field734 = 0;
 
-      for(int var7 = 1; var7 < 2048; ++var7) {
-         if(var1 != var7) {
+      for (int var7 = 1; var7 < 2048; ++var7) {
+         if (var1 != var7) {
             int var8 = var0.readBits(18);
             int var9 = var8 >> 16;
             int var10 = var8 >> 8 & 597;
@@ -68,8 +72,8 @@ final class class11 implements Comparator {
             Players.Players_regions[var7] = (var10 << 14) + var11 + (var9 << 28);
             Players.Players_orientations[var7] = 0;
             Players.Players_targetIndices[var7] = -1;
-            Players.__cq_e[++Players.__cq_l - 1] = var7;
-            Players.__cq_q[var7] = 0;
+            Players.field735[++Players.field734 - 1] = var7;
+            Players.field731[var7] = 0;
          }
       }
 
@@ -83,20 +87,19 @@ final class class11 implements Comparator {
    )
    static int method141(int var0, Script var1, boolean var2) {
       Widget var3;
-      if(var0 >= 2000) {
+      if (var0 >= 2000) {
          var0 -= 1000;
          var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
       } else {
-         var3 = var2?WorldMapIcon1.__t_i:class12.__n_n;
+         var3 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111;
       }
 
       String var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
       int[] var5 = null;
-      if(var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') {
+      if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') {
          int var6 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-         if(var6 > 0) {
-            for(var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]) {
-               ;
+         if (var6 > 0) {
+            for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]) {
             }
          }
 
@@ -106,8 +109,8 @@ final class class11 implements Comparator {
       Object[] var8 = new Object[var4.length() + 1];
 
       int var7;
-      for(var7 = var8.length - 1; var7 >= 1; --var7) {
-         if(var4.charAt(var7 - 1) == 's') {
+      for (var7 = var8.length - 1; var7 >= 1; --var7) {
+         if (var4.charAt(var7 - 1) == 's') {
             var8[var7] = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
          } else {
             var8[var7] = new Integer(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
@@ -115,73 +118,73 @@ final class class11 implements Comparator {
       }
 
       var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-      if(var7 != -1) {
+      if (var7 != -1) {
          var8[0] = new Integer(var7);
       } else {
          var8 = null;
       }
 
-      if(var0 == 1400) {
+      if (var0 == ScriptOpcodes.CC_SETONCLICK) {
          var3.onClick = var8;
-      } else if(var0 == 1401) {
+      } else if (var0 == ScriptOpcodes.CC_SETONHOLD) {
          var3.onHold = var8;
-      } else if(var0 == 1402) {
+      } else if (var0 == ScriptOpcodes.CC_SETONRELEASE) {
          var3.onRelease = var8;
-      } else if(var0 == 1403) {
+      } else if (var0 == ScriptOpcodes.CC_SETONMOUSEOVER) {
          var3.onMouseOver = var8;
-      } else if(var0 == 1404) {
+      } else if (var0 == ScriptOpcodes.CC_SETONMOUSELEAVE) {
          var3.onMouseLeave = var8;
-      } else if(var0 == 1405) {
+      } else if (var0 == ScriptOpcodes.CC_SETONDRAG) {
          var3.onDrag = var8;
-      } else if(var0 == 1406) {
+      } else if (var0 == ScriptOpcodes.CC_SETONTARGETLEAVE) {
          var3.onTargetLeave = var8;
-      } else if(var0 == 1407) {
+      } else if (var0 == ScriptOpcodes.CC_SETONVARTRANSMIT) {
          var3.onVarTransmit = var8;
          var3.varTransmitTriggers = var5;
-      } else if(var0 == 1408) {
+      } else if (var0 == ScriptOpcodes.CC_SETONTIMER) {
          var3.onTimer = var8;
-      } else if(var0 == 1409) {
+      } else if (var0 == ScriptOpcodes.CC_SETONOP) {
          var3.onOp = var8;
-      } else if(var0 == 1410) {
+      } else if (var0 == ScriptOpcodes.CC_SETONDRAGCOMPLETE) {
          var3.onDragComplete = var8;
-      } else if(var0 == 1411) {
+      } else if (var0 == ScriptOpcodes.CC_SETONCLICKREPEAT) {
          var3.onClickRepeat = var8;
-      } else if(var0 == 1412) {
+      } else if (var0 == ScriptOpcodes.CC_SETONMOUSEREPEAT) {
          var3.onMouseRepeat = var8;
-      } else if(var0 == 1414) {
+      } else if (var0 == ScriptOpcodes.CC_SETONINVTRANSMIT) {
          var3.onInvTransmit = var8;
          var3.invTransmitTriggers = var5;
-      } else if(var0 == 1415) {
+      } else if (var0 == ScriptOpcodes.CC_SETONSTATTRANSMIT) {
          var3.onStatTransmit = var8;
          var3.statTransmitTriggers = var5;
-      } else if(var0 == 1416) {
+      } else if (var0 == ScriptOpcodes.CC_SETONTARGETENTER) {
          var3.onTargetEnter = var8;
-      } else if(var0 == 1417) {
+      } else if (var0 == ScriptOpcodes.CC_SETONSCROLLWHEEL) {
          var3.onScroll = var8;
-      } else if(var0 == 1418) {
-         var3.__em = var8;
-      } else if(var0 == 1419) {
-         var3.onKeyListener = var8;
-      } else if(var0 == 1420) {
-         var3.__ex = var8;
-      } else if(var0 == 1421) {
-         var3.__ej = var8;
-      } else if(var0 == 1422) {
-         var3.__el = var8;
-      } else if(var0 == 1423) {
-         var3.onDialogAbortListener = var8;
-      } else if(var0 == 1424) {
-         var3.__ei = var8;
-      } else if(var0 == 1425) {
-         var3.__eq = var8;
-      } else if(var0 == 1426) {
-         var3.__eh = var8;
+      } else if (var0 == ScriptOpcodes.CC_SETONCHATTRANSMIT) {
+         var3.onChatTransmit = var8;
+      } else if (var0 == ScriptOpcodes.CC_SETONKEY) {
+         var3.onKey = var8;
+      } else if (var0 == ScriptOpcodes.CC_SETONFRIENDTRANSMIT) {
+         var3.onFriendTransmit = var8;
+      } else if (var0 == ScriptOpcodes.CC_SETONCLANTRANSMIT) {
+         var3.onClanTransmit = var8;
+      } else if (var0 == ScriptOpcodes.CC_SETONMISCTRANSMIT) {
+         var3.onMiscTransmit = var8;
+      } else if (var0 == ScriptOpcodes.CC_SETONDIALOGABORT) {
+         var3.onDialogAbort = var8;
+      } else if (var0 == ScriptOpcodes.CC_SETONSUBCHANGE) {
+         var3.onSubChange = var8;
+      } else if (var0 == ScriptOpcodes.CC_SETONSTOCKTRANSMIT) {
+         var3.onStockTransmit = var8;
+      } else if (var0 == 1426) {
+         var3.field977 = var8;
       } else {
-         if(var0 != 1427) {
+         if (var0 != ScriptOpcodes.CC_SETONRESIZE) {
             return 2;
          }
 
-         var3.__ee = var8;
+         var3.onResize = var8;
       }
 
       var3.hasListener = true;
@@ -195,31 +198,31 @@ final class class11 implements Comparator {
    )
    static int method146(int var0, Script var1, boolean var2) {
       Widget var3;
-      if(var0 == 2700) {
+      if (var0 == ScriptOpcodes.IF_GETINVOBJECT) {
          var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.itemId;
          return 1;
-      } else if(var0 == 2701) {
+      } else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) {
          var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
-         if(var3.itemId != -1) {
+         if (var3.itemId != -1) {
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.itemQuantity;
          } else {
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
          }
 
          return 1;
-      } else if(var0 == 2702) {
-         int var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-         WidgetGroupParent var4 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var5);
-         if(var4 != null) {
+      } else if (var0 == ScriptOpcodes.IF_HASSUB) {
+         int var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+         InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var4);
+         if (var5 != null) {
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1;
          } else {
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
          }
 
          return 1;
-      } else if(var0 == 2706) {
-         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.rootWidgetGroup;
+      } else if (var0 == ScriptOpcodes.IF_GETTOP) {
+         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.rootInterface;
          return 1;
       } else {
          return 2;
@@ -235,15 +238,15 @@ final class class11 implements Comparator {
       UserComparator6.clock.mark();
 
       int var0;
-      for(var0 = 0; var0 < 32; ++var0) {
-         GameShell.__ba_a[var0] = 0L;
+      for (var0 = 0; var0 < 32; ++var0) {
+         GameShell.field365[var0] = 0L;
       }
 
-      for(var0 = 0; var0 < 32; ++var0) {
-         GameShell.__ba_j[var0] = 0L;
+      for (var0 = 0; var0 < 32; ++var0) {
+         GameShell.field366[var0] = 0L;
       }
 
-      GameShell.__ba_l = 0;
+      GameShell.field362 = 0;
    }
 
    @ObfuscatedName("ih")
@@ -254,21 +257,21 @@ final class class11 implements Comparator {
    static final void method148(int var0, int var1, int var2, int var3, int var4) {
       class32.scrollBarSprites[0].drawAt(var0, var1);
       class32.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16);
-      Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.__client_hx);
+      Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field184);
       int var5 = var3 * (var3 - 32) / var4;
-      if(var5 < 8) {
+      if (var5 < 8) {
          var5 = 8;
       }
 
       int var6 = (var3 - 32 - var5) * var2 / (var4 - var3);
-      Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.__client_hn);
-      Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.__client_hg);
-      Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.__client_hg);
-      Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.__client_hg);
-      Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.__client_hg);
-      Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.__client_hr);
-      Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.__client_hr);
-      Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var5 + var6 + var1 + 15, 16, Client.__client_hr);
-      Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var6 + var5 + var1 + 14, 15, Client.__client_hr);
+      Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field185);
+      Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field187);
+      Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field187);
+      Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field187);
+      Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field187);
+      Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field186);
+      Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field186);
+      Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var5 + var6 + var1 + 15, 16, Client.field186);
+      Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var6 + var5 + var1 + 14, 15, Client.field186);
    }
 }
diff --git a/runescape-client/src/main/java/OwnWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java
similarity index 54%
rename from runescape-client/src/main/java/OwnWorldComparator.java
rename to runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java
index 0c81a18929..b7a541aaf0 100644
--- a/runescape-client/src/main/java/OwnWorldComparator.java
+++ b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java
@@ -3,45 +3,45 @@ 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("bj")
-@Implements("OwnWorldComparator")
-public class OwnWorldComparator implements Comparator {
+@Implements("GrandExchangeOfferOwnWorldComparator")
+public class GrandExchangeOfferOwnWorldComparator implements Comparator {
    @ObfuscatedName("m")
-   boolean __m;
+   @Export("compareOwnWorld")
+   boolean compareOwnWorld;
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "(Ll;Ll;B)I",
       garbageValue = "21"
    )
-   int __m_132(GrandExchangeEvent var1, GrandExchangeEvent var2) {
-      if(var2.world == var1.world) {
+   @Export("compareTyped")
+   int compareTyped(GrandExchangeEvent var1, GrandExchangeEvent var2) {
+      if (var2.world == var1.world) {
          return 0;
       } else {
-         if(this.__m) {
-            if(Client.worldId == var1.world) {
+         if (this.compareOwnWorld) {
+            if (Client.worldId == var1.world) {
                return -1;
             }
 
-            if(var2.world == Client.worldId) {
+            if (var2.world == Client.worldId) {
                return 1;
             }
          }
 
-         return var1.world < var2.world?-1:1;
+         return var1.world < var2.world ? -1 : 1;
       }
    }
 
-   @ObfuscatedName("equals")
-   public boolean __equals_134(Object var1) {
+   public boolean equals(Object var1) {
       return super.equals(var1);
    }
 
-   @Export("compare")
-   @ObfuscatedName("compare")
    public int compare(Object var1, Object var2) {
-      return this.__m_132((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
+      return this.compareTyped((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
    }
 
    @ObfuscatedName("al")
@@ -51,32 +51,32 @@ public class OwnWorldComparator implements Comparator {
    )
    static int method1285(int var0, Script var1, boolean var2) {
       int var3;
-      if(var0 == 5504) {
+      if (var0 == ScriptOpcodes.CAM_FORCEANGLE) {
          RouteStrategy.Interpreter_intStackSize -= 2;
          var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
          int var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-         if(!Client.isCameraLocked) {
-            Client.cameraPitchTarget = var3;
-            Client.minimapOrientation = var4;
+         if (!Client.isCameraLocked) {
+            Client.camAngleX = var3;
+            Client.camAngleY = var4;
          }
 
          return 1;
-      } else if(var0 == 5505) {
-         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.cameraPitchTarget;
+      } else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) {
+         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.camAngleX;
          return 1;
-      } else if(var0 == 5506) {
-         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.minimapOrientation;
+      } else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) {
+         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.camAngleY;
          return 1;
-      } else if(var0 == 5530) {
+      } else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) {
          var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-         if(var3 < 0) {
+         if (var3 < 0) {
             var3 = 0;
          }
 
-         Client.cameraFollowHeight = var3;
+         Client.camFollowHeight = var3;
          return 1;
-      } else if(var0 == 5531) {
-         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.cameraFollowHeight;
+      } else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) {
+         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.camFollowHeight;
          return 1;
       } else {
          return 2;
diff --git a/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java
new file mode 100644
index 0000000000..4b32d87fec
--- /dev/null
+++ b/runescape-client/src/main/java/GrandExchangeOfferTotalQuantityComparator.java
@@ -0,0 +1,207 @@
+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("e")
+@Implements("GrandExchangeOfferTotalQuantityComparator")
+final class GrandExchangeOfferTotalQuantityComparator implements Comparator {
+   @ObfuscatedName("m")
+   @ObfuscatedSignature(
+      signature = "(Ll;Ll;I)I",
+      garbageValue = "-573736433"
+   )
+   @Export("compareTyped")
+   int compareTyped(GrandExchangeEvent var1, GrandExchangeEvent var2) {
+      return var1.grandExchangeOffer.totalQuantity < var2.grandExchangeOffer.totalQuantity ? -1 : (var2.grandExchangeOffer.totalQuantity == var1.grandExchangeOffer.totalQuantity ? 0 : 1);
+   }
+
+   public int compare(Object var1, Object var2) {
+      return this.compareTyped((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
+   }
+
+   public boolean equals(Object var1) {
+      return super.equals(var1);
+   }
+
+   @ObfuscatedName("o")
+   @ObfuscatedSignature(
+      signature = "(Lgr;IIIIIIB)V",
+      garbageValue = "46"
+   )
+   @Export("loadTerrain")
+   static final void loadTerrain(Buffer buffer, int plane, int x, int y, int x0, int y0, int var6) {
+      int var7;
+      if (x >= 0 && x < 104 && y >= 0 && y < 104) {
+         Tiles.Tiles_renderFlags[plane][x][y] = 0;
+
+         while (true) {
+            var7 = buffer.readUnsignedByte();
+            if (var7 == 0) {
+               if (plane == 0) {
+                  int[] var12 = Tiles.Tiles_heights[0][x];
+                  int var9 = x + x0 + 932731;
+                  int var10 = y + y0 + 556238;
+                  int var11 = Script.method2204(var9 + 45365, var10 + 91923, 4) - 128 + (Script.method2204(10294 + var9, 37821 + var10, 2) - 128 >> 1) + (Script.method2204(var9, var10, 1) - 128 >> 2);
+                  var11 = (int)((double)var11 * 0.3D) + 35;
+                  if (var11 < 10) {
+                     var11 = 10;
+                  } else if (var11 > 60) {
+                     var11 = 60;
+                  }
+
+                  var12[y] = -var11 * 8;
+               } else {
+                  Tiles.Tiles_heights[plane][x][y] = Tiles.Tiles_heights[plane - 1][x][y] - 240;
+               }
+               break;
+            }
+
+            if (var7 == 1) {
+               int var8 = buffer.readUnsignedByte();
+               if (var8 == 1) {
+                  var8 = 0;
+               }
+
+               if (plane == 0) {
+                  Tiles.Tiles_heights[0][x][y] = -var8 * 8;
+               } else {
+                  Tiles.Tiles_heights[plane][x][y] = Tiles.Tiles_heights[plane - 1][x][y] - var8 * 8;
+               }
+               break;
+            }
+
+            if (var7 <= 49) {
+               Fonts.field350[plane][x][y] = buffer.readByte();
+               class32.field1157[plane][x][y] = (byte)((var7 - 2) / 4);
+               class307.field1155[plane][x][y] = (byte)(var7 - 2 + var6 & 3);
+            } else if (var7 <= 81) {
+               Tiles.Tiles_renderFlags[plane][x][y] = (byte)(var7 - 49);
+            } else {
+               Tiles.field908[plane][x][y] = (byte)(var7 - 81);
+            }
+         }
+      } else {
+         while (true) {
+            var7 = buffer.readUnsignedByte();
+            if (var7 == 0) {
+               break;
+            }
+
+            if (var7 == 1) {
+               buffer.readUnsignedByte();
+               break;
+            }
+
+            if (var7 <= 49) {
+               buffer.readUnsignedByte();
+            }
+         }
+      }
+
+   }
+
+   @ObfuscatedName("an")
+   @ObfuscatedSignature(
+      signature = "(ILhu;ZI)V",
+      garbageValue = "466862614"
+   )
+   static void method96(int var0, Coord var1, boolean var2) {
+      WorldMapArea var3 = BufferedFile.worldMap().getMapArea(var0);
+      int var4 = Canvas.localPlayer.plane;
+      int var5 = (Canvas.localPlayer.x >> 7) + class50.baseX;
+      int var6 = (Canvas.localPlayer.y >> 7) + GraphicsObject.baseY;
+      Coord var7 = new Coord(var4, var5, var6);
+      BufferedFile.worldMap().method367(var3, var7, var1, var2);
+   }
+
+   @ObfuscatedName("ik")
+   @ObfuscatedSignature(
+      signature = "(Lbr;IIII)V",
+      garbageValue = "835715563"
+   )
+   @Export("addPlayerToMenu")
+   static final void addPlayerToMenu(Player player, int menuArg0, int menuArg1, int menuArg2) {
+      if (Canvas.localPlayer != player && Client.menuOptionsCount < 400) {
+         String var4;
+         int var5;
+         if (player.skillLevel == 0) {
+            String var6 = player.actions[0] + player.username + player.actions[1];
+            var5 = player.combatLevel;
+            int var7 = Canvas.localPlayer.combatLevel;
+            int var8 = var7 - var5;
+            String var9;
+            if (var8 < -9) {
+               var9 = BufferedFile.colorStartTag(16711680);
+            } else if (var8 < -6) {
+               var9 = BufferedFile.colorStartTag(16723968);
+            } else if (var8 < -3) {
+               var9 = BufferedFile.colorStartTag(16740352);
+            } else if (var8 < 0) {
+               var9 = BufferedFile.colorStartTag(16756736);
+            } else if (var8 > 9) {
+               var9 = BufferedFile.colorStartTag(65280);
+            } else if (var8 > 6) {
+               var9 = BufferedFile.colorStartTag(4259584);
+            } else if (var8 > 3) {
+               var9 = BufferedFile.colorStartTag(8453888);
+            } else if (var8 > 0) {
+               var9 = BufferedFile.colorStartTag(12648192);
+            } else {
+               var9 = BufferedFile.colorStartTag(16776960);
+            }
+
+            var4 = var6 + var9 + "  (level-" + player.combatLevel + ")" + player.actions[2];
+         } else {
+            var4 = player.actions[0] + player.username + player.actions[1] + "  (skill-" + player.skillLevel + ")" + player.actions[2];
+         }
+
+         int var10;
+         if (Client.isItemSelected == 1) {
+            Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " -> " + BufferedFile.colorStartTag(16777215) + var4, 14, menuArg0, menuArg1, menuArg2);
+         } else if (Client.isSpellSelected) {
+            if ((FloorDecoration.selectedSpellFlags & 8) == 8) {
+               Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + BufferedFile.colorStartTag(16777215) + var4, 15, menuArg0, menuArg1, menuArg2);
+            }
+         } else {
+            for (var10 = 7; var10 >= 0; --var10) {
+               if (Client.playerMenuActions[var10] != null) {
+                  short var11 = 0;
+                  if (Client.playerMenuActions[var10].equalsIgnoreCase("Attack")) {
+                     if (AttackOption.AttackOption_hidden == Client.playerAttackOption) {
+                        continue;
+                     }
+
+                     if (AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || AttackOption.AttackOption_dependsOnCombatLevels == Client.playerAttackOption && player.combatLevel > Canvas.localPlayer.combatLevel) {
+                        var11 = 2000;
+                     }
+
+                     if (Canvas.localPlayer.team != 0 && player.team != 0) {
+                        if (player.team == Canvas.localPlayer.team) {
+                           var11 = 2000;
+                        } else {
+                           var11 = 0;
+                        }
+                     }
+                  } else if (Client.playerOptionsPriorities[var10]) {
+                     var11 = 2000;
+                  }
+
+                  boolean var12 = false;
+                  var5 = Client.playerMenuOpcodes[var10] + var11;
+                  Tiles.insertMenuItemNoShift(Client.playerMenuActions[var10], BufferedFile.colorStartTag(16777215) + var4, var5, menuArg0, menuArg1, menuArg2);
+               }
+            }
+         }
+
+         for (var10 = 0; var10 < Client.menuOptionsCount; ++var10) {
+            if (Client.menuOpcodes[var10] == 23) {
+               Client.menuTargetNames[var10] = BufferedFile.colorStartTag(16777215) + var4;
+               break;
+            }
+         }
+      }
+
+   }
+}
diff --git a/runescape-client/src/main/java/UnitPriceComparator.java b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java
similarity index 60%
rename from runescape-client/src/main/java/UnitPriceComparator.java
rename to runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java
index 57e4706f23..96ea411df2 100644
--- a/runescape-client/src/main/java/UnitPriceComparator.java
+++ b/runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java
@@ -5,8 +5,8 @@ import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("d")
-@Implements("UnitPriceComparator")
-final class UnitPriceComparator implements Comparator {
+@Implements("GrandExchangeOfferUnitPriceComparator")
+final class GrandExchangeOfferUnitPriceComparator implements Comparator {
    @ObfuscatedName("gz")
    @ObfuscatedSignature(
       signature = "Lln;"
@@ -25,18 +25,16 @@ final class UnitPriceComparator implements Comparator {
       signature = "(Ll;Ll;I)I",
       garbageValue = "-120071238"
    )
-   int __m_11(GrandExchangeEvent var1, GrandExchangeEvent var2) {
-      return var1.grandExchangeOffer.unitPrice < var2.grandExchangeOffer.unitPrice?-1:(var2.grandExchangeOffer.unitPrice == var1.grandExchangeOffer.unitPrice?0:1);
+   @Export("compareTyped")
+   int compareTyped(GrandExchangeEvent var1, GrandExchangeEvent var2) {
+      return var1.grandExchangeOffer.unitPrice < var2.grandExchangeOffer.unitPrice ? -1 : (var2.grandExchangeOffer.unitPrice == var1.grandExchangeOffer.unitPrice ? 0 : 1);
    }
 
-   @Export("compare")
-   @ObfuscatedName("compare")
    public int compare(Object var1, Object var2) {
-      return this.__m_11((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
+      return this.compareTyped((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
    }
 
-   @ObfuscatedName("equals")
-   public boolean __equals_13(Object var1) {
+   public boolean equals(Object var1) {
       return super.equals(var1);
    }
 
@@ -45,8 +43,9 @@ final class UnitPriceComparator implements Comparator {
       signature = "(Lir;B)V",
       garbageValue = "23"
    )
-   public static void method135(AbstractIndexCache var0) {
-      VarbitDefinition.VarbitDefinition_indexCache = var0;
+   @Export("setVarbitDefinitionArchive")
+   public static void setVarbitDefinitionArchive(AbstractArchive var0) {
+      VarbitDefinition.VarbitDefinition_archive = var0;
    }
 
    @ObfuscatedName("m")
@@ -69,14 +68,14 @@ final class UnitPriceComparator implements Comparator {
       garbageValue = "2032203362"
    )
    static final int method131() {
-      if(ReflectionCheck.clientPreferences.roofsHidden) {
+      if (ReflectionCheck.clientPreferences.roofsHidden) {
          return SoundSystem.plane;
       } else {
          int var0 = 3;
-         if(WorldMapIcon1.cameraPitch < 310) {
+         if (WorldMapIcon1.cameraPitch < 310) {
             int var1;
             int var2;
-            if(Client.oculusOrbState == 1) {
+            if (Client.oculusOrbState == 1) {
                var1 = MouseHandler.oculusOrbFocalPointX >> 7;
                var2 = ScriptEvent.oculusOrbFocalPointY >> 7;
             } else {
@@ -84,29 +83,29 @@ final class UnitPriceComparator implements Comparator {
                var2 = Canvas.localPlayer.y >> 7;
             }
 
-            int var3 = WorldMapSection1.cameraX >> 7;
-            int var4 = class11.cameraZ >> 7;
-            if(var3 < 0 || var4 < 0 || var3 >= 104 || var4 >= 104) {
+            int var3 = WorldMapSection2.cameraX >> 7;
+            int var4 = GrandExchangeOfferNameComparator.cameraZ >> 7;
+            if (var3 < 0 || var4 < 0 || var3 >= 104 || var4 >= 104) {
                return SoundSystem.plane;
             }
 
-            if(var1 < 0 || var2 < 0 || var1 >= 104 || var2 >= 104) {
+            if (var1 < 0 || var2 < 0 || var1 >= 104 || var2 >= 104) {
                return SoundSystem.plane;
             }
 
-            if((Tiles.Tiles_renderFlags[SoundSystem.plane][var3][var4] & 4) != 0) {
+            if ((Tiles.Tiles_renderFlags[SoundSystem.plane][var3][var4] & 4) != 0) {
                var0 = SoundSystem.plane;
             }
 
             int var5;
-            if(var1 > var3) {
+            if (var1 > var3) {
                var5 = var1 - var3;
             } else {
                var5 = var3 - var1;
             }
 
             int var6;
-            if(var2 > var4) {
+            if (var2 > var4) {
                var6 = var2 - var4;
             } else {
                var6 = var4 - var2;
@@ -114,60 +113,60 @@ final class UnitPriceComparator implements Comparator {
 
             int var7;
             int var8;
-            if(var5 > var6) {
+            if (var5 > var6) {
                var7 = var6 * 65536 / var5;
                var8 = 32768;
 
-               while(var3 != var1) {
-                  if(var3 < var1) {
+               while (var3 != var1) {
+                  if (var3 < var1) {
                      ++var3;
-                  } else if(var3 > var1) {
+                  } else if (var3 > var1) {
                      --var3;
                   }
 
-                  if((Tiles.Tiles_renderFlags[SoundSystem.plane][var3][var4] & 4) != 0) {
+                  if ((Tiles.Tiles_renderFlags[SoundSystem.plane][var3][var4] & 4) != 0) {
                      var0 = SoundSystem.plane;
                   }
 
                   var8 += var7;
-                  if(var8 >= 65536) {
+                  if (var8 >= 65536) {
                      var8 -= 65536;
-                     if(var4 < var2) {
+                     if (var4 < var2) {
                         ++var4;
-                     } else if(var4 > var2) {
+                     } else if (var4 > var2) {
                         --var4;
                      }
 
-                     if((Tiles.Tiles_renderFlags[SoundSystem.plane][var3][var4] & 4) != 0) {
+                     if ((Tiles.Tiles_renderFlags[SoundSystem.plane][var3][var4] & 4) != 0) {
                         var0 = SoundSystem.plane;
                      }
                   }
                }
-            } else if(var6 > 0) {
+            } else if (var6 > 0) {
                var7 = var5 * 65536 / var6;
                var8 = 32768;
 
-               while(var4 != var2) {
-                  if(var4 < var2) {
+               while (var4 != var2) {
+                  if (var4 < var2) {
                      ++var4;
-                  } else if(var4 > var2) {
+                  } else if (var4 > var2) {
                      --var4;
                   }
 
-                  if((Tiles.Tiles_renderFlags[SoundSystem.plane][var3][var4] & 4) != 0) {
+                  if ((Tiles.Tiles_renderFlags[SoundSystem.plane][var3][var4] & 4) != 0) {
                      var0 = SoundSystem.plane;
                   }
 
                   var8 += var7;
-                  if(var8 >= 65536) {
+                  if (var8 >= 65536) {
                      var8 -= 65536;
-                     if(var3 < var1) {
+                     if (var3 < var1) {
                         ++var3;
-                     } else if(var3 > var1) {
+                     } else if (var3 > var1) {
                         --var3;
                      }
 
-                     if((Tiles.Tiles_renderFlags[SoundSystem.plane][var3][var4] & 4) != 0) {
+                     if ((Tiles.Tiles_renderFlags[SoundSystem.plane][var3][var4] & 4) != 0) {
                         var0 = SoundSystem.plane;
                      }
                   }
@@ -175,8 +174,8 @@ final class UnitPriceComparator implements Comparator {
             }
          }
 
-         if(Canvas.localPlayer.x >= 0 && Canvas.localPlayer.y >= 0 && Canvas.localPlayer.x < 13312 && Canvas.localPlayer.y < 13312) {
-            if((Tiles.Tiles_renderFlags[SoundSystem.plane][Canvas.localPlayer.x >> 7][Canvas.localPlayer.y >> 7] & 4) != 0) {
+         if (Canvas.localPlayer.x >= 0 && Canvas.localPlayer.y >= 0 && Canvas.localPlayer.x < 13312 && Canvas.localPlayer.y < 13312) {
+            if ((Tiles.Tiles_renderFlags[SoundSystem.plane][Canvas.localPlayer.x >> 7][Canvas.localPlayer.y >> 7] & 4) != 0) {
                var0 = SoundSystem.plane;
             }
 
@@ -193,12 +192,12 @@ final class UnitPriceComparator implements Comparator {
       garbageValue = "-239357025"
    )
    static final void method136(int var0, int var1) {
-      if(Client.hintArrowType == 2) {
+      if (Client.hintArrowType == 2) {
          WorldMapLabel.worldToScreen((Client.hintArrowX - class50.baseX << 7) + Client.hintArrowSubX, (Client.hintArrowY - GraphicsObject.baseY << 7) + Client.hintArrowSubY, Client.hintArrowHeight * 2);
-         if(Client.viewportTempX > -1 && Client.cycle % 20 < 10) {
+         if (Client.viewportTempX > -1 && Client.cycle % 20 < 10) {
             Player.headIconHintSprites[0].drawAt2(var0 + Client.viewportTempX - 12, Client.viewportTempY + var1 - 28);
          }
-
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/WorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java
similarity index 54%
rename from runescape-client/src/main/java/WorldComparator.java
rename to runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java
index 1f284bc1a2..a34c468e81 100644
--- a/runescape-client/src/main/java/WorldComparator.java
+++ b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java
@@ -3,30 +3,29 @@ 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("u")
-@Implements("WorldComparator")
-final class WorldComparator implements Comparator {
+@Implements("GrandExchangeOfferWorldComparator")
+final class GrandExchangeOfferWorldComparator implements Comparator {
    @ObfuscatedName("n")
-   public static boolean __u_n;
+   public static boolean field988;
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "(Ll;Ll;I)I",
       garbageValue = "707844889"
    )
-   int __m_0(GrandExchangeEvent var1, GrandExchangeEvent var2) {
-      return var1.world < var2.world?-1:(var2.world == var1.world?0:1);
+   @Export("compareTyped")
+   int compareTyped(GrandExchangeEvent var1, GrandExchangeEvent var2) {
+      return var1.world < var2.world ? -1 : (var2.world == var1.world ? 0 : 1);
    }
 
-   @Export("compare")
-   @ObfuscatedName("compare")
    public int compare(Object var1, Object var2) {
-      return this.__m_0((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
+      return this.compareTyped((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
    }
 
-   @ObfuscatedName("equals")
-   public boolean __equals_2(Object var1) {
+   public boolean equals(Object var1) {
       return super.equals(var1);
    }
 
@@ -45,14 +44,14 @@ final class WorldComparator implements Comparator {
       garbageValue = "108"
    )
    static int method68(int var0, Script var1, boolean var2) {
-      if(var0 == 3200) {
+      if (var0 == ScriptOpcodes.SOUND_SYNTH) {
          RouteStrategy.Interpreter_intStackSize -= 3;
          Ignored.queueSoundEffect(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize], Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2]);
          return 1;
-      } else if(var0 == 3201) {
+      } else if (var0 == ScriptOpcodes.SOUND_SONG) {
          AbstractUserComparator.method5437(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
          return 1;
-      } else if(var0 == 3202) {
+      } else if (var0 == ScriptOpcodes.SOUND_JINGLE) {
          RouteStrategy.Interpreter_intStackSize -= 2;
          HealthBar.method1994(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize], Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]);
          return 1;
@@ -67,13 +66,13 @@ final class WorldComparator implements Comparator {
       garbageValue = "96"
    )
    static final void method67(PacketBuffer var0) {
-      for(int var1 = 0; var1 < Client.__client_fw; ++var1) {
-         int var2 = Client.__client_fg[var1];
-         Npc var3 = Client.npcs[var2];
+      for (int var1 = 0; var1 < Client.field173; ++var1) {
+         int var2 = Client.field174[var1];
+         NPC var3 = Client.npcs[var2];
          int var4 = var0.readUnsignedByte();
-         if((var4 & 1) != 0) {
-            var3.targetIndex = var0.__by_324();
-            if(var3.targetIndex == 65535) {
+         if ((var4 & 1) != 0) {
+            var3.targetIndex = var0.method65();
+            if (var3.targetIndex == 65535) {
                var3.targetIndex = -1;
             }
          }
@@ -82,94 +81,94 @@ final class WorldComparator implements Comparator {
          int var6;
          int var7;
          int var8;
-         if((var4 & 64) != 0) {
-            var5 = var0.__bm_326();
-            var6 = var0.__bm_326();
+         if ((var4 & 64) != 0) {
+            var5 = var0.method67();
+            var6 = var0.method67();
             var7 = var3.x - (var5 - class50.baseX - class50.baseX) * 64;
             var8 = var3.y - (var6 - GraphicsObject.baseY - GraphicsObject.baseY) * 64;
-            if(var7 != 0 || var8 != 0) {
-               var3.__bc = (int)(Math.atan2((double)var7, (double)var8) * 325.949D) & 2047;
+            if (var7 != 0 || var8 != 0) {
+               var3.field12 = (int)(Math.atan2((double)var7, (double)var8) * 325.949D) & 2047;
             }
          }
 
-         if((var4 & 32) != 0) {
-            var5 = var0.__ag_302();
-            if(var5 == 65535) {
+         if ((var4 & 32) != 0) {
+            var5 = var0.readUnsignedShort();
+            if (var5 == 65535) {
                var5 = -1;
             }
 
-            var6 = var0.__bq_318();
-            if(var5 == var3.sequence && var5 != -1) {
-               var7 = WorldMapAreaData.getSequenceDefinition(var5).__t;
-               if(var7 == 1) {
+            var6 = var0.method59();
+            if (var5 == var3.sequence && var5 != -1) {
+               var7 = WorldMapAreaData.getSequenceDefinition(var5).field783;
+               if (var7 == 1) {
                   var3.sequenceFrame = 0;
                   var3.sequenceFrameCycle = 0;
                   var3.sequenceDelay = var6;
-                  var3.__bj = 0;
+                  var3.field13 = 0;
                }
 
-               if(var7 == 2) {
-                  var3.__bj = 0;
+               if (var7 == 2) {
+                  var3.field13 = 0;
                }
-            } else if(var5 == -1 || var3.sequence == -1 || WorldMapAreaData.getSequenceDefinition(var5).__n >= WorldMapAreaData.getSequenceDefinition(var3.sequence).__n) {
+            } else if (var5 == -1 || var3.sequence == -1 || WorldMapAreaData.getSequenceDefinition(var5).field779 >= WorldMapAreaData.getSequenceDefinition(var3.sequence).field779) {
                var3.sequence = var5;
                var3.sequenceFrame = 0;
                var3.sequenceFrameCycle = 0;
                var3.sequenceDelay = var6;
-               var3.__bj = 0;
-               var3.__ch = var3.pathLength;
+               var3.field13 = 0;
+               var3.field25 = var3.pathLength;
             }
          }
 
-         if((var4 & 4) != 0) {
-            var3.definition = ObjectDefinition.getNpcDefinition(var0.__ag_302());
+         if ((var4 & 4) != 0) {
+            var3.definition = ObjectDefinition.getNpcDefinition(var0.readUnsignedShort());
             var3.size = var3.definition.size;
-            var3.__cj = var3.definition.__av;
+            var3.field23 = var3.definition.field639;
             var3.walkSequence = var3.definition.walkSequence;
-            var3.walkTurnSequence = var3.definition.walkTurnSequence;
-            var3.walkTurnLeftSequence = var3.definition.walkTurnLeftSequence;
-            var3.walkTurnRightSequence = var3.definition.walkTurnRightSequence;
-            var3.idleSequence = var3.definition.idleSequence;
+            var3.walkBackSequence = var3.definition.walkBackSequence;
+            var3.walkLeftSequence = var3.definition.walkLeftSequence;
+            var3.walkRightSequence = var3.definition.walkRightSequence;
+            var3.readySequence = var3.definition.readySequence;
             var3.turnLeftSequence = var3.definition.turnLeftSequence;
             var3.turnRightSequence = var3.definition.turnRightSequence;
          }
 
-         if((var4 & 16) != 0) {
+         if ((var4 & 16) != 0) {
             var5 = var0.readUnsignedByteNegate();
             int var9;
             int var10;
             int var11;
-            if(var5 > 0) {
-               for(var6 = 0; var6 < var5; ++var6) {
+            if (var5 > 0) {
+               for (var6 = 0; var6 < var5; ++var6) {
                   var8 = -1;
                   var9 = -1;
                   var10 = -1;
-                  var7 = var0.__ae_307();
-                  if(var7 == 32767) {
-                     var7 = var0.__ae_307();
-                     var9 = var0.__ae_307();
-                     var8 = var0.__ae_307();
-                     var10 = var0.__ae_307();
-                  } else if(var7 != 32766) {
-                     var9 = var0.__ae_307();
+                  var7 = var0.readUShortSmart();
+                  if (var7 == 32767) {
+                     var7 = var0.readUShortSmart();
+                     var9 = var0.readUShortSmart();
+                     var8 = var0.readUShortSmart();
+                     var10 = var0.readUShortSmart();
+                  } else if (var7 != 32766) {
+                     var9 = var0.readUShortSmart();
                   } else {
                      var7 = -1;
                   }
 
-                  var11 = var0.__ae_307();
+                  var11 = var0.readUShortSmart();
                   var3.addHitSplat(var7, var9, var8, var10, Client.cycle, var11);
                }
             }
 
-            var6 = var0.__bb_317();
-            if(var6 > 0) {
-               for(var7 = 0; var7 < var6; ++var7) {
-                  var8 = var0.__ae_307();
-                  var9 = var0.__ae_307();
-                  if(var9 != 32767) {
-                     var10 = var0.__ae_307();
+            var6 = var0.method58();
+            if (var6 > 0) {
+               for (var7 = 0; var7 < var6; ++var7) {
+                  var8 = var0.readUShortSmart();
+                  var9 = var0.readUShortSmart();
+                  if (var9 != 32767) {
+                     var10 = var0.readUShortSmart();
                      var11 = var0.readUnsignedByte();
-                     int var12 = var9 > 0?var0.__bq_318():var11;
+                     int var12 = var9 > 0 ? var0.method59() : var11;
                      var3.addHealthBar(var8, Client.cycle, var9, var10, var11, var12);
                   } else {
                      var3.removeHealthBar(var8);
@@ -178,23 +177,23 @@ final class WorldComparator implements Comparator {
             }
          }
 
-         if((var4 & 8) != 0) {
-            var3.spotAnimation = var0.__by_324();
-            var5 = var0.__bp_331();
+         if ((var4 & 8) != 0) {
+            var3.spotAnimation = var0.method65();
+            var5 = var0.method72();
             var3.heightOffset = var5 >> 16;
-            var3.__bt = (var5 & 65535) + Client.cycle;
+            var3.field14 = (var5 & 65535) + Client.cycle;
             var3.spotAnimationFrame = 0;
             var3.spotAnimationFrameCycle = 0;
-            if(var3.__bt > Client.cycle) {
+            if (var3.field14 > Client.cycle) {
                var3.spotAnimationFrame = -1;
             }
 
-            if(var3.spotAnimation == 65535) {
+            if (var3.spotAnimation == 65535) {
                var3.spotAnimation = -1;
             }
          }
 
-         if((var4 & 2) != 0) {
+         if ((var4 & 2) != 0) {
             var3.overheadText = var0.readStringCp1252NullTerminated();
             var3.overheadTextCyclesRemaining = 100;
          }
diff --git a/runescape-client/src/main/java/SpriteIds.java b/runescape-client/src/main/java/GraphicsDefaults.java
similarity index 66%
rename from runescape-client/src/main/java/SpriteIds.java
rename to runescape-client/src/main/java/GraphicsDefaults.java
index e0db3df86e..bc393f6317 100644
--- a/runescape-client/src/main/java/SpriteIds.java
+++ b/runescape-client/src/main/java/GraphicsDefaults.java
@@ -5,18 +5,18 @@ import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("lg")
-@Implements("SpriteIds")
-public class SpriteIds {
+@Implements("GraphicsDefaults")
+public class GraphicsDefaults {
    @ObfuscatedName("m")
    @ObfuscatedGetter(
       intValue = 1673796151
    )
-   public int __m;
+   public int field878;
    @ObfuscatedName("f")
    @ObfuscatedGetter(
       intValue = 159591367
    )
-   public int __f;
+   public int field879;
    @ObfuscatedName("q")
    @ObfuscatedGetter(
       intValue = -104203005
@@ -72,9 +72,9 @@ public class SpriteIds {
    @Export("modIcons")
    public int modIcons;
 
-   public SpriteIds() {
-      this.__m = -1;
-      this.__f = -1;
+   public GraphicsDefaults() {
+      this.field878 = -1;
+      this.field879 = -1;
       this.mapScenes = -1;
       this.headIconsPk = -1;
       this.headIconsPrayer = -1;
@@ -91,14 +91,14 @@ public class SpriteIds {
       signature = "(Lir;I)V",
       garbageValue = "1764356022"
    )
-   @Export("read")
-   public void read(AbstractIndexCache var1) {
-      byte[] var2 = var1.takeRecordFlat(class311.field3810.field3809);
+   @Export("decode")
+   public void decode(AbstractArchive index) {
+      byte[] var2 = index.takeFileFlat(DefaultsGroup.DefaultsGroup_graphics.group);
       Buffer var3 = new Buffer(var2);
 
-      while(true) {
+      while (true) {
          int var4 = var3.readUnsignedByte();
-         if(var4 == 0) {
+         if (var4 == 0) {
             return;
          }
 
@@ -107,17 +107,17 @@ public class SpriteIds {
             var3.readMedium();
             break;
          case 2:
-            this.__m = var3.__ap_310();
-            this.__f = var3.__ap_310();
-            this.mapScenes = var3.__ap_310();
-            this.headIconsPk = var3.__ap_310();
-            this.headIconsPrayer = var3.__ap_310();
-            this.headIconsHint = var3.__ap_310();
-            this.mapMarkers = var3.__ap_310();
-            this.crosses = var3.__ap_310();
-            this.mapDots = var3.__ap_310();
-            this.scrollBars = var3.__ap_310();
-            this.modIcons = var3.__ap_310();
+            this.field878 = var3.method51();
+            this.field879 = var3.method51();
+            this.mapScenes = var3.method51();
+            this.headIconsPk = var3.method51();
+            this.headIconsPrayer = var3.method51();
+            this.headIconsHint = var3.method51();
+            this.mapMarkers = var3.method51();
+            this.crosses = var3.method51();
+            this.mapDots = var3.method51();
+            this.scrollBars = var3.method51();
+            this.modIcons = var3.method51();
          }
       }
    }
@@ -127,26 +127,26 @@ public class SpriteIds {
       signature = "(Lir;Lir;III)Lkk;",
       garbageValue = "195396240"
    )
-   public static Font method5823(AbstractIndexCache var0, AbstractIndexCache var1, int var2, int var3) {
-      if(!SpriteMask.loadSprite(var0, var2, var3)) {
+   public static Font method5823(AbstractArchive var0, AbstractArchive var1, int var2, int var3) {
+      if (!SpriteMask.loadSprite(var0, var2, var3)) {
          return null;
       } else {
-         byte[] var5 = var1.takeRecord(var2, var3);
-         Font var4;
-         if(var5 == null) {
-            var4 = null;
+         byte[] var4 = var1.takeFile(var2, var3);
+         Font var5;
+         if (var4 == null) {
+            var5 = null;
          } else {
-            Font var6 = new Font(var5, class328.indexedSpriteOffsetXs, class328.indexedSpriteOffsetYs, VarbitDefinition.indexedSpriteWidths, SecureRandomCallable.indexedSpriteHeights, class328.indexedSpritePalette, class328.spritePixels);
+            Font var6 = new Font(var4, class328.indexedSpriteOffsetXs, class328.indexedSpriteOffsetYs, VarbitDefinition.indexedSpriteWidths, SecureRandomCallable.indexedSpriteHeights, class328.indexedSpritePalette, class328.spritePixels);
             class328.indexedSpriteOffsetXs = null;
             class328.indexedSpriteOffsetYs = null;
             VarbitDefinition.indexedSpriteWidths = null;
             SecureRandomCallable.indexedSpriteHeights = null;
             class328.indexedSpritePalette = null;
-            class328.spritePixels = null;
-            var4 = var6;
+            class328.spritePixels = ((byte[][])null);
+            var5 = var6;
          }
 
-         return var4;
+         return var5;
       }
    }
 
@@ -156,12 +156,12 @@ public class SpriteIds {
       garbageValue = "58"
    )
    static final void method5828(Actor var0) {
-      int var1 = var0.__bw - Client.cycle;
-      int var2 = var0.__bf * 128 + var0.size * 64;
-      int var3 = var0.__be * 128 + var0.size * 64;
+      int var1 = var0.field19 - Client.cycle;
+      int var2 = var0.field15 * 128 + var0.size * 64;
+      int var3 = var0.field17 * 128 + var0.size * 64;
       var0.x += (var2 - var0.x) / var1;
       var0.y += (var3 - var0.y) / var1;
-      var0.__cq = 0;
-      var0.orientation = var0.__cv;
+      var0.field24 = 0;
+      var0.orientation = var0.field21;
    }
 }
diff --git a/runescape-client/src/main/java/GraphicsObject.java b/runescape-client/src/main/java/GraphicsObject.java
index e717317aa6..3e7fdda8f4 100644
--- a/runescape-client/src/main/java/GraphicsObject.java
+++ b/runescape-client/src/main/java/GraphicsObject.java
@@ -11,7 +11,7 @@ public final class GraphicsObject extends Entity {
    @ObfuscatedGetter(
       intValue = -1807262579
    )
-   static int __bw_d;
+   static int field377;
    @ObfuscatedName("k")
    @ObfuscatedSignature(
       signature = "Llq;"
@@ -93,7 +93,7 @@ public final class GraphicsObject extends Entity {
       this.height = var5;
       this.cycleStart = var7 + var6;
       int var8 = class50.getSpotAnimationDefinition(this.id).sequence;
-      if(var8 != -1) {
+      if (var8 != -1) {
          this.isFinished = false;
          this.sequenceDefinition = WorldMapAreaData.getSequenceDefinition(var8);
       } else {
@@ -108,20 +108,20 @@ public final class GraphicsObject extends Entity {
       garbageValue = "-730240149"
    )
    @Export("advance")
-   final void advance(int var1) {
-      if(!this.isFinished) {
-         this.frameCycle += var1;
+   final void advance(int cycles) {
+      if (!this.isFinished) {
+         this.frameCycle += cycles;
 
-         while(this.frameCycle > this.sequenceDefinition.frameLengths[this.frame]) {
+         while (this.frameCycle > this.sequenceDefinition.frameLengths[this.frame]) {
             this.frameCycle -= this.sequenceDefinition.frameLengths[this.frame];
             ++this.frame;
-            if(this.frame >= this.sequenceDefinition.frameIds.length) {
+            if (this.frame >= this.sequenceDefinition.frameIds.length) {
                this.isFinished = true;
                break;
             }
          }
-
       }
+
    }
 
    @ObfuscatedName("e")
@@ -133,13 +133,13 @@ public final class GraphicsObject extends Entity {
    protected final Model getModel() {
       SpotAnimationDefinition var1 = class50.getSpotAnimationDefinition(this.id);
       Model var2;
-      if(!this.isFinished) {
+      if (!this.isFinished) {
          var2 = var1.getModel(this.frame);
       } else {
          var2 = var1.getModel(-1);
       }
 
-      return var2 == null?null:var2;
+      return var2 == null ? null : var2;
    }
 
    @ObfuscatedName("x")
diff --git a/runescape-client/src/main/java/GroundItem.java b/runescape-client/src/main/java/GroundItem.java
index 515facdfdb..a54b76c5bd 100644
--- a/runescape-client/src/main/java/GroundItem.java
+++ b/runescape-client/src/main/java/GroundItem.java
@@ -47,21 +47,22 @@ public final class GroundItem extends Entity {
       signature = "(II)V",
       garbageValue = "411352848"
    )
-   static void method2095(int var0) {
-      Client.__client_oa = 0L;
-      if(var0 >= 2) {
+   @Export("setWindowedMode")
+   static void setWindowedMode(int var0) {
+      Client.field99 = 0L;
+      if (var0 >= 2) {
          Client.isResizable = true;
       } else {
          Client.isResizable = false;
       }
 
-      if(SpotAnimationDefinition.method4822() == 1) {
+      if (SpotAnimationDefinition.getWindowedMode() == 1) {
          TextureProvider.client.setMaxCanvasSize(765, 503);
       } else {
          TextureProvider.client.setMaxCanvasSize(7680, 2160);
       }
 
-      if(Client.gameState >= 25) {
+      if (Client.gameState >= 25) {
          AbstractByteArrayCopier.method4024();
       }
 
diff --git a/runescape-client/src/main/java/GroundItemPile.java b/runescape-client/src/main/java/GroundItemPile.java
index 4b9c5708bd..46e1dfe9fe 100644
--- a/runescape-client/src/main/java/GroundItemPile.java
+++ b/runescape-client/src/main/java/GroundItemPile.java
@@ -67,38 +67,38 @@ public final class GroundItemPile {
       signature = "(IB)Z",
       garbageValue = "-60"
    )
-   @Export("loadWidgetGroup")
-   public static boolean loadWidgetGroup(int var0) {
-      if(Widget.loadedWidgetGroups[var0]) {
+   @Export("loadInterface")
+   public static boolean loadInterface(int itf) {
+      if (Widget.loadedInterfaces[itf]) {
          return true;
-      } else if(!Widget.Widget_indexCache.tryLoadArchive(var0)) {
+      } else if (!Widget.Widget_archive.tryLoadGroup(itf)) {
          return false;
       } else {
-         int var1 = Widget.Widget_indexCache.__s_396(var0);
-         if(var1 == 0) {
-            Widget.loadedWidgetGroups[var0] = true;
+         int var1 = Widget.Widget_archive.getGroupFileCount(itf);
+         if (var1 == 0) {
+            Widget.loadedInterfaces[itf] = true;
             return true;
          } else {
-            if(Widget.widgets[var0] == null) {
-               Widget.widgets[var0] = new Widget[var1];
+            if (Widget.interfaceComponents[itf] == null) {
+               Widget.interfaceComponents[itf] = new Widget[var1];
             }
 
-            for(int var2 = 0; var2 < var1; ++var2) {
-               if(Widget.widgets[var0][var2] == null) {
-                  byte[] var3 = Widget.Widget_indexCache.takeRecord(var0, var2);
-                  if(var3 != null) {
-                     Widget.widgets[var0][var2] = new Widget();
-                     Widget.widgets[var0][var2].id = var2 + (var0 << 16);
-                     if(var3[0] == -1) {
-                        Widget.widgets[var0][var2].decode(new Buffer(var3));
+            for (int var2 = 0; var2 < var1; ++var2) {
+               if (Widget.interfaceComponents[itf][var2] == null) {
+                  byte[] var3 = Widget.Widget_archive.takeFile(itf, var2);
+                  if (var3 != null) {
+                     Widget.interfaceComponents[itf][var2] = new Widget();
+                     Widget.interfaceComponents[itf][var2].id = var2 + (itf << 16);
+                     if (var3[0] == -1) {
+                        Widget.interfaceComponents[itf][var2].decode(new Buffer(var3));
                      } else {
-                        Widget.widgets[var0][var2].decodeLegacy(new Buffer(var3));
+                        Widget.interfaceComponents[itf][var2].decodeLegacy(new Buffer(var3));
                      }
                   }
                }
             }
 
-            Widget.loadedWidgetGroups[var0] = true;
+            Widget.loadedInterfaces[itf] = true;
             return true;
          }
       }
diff --git a/runescape-client/src/main/java/GzipDecompressor.java b/runescape-client/src/main/java/GzipDecompressor.java
index 26ba4cbf74..2907038b9f 100644
--- a/runescape-client/src/main/java/GzipDecompressor.java
+++ b/runescape-client/src/main/java/GzipDecompressor.java
@@ -8,7 +8,7 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("GzipDecompressor")
 public class GzipDecompressor {
    @ObfuscatedName("ck")
-   public static char __go_ck;
+   public static char field378;
    @ObfuscatedName("m")
    @Export("inflater")
    Inflater inflater;
@@ -31,8 +31,8 @@ public class GzipDecompressor {
    )
    @Export("decompress")
    public void decompress(Buffer var1, byte[] var2) {
-      if(var1.array[var1.index] == 31 && var1.array[var1.index + 1] == -117) {
-         if(this.inflater == null) {
+      if (var1.array[var1.index] == 31 && var1.array[var1.index + 1] == -117) {
+         if (this.inflater == null) {
             this.inflater = new Inflater(true);
          }
 
@@ -55,19 +55,20 @@ public class GzipDecompressor {
       signature = "(II)Ljq;",
       garbageValue = "-1060388349"
    )
-   public static StructDefinition method3702(int var0) {
-      StructDefinition var1 = (StructDefinition)StructDefinition.__jq_f.get((long)var0);
-      if(var1 != null) {
+   @Export("getStructDefinition")
+   public static StructDefinition getStructDefinition(int var0) {
+      StructDefinition var1 = (StructDefinition)StructDefinition.StructDefinition_cached.get((long)var0);
+      if (var1 != null) {
          return var1;
       } else {
-         byte[] var2 = StructDefinition.__jq_m.takeRecord(34, var0);
+         byte[] var2 = StructDefinition.StructDefinition_archive.takeFile(34, var0);
          var1 = new StructDefinition();
-         if(var2 != null) {
-            var1.read(new Buffer(var2));
+         if (var2 != null) {
+            var1.decode(new Buffer(var2));
          }
 
-         var1.init();
-         StructDefinition.__jq_f.put(var1, (long)var0);
+         var1.postDecode();
+         StructDefinition.StructDefinition_cached.put(var1, (long)var0);
          return var1;
       }
    }
diff --git a/runescape-client/src/main/java/HealthBar.java b/runescape-client/src/main/java/HealthBar.java
index 5e59f095ee..d0b0d00a2c 100644
--- a/runescape-client/src/main/java/HealthBar.java
+++ b/runescape-client/src/main/java/HealthBar.java
@@ -37,30 +37,29 @@ public class HealthBar extends Node {
       HealthBarUpdate var5 = null;
       int var6 = 0;
 
-      for(HealthBarUpdate var7 = (HealthBarUpdate)this.updates.last(); var7 != null; var7 = (HealthBarUpdate)this.updates.previous()) {
+      for (HealthBarUpdate var7 = (HealthBarUpdate)this.updates.last(); var7 != null; var7 = (HealthBarUpdate)this.updates.previous()) {
          ++var6;
-         if(var7.cycle == var1) {
+         if (var7.cycle == var1) {
             var7.set(var1, var2, var3, var4);
             return;
          }
 
-         if(var7.cycle <= var1) {
+         if (var7.cycle <= var1) {
             var5 = var7;
          }
       }
 
-      if(var5 == null) {
-         if(var6 < 4) {
+      if (var5 == null) {
+         if (var6 < 4) {
             this.updates.addLast(new HealthBarUpdate(var1, var2, var3, var4));
          }
-
       } else {
          IterableNodeDeque.IterableNodeDeque_addBefore(new HealthBarUpdate(var1, var2, var3, var4), var5);
-         if(var6 >= 4) {
+         if (var6 >= 4) {
             this.updates.last().remove();
          }
-
       }
+
    }
 
    @ObfuscatedName("f")
@@ -69,15 +68,15 @@ public class HealthBar extends Node {
       garbageValue = "1594721795"
    )
    @Export("get")
-   HealthBarUpdate get(int var1) {
+   HealthBarUpdate get(int cycle) {
       HealthBarUpdate var2 = (HealthBarUpdate)this.updates.last();
-      if(var2 != null && var2.cycle <= var1) {
-         for(HealthBarUpdate var3 = (HealthBarUpdate)this.updates.previous(); var3 != null && var3.cycle <= var1; var3 = (HealthBarUpdate)this.updates.previous()) {
+      if (var2 != null && var2.cycle <= cycle) {
+         for (HealthBarUpdate var3 = (HealthBarUpdate)this.updates.previous(); var3 != null && var3.cycle <= cycle; var3 = (HealthBarUpdate)this.updates.previous()) {
             var2.remove();
             var2 = var3;
          }
 
-         if(this.definition.int5 + var2.cycleOffset + var2.cycle > var1) {
+         if (this.definition.int5 + var2.cycleOffset + var2.cycle > cycle) {
             return var2;
          } else {
             var2.remove();
@@ -106,61 +105,61 @@ public class HealthBar extends Node {
    @Export("charToByteCp1252")
    public static byte charToByteCp1252(char var0) {
       byte var1;
-      if(var0 > 0 && var0 < 128 || var0 >= 160 && var0 <= 255) {
+      if (var0 > 0 && var0 < 128 || var0 >= 160 && var0 <= 255) {
          var1 = (byte)var0;
-      } else if(var0 == 8364) {
+      } else if (var0 == 8364) {
          var1 = -128;
-      } else if(var0 == 8218) {
+      } else if (var0 == 8218) {
          var1 = -126;
-      } else if(var0 == 402) {
+      } else if (var0 == 402) {
          var1 = -125;
-      } else if(var0 == 8222) {
+      } else if (var0 == 8222) {
          var1 = -124;
-      } else if(var0 == 8230) {
+      } else if (var0 == 8230) {
          var1 = -123;
-      } else if(var0 == 8224) {
+      } else if (var0 == 8224) {
          var1 = -122;
-      } else if(var0 == 8225) {
+      } else if (var0 == 8225) {
          var1 = -121;
-      } else if(var0 == 710) {
+      } else if (var0 == 710) {
          var1 = -120;
-      } else if(var0 == 8240) {
+      } else if (var0 == 8240) {
          var1 = -119;
-      } else if(var0 == 352) {
+      } else if (var0 == 352) {
          var1 = -118;
-      } else if(var0 == 8249) {
+      } else if (var0 == 8249) {
          var1 = -117;
-      } else if(var0 == 338) {
+      } else if (var0 == 338) {
          var1 = -116;
-      } else if(var0 == 381) {
+      } else if (var0 == 381) {
          var1 = -114;
-      } else if(var0 == 8216) {
+      } else if (var0 == 8216) {
          var1 = -111;
-      } else if(var0 == 8217) {
+      } else if (var0 == 8217) {
          var1 = -110;
-      } else if(var0 == 8220) {
+      } else if (var0 == 8220) {
          var1 = -109;
-      } else if(var0 == 8221) {
+      } else if (var0 == 8221) {
          var1 = -108;
-      } else if(var0 == 8226) {
+      } else if (var0 == 8226) {
          var1 = -107;
-      } else if(var0 == 8211) {
+      } else if (var0 == 8211) {
          var1 = -106;
-      } else if(var0 == 8212) {
+      } else if (var0 == 8212) {
          var1 = -105;
-      } else if(var0 == 732) {
+      } else if (var0 == 732) {
          var1 = -104;
-      } else if(var0 == 8482) {
+      } else if (var0 == 8482) {
          var1 = -103;
-      } else if(var0 == 353) {
+      } else if (var0 == 353) {
          var1 = -102;
-      } else if(var0 == 8250) {
+      } else if (var0 == 8250) {
          var1 = -101;
-      } else if(var0 == 339) {
+      } else if (var0 == 339) {
          var1 = -100;
-      } else if(var0 == 382) {
+      } else if (var0 == 382) {
          var1 = -98;
-      } else if(var0 == 376) {
+      } else if (var0 == 376) {
          var1 = -97;
       } else {
          var1 = 63;
@@ -175,9 +174,9 @@ public class HealthBar extends Node {
       garbageValue = "-1326999134"
    )
    static void method1994(int var0, int var1) {
-      if(Client.__client_qf != 0 && var0 != -1) {
-         Login.method2076(Login.indexCache11, var0, 0, Client.__client_qf, false);
-         Client.__client_qq = true;
+      if (Client.field128 != 0 && var0 != -1) {
+         Login.method2076(Login.archive11, var0, 0, Client.field128, false);
+         Client.field107 = true;
       }
 
    }
diff --git a/runescape-client/src/main/java/HealthBarDefinition.java b/runescape-client/src/main/java/HealthBarDefinition.java
index b147b45c00..67f7ab1206 100644
--- a/runescape-client/src/main/java/HealthBarDefinition.java
+++ b/runescape-client/src/main/java/HealthBarDefinition.java
@@ -11,12 +11,12 @@ public class HealthBarDefinition extends DualNode {
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   public static AbstractIndexCache __ii_m;
+   public static AbstractArchive field379;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   public static AbstractIndexCache __ii_f;
+   public static AbstractArchive field380;
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Ler;"
@@ -39,7 +39,7 @@ public class HealthBarDefinition extends DualNode {
    @ObfuscatedGetter(
       intValue = 1515955705
    )
-   public int __o;
+   public int field381;
    @ObfuscatedName("l")
    @ObfuscatedGetter(
       intValue = 390656615
@@ -95,11 +95,6 @@ public class HealthBarDefinition extends DualNode {
    @Export("widthPadding")
    public int widthPadding;
 
-   static {
-      HealthBarDefinition_cached = new EvictingDualNodeHashTable(64);
-      HealthBarDefinition_cachedSprites = new EvictingDualNodeHashTable(64);
-   }
-
    public HealthBarDefinition() {
       this.int1 = 255;
       this.int2 = 255;
@@ -117,15 +112,15 @@ public class HealthBarDefinition extends DualNode {
       signature = "(Lgr;I)V",
       garbageValue = "280763431"
    )
-   @Export("read")
-   public void read(Buffer var1) {
-      while(true) {
+   @Export("decode")
+   public void decode(Buffer var1) {
+      while (true) {
          int var2 = var1.readUnsignedByte();
-         if(var2 == 0) {
+         if (var2 == 0) {
             return;
          }
 
-         this.readNext(var1, var2);
+         this.decodeNext(var1, var2);
       }
    }
 
@@ -134,29 +129,29 @@ public class HealthBarDefinition extends DualNode {
       signature = "(Lgr;IB)V",
       garbageValue = "10"
    )
-   @Export("readNext")
-   void readNext(Buffer var1, int var2) {
-      if(var2 == 1) {
-         var1.__ag_302();
-      } else if(var2 == 2) {
+   @Export("decodeNext")
+   void decodeNext(Buffer var1, int var2) {
+      if (var2 == 1) {
+         var1.readUnsignedShort();
+      } else if (var2 == 2) {
          this.int1 = var1.readUnsignedByte();
-      } else if(var2 == 3) {
+      } else if (var2 == 3) {
          this.int2 = var1.readUnsignedByte();
-      } else if(var2 == 4) {
+      } else if (var2 == 4) {
          this.int3 = 0;
-      } else if(var2 == 5) {
-         this.int5 = var1.__ag_302();
-      } else if(var2 == 6) {
+      } else if (var2 == 5) {
+         this.int5 = var1.readUnsignedShort();
+      } else if (var2 == 6) {
          var1.readUnsignedByte();
-      } else if(var2 == 7) {
-         this.spriteId1 = var1.__ap_310();
-      } else if(var2 == 8) {
-         this.spriteId2 = var1.__ap_310();
-      } else if(var2 == 11) {
-         this.int3 = var1.__ag_302();
-      } else if(var2 == 14) {
+      } else if (var2 == 7) {
+         this.spriteId1 = var1.method51();
+      } else if (var2 == 8) {
+         this.spriteId2 = var1.method51();
+      } else if (var2 == 11) {
+         this.int3 = var1.readUnsignedShort();
+      } else if (var2 == 14) {
          this.width = var1.readUnsignedByte();
-      } else if(var2 == 15) {
+      } else if (var2 == 15) {
          this.widthPadding = var1.readUnsignedByte();
       }
 
@@ -169,15 +164,15 @@ public class HealthBarDefinition extends DualNode {
    )
    @Export("getSprite1")
    public Sprite getSprite1() {
-      if(this.spriteId1 < 0) {
+      if (this.spriteId1 < 0) {
          return null;
       } else {
          Sprite var1 = (Sprite)HealthBarDefinition_cachedSprites.get((long)this.spriteId1);
-         if(var1 != null) {
+         if (var1 != null) {
             return var1;
          } else {
-            var1 = class322.readSprite(__ii_f, this.spriteId1, 0);
-            if(var1 != null) {
+            var1 = class322.readSprite(field380, this.spriteId1, 0);
+            if (var1 != null) {
                HealthBarDefinition_cachedSprites.put(var1, (long)this.spriteId1);
             }
 
@@ -193,15 +188,15 @@ public class HealthBarDefinition extends DualNode {
    )
    @Export("getSprite2")
    public Sprite getSprite2() {
-      if(this.spriteId2 < 0) {
+      if (this.spriteId2 < 0) {
          return null;
       } else {
          Sprite var1 = (Sprite)HealthBarDefinition_cachedSprites.get((long)this.spriteId2);
-         if(var1 != null) {
+         if (var1 != null) {
             return var1;
          } else {
-            var1 = class322.readSprite(__ii_f, this.spriteId2, 0);
-            if(var1 != null) {
+            var1 = class322.readSprite(field380, this.spriteId2, 0);
+            if (var1 != null) {
                HealthBarDefinition_cachedSprites.put(var1, (long)this.spriteId2);
             }
 
@@ -209,4 +204,9 @@ public class HealthBarDefinition extends DualNode {
          }
       }
    }
+
+   static {
+      HealthBarDefinition_cached = new EvictingDualNodeHashTable(64);
+      HealthBarDefinition_cachedSprites = new EvictingDualNodeHashTable(64);
+   }
 }
diff --git a/runescape-client/src/main/java/HealthBarUpdate.java b/runescape-client/src/main/java/HealthBarUpdate.java
index 4970ba4bd4..0cab72dbf6 100644
--- a/runescape-client/src/main/java/HealthBarUpdate.java
+++ b/runescape-client/src/main/java/HealthBarUpdate.java
@@ -61,34 +61,34 @@ public class HealthBarUpdate extends Node {
       garbageValue = "342552136"
    )
    public static String method1722(CharSequence var0) {
-      long var3 = 0L;
-      int var5 = var0.length();
+      long var1 = 0L;
+      int var3 = var0.length();
 
-      for(int var6 = 0; var6 < var5; ++var6) {
-         var3 *= 37L;
-         char var7 = var0.charAt(var6);
-         if(var7 >= 'A' && var7 <= 'Z') {
-            var3 += (long)(var7 + 1 - 65);
-         } else if(var7 >= 'a' && var7 <= 'z') {
-            var3 += (long)(var7 + 1 - 97);
-         } else if(var7 >= '0' && var7 <= '9') {
-            var3 += (long)(var7 + 27 - 48);
+      for (int var4 = 0; var4 < var3; ++var4) {
+         var1 *= 37L;
+         char var5 = var0.charAt(var4);
+         if (var5 >= 'A' && var5 <= 'Z') {
+            var1 += (long)(var5 + 1 - 65);
+         } else if (var5 >= 'a' && var5 <= 'z') {
+            var1 += (long)(var5 + 1 - 97);
+         } else if (var5 >= '0' && var5 <= '9') {
+            var1 += (long)(var5 + 27 - 48);
          }
 
-         if(var3 >= 177917621779460413L) {
+         if (var1 >= 177917621779460413L) {
             break;
          }
       }
 
-      while(0L == var3 % 37L && var3 != 0L) {
-         var3 /= 37L;
+      while (0L == var1 % 37L && var1 != 0L) {
+         var1 /= 37L;
       }
 
-      String var8 = Clock.method3534(var3);
-      if(var8 == null) {
-         var8 = "";
+      String var6 = Clock.method3534(var1);
+      if (var6 == null) {
+         var6 = "";
       }
 
-      return var8;
+      return var6;
    }
 }
diff --git a/runescape-client/src/main/java/HitSplatDefinition.java b/runescape-client/src/main/java/HitSplatDefinition.java
index 961a1c899c..07ae476724 100644
--- a/runescape-client/src/main/java/HitSplatDefinition.java
+++ b/runescape-client/src/main/java/HitSplatDefinition.java
@@ -11,17 +11,17 @@ public class HitSplatDefinition extends DualNode {
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   static AbstractIndexCache __jm_m;
+   static AbstractArchive field382;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   static AbstractIndexCache __jm_f;
+   static AbstractArchive field383;
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   static AbstractIndexCache __jm_q;
+   static AbstractArchive field384;
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "Ler;"
@@ -32,7 +32,7 @@ public class HitSplatDefinition extends DualNode {
    @ObfuscatedSignature(
       signature = "Ler;"
    )
-   static EvictingDualNodeHashTable __jm_o;
+   static EvictingDualNodeHashTable field385;
    @ObfuscatedName("u")
    @ObfuscatedSignature(
       signature = "Ler;"
@@ -49,59 +49,59 @@ public class HitSplatDefinition extends DualNode {
    @ObfuscatedGetter(
       intValue = -1151968735
    )
-   public int __n;
+   public int field386;
    @ObfuscatedName("i")
    @ObfuscatedGetter(
       intValue = -102270561
    )
-   public int __i;
+   public int field387;
    @ObfuscatedName("a")
    @ObfuscatedGetter(
       intValue = -1533306389
    )
-   int __a;
+   int field388;
    @ObfuscatedName("z")
    @ObfuscatedGetter(
       intValue = -1677628889
    )
-   int __z;
+   int field389;
    @ObfuscatedName("j")
    @ObfuscatedGetter(
       intValue = 1683792491
    )
-   int __j;
+   int field390;
    @ObfuscatedName("s")
    @ObfuscatedGetter(
       intValue = 1845590719
    )
-   int __s;
+   int field391;
    @ObfuscatedName("t")
    @ObfuscatedGetter(
       intValue = -389283589
    )
-   public int __t;
+   public int field392;
    @ObfuscatedName("y")
    @ObfuscatedGetter(
       intValue = 1751286975
    )
-   public int __y;
+   public int field393;
    @ObfuscatedName("h")
    @ObfuscatedGetter(
       intValue = 199815415
    )
-   public int __h;
+   public int field394;
    @ObfuscatedName("b")
-   String __b;
+   String field395;
    @ObfuscatedName("c")
    @ObfuscatedGetter(
       intValue = 1003116765
    )
-   public int __c;
+   public int field396;
    @ObfuscatedName("r")
    @ObfuscatedGetter(
       intValue = 1498880475
    )
-   public int __r;
+   public int field397;
    @ObfuscatedName("p")
    @Export("transforms")
    public int[] transforms;
@@ -118,26 +118,20 @@ public class HitSplatDefinition extends DualNode {
    @Export("transformVarp")
    int transformVarp;
 
-   static {
-      HitSplatDefinition_cached = new EvictingDualNodeHashTable(64);
-      __jm_o = new EvictingDualNodeHashTable(64);
-      HitSplatDefinition_cachedFonts = new EvictingDualNodeHashTable(20);
-   }
-
    HitSplatDefinition() {
       this.fontId = -1;
-      this.__n = 16777215;
-      this.__i = 70;
-      this.__a = -1;
-      this.__z = -1;
-      this.__j = -1;
-      this.__s = -1;
-      this.__t = 0;
-      this.__y = 0;
-      this.__h = -1;
-      this.__b = "";
-      this.__c = -1;
-      this.__r = 0;
+      this.field386 = 16777215;
+      this.field387 = 70;
+      this.field388 = -1;
+      this.field389 = -1;
+      this.field390 = -1;
+      this.field391 = -1;
+      this.field392 = 0;
+      this.field393 = 0;
+      this.field394 = -1;
+      this.field395 = "";
+      this.field396 = -1;
+      this.field397 = 0;
       this.transformVarbit = -1;
       this.transformVarp = -1;
    }
@@ -147,15 +141,15 @@ public class HitSplatDefinition extends DualNode {
       signature = "(Lgr;I)V",
       garbageValue = "1963348982"
    )
-   @Export("read")
-   void read(Buffer var1) {
-      while(true) {
+   @Export("decode")
+   void decode(Buffer var1) {
+      while (true) {
          int var2 = var1.readUnsignedByte();
-         if(var2 == 0) {
+         if (var2 == 0) {
             return;
          }
 
-         this.readNext(var1, var2);
+         this.decodeNext(var1, var2);
       }
    }
 
@@ -164,51 +158,51 @@ public class HitSplatDefinition extends DualNode {
       signature = "(Lgr;II)V",
       garbageValue = "1789835753"
    )
-   @Export("readNext")
-   void readNext(Buffer var1, int var2) {
-      if(var2 == 1) {
-         this.fontId = var1.__ap_310();
-      } else if(var2 == 2) {
-         this.__n = var1.readMedium();
-      } else if(var2 == 3) {
-         this.__a = var1.__ap_310();
-      } else if(var2 == 4) {
-         this.__j = var1.__ap_310();
-      } else if(var2 == 5) {
-         this.__z = var1.__ap_310();
-      } else if(var2 == 6) {
-         this.__s = var1.__ap_310();
-      } else if(var2 == 7) {
-         this.__t = var1.__aq_303();
-      } else if(var2 == 8) {
-         this.__b = var1.readStringCp1252NullCircumfixed();
-      } else if(var2 == 9) {
-         this.__i = var1.__ag_302();
-      } else if(var2 == 10) {
-         this.__y = var1.__aq_303();
-      } else if(var2 == 11) {
-         this.__h = 0;
-      } else if(var2 == 12) {
-         this.__c = var1.readUnsignedByte();
-      } else if(var2 == 13) {
-         this.__r = var1.__aq_303();
-      } else if(var2 == 14) {
-         this.__h = var1.__ag_302();
-      } else if(var2 == 17 || var2 == 18) {
-         this.transformVarbit = var1.__ag_302();
-         if(this.transformVarbit == 65535) {
+   @Export("decodeNext")
+   void decodeNext(Buffer var1, int var2) {
+      if (var2 == 1) {
+         this.fontId = var1.method51();
+      } else if (var2 == 2) {
+         this.field386 = var1.readMedium();
+      } else if (var2 == 3) {
+         this.field388 = var1.method51();
+      } else if (var2 == 4) {
+         this.field390 = var1.method51();
+      } else if (var2 == 5) {
+         this.field389 = var1.method51();
+      } else if (var2 == 6) {
+         this.field391 = var1.method51();
+      } else if (var2 == 7) {
+         this.field392 = var1.readShort();
+      } else if (var2 == 8) {
+         this.field395 = var1.readStringCp1252NullCircumfixed();
+      } else if (var2 == 9) {
+         this.field387 = var1.readUnsignedShort();
+      } else if (var2 == 10) {
+         this.field393 = var1.readShort();
+      } else if (var2 == 11) {
+         this.field394 = 0;
+      } else if (var2 == 12) {
+         this.field396 = var1.readUnsignedByte();
+      } else if (var2 == 13) {
+         this.field397 = var1.readShort();
+      } else if (var2 == 14) {
+         this.field394 = var1.readUnsignedShort();
+      } else if (var2 == 17 || var2 == 18) {
+         this.transformVarbit = var1.readUnsignedShort();
+         if (this.transformVarbit == 65535) {
             this.transformVarbit = -1;
          }
 
-         this.transformVarp = var1.__ag_302();
-         if(this.transformVarp == 65535) {
+         this.transformVarp = var1.readUnsignedShort();
+         if (this.transformVarp == 65535) {
             this.transformVarp = -1;
          }
 
          int var3 = -1;
-         if(var2 == 18) {
-            var3 = var1.__ag_302();
-            if(var3 == 65535) {
+         if (var2 == 18) {
+            var3 = var1.readUnsignedShort();
+            if (var3 == 65535) {
                var3 = -1;
             }
          }
@@ -216,9 +210,9 @@ public class HitSplatDefinition extends DualNode {
          int var4 = var1.readUnsignedByte();
          this.transforms = new int[var4 + 2];
 
-         for(int var5 = 0; var5 <= var4; ++var5) {
-            this.transforms[var5] = var1.__ag_302();
-            if(this.transforms[var5] == 65535) {
+         for (int var5 = 0; var5 <= var4; ++var5) {
+            this.transforms[var5] = var1.readUnsignedShort();
+            if (this.transforms[var5] == 65535) {
                this.transforms[var5] = -1;
             }
          }
@@ -236,20 +230,20 @@ public class HitSplatDefinition extends DualNode {
    @Export("transform")
    public final HitSplatDefinition transform() {
       int var1 = -1;
-      if(this.transformVarbit != -1) {
-         var1 = WorldMapSection2.getVarbit(this.transformVarbit);
-      } else if(this.transformVarp != -1) {
+      if (this.transformVarbit != -1) {
+         var1 = WorldMapSection0.getVarbit(this.transformVarbit);
+      } else if (this.transformVarp != -1) {
          var1 = Varps.Varps_main[this.transformVarp];
       }
 
       int var2;
-      if(var1 >= 0 && var1 < this.transforms.length - 1) {
+      if (var1 >= 0 && var1 < this.transforms.length - 1) {
          var2 = this.transforms[var1];
       } else {
          var2 = this.transforms[this.transforms.length - 1];
       }
 
-      return var2 != -1? LoginScreenAnimation.getHitSplatDefinition(var2):null;
+      return var2 != -1 ? LoginScreenAnimation.getHitSplatDefinition(var2) : null;
    }
 
    @ObfuscatedName("u")
@@ -259,11 +253,11 @@ public class HitSplatDefinition extends DualNode {
    )
    @Export("getString")
    public String getString(int var1) {
-      String var2 = this.__b;
+      String var2 = this.field395;
 
-      while(true) {
+      while (true) {
          int var3 = var2.indexOf("%1");
-         if(var3 < 0) {
+         if (var3 < 0) {
             return var2;
          }
 
@@ -276,17 +270,17 @@ public class HitSplatDefinition extends DualNode {
       signature = "(I)Lln;",
       garbageValue = "-1692599381"
    )
-   public Sprite __g_417() {
-      if(this.__a < 0) {
+   public Sprite method123() {
+      if (this.field388 < 0) {
          return null;
       } else {
-         Sprite var1 = (Sprite)__jm_o.get((long)this.__a);
-         if(var1 != null) {
+         Sprite var1 = (Sprite)field385.get((long)this.field388);
+         if (var1 != null) {
             return var1;
          } else {
-            var1 = class322.readSprite(__jm_f, this.__a, 0);
-            if(var1 != null) {
-               __jm_o.put(var1, (long)this.__a);
+            var1 = class322.readSprite(field383, this.field388, 0);
+            if (var1 != null) {
+               field385.put(var1, (long)this.field388);
             }
 
             return var1;
@@ -299,17 +293,17 @@ public class HitSplatDefinition extends DualNode {
       signature = "(B)Lln;",
       garbageValue = "-15"
    )
-   public Sprite __l_418() {
-      if(this.__z < 0) {
+   public Sprite method124() {
+      if (this.field389 < 0) {
          return null;
       } else {
-         Sprite var1 = (Sprite)__jm_o.get((long)this.__z);
-         if(var1 != null) {
+         Sprite var1 = (Sprite)field385.get((long)this.field389);
+         if (var1 != null) {
             return var1;
          } else {
-            var1 = class322.readSprite(__jm_f, this.__z, 0);
-            if(var1 != null) {
-               __jm_o.put(var1, (long)this.__z);
+            var1 = class322.readSprite(field383, this.field389, 0);
+            if (var1 != null) {
+               field385.put(var1, (long)this.field389);
             }
 
             return var1;
@@ -322,17 +316,17 @@ public class HitSplatDefinition extends DualNode {
       signature = "(B)Lln;",
       garbageValue = "-49"
    )
-   public Sprite __e_419() {
-      if(this.__j < 0) {
+   public Sprite method125() {
+      if (this.field390 < 0) {
          return null;
       } else {
-         Sprite var1 = (Sprite)__jm_o.get((long)this.__j);
-         if(var1 != null) {
+         Sprite var1 = (Sprite)field385.get((long)this.field390);
+         if (var1 != null) {
             return var1;
          } else {
-            var1 = class322.readSprite(__jm_f, this.__j, 0);
-            if(var1 != null) {
-               __jm_o.put(var1, (long)this.__j);
+            var1 = class322.readSprite(field383, this.field390, 0);
+            if (var1 != null) {
+               field385.put(var1, (long)this.field390);
             }
 
             return var1;
@@ -345,17 +339,17 @@ public class HitSplatDefinition extends DualNode {
       signature = "(I)Lln;",
       garbageValue = "393569067"
    )
-   public Sprite __x_420() {
-      if(this.__s < 0) {
+   public Sprite method126() {
+      if (this.field391 < 0) {
          return null;
       } else {
-         Sprite var1 = (Sprite)__jm_o.get((long)this.__s);
-         if(var1 != null) {
+         Sprite var1 = (Sprite)field385.get((long)this.field391);
+         if (var1 != null) {
             return var1;
          } else {
-            var1 = class322.readSprite(__jm_f, this.__s, 0);
-            if(var1 != null) {
-               __jm_o.put(var1, (long)this.__s);
+            var1 = class322.readSprite(field383, this.field391, 0);
+            if (var1 != null) {
+               field385.put(var1, (long)this.field391);
             }
 
             return var1;
@@ -370,15 +364,15 @@ public class HitSplatDefinition extends DualNode {
    )
    @Export("getFont")
    public Font getFont() {
-      if(this.fontId == -1) {
+      if (this.fontId == -1) {
          return null;
       } else {
          Font var1 = (Font)HitSplatDefinition_cachedFonts.get((long)this.fontId);
-         if(var1 != null) {
+         if (var1 != null) {
             return var1;
          } else {
-            var1 = SpriteIds.method5823(__jm_f, __jm_q, this.fontId, 0);
-            if(var1 != null) {
+            var1 = GraphicsDefaults.method5823(field383, field384, this.fontId, 0);
+            if (var1 != null) {
                HitSplatDefinition_cachedFonts.put(var1, (long)this.fontId);
             }
 
@@ -391,4 +385,10 @@ public class HitSplatDefinition extends DualNode {
    public static int method4972(long var0) {
       return (int)(var0 >>> 17 & 4294967295L);
    }
+
+   static {
+      HitSplatDefinition_cached = new EvictingDualNodeHashTable(64);
+      field385 = new EvictingDualNodeHashTable(64);
+      HitSplatDefinition_cachedFonts = new EvictingDualNodeHashTable(20);
+   }
 }
diff --git a/runescape-client/src/main/java/class266.java b/runescape-client/src/main/java/HorizontalAlignment.java
similarity index 71%
rename from runescape-client/src/main/java/class266.java
rename to runescape-client/src/main/java/HorizontalAlignment.java
index 72071e4fc6..55adc59bad 100644
--- a/runescape-client/src/main/java/class266.java
+++ b/runescape-client/src/main/java/HorizontalAlignment.java
@@ -1,10 +1,12 @@
 import net.runelite.mapping.Export;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("ju")
-public enum class266 implements Enumerated {
+@Implements("HorizontalAlignment")
+public enum HorizontalAlignment implements Enumerated {
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "Lju;"
@@ -28,16 +30,18 @@ public enum class266 implements Enumerated {
    @ObfuscatedGetter(
       intValue = -739868097
    )
-   public final int field3528;
+   @Export("value")
+   public final int value;
    @ObfuscatedName("o")
    @ObfuscatedGetter(
       intValue = -1327532101
    )
-   final int field3530;
+   @Export("id")
+   final int id;
 
-   class266(int var3, int var4) {
-      this.field3528 = var3;
-      this.field3530 = var4;
+   private HorizontalAlignment(int var3, int var4) {
+      this.value = var3;
+      this.id = var4;
    }
 
    @ObfuscatedName("f")
@@ -47,7 +51,7 @@ public enum class266 implements Enumerated {
    )
    @Export("rsOrdinal")
    public int rsOrdinal() {
-      return this.field3530;
+      return this.id;
    }
 
    @ObfuscatedName("ft")
@@ -56,13 +60,13 @@ public enum class266 implements Enumerated {
       garbageValue = "1908348747"
    )
    static final void method5120() {
-      if(VertexNormal.__dq_pe) {
-         if(PacketWriter.clanChat != null) {
+      if (VertexNormal.field945) {
+         if (PacketWriter.clanChat != null) {
             PacketWriter.clanChat.sort();
          }
 
          FontName.method5635();
-         VertexNormal.__dq_pe = false;
+         VertexNormal.field945 = false;
       }
 
    }
diff --git a/runescape-client/src/main/java/Huffman.java b/runescape-client/src/main/java/Huffman.java
index cf37ace67f..b90daa9e9d 100644
--- a/runescape-client/src/main/java/Huffman.java
+++ b/runescape-client/src/main/java/Huffman.java
@@ -8,7 +8,7 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("Huffman")
 public class Huffman {
    @ObfuscatedName("e")
-   static int[][] __gd_e;
+   static int[][] field398;
    @ObfuscatedName("p")
    @ObfuscatedGetter(
       intValue = -842662451
@@ -16,43 +16,46 @@ public class Huffman {
    @Export("canvasHeight")
    public static int canvasHeight;
    @ObfuscatedName("m")
-   int[] __m;
+   @Export("masks")
+   int[] masks;
    @ObfuscatedName("f")
-   byte[] __f;
+   @Export("bits")
+   byte[] bits;
    @ObfuscatedName("q")
-   int[] __q;
+   @Export("keys")
+   int[] keys;
 
    public Huffman(byte[] var1) {
       int var2 = var1.length;
-      this.__m = new int[var2];
-      this.__f = var1;
+      this.masks = new int[var2];
+      this.bits = var1;
       int[] var3 = new int[33];
-      this.__q = new int[8];
+      this.keys = new int[8];
       int var4 = 0;
 
-      for(int var5 = 0; var5 < var2; ++var5) {
+      for (int var5 = 0; var5 < var2; ++var5) {
          byte var6 = var1[var5];
-         if(var6 != 0) {
+         if (var6 != 0) {
             int var7 = 1 << 32 - var6;
             int var8 = var3[var6];
-            this.__m[var5] = var8;
+            this.masks[var5] = var8;
             int var9;
             int var10;
             int var11;
             int var12;
-            if((var8 & var7) != 0) {
+            if ((var8 & var7) != 0) {
                var9 = var3[var6 - 1];
             } else {
                var9 = var8 | var7;
 
-               for(var10 = var6 - 1; var10 >= 1; --var10) {
+               for (var10 = var6 - 1; var10 >= 1; --var10) {
                   var11 = var3[var10];
-                  if(var11 != var8) {
+                  if (var11 != var8) {
                      break;
                   }
 
                   var12 = 1 << 32 - var10;
-                  if((var11 & var12) != 0) {
+                  if ((var11 & var12) != 0) {
                      var3[var10] = var3[var10 - 1];
                      break;
                   }
@@ -63,41 +66,41 @@ public class Huffman {
 
             var3[var6] = var9;
 
-            for(var10 = var6 + 1; var10 <= 32; ++var10) {
-               if(var8 == var3[var10]) {
+            for (var10 = var6 + 1; var10 <= 32; ++var10) {
+               if (var8 == var3[var10]) {
                   var3[var10] = var9;
                }
             }
 
             var10 = 0;
 
-            for(var11 = 0; var11 < var6; ++var11) {
+            for (var11 = 0; var11 < var6; ++var11) {
                var12 = Integer.MIN_VALUE >>> var11;
-               if((var8 & var12) != 0) {
-                  if(this.__q[var10] == 0) {
-                     this.__q[var10] = var4;
+               if ((var8 & var12) != 0) {
+                  if (this.keys[var10] == 0) {
+                     this.keys[var10] = var4;
                   }
 
-                  var10 = this.__q[var10];
+                  var10 = this.keys[var10];
                } else {
                   ++var10;
                }
 
-               if(var10 >= this.__q.length) {
-                  int[] var13 = new int[this.__q.length * 2];
+               if (var10 >= this.keys.length) {
+                  int[] var13 = new int[this.keys.length * 2];
 
-                  for(int var14 = 0; var14 < this.__q.length; ++var14) {
-                     var13[var14] = this.__q[var14];
+                  for (int var14 = 0; var14 < this.keys.length; ++var14) {
+                     var13[var14] = this.keys[var14];
                   }
 
-                  this.__q = var13;
+                  this.keys = var13;
                }
 
                var12 >>>= 1;
             }
 
-            this.__q[var10] = ~var5;
-            if(var10 >= var4) {
+            this.keys[var10] = ~var5;
+            if (var10 >= var4) {
                var4 = var10 + 1;
             }
          }
@@ -110,15 +113,16 @@ public class Huffman {
       signature = "([BII[BIB)I",
       garbageValue = "64"
    )
-   public int __m_293(byte[] var1, int var2, int var3, byte[] var4, int var5) {
+   @Export("compress")
+   public int compress(byte[] var1, int var2, int var3, byte[] var4, int var5) {
       int var6 = 0;
       int var7 = var5 << 3;
 
-      for(var3 += var2; var2 < var3; ++var2) {
+      for (var3 += var2; var2 < var3; ++var2) {
          int var8 = var1[var2] & 255;
-         int var9 = this.__m[var8];
-         byte var10 = this.__f[var8];
-         if(var10 == 0) {
+         int var9 = this.masks[var8];
+         byte var10 = this.bits[var8];
+         if (var10 == 0) {
             throw new RuntimeException("");
          }
 
@@ -128,19 +132,19 @@ public class Huffman {
          int var13 = (var10 + var12 - 1 >> 3) + var11;
          var12 += 24;
          var4[var11] = (byte)(var6 |= var9 >>> var12);
-         if(var11 < var13) {
+         if (var11 < var13) {
             ++var11;
             var12 -= 8;
             var4[var11] = (byte)(var6 = var9 >>> var12);
-            if(var11 < var13) {
+            if (var11 < var13) {
                ++var11;
                var12 -= 8;
                var4[var11] = (byte)(var6 = var9 >>> var12);
-               if(var11 < var13) {
+               if (var11 < var13) {
                   ++var11;
                   var12 -= 8;
                   var4[var11] = (byte)(var6 = var9 >>> var12);
-                  if(var11 < var13) {
+                  if (var11 < var13) {
                      ++var11;
                      var12 -= 8;
                      var4[var11] = (byte)(var6 = var9 << -var12);
@@ -160,131 +164,132 @@ public class Huffman {
       signature = "([BI[BIII)I",
       garbageValue = "-2094399899"
    )
-   public int __f_294(byte[] var1, int var2, byte[] var3, int var4, int var5) {
-      if(var5 == 0) {
+   @Export("decompress")
+   public int decompress(byte[] var1, int var2, byte[] var3, int var4, int var5) {
+      if (var5 == 0) {
          return 0;
       } else {
          int var6 = 0;
          var5 += var4;
          int var7 = var2;
 
-         while(true) {
+         while (true) {
             byte var8 = var1[var7];
-            if(var8 < 0) {
-               var6 = this.__q[var6];
+            if (var8 < 0) {
+               var6 = this.keys[var6];
             } else {
                ++var6;
             }
 
             int var9;
-            if((var9 = this.__q[var6]) < 0) {
+            if ((var9 = this.keys[var6]) < 0) {
                var3[var4++] = (byte)(~var9);
-               if(var4 >= var5) {
+               if (var4 >= var5) {
                   break;
                }
 
                var6 = 0;
             }
 
-            if((var8 & 64) != 0) {
-               var6 = this.__q[var6];
+            if ((var8 & 64) != 0) {
+               var6 = this.keys[var6];
             } else {
                ++var6;
             }
 
-            if((var9 = this.__q[var6]) < 0) {
+            if ((var9 = this.keys[var6]) < 0) {
                var3[var4++] = (byte)(~var9);
-               if(var4 >= var5) {
+               if (var4 >= var5) {
                   break;
                }
 
                var6 = 0;
             }
 
-            if((var8 & 32) != 0) {
-               var6 = this.__q[var6];
+            if ((var8 & 32) != 0) {
+               var6 = this.keys[var6];
             } else {
                ++var6;
             }
 
-            if((var9 = this.__q[var6]) < 0) {
+            if ((var9 = this.keys[var6]) < 0) {
                var3[var4++] = (byte)(~var9);
-               if(var4 >= var5) {
+               if (var4 >= var5) {
                   break;
                }
 
                var6 = 0;
             }
 
-            if((var8 & 16) != 0) {
-               var6 = this.__q[var6];
+            if ((var8 & 16) != 0) {
+               var6 = this.keys[var6];
             } else {
                ++var6;
             }
 
-            if((var9 = this.__q[var6]) < 0) {
+            if ((var9 = this.keys[var6]) < 0) {
                var3[var4++] = (byte)(~var9);
-               if(var4 >= var5) {
+               if (var4 >= var5) {
                   break;
                }
 
                var6 = 0;
             }
 
-            if((var8 & 8) != 0) {
-               var6 = this.__q[var6];
+            if ((var8 & 8) != 0) {
+               var6 = this.keys[var6];
             } else {
                ++var6;
             }
 
-            if((var9 = this.__q[var6]) < 0) {
+            if ((var9 = this.keys[var6]) < 0) {
                var3[var4++] = (byte)(~var9);
-               if(var4 >= var5) {
+               if (var4 >= var5) {
                   break;
                }
 
                var6 = 0;
             }
 
-            if((var8 & 4) != 0) {
-               var6 = this.__q[var6];
+            if ((var8 & 4) != 0) {
+               var6 = this.keys[var6];
             } else {
                ++var6;
             }
 
-            if((var9 = this.__q[var6]) < 0) {
+            if ((var9 = this.keys[var6]) < 0) {
                var3[var4++] = (byte)(~var9);
-               if(var4 >= var5) {
+               if (var4 >= var5) {
                   break;
                }
 
                var6 = 0;
             }
 
-            if((var8 & 2) != 0) {
-               var6 = this.__q[var6];
+            if ((var8 & 2) != 0) {
+               var6 = this.keys[var6];
             } else {
                ++var6;
             }
 
-            if((var9 = this.__q[var6]) < 0) {
+            if ((var9 = this.keys[var6]) < 0) {
                var3[var4++] = (byte)(~var9);
-               if(var4 >= var5) {
+               if (var4 >= var5) {
                   break;
                }
 
                var6 = 0;
             }
 
-            if((var8 & 1) != 0) {
-               var6 = this.__q[var6];
+            if ((var8 & 1) != 0) {
+               var6 = this.keys[var6];
             } else {
                ++var6;
             }
 
-            if((var9 = this.__q[var6]) < 0) {
+            if ((var9 = this.keys[var6]) < 0) {
                var3[var4++] = (byte)(~var9);
-               if(var4 >= var5) {
+               if (var4 >= var5) {
                   break;
                }
 
@@ -307,14 +312,14 @@ public class Huffman {
    public static Widget getWidget(int var0) {
       int var1 = var0 >> 16;
       int var2 = var0 & 65535;
-      if(Widget.widgets[var1] == null || Widget.widgets[var1][var2] == null) {
-         boolean var3 = GroundItemPile.loadWidgetGroup(var1);
-         if(!var3) {
+      if (Widget.interfaceComponents[var1] == null || Widget.interfaceComponents[var1][var2] == null) {
+         boolean var3 = GroundItemPile.loadInterface(var1);
+         if (!var3) {
             return null;
          }
       }
 
-      return Widget.widgets[var1][var2];
+      return Widget.interfaceComponents[var1][var2];
    }
 
    @ObfuscatedName("m")
diff --git a/runescape-client/src/main/java/IgnoreList.java b/runescape-client/src/main/java/IgnoreList.java
index 3257e5fa90..eac4b5886a 100644
--- a/runescape-client/src/main/java/IgnoreList.java
+++ b/runescape-client/src/main/java/IgnoreList.java
@@ -47,20 +47,20 @@ public class IgnoreList extends UserList {
       garbageValue = "32"
    )
    @Export("read")
-   public void read(Buffer var1, int var2) {
-      while(true) {
-         if(var1.index < var2) {
-            int var3 = var1.readUnsignedByte();
+   public void read(Buffer buffer, int var2) {
+      while (true) {
+         if (buffer.index < var2) {
+            int var3 = buffer.readUnsignedByte();
             boolean var4 = (var3 & 1) == 1;
-            Username var5 = new Username(var1.readStringCp1252NullTerminated(), this.loginType);
-            Username var6 = new Username(var1.readStringCp1252NullTerminated(), this.loginType);
-            var1.readStringCp1252NullTerminated();
-            if(var5 != null && var5.hasCleanName()) {
+            Username var5 = new Username(buffer.readStringCp1252NullTerminated(), this.loginType);
+            Username var6 = new Username(buffer.readStringCp1252NullTerminated(), this.loginType);
+            buffer.readStringCp1252NullTerminated();
+            if (var5 != null && var5.hasCleanName()) {
                Ignored var7 = (Ignored)this.getByCurrentUsername(var5);
-               if(var4) {
+               if (var4) {
                   Ignored var8 = (Ignored)this.getByCurrentUsername(var6);
-                  if(var8 != null && var8 != var7) {
-                     if(var7 != null) {
+                  if (var8 != null && var8 != var7) {
+                     if (var7 != null) {
                         this.remove(var8);
                      } else {
                         var7 = var8;
@@ -68,12 +68,12 @@ public class IgnoreList extends UserList {
                   }
                }
 
-               if(var7 != null) {
+               if (var7 != null) {
                   this.changeName(var7, var5, var6);
                   continue;
                }
 
-               if(this.size() < 400) {
+               if (this.size() < 400) {
                   int var9 = this.size();
                   var7 = (Ignored)this.addLast(var5, var6);
                   var7.id = var9;
@@ -94,56 +94,56 @@ public class IgnoreList extends UserList {
       garbageValue = "5"
    )
    static int method5438(CharSequence var0, int var1, boolean var2) {
-      if(var1 >= 2 && var1 <= 36) {
+      if (var1 >= 2 && var1 <= 36) {
          boolean var3 = false;
          boolean var4 = false;
          int var5 = 0;
          int var6 = var0.length();
 
-         for(int var7 = 0; var7 < var6; ++var7) {
+         for (int var7 = 0; var7 < var6; ++var7) {
             char var8 = var0.charAt(var7);
-            if(var7 == 0) {
-               if(var8 == '-') {
+            if (var7 == 0) {
+               if (var8 == '-') {
                   var3 = true;
                   continue;
                }
 
-               if(var8 == '+') {
+               if (var8 == '+') {
                   continue;
                }
             }
 
-            int var10;
-            if(var8 >= '0' && var8 <= '9') {
-               var10 = var8 - '0';
-            } else if(var8 >= 'A' && var8 <= 'Z') {
-               var10 = var8 - '7';
+            int var9;
+            if (var8 >= '0' && var8 <= '9') {
+               var9 = var8 - '0';
+            } else if (var8 >= 'A' && var8 <= 'Z') {
+               var9 = var8 - '7';
             } else {
-               if(var8 < 'a' || var8 > 'z') {
+               if (var8 < 'a' || var8 > 'z') {
                   throw new NumberFormatException();
                }
 
-               var10 = var8 - 'W';
+               var9 = var8 - 'W';
             }
 
-            if(var10 >= var1) {
+            if (var9 >= var1) {
                throw new NumberFormatException();
             }
 
-            if(var3) {
-               var10 = -var10;
+            if (var3) {
+               var9 = -var9;
             }
 
-            int var9 = var10 + var5 * var1;
-            if(var9 / var1 != var5) {
+            int var10 = var9 + var5 * var1;
+            if (var10 / var1 != var5) {
                throw new NumberFormatException();
             }
 
-            var5 = var9;
+            var5 = var10;
             var4 = true;
          }
 
-         if(!var4) {
+         if (!var4) {
             throw new NumberFormatException();
          } else {
             return var5;
diff --git a/runescape-client/src/main/java/Ignored.java b/runescape-client/src/main/java/Ignored.java
index 87c2827f60..b716e2a1c0 100644
--- a/runescape-client/src/main/java/Ignored.java
+++ b/runescape-client/src/main/java/Ignored.java
@@ -8,7 +8,7 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("Ignored")
 public class Ignored extends User {
    @ObfuscatedName("at")
-   protected static String __ks_at;
+   protected static String field402;
    @ObfuscatedName("m")
    @ObfuscatedGetter(
       intValue = 344024525
@@ -21,9 +21,9 @@ public class Ignored extends User {
       signature = "(Lks;I)I",
       garbageValue = "-842469150"
    )
-   @Export("compareTo00")
-   int compareTo00(Ignored var1) {
-      return this.id - var1.id;
+   @Export("compareToIgnored")
+   int compareToIgnored(Ignored other) {
+      return this.id - other.id;
    }
 
    @ObfuscatedName("aj")
@@ -31,13 +31,13 @@ public class Ignored extends User {
       signature = "(Ljs;I)I",
       garbageValue = "1627362569"
    )
-   public int compareTo0(User var1) {
-      return this.compareTo00((Ignored)var1);
+   @Export("compareToUser")
+   public int compareToUser(User var1) {
+      return this.compareToIgnored((Ignored)var1);
    }
 
-   @ObfuscatedName("compareTo")
    public int compareTo(Object var1) {
-      return this.compareTo00((Ignored)var1);
+      return this.compareToIgnored((Ignored)var1);
    }
 
    @ObfuscatedName("fv")
@@ -47,7 +47,7 @@ public class Ignored extends User {
    )
    @Export("queueSoundEffect")
    static void queueSoundEffect(int var0, int var1, int var2) {
-      if(Client.soundEffectVolume != 0 && var1 != 0 && Client.soundEffectCount < 50) {
+      if (Client.soundEffectVolume != 0 && var1 != 0 && Client.soundEffectCount < 50) {
          Client.soundEffectIds[Client.soundEffectCount] = var0;
          Client.queuedSoundEffectLoops[Client.soundEffectCount] = var1;
          Client.queuedSoundEffectDelays[Client.soundEffectCount] = var2;
diff --git a/runescape-client/src/main/java/IndexCache.java b/runescape-client/src/main/java/IndexCache.java
deleted file mode 100644
index 6f39f6bf7b..0000000000
--- a/runescape-client/src/main/java/IndexCache.java
+++ /dev/null
@@ -1,560 +0,0 @@
-import java.util.zip.CRC32;
-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")
-@Implements("IndexCache")
-public class IndexCache extends AbstractIndexCache {
-   @ObfuscatedName("aj")
-   @Export("IndexCache_crc")
-   static CRC32 IndexCache_crc;
-   @ObfuscatedName("c")
-   @ObfuscatedSignature(
-      signature = "Lff;"
-   )
-   @Export("indexStore")
-   IndexStore indexStore;
-   @ObfuscatedName("r")
-   @ObfuscatedSignature(
-      signature = "Lff;"
-   )
-   @Export("referenceStore")
-   IndexStore referenceStore;
-   @ObfuscatedName("p")
-   @ObfuscatedGetter(
-      intValue = -1579549759
-   )
-   @Export("index")
-   int index;
-   @ObfuscatedName("v")
-   volatile boolean __v;
-   @ObfuscatedName("ag")
-   boolean __ag;
-   @ObfuscatedName("aq")
-   @Export("validArchives")
-   volatile boolean[] validArchives;
-   @ObfuscatedName("av")
-   @ObfuscatedGetter(
-      intValue = 1472870917
-   )
-   @Export("indexReferenceCrc")
-   int indexReferenceCrc;
-   @ObfuscatedName("ar")
-   @ObfuscatedGetter(
-      intValue = -785528219
-   )
-   @Export("indexReferenceVersion")
-   int indexReferenceVersion;
-   @ObfuscatedName("ac")
-   @ObfuscatedGetter(
-      intValue = -1884661133
-   )
-   int __ac;
-
-   static {
-      IndexCache_crc = new CRC32();
-   }
-
-   @ObfuscatedSignature(
-      signature = "(Lff;Lff;IZZZ)V"
-   )
-   public IndexCache(IndexStore var1, IndexStore var2, int var3, boolean var4, boolean var5, boolean var6) {
-      super(var4, var5);
-      this.__v = false;
-      this.__ag = false;
-      this.__ac = -1;
-      this.indexStore = var1;
-      this.referenceStore = var2;
-      this.index = var3;
-      this.__ag = var6;
-      int var8 = this.index;
-      if(Players.NetCache_reference != null) {
-         Players.NetCache_reference.index = var8 * 8 + 5;
-         int var9 = Players.NetCache_reference.readInt();
-         int var10 = Players.NetCache_reference.readInt();
-         this.loadIndexReference(var9, var10);
-      } else {
-         PacketBuffer.requestNetFile((IndexCache)null, 255, 255, 0, (byte)0, true);
-         NetCache.NetCache_indexCaches[var8] = this;
-      }
-
-   }
-
-   @ObfuscatedName("f")
-   @ObfuscatedSignature(
-      signature = "(II)V",
-      garbageValue = "2102142648"
-   )
-   void __f_392(int var1) {
-      int var2 = this.index;
-      long var3 = (long)((var2 << 16) + var1);
-      NetFileRequest var5 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var3);
-      if(var5 != null) {
-         NetCache.NetCache_pendingWritesQueue.addLast(var5);
-      }
-
-   }
-
-   @ObfuscatedName("e")
-   @ObfuscatedSignature(
-      signature = "(II)I",
-      garbageValue = "-1809769865"
-   )
-   @Export("archiveLoadPercent")
-   int archiveLoadPercent(int var1) {
-      return super.archives[var1] != null?100:(this.validArchives[var1]?100:class54.method1086(this.index, var1));
-   }
-
-   @ObfuscatedName("z")
-   @ObfuscatedSignature(
-      signature = "(II)V",
-      garbageValue = "-1829145107"
-   )
-   @Export("loadArchive")
-   void loadArchive(int var1) {
-      if(this.indexStore != null && this.validArchives != null && this.validArchives[var1]) {
-         IndexStore var2 = this.indexStore;
-         byte[] var4 = null;
-         NodeDeque var5 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue;
-         synchronized(IndexStoreActionHandler.IndexStoreActionHandler_requestQueue) {
-            for(IndexStoreAction var6 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.last(); var6 != null; var6 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.previous()) {
-               if(var6.key == (long)var1 && var2 == var6.indexStore && var6.type == 0) {
-                  var4 = var6.data;
-                  break;
-               }
-            }
-         }
-
-         if(var4 != null) {
-            this.load(var2, var1, var4, true);
-         } else {
-            byte[] var9 = var2.read(var1);
-            this.load(var2, var1, var9, true);
-         }
-      } else {
-         PacketBuffer.requestNetFile(this, this.index, var1, super.archiveCrcs[var1], (byte)2, true);
-      }
-
-   }
-
-   @ObfuscatedName("cx")
-   @ObfuscatedSignature(
-      signature = "(I)Z",
-      garbageValue = "1750279412"
-   )
-   public boolean __cx_404() {
-      return this.__v;
-   }
-
-   @ObfuscatedName("ca")
-   @ObfuscatedSignature(
-      signature = "(I)I",
-      garbageValue = "1671499504"
-   )
-   public int __ca_405() {
-      if(this.__v) {
-         return 100;
-      } else if(super.archives != null) {
-         return 99;
-      } else {
-         int var1 = class54.method1086(255, this.index);
-         if(var1 >= 100) {
-            var1 = 99;
-         }
-
-         return var1;
-      }
-   }
-
-   @ObfuscatedName("co")
-   @ObfuscatedSignature(
-      signature = "(III)V",
-      garbageValue = "-1621053520"
-   )
-   @Export("loadIndexReference")
-   public void loadIndexReference(int var1, int var2) {
-      this.indexReferenceCrc = var1;
-      this.indexReferenceVersion = var2;
-      if(this.referenceStore != null) {
-         int var3 = this.index;
-         IndexStore var4 = this.referenceStore;
-         byte[] var6 = null;
-         NodeDeque var7 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue;
-         synchronized(IndexStoreActionHandler.IndexStoreActionHandler_requestQueue) {
-            for(IndexStoreAction var8 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.last(); var8 != null; var8 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.previous()) {
-               if(var8.key == (long)var3 && var4 == var8.indexStore && var8.type == 0) {
-                  var6 = var8.data;
-                  break;
-               }
-            }
-         }
-
-         if(var6 != null) {
-            this.load(var4, var3, var6, true);
-         } else {
-            byte[] var11 = var4.read(var3);
-            this.load(var4, var3, var11, true);
-         }
-      } else {
-         PacketBuffer.requestNetFile(this, 255, this.index, this.indexReferenceCrc, (byte)0, true);
-      }
-
-   }
-
-   @ObfuscatedName("de")
-   @ObfuscatedSignature(
-      signature = "(I[BZZB)V",
-      garbageValue = "24"
-   )
-   @Export("write")
-   public void write(int var1, byte[] var2, boolean var3, boolean var4) {
-      if(var3) {
-         if(this.__v) {
-            throw new RuntimeException();
-         }
-
-         if(this.referenceStore != null) {
-            Widget.method4499(this.index, var2, this.referenceStore);
-         }
-
-         this.setIndexReference(var2);
-         this.loadAllLocal();
-      } else {
-         var2[var2.length - 2] = (byte)(super.archiveVersions[var1] >> 8);
-         var2[var2.length - 1] = (byte)super.archiveVersions[var1];
-         if(this.indexStore != null) {
-            Widget.method4499(var1, var2, this.indexStore);
-            this.validArchives[var1] = true;
-         }
-
-         if(var4) {
-            super.archives[var1] = Projectile.byteArrayToObject(var2, false);
-         }
-      }
-
-   }
-
-   @ObfuscatedName("dx")
-   @ObfuscatedSignature(
-      signature = "(Lff;I[BZI)V",
-      garbageValue = "-2045340856"
-   )
-   @Export("load")
-   void load(IndexStore var1, int var2, byte[] var3, boolean var4) {
-      int var5;
-      if(var1 == this.referenceStore) {
-         if(this.__v) {
-            throw new RuntimeException();
-         }
-
-         if(var3 == null) {
-            PacketBuffer.requestNetFile(this, 255, this.index, this.indexReferenceCrc, (byte)0, true);
-            return;
-         }
-
-         IndexCache_crc.reset();
-         IndexCache_crc.update(var3, 0, var3.length);
-         var5 = (int)IndexCache_crc.getValue();
-         if(var5 != this.indexReferenceCrc) {
-            PacketBuffer.requestNetFile(this, 255, this.index, this.indexReferenceCrc, (byte)0, true);
-            return;
-         }
-
-         Buffer var9 = new Buffer(Strings.decompressBytes(var3));
-         int var7 = var9.readUnsignedByte();
-         if(var7 != 5 && var7 != 6) {
-            throw new RuntimeException(var7 + "," + this.index + "," + var2);
-         }
-
-         int var8 = 0;
-         if(var7 >= 6) {
-            var8 = var9.readInt();
-         }
-
-         if(var8 != this.indexReferenceVersion) {
-            PacketBuffer.requestNetFile(this, 255, this.index, this.indexReferenceCrc, (byte)0, true);
-            return;
-         }
-
-         this.setIndexReference(var3);
-         this.loadAllLocal();
-      } else {
-         if(!var4 && var2 == this.__ac) {
-            this.__v = true;
-         }
-
-         if(var3 == null || var3.length <= 2) {
-            this.validArchives[var2] = false;
-            if(this.__ag || var4) {
-               PacketBuffer.requestNetFile(this, this.index, var2, super.archiveCrcs[var2], (byte)2, var4);
-            }
-
-            return;
-         }
-
-         IndexCache_crc.reset();
-         IndexCache_crc.update(var3, 0, var3.length - 2);
-         var5 = (int)IndexCache_crc.getValue();
-         int var6 = ((var3[var3.length - 2] & 255) << 8) + (var3[var3.length - 1] & 255);
-         if(var5 != super.archiveCrcs[var2] || var6 != super.archiveVersions[var2]) {
-            this.validArchives[var2] = false;
-            if(this.__ag || var4) {
-               PacketBuffer.requestNetFile(this, this.index, var2, super.archiveCrcs[var2], (byte)2, var4);
-            }
-
-            return;
-         }
-
-         this.validArchives[var2] = true;
-         if(var4) {
-            super.archives[var2] = Projectile.byteArrayToObject(var3, false);
-         }
-      }
-
-   }
-
-   @ObfuscatedName("dt")
-   @ObfuscatedSignature(
-      signature = "(I)V",
-      garbageValue = "1357733042"
-   )
-   @Export("loadAllLocal")
-   void loadAllLocal() {
-      this.validArchives = new boolean[super.archives.length];
-
-      int var1;
-      for(var1 = 0; var1 < this.validArchives.length; ++var1) {
-         this.validArchives[var1] = false;
-      }
-
-      if(this.indexStore == null) {
-         this.__v = true;
-      } else {
-         this.__ac = -1;
-
-         for(var1 = 0; var1 < this.validArchives.length; ++var1) {
-            if(super.recordCounts[var1] > 0) {
-               Npc.method2009(var1, this.indexStore, this);
-               this.__ac = var1;
-            }
-         }
-
-         if(this.__ac == -1) {
-            this.__v = true;
-         }
-
-      }
-   }
-
-   @ObfuscatedName("dn")
-   @ObfuscatedSignature(
-      signature = "(IB)Z",
-      garbageValue = "0"
-   )
-   public boolean __dn_407(int var1) {
-      return this.validArchives[var1];
-   }
-
-   @ObfuscatedName("df")
-   @ObfuscatedSignature(
-      signature = "(II)Z",
-      garbageValue = "1419648188"
-   )
-   public boolean __df_408(int var1) {
-      return this.__j_395(var1) != null;
-   }
-
-   @ObfuscatedName("da")
-   @ObfuscatedSignature(
-      signature = "(I)I",
-      garbageValue = "-1809381772"
-   )
-   @Export("loadPercent")
-   public int loadPercent() {
-      int var1 = 0;
-      int var2 = 0;
-
-      int var3;
-      for(var3 = 0; var3 < super.archives.length; ++var3) {
-         if(super.recordCounts[var3] > 0) {
-            var1 += 100;
-            var2 += this.archiveLoadPercent(var3);
-         }
-      }
-
-      if(var1 == 0) {
-         return 100;
-      } else {
-         var3 = var2 * 100 / var1;
-         return var3;
-      }
-   }
-
-   @ObfuscatedName("jc")
-   @ObfuscatedSignature(
-      signature = "(IB)V",
-      garbageValue = "-34"
-   )
-   static final void method4703(int var0) {
-      class12.method159();
-
-      for(ObjectSound var1 = (ObjectSound)ObjectSound.objectSounds.last(); var1 != null; var1 = (ObjectSound)ObjectSound.objectSounds.previous()) {
-         if(var1.obj != null) {
-            var1.set();
-         }
-      }
-
-      int var4 = SecureRandomCallable.method1140(var0).type;
-      if(var4 != 0) {
-         int var2 = Varps.Varps_main[var0];
-         if(var4 == 1) {
-            if(var2 == 1) {
-               Rasterizer3D.Rasterizer3D_setBrightness(0.9D);
-               ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.9D);
-            }
-
-            if(var2 == 2) {
-               Rasterizer3D.Rasterizer3D_setBrightness(0.8D);
-               ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.8D);
-            }
-
-            if(var2 == 3) {
-               Rasterizer3D.Rasterizer3D_setBrightness(0.7D);
-               ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.7D);
-            }
-
-            if(var2 == 4) {
-               Rasterizer3D.Rasterizer3D_setBrightness(0.6D);
-               ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).setBrightness(0.6D);
-            }
-
-            ObjectDefinition.method5041();
-         }
-
-         if(var4 == 3) {
-            short var3 = 0;
-            if(var2 == 0) {
-               var3 = 255;
-            }
-
-            if(var2 == 1) {
-               var3 = 192;
-            }
-
-            if(var2 == 2) {
-               var3 = 128;
-            }
-
-            if(var2 == 3) {
-               var3 = 64;
-            }
-
-            if(var2 == 4) {
-               var3 = 0;
-            }
-
-            if(var3 != Client.__client_qf) {
-               if(Client.__client_qf == 0 && Client.__client_qy != -1) {
-                  Login.method2076(UserComparator3.indexCache6, Client.__client_qy, 0, var3, false);
-                  Client.__client_qq = false;
-               } else if(var3 == 0) {
-                  class214.midiPcmStream.clear();
-                  class214.__hf_o = 1;
-                  class214.__hf_u = null;
-                  Client.__client_qq = false;
-               } else {
-                  class203.method4008(var3);
-               }
-
-               Client.__client_qf = var3;
-            }
-         }
-
-         if(var4 == 4) {
-            if(var2 == 0) {
-               Client.soundEffectVolume = 127;
-            }
-
-            if(var2 == 1) {
-               Client.soundEffectVolume = 96;
-            }
-
-            if(var2 == 2) {
-               Client.soundEffectVolume = 64;
-            }
-
-            if(var2 == 3) {
-               Client.soundEffectVolume = 32;
-            }
-
-            if(var2 == 4) {
-               Client.soundEffectVolume = 0;
-            }
-         }
-
-         if(var4 == 5) {
-            Client.__client_ku = var2;
-         }
-
-         if(var4 == 6) {
-            Client.chatEffects = var2;
-         }
-
-         if(var4 == 9) {
-            Client.__client_mb = var2;
-         }
-
-         if(var4 == 10) {
-            if(var2 == 0) {
-               Client.__client_qc = 127;
-            }
-
-            if(var2 == 1) {
-               Client.__client_qc = 96;
-            }
-
-            if(var2 == 2) {
-               Client.__client_qc = 64;
-            }
-
-            if(var2 == 3) {
-               Client.__client_qc = 32;
-            }
-
-            if(var2 == 4) {
-               Client.__client_qc = 0;
-            }
-         }
-
-         if(var4 == 17) {
-            Client.followerIndex = var2 & 65535;
-         }
-
-         if(var4 == 18) {
-            Client.playerAttackOption = (AttackOption)ScriptFrame.findEnumerated(ClientPacket.method3665(), var2);
-            if(Client.playerAttackOption == null) {
-               Client.playerAttackOption = AttackOption.AttackOption_dependsOnCombatLevels;
-            }
-         }
-
-         if(var4 == 19) {
-            if(var2 == -1) {
-               Client.combatTargetPlayerIndex = -1;
-            } else {
-               Client.combatTargetPlayerIndex = var2 & 2047;
-            }
-         }
-
-         if(var4 == 22) {
-            Client.npcAttackOption = (AttackOption)ScriptFrame.findEnumerated(ClientPacket.method3665(), var2);
-            if(Client.npcAttackOption == null) {
-               Client.npcAttackOption = AttackOption.AttackOption_dependsOnCombatLevels;
-            }
-         }
-
-      }
-   }
-}
diff --git a/runescape-client/src/main/java/IndexCacheLoader.java b/runescape-client/src/main/java/IndexCacheLoader.java
deleted file mode 100644
index 352fa614f5..0000000000
--- a/runescape-client/src/main/java/IndexCacheLoader.java
+++ /dev/null
@@ -1,704 +0,0 @@
-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("bd")
-@Implements("IndexCacheLoader")
-public class IndexCacheLoader {
-   @ObfuscatedName("pf")
-   @ObfuscatedSignature(
-      signature = "Lko;"
-   )
-   static class310 field512;
-   @ObfuscatedName("u")
-   @ObfuscatedSignature(
-      signature = "Llq;"
-   )
-   @Export("titlebuttonSprite")
-   static IndexedSprite titlebuttonSprite;
-   @ObfuscatedName("x")
-   public static short[][] __bd_x;
-   @ObfuscatedName("er")
-   @ObfuscatedGetter(
-      intValue = 636454135
-   )
-   static int __bd_er;
-   @ObfuscatedName("gw")
-   @Export("regionMapArchiveIds")
-   static int[] regionMapArchiveIds;
-   @ObfuscatedName("f")
-   @ObfuscatedSignature(
-      signature = "Lit;"
-   )
-   @Export("indexCache")
-   final IndexCache indexCache;
-   @ObfuscatedName("q")
-   @ObfuscatedGetter(
-      intValue = 1459455501
-   )
-   final int __q;
-   @ObfuscatedName("w")
-   @ObfuscatedGetter(
-      intValue = 782003089
-   )
-   int __w;
-
-   @ObfuscatedSignature(
-      signature = "(Lit;Ljava/lang/String;)V"
-   )
-   IndexCacheLoader(IndexCache var1, String var2) {
-      this.__w = 0;
-      this.indexCache = var1;
-      this.__q = var1.__t_397();
-   }
-
-   @ObfuscatedName("m")
-   @ObfuscatedSignature(
-      signature = "(I)Z",
-      garbageValue = "1352221725"
-   )
-   boolean __m_122() {
-      this.__w = 0;
-
-      for(int var1 = 0; var1 < this.__q; ++var1) {
-         if(!this.indexCache.__df_408(var1) || this.indexCache.__dn_407(var1)) {
-            ++this.__w;
-         }
-      }
-
-      return this.__w >= this.__q;
-   }
-
-   @ObfuscatedName("x")
-   @ObfuscatedSignature(
-      signature = "(Lkk;Lkk;Lkk;I)V",
-      garbageValue = "839403460"
-   )
-   @Export("drawTitle")
-   static void drawTitle(Font var0, Font var1, Font var2) {
-      Login.xPadding = (SoundCache.canvasWidth - 765) / 2;
-      Login.loginBoxX = Login.xPadding + 202;
-      Varps.loginBoxCenter = Login.loginBoxX + 180;
-      int var9;
-      int var11;
-      int var19;
-      byte var23;
-      int var24;
-      int var27;
-      int var28;
-      int var48;
-      if(Login.worldSelectOpen) {
-         if(class30.worldSelectBackSprites == null) {
-            class30.worldSelectBackSprites = class2.method20(WorldMapSection3.indexCache8, "sl_back", "");
-         }
-
-         IndexCache var36;
-         int var37;
-         int var39;
-         IndexedSprite[] var40;
-         if(Frames.worldSelectFlagSprites == null) {
-            var36 = WorldMapSection3.indexCache8;
-            var39 = var36.getArchiveId("sl_flags");
-            var37 = var36.getRecordId(var39, "");
-            if(!SpriteMask.loadSprite(var36, var39, var37)) {
-               var40 = null;
-            } else {
-               var40 = WorldMapLabel.createIndexedSpriteArray();
-            }
-
-            Frames.worldSelectFlagSprites = var40;
-         }
-
-         if(AttackOption.worldSelectArrows == null) {
-            var36 = WorldMapSection3.indexCache8;
-            var39 = var36.getArchiveId("sl_arrows");
-            var37 = var36.getRecordId(var39, "");
-            if(!SpriteMask.loadSprite(var36, var39, var37)) {
-               var40 = null;
-            } else {
-               var40 = WorldMapLabel.createIndexedSpriteArray();
-            }
-
-            AttackOption.worldSelectArrows = var40;
-         }
-
-         if(UrlRequest.worldSelectStars == null) {
-            var36 = WorldMapSection3.indexCache8;
-            var39 = var36.getArchiveId("sl_stars");
-            var37 = var36.getRecordId(var39, "");
-            if(!SpriteMask.loadSprite(var36, var39, var37)) {
-               var40 = null;
-            } else {
-               var40 = WorldMapLabel.createIndexedSpriteArray();
-            }
-
-            UrlRequest.worldSelectStars = var40;
-         }
-
-         if(SecureRandomFuture.worldSelectLeftSprite == null) {
-            SecureRandomFuture.worldSelectLeftSprite = MenuAction.loadIndexedSpriteByName(WorldMapSection3.indexCache8, "leftarrow", "");
-         }
-
-         if(NetSocket.worldSelectRightSprite == null) {
-            NetSocket.worldSelectRightSprite = MenuAction.loadIndexedSpriteByName(WorldMapSection3.indexCache8, "rightarrow", "");
-         }
-
-         Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0);
-         Rasterizer2D.drawGradient(Login.xPadding, 0, 125, 23, 12425273, 9135624);
-         Rasterizer2D.drawGradient(Login.xPadding + 125, 0, 640, 23, 5197647, 2697513);
-         var0.drawCentered("Select a world", Login.xPadding + 62, 15, 0, -1);
-         if(UrlRequest.worldSelectStars != null) {
-            UrlRequest.worldSelectStars[1].drawAt(Login.xPadding + 140, 1);
-            var1.draw("Members only world", Login.xPadding + 152, 10, 16777215, -1);
-            UrlRequest.worldSelectStars[0].drawAt(Login.xPadding + 140, 12);
-            var1.draw("Free world", Login.xPadding + 152, 21, 16777215, -1);
-         }
-
-         if(AttackOption.worldSelectArrows != null) {
-            var48 = Login.xPadding + 280;
-            if(World.sortOption1[0] == 0 && World.sortOption2[0] == 0) {
-               AttackOption.worldSelectArrows[2].drawAt(var48, 4);
-            } else {
-               AttackOption.worldSelectArrows[0].drawAt(var48, 4);
-            }
-
-            if(World.sortOption1[0] == 0 && World.sortOption2[0] == 1) {
-               AttackOption.worldSelectArrows[3].drawAt(var48 + 15, 4);
-            } else {
-               AttackOption.worldSelectArrows[1].drawAt(var48 + 15, 4);
-            }
-
-            var0.draw("World", var48 + 32, 17, 16777215, -1);
-            var24 = Login.xPadding + 390;
-            if(World.sortOption1[0] == 1 && World.sortOption2[0] == 0) {
-               AttackOption.worldSelectArrows[2].drawAt(var24, 4);
-            } else {
-               AttackOption.worldSelectArrows[0].drawAt(var24, 4);
-            }
-
-            if(World.sortOption1[0] == 1 && World.sortOption2[0] == 1) {
-               AttackOption.worldSelectArrows[3].drawAt(var24 + 15, 4);
-            } else {
-               AttackOption.worldSelectArrows[1].drawAt(var24 + 15, 4);
-            }
-
-            var0.draw("Players", var24 + 32, 17, 16777215, -1);
-            var39 = Login.xPadding + 500;
-            if(World.sortOption1[0] == 2 && World.sortOption2[0] == 0) {
-               AttackOption.worldSelectArrows[2].drawAt(var39, 4);
-            } else {
-               AttackOption.worldSelectArrows[0].drawAt(var39, 4);
-            }
-
-            if(World.sortOption1[0] == 2 && World.sortOption2[0] == 1) {
-               AttackOption.worldSelectArrows[3].drawAt(var39 + 15, 4);
-            } else {
-               AttackOption.worldSelectArrows[1].drawAt(var39 + 15, 4);
-            }
-
-            var0.draw("Location", var39 + 32, 17, 16777215, -1);
-            var37 = Login.xPadding + 610;
-            if(World.sortOption1[0] == 3 && World.sortOption2[0] == 0) {
-               AttackOption.worldSelectArrows[2].drawAt(var37, 4);
-            } else {
-               AttackOption.worldSelectArrows[0].drawAt(var37, 4);
-            }
-
-            if(World.sortOption1[0] == 3 && World.sortOption2[0] == 1) {
-               AttackOption.worldSelectArrows[3].drawAt(var37 + 15, 4);
-            } else {
-               AttackOption.worldSelectArrows[1].drawAt(var37 + 15, 4);
-            }
-
-            var0.draw("Type", var37 + 32, 17, 16777215, -1);
-         }
-
-         Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding + 708, 4, 50, 16, 0);
-         var1.drawCentered("Cancel", Login.xPadding + 708 + 25, 16, 16777215, -1);
-         Login.hoveredWorldIndex = -1;
-         if(class30.worldSelectBackSprites != null) {
-            var23 = 88;
-            byte var51 = 19;
-            var39 = 765 / (var23 + 1) - 1;
-            var37 = 480 / (var51 + 1);
-
-            do {
-               var27 = var37;
-               var28 = var39;
-               if(var37 * (var39 - 1) >= World.worldsCount) {
-                  --var39;
-               }
-
-               if(var39 * (var37 - 1) >= World.worldsCount) {
-                  --var37;
-               }
-
-               if(var39 * (var37 - 1) >= World.worldsCount) {
-                  --var37;
-               }
-            } while(var37 != var27 || var39 != var28);
-
-            var27 = (765 - var23 * var39) / (var39 + 1);
-            if(var27 > 5) {
-               var27 = 5;
-            }
-
-            var28 = (480 - var51 * var37) / (var37 + 1);
-            if(var28 > 5) {
-               var28 = 5;
-            }
-
-            var9 = (765 - var39 * var23 - var27 * (var39 - 1)) / 2;
-            int var10 = (480 - var37 * var51 - var28 * (var37 - 1)) / 2;
-            var11 = (var37 + World.worldsCount - 1) / var37;
-            Login.worldSelectPagesCount = var11 - var39;
-            if(SecureRandomFuture.worldSelectLeftSprite != null && Login.worldSelectPage > 0) {
-               SecureRandomFuture.worldSelectLeftSprite.drawAt(8, Huffman.canvasHeight / 2 - SecureRandomFuture.worldSelectLeftSprite.subHeight / 2);
-            }
-
-            if(NetSocket.worldSelectRightSprite != null && Login.worldSelectPage < Login.worldSelectPagesCount) {
-               NetSocket.worldSelectRightSprite.drawAt(SoundCache.canvasWidth - NetSocket.worldSelectRightSprite.subWidth - 8, Huffman.canvasHeight / 2 - NetSocket.worldSelectRightSprite.subHeight / 2);
-            }
-
-            int var41 = var10 + 23;
-            int var42 = var9 + Login.xPadding;
-            int var43 = 0;
-            boolean var15 = false;
-            int var16 = Login.worldSelectPage;
-
-            int var44;
-            for(var44 = var37 * var16; var44 < World.worldsCount && var16 - Login.worldSelectPage < var39; ++var44) {
-               World var29 = ItemContainer.worlds[var44];
-               boolean var46 = true;
-               String var20 = Integer.toString(var29.population);
-               if(var29.population == -1) {
-                  var20 = "OFF";
-                  var46 = false;
-               } else if(var29.population > 1980) {
-                  var20 = "FULL";
-                  var46 = false;
-               }
-
-               int var22 = 0;
-               byte var21;
-               if(var29.isBeta()) {
-                  if(var29.isMembersOnly()) {
-                     var21 = 7;
-                  } else {
-                     var21 = 6;
-                  }
-               } else if(var29.isDeadman()) {
-                  var22 = 0xff0000;
-                  if(var29.isMembersOnly()) {
-                     var21 = 5;
-                  } else {
-                     var21 = 4;
-                  }
-               } else if(var29.isPvp()) {
-                  if(var29.isMembersOnly()) {
-                     var21 = 3;
-                  } else {
-                     var21 = 2;
-                  }
-               } else if(var29.isMembersOnly()) {
-                  var21 = 1;
-               } else {
-                  var21 = 0;
-               }
-
-               if(MouseHandler.MouseHandler_x >= var42 && MouseHandler.MouseHandler_y >= var41 && MouseHandler.MouseHandler_x < var42 + var23 && MouseHandler.MouseHandler_y < var51 + var41 && var46) {
-                  Login.hoveredWorldIndex = var44;
-                  class30.worldSelectBackSprites[var21].drawAtTransOverlay(var42, var41, 128, 0xffffff);
-                  var15 = true;
-               } else {
-                  class30.worldSelectBackSprites[var21].drawAt(var42, var41);
-               }
-
-               if(Frames.worldSelectFlagSprites != null) {
-                  Frames.worldSelectFlagSprites[(var29.isMembersOnly()?8:0) + var29.location].drawAt(var42 + 29, var41);
-               }
-
-               var0.drawCentered(Integer.toString(var29.id), var42 + 15, var51 / 2 + var41 + 5, var22, -1);
-               var1.drawCentered(var20, var42 + 60, var51 / 2 + var41 + 5, 268435455, -1);
-               var41 = var41 + var28 + var51;
-               ++var43;
-               if(var43 >= var37) {
-                  var41 = var10 + 23;
-                  var42 = var42 + var23 + var27;
-                  var43 = 0;
-                  ++var16;
-               }
-            }
-
-            if(var15) {
-               var44 = var1.stringWidth(ItemContainer.worlds[Login.hoveredWorldIndex].activity) + 6;
-               int var45 = var1.ascent + 8;
-               var19 = MouseHandler.MouseHandler_y + 25;
-               if(var45 + var19 > 480) {
-                  var19 = MouseHandler.MouseHandler_y - 25 - var45;
-               }
-
-               Rasterizer2D.Rasterizer2D_fillRectangle(MouseHandler.MouseHandler_x - var44 / 2, var19, var44, var45, 16777120);
-               Rasterizer2D.Rasterizer2D_drawRectangle(MouseHandler.MouseHandler_x - var44 / 2, var19, var44, var45, 0);
-               var1.drawCentered(ItemContainer.worlds[Login.hoveredWorldIndex].activity, MouseHandler.MouseHandler_x, var19 + var1.ascent + 4, 0, -1);
-            }
-         }
-
-         class197.rasterProvider.drawFull(0, 0);
-      } else {
-         Login.leftTitleSprite.drawAt(Login.xPadding, 0);
-         Fonts.rightTitleSprite.drawAt(Login.xPadding + 382, 0);
-         WorldMapSectionType.logoSprite.drawAt(Login.xPadding + 382 - WorldMapSectionType.logoSprite.subWidth / 2, 18);
-         if(Client.gameState == 0 || Client.gameState == 5) {
-            var23 = 20;
-            var0.drawCentered("RuneScape is loading - please wait...", Login.loginBoxX + 180, 245 - var23, 16777215, -1);
-            var24 = 253 - var23;
-            Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 152, var24, 304, 34, 9179409);
-            Rasterizer2D.Rasterizer2D_drawRectangle(Login.loginBoxX + 180 - 151, var24 + 1, 302, 32, 0);
-            Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150, var24 + 2, Login.Login_loadingPercent * 3, 30, 9179409);
-            Rasterizer2D.Rasterizer2D_fillRectangle(Login.loginBoxX + 180 - 150 + Login.Login_loadingPercent * 3, var24 + 2, 300 - Login.Login_loadingPercent * 3, 30, 0);
-            var0.drawCentered(Login.Login_loadingText, Login.loginBoxX + 180, 276 - var23, 16777215, -1);
-         }
-
-         String var7;
-         String var8;
-         String var25;
-         String var30;
-         String var31;
-         short var47;
-         short var49;
-         if(Client.gameState == 20) {
-            Login.titleboxSprite.drawAt(Login.loginBoxX + 180 - Login.titleboxSprite.subWidth / 2, 271 - Login.titleboxSprite.subHeight / 2);
-            var47 = 201;
-            var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var47, 16776960, 0);
-            var48 = var47 + 15;
-            var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var48, 16776960, 0);
-            var48 += 15;
-            var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var48, 16776960, 0);
-            var48 += 15;
-            var48 += 7;
-            if(Login.loginIndex != 4) {
-               var0.draw("Login: ", Login.loginBoxX + 180 - 110, var48, 16777215, 0);
-               var49 = 200;
-               if(ReflectionCheck.clientPreferences.hideUsername) {
-                  var8 = Login.Login_username;
-                  var7 = class168.method3450('*', var8.length());
-                  var25 = var7;
-               } else {
-                  var25 = Login.Login_username;
-               }
-
-               for(var25 = var25; var0.stringWidth(var25) > var49; var25 = var25.substring(0, var25.length() - 1)) {
-                  ;
-               }
-
-               var0.draw(AbstractFont.escapeBrackets(var25), Login.loginBoxX + 180 - 70, var48, 16777215, 0);
-               var48 += 15;
-               var8 = "Password: ";
-               var30 = Login.Login_password;
-               var31 = class168.method3450('*', var30.length());
-               var0.draw(var8 + var31, Login.loginBoxX + 180 - 108, var48, 16777215, 0);
-               var48 += 15;
-            }
-         }
-
-         if(Client.gameState == 10 || Client.gameState == 11) {
-            Login.titleboxSprite.drawAt(Login.loginBoxX, 171);
-            short var5;
-            if(Login.loginIndex == 0) {
-               var47 = 251;
-               var0.drawCentered("Welcome to RuneScape", Login.loginBoxX + 180, var47, 16776960, 0);
-               var48 = var47 + 30;
-               var24 = Login.loginBoxX + 180 - 80;
-               var5 = 291;
-               titlebuttonSprite.drawAt(var24 - 73, var5 - 20);
-               var0.drawLines("New User", var24 - 73, var5 - 20, 144, 40, 16777215, 0, 1, 1, 0);
-               var24 = Login.loginBoxX + 180 + 80;
-               titlebuttonSprite.drawAt(var24 - 73, var5 - 20);
-               var0.drawLines("Existing User", var24 - 73, var5 - 20, 144, 40, 16777215, 0, 1, 1, 0);
-            } else if(Login.loginIndex == 1) {
-               var0.drawCentered(Login.Login_response0, Login.loginBoxX + 180, 201, 16776960, 0);
-               var47 = 236;
-               var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var47, 16777215, 0);
-               var48 = var47 + 15;
-               var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var48, 16777215, 0);
-               var48 += 15;
-               var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var48, 16777215, 0);
-               var48 += 15;
-               var24 = Login.loginBoxX + 180 - 80;
-               var5 = 321;
-               titlebuttonSprite.drawAt(var24 - 73, var5 - 20);
-               var0.drawCentered("Continue", var24, var5 + 5, 16777215, 0);
-               var24 = Login.loginBoxX + 180 + 80;
-               titlebuttonSprite.drawAt(var24 - 73, var5 - 20);
-               var0.drawCentered("Cancel", var24, var5 + 5, 16777215, 0);
-            } else if(Login.loginIndex == 2) {
-               var47 = 201;
-               var0.drawCentered(Login.Login_response1, Varps.loginBoxCenter, var47, 16776960, 0);
-               var48 = var47 + 15;
-               var0.drawCentered(Login.Login_response2, Varps.loginBoxCenter, var48, 16776960, 0);
-               var48 += 15;
-               var0.drawCentered(Login.Login_response3, Varps.loginBoxCenter, var48, 16776960, 0);
-               var48 += 15;
-               var48 += 7;
-               var0.draw("Login: ", Varps.loginBoxCenter - 110, var48, 16777215, 0);
-               var49 = 200;
-               if(ReflectionCheck.clientPreferences.hideUsername) {
-                  var8 = Login.Login_username;
-                  var7 = class168.method3450('*', var8.length());
-                  var25 = var7;
-               } else {
-                  var25 = Login.Login_username;
-               }
-
-               for(var25 = var25; var0.stringWidth(var25) > var49; var25 = var25.substring(1)) {
-                  ;
-               }
-
-               var0.draw(AbstractFont.escapeBrackets(var25) + (Login.currentLoginField == 0 & Client.cycle % 40 < 20?BufferedFile.colorStartTag(16776960) + "|":""), Varps.loginBoxCenter - 70, var48, 16777215, 0);
-               var48 += 15;
-               var8 = "Password: ";
-               var30 = Login.Login_password;
-               var31 = class168.method3450('*', var30.length());
-               var0.draw(var8 + var31 + (Login.currentLoginField == 1 & Client.cycle % 40 < 20?BufferedFile.colorStartTag(16776960) + "|":""), Varps.loginBoxCenter - 108, var48, 16777215, 0);
-               var48 += 15;
-               var47 = 277;
-               var11 = Varps.loginBoxCenter + -117;
-               boolean var13 = Client.Login_isUsernameRemembered;
-               boolean var14 = Login.__cu_aa;
-               IndexedSprite var32 = var13?(var14?KeyHandler.options_buttons_6Sprite :class308.options_buttons_2Sprite):(var14?GraphicsObject.options_buttons_4Sprite :Login.options_buttons_0Sprite);
-               var32.drawAt(var11, var47);
-               var11 = var11 + var32.subWidth + 5;
-               var1.draw("Remember username", var11, var47 + 13, 16776960, 0);
-               var11 = Varps.loginBoxCenter + 24;
-               boolean var17 = ReflectionCheck.clientPreferences.hideUsername;
-               boolean var18 = Login.__cu_ax;
-               IndexedSprite var34 = var17?(var18?KeyHandler.options_buttons_6Sprite :class308.options_buttons_2Sprite):(var18?GraphicsObject.options_buttons_4Sprite :Login.options_buttons_0Sprite);
-               var34.drawAt(var11, var47);
-               var11 = var11 + var34.subWidth + 5;
-               var1.draw("Hide username", var11, var47 + 13, 16776960, 0);
-               var48 = var47 + 15;
-               var19 = Varps.loginBoxCenter - 80;
-               short var35 = 321;
-               titlebuttonSprite.drawAt(var19 - 73, var35 - 20);
-               var0.drawCentered("Login", var19, var35 + 5, 16777215, 0);
-               var19 = Varps.loginBoxCenter + 80;
-               titlebuttonSprite.drawAt(var19 - 73, var35 - 20);
-               var0.drawCentered("Cancel", var19, var35 + 5, 16777215, 0);
-               var47 = 357;
-               switch(Login.__cu_ac) {
-               case 2:
-                  AttackOption.__cj_ay = "Having trouble logging in?";
-                  break;
-               default:
-                  AttackOption.__cj_ay = "Can\'t login? Click here.";
-               }
-
-               TilePaint.__eb_ah = new Bounds(Varps.loginBoxCenter, var47, var1.stringWidth(AttackOption.__cj_ay), 11);
-               UrlRequester.__eo_ak = new Bounds(Varps.loginBoxCenter, var47, var1.stringWidth("Still having trouble logging in?"), 11);
-               var1.drawCentered(AttackOption.__cj_ay, Varps.loginBoxCenter, var47, 16777215, 0);
-            } else if(Login.loginIndex == 3) {
-               var47 = 201;
-               var0.drawCentered("Invalid credentials.", Login.loginBoxX + 180, var47, 16776960, 0);
-               var48 = var47 + 20;
-               var1.drawCentered("For accounts created after 24th November 2010, please use your", Login.loginBoxX + 180, var48, 16776960, 0);
-               var48 += 15;
-               var1.drawCentered("email address to login. Otherwise please login with your username.", Login.loginBoxX + 180, var48, 16776960, 0);
-               var48 += 15;
-               var24 = Login.loginBoxX + 180;
-               var5 = 276;
-               titlebuttonSprite.drawAt(var24 - 73, var5 - 20);
-               var2.drawCentered("Try again", var24, var5 + 5, 16777215, 0);
-               var24 = Login.loginBoxX + 180;
-               var5 = 326;
-               titlebuttonSprite.drawAt(var24 - 73, var5 - 20);
-               var2.drawCentered("Forgotten password?", var24, var5 + 5, 16777215, 0);
-            } else {
-               String var26;
-               if(Login.loginIndex == 4) {
-                  var0.drawCentered("Authenticator", Login.loginBoxX + 180, 201, 16776960, 0);
-                  var47 = 236;
-                  var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var47, 16777215, 0);
-                  var48 = var47 + 15;
-                  var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var48, 16777215, 0);
-                  var48 += 15;
-                  var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var48, 16777215, 0);
-                  var48 += 15;
-                  var26 = "PIN: ";
-                  var7 = Login.otp;
-                  var25 = class168.method3450('*', var7.length());
-                  var0.draw(var26 + var25 + (Client.cycle % 40 < 20?BufferedFile.colorStartTag(16776960) + "|":""), Login.loginBoxX + 180 - 108, var48, 16777215, 0);
-                  var48 -= 8;
-                  var0.draw("Trust this computer", Login.loginBoxX + 180 - 9, var48, 16776960, 0);
-                  var48 += 15;
-                  var0.draw("for 30 days: ", Login.loginBoxX + 180 - 9, var48, 16776960, 0);
-                  var28 = Login.loginBoxX + 180 - 9 + var0.stringWidth("for 30 days: ") + 15;
-                  var9 = var48 - var0.ascent;
-                  IndexedSprite var52;
-                  if(Login.__cu_ba) {
-                     var52 = class308.options_buttons_2Sprite;
-                  } else {
-                     var52 = Login.options_buttons_0Sprite;
-                  }
-
-                  var52.drawAt(var28, var9);
-                  var48 += 15;
-                  var11 = Login.loginBoxX + 180 - 80;
-                  short var12 = 321;
-                  titlebuttonSprite.drawAt(var11 - 73, var12 - 20);
-                  var0.drawCentered("Continue", var11, var12 + 5, 16777215, 0);
-                  var11 = Login.loginBoxX + 180 + 80;
-                  titlebuttonSprite.drawAt(var11 - 73, var12 - 20);
-                  var0.drawCentered("Cancel", var11, var12 + 5, 16777215, 0);
-                  var1.drawCentered("<u=ff>Can\'t Log In?</u>", Login.loginBoxX + 180, var12 + 36, 255, 0);
-               } else {
-                  short var50;
-                  if(Login.loginIndex == 5) {
-                     var0.drawCentered("Forgotten your password?", Login.loginBoxX + 180, 201, 16776960, 0);
-                     var47 = 221;
-                     var2.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var47, 16776960, 0);
-                     var48 = var47 + 15;
-                     var2.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var48, 16776960, 0);
-                     var48 += 15;
-                     var2.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var48, 16776960, 0);
-                     var48 += 15;
-                     var48 += 14;
-                     var0.draw("Username/email: ", Login.loginBoxX + 180 - 145, var48, 16777215, 0);
-                     var49 = 174;
-                     if(ReflectionCheck.clientPreferences.hideUsername) {
-                        var8 = Login.Login_username;
-                        var7 = class168.method3450('*', var8.length());
-                        var25 = var7;
-                     } else {
-                        var25 = Login.Login_username;
-                     }
-
-                     for(var25 = var25; var0.stringWidth(var25) > var49; var25 = var25.substring(1)) {
-                        ;
-                     }
-
-                     var0.draw(AbstractFont.escapeBrackets(var25) + (Client.cycle % 40 < 20?BufferedFile.colorStartTag(16776960) + "|":""), Login.loginBoxX + 180 - 34, var48, 16777215, 0);
-                     var48 += 15;
-                     var27 = Login.loginBoxX + 180 - 80;
-                     var50 = 321;
-                     titlebuttonSprite.drawAt(var27 - 73, var50 - 20);
-                     var0.drawCentered("Recover", var27, var50 + 5, 16777215, 0);
-                     var27 = Login.loginBoxX + 180 + 80;
-                     titlebuttonSprite.drawAt(var27 - 73, var50 - 20);
-                     var0.drawCentered("Back", var27, var50 + 5, 16777215, 0);
-                     var50 = 356;
-                     var1.drawCentered("Still having trouble logging in?", Varps.loginBoxCenter, var50, 268435455, 0);
-                  } else if(Login.loginIndex == 6) {
-                     var47 = 201;
-                     var0.drawCentered(Login.Login_response1, Login.loginBoxX + 180, var47, 16776960, 0);
-                     var48 = var47 + 15;
-                     var0.drawCentered(Login.Login_response2, Login.loginBoxX + 180, var48, 16776960, 0);
-                     var48 += 15;
-                     var0.drawCentered(Login.Login_response3, Login.loginBoxX + 180, var48, 16776960, 0);
-                     var48 += 15;
-                     var24 = Login.loginBoxX + 180;
-                     var5 = 321;
-                     titlebuttonSprite.drawAt(var24 - 73, var5 - 20);
-                     var0.drawCentered("Back", var24, var5 + 5, 16777215, 0);
-                  } else if(Login.loginIndex == 7) {
-                     var47 = 216;
-                     var0.drawCentered("Your date of birth isn\'t set.", Login.loginBoxX + 180, var47, 16776960, 0);
-                     var48 = var47 + 15;
-                     var2.drawCentered("Please verify your account status by", Login.loginBoxX + 180, var48, 16776960, 0);
-                     var48 += 15;
-                     var2.drawCentered("setting your date of birth.", Login.loginBoxX + 180, var48, 16776960, 0);
-                     var48 += 15;
-                     var24 = Login.loginBoxX + 180 - 80;
-                     var5 = 321;
-                     titlebuttonSprite.drawAt(var24 - 73, var5 - 20);
-                     var0.drawCentered("Set Date of Birth", var24, var5 + 5, 16777215, 0);
-                     var24 = Login.loginBoxX + 180 + 80;
-                     titlebuttonSprite.drawAt(var24 - 73, var5 - 20);
-                     var0.drawCentered("Back", var24, var5 + 5, 16777215, 0);
-                  } else if(Login.loginIndex == 8) {
-                     var47 = 216;
-                     var0.drawCentered("Sorry, but your account is not eligible to play.", Login.loginBoxX + 180, var47, 16776960, 0);
-                     var48 = var47 + 15;
-                     var2.drawCentered("For more information, please take a look at", Login.loginBoxX + 180, var48, 16776960, 0);
-                     var48 += 15;
-                     var2.drawCentered("our privacy policy.", Login.loginBoxX + 180, var48, 16776960, 0);
-                     var48 += 15;
-                     var24 = Login.loginBoxX + 180 - 80;
-                     var5 = 321;
-                     titlebuttonSprite.drawAt(var24 - 73, var5 - 20);
-                     var0.drawCentered("Privacy Policy", var24, var5 + 5, 16777215, 0);
-                     var24 = Login.loginBoxX + 180 + 80;
-                     titlebuttonSprite.drawAt(var24 - 73, var5 - 20);
-                     var0.drawCentered("Back", var24, var5 + 5, 16777215, 0);
-                  } else if(Login.loginIndex == 12) {
-                     var47 = 201;
-                     String var4 = "";
-                     var26 = "";
-                     var25 = "";
-                     switch(Login.__cu_aj) {
-                     case 0:
-                        var4 = "Your account has been disabled.";
-                        var26 = Strings.__id_bq;
-                        var25 = "";
-                        break;
-                     case 1:
-                        var4 = "Account locked as we suspect it has been stolen.";
-                        var26 = Strings.__id_cp;
-                        var25 = "";
-                        break;
-                     default:
-                        MouseHandler.method1084(false);
-                     }
-
-                     var0.drawCentered(var4, Login.loginBoxX + 180, var47, 16776960, 0);
-                     var48 = var47 + 15;
-                     var2.drawCentered(var26, Login.loginBoxX + 180, var48, 16776960, 0);
-                     var48 += 15;
-                     var2.drawCentered(var25, Login.loginBoxX + 180, var48, 16776960, 0);
-                     var48 += 15;
-                     var27 = Login.loginBoxX + 180;
-                     var50 = 276;
-                     titlebuttonSprite.drawAt(var27 - 73, var50 - 20);
-                     var0.drawCentered("Support Page", var27, var50 + 5, 16777215, 0);
-                     var27 = Login.loginBoxX + 180;
-                     var50 = 326;
-                     titlebuttonSprite.drawAt(var27 - 73, var50 - 20);
-                     var0.drawCentered("Back", var27, var50 + 5, 16777215, 0);
-                  }
-               }
-            }
-         }
-
-         if(Client.gameState >= 10) {
-            int[] var3 = new int[4];
-            Rasterizer2D.Rasterizer2D_getClipArray(var3);
-            Rasterizer2D.Rasterizer2D_setClip(Login.xPadding, 0, Login.xPadding + 765, Huffman.canvasHeight);
-            class16.loginScreenRunesAnimation.method1782(Login.xPadding - 22, Client.cycle);
-            class16.loginScreenRunesAnimation.method1782(Login.xPadding + 22 + 765 - 128, Client.cycle);
-            Rasterizer2D.Rasterizer2D_setClipArray(var3);
-         }
-
-         KeyHandler.title_muteSprite[ReflectionCheck.clientPreferences.titleMusicDisabled?1:0].drawAt(Login.xPadding + 765 - 40, 463);
-         if(Client.gameState > 5 && Client.language == 0) {
-            if(class277.__jn_by != null) {
-               var48 = Login.xPadding + 5;
-               var49 = 463;
-               byte var38 = 100;
-               byte var6 = 35;
-               class277.__jn_by.drawAt(var48, var49);
-               var0.drawCentered("World" + " " + Client.worldId, var38 / 2 + var48, var6 / 2 + var49 - 2, 16777215, 0);
-               if(FriendLoginUpdate.__kn_x != null) {
-                  var1.drawCentered("Loading...", var38 / 2 + var48, var6 / 2 + var49 + 12, 16777215, 0);
-               } else {
-                  var1.drawCentered("Click to switch", var38 / 2 + var48, var6 / 2 + var49 + 12, 16777215, 0);
-               }
-            } else {
-               class277.__jn_by = MenuAction.loadIndexedSpriteByName(WorldMapSection3.indexCache8, "sl_button", "");
-            }
-         }
-
-      }
-   }
-}
diff --git a/runescape-client/src/main/java/IndexStore.java b/runescape-client/src/main/java/IndexStore.java
deleted file mode 100644
index c17efeb20a..0000000000
--- a/runescape-client/src/main/java/IndexStore.java
+++ /dev/null
@@ -1,488 +0,0 @@
-import java.io.EOFException;
-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("ff")
-@Implements("IndexStore")
-public final class IndexStore {
-   @ObfuscatedName("m")
-   @Export("IndexStore_buffer")
-   static byte[] IndexStore_buffer;
-   @ObfuscatedName("f")
-   @ObfuscatedSignature(
-      signature = "Ldy;"
-   )
-   @Export("dataFile")
-   BufferedFile dataFile;
-   @ObfuscatedName("q")
-   @ObfuscatedSignature(
-      signature = "Ldy;"
-   )
-   @Export("indexFile")
-   BufferedFile indexFile;
-   @ObfuscatedName("w")
-   @ObfuscatedGetter(
-      intValue = -1982523283
-   )
-   @Export("index")
-   int index;
-   @ObfuscatedName("o")
-   @ObfuscatedGetter(
-      intValue = -748616567
-   )
-   @Export("maxEntrySize")
-   int maxEntrySize;
-
-   static {
-      IndexStore_buffer = new byte[520];
-   }
-
-   @ObfuscatedSignature(
-      signature = "(ILdy;Ldy;I)V"
-   )
-   public IndexStore(int var1, BufferedFile var2, BufferedFile var3, int var4) {
-      this.dataFile = null;
-      this.indexFile = null;
-      this.maxEntrySize = 65000;
-      this.index = var1;
-      this.dataFile = var2;
-      this.indexFile = var3;
-      this.maxEntrySize = var4;
-   }
-
-   @ObfuscatedName("m")
-   @ObfuscatedSignature(
-      signature = "(II)[B",
-      garbageValue = "-294587791"
-   )
-   @Export("read")
-   public byte[] read(int var1) {
-      BufferedFile var2 = this.dataFile;
-      synchronized(this.dataFile) {
-         try {
-            Object var10000;
-            if(this.indexFile.length() < (long)(var1 * 6 + 6)) {
-               var10000 = null;
-               return (byte[])var10000;
-            } else {
-               this.indexFile.seek((long)(var1 * 6));
-               this.indexFile.read(IndexStore_buffer, 0, 6);
-               int var3 = ((IndexStore_buffer[0] & 255) << 16) + (IndexStore_buffer[2] & 255) + ((IndexStore_buffer[1] & 255) << 8);
-               int var4 = (IndexStore_buffer[5] & 255) + ((IndexStore_buffer[3] & 255) << 16) + ((IndexStore_buffer[4] & 255) << 8);
-               if(var3 < 0 || var3 > this.maxEntrySize) {
-                  var10000 = null;
-                  return (byte[])var10000;
-               } else if(var4 <= 0 || (long)var4 > this.dataFile.length() / 520L) {
-                  var10000 = null;
-                  return (byte[])var10000;
-               } else {
-                  byte[] var5 = new byte[var3];
-                  int var6 = 0;
-                  int var7 = 0;
-
-                  while(var6 < var3) {
-                     if(var4 == 0) {
-                        var10000 = null;
-                        return (byte[])var10000;
-                     }
-
-                     this.dataFile.seek((long)(var4 * 520));
-                     int var8 = var3 - var6;
-                     if(var8 > 512) {
-                        var8 = 512;
-                     }
-
-                     this.dataFile.read(IndexStore_buffer, 0, var8 + 8);
-                     int var9 = (IndexStore_buffer[1] & 255) + ((IndexStore_buffer[0] & 255) << 8);
-                     int var10 = (IndexStore_buffer[3] & 255) + ((IndexStore_buffer[2] & 255) << 8);
-                     int var11 = ((IndexStore_buffer[5] & 255) << 8) + ((IndexStore_buffer[4] & 255) << 16) + (IndexStore_buffer[6] & 255);
-                     int var12 = IndexStore_buffer[7] & 255;
-                     if(var9 == var1 && var7 == var10 && var12 == this.index) {
-                        if(var11 >= 0 && (long)var11 <= this.dataFile.length() / 520L) {
-                           for(int var13 = 0; var13 < var8; ++var13) {
-                              var5[var6++] = IndexStore_buffer[var13 + 8];
-                           }
-
-                           var4 = var11;
-                           ++var7;
-                           continue;
-                        }
-
-                        var10000 = null;
-                        return (byte[])var10000;
-                     }
-
-                     var10000 = null;
-                     return (byte[])var10000;
-                  }
-
-                  byte[] var18 = var5;
-                  return var18;
-               }
-            }
-         } catch (IOException var16) {
-            return null;
-         }
-      }
-   }
-
-   @ObfuscatedName("f")
-   @ObfuscatedSignature(
-      signature = "(I[BII)Z",
-      garbageValue = "-1750864122"
-   )
-   @Export("write")
-   public boolean write(int var1, byte[] var2, int var3) {
-      BufferedFile var4 = this.dataFile;
-      synchronized(this.dataFile) {
-         if(var3 >= 0 && var3 <= this.maxEntrySize) {
-            boolean var5 = this.write0(var1, var2, var3, true);
-            if(!var5) {
-               var5 = this.write0(var1, var2, var3, false);
-            }
-
-            return var5;
-         } else {
-            throw new IllegalArgumentException();
-         }
-      }
-   }
-
-   @ObfuscatedName("q")
-   @ObfuscatedSignature(
-      signature = "(I[BIZI)Z",
-      garbageValue = "-944588642"
-   )
-   @Export("write0")
-   boolean write0(int var1, byte[] var2, int var3, boolean var4) {
-      BufferedFile var5 = this.dataFile;
-      synchronized(this.dataFile) {
-         try {
-            int var6;
-            boolean var10000;
-            if(var4) {
-               if(this.indexFile.length() < (long)(var1 * 6 + 6)) {
-                  var10000 = false;
-                  return var10000;
-               }
-
-               this.indexFile.seek((long)(var1 * 6));
-               this.indexFile.read(IndexStore_buffer, 0, 6);
-               var6 = (IndexStore_buffer[5] & 255) + ((IndexStore_buffer[3] & 255) << 16) + ((IndexStore_buffer[4] & 255) << 8);
-               if(var6 <= 0 || (long)var6 > this.dataFile.length() / 520L) {
-                  var10000 = false;
-                  return var10000;
-               }
-            } else {
-               var6 = (int)((this.dataFile.length() + 519L) / 520L);
-               if(var6 == 0) {
-                  var6 = 1;
-               }
-            }
-
-            IndexStore_buffer[0] = (byte)(var3 >> 16);
-            IndexStore_buffer[1] = (byte)(var3 >> 8);
-            IndexStore_buffer[2] = (byte)var3;
-            IndexStore_buffer[3] = (byte)(var6 >> 16);
-            IndexStore_buffer[4] = (byte)(var6 >> 8);
-            IndexStore_buffer[5] = (byte)var6;
-            this.indexFile.seek((long)(var1 * 6));
-            this.indexFile.write(IndexStore_buffer, 0, 6);
-            int var7 = 0;
-            int var8 = 0;
-
-            while(true) {
-               if(var7 < var3) {
-                  label142: {
-                     int var9 = 0;
-                     int var14;
-                     if(var4) {
-                        this.dataFile.seek((long)(var6 * 520));
-
-                        try {
-                           this.dataFile.read(IndexStore_buffer, 0, 8);
-                        } catch (EOFException var16) {
-                           break label142;
-                        }
-
-                        var14 = (IndexStore_buffer[1] & 255) + ((IndexStore_buffer[0] & 255) << 8);
-                        int var11 = (IndexStore_buffer[3] & 255) + ((IndexStore_buffer[2] & 255) << 8);
-                        var9 = ((IndexStore_buffer[5] & 255) << 8) + ((IndexStore_buffer[4] & 255) << 16) + (IndexStore_buffer[6] & 255);
-                        int var12 = IndexStore_buffer[7] & 255;
-                        if(var14 != var1 || var11 != var8 || var12 != this.index) {
-                           var10000 = false;
-                           return var10000;
-                        }
-
-                        if(var9 < 0 || (long)var9 > this.dataFile.length() / 520L) {
-                           var10000 = false;
-                           return var10000;
-                        }
-                     }
-
-                     if(var9 == 0) {
-                        var4 = false;
-                        var9 = (int)((this.dataFile.length() + 519L) / 520L);
-                        if(var9 == 0) {
-                           ++var9;
-                        }
-
-                        if(var6 == var9) {
-                           ++var9;
-                        }
-                     }
-
-                     if(var3 - var7 <= 512) {
-                        var9 = 0;
-                     }
-
-                     IndexStore_buffer[0] = (byte)(var1 >> 8);
-                     IndexStore_buffer[1] = (byte)var1;
-                     IndexStore_buffer[2] = (byte)(var8 >> 8);
-                     IndexStore_buffer[3] = (byte)var8;
-                     IndexStore_buffer[4] = (byte)(var9 >> 16);
-                     IndexStore_buffer[5] = (byte)(var9 >> 8);
-                     IndexStore_buffer[6] = (byte)var9;
-                     IndexStore_buffer[7] = (byte)this.index;
-                     this.dataFile.seek((long)(var6 * 520));
-                     this.dataFile.write(IndexStore_buffer, 0, 8);
-                     var14 = var3 - var7;
-                     if(var14 > 512) {
-                        var14 = 512;
-                     }
-
-                     this.dataFile.write(var2, var7, var14);
-                     var7 += var14;
-                     var6 = var9;
-                     ++var8;
-                     continue;
-                  }
-               }
-
-               var10000 = true;
-               return var10000;
-            }
-         } catch (IOException var17) {
-            return false;
-         }
-      }
-   }
-
-   @ObfuscatedName("q")
-   @ObfuscatedSignature(
-      signature = "(IIILfe;Lfy;B)Z",
-      garbageValue = "1"
-   )
-   static final boolean method3585(int var0, int var1, int var2, RouteStrategy var3, CollisionMap var4) {
-      int var5 = var0;
-      int var6 = var1;
-      byte var7 = 64;
-      byte var8 = 64;
-      int var9 = var0 - var7;
-      int var10 = var1 - var8;
-      class178.directions[var7][var8] = 99;
-      class178.distances[var7][var8] = 0;
-      byte var11 = 0;
-      int var12 = 0;
-      class178.bufferX[var11] = var0;
-      int var20 = var11 + 1;
-      class178.bufferY[var11] = var1;
-      int[][] var13 = var4.flags;
-
-      while(true) {
-         label300:
-         while(true) {
-            int var14;
-            int var15;
-            int var16;
-            int var17;
-            int var18;
-            int var19;
-            do {
-               do {
-                  do {
-                     label277:
-                     do {
-                        if(var20 == var12) {
-                           WidgetGroupParent.__bx_o = var5;
-                           UrlRequester.__eo_u = var6;
-                           return false;
-                        }
-
-                        var5 = class178.bufferX[var12];
-                        var6 = class178.bufferY[var12];
-                        var12 = var12 + 1 & 4095;
-                        var18 = var5 - var9;
-                        var19 = var6 - var10;
-                        var14 = var5 - var4.xInset;
-                        var15 = var6 - var4.yInset;
-                        if(var3.vmethod3644(var2, var5, var6, var4)) {
-                           WidgetGroupParent.__bx_o = var5;
-                           UrlRequester.__eo_u = var6;
-                           return true;
-                        }
-
-                        var16 = class178.distances[var18][var19] + 1;
-                        if(var18 > 0 && class178.directions[var18 - 1][var19] == 0 && (var13[var14 - 1][var15] & 19136782) == 0 && (var13[var14 - 1][var15 + var2 - 1] & 19136824) == 0) {
-                           var17 = 1;
-
-                           while(true) {
-                              if(var17 >= var2 - 1) {
-                                 class178.bufferX[var20] = var5 - 1;
-                                 class178.bufferY[var20] = var6;
-                                 var20 = var20 + 1 & 4095;
-                                 class178.directions[var18 - 1][var19] = 2;
-                                 class178.distances[var18 - 1][var19] = var16;
-                                 break;
-                              }
-
-                              if((var13[var14 - 1][var17 + var15] & 19136830) != 0) {
-                                 break;
-                              }
-
-                              ++var17;
-                           }
-                        }
-
-                        if(var18 < 128 - var2 && class178.directions[var18 + 1][var19] == 0 && (var13[var14 + var2][var15] & 19136899) == 0 && (var13[var14 + var2][var15 + var2 - 1] & 19136992) == 0) {
-                           var17 = 1;
-
-                           while(true) {
-                              if(var17 >= var2 - 1) {
-                                 class178.bufferX[var20] = var5 + 1;
-                                 class178.bufferY[var20] = var6;
-                                 var20 = var20 + 1 & 4095;
-                                 class178.directions[var18 + 1][var19] = 8;
-                                 class178.distances[var18 + 1][var19] = var16;
-                                 break;
-                              }
-
-                              if((var13[var14 + var2][var15 + var17] & 19136995) != 0) {
-                                 break;
-                              }
-
-                              ++var17;
-                           }
-                        }
-
-                        if(var19 > 0 && class178.directions[var18][var19 - 1] == 0 && (var13[var14][var15 - 1] & 19136782) == 0 && (var13[var14 + var2 - 1][var15 - 1] & 19136899) == 0) {
-                           var17 = 1;
-
-                           while(true) {
-                              if(var17 >= var2 - 1) {
-                                 class178.bufferX[var20] = var5;
-                                 class178.bufferY[var20] = var6 - 1;
-                                 var20 = var20 + 1 & 4095;
-                                 class178.directions[var18][var19 - 1] = 1;
-                                 class178.distances[var18][var19 - 1] = var16;
-                                 break;
-                              }
-
-                              if((var13[var17 + var14][var15 - 1] & 19136911) != 0) {
-                                 break;
-                              }
-
-                              ++var17;
-                           }
-                        }
-
-                        if(var19 < 128 - var2 && class178.directions[var18][var19 + 1] == 0 && (var13[var14][var15 + var2] & 19136824) == 0 && (var13[var14 + var2 - 1][var15 + var2] & 19136992) == 0) {
-                           var17 = 1;
-
-                           while(true) {
-                              if(var17 >= var2 - 1) {
-                                 class178.bufferX[var20] = var5;
-                                 class178.bufferY[var20] = var6 + 1;
-                                 var20 = var20 + 1 & 4095;
-                                 class178.directions[var18][var19 + 1] = 4;
-                                 class178.distances[var18][var19 + 1] = var16;
-                                 break;
-                              }
-
-                              if((var13[var17 + var14][var15 + var2] & 19137016) != 0) {
-                                 break;
-                              }
-
-                              ++var17;
-                           }
-                        }
-
-                        if(var18 > 0 && var19 > 0 && class178.directions[var18 - 1][var19 - 1] == 0 && (var13[var14 - 1][var15 - 1] & 19136782) == 0) {
-                           var17 = 1;
-
-                           while(true) {
-                              if(var17 >= var2) {
-                                 class178.bufferX[var20] = var5 - 1;
-                                 class178.bufferY[var20] = var6 - 1;
-                                 var20 = var20 + 1 & 4095;
-                                 class178.directions[var18 - 1][var19 - 1] = 3;
-                                 class178.distances[var18 - 1][var19 - 1] = var16;
-                                 break;
-                              }
-
-                              if((var13[var14 - 1][var17 + (var15 - 1)] & 19136830) != 0 || (var13[var17 + (var14 - 1)][var15 - 1] & 19136911) != 0) {
-                                 break;
-                              }
-
-                              ++var17;
-                           }
-                        }
-
-                        if(var18 < 128 - var2 && var19 > 0 && class178.directions[var18 + 1][var19 - 1] == 0 && (var13[var14 + var2][var15 - 1] & 19136899) == 0) {
-                           var17 = 1;
-
-                           while(true) {
-                              if(var17 >= var2) {
-                                 class178.bufferX[var20] = var5 + 1;
-                                 class178.bufferY[var20] = var6 - 1;
-                                 var20 = var20 + 1 & 4095;
-                                 class178.directions[var18 + 1][var19 - 1] = 9;
-                                 class178.distances[var18 + 1][var19 - 1] = var16;
-                                 break;
-                              }
-
-                              if((var13[var14 + var2][var17 + (var15 - 1)] & 19136995) != 0 || (var13[var17 + var14][var15 - 1] & 19136911) != 0) {
-                                 break;
-                              }
-
-                              ++var17;
-                           }
-                        }
-
-                        if(var18 > 0 && var19 < 128 - var2 && class178.directions[var18 - 1][var19 + 1] == 0 && (var13[var14 - 1][var15 + var2] & 19136824) == 0) {
-                           for(var17 = 1; var17 < var2; ++var17) {
-                              if((var13[var14 - 1][var15 + var17] & 19136830) != 0 || (var13[var17 + (var14 - 1)][var15 + var2] & 19137016) != 0) {
-                                 continue label277;
-                              }
-                           }
-
-                           class178.bufferX[var20] = var5 - 1;
-                           class178.bufferY[var20] = var6 + 1;
-                           var20 = var20 + 1 & 4095;
-                           class178.directions[var18 - 1][var19 + 1] = 6;
-                           class178.distances[var18 - 1][var19 + 1] = var16;
-                        }
-                     } while(var18 >= 128 - var2);
-                  } while(var19 >= 128 - var2);
-               } while(class178.directions[var18 + 1][var19 + 1] != 0);
-            } while((var13[var14 + var2][var15 + var2] & 19136992) != 0);
-
-            for(var17 = 1; var17 < var2; ++var17) {
-               if((var13[var14 + var17][var15 + var2] & 19137016) != 0 || (var13[var14 + var2][var17 + var15] & 19136995) != 0) {
-                  continue label300;
-               }
-            }
-
-            class178.bufferX[var20] = var5 + 1;
-            class178.bufferY[var20] = var6 + 1;
-            var20 = var20 + 1 & 4095;
-            class178.directions[var18 + 1][var19 + 1] = 12;
-            class178.distances[var18 + 1][var19 + 1] = var16;
-         }
-      }
-   }
-}
diff --git a/runescape-client/src/main/java/IndexStoreActionHandler.java b/runescape-client/src/main/java/IndexStoreActionHandler.java
deleted file mode 100644
index 5d0c97e34c..0000000000
--- a/runescape-client/src/main/java/IndexStoreActionHandler.java
+++ /dev/null
@@ -1,107 +0,0 @@
-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("iv")
-@Implements("IndexStoreActionHandler")
-public class IndexStoreActionHandler implements Runnable {
-   @ObfuscatedName("m")
-   @ObfuscatedSignature(
-      signature = "Lje;"
-   )
-   @Export("IndexStoreActionHandler_requestQueue")
-   static NodeDeque IndexStoreActionHandler_requestQueue;
-   @ObfuscatedName("f")
-   @ObfuscatedSignature(
-      signature = "Lje;"
-   )
-   @Export("IndexStoreActionHandler_responseQueue")
-   static NodeDeque IndexStoreActionHandler_responseQueue;
-   @ObfuscatedName("q")
-   @ObfuscatedGetter(
-      intValue = -1282224505
-   )
-   static int __iv_q;
-   @ObfuscatedName("w")
-   @Export("IndexStoreActionHandler_lock")
-   static Object IndexStoreActionHandler_lock;
-
-   static {
-      IndexStoreActionHandler_requestQueue = new NodeDeque();
-      IndexStoreActionHandler_responseQueue = new NodeDeque();
-      __iv_q = 0;
-      IndexStoreActionHandler_lock = new Object();
-   }
-
-   @Export("run")
-   @ObfuscatedName("run")
-   public void run() {
-      try {
-         while(true) {
-            NodeDeque var2 = IndexStoreActionHandler_requestQueue;
-            IndexStoreAction var1;
-            synchronized(IndexStoreActionHandler_requestQueue) {
-               var1 = (IndexStoreAction)IndexStoreActionHandler_requestQueue.last();
-            }
-
-            Object var14;
-            if(var1 != null) {
-               if(var1.type == 0) {
-                  var1.indexStore.write((int)var1.key, var1.data, var1.data.length);
-                  var2 = IndexStoreActionHandler_requestQueue;
-                  synchronized(IndexStoreActionHandler_requestQueue) {
-                     var1.remove();
-                  }
-               } else if(var1.type == 1) {
-                  var1.data = var1.indexStore.read((int)var1.key);
-                  var2 = IndexStoreActionHandler_requestQueue;
-                  synchronized(IndexStoreActionHandler_requestQueue) {
-                     IndexStoreActionHandler_responseQueue.addFirst(var1);
-                  }
-               }
-
-               var14 = IndexStoreActionHandler_lock;
-               synchronized(IndexStoreActionHandler_lock) {
-                  if(__iv_q <= 1) {
-                     __iv_q = 0;
-                     IndexStoreActionHandler_lock.notifyAll();
-                     return;
-                  }
-
-                  __iv_q = 600;
-               }
-            } else {
-               class203.method4010(100L);
-               var14 = IndexStoreActionHandler_lock;
-               synchronized(IndexStoreActionHandler_lock) {
-                  if(__iv_q <= 1) {
-                     __iv_q = 0;
-                     IndexStoreActionHandler_lock.notifyAll();
-                     return;
-                  }
-
-                  --__iv_q;
-               }
-            }
-         }
-      } catch (Exception var13) {
-         NpcDefinition.sendStackTrace((String)null, var13);
-      }
-   }
-
-   @ObfuscatedName("ky")
-   @ObfuscatedSignature(
-      signature = "(Ljava/lang/String;B)V",
-      garbageValue = "67"
-   )
-   static final void method4655(String var0) {
-      if(PacketWriter.clanChat != null) {
-         PacketBufferNode var1 = Interpreter.method1915(ClientPacket.__gs_i, Client.packetWriter.isaacCipher);
-         var1.packetBuffer.writeByte(WorldMapRegion.method550(var0));
-         var1.packetBuffer.writeStringCp1252NullTerminated(var0);
-         Client.packetWriter.__q_167(var1);
-      }
-   }
-}
diff --git a/runescape-client/src/main/java/IndexedSprite.java b/runescape-client/src/main/java/IndexedSprite.java
index 9a0e481697..85002bdf4e 100644
--- a/runescape-client/src/main/java/IndexedSprite.java
+++ b/runescape-client/src/main/java/IndexedSprite.java
@@ -33,12 +33,12 @@ public final class IndexedSprite extends Rasterizer2D {
    @ObfuscatedName("m")
    @Export("normalize")
    public void normalize() {
-      if(this.subWidth != this.width || this.subHeight != this.height) {
+      if (this.subWidth != this.width || this.subHeight != this.height) {
          byte[] var1 = new byte[this.width * this.height];
          int var2 = 0;
 
-         for(int var3 = 0; var3 < this.subHeight; ++var3) {
-            for(int var4 = 0; var4 < this.subWidth; ++var4) {
+         for (int var3 = 0; var3 < this.subHeight; ++var3) {
+            for (int var4 = 0; var4 < this.subWidth; ++var4) {
                var1[var4 + (var3 + this.yOffset) * this.width + this.xOffset] = this.pixels[var2++];
             }
          }
@@ -49,33 +49,34 @@ public final class IndexedSprite extends Rasterizer2D {
          this.xOffset = 0;
          this.yOffset = 0;
       }
+
    }
 
    @ObfuscatedName("f")
    @Export("shiftColors")
    public void shiftColors(int var1, int var2, int var3) {
-      for(int var4 = 0; var4 < this.palette.length; ++var4) {
+      for (int var4 = 0; var4 < this.palette.length; ++var4) {
          int var5 = this.palette[var4] >> 16 & 255;
          var5 += var1;
-         if(var5 < 0) {
+         if (var5 < 0) {
             var5 = 0;
-         } else if(var5 > 255) {
+         } else if (var5 > 255) {
             var5 = 255;
          }
 
          int var6 = this.palette[var4] >> 8 & 255;
          var6 += var2;
-         if(var6 < 0) {
+         if (var6 < 0) {
             var6 = 0;
-         } else if(var6 > 255) {
+         } else if (var6 > 255) {
             var6 = 255;
          }
 
          int var7 = this.palette[var4] & 255;
          var7 += var3;
-         if(var7 < 0) {
+         if (var7 < 0) {
             var7 = 0;
-         } else if(var7 > 255) {
+         } else if (var7 > 255) {
             var7 = 255;
          }
 
@@ -86,52 +87,53 @@ public final class IndexedSprite extends Rasterizer2D {
 
    @ObfuscatedName("q")
    @Export("drawAt")
-   public void drawAt(int x, int y) {
-      x += this.xOffset;
-      y += this.yOffset;
-      int var3 = x + y * Rasterizer2D.Rasterizer2D_width;
+   public void drawAt(int var1, int var2) {
+      var1 += this.xOffset;
+      var2 += this.yOffset;
+      int var3 = var1 + var2 * Rasterizer2D.Rasterizer2D_width;
       int var4 = 0;
       int var5 = this.subHeight;
       int var6 = this.subWidth;
       int var7 = Rasterizer2D.Rasterizer2D_width - var6;
       int var8 = 0;
       int var9;
-      if(y < Rasterizer2D.Rasterizer2D_yClipStart) {
-         var9 = Rasterizer2D.Rasterizer2D_yClipStart - y;
+      if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
+         var9 = Rasterizer2D.Rasterizer2D_yClipStart - var2;
          var5 -= var9;
-         y = Rasterizer2D.Rasterizer2D_yClipStart;
+         var2 = Rasterizer2D.Rasterizer2D_yClipStart;
          var4 += var9 * var6;
          var3 += var9 * Rasterizer2D.Rasterizer2D_width;
       }
 
-      if(var5 + y > Rasterizer2D.Rasterizer2D_yClipEnd) {
-         var5 -= var5 + y - Rasterizer2D.Rasterizer2D_yClipEnd;
+      if (var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) {
+         var5 -= var5 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd;
       }
 
-      if(x < Rasterizer2D.Rasterizer2D_xClipStart) {
-         var9 = Rasterizer2D.Rasterizer2D_xClipStart - x;
+      if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
+         var9 = Rasterizer2D.Rasterizer2D_xClipStart - var1;
          var6 -= var9;
-         x = Rasterizer2D.Rasterizer2D_xClipStart;
+         var1 = Rasterizer2D.Rasterizer2D_xClipStart;
          var4 += var9;
          var3 += var9;
          var8 += var9;
          var7 += var9;
       }
 
-      if(var6 + x > Rasterizer2D.Rasterizer2D_xClipEnd) {
-         var9 = var6 + x - Rasterizer2D.Rasterizer2D_xClipEnd;
+      if (var6 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
+         var9 = var6 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd;
          var6 -= var9;
          var8 += var9;
          var7 += var9;
       }
 
-      if(var6 > 0 && var5 > 0) {
+      if (var6 > 0 && var5 > 0) {
          IndexedSprite_two(Rasterizer2D.Rasterizer2D_pixels, this.pixels, this.palette, var4, var3, var6, var5, var7, var8);
       }
+
    }
 
    @ObfuscatedName("o")
-   public void __o_497(int var1, int var2, int var3, int var4) {
+   public void method135(int var1, int var2, int var3, int var4) {
       int var5 = this.subWidth;
       int var6 = this.subHeight;
       int var7 = 0;
@@ -141,47 +143,47 @@ public final class IndexedSprite extends Rasterizer2D {
       int var11 = (var9 << 16) / var3;
       int var12 = (var10 << 16) / var4;
       int var13;
-      if(this.xOffset > 0) {
+      if (this.xOffset > 0) {
          var13 = (var11 + (this.xOffset << 16) - 1) / var11;
          var1 += var13;
          var7 += var13 * var11 - (this.xOffset << 16);
       }
 
-      if(this.yOffset > 0) {
+      if (this.yOffset > 0) {
          var13 = (var12 + (this.yOffset << 16) - 1) / var12;
          var2 += var13;
          var8 += var13 * var12 - (this.yOffset << 16);
       }
 
-      if(var5 < var9) {
+      if (var5 < var9) {
          var3 = (var11 + ((var5 << 16) - var7) - 1) / var11;
       }
 
-      if(var6 < var10) {
+      if (var6 < var10) {
          var4 = (var12 + ((var6 << 16) - var8) - 1) / var12;
       }
 
       var13 = var1 + var2 * Rasterizer2D.Rasterizer2D_width;
       int var14 = Rasterizer2D.Rasterizer2D_width - var3;
-      if(var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) {
+      if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) {
          var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd;
       }
 
       int var15;
-      if(var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
+      if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
          var15 = Rasterizer2D.Rasterizer2D_yClipStart - var2;
          var4 -= var15;
          var13 += var15 * Rasterizer2D.Rasterizer2D_width;
          var8 += var12 * var15;
       }
 
-      if(var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
+      if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
          var15 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd;
          var3 -= var15;
          var14 += var15;
       }
 
-      if(var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
+      if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
          var15 = Rasterizer2D.Rasterizer2D_xClipStart - var1;
          var3 -= var15;
          var13 += var15;
@@ -198,42 +200,42 @@ public final class IndexedSprite extends Rasterizer2D {
       int var9 = -(var5 >> 2);
       var5 = -(var5 & 3);
 
-      for(int var10 = -var6; var10 < 0; ++var10) {
+      for (int var10 = -var6; var10 < 0; ++var10) {
          int var11;
          byte var12;
-         for(var11 = var9; var11 < 0; ++var11) {
+         for (var11 = var9; var11 < 0; ++var11) {
             var12 = var1[var3++];
-            if(var12 != 0) {
+            if (var12 != 0) {
                var0[var4++] = var2[var12 & 255];
             } else {
                ++var4;
             }
 
             var12 = var1[var3++];
-            if(var12 != 0) {
+            if (var12 != 0) {
                var0[var4++] = var2[var12 & 255];
             } else {
                ++var4;
             }
 
             var12 = var1[var3++];
-            if(var12 != 0) {
+            if (var12 != 0) {
                var0[var4++] = var2[var12 & 255];
             } else {
                ++var4;
             }
 
             var12 = var1[var3++];
-            if(var12 != 0) {
+            if (var12 != 0) {
                var0[var4++] = var2[var12 & 255];
             } else {
                ++var4;
             }
          }
 
-         for(var11 = var5; var11 < 0; ++var11) {
+         for (var11 = var5; var11 < 0; ++var11) {
             var12 = var1[var3++];
-            if(var12 != 0) {
+            if (var12 != 0) {
                var0[var4++] = var2[var12 & 255];
             } else {
                ++var4;
@@ -251,12 +253,12 @@ public final class IndexedSprite extends Rasterizer2D {
    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;
 
-      for(int var13 = -var8; var13 < 0; ++var13) {
+      for (int var13 = -var8; var13 < 0; ++var13) {
          int var14 = var11 * (var4 >> 16);
 
-         for(int var15 = -var7; var15 < 0; ++var15) {
+         for (int var15 = -var7; var15 < 0; ++var15) {
             byte var16 = var1[(var3 >> 16) + var14];
-            if(var16 != 0) {
+            if (var16 != 0) {
                var0[var5++] = var2[var16 & 255];
             } else {
                ++var5;
diff --git a/runescape-client/src/main/java/Instrument.java b/runescape-client/src/main/java/Instrument.java
index e6f6ae9645..a00392cd96 100644
--- a/runescape-client/src/main/java/Instrument.java
+++ b/runescape-client/src/main/java/Instrument.java
@@ -35,42 +35,50 @@ public class Instrument {
    @ObfuscatedSignature(
       signature = "Lde;"
    )
-   SoundEnvelope __m;
+   @Export("pitch")
+   SoundEnvelope pitch;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Lde;"
    )
-   SoundEnvelope __f;
+   @Export("volume")
+   SoundEnvelope volume;
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Lde;"
    )
-   SoundEnvelope __q;
+   @Export("pitchModifier")
+   SoundEnvelope pitchModifier;
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "Lde;"
    )
-   SoundEnvelope __w;
+   @Export("pitchModifierAmplitude")
+   SoundEnvelope pitchModifierAmplitude;
    @ObfuscatedName("o")
    @ObfuscatedSignature(
       signature = "Lde;"
    )
-   SoundEnvelope __o;
+   @Export("volumeMultiplier")
+   SoundEnvelope volumeMultiplier;
    @ObfuscatedName("u")
    @ObfuscatedSignature(
       signature = "Lde;"
    )
-   SoundEnvelope __u;
+   @Export("volumeMultiplierAmplitude")
+   SoundEnvelope volumeMultiplierAmplitude;
    @ObfuscatedName("g")
    @ObfuscatedSignature(
       signature = "Lde;"
    )
-   SoundEnvelope __g;
+   @Export("release")
+   SoundEnvelope release;
    @ObfuscatedName("l")
    @ObfuscatedSignature(
       signature = "Lde;"
    )
-   SoundEnvelope __l;
+   @Export("attack")
+   SoundEnvelope attack;
    @ObfuscatedName("e")
    @Export("oscillatorVolume")
    int[] oscillatorVolume;
@@ -96,7 +104,8 @@ public class Instrument {
    @ObfuscatedSignature(
       signature = "Lde;"
    )
-   SoundEnvelope __a;
+   @Export("filterEnvelope")
+   SoundEnvelope filterEnvelope;
    @ObfuscatedName("z")
    @Export("duration")
    int duration;
@@ -104,29 +113,6 @@ public class Instrument {
    @Export("offset")
    int offset;
 
-   static {
-      Instrument_noise = new int['耀'];
-      Random var0 = new Random(0L);
-
-      int var1;
-      for(var1 = 0; var1 < 32768; ++var1) {
-         Instrument_noise[var1] = (var0.nextInt() & 2) - 1;
-      }
-
-      Instrument_sine = new int['耀'];
-
-      for(var1 = 0; var1 < 32768; ++var1) {
-         Instrument_sine[var1] = (int)(Math.sin((double)var1 / 5215.1903D) * 16384.0D);
-      }
-
-      Instrument_samples = new int[220500];
-      Instrument_phases = new int[5];
-      Instrument_delays = new int[5];
-      Instrument_volumeSteps = new int[5];
-      Instrument_pitchSteps = new int[5];
-      Instrument_pitchBaseSteps = new int[5];
-   }
-
    Instrument() {
       this.oscillatorVolume = new int[]{0, 0, 0, 0, 0};
       this.oscillatorPitch = new int[]{0, 0, 0, 0, 0};
@@ -141,40 +127,40 @@ public class Instrument {
    @Export("synthesize")
    final int[] synthesize(int var1, int var2) {
       class212.clearIntArray(Instrument_samples, 0, var1);
-      if(var2 < 10) {
+      if (var2 < 10) {
          return Instrument_samples;
       } else {
          double var3 = (double)var1 / ((double)var2 + 0.0D);
-         this.__m.reset();
-         this.__f.reset();
+         this.pitch.reset();
+         this.volume.reset();
          int var5 = 0;
          int var6 = 0;
          int var7 = 0;
-         if(this.__q != null) {
-            this.__q.reset();
-            this.__w.reset();
-            var5 = (int)((double)(this.__q.end - this.__q.start) * 32.768D / var3);
-            var6 = (int)((double)this.__q.start * 32.768D / var3);
+         if (this.pitchModifier != null) {
+            this.pitchModifier.reset();
+            this.pitchModifierAmplitude.reset();
+            var5 = (int)((double)(this.pitchModifier.end - this.pitchModifier.start) * 32.768D / var3);
+            var6 = (int)((double)this.pitchModifier.start * 32.768D / var3);
          }
 
          int var8 = 0;
          int var9 = 0;
          int var10 = 0;
-         if(this.__o != null) {
-            this.__o.reset();
-            this.__u.reset();
-            var8 = (int)((double)(this.__o.end - this.__o.start) * 32.768D / var3);
-            var9 = (int)((double)this.__o.start * 32.768D / var3);
+         if (this.volumeMultiplier != null) {
+            this.volumeMultiplier.reset();
+            this.volumeMultiplierAmplitude.reset();
+            var8 = (int)((double)(this.volumeMultiplier.end - this.volumeMultiplier.start) * 32.768D / var3);
+            var9 = (int)((double)this.volumeMultiplier.start * 32.768D / var3);
          }
 
          int var11;
-         for(var11 = 0; var11 < 5; ++var11) {
-            if(this.oscillatorVolume[var11] != 0) {
+         for (var11 = 0; var11 < 5; ++var11) {
+            if (this.oscillatorVolume[var11] != 0) {
                Instrument_phases[var11] = 0;
                Instrument_delays[var11] = (int)((double)this.oscillatorDelays[var11] * var3);
                Instrument_volumeSteps[var11] = (this.oscillatorVolume[var11] << 14) / 100;
-               Instrument_pitchSteps[var11] = (int)((double)(this.__m.end - this.__m.start) * 32.768D * Math.pow(1.0057929410678534D, (double)this.oscillatorPitch[var11]) / var3);
-               Instrument_pitchBaseSteps[var11] = (int)((double)this.__m.start * 32.768D / var3);
+               Instrument_pitchSteps[var11] = (int)((double)(this.pitch.end - this.pitch.start) * 32.768D * Math.pow(1.0057929410678534D, (double)this.oscillatorPitch[var11]) / var3);
+               Instrument_pitchBaseSteps[var11] = (int)((double)this.pitch.start * 32.768D / var3);
             }
          }
 
@@ -182,156 +168,160 @@ public class Instrument {
          int var13;
          int var14;
          int var15;
-         for(var11 = 0; var11 < var1; ++var11) {
-            var12 = this.__m.doStep(var1);
-            var13 = this.__f.doStep(var1);
-            if(this.__q != null) {
-               var14 = this.__q.doStep(var1);
-               var15 = this.__w.doStep(var1);
-               var12 += this.evaluateWave(var7, var15, this.__q.form) >> 1;
+         int[] var16;
+         for (var11 = 0; var11 < var1; ++var11) {
+            var12 = this.pitch.doStep(var1);
+            var13 = this.volume.doStep(var1);
+            if (this.pitchModifier != null) {
+               var14 = this.pitchModifier.doStep(var1);
+               var15 = this.pitchModifierAmplitude.doStep(var1);
+               var12 += this.evaluateWave(var7, var15, this.pitchModifier.form) >> 1;
                var7 = var7 + var6 + (var14 * var5 >> 16);
             }
 
-            if(this.__o != null) {
-               var14 = this.__o.doStep(var1);
-               var15 = this.__u.doStep(var1);
-               var13 = var13 * ((this.evaluateWave(var10, var15, this.__o.form) >> 1) + 32768) >> 15;
+            if (this.volumeMultiplier != null) {
+               var14 = this.volumeMultiplier.doStep(var1);
+               var15 = this.volumeMultiplierAmplitude.doStep(var1);
+               var13 = var13 * ((this.evaluateWave(var10, var15, this.volumeMultiplier.form) >> 1) + 32768) >> 15;
                var10 = var10 + var9 + (var14 * var8 >> 16);
             }
 
-            for(var14 = 0; var14 < 5; ++var14) {
-               if(this.oscillatorVolume[var14] != 0) {
+            for (var14 = 0; var14 < 5; ++var14) {
+               if (this.oscillatorVolume[var14] != 0) {
                   var15 = Instrument_delays[var14] + var11;
-                  if(var15 < var1) {
-                     Instrument_samples[var15] += this.evaluateWave(Instrument_phases[var14], var13 * Instrument_volumeSteps[var14] >> 15, this.__m.form);
-                     Instrument_phases[var14] += (var12 * Instrument_pitchSteps[var14] >> 16) + Instrument_pitchBaseSteps[var14];
+                  if (var15 < var1) {
+                     var16 = Instrument_samples;
+                     var16[var15] += this.evaluateWave(Instrument_phases[var14], var13 * Instrument_volumeSteps[var14] >> 15, this.pitch.form);
+                     var16 = Instrument_phases;
+                     var16[var14] += (var12 * Instrument_pitchSteps[var14] >> 16) + Instrument_pitchBaseSteps[var14];
                   }
                }
             }
          }
 
-         int var16;
-         if(this.__g != null) {
-            this.__g.reset();
-            this.__l.reset();
+         int var17;
+         if (this.release != null) {
+            this.release.reset();
+            this.attack.reset();
             var11 = 0;
-            boolean var19 = false;
-            boolean var20 = true;
+            boolean var18 = false;
+            boolean var19 = true;
 
-            for(var14 = 0; var14 < var1; ++var14) {
-               var15 = this.__g.doStep(var1);
-               var16 = this.__l.doStep(var1);
-               if(var20) {
-                  var12 = (var15 * (this.__g.end - this.__g.start) >> 8) + this.__g.start;
+            for (var14 = 0; var14 < var1; ++var14) {
+               var15 = this.release.doStep(var1);
+               var17 = this.attack.doStep(var1);
+               if (var19) {
+                  var12 = (var15 * (this.release.end - this.release.start) >> 8) + this.release.start;
                } else {
-                  var12 = (var16 * (this.__g.end - this.__g.start) >> 8) + this.__g.start;
+                  var12 = (var17 * (this.release.end - this.release.start) >> 8) + this.release.start;
                }
 
                var11 += 256;
-               if(var11 >= var12) {
+               if (var11 >= var12) {
                   var11 = 0;
-                  var20 = !var20;
+                  var19 = !var19;
                }
 
-               if(var20) {
+               if (var19) {
                   Instrument_samples[var14] = 0;
                }
             }
          }
 
-         if(this.delayTime > 0 && this.delayDecay > 0) {
+         if (this.delayTime > 0 && this.delayDecay > 0) {
             var11 = (int)((double)this.delayTime * var3);
 
-            for(var12 = var11; var12 < var1; ++var12) {
-               Instrument_samples[var12] += Instrument_samples[var12 - var11] * this.delayDecay / 100;
+            for (var12 = var11; var12 < var1; ++var12) {
+               var16 = Instrument_samples;
+               var16[var12] += Instrument_samples[var12 - var11] * this.delayDecay / 100;
             }
          }
 
-         if(this.filter.__m[0] > 0 || this.filter.__m[1] > 0) {
-            this.__a.reset();
-            var11 = this.__a.doStep(var1 + 1);
-            var12 = this.filter.__w_207(0, (float)var11 / 65536.0F);
-            var13 = this.filter.__w_207(1, (float)var11 / 65536.0F);
-            if(var1 >= var12 + var13) {
+         if (this.filter.pairs[0] > 0 || this.filter.pairs[1] > 0) {
+            this.filterEnvelope.reset();
+            var11 = this.filterEnvelope.doStep(var1 + 1);
+            var12 = this.filter.compute(0, (float)var11 / 65536.0F);
+            var13 = this.filter.compute(1, (float)var11 / 65536.0F);
+            if (var1 >= var12 + var13) {
                var14 = 0;
                var15 = var13;
-               if(var13 > var1 - var12) {
+               if (var13 > var1 - var12) {
                   var15 = var1 - var12;
                }
 
-               int var17;
-               while(var14 < var15) {
-                  var16 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.__di_e >> 16);
+               int var20;
+               while (var14 < var15) {
+                  var17 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.forwardMultiplier >> 16);
 
-                  for(var17 = 0; var17 < var12; ++var17) {
-                     var16 += (int)((long)Instrument_samples[var14 + var12 - 1 - var17] * (long)AudioFilter.__di_g[0][var17] >> 16);
+                  for (var20 = 0; var20 < var12; ++var20) {
+                     var17 += (int)((long)Instrument_samples[var14 + var12 - 1 - var20] * (long)AudioFilter.coefficients[0][var20] >> 16);
                   }
 
-                  for(var17 = 0; var17 < var14; ++var17) {
-                     var16 -= (int)((long)Instrument_samples[var14 - 1 - var17] * (long)AudioFilter.__di_g[1][var17] >> 16);
+                  for (var20 = 0; var20 < var14; ++var20) {
+                     var17 -= (int)((long)Instrument_samples[var14 - 1 - var20] * (long)AudioFilter.coefficients[1][var20] >> 16);
                   }
 
-                  Instrument_samples[var14] = var16;
-                  var11 = this.__a.doStep(var1 + 1);
+                  Instrument_samples[var14] = var17;
+                  var11 = this.filterEnvelope.doStep(var1 + 1);
                   ++var14;
                }
 
                var15 = 128;
 
-               while(true) {
-                  if(var15 > var1 - var12) {
+               while (true) {
+                  if (var15 > var1 - var12) {
                      var15 = var1 - var12;
                   }
 
-                  int var18;
-                  while(var14 < var15) {
-                     var17 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.__di_e >> 16);
+                  int var21;
+                  while (var14 < var15) {
+                     var20 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.forwardMultiplier >> 16);
 
-                     for(var18 = 0; var18 < var12; ++var18) {
-                        var17 += (int)((long)Instrument_samples[var14 + var12 - 1 - var18] * (long)AudioFilter.__di_g[0][var18] >> 16);
+                     for (var21 = 0; var21 < var12; ++var21) {
+                        var20 += (int)((long)Instrument_samples[var14 + var12 - 1 - var21] * (long)AudioFilter.coefficients[0][var21] >> 16);
                      }
 
-                     for(var18 = 0; var18 < var13; ++var18) {
-                        var17 -= (int)((long)Instrument_samples[var14 - 1 - var18] * (long)AudioFilter.__di_g[1][var18] >> 16);
+                     for (var21 = 0; var21 < var13; ++var21) {
+                        var20 -= (int)((long)Instrument_samples[var14 - 1 - var21] * (long)AudioFilter.coefficients[1][var21] >> 16);
                      }
 
-                     Instrument_samples[var14] = var17;
-                     var11 = this.__a.doStep(var1 + 1);
+                     Instrument_samples[var14] = var20;
+                     var11 = this.filterEnvelope.doStep(var1 + 1);
                      ++var14;
                   }
 
-                  if(var14 >= var1 - var12) {
-                     while(var14 < var1) {
-                        var17 = 0;
+                  if (var14 >= var1 - var12) {
+                     while (var14 < var1) {
+                        var20 = 0;
 
-                        for(var18 = var14 + var12 - var1; var18 < var12; ++var18) {
-                           var17 += (int)((long)Instrument_samples[var14 + var12 - 1 - var18] * (long)AudioFilter.__di_g[0][var18] >> 16);
+                        for (var21 = var14 + var12 - var1; var21 < var12; ++var21) {
+                           var20 += (int)((long)Instrument_samples[var14 + var12 - 1 - var21] * (long)AudioFilter.coefficients[0][var21] >> 16);
                         }
 
-                        for(var18 = 0; var18 < var13; ++var18) {
-                           var17 -= (int)((long)Instrument_samples[var14 - 1 - var18] * (long)AudioFilter.__di_g[1][var18] >> 16);
+                        for (var21 = 0; var21 < var13; ++var21) {
+                           var20 -= (int)((long)Instrument_samples[var14 - 1 - var21] * (long)AudioFilter.coefficients[1][var21] >> 16);
                         }
 
-                        Instrument_samples[var14] = var17;
-                        this.__a.doStep(var1 + 1);
+                        Instrument_samples[var14] = var20;
+                        this.filterEnvelope.doStep(var1 + 1);
                         ++var14;
                      }
                      break;
                   }
 
-                  var12 = this.filter.__w_207(0, (float)var11 / 65536.0F);
-                  var13 = this.filter.__w_207(1, (float)var11 / 65536.0F);
+                  var12 = this.filter.compute(0, (float)var11 / 65536.0F);
+                  var13 = this.filter.compute(1, (float)var11 / 65536.0F);
                   var15 += 128;
                }
             }
          }
 
-         for(var11 = 0; var11 < var1; ++var11) {
-            if(Instrument_samples[var11] < -32768) {
+         for (var11 = 0; var11 < var1; ++var11) {
+            if (Instrument_samples[var11] < -32768) {
                Instrument_samples[var11] = -32768;
             }
 
-            if(Instrument_samples[var11] > 32767) {
+            if (Instrument_samples[var11] > 32767) {
                Instrument_samples[var11] = 32767;
             }
          }
@@ -343,7 +333,7 @@ public class Instrument {
    @ObfuscatedName("f")
    @Export("evaluateWave")
    final int evaluateWave(int var1, int var2, int var3) {
-      return var3 == 1?((var1 & 32767) < 16384?var2:-var2):(var3 == 2?Instrument_sine[var1 & 32767] * var2 >> 14:(var3 == 3?(var2 * (var1 & 32767) >> 14) - var2:(var3 == 4?var2 * Instrument_noise[var1 / 2607 & 32767]:0)));
+      return var3 == 1 ? ((var1 & 32767) < 16384 ? var2 : -var2) : (var3 == 2 ? Instrument_sine[var1 & 32767] * var2 >> 14 : (var3 == 3 ? (var2 * (var1 & 32767) >> 14) - var2 : (var3 == 4 ? var2 * Instrument_noise[var1 / 2607 & 32767] : 0)));
    }
 
    @ObfuscatedName("q")
@@ -351,55 +341,78 @@ public class Instrument {
       signature = "(Lgr;)V"
    )
    @Export("decode")
-   final void decode(Buffer var1) {
-      this.__m = new SoundEnvelope();
-      this.__m.decode(var1);
-      this.__f = new SoundEnvelope();
-      this.__f.decode(var1);
-      int var2 = var1.readUnsignedByte();
-      if(var2 != 0) {
-         --var1.index;
-         this.__q = new SoundEnvelope();
-         this.__q.decode(var1);
-         this.__w = new SoundEnvelope();
-         this.__w.decode(var1);
+   final void decode(Buffer buffer) {
+      this.pitch = new SoundEnvelope();
+      this.pitch.decode(buffer);
+      this.volume = new SoundEnvelope();
+      this.volume.decode(buffer);
+      int var2 = buffer.readUnsignedByte();
+      if (var2 != 0) {
+         --buffer.index;
+         this.pitchModifier = new SoundEnvelope();
+         this.pitchModifier.decode(buffer);
+         this.pitchModifierAmplitude = new SoundEnvelope();
+         this.pitchModifierAmplitude.decode(buffer);
       }
 
-      var2 = var1.readUnsignedByte();
-      if(var2 != 0) {
-         --var1.index;
-         this.__o = new SoundEnvelope();
-         this.__o.decode(var1);
-         this.__u = new SoundEnvelope();
-         this.__u.decode(var1);
+      var2 = buffer.readUnsignedByte();
+      if (var2 != 0) {
+         --buffer.index;
+         this.volumeMultiplier = new SoundEnvelope();
+         this.volumeMultiplier.decode(buffer);
+         this.volumeMultiplierAmplitude = new SoundEnvelope();
+         this.volumeMultiplierAmplitude.decode(buffer);
       }
 
-      var2 = var1.readUnsignedByte();
-      if(var2 != 0) {
-         --var1.index;
-         this.__g = new SoundEnvelope();
-         this.__g.decode(var1);
-         this.__l = new SoundEnvelope();
-         this.__l.decode(var1);
+      var2 = buffer.readUnsignedByte();
+      if (var2 != 0) {
+         --buffer.index;
+         this.release = new SoundEnvelope();
+         this.release.decode(buffer);
+         this.attack = new SoundEnvelope();
+         this.attack.decode(buffer);
       }
 
-      for(int var3 = 0; var3 < 10; ++var3) {
-         int var4 = var1.__ae_307();
-         if(var4 == 0) {
+      for (int var3 = 0; var3 < 10; ++var3) {
+         int var4 = buffer.readUShortSmart();
+         if (var4 == 0) {
             break;
          }
 
          this.oscillatorVolume[var3] = var4;
-         this.oscillatorPitch[var3] = var1.__ab_306();
-         this.oscillatorDelays[var3] = var1.__ae_307();
+         this.oscillatorPitch[var3] = buffer.readShortSmart();
+         this.oscillatorDelays[var3] = buffer.readUShortSmart();
       }
 
-      this.delayTime = var1.__ae_307();
-      this.delayDecay = var1.__ae_307();
-      this.duration = var1.__ag_302();
-      this.offset = var1.__ag_302();
+      this.delayTime = buffer.readUShortSmart();
+      this.delayDecay = buffer.readUShortSmart();
+      this.duration = buffer.readUnsignedShort();
+      this.offset = buffer.readUnsignedShort();
       this.filter = new AudioFilter();
-      this.__a = new SoundEnvelope();
-      this.filter.__o_208(var1, this.__a);
+      this.filterEnvelope = new SoundEnvelope();
+      this.filter.method27(buffer, this.filterEnvelope);
+   }
+
+   static {
+      Instrument_noise = new int[32768];
+      Random var0 = new Random(0L);
+
+      int var1;
+      for (var1 = 0; var1 < 32768; ++var1) {
+         Instrument_noise[var1] = (var0.nextInt() & 2) - 1;
+      }
+
+      Instrument_sine = new int[32768];
+
+      for (var1 = 0; var1 < 32768; ++var1) {
+         Instrument_sine[var1] = (int)(Math.sin((double)var1 / 5215.1903D) * 16384.0D);
+      }
+
+      Instrument_samples = new int[220500];
+      Instrument_phases = new int[5];
+      Instrument_delays = new int[5];
+      Instrument_volumeSteps = new int[5];
+      Instrument_pitchSteps = new int[5];
+      Instrument_pitchBaseSteps = new int[5];
    }
 }
diff --git a/runescape-client/src/main/java/IntHashTable.java b/runescape-client/src/main/java/IntHashTable.java
index 8e94ce9a5f..44e2b9aa59 100644
--- a/runescape-client/src/main/java/IntHashTable.java
+++ b/runescape-client/src/main/java/IntHashTable.java
@@ -12,21 +12,19 @@ public class IntHashTable {
 
    public IntHashTable(int[] var1) {
       int var2;
-      for(var2 = 1; var2 <= (var1.length >> 1) + var1.length; var2 <<= 1) {
-         ;
+      for (var2 = 1; var2 <= (var1.length >> 1) + var1.length; var2 <<= 1) {
       }
 
       this.array = new int[var2 + var2];
 
       int var3;
-      for(var3 = 0; var3 < var2 + var2; ++var3) {
+      for (var3 = 0; var3 < var2 + var2; ++var3) {
          this.array[var3] = -1;
       }
 
       int var4;
-      for(var3 = 0; var3 < var1.length; this.array[var4 + var4 + 1] = var3++) {
-         for(var4 = var1[var3] & var2 - 1; this.array[var4 + var4 + 1] != -1; var4 = var4 + 1 & var2 - 1) {
-            ;
+      for (var3 = 0; var3 < var1.length; this.array[var4 + var4 + 1] = var3++) {
+         for (var4 = var1[var3] & var2 - 1; this.array[var4 + var4 + 1] != -1; var4 = var4 + 1 & var2 - 1) {
          }
 
          this.array[var4 + var4] = var1[var3];
@@ -44,13 +42,13 @@ public class IntHashTable {
       int var2 = (this.array.length >> 1) - 1;
       int var3 = var1 & var2;
 
-      while(true) {
+      while (true) {
          int var4 = this.array[var3 + var3 + 1];
-         if(var4 == -1) {
+         if (var4 == -1) {
             return -1;
          }
 
-         if(this.array[var3 + var3] == var1) {
+         if (this.array[var3 + var3] == var1) {
             return var4;
          }
 
diff --git a/runescape-client/src/main/java/WidgetGroupParent.java b/runescape-client/src/main/java/InterfaceParent.java
similarity index 72%
rename from runescape-client/src/main/java/WidgetGroupParent.java
rename to runescape-client/src/main/java/InterfaceParent.java
index 491c7b8343..a19bdf72c4 100644
--- a/runescape-client/src/main/java/WidgetGroupParent.java
+++ b/runescape-client/src/main/java/InterfaceParent.java
@@ -5,8 +5,8 @@ import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("bx")
-@Implements("WidgetGroupParent")
-public class WidgetGroupParent extends Node {
+@Implements("InterfaceParent")
+public class InterfaceParent extends Node {
    @ObfuscatedName("px")
    @ObfuscatedSignature(
       signature = "Lln;"
@@ -17,7 +17,7 @@ public class WidgetGroupParent extends Node {
    @ObfuscatedGetter(
       intValue = -992379173
    )
-   static int __bx_o;
+   static int field986;
    @ObfuscatedName("m")
    @ObfuscatedGetter(
       intValue = -707461797
@@ -34,7 +34,7 @@ public class WidgetGroupParent extends Node {
    @Export("keep")
    boolean keep;
 
-   WidgetGroupParent() {
+   InterfaceParent() {
       this.keep = false;
    }
 
@@ -45,22 +45,22 @@ public class WidgetGroupParent extends Node {
    )
    static Script method1175(int var0, int var1) {
       Script var2 = (Script)Script.Script_cached.get((long)(var0 << 16));
-      if(var2 != null) {
+      if (var2 != null) {
          return var2;
       } else {
          String var3 = String.valueOf(var0);
-         int var4 = Formatting.indexCache12.getArchiveId(var3);
-         if(var4 == -1) {
+         int var4 = Formatting.archive12.getGroupId(var3);
+         if (var4 == -1) {
             return null;
          } else {
-            byte[] var5 = Formatting.indexCache12.takeRecordFlat(var4);
-            if(var5 != null) {
-               if(var5.length <= 1) {
+            byte[] var5 = Formatting.archive12.takeFileFlat(var4);
+            if (var5 != null) {
+               if (var5.length <= 1) {
                   return null;
                }
 
                var2 = Occluder.newScript(var5);
-               if(var2 != null) {
+               if (var2 != null) {
                   Script.Script_cached.put(var2, (long)(var0 << 16));
                   return var2;
                }
@@ -77,16 +77,16 @@ public class WidgetGroupParent extends Node {
       garbageValue = "619422509"
    )
    @Export("decodeStringCp1252")
-   public static String decodeStringCp1252(byte[] var0, int var1, int var2) {
-      char[] var3 = new char[var2];
+   public static String decodeStringCp1252(byte[] src, int srcStart, int length) {
+      char[] var3 = new char[length];
       int var4 = 0;
 
-      for(int var5 = 0; var5 < var2; ++var5) {
-         int var6 = var0[var5 + var1] & 255;
-         if(var6 != 0) {
-            if(var6 >= 128 && var6 < 160) {
+      for (int var5 = 0; var5 < length; ++var5) {
+         int var6 = src[var5 + srcStart] & 255;
+         if (var6 != 0) {
+            if (var6 >= 128 && var6 < 160) {
                char var7 = class304.cp1252AsciiExtension[var6 - 128];
-               if(var7 == 0) {
+               if (var7 == 0) {
                   var7 = '?';
                }
 
@@ -106,7 +106,7 @@ public class WidgetGroupParent extends Node {
       garbageValue = "32"
    )
    static int method1174(int var0) {
-      ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(Integer.valueOf(var0));
-      return var1 == null?0:var1.size();
+      ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0);
+      return var1 == null ? 0 : var1.size();
    }
 }
diff --git a/runescape-client/src/main/java/Interpreter.java b/runescape-client/src/main/java/Interpreter.java
index 61ace7fd65..ca85e1b04b 100644
--- a/runescape-client/src/main/java/Interpreter.java
+++ b/runescape-client/src/main/java/Interpreter.java
@@ -48,33 +48,19 @@ public class Interpreter {
    @Export("Interpreter_calendar")
    static Calendar Interpreter_calendar;
    @ObfuscatedName("z")
-   static final String[] __bv_z;
+   @Export("Interpreter_MONTHS")
+   static final String[] Interpreter_MONTHS;
    @ObfuscatedName("s")
-   static boolean __bv_s;
+   static boolean field423;
    @ObfuscatedName("t")
-   static boolean __bv_t;
+   static boolean field424;
    @ObfuscatedName("y")
    @ObfuscatedGetter(
       intValue = -1019558835
    )
-   static int __bv_y;
+   static int field425;
    @ObfuscatedName("r")
-   static final double __bv_r;
-
-   static {
-      Interpreter_arrayLengths = new int[5];
-      Interpreter_arrays = new int[5][5000];
-      Interpreter_intStack = new int[1000];
-      Interpreter_stringStack = new String[1000];
-      Interpreter_frameDepth = 0;
-      Interpreter_frames = new ScriptFrame[50];
-      Interpreter_calendar = Calendar.getInstance();
-      __bv_z = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
-      __bv_s = false;
-      __bv_t = false;
-      __bv_y = 0;
-      __bv_r = Math.log(2.0D);
-   }
+   static final double field426;
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
@@ -83,29 +69,29 @@ public class Interpreter {
    )
    public static PacketBufferNode method1915(ClientPacket var0, IsaacCipher var1) {
       PacketBufferNode var2;
-      if(PacketBufferNode.__gg_u == 0) {
+      if (PacketBufferNode.field668 == 0) {
          var2 = new PacketBufferNode();
       } else {
-         var2 = PacketBufferNode.packetBufferNodes[--PacketBufferNode.__gg_u];
+         var2 = PacketBufferNode.packetBufferNodes[--PacketBufferNode.field668];
       }
 
-      var2.__m = var0;
-      var2.__f = var0.length;
-      if(var2.__f == -1) {
+      var2.field669 = var0;
+      var2.field670 = var0.length;
+      if (var2.field670 == -1) {
          var2.packetBuffer = new PacketBuffer(260);
-      } else if(var2.__f == -2) {
+      } else if (var2.field670 == -2) {
          var2.packetBuffer = new PacketBuffer(10000);
-      } else if(var2.__f <= 18) {
+      } else if (var2.field670 <= 18) {
          var2.packetBuffer = new PacketBuffer(20);
-      } else if(var2.__f <= 98) {
+      } else if (var2.field670 <= 98) {
          var2.packetBuffer = new PacketBuffer(100);
       } else {
          var2.packetBuffer = new PacketBuffer(260);
       }
 
       var2.packetBuffer.setIsaacCipher(var1);
-      var2.packetBuffer.writeByteIsaac(var2.__m.id);
-      var2.__w = 0;
+      var2.packetBuffer.writeByteIsaac(var2.field669.id);
+      var2.field671 = 0;
       return var2;
    }
 
@@ -117,13 +103,13 @@ public class Interpreter {
    @Export("getEnum")
    public static EnumDefinition getEnum(int var0) {
       EnumDefinition var1 = (EnumDefinition)EnumDefinition.EnumDefinition_cached.get((long)var0);
-      if(var1 != null) {
+      if (var1 != null) {
          return var1;
       } else {
-         byte[] var2 = EnumDefinition.EnumDefinition_indexCache.takeRecord(8, var0);
+         byte[] var2 = EnumDefinition.EnumDefinition_archive.takeFile(8, var0);
          var1 = new EnumDefinition();
-         if(var2 != null) {
-            var1.read(new Buffer(var2));
+         if (var2 != null) {
+            var1.decode(new Buffer(var2));
          }
 
          EnumDefinition.EnumDefinition_cached.put(var1, (long)var0);
@@ -144,8 +130,8 @@ public class Interpreter {
       var3[0] = var1;
       int var4 = 1;
 
-      for(int var5 = 0; var5 < 4; ++var5) {
-         if(World.sortOption1[var5] != var0) {
+      for (int var5 = 0; var5 < 4; ++var5) {
+         if (World.sortOption1[var5] != var0) {
             var2[var4] = World.sortOption1[var5];
             var3[var4] = World.sortOption2[var5];
             ++var4;
@@ -154,7 +140,7 @@ public class Interpreter {
 
       World.sortOption1 = var2;
       World.sortOption2 = var3;
-      MilliClock.method3400(ItemContainer.worlds, 0, ItemContainer.worlds.length - 1, World.sortOption1, World.sortOption2);
+      MilliClock.sortWorlds(ItemContainer.worlds, 0, ItemContainer.worlds.length - 1, World.sortOption1, World.sortOption2);
    }
 
    @ObfuscatedName("w")
@@ -164,34 +150,33 @@ public class Interpreter {
    )
    public static void method1976() {
       try {
-         File var0 = new File(WorldMapSection1.userHomeDirectory, "random.dat");
-         int var2;
-         if(var0.exists()) {
+         File var0 = new File(WorldMapSection2.userHomeDirectory, "random.dat");
+         int var1;
+         if (var0.exists()) {
             class168.randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0);
          } else {
-            label38:
-            for(int var1 = 0; var1 < Canvas.__ao_s.length; ++var1) {
-               for(var2 = 0; var2 < WorldMapSection2.cacheDirectoryLocations.length; ++var2) {
-                  File var3 = new File(WorldMapSection2.cacheDirectoryLocations[var2] + Canvas.__ao_s[var1] + File.separatorChar + "random.dat");
-                  if(var3.exists()) {
+            label34:
+            for (int var2 = 0; var2 < Canvas.field94.length; ++var2) {
+               for (var1 = 0; var1 < WorldMapSection0.cacheDirectoryLocations.length; ++var1) {
+                  File var3 = new File(WorldMapSection0.cacheDirectoryLocations[var1] + Canvas.field94[var2] + File.separatorChar + "random.dat");
+                  if (var3.exists()) {
                      class168.randomDat = new BufferedFile(new AccessFile(var3, "rw", 25L), 24, 0);
-                     break label38;
+                     break label34;
                   }
                }
             }
          }
 
-         if(class168.randomDat == null) {
-            RandomAccessFile var4 = new RandomAccessFile(var0, "rw");
-            var2 = var4.read();
-            var4.seek(0L);
-            var4.write(var2);
-            var4.seek(0L);
-            var4.close();
+         if (class168.randomDat == null) {
+            RandomAccessFile var5 = new RandomAccessFile(var0, "rw");
+            var1 = var5.read();
+            var5.seek(0L);
+            var5.write(var1);
+            var5.seek(0L);
+            var5.close();
             class168.randomDat = new BufferedFile(new AccessFile(var0, "rw", 25L), 24, 0);
          }
-      } catch (IOException var5) {
-         ;
+      } catch (IOException var4) {
       }
 
    }
@@ -202,24 +187,36 @@ public class Interpreter {
       garbageValue = "-10"
    )
    @Export("drawWidgets")
-   static final void drawWidgets(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
-      if(GroundItemPile.loadWidgetGroup(var0)) {
-         class279.__jx_ne = null;
-         DevicePcmPlayerProvider.drawWidgetGroup(Widget.widgets[var0], -1, var1, var2, var3, var4, var5, var6, var7);
-         if(class279.__jx_ne != null) {
-            DevicePcmPlayerProvider.drawWidgetGroup(class279.__jx_ne, -1412584499, var1, var2, var3, var4, class54.__bs_nb, class157.__fw_nm, var7);
-            class279.__jx_ne = null;
+   static final void drawWidgets(int interfaceID, int xStart, int yStart, int xEnd, int yEnd, int var5, int var6, int var7) {
+      if (GroundItemPile.loadInterface(interfaceID)) {
+         class279.field1145 = null;
+         DevicePcmPlayerProvider.drawInterface(Widget.interfaceComponents[interfaceID], -1, xStart, yStart, xEnd, yEnd, var5, var6, var7);
+         if (class279.field1145 != null) {
+            DevicePcmPlayerProvider.drawInterface(class279.field1145, -1412584499, xStart, yStart, xEnd, yEnd, class54.field1161, BuddyRankComparator.field1114, var7);
+            class279.field1145 = null;
          }
-
+      } else if (var7 != -1) {
+         Client.field100[var7] = true;
       } else {
-         if(var7 != -1) {
-            Client.__client_od[var7] = true;
-         } else {
-            for(int var8 = 0; var8 < 100; ++var8) {
-               Client.__client_od[var8] = true;
-            }
+         for (int var8 = 0; var8 < 100; ++var8) {
+            Client.field100[var8] = true;
          }
-
       }
+
+   }
+
+   static {
+      Interpreter_arrayLengths = new int[5];
+      Interpreter_arrays = new int[5][5000];
+      Interpreter_intStack = new int[1000];
+      Interpreter_stringStack = new String[1000];
+      Interpreter_frameDepth = 0;
+      Interpreter_frames = new ScriptFrame[50];
+      Interpreter_calendar = Calendar.getInstance();
+      Interpreter_MONTHS = new String[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
+      field423 = false;
+      field424 = false;
+      field425 = 0;
+      field426 = Math.log(2.0D);
    }
 }
diff --git a/runescape-client/src/main/java/InvDefinition.java b/runescape-client/src/main/java/InvDefinition.java
index 922b60700a..a762466103 100644
--- a/runescape-client/src/main/java/InvDefinition.java
+++ b/runescape-client/src/main/java/InvDefinition.java
@@ -11,7 +11,8 @@ public class InvDefinition extends DualNode {
    @ObfuscatedSignature(
       signature = "Ler;"
    )
-   static EvictingDualNodeHashTable __ib_f;
+   @Export("InvDefinition_cached")
+   static EvictingDualNodeHashTable InvDefinition_cached;
    @ObfuscatedName("q")
    @ObfuscatedGetter(
       intValue = 1358868971
@@ -19,10 +20,6 @@ public class InvDefinition extends DualNode {
    @Export("size")
    public int size;
 
-   static {
-      __ib_f = new EvictingDualNodeHashTable(64);
-   }
-
    InvDefinition() {
       this.size = 0;
    }
@@ -32,15 +29,15 @@ public class InvDefinition extends DualNode {
       signature = "(Lgr;I)V",
       garbageValue = "628080573"
    )
-   @Export("read")
-   void read(Buffer var1) {
-      while(true) {
+   @Export("decode")
+   void decode(Buffer var1) {
+      while (true) {
          int var2 = var1.readUnsignedByte();
-         if(var2 == 0) {
+         if (var2 == 0) {
             return;
          }
 
-         this.readNext(var1, var2);
+         this.decodeNext(var1, var2);
       }
    }
 
@@ -49,10 +46,10 @@ public class InvDefinition extends DualNode {
       signature = "(Lgr;II)V",
       garbageValue = "1763455566"
    )
-   @Export("readNext")
-   void readNext(Buffer var1, int var2) {
-      if(var2 == 2) {
-         this.size = var1.__ag_302();
+   @Export("decodeNext")
+   void decodeNext(Buffer var1, int var2) {
+      if (var2 == 2) {
+         this.size = var1.readUnsignedShort();
       }
 
    }
@@ -63,6 +60,10 @@ public class InvDefinition extends DualNode {
       garbageValue = "-121177696"
    )
    public static void method4754() {
-      ParamKeyDefinition.ParamKeyDefinition_cached.clear();
+      ParamDefinition.ParamDefinition_cached.clear();
+   }
+
+   static {
+      InvDefinition_cached = new EvictingDualNodeHashTable(64);
    }
 }
diff --git a/runescape-client/src/main/java/IsaacCipher.java b/runescape-client/src/main/java/IsaacCipher.java
index 11f5951763..235eec0d49 100644
--- a/runescape-client/src/main/java/IsaacCipher.java
+++ b/runescape-client/src/main/java/IsaacCipher.java
@@ -11,36 +11,42 @@ public final class IsaacCipher {
    @ObfuscatedGetter(
       intValue = 1514845493
    )
-   int __w;
+   @Export("valuesRemaining")
+   int valuesRemaining;
    @ObfuscatedName("o")
-   int[] __o;
+   @Export("results")
+   int[] results;
    @ObfuscatedName("u")
-   int[] __u;
+   @Export("mm")
+   int[] mm;
    @ObfuscatedName("g")
    @ObfuscatedGetter(
       intValue = -1670027699
    )
-   int __g;
+   @Export("aa")
+   int aa;
    @ObfuscatedName("l")
    @ObfuscatedGetter(
       intValue = -325762649
    )
-   int __l;
+   @Export("bb")
+   int bb;
    @ObfuscatedName("e")
    @ObfuscatedGetter(
       intValue = -1951204929
    )
-   int __e;
+   @Export("cc")
+   int cc;
 
-   public IsaacCipher(int[] var1) {
-      this.__u = new int[256];
-      this.__o = new int[256];
+   public IsaacCipher(int[] seed) {
+      this.mm = new int[256];
+      this.results = new int[256];
 
-      for(int var2 = 0; var2 < var1.length; ++var2) {
-         this.__o[var2] = var1[var2];
+      for (int var2 = 0; var2 < seed.length; ++var2) {
+         this.results[var2] = seed[var2];
       }
 
-      this.__w_339();
+      this.method139();
    }
 
    @ObfuscatedName("m")
@@ -48,13 +54,14 @@ public final class IsaacCipher {
       signature = "(I)I",
       garbageValue = "-7509790"
    )
-   final int __m_336() {
-      if(0 == --this.__w + 1) {
-         this.__q_338();
-         this.__w = 255;
+   @Export("nextInt")
+   final int nextInt() {
+      if (0 == --this.valuesRemaining + 1) {
+         this.generateMoreResults();
+         this.valuesRemaining = 255;
       }
 
-      return this.__o[this.__w];
+      return this.results[this.valuesRemaining];
    }
 
    @ObfuscatedName("f")
@@ -62,13 +69,13 @@ public final class IsaacCipher {
       signature = "(I)I",
       garbageValue = "-506873526"
    )
-   final int __f_337() {
-      if(this.__w == 0) {
-         this.__q_338();
-         this.__w = 256;
+   final int method137() {
+      if (this.valuesRemaining == 0) {
+         this.generateMoreResults();
+         this.valuesRemaining = 256;
       }
 
-      return this.__o[this.__w - 1];
+      return this.results[this.valuesRemaining - 1];
    }
 
    @ObfuscatedName("q")
@@ -76,27 +83,28 @@ public final class IsaacCipher {
       signature = "(B)V",
       garbageValue = "124"
    )
-   final void __q_338() {
-      this.__l += ++this.__e;
+   @Export("generateMoreResults")
+   final void generateMoreResults() {
+      this.bb += ++this.cc;
 
-      for(int var1 = 0; var1 < 256; ++var1) {
-         int var2 = this.__u[var1];
-         if((var1 & 2) == 0) {
-            if((var1 & 1) == 0) {
-               this.__g ^= this.__g << 13;
+      for (int var1 = 0; var1 < 256; ++var1) {
+         int var2 = this.mm[var1];
+         if ((var1 & 2) == 0) {
+            if ((var1 & 1) == 0) {
+               this.aa ^= this.aa << 13;
             } else {
-               this.__g ^= this.__g >>> 6;
+               this.aa ^= this.aa >>> 6;
             }
-         } else if((var1 & 1) == 0) {
-            this.__g ^= this.__g << 2;
+         } else if ((var1 & 1) == 0) {
+            this.aa ^= this.aa << 2;
          } else {
-            this.__g ^= this.__g >>> 16;
+            this.aa ^= this.aa >>> 16;
          }
 
-         this.__g += this.__u[128 + var1 & 255];
+         this.aa += this.mm[128 + var1 & 255];
          int var3;
-         this.__u[var1] = var3 = this.__u[(var2 & 1020) >> 2] + this.__l + this.__g;
-         this.__o[var1] = this.__l = this.__u[(var3 >> 8 & 1020) >> 2] + var2;
+         this.mm[var1] = var3 = this.mm[(var2 & 1020) >> 2] + this.bb + this.aa;
+         this.results[var1] = this.bb = this.mm[(var3 >> 8 & 1020) >> 2] + var2;
       }
 
    }
@@ -106,132 +114,132 @@ public final class IsaacCipher {
       signature = "(I)V",
       garbageValue = "579890110"
    )
-   final void __w_339() {
-      int var9 = -1640531527;
-      int var8 = -1640531527;
-      int var7 = -1640531527;
-      int var6 = -1640531527;
-      int var5 = -1640531527;
-      int var4 = -1640531527;
-      int var3 = -1640531527;
-      int var2 = -1640531527;
+   final void method139() {
+      int var1 = 0x9e3779b9;
+      int var2 = 0x9e3779b9;
+      int var3 = 0x9e3779b9;
+      int var4 = 0x9e3779b9;
+      int var5 = 0x9e3779b9;
+      int var6 = 0x9e3779b9;
+      int var7 = 0x9e3779b9;
+      int var8 = 0x9e3779b9;
 
-      int var1;
-      for(var1 = 0; var1 < 4; ++var1) {
-         var2 ^= var3 << 11;
-         var5 += var2;
-         var3 += var4;
-         var3 ^= var4 >>> 2;
-         var6 += var3;
-         var4 += var5;
-         var4 ^= var5 << 8;
-         var7 += var4;
-         var5 += var6;
-         var5 ^= var6 >>> 16;
-         var8 += var5;
-         var6 += var7;
-         var6 ^= var7 << 10;
-         var9 += var6;
-         var7 += var8;
-         var7 ^= var8 >>> 4;
-         var2 += var7;
-         var8 += var9;
-         var8 ^= var9 << 8;
-         var3 += var8;
-         var9 += var2;
-         var9 ^= var2 >>> 9;
-         var4 += var9;
-         var2 += var3;
+      int var9;
+      for (var9 = 0; var9 < 4; ++var9) {
+         var8 ^= var7 << 11;
+         var5 += var8;
+         var7 += var6;
+         var7 ^= var6 >>> 2;
+         var4 += var7;
+         var6 += var5;
+         var6 ^= var5 << 8;
+         var3 += var6;
+         var5 += var4;
+         var5 ^= var4 >>> 16;
+         var2 += var5;
+         var4 += var3;
+         var4 ^= var3 << 10;
+         var1 += var4;
+         var3 += var2;
+         var3 ^= var2 >>> 4;
+         var8 += var3;
+         var2 += var1;
+         var2 ^= var1 << 8;
+         var7 += var2;
+         var1 += var8;
+         var1 ^= var8 >>> 9;
+         var6 += var1;
+         var8 += var7;
       }
 
-      for(var1 = 0; var1 < 256; var1 += 8) {
-         var2 += this.__o[var1];
-         var3 += this.__o[var1 + 1];
-         var4 += this.__o[var1 + 2];
-         var5 += this.__o[var1 + 3];
-         var6 += this.__o[var1 + 4];
-         var7 += this.__o[var1 + 5];
-         var8 += this.__o[var1 + 6];
-         var9 += this.__o[var1 + 7];
-         var2 ^= var3 << 11;
-         var5 += var2;
-         var3 += var4;
-         var3 ^= var4 >>> 2;
-         var6 += var3;
-         var4 += var5;
-         var4 ^= var5 << 8;
-         var7 += var4;
-         var5 += var6;
-         var5 ^= var6 >>> 16;
-         var8 += var5;
-         var6 += var7;
-         var6 ^= var7 << 10;
-         var9 += var6;
-         var7 += var8;
-         var7 ^= var8 >>> 4;
-         var2 += var7;
-         var8 += var9;
-         var8 ^= var9 << 8;
-         var3 += var8;
-         var9 += var2;
-         var9 ^= var2 >>> 9;
-         var4 += var9;
-         var2 += var3;
-         this.__u[var1] = var2;
-         this.__u[var1 + 1] = var3;
-         this.__u[var1 + 2] = var4;
-         this.__u[var1 + 3] = var5;
-         this.__u[var1 + 4] = var6;
-         this.__u[var1 + 5] = var7;
-         this.__u[var1 + 6] = var8;
-         this.__u[var1 + 7] = var9;
+      for (var9 = 0; var9 < 256; var9 += 8) {
+         var8 += this.results[var9];
+         var7 += this.results[var9 + 1];
+         var6 += this.results[var9 + 2];
+         var5 += this.results[var9 + 3];
+         var4 += this.results[var9 + 4];
+         var3 += this.results[var9 + 5];
+         var2 += this.results[var9 + 6];
+         var1 += this.results[var9 + 7];
+         var8 ^= var7 << 11;
+         var5 += var8;
+         var7 += var6;
+         var7 ^= var6 >>> 2;
+         var4 += var7;
+         var6 += var5;
+         var6 ^= var5 << 8;
+         var3 += var6;
+         var5 += var4;
+         var5 ^= var4 >>> 16;
+         var2 += var5;
+         var4 += var3;
+         var4 ^= var3 << 10;
+         var1 += var4;
+         var3 += var2;
+         var3 ^= var2 >>> 4;
+         var8 += var3;
+         var2 += var1;
+         var2 ^= var1 << 8;
+         var7 += var2;
+         var1 += var8;
+         var1 ^= var8 >>> 9;
+         var6 += var1;
+         var8 += var7;
+         this.mm[var9] = var8;
+         this.mm[var9 + 1] = var7;
+         this.mm[var9 + 2] = var6;
+         this.mm[var9 + 3] = var5;
+         this.mm[var9 + 4] = var4;
+         this.mm[var9 + 5] = var3;
+         this.mm[var9 + 6] = var2;
+         this.mm[var9 + 7] = var1;
       }
 
-      for(var1 = 0; var1 < 256; var1 += 8) {
-         var2 += this.__u[var1];
-         var3 += this.__u[var1 + 1];
-         var4 += this.__u[var1 + 2];
-         var5 += this.__u[var1 + 3];
-         var6 += this.__u[var1 + 4];
-         var7 += this.__u[var1 + 5];
-         var8 += this.__u[var1 + 6];
-         var9 += this.__u[var1 + 7];
-         var2 ^= var3 << 11;
-         var5 += var2;
-         var3 += var4;
-         var3 ^= var4 >>> 2;
-         var6 += var3;
-         var4 += var5;
-         var4 ^= var5 << 8;
-         var7 += var4;
-         var5 += var6;
-         var5 ^= var6 >>> 16;
-         var8 += var5;
-         var6 += var7;
-         var6 ^= var7 << 10;
-         var9 += var6;
-         var7 += var8;
-         var7 ^= var8 >>> 4;
-         var2 += var7;
-         var8 += var9;
-         var8 ^= var9 << 8;
-         var3 += var8;
-         var9 += var2;
-         var9 ^= var2 >>> 9;
-         var4 += var9;
-         var2 += var3;
-         this.__u[var1] = var2;
-         this.__u[var1 + 1] = var3;
-         this.__u[var1 + 2] = var4;
-         this.__u[var1 + 3] = var5;
-         this.__u[var1 + 4] = var6;
-         this.__u[var1 + 5] = var7;
-         this.__u[var1 + 6] = var8;
-         this.__u[var1 + 7] = var9;
+      for (var9 = 0; var9 < 256; var9 += 8) {
+         var8 += this.mm[var9];
+         var7 += this.mm[var9 + 1];
+         var6 += this.mm[var9 + 2];
+         var5 += this.mm[var9 + 3];
+         var4 += this.mm[var9 + 4];
+         var3 += this.mm[var9 + 5];
+         var2 += this.mm[var9 + 6];
+         var1 += this.mm[var9 + 7];
+         var8 ^= var7 << 11;
+         var5 += var8;
+         var7 += var6;
+         var7 ^= var6 >>> 2;
+         var4 += var7;
+         var6 += var5;
+         var6 ^= var5 << 8;
+         var3 += var6;
+         var5 += var4;
+         var5 ^= var4 >>> 16;
+         var2 += var5;
+         var4 += var3;
+         var4 ^= var3 << 10;
+         var1 += var4;
+         var3 += var2;
+         var3 ^= var2 >>> 4;
+         var8 += var3;
+         var2 += var1;
+         var2 ^= var1 << 8;
+         var7 += var2;
+         var1 += var8;
+         var1 ^= var8 >>> 9;
+         var6 += var1;
+         var8 += var7;
+         this.mm[var9] = var8;
+         this.mm[var9 + 1] = var7;
+         this.mm[var9 + 2] = var6;
+         this.mm[var9 + 3] = var5;
+         this.mm[var9 + 4] = var4;
+         this.mm[var9 + 5] = var3;
+         this.mm[var9 + 6] = var2;
+         this.mm[var9 + 7] = var1;
       }
 
-      this.__q_338();
-      this.__w = 256;
+      this.generateMoreResults();
+      this.valuesRemaining = 256;
    }
 
    @ObfuscatedName("m")
@@ -239,9 +247,10 @@ public final class IsaacCipher {
       signature = "(Lir;Lir;I)V",
       garbageValue = "75867683"
    )
-   public static void method4082(AbstractIndexCache var0, AbstractIndexCache var1) {
-      NpcDefinition.NpcDefinition_indexCache = var0;
-      NpcDefinition.NpcDefinition_modelIndexCache = var1;
+   @Export("setNpcDefinitionArchives")
+   public static void setNpcDefinitionArchives(AbstractArchive var0, AbstractArchive var1) {
+      NPCDefinition.NpcDefinition_archive = var0;
+      NPCDefinition.NpcDefinition_modelArchive = var1;
    }
 
    @ObfuscatedName("fl")
@@ -250,83 +259,83 @@ public final class IsaacCipher {
       garbageValue = "1676957578"
    )
    static void method4093(int var0) {
-      if(var0 == -3) {
+      if (var0 == -3) {
          class54.method1089("Connection timed out.", "Please try using a different world.", "");
-      } else if(var0 == -2) {
+      } else if (var0 == -2) {
          class54.method1089("", "Error connecting to server.", "");
-      } else if(var0 == -1) {
+      } else if (var0 == -1) {
          class54.method1089("No response from server.", "Please try using a different world.", "");
-      } else if(var0 == 3) {
+      } else if (var0 == 3) {
          Login.loginIndex = 3;
-         Login.__cu_ac = 1;
-      } else if(var0 == 4) {
+         Login.field467 = 1;
+      } else if (var0 == 4) {
          class32.method578(0);
-      } else if(var0 == 5) {
-         Login.__cu_ac = 2;
+      } else if (var0 == 5) {
+         Login.field467 = 2;
          class54.method1089("Your account has not logged out from its last", "session or the server is too busy right now.", "Please try again in a few minutes.");
-      } else if(var0 != 68 && (Client.__client_bl || var0 != 6)) {
-         if(var0 == 7) {
+      } else if (var0 != 68 && (Client.onMobile || var0 != 6)) {
+         if (var0 == 7) {
             class54.method1089("This world is full.", "Please use a different world.", "");
-         } else if(var0 == 8) {
+         } else if (var0 == 8) {
             class54.method1089("Unable to connect.", "Login server offline.", "");
-         } else if(var0 == 9) {
+         } else if (var0 == 9) {
             class54.method1089("Login limit exceeded.", "Too many connections from your address.", "");
-         } else if(var0 == 10) {
+         } else if (var0 == 10) {
             class54.method1089("Unable to connect.", "Bad session id.", "");
-         } else if(var0 == 11) {
-            class54.method1089("We suspect someone knows your password.", "Press \'change your password\' on front page.", "");
-         } else if(var0 == 12) {
+         } else if (var0 == 11) {
+            class54.method1089("We suspect someone knows your password.", "Press 'change your password' on front page.", "");
+         } else if (var0 == 12) {
             class54.method1089("You need a members account to login to this world.", "Please subscribe, or use a different world.", "");
-         } else if(var0 == 13) {
+         } else if (var0 == 13) {
             class54.method1089("Could not complete login.", "Please try using a different world.", "");
-         } else if(var0 == 14) {
+         } else if (var0 == 14) {
             class54.method1089("The server is being updated.", "Please wait 1 minute and try again.", "");
-         } else if(var0 == 16) {
+         } else if (var0 == 16) {
             class54.method1089("Too many login attempts.", "Please wait a few minutes before trying again.", "");
-         } else if(var0 == 17) {
+         } else if (var0 == 17) {
             class54.method1089("You are standing in a members-only area.", "To play on this world move to a free area first", "");
-         } else if(var0 == 18) {
+         } else if (var0 == 18) {
             class32.method578(1);
-         } else if(var0 == 19) {
+         } else if (var0 == 19) {
             class54.method1089("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world.");
-         } else if(var0 == 20) {
+         } else if (var0 == 20) {
             class54.method1089("Invalid loginserver requested.", "Please try using a different world.", "");
-         } else if(var0 == 22) {
+         } else if (var0 == 22) {
             class54.method1089("Malformed login packet.", "Please try again.", "");
-         } else if(var0 == 23) {
+         } else if (var0 == 23) {
             class54.method1089("No reply from loginserver.", "Please wait 1 minute and try again.", "");
-         } else if(var0 == 24) {
+         } else if (var0 == 24) {
             class54.method1089("Error loading your profile.", "Please contact customer support.", "");
-         } else if(var0 == 25) {
+         } else if (var0 == 25) {
             class54.method1089("Unexpected loginserver response.", "Please try using a different world.", "");
-         } else if(var0 == 26) {
+         } else if (var0 == 26) {
             class54.method1089("This computers address has been blocked", "as it was used to break our rules.", "");
-         } else if(var0 == 27) {
+         } else if (var0 == 27) {
             class54.method1089("", "Service unavailable.", "");
-         } else if(var0 == 31) {
+         } else if (var0 == 31) {
             class54.method1089("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) {
-            class54.method1089("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) {
+         } else if (var0 == 32) {
+            class54.method1089("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) {
             class54.method1089("Your account is currently inaccessible.", "Please try again in a few minutes.", "");
-         } else if(var0 == 38) {
+         } else if (var0 == 38) {
             class54.method1089("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!");
-         } else if(var0 == 55) {
+         } else if (var0 == 55) {
             Login.loginIndex = 8;
          } else {
-            if(var0 == 56) {
+            if (var0 == 56) {
                class54.method1089("Enter the 6-digit code generated by your", "authenticator app.", "");
                GameShell.updateGameState(11);
                return;
             }
 
-            if(var0 == 57) {
+            if (var0 == 57) {
                class54.method1089("The code you entered was incorrect.", "Please try again.", "");
                GameShell.updateGameState(11);
                return;
             }
 
-            if(var0 == 61) {
+            if (var0 == 61) {
                Login.loginIndex = 7;
             } else {
                class54.method1089("Unexpected server response", "Please try using a different world.", "");
diff --git a/runescape-client/src/main/java/ItemContainer.java b/runescape-client/src/main/java/ItemContainer.java
index 8a99037d41..40a7592c28 100644
--- a/runescape-client/src/main/java/ItemContainer.java
+++ b/runescape-client/src/main/java/ItemContainer.java
@@ -22,7 +22,8 @@ public class ItemContainer extends Node {
    @ObfuscatedSignature(
       signature = "Lit;"
    )
-   static IndexCache __bc_dm;
+   @Export("archive19")
+   static Archive archive19;
    @ObfuscatedName("f")
    @Export("ids")
    int[] ids;
@@ -30,10 +31,6 @@ public class ItemContainer extends Node {
    @Export("quantities")
    int[] quantities;
 
-   static {
-      itemContainers = new NodeHashTable(32);
-   }
-
    ItemContainer() {
       this.ids = new int[]{-1};
       this.quantities = new int[]{0};
@@ -55,44 +52,48 @@ public class ItemContainer extends Node {
    )
    @Export("getFrames")
    static Frames getFrames(int var0) {
-      Frames var1 = (Frames)SequenceDefinition.__jh_o.get((long)var0);
-      if(var1 != null) {
+      Frames var1 = (Frames)SequenceDefinition.field775.get((long)var0);
+      if (var1 != null) {
          return var1;
       } else {
-         AbstractIndexCache var3 = SequenceDefinition.__jh_f;
-         AbstractIndexCache var4 = SequenceDefinition.__jh_q;
-         boolean var5 = true;
-         int[] var6 = var3.__j_395(var0);
+         AbstractArchive var2 = SequenceDefinition.field773;
+         AbstractArchive var3 = SequenceDefinition.field774;
+         boolean var4 = true;
+         int[] var5 = var2.method3(var0);
 
-         for(int var7 = 0; var7 < var6.length; ++var7) {
-            byte[] var8 = var3.getRecord(var0, var6[var7]);
-            if(var8 == null) {
-               var5 = false;
+         for (int var6 = 0; var6 < var5.length; ++var6) {
+            byte[] var7 = var2.getFile(var0, var5[var6]);
+            if (var7 == null) {
+               var4 = false;
             } else {
-               int var9 = (var8[0] & 255) << 8 | var8[1] & 255;
-               byte[] var10 = var4.getRecord(var9, 0);
-               if(var10 == null) {
-                  var5 = false;
+               int var8 = (var7[0] & 255) << 8 | var7[1] & 255;
+               byte[] var9 = var3.getFile(var8, 0);
+               if (var9 == null) {
+                  var4 = false;
                }
             }
          }
 
-         Frames var2;
-         if(!var5) {
-            var2 = null;
+         Frames var11;
+         if (!var4) {
+            var11 = null;
          } else {
             try {
-               var2 = new Frames(var3, var4, var0, false);
-            } catch (Exception var12) {
-               var2 = null;
+               var11 = new Frames(var2, var3, var0, false);
+            } catch (Exception var10) {
+               var11 = null;
             }
          }
 
-         if(var2 != null) {
-            SequenceDefinition.__jh_o.put(var2, (long)var0);
+         if (var11 != null) {
+            SequenceDefinition.field775.put(var11, (long)var0);
          }
 
-         return var2;
+         return var11;
       }
    }
+
+   static {
+      itemContainers = new NodeHashTable(32);
+   }
 }
diff --git a/runescape-client/src/main/java/ItemDefinition.java b/runescape-client/src/main/java/ItemDefinition.java
index 79a6776a68..ebd5c220fd 100644
--- a/runescape-client/src/main/java/ItemDefinition.java
+++ b/runescape-client/src/main/java/ItemDefinition.java
@@ -11,14 +11,14 @@ public class ItemDefinition extends DualNode {
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   @Export("ItemDefinition_indexCache")
-   public static AbstractIndexCache ItemDefinition_indexCache;
+   @Export("ItemDefinition_archive")
+   public static AbstractArchive ItemDefinition_archive;
    @ObfuscatedName("g")
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   @Export("ItemDefinition_modelIndexCache")
-   public static AbstractIndexCache ItemDefinition_modelIndexCache;
+   @Export("ItemDefinition_modelArchive")
+   public static AbstractArchive ItemDefinition_modelArchive;
    @ObfuscatedName("x")
    @ObfuscatedSignature(
       signature = "Ler;"
@@ -47,7 +47,8 @@ public class ItemDefinition extends DualNode {
    @ObfuscatedGetter(
       intValue = 1070080857
    )
-   int __a;
+   @Export("model")
+   int model;
    @ObfuscatedName("z")
    @Export("name")
    public String name;
@@ -124,8 +125,8 @@ public class ItemDefinition extends DualNode {
    @ObfuscatedGetter(
       intValue = 881309855
    )
-   @Export("shiftClickIndex0")
-   int shiftClickIndex0;
+   @Export("shiftClickIndex")
+   int shiftClickIndex;
    @ObfuscatedName("ah")
    @ObfuscatedGetter(
       intValue = 939367983
@@ -199,9 +200,11 @@ public class ItemDefinition extends DualNode {
    @Export("femaleHeadModel2")
    int femaleHeadModel2;
    @ObfuscatedName("az")
-   int[] __az;
+   @Export("countobj")
+   int[] countobj;
    @ObfuscatedName("au")
-   int[] __au;
+   @Export("countco")
+   int[] countco;
    @ObfuscatedName("ao")
    @ObfuscatedGetter(
       intValue = 619422509
@@ -248,8 +251,8 @@ public class ItemDefinition extends DualNode {
    @ObfuscatedGetter(
       intValue = -1057008657
    )
-   @Export("int1")
-   public int int1;
+   @Export("team")
+   public int team;
    @ObfuscatedName("bq")
    @ObfuscatedSignature(
       signature = "Llh;"
@@ -284,12 +287,6 @@ public class ItemDefinition extends DualNode {
    @Export("placeholderTemplate")
    public int placeholderTemplate;
 
-   static {
-      ItemDefinition_cached = new EvictingDualNodeHashTable(64);
-      ItemDefinition_cachedModels = new EvictingDualNodeHashTable(50);
-      Sprite_cached = new EvictingDualNodeHashTable(200);
-   }
-
    ItemDefinition() {
       this.name = "null";
       this.zoom2d = 2000;
@@ -303,7 +300,7 @@ public class ItemDefinition extends DualNode {
       this.isMembersOnly = false;
       this.groundActions = new String[]{null, null, "Take", null, null};
       this.inventoryActions = new String[]{null, null, null, null, "Drop"};
-      this.shiftClickIndex0 = -2;
+      this.shiftClickIndex = -2;
       this.maleModel = -1;
       this.maleModel1 = -1;
       this.maleOffset = 0;
@@ -323,7 +320,7 @@ public class ItemDefinition extends DualNode {
       this.resizeZ = 128;
       this.ambient = 0;
       this.contrast = 0;
-      this.int1 = 0;
+      this.team = 0;
       this.isTradable = false;
       this.unnotedId = -1;
       this.notedId = -1;
@@ -345,15 +342,15 @@ public class ItemDefinition extends DualNode {
       signature = "(Lgr;I)V",
       garbageValue = "-781492560"
    )
-   @Export("read")
-   void read(Buffer var1) {
-      while(true) {
+   @Export("decode")
+   void decode(Buffer var1) {
+      while (true) {
          int var2 = var1.readUnsignedByte();
-         if(var2 == 0) {
+         if (var2 == 0) {
             return;
          }
 
-         this.readNext(var1, var2);
+         this.decodeNext(var1, var2);
       }
    }
 
@@ -362,124 +359,124 @@ public class ItemDefinition extends DualNode {
       signature = "(Lgr;II)V",
       garbageValue = "-1975780739"
    )
-   @Export("readNext")
-   void readNext(Buffer var1, int var2) {
-      if(var2 == 1) {
-         this.__a = var1.__ag_302();
-      } else if(var2 == 2) {
+   @Export("decodeNext")
+   void decodeNext(Buffer var1, int var2) {
+      if (var2 == 1) {
+         this.model = var1.readUnsignedShort();
+      } else if (var2 == 2) {
          this.name = var1.readStringCp1252NullTerminated();
-      } else if(var2 == 4) {
-         this.zoom2d = var1.__ag_302();
-      } else if(var2 == 5) {
-         this.xan2d = var1.__ag_302();
-      } else if(var2 == 6) {
-         this.yan2d = var1.__ag_302();
-      } else if(var2 == 7) {
-         this.offsetX2d = var1.__ag_302();
-         if(this.offsetX2d > 32767) {
+      } else if (var2 == 4) {
+         this.zoom2d = var1.readUnsignedShort();
+      } else if (var2 == 5) {
+         this.xan2d = var1.readUnsignedShort();
+      } else if (var2 == 6) {
+         this.yan2d = var1.readUnsignedShort();
+      } else if (var2 == 7) {
+         this.offsetX2d = var1.readUnsignedShort();
+         if (this.offsetX2d > 32767) {
             this.offsetX2d -= 65536;
          }
-      } else if(var2 == 8) {
-         this.offsetY2d = var1.__ag_302();
-         if(this.offsetY2d > 32767) {
+      } else if (var2 == 8) {
+         this.offsetY2d = var1.readUnsignedShort();
+         if (this.offsetY2d > 32767) {
             this.offsetY2d -= 65536;
          }
-      } else if(var2 == 11) {
+      } else if (var2 == 11) {
          this.isStackable = 1;
-      } else if(var2 == 12) {
+      } else if (var2 == 12) {
          this.price = var1.readInt();
-      } else if(var2 == 16) {
+      } else if (var2 == 16) {
          this.isMembersOnly = true;
-      } else if(var2 == 23) {
-         this.maleModel = var1.__ag_302();
+      } else if (var2 == 23) {
+         this.maleModel = var1.readUnsignedShort();
          this.maleOffset = var1.readUnsignedByte();
-      } else if(var2 == 24) {
-         this.maleModel1 = var1.__ag_302();
-      } else if(var2 == 25) {
-         this.femaleModel = var1.__ag_302();
+      } else if (var2 == 24) {
+         this.maleModel1 = var1.readUnsignedShort();
+      } else if (var2 == 25) {
+         this.femaleModel = var1.readUnsignedShort();
          this.femaleOffset = var1.readUnsignedByte();
-      } else if(var2 == 26) {
-         this.femaleModel1 = var1.__ag_302();
-      } else if(var2 >= 30 && var2 < 35) {
+      } else if (var2 == 26) {
+         this.femaleModel1 = var1.readUnsignedShort();
+      } else if (var2 >= 30 && var2 < 35) {
          this.groundActions[var2 - 30] = var1.readStringCp1252NullTerminated();
-         if(this.groundActions[var2 - 30].equalsIgnoreCase("Hidden")) {
+         if (this.groundActions[var2 - 30].equalsIgnoreCase("Hidden")) {
             this.groundActions[var2 - 30] = null;
          }
-      } else if(var2 >= 35 && var2 < 40) {
+      } else if (var2 >= 35 && var2 < 40) {
          this.inventoryActions[var2 - 35] = var1.readStringCp1252NullTerminated();
       } else {
          int var3;
          int var4;
-         if(var2 == 40) {
+         if (var2 == 40) {
             var3 = var1.readUnsignedByte();
             this.recolorFrom = new short[var3];
             this.recolorTo = new short[var3];
 
-            for(var4 = 0; var4 < var3; ++var4) {
-               this.recolorFrom[var4] = (short)var1.__ag_302();
-               this.recolorTo[var4] = (short)var1.__ag_302();
+            for (var4 = 0; var4 < var3; ++var4) {
+               this.recolorFrom[var4] = (short)var1.readUnsignedShort();
+               this.recolorTo[var4] = (short)var1.readUnsignedShort();
             }
-         } else if(var2 == 41) {
+         } else if (var2 == 41) {
             var3 = var1.readUnsignedByte();
             this.retextureFrom = new short[var3];
             this.retextureTo = new short[var3];
 
-            for(var4 = 0; var4 < var3; ++var4) {
-               this.retextureFrom[var4] = (short)var1.__ag_302();
-               this.retextureTo[var4] = (short)var1.__ag_302();
+            for (var4 = 0; var4 < var3; ++var4) {
+               this.retextureFrom[var4] = (short)var1.readUnsignedShort();
+               this.retextureTo[var4] = (short)var1.readUnsignedShort();
             }
-         } else if(var2 == 42) {
-            this.shiftClickIndex0 = var1.readByte();
-         } else if(var2 == 65) {
+         } else if (var2 == 42) {
+            this.shiftClickIndex = var1.readByte();
+         } else if (var2 == 65) {
             this.isTradable = true;
-         } else if(var2 == 78) {
-            this.maleModel2 = var1.__ag_302();
-         } else if(var2 == 79) {
-            this.femaleModel2 = var1.__ag_302();
-         } else if(var2 == 90) {
-            this.maleHeadModel = var1.__ag_302();
-         } else if(var2 == 91) {
-            this.femaleHeadModel = var1.__ag_302();
-         } else if(var2 == 92) {
-            this.maleHeadModel2 = var1.__ag_302();
-         } else if(var2 == 93) {
-            this.femaleHeadModel2 = var1.__ag_302();
-         } else if(var2 == 95) {
-            this.zan2d = var1.__ag_302();
-         } else if(var2 == 97) {
-            this.note = var1.__ag_302();
-         } else if(var2 == 98) {
-            this.noteTemplate = var1.__ag_302();
-         } else if(var2 >= 100 && var2 < 110) {
-            if(this.__az == null) {
-               this.__az = new int[10];
-               this.__au = new int[10];
+         } else if (var2 == 78) {
+            this.maleModel2 = var1.readUnsignedShort();
+         } else if (var2 == 79) {
+            this.femaleModel2 = var1.readUnsignedShort();
+         } else if (var2 == 90) {
+            this.maleHeadModel = var1.readUnsignedShort();
+         } else if (var2 == 91) {
+            this.femaleHeadModel = var1.readUnsignedShort();
+         } else if (var2 == 92) {
+            this.maleHeadModel2 = var1.readUnsignedShort();
+         } else if (var2 == 93) {
+            this.femaleHeadModel2 = var1.readUnsignedShort();
+         } else if (var2 == 95) {
+            this.zan2d = var1.readUnsignedShort();
+         } else if (var2 == 97) {
+            this.note = var1.readUnsignedShort();
+         } else if (var2 == 98) {
+            this.noteTemplate = var1.readUnsignedShort();
+         } else if (var2 >= 100 && var2 < 110) {
+            if (this.countobj == null) {
+               this.countobj = new int[10];
+               this.countco = new int[10];
             }
 
-            this.__az[var2 - 100] = var1.__ag_302();
-            this.__au[var2 - 100] = var1.__ag_302();
-         } else if(var2 == 110) {
-            this.resizeX = var1.__ag_302();
-         } else if(var2 == 111) {
-            this.resizeY = var1.__ag_302();
-         } else if(var2 == 112) {
-            this.resizeZ = var1.__ag_302();
-         } else if(var2 == 113) {
+            this.countobj[var2 - 100] = var1.readUnsignedShort();
+            this.countco[var2 - 100] = var1.readUnsignedShort();
+         } else if (var2 == 110) {
+            this.resizeX = var1.readUnsignedShort();
+         } else if (var2 == 111) {
+            this.resizeY = var1.readUnsignedShort();
+         } else if (var2 == 112) {
+            this.resizeZ = var1.readUnsignedShort();
+         } else if (var2 == 113) {
             this.ambient = var1.readByte();
-         } else if(var2 == 114) {
+         } else if (var2 == 114) {
             this.contrast = var1.readByte();
-         } else if(var2 == 115) {
-            this.int1 = var1.readUnsignedByte();
-         } else if(var2 == 139) {
-            this.unnotedId = var1.__ag_302();
-         } else if(var2 == 140) {
-            this.notedId = var1.__ag_302();
-         } else if(var2 == 148) {
-            this.placeholder = var1.__ag_302();
-         } else if(var2 == 149) {
-            this.placeholderTemplate = var1.__ag_302();
-         } else if(var2 == 249) {
-            this.params = AbstractIndexCache.readStringIntParameters(var1, this.params);
+         } else if (var2 == 115) {
+            this.team = var1.readUnsignedByte();
+         } else if (var2 == 139) {
+            this.unnotedId = var1.readUnsignedShort();
+         } else if (var2 == 140) {
+            this.notedId = var1.readUnsignedShort();
+         } else if (var2 == 148) {
+            this.placeholder = var1.readUnsignedShort();
+         } else if (var2 == 149) {
+            this.placeholderTemplate = var1.readUnsignedShort();
+         } else if (var2 == 249) {
+            this.params = AbstractArchive.readStringIntParameters(var1, this.params);
          }
       }
 
@@ -490,21 +487,22 @@ public class ItemDefinition extends DualNode {
       signature = "(Ljv;Ljv;I)V",
       garbageValue = "2051877377"
    )
-   void __o_426(ItemDefinition var1, ItemDefinition var2) {
-      this.__a = var1.__a;
-      this.zoom2d = var1.zoom2d;
-      this.xan2d = var1.xan2d;
-      this.yan2d = var1.yan2d;
-      this.zan2d = var1.zan2d;
-      this.offsetX2d = var1.offsetX2d;
-      this.offsetY2d = var1.offsetY2d;
-      this.recolorFrom = var1.recolorFrom;
-      this.recolorTo = var1.recolorTo;
-      this.retextureFrom = var1.retextureFrom;
-      this.retextureTo = var1.retextureTo;
-      this.name = var2.name;
-      this.isMembersOnly = var2.isMembersOnly;
-      this.price = var2.price;
+   @Export("genCert")
+   void genCert(ItemDefinition template, ItemDefinition link) {
+      this.model = template.model;
+      this.zoom2d = template.zoom2d;
+      this.xan2d = template.xan2d;
+      this.yan2d = template.yan2d;
+      this.zan2d = template.zan2d;
+      this.offsetX2d = template.offsetX2d;
+      this.offsetY2d = template.offsetY2d;
+      this.recolorFrom = template.recolorFrom;
+      this.recolorTo = template.recolorTo;
+      this.retextureFrom = template.retextureFrom;
+      this.retextureTo = template.retextureTo;
+      this.name = link.name;
+      this.isMembersOnly = link.isMembersOnly;
+      this.price = link.price;
       this.isStackable = 1;
    }
 
@@ -513,37 +511,38 @@ public class ItemDefinition extends DualNode {
       signature = "(Ljv;Ljv;I)V",
       garbageValue = "227754762"
    )
-   void __u_427(ItemDefinition var1, ItemDefinition var2) {
-      this.__a = var1.__a;
-      this.zoom2d = var1.zoom2d;
-      this.xan2d = var1.xan2d;
-      this.yan2d = var1.yan2d;
-      this.zan2d = var1.zan2d;
-      this.offsetX2d = var1.offsetX2d;
-      this.offsetY2d = var1.offsetY2d;
-      this.recolorFrom = var2.recolorFrom;
-      this.recolorTo = var2.recolorTo;
-      this.retextureFrom = var2.retextureFrom;
-      this.retextureTo = var2.retextureTo;
-      this.name = var2.name;
-      this.isMembersOnly = var2.isMembersOnly;
-      this.isStackable = var2.isStackable;
-      this.maleModel = var2.maleModel;
-      this.maleModel1 = var2.maleModel1;
-      this.maleModel2 = var2.maleModel2;
-      this.femaleModel = var2.femaleModel;
-      this.femaleModel1 = var2.femaleModel1;
-      this.femaleModel2 = var2.femaleModel2;
-      this.maleHeadModel = var2.maleHeadModel;
-      this.maleHeadModel2 = var2.maleHeadModel2;
-      this.femaleHeadModel = var2.femaleHeadModel;
-      this.femaleHeadModel2 = var2.femaleHeadModel2;
-      this.int1 = var2.int1;
-      this.groundActions = var2.groundActions;
+   @Export("genBought")
+   void genBought(ItemDefinition template, ItemDefinition link) {
+      this.model = template.model;
+      this.zoom2d = template.zoom2d;
+      this.xan2d = template.xan2d;
+      this.yan2d = template.yan2d;
+      this.zan2d = template.zan2d;
+      this.offsetX2d = template.offsetX2d;
+      this.offsetY2d = template.offsetY2d;
+      this.recolorFrom = link.recolorFrom;
+      this.recolorTo = link.recolorTo;
+      this.retextureFrom = link.retextureFrom;
+      this.retextureTo = link.retextureTo;
+      this.name = link.name;
+      this.isMembersOnly = link.isMembersOnly;
+      this.isStackable = link.isStackable;
+      this.maleModel = link.maleModel;
+      this.maleModel1 = link.maleModel1;
+      this.maleModel2 = link.maleModel2;
+      this.femaleModel = link.femaleModel;
+      this.femaleModel1 = link.femaleModel1;
+      this.femaleModel2 = link.femaleModel2;
+      this.maleHeadModel = link.maleHeadModel;
+      this.maleHeadModel2 = link.maleHeadModel2;
+      this.femaleHeadModel = link.femaleHeadModel;
+      this.femaleHeadModel2 = link.femaleHeadModel2;
+      this.team = link.team;
+      this.groundActions = link.groundActions;
       this.inventoryActions = new String[5];
-      if(var2.inventoryActions != null) {
-         for(int var3 = 0; var3 < 4; ++var3) {
-            this.inventoryActions[var3] = var2.inventoryActions[var3];
+      if (link.inventoryActions != null) {
+         for (int var3 = 0; var3 < 4; ++var3) {
+            this.inventoryActions[var3] = link.inventoryActions[var3];
          }
       }
 
@@ -556,20 +555,21 @@ public class ItemDefinition extends DualNode {
       signature = "(Ljv;Ljv;I)V",
       garbageValue = "2084647027"
    )
-   void __g_428(ItemDefinition var1, ItemDefinition var2) {
-      this.__a = var1.__a;
-      this.zoom2d = var1.zoom2d;
-      this.xan2d = var1.xan2d;
-      this.yan2d = var1.yan2d;
-      this.zan2d = var1.zan2d;
-      this.offsetX2d = var1.offsetX2d;
-      this.offsetY2d = var1.offsetY2d;
-      this.recolorFrom = var1.recolorFrom;
-      this.recolorTo = var1.recolorTo;
-      this.retextureFrom = var1.retextureFrom;
-      this.retextureTo = var1.retextureTo;
-      this.isStackable = var1.isStackable;
-      this.name = var2.name;
+   @Export("genPlaceholder")
+   void genPlaceholder(ItemDefinition template, ItemDefinition link) {
+      this.model = template.model;
+      this.zoom2d = template.zoom2d;
+      this.xan2d = template.xan2d;
+      this.yan2d = template.yan2d;
+      this.zan2d = template.zan2d;
+      this.offsetX2d = template.offsetX2d;
+      this.offsetY2d = template.offsetY2d;
+      this.recolorFrom = template.recolorFrom;
+      this.recolorTo = template.recolorTo;
+      this.retextureFrom = template.retextureFrom;
+      this.retextureTo = template.retextureTo;
+      this.isStackable = template.isStackable;
+      this.name = link.name;
       this.price = 0;
       this.isMembersOnly = false;
       this.isTradable = false;
@@ -580,39 +580,39 @@ public class ItemDefinition extends DualNode {
       signature = "(II)Ldw;",
       garbageValue = "-223149161"
    )
-   public final ModelData __l_429(int var1) {
-      int var3;
-      if(this.__az != null && var1 > 1) {
-         int var2 = -1;
+   public final ModelData method143(int var1) {
+      int var2;
+      if (this.countobj != null && var1 > 1) {
+         int var3 = -1;
 
-         for(var3 = 0; var3 < 10; ++var3) {
-            if(var1 >= this.__au[var3] && this.__au[var3] != 0) {
-               var2 = this.__az[var3];
+         for (var2 = 0; var2 < 10; ++var2) {
+            if (var1 >= this.countco[var2] && this.countco[var2] != 0) {
+               var3 = this.countobj[var2];
             }
          }
 
-         if(var2 != -1) {
-            return Skills.getItemDefinition(var2).__l_429(1);
+         if (var3 != -1) {
+            return Skills.getItemDefinition(var3).method143(1);
          }
       }
 
-      ModelData var4 = ModelData.method2788(ItemDefinition_modelIndexCache, this.__a, 0);
-      if(var4 == null) {
+      ModelData var4 = ModelData.method2788(ItemDefinition_modelArchive, this.model, 0);
+      if (var4 == null) {
          return null;
       } else {
-         if(this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) {
-            var4.__y_227(this.resizeX, this.resizeY, this.resizeZ);
+         if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) {
+            var4.method215(this.resizeX, this.resizeY, this.resizeZ);
          }
 
-         if(this.recolorFrom != null) {
-            for(var3 = 0; var3 < this.recolorFrom.length; ++var3) {
-               var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]);
+         if (this.recolorFrom != null) {
+            for (var2 = 0; var2 < this.recolorFrom.length; ++var2) {
+               var4.recolor(this.recolorFrom[var2], this.recolorTo[var2]);
             }
          }
 
-         if(this.retextureFrom != null) {
-            for(var3 = 0; var3 < this.retextureFrom.length; ++var3) {
-               var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]);
+         if (this.retextureFrom != null) {
+            for (var2 = 0; var2 < this.retextureFrom.length; ++var2) {
+               var4.retexture(this.retextureFrom[var2], this.retextureTo[var2]);
             }
          }
 
@@ -626,42 +626,42 @@ public class ItemDefinition extends DualNode {
       garbageValue = "1152916563"
    )
    @Export("getModel")
-   public final Model getModel(int var1) {
-      if(this.__az != null && var1 > 1) {
+   public final Model getModel(int quantity) {
+      if (this.countobj != null && quantity > 1) {
          int var2 = -1;
 
-         for(int var3 = 0; var3 < 10; ++var3) {
-            if(var1 >= this.__au[var3] && this.__au[var3] != 0) {
-               var2 = this.__az[var3];
+         for (int var3 = 0; var3 < 10; ++var3) {
+            if (quantity >= this.countco[var3] && this.countco[var3] != 0) {
+               var2 = this.countobj[var3];
             }
          }
 
-         if(var2 != -1) {
+         if (var2 != -1) {
             return Skills.getItemDefinition(var2).getModel(1);
          }
       }
 
       Model var5 = (Model)ItemDefinition_cachedModels.get((long)this.id);
-      if(var5 != null) {
+      if (var5 != null) {
          return var5;
       } else {
-         ModelData var6 = ModelData.method2788(ItemDefinition_modelIndexCache, this.__a, 0);
-         if(var6 == null) {
+         ModelData var6 = ModelData.method2788(ItemDefinition_modelArchive, this.model, 0);
+         if (var6 == null) {
             return null;
          } else {
-            if(this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) {
-               var6.__y_227(this.resizeX, this.resizeY, this.resizeZ);
+            if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) {
+               var6.method215(this.resizeX, this.resizeY, this.resizeZ);
             }
 
             int var4;
-            if(this.recolorFrom != null) {
-               for(var4 = 0; var4 < this.recolorFrom.length; ++var4) {
+            if (this.recolorFrom != null) {
+               for (var4 = 0; var4 < this.recolorFrom.length; ++var4) {
                   var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]);
                }
             }
 
-            if(this.retextureFrom != null) {
-               for(var4 = 0; var4 < this.retextureFrom.length; ++var4) {
+            if (this.retextureFrom != null) {
+               for (var4 = 0; var4 < this.retextureFrom.length; ++var4) {
                   var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]);
                }
             }
@@ -679,17 +679,18 @@ public class ItemDefinition extends DualNode {
       signature = "(IB)Ljv;",
       garbageValue = "0"
    )
-   public ItemDefinition __x_430(int var1) {
-      if(this.__az != null && var1 > 1) {
+   @Export("getCountObj")
+   public ItemDefinition getCountObj(int quantity) {
+      if (this.countobj != null && quantity > 1) {
          int var2 = -1;
 
-         for(int var3 = 0; var3 < 10; ++var3) {
-            if(var1 >= this.__au[var3] && this.__au[var3] != 0) {
-               var2 = this.__az[var3];
+         for (int var3 = 0; var3 < 10; ++var3) {
+            if (quantity >= this.countco[var3] && this.countco[var3] != 0) {
+               var2 = this.countobj[var3];
             }
          }
 
-         if(var2 != -1) {
+         if (var2 != -1) {
             return Skills.getItemDefinition(var2);
          }
       }
@@ -702,29 +703,29 @@ public class ItemDefinition extends DualNode {
       signature = "(ZI)Z",
       garbageValue = "-918880706"
    )
-   public final boolean __z_431(boolean var1) {
+   public final boolean method145(boolean var1) {
       int var2 = this.maleModel;
       int var3 = this.maleModel1;
       int var4 = this.maleModel2;
-      if(var1) {
+      if (var1) {
          var2 = this.femaleModel;
          var3 = this.femaleModel1;
          var4 = this.femaleModel2;
       }
 
-      if(var2 == -1) {
+      if (var2 == -1) {
          return true;
       } else {
          boolean var5 = true;
-         if(!ItemDefinition_modelIndexCache.tryLoadRecord(var2, 0)) {
+         if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) {
             var5 = false;
          }
 
-         if(var3 != -1 && !ItemDefinition_modelIndexCache.tryLoadRecord(var3, 0)) {
+         if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) {
             var5 = false;
          }
 
-         if(var4 != -1 && !ItemDefinition_modelIndexCache.tryLoadRecord(var4, 0)) {
+         if (var4 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var4, 0)) {
             var5 = false;
          }
 
@@ -737,24 +738,24 @@ public class ItemDefinition extends DualNode {
       signature = "(ZB)Ldw;",
       garbageValue = "-123"
    )
-   public final ModelData __j_432(boolean var1) {
+   public final ModelData method146(boolean var1) {
       int var2 = this.maleModel;
       int var3 = this.maleModel1;
       int var4 = this.maleModel2;
-      if(var1) {
+      if (var1) {
          var2 = this.femaleModel;
          var3 = this.femaleModel1;
          var4 = this.femaleModel2;
       }
 
-      if(var2 == -1) {
+      if (var2 == -1) {
          return null;
       } else {
-         ModelData var5 = ModelData.method2788(ItemDefinition_modelIndexCache, var2, 0);
-         if(var3 != -1) {
-            ModelData var6 = ModelData.method2788(ItemDefinition_modelIndexCache, var3, 0);
-            if(var4 != -1) {
-               ModelData var7 = ModelData.method2788(ItemDefinition_modelIndexCache, var4, 0);
+         ModelData var5 = ModelData.method2788(ItemDefinition_modelArchive, var2, 0);
+         if (var3 != -1) {
+            ModelData var6 = ModelData.method2788(ItemDefinition_modelArchive, var3, 0);
+            if (var4 != -1) {
+               ModelData var7 = ModelData.method2788(ItemDefinition_modelArchive, var4, 0);
                ModelData[] var8 = new ModelData[]{var5, var6, var7};
                var5 = new ModelData(var8, 3);
             } else {
@@ -763,23 +764,23 @@ public class ItemDefinition extends DualNode {
             }
          }
 
-         if(!var1 && this.maleOffset != 0) {
-            var5.__z_225(0, this.maleOffset, 0);
+         if (!var1 && this.maleOffset != 0) {
+            var5.method213(0, this.maleOffset, 0);
          }
 
-         if(var1 && this.femaleOffset != 0) {
-            var5.__z_225(0, this.femaleOffset, 0);
+         if (var1 && this.femaleOffset != 0) {
+            var5.method213(0, this.femaleOffset, 0);
          }
 
          int var9;
-         if(this.recolorFrom != null) {
-            for(var9 = 0; var9 < this.recolorFrom.length; ++var9) {
+         if (this.recolorFrom != null) {
+            for (var9 = 0; var9 < this.recolorFrom.length; ++var9) {
                var5.recolor(this.recolorFrom[var9], this.recolorTo[var9]);
             }
          }
 
-         if(this.retextureFrom != null) {
-            for(var9 = 0; var9 < this.retextureFrom.length; ++var9) {
+         if (this.retextureFrom != null) {
+            for (var9 = 0; var9 < this.retextureFrom.length; ++var9) {
                var5.retexture(this.retextureFrom[var9], this.retextureTo[var9]);
             }
          }
@@ -793,23 +794,23 @@ public class ItemDefinition extends DualNode {
       signature = "(ZI)Z",
       garbageValue = "-998582497"
    )
-   public final boolean __s_433(boolean var1) {
+   public final boolean method147(boolean var1) {
       int var2 = this.maleHeadModel;
       int var3 = this.maleHeadModel2;
-      if(var1) {
+      if (var1) {
          var2 = this.femaleHeadModel;
          var3 = this.femaleHeadModel2;
       }
 
-      if(var2 == -1) {
+      if (var2 == -1) {
          return true;
       } else {
          boolean var4 = true;
-         if(!ItemDefinition_modelIndexCache.tryLoadRecord(var2, 0)) {
+         if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) {
             var4 = false;
          }
 
-         if(var3 != -1 && !ItemDefinition_modelIndexCache.tryLoadRecord(var3, 0)) {
+         if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) {
             var4 = false;
          }
 
@@ -822,33 +823,33 @@ public class ItemDefinition extends DualNode {
       signature = "(ZI)Ldw;",
       garbageValue = "-1820885439"
    )
-   public final ModelData __t_434(boolean var1) {
+   public final ModelData method148(boolean var1) {
       int var2 = this.maleHeadModel;
       int var3 = this.maleHeadModel2;
-      if(var1) {
+      if (var1) {
          var2 = this.femaleHeadModel;
          var3 = this.femaleHeadModel2;
       }
 
-      if(var2 == -1) {
+      if (var2 == -1) {
          return null;
       } else {
-         ModelData var4 = ModelData.method2788(ItemDefinition_modelIndexCache, var2, 0);
-         if(var3 != -1) {
-            ModelData var5 = ModelData.method2788(ItemDefinition_modelIndexCache, var3, 0);
+         ModelData var4 = ModelData.method2788(ItemDefinition_modelArchive, var2, 0);
+         if (var3 != -1) {
+            ModelData var5 = ModelData.method2788(ItemDefinition_modelArchive, var3, 0);
             ModelData[] var6 = new ModelData[]{var4, var5};
             var4 = new ModelData(var6, 2);
          }
 
          int var7;
-         if(this.recolorFrom != null) {
-            for(var7 = 0; var7 < this.recolorFrom.length; ++var7) {
+         if (this.recolorFrom != null) {
+            for (var7 = 0; var7 < this.recolorFrom.length; ++var7) {
                var4.recolor(this.recolorFrom[var7], this.recolorTo[var7]);
             }
          }
 
-         if(this.retextureFrom != null) {
-            for(var7 = 0; var7 < this.retextureFrom.length; ++var7) {
+         if (this.retextureFrom != null) {
+            for (var7 = 0; var7 < this.retextureFrom.length; ++var7) {
                var4.retexture(this.retextureFrom[var7], this.retextureTo[var7]);
             }
          }
@@ -864,20 +865,20 @@ public class ItemDefinition extends DualNode {
    )
    @Export("getIntParam")
    public int getIntParam(int var1, int var2) {
-      IterableNodeHashTable var4 = this.params;
-      int var3;
-      if(var4 == null) {
-         var3 = var2;
+      IterableNodeHashTable var3 = this.params;
+      int var4;
+      if (var3 == null) {
+         var4 = var2;
       } else {
-         IntegerNode var5 = (IntegerNode)var4.get((long)var1);
-         if(var5 == null) {
-            var3 = var2;
+         IntegerNode var5 = (IntegerNode)var3.get((long)var1);
+         if (var5 == null) {
+            var4 = var2;
          } else {
-            var3 = var5.integer;
+            var4 = var5.integer;
          }
       }
 
-      return var3;
+      return var4;
    }
 
    @ObfuscatedName("h")
@@ -897,6 +898,12 @@ public class ItemDefinition extends DualNode {
    )
    @Export("getShiftClickIndex")
    public int getShiftClickIndex() {
-      return this.shiftClickIndex0 != -1 && this.inventoryActions != null?(this.shiftClickIndex0 >= 0?(this.inventoryActions[this.shiftClickIndex0] != null?this.shiftClickIndex0:-1):("Drop".equalsIgnoreCase(this.inventoryActions[4])?4:-1)):-1;
+      return this.shiftClickIndex != -1 && this.inventoryActions != null ? (this.shiftClickIndex >= 0 ? (this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex : -1) : ("Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1)) : -1;
+   }
+
+   static {
+      ItemDefinition_cached = new EvictingDualNodeHashTable(64);
+      ItemDefinition_cachedModels = new EvictingDualNodeHashTable(50);
+      Sprite_cached = new EvictingDualNodeHashTable(200);
    }
 }
diff --git a/runescape-client/src/main/java/IterableDualNodeQueue.java b/runescape-client/src/main/java/IterableDualNodeQueue.java
index da2bea045e..8d50146343 100644
--- a/runescape-client/src/main/java/IterableDualNodeQueue.java
+++ b/runescape-client/src/main/java/IterableDualNodeQueue.java
@@ -29,7 +29,7 @@ public class IterableDualNodeQueue implements Iterable {
    @ObfuscatedName("m")
    @Export("clear")
    public void clear() {
-      while(this.sentinel.previousDual != this.sentinel) {
+      while (this.sentinel.previousDual != this.sentinel) {
          this.sentinel.previousDual.removeDual();
       }
 
@@ -41,7 +41,7 @@ public class IterableDualNodeQueue implements Iterable {
    )
    @Export("add")
    public void add(DualNode var1) {
-      if(var1.nextDual != null) {
+      if (var1.nextDual != null) {
          var1.removeDual();
       }
 
@@ -55,9 +55,10 @@ public class IterableDualNodeQueue implements Iterable {
    @ObfuscatedSignature(
       signature = "()Lfn;"
    )
-   public DualNode __q_448() {
+   @Export("removeLast")
+   public DualNode removeLast() {
       DualNode var1 = this.sentinel.previousDual;
-      if(var1 == this.sentinel) {
+      if (var1 == this.sentinel) {
          return null;
       } else {
          var1.removeDual();
@@ -69,23 +70,25 @@ public class IterableDualNodeQueue implements Iterable {
    @ObfuscatedSignature(
       signature = "()Lfn;"
    )
-   public DualNode __w_449() {
-      return this.__o_450((DualNode)null);
+   @Export("last")
+   public DualNode last() {
+      return this.previousOrLast((DualNode)null);
    }
 
    @ObfuscatedName("o")
    @ObfuscatedSignature(
       signature = "(Lfn;)Lfn;"
    )
-   DualNode __o_450(DualNode var1) {
+   @Export("previousOrLast")
+   DualNode previousOrLast(DualNode var1) {
       DualNode var2;
-      if(var1 == null) {
+      if (var1 == null) {
          var2 = this.sentinel.previousDual;
       } else {
          var2 = var1;
       }
 
-      if(var2 == this.sentinel) {
+      if (var2 == this.sentinel) {
          this.head = null;
          return null;
       } else {
@@ -98,9 +101,10 @@ public class IterableDualNodeQueue implements Iterable {
    @ObfuscatedSignature(
       signature = "()Lfn;"
    )
-   public DualNode __u_451() {
+   @Export("previous")
+   public DualNode previous() {
       DualNode var1 = this.head;
-      if(var1 == this.sentinel) {
+      if (var1 == this.sentinel) {
          this.head = null;
          return null;
       } else {
diff --git a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java
index 76c1205ba7..5f75f3b7e8 100644
--- a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java
+++ b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java
@@ -17,51 +17,54 @@ public class IterableDualNodeQueueIterator implements Iterator {
    @ObfuscatedSignature(
       signature = "Lfn;"
    )
-   DualNode __f;
+   @Export("head")
+   DualNode head;
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Lfn;"
    )
-   DualNode __q;
+   @Export("last")
+   DualNode last;
 
    @ObfuscatedSignature(
       signature = "(Ljc;)V"
    )
    IterableDualNodeQueueIterator(IterableDualNodeQueue var1) {
-      this.__q = null;
+      this.last = null;
       this.queue = var1;
-      this.__f = this.queue.sentinel.previousDual;
-      this.__q = null;
+      this.head = this.queue.sentinel.previousDual;
+      this.last = null;
    }
 
    @Export("next")
    @ObfuscatedName("next")
    public Object next() {
-      DualNode var1 = this.__f;
-      if(var1 == this.queue.sentinel) {
+      DualNode var1 = this.head;
+      if (var1 == this.queue.sentinel) {
          var1 = null;
-         this.__f = null;
+         this.head = null;
       } else {
-         this.__f = var1.previousDual;
+         this.head = var1.previousDual;
       }
 
-      this.__q = var1;
+      this.last = var1;
       return var1;
    }
 
    @Export("hasNext")
    @ObfuscatedName("hasNext")
    public boolean hasNext() {
-      return this.queue.sentinel != this.__f;
+      return this.queue.sentinel != this.head;
    }
 
    @ObfuscatedName("remove")
-   public void __remove_442() {
-      if(this.__q == null) {
+   @Export("remove")
+   public void remove() {
+      if (this.last == null) {
          throw new IllegalStateException();
       } else {
-         this.__q.removeDual();
-         this.__q = null;
+         this.last.removeDual();
+         this.last = null;
       }
    }
 }
diff --git a/runescape-client/src/main/java/IterableNodeDeque.java b/runescape-client/src/main/java/IterableNodeDeque.java
index 6a09c766a7..f916f30966 100644
--- a/runescape-client/src/main/java/IterableNodeDeque.java
+++ b/runescape-client/src/main/java/IterableNodeDeque.java
@@ -29,7 +29,7 @@ public class IterableNodeDeque implements Iterable {
    @ObfuscatedName("m")
    @Export("clear")
    public void clear() {
-      while(this.sentinel.previous != this.sentinel) {
+      while (this.sentinel.previous != this.sentinel) {
          this.sentinel.previous.remove();
       }
 
@@ -40,15 +40,15 @@ public class IterableNodeDeque implements Iterable {
       signature = "(Lgw;)V"
    )
    @Export("addFirst")
-   public void addFirst(Node var1) {
-      if(var1.next != null) {
-         var1.remove();
+   public void addFirst(Node node) {
+      if (node.next != null) {
+         node.remove();
       }
 
-      var1.next = this.sentinel.next;
-      var1.previous = this.sentinel;
-      var1.next.previous = var1;
-      var1.previous.next = var1;
+      node.next = this.sentinel.next;
+      node.previous = this.sentinel;
+      node.next.previous = node;
+      node.previous.next = node;
    }
 
    @ObfuscatedName("q")
@@ -56,15 +56,15 @@ public class IterableNodeDeque implements Iterable {
       signature = "(Lgw;)V"
    )
    @Export("addLast")
-   public void addLast(Node var1) {
-      if(var1.next != null) {
-         var1.remove();
+   public void addLast(Node node) {
+      if (node.next != null) {
+         node.remove();
       }
 
-      var1.next = this.sentinel;
-      var1.previous = this.sentinel.previous;
-      var1.next.previous = var1;
-      var1.previous.next = var1;
+      node.next = this.sentinel;
+      node.previous = this.sentinel.previous;
+      node.next.previous = node;
+      node.previous.next = node;
    }
 
    @ObfuscatedName("o")
@@ -81,15 +81,15 @@ public class IterableNodeDeque implements Iterable {
       signature = "(Lgw;)Lgw;"
    )
    @Export("previousOrLast")
-   Node previousOrLast(Node var1) {
+   Node previousOrLast(Node node) {
       Node var2;
-      if(var1 == null) {
+      if (node == null) {
          var2 = this.sentinel.previous;
       } else {
-         var2 = var1;
+         var2 = node;
       }
 
-      if(var2 == this.sentinel) {
+      if (var2 == this.sentinel) {
          this.current = null;
          return null;
       } else {
@@ -105,7 +105,7 @@ public class IterableNodeDeque implements Iterable {
    @Export("previous")
    public Node previous() {
       Node var1 = this.current;
-      if(var1 == this.sentinel) {
+      if (var1 == this.sentinel) {
          this.current = null;
          return null;
       } else {
@@ -131,14 +131,14 @@ public class IterableNodeDeque implements Iterable {
       signature = "(Lgw;Lgw;)V"
    )
    @Export("IterableNodeDeque_addBefore")
-   public static void IterableNodeDeque_addBefore(Node var0, Node var1) {
-      if(var0.next != null) {
-         var0.remove();
+   public static void IterableNodeDeque_addBefore(Node node, Node old) {
+      if (node.next != null) {
+         node.remove();
       }
 
-      var0.next = var1;
-      var0.previous = var1.previous;
-      var0.next.previous = var0;
-      var0.previous.next = var0;
+      node.next = old;
+      node.previous = old.previous;
+      node.next.previous = node;
+      node.previous.next = node;
    }
 }
diff --git a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java
index dd0e92ce91..8d81ecf84c 100644
--- a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java
+++ b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java
@@ -17,64 +17,69 @@ public class IterableNodeDequeDescendingIterator implements Iterator {
    @ObfuscatedSignature(
       signature = "Lgw;"
    )
-   Node __f;
+   @Export("head")
+   Node head;
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Lgw;"
    )
-   Node __q;
+   @Export("last")
+   Node last;
 
    @ObfuscatedSignature(
       signature = "(Lja;)V"
    )
    IterableNodeDequeDescendingIterator(IterableNodeDeque var1) {
-      this.__q = null;
-      this.__u_443(var1);
+      this.last = null;
+      this.setDeque(var1);
    }
 
    @ObfuscatedName("u")
    @ObfuscatedSignature(
       signature = "(Lja;)V"
    )
-   void __u_443(IterableNodeDeque var1) {
+   @Export("setDeque")
+   void setDeque(IterableNodeDeque var1) {
       this.deque = var1;
-      this.__g_444();
+      this.start();
    }
 
    @ObfuscatedName("g")
-   void __g_444() {
-      this.__f = this.deque != null?this.deque.sentinel.previous:null;
-      this.__q = null;
+   @Export("start")
+   void start() {
+      this.head = this.deque != null ? this.deque.sentinel.previous : null;
+      this.last = null;
    }
 
    @Export("hasNext")
    @ObfuscatedName("hasNext")
    public boolean hasNext() {
-      return this.deque.sentinel != this.__f;
+      return this.deque.sentinel != this.head;
    }
 
    @Export("next")
    @ObfuscatedName("next")
    public Object next() {
-      Node var1 = this.__f;
-      if(var1 == this.deque.sentinel) {
+      Node var1 = this.head;
+      if (var1 == this.deque.sentinel) {
          var1 = null;
-         this.__f = null;
+         this.head = null;
       } else {
-         this.__f = var1.previous;
+         this.head = var1.previous;
       }
 
-      this.__q = var1;
+      this.last = var1;
       return var1;
    }
 
    @ObfuscatedName("remove")
-   public void __remove_447() {
-      if(this.__q == null) {
+   @Export("remove")
+   public void remove() {
+      if (this.last == null) {
          throw new IllegalStateException();
       } else {
-         this.__q.remove();
-         this.__q = null;
+         this.last.remove();
+         this.last = null;
       }
    }
 }
diff --git a/runescape-client/src/main/java/IterableNodeHashTable.java b/runescape-client/src/main/java/IterableNodeHashTable.java
index a3404858e8..c56d9b9e2f 100644
--- a/runescape-client/src/main/java/IterableNodeHashTable.java
+++ b/runescape-client/src/main/java/IterableNodeHashTable.java
@@ -37,7 +37,7 @@ public final class IterableNodeHashTable implements Iterable {
       this.size = var1;
       this.buckets = new Node[var1];
 
-      for(int var2 = 0; var2 < var1; ++var2) {
+      for (int var2 = 0; var2 < var1; ++var2) {
          Node var3 = this.buckets[var2] = new Node();
          var3.previous = var3;
          var3.next = var3;
@@ -53,8 +53,8 @@ public final class IterableNodeHashTable implements Iterable {
    public Node get(long var1) {
       Node var3 = this.buckets[(int)(var1 & (long)(this.size - 1))];
 
-      for(this.currentGet = var3.previous; var3 != this.currentGet; this.currentGet = this.currentGet.previous) {
-         if(this.currentGet.key == var1) {
+      for (this.currentGet = var3.previous; var3 != this.currentGet; this.currentGet = this.currentGet.previous) {
+         if (this.currentGet.key == var1) {
             Node var4 = this.currentGet;
             this.currentGet = this.currentGet.previous;
             return var4;
@@ -71,7 +71,7 @@ public final class IterableNodeHashTable implements Iterable {
    )
    @Export("put")
    public void put(Node var1, long var2) {
-      if(var1.next != null) {
+      if (var1.next != null) {
          var1.remove();
       }
 
@@ -86,12 +86,12 @@ public final class IterableNodeHashTable implements Iterable {
    @ObfuscatedName("q")
    @Export("clear")
    public void clear() {
-      for(int var1 = 0; var1 < this.size; ++var1) {
+      for (int var1 = 0; var1 < this.size; ++var1) {
          Node var2 = this.buckets[var1];
 
-         while(true) {
+         while (true) {
             Node var3 = var2.previous;
-            if(var3 == var2) {
+            if (var3 == var2) {
                break;
             }
 
@@ -120,13 +120,13 @@ public final class IterableNodeHashTable implements Iterable {
    @Export("next")
    public Node next() {
       Node var1;
-      if(this.index > 0 && this.buckets[this.index - 1] != this.current) {
+      if (this.index > 0 && this.buckets[this.index - 1] != this.current) {
          var1 = this.current;
          this.current = var1.previous;
          return var1;
       } else {
          do {
-            if(this.index >= this.size) {
+            if (this.index >= this.size) {
                return null;
             }
 
diff --git a/runescape-client/src/main/java/IterableNodeHashTableIterator.java b/runescape-client/src/main/java/IterableNodeHashTableIterator.java
index 87ce727ad7..3fc7468142 100644
--- a/runescape-client/src/main/java/IterableNodeHashTableIterator.java
+++ b/runescape-client/src/main/java/IterableNodeHashTableIterator.java
@@ -17,51 +17,55 @@ public class IterableNodeHashTableIterator implements Iterator {
    @ObfuscatedSignature(
       signature = "Lgw;"
    )
-   Node __f;
+   @Export("head")
+   Node head;
    @ObfuscatedName("q")
-   int __q;
+   @Export("index")
+   int index;
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "Lgw;"
    )
-   Node __w;
+   @Export("last")
+   Node last;
 
    @ObfuscatedSignature(
       signature = "(Llh;)V"
    )
    IterableNodeHashTableIterator(IterableNodeHashTable var1) {
-      this.__w = null;
+      this.last = null;
       this.hashTable = var1;
-      this.__u_483();
+      this.start();
    }
 
    @ObfuscatedName("u")
-   void __u_483() {
-      this.__f = this.hashTable.buckets[0].previous;
-      this.__q = 1;
-      this.__w = null;
+   @Export("start")
+   void start() {
+      this.head = this.hashTable.buckets[0].previous;
+      this.index = 1;
+      this.last = null;
    }
 
    @Export("next")
    @ObfuscatedName("next")
    public Object next() {
       Node var1;
-      if(this.hashTable.buckets[this.__q - 1] != this.__f) {
-         var1 = this.__f;
-         this.__f = var1.previous;
-         this.__w = var1;
+      if (this.hashTable.buckets[this.index - 1] != this.head) {
+         var1 = this.head;
+         this.head = var1.previous;
+         this.last = var1;
          return var1;
       } else {
          do {
-            if(this.__q >= this.hashTable.size) {
+            if (this.index >= this.hashTable.size) {
                return null;
             }
 
-            var1 = this.hashTable.buckets[this.__q++].previous;
-         } while(var1 == this.hashTable.buckets[this.__q - 1]);
+            var1 = this.hashTable.buckets[this.index++].previous;
+         } while(var1 == this.hashTable.buckets[this.index - 1]);
 
-         this.__f = var1.previous;
-         this.__w = var1;
+         this.head = var1.previous;
+         this.last = var1;
          return var1;
       }
    }
@@ -69,16 +73,16 @@ public class IterableNodeHashTableIterator implements Iterator {
    @Export("hasNext")
    @ObfuscatedName("hasNext")
    public boolean hasNext() {
-      if(this.hashTable.buckets[this.__q - 1] != this.__f) {
+      if (this.hashTable.buckets[this.index - 1] != this.head) {
          return true;
       } else {
-         while(this.__q < this.hashTable.size) {
-            if(this.hashTable.buckets[this.__q++].previous != this.hashTable.buckets[this.__q - 1]) {
-               this.__f = this.hashTable.buckets[this.__q - 1].previous;
+         while (this.index < this.hashTable.size) {
+            if (this.hashTable.buckets[this.index++].previous != this.hashTable.buckets[this.index - 1]) {
+               this.head = this.hashTable.buckets[this.index - 1].previous;
                return true;
             }
 
-            this.__f = this.hashTable.buckets[this.__q - 1];
+            this.head = this.hashTable.buckets[this.index - 1];
          }
 
          return false;
@@ -86,12 +90,13 @@ public class IterableNodeHashTableIterator implements Iterator {
    }
 
    @ObfuscatedName("remove")
-   public void __remove_486() {
-      if(this.__w == null) {
+   @Export("remove")
+   public void remove() {
+      if (this.last == null) {
          throw new IllegalStateException();
       } else {
-         this.__w.remove();
-         this.__w = null;
+         this.last.remove();
+         this.last = null;
       }
    }
 }
diff --git a/runescape-client/src/main/java/KeyHandler.java b/runescape-client/src/main/java/KeyHandler.java
index 7bd6aa523f..d788fc95c4 100644
--- a/runescape-client/src/main/java/KeyHandler.java
+++ b/runescape-client/src/main/java/KeyHandler.java
@@ -16,7 +16,7 @@ public final class KeyHandler implements KeyListener, FocusListener {
    @ObfuscatedGetter(
       intValue = -817957995
    )
-   static int __an_ra;
+   static int field445;
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "Lan;"
@@ -45,43 +45,43 @@ public final class KeyHandler implements KeyListener, FocusListener {
    @Export("KeyHandler_pressedKeys")
    public static boolean[] KeyHandler_pressedKeys;
    @ObfuscatedName("cq")
-   static int[] __an_cq;
+   static int[] field446;
    @ObfuscatedName("ch")
    @ObfuscatedGetter(
       intValue = 1112094745
    )
-   static int __an_ch;
+   static int field447;
    @ObfuscatedName("cw")
    @ObfuscatedGetter(
       intValue = -1208053825
    )
-   static int __an_cw;
+   static int field448;
    @ObfuscatedName("cg")
-   static char[] __an_cg;
+   static char[] field449;
    @ObfuscatedName("cf")
-   static int[] __an_cf;
+   static int[] field450;
    @ObfuscatedName("cp")
-   public static int[] __an_cp;
+   public static int[] field451;
    @ObfuscatedName("cl")
    @ObfuscatedGetter(
       intValue = -674534717
    )
-   public static int __an_cl;
+   public static int field452;
    @ObfuscatedName("ct")
    @ObfuscatedGetter(
       intValue = -93280591
    )
-   static int __an_ct;
+   static int field453;
    @ObfuscatedName("cz")
    @ObfuscatedGetter(
       intValue = 2066759739
    )
-   static int __an_cz;
+   static int field454;
    @ObfuscatedName("cc")
    @ObfuscatedGetter(
       intValue = -1942898885
    )
-   static int __an_cc;
+   static int field455;
    @ObfuscatedName("ci")
    @ObfuscatedGetter(
       intValue = -474146073
@@ -98,57 +98,40 @@ public final class KeyHandler implements KeyListener, FocusListener {
    @Export("crossSprites")
    static Sprite[] crossSprites;
 
-   static {
-      KeyHandler_instance = new KeyHandler();
-      KeyHandler_pressedKeys = new boolean[112];
-      __an_cq = new int[128];
-      __an_ch = 0;
-      __an_cw = 0;
-      __an_cg = new char[128];
-      __an_cf = new int[128];
-      __an_cp = new int[128];
-      __an_cl = 0;
-      __an_ct = 0;
-      __an_cz = 0;
-      __an_cc = 0;
-      KeyHandler_idleCycles = 0;
-      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, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
-   }
-
    @Export("keyPressed")
    @ObfuscatedName("keyPressed")
    public final synchronized void keyPressed(KeyEvent var1) {
-      if(KeyHandler_instance != null) {
+      if (KeyHandler_instance != null) {
          int var2 = var1.getKeyCode();
-         if(var2 >= 0 && var2 < KeyHandler_keyCodes.length) {
+         if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) {
             var2 = KeyHandler_keyCodes[var2];
-            if((var2 & 128) != 0) {
+            if ((var2 & 128) != 0) {
                var2 = -1;
             }
          } else {
             var2 = -1;
          }
 
-         if(__an_cw >= 0 && var2 >= 0) {
-            __an_cq[__an_cw] = var2;
-            __an_cw = __an_cw + 1 & 127;
-            if(__an_ch == __an_cw) {
-               __an_cw = -1;
+         if (field448 >= 0 && var2 >= 0) {
+            field446[field448] = var2;
+            field448 = field448 + 1 & 127;
+            if (field447 == field448) {
+               field448 = -1;
             }
          }
 
          int var3;
-         if(var2 >= 0) {
-            var3 = __an_cz + 1 & 127;
-            if(var3 != __an_ct) {
-               __an_cf[__an_cz] = var2;
-               __an_cg[__an_cz] = 0;
-               __an_cz = var3;
+         if (var2 >= 0) {
+            var3 = field454 + 1 & 127;
+            if (var3 != field453) {
+               field450[field454] = var2;
+               field449[field454] = 0;
+               field454 = var3;
             }
          }
 
          var3 = var1.getModifiers();
-         if((var3 & 10) != 0 || var2 == 85 || var2 == 10) {
+         if ((var3 & 10) != 0 || var2 == 85 || var2 == 10) {
             var1.consume();
          }
       }
@@ -163,8 +146,8 @@ public final class KeyHandler implements KeyListener, FocusListener {
    @Export("focusLost")
    @ObfuscatedName("focusLost")
    public final synchronized void focusLost(FocusEvent var1) {
-      if(KeyHandler_instance != null) {
-         __an_cw = -1;
+      if (KeyHandler_instance != null) {
+         field448 = -1;
       }
 
    }
@@ -172,19 +155,19 @@ public final class KeyHandler implements KeyListener, FocusListener {
    @Export("keyReleased")
    @ObfuscatedName("keyReleased")
    public final synchronized void keyReleased(KeyEvent var1) {
-      if(KeyHandler_instance != null) {
+      if (KeyHandler_instance != null) {
          int var2 = var1.getKeyCode();
-         if(var2 >= 0 && var2 < KeyHandler_keyCodes.length) {
+         if (var2 >= 0 && var2 < KeyHandler_keyCodes.length) {
             var2 = KeyHandler_keyCodes[var2] & -129;
          } else {
             var2 = -1;
          }
 
-         if(__an_cw >= 0 && var2 >= 0) {
-            __an_cq[__an_cw] = ~var2;
-            __an_cw = __an_cw + 1 & 127;
-            if(__an_ch == __an_cw) {
-               __an_cw = -1;
+         if (field448 >= 0 && var2 >= 0) {
+            field446[field448] = ~var2;
+            field448 = field448 + 1 & 127;
+            if (field447 == field448) {
+               field448 = -1;
             }
          }
       }
@@ -195,22 +178,22 @@ public final class KeyHandler implements KeyListener, FocusListener {
    @Export("keyTyped")
    @ObfuscatedName("keyTyped")
    public final void keyTyped(KeyEvent var1) {
-      if(KeyHandler_instance != null) {
+      if (KeyHandler_instance != null) {
          char var2 = var1.getKeyChar();
-         if(var2 != 0 && var2 != '\uffff') {
+         if (var2 != 0 && var2 != '\uffff') {
             boolean var3;
-            if(var2 > 0 && var2 < 128 || var2 >= 160 && var2 <= 255) {
+            if (var2 > 0 && var2 < 128 || var2 >= 160 && var2 <= 255) {
                var3 = true;
             } else {
-               label63: {
-                  if(var2 != 0) {
-                     char[] var7 = class304.cp1252AsciiExtension;
+               label56: {
+                  if (var2 != 0) {
+                     char[] var4 = class304.cp1252AsciiExtension;
 
-                     for(int var5 = 0; var5 < var7.length; ++var5) {
-                        char var6 = var7[var5];
-                        if(var2 == var6) {
+                     for (int var5 = 0; var5 < var4.length; ++var5) {
+                        char var6 = var4[var5];
+                        if (var2 == var6) {
                            var3 = true;
-                           break label63;
+                           break label56;
                         }
                      }
                   }
@@ -219,12 +202,12 @@ public final class KeyHandler implements KeyListener, FocusListener {
                }
             }
 
-            if(var3) {
-               int var4 = __an_cz + 1 & 127;
-               if(var4 != __an_ct) {
-                  __an_cf[__an_cz] = -1;
-                  __an_cg[__an_cz] = var2;
-                  __an_cz = var4;
+            if (var3) {
+               int var7 = field454 + 1 & 127;
+               if (var7 != field453) {
+                  field450[field454] = -1;
+                  field449[field454] = var2;
+                  field454 = var7;
                }
             }
          }
@@ -241,11 +224,28 @@ public final class KeyHandler implements KeyListener, FocusListener {
    static String method839() {
       String var0 = "";
 
-      Message var2;
-      for(Iterator var1 = Messages.Messages_hashTable.iterator(); var1.hasNext(); var0 = var0 + var2.sender + ':' + var2.text + '\n') {
-         var2 = (Message)var1.next();
+      Message var1;
+      for (Iterator var2 = Messages.Messages_hashTable.iterator(); var2.hasNext(); var0 = var0 + var1.sender + ':' + var1.text + '\n') {
+         var1 = (Message)var2.next();
       }
 
       return var0;
    }
+
+   static {
+      KeyHandler_instance = new KeyHandler();
+      KeyHandler_pressedKeys = new boolean[112];
+      field446 = new int[128];
+      field447 = 0;
+      field448 = 0;
+      field449 = new char[128];
+      field450 = new int[128];
+      field451 = new int[128];
+      field452 = 0;
+      field453 = 0;
+      field454 = 0;
+      field455 = 0;
+      KeyHandler_idleCycles = 0;
+      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, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
+   }
 }
diff --git a/runescape-client/src/main/java/KitDefinition.java b/runescape-client/src/main/java/KitDefinition.java
index bb2b7caf1e..1bc3ba848e 100644
--- a/runescape-client/src/main/java/KitDefinition.java
+++ b/runescape-client/src/main/java/KitDefinition.java
@@ -11,18 +11,19 @@ public class KitDefinition extends DualNode {
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   @Export("KitDefinition_indexCache")
-   public static AbstractIndexCache KitDefinition_indexCache;
+   @Export("KitDefinition_archive")
+   public static AbstractArchive KitDefinition_archive;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   public static AbstractIndexCache __im_f;
+   public static AbstractArchive field456;
    @ObfuscatedName("q")
    @ObfuscatedGetter(
       intValue = 235389995
    )
-   public static int __im_q;
+   @Export("KitDefinition_totalCount")
+   public static int KitDefinition_totalCount;
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "Ler;"
@@ -33,9 +34,11 @@ public class KitDefinition extends DualNode {
    @ObfuscatedGetter(
       intValue = 1619779051
    )
-   public int __o;
+   @Export("bodypartID")
+   public int bodypartID;
    @ObfuscatedName("u")
-   int[] __u;
+   @Export("models2")
+   int[] models2;
    @ObfuscatedName("g")
    @Export("recolorFrom")
    short[] recolorFrom;
@@ -49,19 +52,16 @@ public class KitDefinition extends DualNode {
    @Export("retextureTo")
    short[] retextureTo;
    @ObfuscatedName("d")
-   @Export("archives")
-   int[] archives;
+   @Export("models")
+   int[] models;
    @ObfuscatedName("k")
-   public boolean __k;
-
-   static {
-      KitDefinition_cached = new EvictingDualNodeHashTable(64);
-   }
+   @Export("nonSelectable")
+   public boolean nonSelectable;
 
    KitDefinition() {
-      this.__o = -1;
-      this.archives = new int[]{-1, -1, -1, -1, -1};
-      this.__k = false;
+      this.bodypartID = -1;
+      this.models = new int[]{-1, -1, -1, -1, -1};
+      this.nonSelectable = false;
    }
 
    @ObfuscatedName("f")
@@ -69,15 +69,15 @@ public class KitDefinition extends DualNode {
       signature = "(Lgr;S)V",
       garbageValue = "22753"
    )
-   @Export("read")
-   void read(Buffer var1) {
-      while(true) {
+   @Export("decode")
+   void decode(Buffer var1) {
+      while (true) {
          int var2 = var1.readUnsignedByte();
-         if(var2 == 0) {
+         if (var2 == 0) {
             return;
          }
 
-         this.readNext(var1, var2);
+         this.decodeNext(var1, var2);
       }
    }
 
@@ -86,42 +86,42 @@ public class KitDefinition extends DualNode {
       signature = "(Lgr;II)V",
       garbageValue = "-1828581673"
    )
-   @Export("readNext")
-   void readNext(Buffer var1, int var2) {
-      if(var2 == 1) {
-         this.__o = var1.readUnsignedByte();
+   @Export("decodeNext")
+   void decodeNext(Buffer var1, int var2) {
+      if (var2 == 1) {
+         this.bodypartID = var1.readUnsignedByte();
       } else {
          int var3;
          int var4;
-         if(var2 == 2) {
+         if (var2 == 2) {
             var3 = var1.readUnsignedByte();
-            this.__u = new int[var3];
+            this.models2 = new int[var3];
 
-            for(var4 = 0; var4 < var3; ++var4) {
-               this.__u[var4] = var1.__ag_302();
+            for (var4 = 0; var4 < var3; ++var4) {
+               this.models2[var4] = var1.readUnsignedShort();
             }
-         } else if(var2 == 3) {
-            this.__k = true;
-         } else if(var2 == 40) {
+         } else if (var2 == 3) {
+            this.nonSelectable = true;
+         } else if (var2 == 40) {
             var3 = var1.readUnsignedByte();
             this.recolorFrom = new short[var3];
             this.recolorTo = new short[var3];
 
-            for(var4 = 0; var4 < var3; ++var4) {
-               this.recolorFrom[var4] = (short)var1.__ag_302();
-               this.recolorTo[var4] = (short)var1.__ag_302();
+            for (var4 = 0; var4 < var3; ++var4) {
+               this.recolorFrom[var4] = (short)var1.readUnsignedShort();
+               this.recolorTo[var4] = (short)var1.readUnsignedShort();
             }
-         } else if(var2 == 41) {
+         } else if (var2 == 41) {
             var3 = var1.readUnsignedByte();
             this.retextureFrom = new short[var3];
             this.retextureTo = new short[var3];
 
-            for(var4 = 0; var4 < var3; ++var4) {
-               this.retextureFrom[var4] = (short)var1.__ag_302();
-               this.retextureTo[var4] = (short)var1.__ag_302();
+            for (var4 = 0; var4 < var3; ++var4) {
+               this.retextureFrom[var4] = (short)var1.readUnsignedShort();
+               this.retextureTo[var4] = (short)var1.readUnsignedShort();
             }
-         } else if(var2 >= 60 && var2 < 70) {
-            this.archives[var2 - 60] = var1.__ag_302();
+         } else if (var2 >= 60 && var2 < 70) {
+            this.models[var2 - 60] = var1.readUnsignedShort();
          }
       }
 
@@ -132,14 +132,15 @@ public class KitDefinition extends DualNode {
       signature = "(I)Z",
       garbageValue = "-1250940659"
    )
-   public boolean __w_413() {
-      if(this.__u == null) {
+   @Export("ready")
+   public boolean ready() {
+      if (this.models2 == null) {
          return true;
       } else {
          boolean var1 = true;
 
-         for(int var2 = 0; var2 < this.__u.length; ++var2) {
-            if(!__im_f.tryLoadRecord(this.__u[var2], 0)) {
+         for (int var2 = 0; var2 < this.models2.length; ++var2) {
+            if (!field456.tryLoadFile(this.models2[var2], 0)) {
                var1 = false;
             }
          }
@@ -153,32 +154,33 @@ public class KitDefinition extends DualNode {
       signature = "(B)Ldw;",
       garbageValue = "0"
    )
-   public ModelData __o_414() {
-      if(this.__u == null) {
+   @Export("getModelData")
+   public ModelData getModelData() {
+      if (this.models2 == null) {
          return null;
       } else {
-         ModelData[] var1 = new ModelData[this.__u.length];
+         ModelData[] var1 = new ModelData[this.models2.length];
 
-         for(int var2 = 0; var2 < this.__u.length; ++var2) {
-            var1[var2] = ModelData.method2788(__im_f, this.__u[var2], 0);
+         for (int var2 = 0; var2 < this.models2.length; ++var2) {
+            var1[var2] = ModelData.method2788(field456, this.models2[var2], 0);
          }
 
          ModelData var4;
-         if(var1.length == 1) {
+         if (var1.length == 1) {
             var4 = var1[0];
          } else {
             var4 = new ModelData(var1, var1.length);
          }
 
          int var3;
-         if(this.recolorFrom != null) {
-            for(var3 = 0; var3 < this.recolorFrom.length; ++var3) {
+         if (this.recolorFrom != null) {
+            for (var3 = 0; var3 < this.recolorFrom.length; ++var3) {
                var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]);
             }
          }
 
-         if(this.retextureFrom != null) {
-            for(var3 = 0; var3 < this.retextureFrom.length; ++var3) {
+         if (this.retextureFrom != null) {
+            for (var3 = 0; var3 < this.retextureFrom.length; ++var3) {
                var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]);
             }
          }
@@ -192,11 +194,11 @@ public class KitDefinition extends DualNode {
       signature = "(I)Z",
       garbageValue = "742548471"
    )
-   public boolean __u_415() {
+   public boolean method161() {
       boolean var1 = true;
 
-      for(int var2 = 0; var2 < 5; ++var2) {
-         if(this.archives[var2] != -1 && !__im_f.tryLoadRecord(this.archives[var2], 0)) {
+      for (int var2 = 0; var2 < 5; ++var2) {
+         if (this.models[var2] != -1 && !field456.tryLoadFile(this.models[var2], 0)) {
             var1 = false;
          }
       }
@@ -209,26 +211,26 @@ public class KitDefinition extends DualNode {
       signature = "(B)Ldw;",
       garbageValue = "-56"
    )
-   public ModelData __g_416() {
+   public ModelData method162() {
       ModelData[] var1 = new ModelData[5];
       int var2 = 0;
 
-      for(int var3 = 0; var3 < 5; ++var3) {
-         if(this.archives[var3] != -1) {
-            var1[var2++] = ModelData.method2788(__im_f, this.archives[var3], 0);
+      for (int var3 = 0; var3 < 5; ++var3) {
+         if (this.models[var3] != -1) {
+            var1[var2++] = ModelData.method2788(field456, this.models[var3], 0);
          }
       }
 
       ModelData var5 = new ModelData(var1, var2);
       int var4;
-      if(this.recolorFrom != null) {
-         for(var4 = 0; var4 < this.recolorFrom.length; ++var4) {
+      if (this.recolorFrom != null) {
+         for (var4 = 0; var4 < this.recolorFrom.length; ++var4) {
             var5.recolor(this.recolorFrom[var4], this.recolorTo[var4]);
          }
       }
 
-      if(this.retextureFrom != null) {
-         for(var4 = 0; var4 < this.retextureFrom.length; ++var4) {
+      if (this.retextureFrom != null) {
+         for (var4 = 0; var4 < this.retextureFrom.length; ++var4) {
             var5.retexture(this.retextureFrom[var4], this.retextureTo[var4]);
          }
       }
@@ -244,19 +246,23 @@ public class KitDefinition extends DualNode {
    public static String method4866(Buffer var0) {
       String var1;
       try {
-         int var2 = var0.__ae_307();
-         if(var2 > 32767) {
+         int var2 = var0.readUShortSmart();
+         if (var2 > 32767) {
             var2 = 32767;
          }
 
          byte[] var3 = new byte[var2];
-         var0.index += class303.huffman.__f_294(var0.array, var0.index, var3, 0, var2);
-         String var4 = WidgetGroupParent.decodeStringCp1252(var3, 0, var2);
+         var0.index += class303.huffman.decompress(var0.array, var0.index, var3, 0, var2);
+         String var4 = InterfaceParent.decodeStringCp1252(var3, 0, var2);
          var1 = var4;
-      } catch (Exception var6) {
+      } catch (Exception var5) {
          var1 = "Cabbage";
       }
 
       return var1;
    }
+
+   static {
+      KitDefinition_cached = new EvictingDualNodeHashTable(64);
+   }
 }
diff --git a/runescape-client/src/main/java/Link.java b/runescape-client/src/main/java/Link.java
index b8722c44a4..9188f48e90 100644
--- a/runescape-client/src/main/java/Link.java
+++ b/runescape-client/src/main/java/Link.java
@@ -10,21 +10,24 @@ public class Link {
    @ObfuscatedSignature(
       signature = "Lgh;"
    )
-   public Link __m;
+   @Export("previous")
+   public Link previous;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Lgh;"
    )
-   public Link __f;
+   @Export("next")
+   public Link next;
 
    @ObfuscatedName("m")
    @Export("remove")
    public void remove() {
-      if(this.__f != null) {
-         this.__f.__m = this.__m;
-         this.__m.__f = this.__f;
-         this.__m = null;
-         this.__f = null;
+      if (this.next != null) {
+         this.next.previous = this.previous;
+         this.previous.next = this.next;
+         this.previous = null;
+         this.next = null;
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/LinkDeque.java b/runescape-client/src/main/java/LinkDeque.java
index c74ef769cc..a4007be90b 100644
--- a/runescape-client/src/main/java/LinkDeque.java
+++ b/runescape-client/src/main/java/LinkDeque.java
@@ -10,45 +10,49 @@ public class LinkDeque {
    @ObfuscatedSignature(
       signature = "Lgh;"
    )
-   Link __m;
+   @Export("sentinel")
+   Link sentinel;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Lgh;"
    )
-   Link __f;
+   @Export("current")
+   Link current;
 
    public LinkDeque() {
-      this.__m = new Link();
-      this.__m.__m = this.__m;
-      this.__m.__f = this.__m;
+      this.sentinel = new Link();
+      this.sentinel.previous = this.sentinel;
+      this.sentinel.next = this.sentinel;
    }
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "(Lgh;)V"
    )
-   public void __m_437(Link var1) {
-      if(var1.__f != null) {
+   @Export("addFirst")
+   public void addFirst(Link var1) {
+      if (var1.next != null) {
          var1.remove();
       }
 
-      var1.__f = this.__m.__f;
-      var1.__m = this.__m;
-      var1.__f.__m = var1;
-      var1.__m.__f = var1;
+      var1.next = this.sentinel.next;
+      var1.previous = this.sentinel;
+      var1.next.previous = var1;
+      var1.previous.next = var1;
    }
 
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "()Lgh;"
    )
-   public Link __f_438() {
-      Link var1 = this.__m.__m;
-      if(var1 == this.__m) {
-         this.__f = null;
+   @Export("last")
+   public Link last() {
+      Link var1 = this.sentinel.previous;
+      if (var1 == this.sentinel) {
+         this.current = null;
          return null;
       } else {
-         this.__f = var1.__m;
+         this.current = var1.previous;
          return var1;
       }
    }
@@ -57,13 +61,14 @@ public class LinkDeque {
    @ObfuscatedSignature(
       signature = "()Lgh;"
    )
-   public Link __q_439() {
-      Link var1 = this.__f;
-      if(var1 == this.__m) {
-         this.__f = null;
+   @Export("previous")
+   public Link previous() {
+      Link var1 = this.current;
+      if (var1 == this.sentinel) {
+         this.current = null;
          return null;
       } else {
-         this.__f = var1.__m;
+         this.current = var1.previous;
          return var1;
       }
    }
diff --git a/runescape-client/src/main/java/Login.java b/runescape-client/src/main/java/Login.java
index 82123fb5af..fd020ffbb4 100644
--- a/runescape-client/src/main/java/Login.java
+++ b/runescape-client/src/main/java/Login.java
@@ -9,7 +9,7 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("Login")
 public class Login {
    @ObfuscatedName("f")
-   static boolean __cu_f;
+   static boolean field465;
    @ObfuscatedName("q")
    @ObfuscatedGetter(
       intValue = 1606541885
@@ -59,12 +59,12 @@ public class Login {
    @ObfuscatedGetter(
       intValue = 1077910071
    )
-   static int __cu_aj;
+   static int field466;
    @ObfuscatedName("ac")
    @ObfuscatedGetter(
       intValue = 1677133239
    )
-   static int __cu_ac;
+   static int field467;
    @ObfuscatedName("aw")
    @ObfuscatedGetter(
       intValue = 1861681835
@@ -90,14 +90,14 @@ public class Login {
    @Export("Login_password")
    static String Login_password;
    @ObfuscatedName("aa")
-   static boolean __cu_aa;
+   static boolean field468;
    @ObfuscatedName("ax")
-   static boolean __cu_ax;
+   static boolean field469;
    @ObfuscatedName("ai")
    @Export("otp")
    static String otp;
    @ObfuscatedName("ba")
-   static boolean __cu_ba;
+   static boolean field470;
    @ObfuscatedName("bb")
    @ObfuscatedGetter(
       intValue = 1769484271
@@ -129,55 +129,27 @@ public class Login {
    @ObfuscatedGetter(
       longValue = 803647694904294325L
    )
-   static long __cu_bi;
+   static long field471;
    @ObfuscatedName("bz")
    @ObfuscatedGetter(
       longValue = -3234258972092460093L
    )
-   static long __cu_bz;
+   static long field472;
    @ObfuscatedName("do")
    @ObfuscatedSignature(
       signature = "Lit;"
    )
-   @Export("indexCache11")
-   static IndexCache indexCache11;
-
-   static {
-      xPadding = 0;
-      loginBoxX = xPadding + 202;
-      Login_loadingPercent = 10;
-      Login_loadingText = "";
-      __cu_aj = -1;
-      __cu_ac = 1;
-      loginIndex = 0;
-      Login_response0 = "";
-      Login_response1 = "";
-      Login_response2 = "";
-      Login_response3 = "";
-      Login_username = "";
-      Login_password = "";
-      __cu_aa = false;
-      __cu_ax = false;
-      __cu_ba = true;
-      currentLoginField = 0;
-      worldSelectOpen = false;
-      hoveredWorldIndex = -1;
-      worldSelectPage = 0;
-      worldSelectPagesCount = 0;
-      new DecimalFormat("##0.00");
-      new class161();
-      __cu_bi = -1L;
-      __cu_bz = -1L;
-   }
+   @Export("archive11")
+   static Archive archive11;
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "(Lir;II)Lhl;",
       garbageValue = "-1625685874"
    )
-   static MusicPatch method2045(AbstractIndexCache var0, int var1) {
-      byte[] var2 = var0.takeRecordFlat(var1);
-      return var2 == null?null:new MusicPatch(var2);
+   static MusicPatch method2045(AbstractArchive var0, int var1) {
+      byte[] var2 = var0.takeFileFlat(var1);
+      return var2 == null ? null : new MusicPatch(var2);
    }
 
    @ObfuscatedName("m")
@@ -186,24 +158,24 @@ public class Login {
       garbageValue = "-246495141"
    )
    static void method2056() {
-      class248.__iu_e = new int[2000];
+      class248.field1141 = new int[2000];
       int var0 = 0;
       int var1 = 240;
 
-      int var3;
-      for(byte var2 = 12; var0 < 16; var1 -= var2) {
-         var3 = class277.method5355((double)((float)var1 / 360.0F), 0.9998999834060669D, (double)((float)var0 * 0.425F / 16.0F + 0.075F));
-         class248.__iu_e[var0] = var3;
+      int var2;
+      for (byte var3 = 12; var0 < 16; var1 -= var3) {
+         var2 = class277.method5355((double)((float)var1 / 360.0F), 0.9998999834060669D, (double)((float)var0 * 0.425F / 16.0F + 0.075F));
+         class248.field1141[var0] = var2;
          ++var0;
       }
 
       var1 = 48;
 
-      for(int var5 = var1 / 6; var0 < class248.__iu_e.length; var1 -= var5) {
-         var3 = var0 * 2;
+      for (int var5 = var1 / 6; var0 < class248.field1141.length; var1 -= var5) {
+         var2 = var0 * 2;
 
-         for(int var4 = class277.method5355((double)((float)var1 / 360.0F), 0.9998999834060669D, 0.5D); var0 < var3 && var0 < class248.__iu_e.length; ++var0) {
-            class248.__iu_e[var0] = var4;
+         for (int var4 = class277.method5355((double)((float)var1 / 360.0F), 0.9998999834060669D, 0.5D); var0 < var2 && var0 < class248.field1141.length; ++var0) {
+            class248.field1141[var0] = var4;
          }
       }
 
@@ -214,14 +186,14 @@ public class Login {
       signature = "(Lir;IIIZB)V",
       garbageValue = "45"
    )
-   public static void method2076(AbstractIndexCache var0, int var1, int var2, int var3, boolean var4) {
-      class214.__hf_o = 1;
-      class214.__hf_u = var0;
-      class30.musicTrackArchiveId = var1;
+   public static void method2076(AbstractArchive var0, int var1, int var2, int var3, boolean var4) {
+      class214.field1129 = 1;
+      class214.field1130 = var0;
+      class30.musicTrackGroupId = var1;
       GrandExchangeOffer.musicTrackFileId = var2;
-      WorldMapLabel.__aj_e = var3;
+      WorldMapLabel.field1039 = var3;
       RectangleMode.musicTrackBoolean = var4;
-      FaceNormal.__el_x = 10000;
+      FaceNormal.field344 = 10000;
    }
 
    @ObfuscatedName("gm")
@@ -230,11 +202,39 @@ public class Login {
       garbageValue = "-1"
    )
    static final int method2061() {
-      if(ReflectionCheck.clientPreferences.roofsHidden) {
+      if (ReflectionCheck.clientPreferences.roofsHidden) {
          return SoundSystem.plane;
       } else {
-         int var0 = class32.getTileHeight(WorldMapSection1.cameraX, class11.cameraZ, SoundSystem.plane);
-         return var0 - GrandExchangeEvents.cameraY < 800 && (Tiles.Tiles_renderFlags[SoundSystem.plane][WorldMapSection1.cameraX >> 7][class11.cameraZ >> 7] & 4) != 0?SoundSystem.plane:3;
+         int var0 = class32.getTileHeight(WorldMapSection2.cameraX, GrandExchangeOfferNameComparator.cameraZ, SoundSystem.plane);
+         return var0 - GrandExchangeEvents.cameraY < 800 && (Tiles.Tiles_renderFlags[SoundSystem.plane][WorldMapSection2.cameraX >> 7][GrandExchangeOfferNameComparator.cameraZ >> 7] & 4) != 0 ? SoundSystem.plane : 3;
       }
    }
+
+   static {
+      xPadding = 0;
+      loginBoxX = xPadding + 202;
+      Login_loadingPercent = 10;
+      Login_loadingText = "";
+      field466 = -1;
+      field467 = 1;
+      loginIndex = 0;
+      Login_response0 = "";
+      Login_response1 = "";
+      Login_response2 = "";
+      Login_response3 = "";
+      Login_username = "";
+      Login_password = "";
+      field468 = false;
+      field469 = false;
+      field470 = true;
+      currentLoginField = 0;
+      worldSelectOpen = false;
+      hoveredWorldIndex = -1;
+      worldSelectPage = 0;
+      worldSelectPagesCount = 0;
+      new DecimalFormat("##0.00");
+      new class161();
+      field471 = -1L;
+      field472 = -1L;
+   }
 }
diff --git a/runescape-client/src/main/java/LoginPacket.java b/runescape-client/src/main/java/LoginPacket.java
index d3f674d1d9..1c26096efc 100644
--- a/runescape-client/src/main/java/LoginPacket.java
+++ b/runescape-client/src/main/java/LoginPacket.java
@@ -13,32 +13,33 @@ public class LoginPacket implements ClientPacketMarker {
    @ObfuscatedSignature(
       signature = "Lgl;"
    )
-   public static final LoginPacket __gl_m;
+   public static final LoginPacket field473;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Lgl;"
    )
-   static final LoginPacket __gl_f;
+   static final LoginPacket field474;
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Lgl;"
    )
-   public static final LoginPacket __gl_q;
+   public static final LoginPacket field475;
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "Lgl;"
    )
-   public static final LoginPacket __gl_w;
+   public static final LoginPacket field476;
    @ObfuscatedName("o")
    @ObfuscatedSignature(
       signature = "Lgl;"
    )
-   static final LoginPacket __gl_o;
+   static final LoginPacket field477;
    @ObfuscatedName("g")
    @ObfuscatedSignature(
       signature = "[Lgl;"
    )
-   static final LoginPacket[] __gl_g;
+   @Export("LoginPacket_indexedValues")
+   static final LoginPacket[] LoginPacket_indexedValues;
    @ObfuscatedName("u")
    @ObfuscatedGetter(
       intValue = 1743806243
@@ -46,21 +47,6 @@ public class LoginPacket implements ClientPacketMarker {
    @Export("id")
    public final int id;
 
-   static {
-      __gl_m = new LoginPacket(14, 0);
-      __gl_f = new LoginPacket(15, 4);
-      __gl_q = new LoginPacket(16, -2);
-      __gl_w = new LoginPacket(18, -2);
-      __gl_o = new LoginPacket(27, 0);
-      __gl_g = new LoginPacket[32];
-      LoginPacket[] var0 = WorldMapIcon2.method300();
-
-      for(int var1 = 0; var1 < var0.length; ++var1) {
-         __gl_g[var0[var1].id] = var0[var1];
-      }
-
-   }
-
    @ObfuscatedSignature(
       signature = "(II)V",
       garbageValue = "0"
@@ -76,39 +62,52 @@ public class LoginPacket implements ClientPacketMarker {
    )
    @Export("getPreferencesFile")
    public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) {
-      File var3 = new File(class168.__fs_o, "preferences" + var0 + ".dat");
-      if(var3.exists()) {
+      File var3 = new File(class168.field1115, "preferences" + var0 + ".dat");
+      if (var3.exists()) {
          try {
-            AccessFile var10 = new AccessFile(var3, "rw", 10000L);
-            return var10;
-         } catch (IOException var9) {
-            ;
+            AccessFile var11 = new AccessFile(var3, "rw", 10000L);
+            return var11;
+         } catch (IOException var10) {
          }
       }
 
       String var4 = "";
-      if(PacketBuffer.__hx_z == 33) {
+      if (PacketBuffer.field667 == 33) {
          var4 = "_rc";
-      } else if(PacketBuffer.__hx_z == 34) {
+      } else if (PacketBuffer.field667 == 34) {
          var4 = "_wip";
       }
 
-      File var5 = new File(WorldMapSection1.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat");
+      File var5 = new File(WorldMapSection2.userHomeDirectory, "jagex_" + var1 + "_preferences" + var0 + var4 + ".dat");
       AccessFile var6;
-      if(!var2 && var5.exists()) {
+      if (!var2 && var5.exists()) {
          try {
             var6 = new AccessFile(var5, "rw", 10000L);
             return var6;
-         } catch (IOException var8) {
-            ;
+         } catch (IOException var9) {
          }
       }
 
       try {
          var6 = new AccessFile(var3, "rw", 10000L);
          return var6;
-      } catch (IOException var7) {
+      } catch (IOException var8) {
          throw new RuntimeException();
       }
    }
+
+   static {
+      field473 = new LoginPacket(14, 0);
+      field474 = new LoginPacket(15, 4);
+      field475 = new LoginPacket(16, -2);
+      field476 = new LoginPacket(18, -2);
+      field477 = new LoginPacket(27, 0);
+      LoginPacket_indexedValues = new LoginPacket[32];
+      LoginPacket[] var0 = WorldMapIcon2.LoginPacket_values();
+
+      for (int var1 = 0; var1 < var0.length; ++var1) {
+         LoginPacket_indexedValues[var0[var1].id] = var0[var1];
+      }
+
+   }
 }
diff --git a/runescape-client/src/main/java/LoginScreenAnimation.java b/runescape-client/src/main/java/LoginScreenAnimation.java
index ddceffb8d9..b519c6b2b7 100644
--- a/runescape-client/src/main/java/LoginScreenAnimation.java
+++ b/runescape-client/src/main/java/LoginScreenAnimation.java
@@ -4,13 +4,14 @@ import java.net.URL;
 import java.net.URLConnection;
 import java.util.Random;
 import net.runelite.mapping.Export;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("bp")
-public class LoginScreenAnimation
-{
+@Implements("LoginScreenAnimation")
+public class LoginScreenAnimation {
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "[Llq;"
@@ -90,65 +91,65 @@ public class LoginScreenAnimation
       this.field1006 = new int[256];
 
       int var1;
-      for(var1 = 0; var1 < 64; ++var1) {
-         this.field1006[var1] = var1 * 0x40000;
+      for (var1 = 0; var1 < 64; ++var1) {
+         this.field1006[var1] = var1 * 262144;
       }
 
-      for(var1 = 0; var1 < 64; ++var1) {
-         this.field1006[var1 + 64] = var1 * 0x400 + 0xff0000;
+      for (var1 = 0; var1 < 64; ++var1) {
+         this.field1006[var1 + 64] = var1 * 1024 + 16711680;
       }
 
-      for(var1 = 0; var1 < 64; ++var1) {
-         this.field1006[var1 + 128] = var1 * 0x4 + 0xffff00;
+      for (var1 = 0; var1 < 64; ++var1) {
+         this.field1006[var1 + 128] = var1 * 4 + 16776960;
       }
 
-      for(var1 = 0; var1 < 64; ++var1) {
-         this.field1006[var1 + 192] = 0xffffff;
+      for (var1 = 0; var1 < 64; ++var1) {
+         this.field1006[var1 + 192] = 16777215;
       }
 
       this.field1007 = new int[256];
 
-      for(var1 = 0; var1 < 64; ++var1) {
-         this.field1007[var1] = var1 * 0x400;
+      for (var1 = 0; var1 < 64; ++var1) {
+         this.field1007[var1] = var1 * 1024;
       }
 
-      for(var1 = 0; var1 < 64; ++var1) {
-         this.field1007[var1 + 64] = var1 * 0x4 + 0xff00;
+      for (var1 = 0; var1 < 64; ++var1) {
+         this.field1007[var1 + 64] = var1 * 4 + 65280;
       }
 
-      for(var1 = 0; var1 < 64; ++var1) {
-         this.field1007[var1 + 128] = var1 * 0x40000 + 0xffff;
+      for (var1 = 0; var1 < 64; ++var1) {
+         this.field1007[var1 + 128] = var1 * 262144 + 65535;
       }
 
-      for(var1 = 0; var1 < 64; ++var1) {
-         this.field1007[var1 + 192] = 0xffffff;
+      for (var1 = 0; var1 < 64; ++var1) {
+         this.field1007[var1 + 192] = 16777215;
       }
 
       this.field1014 = new int[256];
 
-      for(var1 = 0; var1 < 64; ++var1) {
-         this.field1014[var1] = var1 * 0x4;
+      for (var1 = 0; var1 < 64; ++var1) {
+         this.field1014[var1] = var1 * 4;
       }
 
-      for(var1 = 0; var1 < 64; ++var1) {
-         this.field1014[var1 + 64] = var1 * 0x40000 + 0xff;
+      for (var1 = 0; var1 < 64; ++var1) {
+         this.field1014[var1 + 64] = var1 * 262144 + 255;
       }
 
-      for(var1 = 0; var1 < 64; ++var1) {
-         this.field1014[var1 + 128] = var1 * 0x400 + 0xff00ff;
+      for (var1 = 0; var1 < 64; ++var1) {
+         this.field1014[var1 + 128] = var1 * 1024 + 16711935;
       }
 
-      for(var1 = 0; var1 < 64; ++var1) {
-         this.field1014[var1 + 192] = 0xffffff;
+      for (var1 = 0; var1 < 64; ++var1) {
+         this.field1014[var1 + 192] = 16777215;
       }
 
       this.field1013 = new int[256];
       this.field1010 = 0;
-      this.field1004 = new int['耀'];
-      this.field1018 = new int['耀'];
+      this.field1004 = new int[32768];
+      this.field1018 = new int[32768];
       this.method1779((IndexedSprite)null);
-      this.field1011 = new int['耀'];
-      this.field1012 = new int['耀'];
+      this.field1011 = new int[32768];
+      this.field1012 = new int[32768];
    }
 
    @ObfuscatedName("f")
@@ -174,26 +175,26 @@ public class LoginScreenAnimation
       signature = "(III)V",
       garbageValue = "-1684910110"
    )
-   void method1782(int x, int cycle) {
-      if(this.field1011 == null) {
+   void method1782(int var1, int var2) {
+      if (this.field1011 == null) {
          this.method1772();
       }
 
-      if(this.field1017 == 0) {
-         this.field1017 = cycle;
+      if (this.field1017 == 0) {
+         this.field1017 = var2;
       }
 
-      int var3 = cycle - this.field1017;
-      if(var3 >= 256) {
+      int var3 = var2 - this.field1017;
+      if (var3 >= 256) {
          var3 = 0;
       }
 
-      this.field1017 = cycle;
-      if(var3 > 0) {
+      this.field1017 = var2;
+      if (var3 > 0) {
          this.method1791(var3);
       }
 
-      this.method1787(x);
+      this.method1787(var1);
    }
 
    @ObfuscatedName("w")
@@ -204,7 +205,7 @@ public class LoginScreenAnimation
    final void method1791(int var1) {
       this.field1010 += var1 * 128;
       int var2;
-      if(this.field1010 > this.field1004.length) {
+      if (this.field1010 > this.field1004.length) {
          this.field1010 -= this.field1004.length;
          var2 = (int)(Math.random() * 12.0D);
          this.method1779(this.sprites[var2]);
@@ -214,74 +215,74 @@ public class LoginScreenAnimation
       int var3 = var1 * 128;
       int var4 = (256 - var1) * 128;
 
-      int var6;
-      for(int var5 = 0; var5 < var4; ++var5) {
-         var6 = this.field1011[var3 + var2] - this.field1004[var2 + this.field1010 & this.field1004.length - 1] * var1 / 6;
-         if(var6 < 0) {
-            var6 = 0;
+      int var5;
+      for (int var6 = 0; var6 < var4; ++var6) {
+         var5 = this.field1011[var3 + var2] - this.field1004[var2 + this.field1010 & this.field1004.length - 1] * var1 / 6;
+         if (var5 < 0) {
+            var5 = 0;
          }
 
-         this.field1011[var2++] = var6;
+         this.field1011[var2++] = var5;
       }
 
       byte var15 = 10;
-      var6 = 128 - var15;
+      var5 = 128 - var15;
 
       int var7;
-      int var10;
-      for(var7 = 256 - var1; var7 < 256; ++var7) {
-         int var8 = var7 * 128;
+      int var8;
+      for (var7 = 256 - var1; var7 < 256; ++var7) {
+         int var9 = var7 * 128;
 
-         for(int var9 = 0; var9 < 128; ++var9) {
-            var10 = (int)(Math.random() * 100.0D);
-            if(var10 < 50 && var9 > var15 && var9 < var6) {
-               this.field1011[var9 + var8] = 255;
+         for (int var10 = 0; var10 < 128; ++var10) {
+            var8 = (int)(Math.random() * 100.0D);
+            if (var8 < 50 && var10 > var15 && var10 < var5) {
+               this.field1011[var10 + var9] = 255;
             } else {
-               this.field1011[var9 + var8] = 0;
+               this.field1011[var10 + var9] = 0;
             }
          }
       }
 
-      if(this.field1009 > 0) {
+      if (this.field1009 > 0) {
          this.field1009 -= var1 * 4;
       }
 
-      if(this.field1005 > 0) {
+      if (this.field1005 > 0) {
          this.field1005 -= var1 * 4;
       }
 
-      if(this.field1009 == 0 && this.field1005 == 0) {
+      if (this.field1009 == 0 && this.field1005 == 0) {
          var7 = (int)(Math.random() * (double)(2000 / var1));
-         if(var7 == 0) {
+         if (var7 == 0) {
             this.field1009 = 1024;
          }
 
-         if(var7 == 1) {
+         if (var7 == 1) {
             this.field1005 = 1024;
          }
       }
 
-      for(var7 = 0; var7 < 256 - var1; ++var7) {
+      for (var7 = 0; var7 < 256 - var1; ++var7) {
          this.field1015[var7] = this.field1015[var7 + var1];
       }
 
-      for(var7 = 256 - var1; var7 < 256; ++var7) {
+      for (var7 = 256 - var1; var7 < 256; ++var7) {
          this.field1015[var7] = (int)(Math.sin((double)this.field1008 / 14.0D) * 16.0D + Math.sin((double)this.field1008 / 15.0D) * 14.0D + Math.sin((double)this.field1008 / 16.0D) * 12.0D);
          ++this.field1008;
       }
 
       this.field1016 += var1;
       var7 = ((Client.cycle & 1) + var1) / 2;
-      if(var7 > 0) {
+      if (var7 > 0) {
          short var16 = 128;
          byte var17 = 2;
-         var10 = 128 - var17 - var17;
+         var8 = 128 - var17 - var17;
 
          int var11;
          int var12;
          int var13;
-         for(var11 = 0; var11 < this.field1016 * 100; ++var11) {
-            var12 = (int)(Math.random() * (double)var10) + var17;
+         for (var11 = 0; var11 < this.field1016 * 100; ++var11) {
+            var12 = (int)(Math.random() * (double)var8) + var17;
             var13 = (int)(Math.random() * (double)var16) + var16;
             this.field1011[var12 + (var13 << 7)] = 192;
          }
@@ -289,39 +290,39 @@ public class LoginScreenAnimation
          this.field1016 = 0;
 
          int var14;
-         for(var11 = 0; var11 < 256; ++var11) {
+         for (var11 = 0; var11 < 256; ++var11) {
             var12 = 0;
             var13 = var11 * 128;
 
-            for(var14 = -var7; var14 < 128; ++var14) {
-               if(var7 + var14 < 128) {
+            for (var14 = -var7; var14 < 128; ++var14) {
+               if (var7 + var14 < 128) {
                   var12 += this.field1011[var7 + var14 + var13];
                }
 
-               if(var14 - (var7 + 1) >= 0) {
+               if (var14 - (var7 + 1) >= 0) {
                   var12 -= this.field1011[var14 + var13 - (var7 + 1)];
                }
 
-               if(var14 >= 0) {
+               if (var14 >= 0) {
                   this.field1012[var14 + var13] = var12 / (var7 * 2 + 1);
                }
             }
          }
 
-         for(var11 = 0; var11 < 128; ++var11) {
+         for (var11 = 0; var11 < 128; ++var11) {
             var12 = 0;
 
-            for(var13 = -var7; var13 < 256; ++var13) {
+            for (var13 = -var7; var13 < 256; ++var13) {
                var14 = var13 * 128;
-               if(var13 + var7 < 256) {
+               if (var13 + var7 < 256) {
                   var12 += this.field1012[var14 + var11 + var7 * 128];
                }
 
-               if(var13 - (var7 + 1) >= 0) {
+               if (var13 - (var7 + 1) >= 0) {
                   var12 -= this.field1012[var11 + var14 - (var7 + 1) * 128];
                }
 
-               if(var13 >= 0) {
+               if (var13 >= 0) {
                   this.field1011[var11 + var14] = var12 / (var7 * 2 + 1);
                }
             }
@@ -337,7 +338,7 @@ public class LoginScreenAnimation
    )
    final int method1765(int var1, int var2, int var3) {
       int var4 = 256 - var3;
-      return (var4 * (var1 & 0xff00) + var3 * (var2 & 0xff00) & 0xff0000) + (var4 * (var1 & 0xff00ff) + var3 * (var2 & 0xff00ff) & 0xff00ff00) >> 8;
+      return (var4 * (var1 & 65280) + var3 * (var2 & 65280) & 16711680) + (var4 * (var1 & 16711935) + var3 * (var2 & 16711935) & -16711936) >> 8;
    }
 
    @ObfuscatedName("u")
@@ -347,12 +348,12 @@ public class LoginScreenAnimation
    )
    final void method1787(int var1) {
       int var2 = this.field1013.length;
-      if(this.field1009 > 0) {
+      if (this.field1009 > 0) {
          this.method1766(this.field1009, this.field1007);
-      } else if(this.field1005 > 0) {
+      } else if (this.field1005 > 0) {
          this.method1766(this.field1005, this.field1014);
       } else {
-         for(int var3 = 0; var3 < var2; ++var3) {
+         for (int var3 = 0; var3 < var2; ++var3) {
             this.field1013[var3] = this.field1006[var3];
          }
       }
@@ -368,10 +369,10 @@ public class LoginScreenAnimation
    final void method1766(int var1, int[] var2) {
       int var3 = this.field1013.length;
 
-      for(int var4 = 0; var4 < var3; ++var4) {
-         if(var1 > 768) {
+      for (int var4 = 0; var4 < var3; ++var4) {
+         if (var1 > 768) {
             this.field1013[var4] = this.method1765(this.field1006[var4], var2[var4], 1024 - var1);
-         } else if(var1 > 256) {
+         } else if (var1 > 256) {
             this.field1013[var4] = var2[var4];
          } else {
             this.field1013[var4] = this.method1765(var2[var4], this.field1006[var4], 256 - var1);
@@ -388,32 +389,32 @@ public class LoginScreenAnimation
    final void method1767(int var1) {
       int var2 = 0;
 
-      for(int var3 = 1; var3 < 255; ++var3) {
+      for (int var3 = 1; var3 < 255; ++var3) {
          int var4 = (256 - var3) * this.field1015[var3] / 256;
          int var5 = var4 + var1;
          int var6 = 0;
          int var7 = 128;
-         if(var5 < 0) {
+         if (var5 < 0) {
             var6 = -var5;
             var5 = 0;
          }
 
-         if(var5 + 128 >= class197.rasterProvider.width) {
+         if (var5 + 128 >= class197.rasterProvider.width) {
             var7 = class197.rasterProvider.width - var5;
          }
 
          int var8 = var5 + (var3 + 8) * class197.rasterProvider.width;
          var2 += var6;
 
-         for(int var9 = var6; var9 < var7; ++var9) {
+         for (int var9 = var6; var9 < var7; ++var9) {
             int var10 = this.field1011[var2++];
             int var11 = var8 % Rasterizer2D.Rasterizer2D_width;
-            if(var10 != 0 && var11 >= Rasterizer2D.Rasterizer2D_xClipStart && var11 < Rasterizer2D.Rasterizer2D_xClipEnd) {
+            if (var10 != 0 && var11 >= Rasterizer2D.Rasterizer2D_xClipStart && var11 < Rasterizer2D.Rasterizer2D_xClipEnd) {
                int var12 = var10;
                int var13 = 256 - var10;
                var10 = this.field1013[var10];
                int var14 = class197.rasterProvider.pixels[var8];
-               class197.rasterProvider.pixels[var8++] = 0xff000000 | ((var10 & 0xff00ff) * var12 + (var14 & 0xff00ff) * var13 & 0xff00ff00) + (var12 * (var10 & 0xff00) + var13 * (var14 & 0xff00) & 0xff0000) >> 8;
+               class197.rasterProvider.pixels[var8++] = -16777216 | ((var10 & 16711935) * var12 + (var14 & 16711935) * var13 & -16711936) + (var12 * (var10 & 65280) + var13 * (var14 & 65280) & 16711680) >> 8;
             } else {
                ++var8;
             }
@@ -431,40 +432,40 @@ public class LoginScreenAnimation
    )
    final void method1779(IndexedSprite var1) {
       int var2;
-      for(var2 = 0; var2 < this.field1004.length; ++var2) {
+      for (var2 = 0; var2 < this.field1004.length; ++var2) {
          this.field1004[var2] = 0;
       }
 
       int var3;
-      for(var2 = 0; var2 < 5000; ++var2) {
+      for (var2 = 0; var2 < 5000; ++var2) {
          var3 = (int)(Math.random() * 128.0D * 256.0D);
          this.field1004[var3] = (int)(Math.random() * 256.0D);
       }
 
       int var4;
       int var5;
-      for(var2 = 0; var2 < 20; ++var2) {
-         for(var3 = 1; var3 < 255; ++var3) {
-            for(var4 = 1; var4 < 127; ++var4) {
+      for (var2 = 0; var2 < 20; ++var2) {
+         for (var3 = 1; var3 < 255; ++var3) {
+            for (var4 = 1; var4 < 127; ++var4) {
                var5 = var4 + (var3 << 7);
                this.field1018[var5] = (this.field1004[var5 + 1] + this.field1004[var5 + 128] + this.field1004[var5 - 128] + this.field1004[var5 - 1]) / 4;
             }
          }
 
-         int[] var8 = this.field1004;
+         int[] var6 = this.field1004;
          this.field1004 = this.field1018;
-         this.field1018 = var8;
+         this.field1018 = var6;
       }
 
-      if(var1 != null) {
+      if (var1 != null) {
          var2 = 0;
 
-         for(var3 = 0; var3 < var1.subHeight; ++var3) {
-            for(var4 = 0; var4 < var1.subWidth; ++var4) {
-               if(var1.pixels[var2++] != 0) {
+         for (var3 = 0; var3 < var1.subHeight; ++var3) {
+            for (var4 = 0; var4 < var1.subWidth; ++var4) {
+               if (var1.pixels[var2++] != 0) {
                   var5 = var4 + var1.xOffset + 16;
-                  int var6 = var3 + var1.yOffset + 16;
-                  int var7 = var5 + (var6 << 7);
+                  int var8 = var3 + var1.yOffset + 16;
+                  int var7 = var5 + (var8 << 7);
                   this.field1004[var7] = 0;
                }
             }
@@ -486,7 +487,7 @@ public class LoginScreenAnimation
       var4.writeByte(10);
 
       int var7;
-      for(var7 = 0; var7 < 4; ++var7) {
+      for (var7 = 0; var7 < 4; ++var7) {
          var4.writeInt(var3.nextInt());
       }
 
@@ -495,14 +496,14 @@ public class LoginScreenAnimation
       var4.writeLong(var0);
       var4.writeLong(0L);
 
-      for(var7 = 0; var7 < 4; ++var7) {
+      for (var7 = 0; var7 < 4; ++var7) {
          var4.writeInt(var3.nextInt());
       }
 
-      var4.encryptRsa(class80.__ce_o, class80.__ce_u);
+      var4.encryptRsa(class80.field1163, class80.field1164);
       var5.writeByte(10);
 
-      for(var7 = 0; var7 < 3; ++var7) {
+      for (var7 = 0; var7 < 3; ++var7) {
          var5.writeInt(var3.nextInt());
       }
 
@@ -510,9 +511,9 @@ public class LoginScreenAnimation
       var5.writeLongMedium(var3.nextLong());
       Varps.method4400(var5);
       var5.writeLong(var3.nextLong());
-      var5.encryptRsa(class80.__ce_o, class80.__ce_u);
-      var7 = WorldMapRegion.method550(var2);
-      if(var7 % 8 != 0) {
+      var5.encryptRsa(class80.field1163, class80.field1164);
+      var7 = WorldMapRegion.stringCp1252NullTerminatedByteSize(var2);
+      if (var7 % 8 != 0) {
          var7 += 8 - var7 % 8;
       }
 
@@ -523,72 +524,72 @@ public class LoginScreenAnimation
       Buffer var9 = new Buffer(var4.index + var5.index + var8.index + 5);
       var9.writeByte(2);
       var9.writeByte(var4.index);
-      var9.__s_297(var4.array, 0, var4.index);
+      var9.writeBytes(var4.array, 0, var4.index);
       var9.writeByte(var5.index);
-      var9.__s_297(var5.array, 0, var5.index);
+      var9.writeBytes(var5.array, 0, var5.index);
       var9.writeShort(var8.index);
-      var9.__s_297(var8.array, 0, var8.index);
-      byte[] var11 = var9.array;
-      int var13 = var11.length;
-      StringBuilder var14 = new StringBuilder();
+      var9.writeBytes(var8.array, 0, var8.index);
+      byte[] var10 = var9.array;
+      int var11 = var10.length;
+      StringBuilder var12 = new StringBuilder();
 
-      int var17;
-      for(int var15 = 0; var15 < var13 + 0; var15 += 3) {
-         int var16 = var11[var15] & 255;
-         var14.append(class307.__kc_m[var16 >>> 2]);
-         if(var15 < var13 - 1) {
-            var17 = var11[var15 + 1] & 255;
-            var14.append(class307.__kc_m[(var16 & 3) << 4 | var17 >>> 4]);
-            if(var15 < var13 - 2) {
-               int var18 = var11[var15 + 2] & 255;
-               var14.append(class307.__kc_m[(var17 & 15) << 2 | var18 >>> 6]).append(class307.__kc_m[var18 & 63]);
+      int var13;
+      for (int var14 = 0; var14 < var11 + 0; var14 += 3) {
+         int var15 = var10[var14] & 255;
+         var12.append(class307.field1151[var15 >>> 2]);
+         if (var14 < var11 - 1) {
+            var13 = var10[var14 + 1] & 255;
+            var12.append(class307.field1151[(var15 & 3) << 4 | var13 >>> 4]);
+            if (var14 < var11 - 2) {
+               int var16 = var10[var14 + 2] & 255;
+               var12.append(class307.field1151[(var13 & 15) << 2 | var16 >>> 6]).append(class307.field1151[var16 & 63]);
             } else {
-               var14.append(class307.__kc_m[(var17 & 15) << 2]).append("=");
+               var12.append(class307.field1151[(var13 & 15) << 2]).append("=");
             }
          } else {
-            var14.append(class307.__kc_m[(var16 & 3) << 4]).append("==");
+            var12.append(class307.field1151[(var15 & 3) << 4]).append("==");
          }
       }
 
-      String var12 = var14.toString();
-      var12 = var12;
+      String var21 = var12.toString();
+      var21 = var21;
 
       try {
-         URL var19 = new URL(Message.method1227("services", false) + "m=accountappeal/login.ws");
-         URLConnection var24 = var19.openConnection();
-         var24.setDoInput(true);
-         var24.setDoOutput(true);
-         var24.setConnectTimeout(5000);
-         OutputStreamWriter var20 = new OutputStreamWriter(var24.getOutputStream());
-         var20.write("data2=" + class306.method5781(var12) + "&dest=" + class306.method5781("passwordchoice.ws"));
-         var20.flush();
-         InputStream var21 = var24.getInputStream();
+         URL var22 = new URL(Message.method1227("services", false) + "m=accountappeal/login.ws");
+         URLConnection var23 = var22.openConnection();
+         var23.setDoInput(true);
+         var23.setDoOutput(true);
+         var23.setConnectTimeout(5000);
+         OutputStreamWriter var17 = new OutputStreamWriter(var23.getOutputStream());
+         var17.write("data2=" + class306.method5781(var21) + "&dest=" + class306.method5781("passwordchoice.ws"));
+         var17.flush();
+         InputStream var18 = var23.getInputStream();
          var9 = new Buffer(new byte[1000]);
 
          do {
-            var17 = var21.read(var9.array, var9.index, 1000 - var9.index);
-            if(var17 == -1) {
-               var20.close();
-               var21.close();
-               String var22 = new String(var9.array);
-               if(var22.startsWith("OFFLINE")) {
+            var13 = var18.read(var9.array, var9.index, 1000 - var9.index);
+            if (var13 == -1) {
+               var17.close();
+               var18.close();
+               String var19 = new String(var9.array);
+               if (var19.startsWith("OFFLINE")) {
                   return 4;
-               } else if(var22.startsWith("WRONG")) {
+               } else if (var19.startsWith("WRONG")) {
                   return 7;
-               } else if(var22.startsWith("RELOAD")) {
+               } else if (var19.startsWith("RELOAD")) {
                   return 3;
-               } else if(var22.startsWith("Not permitted for social network accounts.")) {
+               } else if (var19.startsWith("Not permitted for social network accounts.")) {
                   return 6;
                } else {
                   var9.xteaDecryptAll(var6);
 
-                  while(var9.index > 0 && var9.array[var9.index - 1] == 0) {
+                  while (var9.index > 0 && var9.array[var9.index - 1] == 0) {
                      --var9.index;
                   }
 
-                  var22 = new String(var9.array, 0, var9.index);
-                  if(class83.method2026(var22)) {
-                     WorldMapCacheName.method635(var22, true, false);
+                  var19 = new String(var9.array, 0, var9.index);
+                  if (class83.method2026(var19)) {
+                     WorldMapCacheName.openURL(var19, true, false);
                      return 2;
                   } else {
                      return 5;
@@ -596,12 +597,12 @@ public class LoginScreenAnimation
                }
             }
 
-            var9.index += var17;
+            var9.index += var13;
          } while(var9.index < 1000);
 
          return 5;
-      } catch (Throwable var23) {
-         var23.printStackTrace();
+      } catch (Throwable var20) {
+         var20.printStackTrace();
          return 5;
       }
    }
@@ -614,13 +615,13 @@ public class LoginScreenAnimation
    @Export("getHitSplatDefinition")
    public static HitSplatDefinition getHitSplatDefinition(int var0) {
       HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var0);
-      if(var1 != null) {
+      if (var1 != null) {
          return var1;
       } else {
-         byte[] var2 = HitSplatDefinition.__jm_m.takeRecord(32, var0);
+         byte[] var2 = HitSplatDefinition.field382.takeFile(32, var0);
          var1 = new HitSplatDefinition();
-         if(var2 != null) {
-            var1.read(new Buffer(var2));
+         if (var2 != null) {
+            var1.decode(new Buffer(var2));
          }
 
          HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0);
diff --git a/runescape-client/src/main/java/LoginType.java b/runescape-client/src/main/java/LoginType.java
index 91705d5b3d..88c8325bc5 100644
--- a/runescape-client/src/main/java/LoginType.java
+++ b/runescape-client/src/main/java/LoginType.java
@@ -1,4 +1,3 @@
-import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
@@ -11,82 +10,81 @@ public class LoginType {
    @ObfuscatedSignature(
       signature = "Llx;"
    )
-   public static final LoginType __lx_m;
+   public static final LoginType field479;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Llx;"
    )
-   static final LoginType __lx_f;
+   static final LoginType field480;
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Llx;"
    )
-   static final LoginType __lx_q;
+   static final LoginType field481;
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "Llx;"
    )
-   static final LoginType __lx_w;
+   static final LoginType field482;
    @ObfuscatedName("o")
    @ObfuscatedSignature(
       signature = "Llx;"
    )
-   static final LoginType __lx_o;
+   static final LoginType field483;
    @ObfuscatedName("u")
    @ObfuscatedSignature(
       signature = "Llx;"
    )
-   static final LoginType __lx_u;
+   static final LoginType field484;
    @ObfuscatedName("g")
    @ObfuscatedSignature(
       signature = "Llx;"
    )
-   static final LoginType __lx_g;
+   static final LoginType field485;
    @ObfuscatedName("l")
    @ObfuscatedSignature(
       signature = "Llx;"
    )
-   static final LoginType __lx_l;
+   static final LoginType field486;
    @ObfuscatedName("e")
    @ObfuscatedSignature(
       signature = "Llx;"
    )
-   public static final LoginType __lx_e;
+   public static final LoginType field487;
    @ObfuscatedName("x")
    @ObfuscatedGetter(
       intValue = -1916729379
    )
-   public final int __x;
+   public final int field488;
    @ObfuscatedName("d")
-   final String __d;
-
-   static {
-      __lx_m = new LoginType(8, 0, "", "");
-      __lx_f = new LoginType(3, 1, "", "");
-      __lx_q = new LoginType(2, 2, "", "");
-      __lx_w = new LoginType(6, 3, "", "");
-      __lx_o = new LoginType(4, 4, "", "");
-      __lx_u = new LoginType(7, 5, "", "");
-      __lx_g = new LoginType(1, 6, "", "");
-      __lx_l = new LoginType(5, 7, "", "");
-      __lx_e = new LoginType(0, -1, "", "", true, new LoginType[]{__lx_m, __lx_f, __lx_q, __lx_o, __lx_w});
-   }
+   final String field489;
 
    LoginType(int var1, int var2, String var3, String var4) {
-      this.__x = var1;
-      this.__d = var4;
+      this.field488 = var1;
+      this.field489 = var4;
    }
 
    @ObfuscatedSignature(
       signature = "(IILjava/lang/String;Ljava/lang/String;Z[Llx;)V"
    )
    LoginType(int var1, int var2, String var3, String var4, boolean var5, LoginType[] var6) {
-      this.__x = var1;
-      this.__d = var4;
+      this.field488 = var1;
+      this.field489 = var4;
    }
 
-   @ObfuscatedName("toString")
-   public String __toString_546() {
-      return this.__d;
+   public String toString() {
+      return this.field489;
+   }
+
+   static {
+      field479 = new LoginType(8, 0, "", "");
+      field480 = new LoginType(3, 1, "", "");
+      field481 = new LoginType(2, 2, "", "");
+      field482 = new LoginType(6, 3, "", "");
+      field483 = new LoginType(4, 4, "", "");
+      field484 = new LoginType(7, 5, "", "");
+      field485 = new LoginType(1, 6, "", "");
+      field486 = new LoginType(5, 7, "", "");
+      field487 = new LoginType(0, -1, "", "", true, new LoginType[]{field479, field480, field481, field483, field482});
    }
 }
diff --git a/runescape-client/src/main/java/MenuAction.java b/runescape-client/src/main/java/MenuAction.java
index 1e3b209c99..2bd6703d40 100644
--- a/runescape-client/src/main/java/MenuAction.java
+++ b/runescape-client/src/main/java/MenuAction.java
@@ -47,11 +47,11 @@ public class MenuAction {
       garbageValue = "0"
    )
    @Export("loadIndexedSpriteByName")
-   public static IndexedSprite loadIndexedSpriteByName(AbstractIndexCache var0, String var1, String var2) {
-      int var3 = var0.getArchiveId(var1);
-      int var4 = var0.getRecordId(var3, var2);
+   public static IndexedSprite loadIndexedSpriteByName(AbstractArchive var0, String var1, String var2) {
+      int var3 = var0.getGroupId(var1);
+      int var4 = var0.getFileId(var3, var2);
       IndexedSprite var5;
-      if(!SpriteMask.loadSprite(var0, var3, var4)) {
+      if (!SpriteMask.loadSprite(var0, var3, var4)) {
          var5 = null;
       } else {
          var5 = ServerPacket.createIndexedSprite();
@@ -65,32 +65,32 @@ public class MenuAction {
       signature = "(Lbx;ZI)V",
       garbageValue = "1537219807"
    )
-   @Export("closeWidgetGroup")
-   static final void closeWidgetGroup(WidgetGroupParent var0, boolean var1) {
+   @Export("closeInterface")
+   static final void closeInterface(InterfaceParent var0, boolean var1) {
       int var2 = var0.group;
       int var3 = (int)var0.key;
       var0.remove();
-      if(var1) {
-         AbstractByteArrayCopier.unloadWidgetGroup(var2);
+      if (var1) {
+         AbstractByteArrayCopier.unloadInterface(var2);
       }
 
-      for(IntegerNode var4 = (IntegerNode)Client.widgetClickMasks.first(); var4 != null; var4 = (IntegerNode)Client.widgetClickMasks.next()) {
-         if((long)var2 == (var4.key >> 48 & 65535L)) {
+      for (IntegerNode var4 = (IntegerNode)Client.widgetClickMasks.first(); var4 != null; var4 = (IntegerNode)Client.widgetClickMasks.next()) {
+         if ((long)var2 == (var4.key >> 48 & 65535L)) {
             var4.remove();
          }
       }
 
-      Widget var14 = Huffman.getWidget(var3);
-      if(var14 != null) {
-         class22.method295(var14);
+      Widget var12 = Huffman.getWidget(var3);
+      if (var12 != null) {
+         WorldMapRectangle.method295(var12);
       }
 
       int var5;
       int var6;
-      for(var5 = 0; var5 < Client.menuOptionsCount; ++var5) {
-         if(WorldMapManager.isWidgetMenuOpcode(Client.menuOpcodes[var5])) {
-            if(var5 < Client.menuOptionsCount - 1) {
-               for(var6 = var5; var6 < Client.menuOptionsCount - 1; ++var6) {
+      for (var5 = 0; var5 < Client.menuOptionsCount; ++var5) {
+         if (WorldMapManager.isWidgetMenuOpcode(Client.menuOpcodes[var5])) {
+            if (var5 < Client.menuOptionsCount - 1) {
+               for (var6 = var5; var6 < Client.menuOptionsCount - 1; ++var6) {
                   Client.menuActions[var6] = Client.menuActions[var6 + 1];
                   Client.menuTargetNames[var6] = Client.menuTargetNames[var6 + 1];
                   Client.menuOpcodes[var6] = Client.menuOpcodes[var6 + 1];
@@ -106,54 +106,54 @@ public class MenuAction {
          }
       }
 
-      var5 = class214.menuWidth / 2 + class25.menuX;
+      var5 = class214.menuWidth / 2 + WorldMapDecoration.menuX;
       var6 = GameShell.menuY;
       int var7 = class2.fontBold12.stringWidth("Choose Option");
 
       int var8;
-      for(var8 = 0; var8 < Client.menuOptionsCount; ++var8) {
+      for (var8 = 0; var8 < Client.menuOptionsCount; ++var8) {
          Font var9 = class2.fontBold12;
          String var10;
-         if(var8 < 0) {
+         if (var8 < 0) {
             var10 = "";
-         } else if(Client.menuTargetNames[var8].length() > 0) {
+         } else if (Client.menuTargetNames[var8].length() > 0) {
             var10 = Client.menuActions[var8] + " " + Client.menuTargetNames[var8];
          } else {
             var10 = Client.menuActions[var8];
          }
 
          int var11 = var9.stringWidth(var10);
-         if(var11 > var7) {
+         if (var11 > var7) {
             var7 = var11;
          }
       }
 
       var7 += 8;
       var8 = Client.menuOptionsCount * 15 + 22;
-      int var12 = var5 - var7 / 2;
-      if(var7 + var12 > SoundCache.canvasWidth) {
-         var12 = SoundCache.canvasWidth - var7;
+      int var13 = var5 - var7 / 2;
+      if (var7 + var13 > SoundCache.canvasWidth) {
+         var13 = SoundCache.canvasWidth - var7;
       }
 
-      if(var12 < 0) {
-         var12 = 0;
-      }
-
-      int var13 = var6;
-      if(var6 + var8 > Huffman.canvasHeight) {
-         var13 = Huffman.canvasHeight - var8;
-      }
-
-      if(var13 < 0) {
+      if (var13 < 0) {
          var13 = 0;
       }
 
-      class25.menuX = var12;
-      GameShell.menuY = var13;
+      int var14 = var6;
+      if (var6 + var8 > Huffman.canvasHeight) {
+         var14 = Huffman.canvasHeight - var8;
+      }
+
+      if (var14 < 0) {
+         var14 = 0;
+      }
+
+      WorldMapDecoration.menuX = var13;
+      GameShell.menuY = var14;
       class214.menuWidth = var7;
       AbstractWorldMapIcon.menuHeight = Client.menuOptionsCount * 15 + 22;
-      if(Client.rootWidgetGroup != -1) {
-         GrandExchangeEvents.method74(Client.rootWidgetGroup, 1);
+      if (Client.rootInterface != -1) {
+         GrandExchangeEvents.method74(Client.rootInterface, 1);
       }
 
    }
diff --git a/runescape-client/src/main/java/Message.java b/runescape-client/src/main/java/Message.java
index 570ff3192f..4c64860070 100644
--- a/runescape-client/src/main/java/Message.java
+++ b/runescape-client/src/main/java/Message.java
@@ -8,7 +8,7 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("Message")
 public class Message extends DualNode {
    @ObfuscatedName("i")
-   static int[] __bm_i;
+   static int[] field490;
    @ObfuscatedName("m")
    @ObfuscatedGetter(
       intValue = 1597147817
@@ -67,15 +67,15 @@ public class Message extends DualNode {
       garbageValue = "0"
    )
    @Export("set")
-   void set(int var1, String var2, String var3, String var4) {
+   void set(int type, String sender, String prefix, String text) {
       int var5 = ++Messages.Messages_count - 1;
       this.count = var5;
       this.cycle = Client.cycle;
-      this.type = var1;
-      this.sender = var2;
+      this.type = type;
+      this.sender = sender;
       this.fillSenderUsername();
-      this.prefix = var3;
-      this.text = var4;
+      this.prefix = prefix;
+      this.text = text;
       this.clearIsFromFriend();
       this.clearIsFromIgnored();
    }
@@ -97,7 +97,7 @@ public class Message extends DualNode {
    )
    @Export("isFromFriend")
    final boolean isFromFriend() {
-      if(this.isFromFriend0 == TriBool.TriBool_unknown) {
+      if (this.isFromFriend0 == TriBool.TriBool_unknown) {
          this.fillIsFromFriend();
       }
 
@@ -111,7 +111,7 @@ public class Message extends DualNode {
    )
    @Export("fillIsFromFriend")
    void fillIsFromFriend() {
-      this.isFromFriend0 = WorldMapArea.friendSystem.friendsList.contains(this.senderUsername)?TriBool.TriBool_true:TriBool.TriBool_false;
+      this.isFromFriend0 = WorldMapArea.friendSystem.friendsList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false;
    }
 
    @ObfuscatedName("o")
@@ -131,7 +131,7 @@ public class Message extends DualNode {
    )
    @Export("isFromIgnored")
    final boolean isFromIgnored() {
-      if(this.isFromIgnored0 == TriBool.TriBool_unknown) {
+      if (this.isFromIgnored0 == TriBool.TriBool_unknown) {
          this.fillIsFromIgnored();
       }
 
@@ -145,7 +145,7 @@ public class Message extends DualNode {
    )
    @Export("fillIsFromIgnored")
    void fillIsFromIgnored() {
-      this.isFromIgnored0 = WorldMapArea.friendSystem.ignoreList.contains(this.senderUsername)?TriBool.TriBool_true:TriBool.TriBool_false;
+      this.isFromIgnored0 = WorldMapArea.friendSystem.ignoreList.contains(this.senderUsername) ? TriBool.TriBool_true : TriBool.TriBool_false;
    }
 
    @ObfuscatedName("l")
@@ -155,8 +155,8 @@ public class Message extends DualNode {
    )
    @Export("fillSenderUsername")
    final void fillSenderUsername() {
-      if(this.sender != null) {
-         this.senderUsername = new Username(NpcDefinition.method5161(this.sender), KeyHandler.loginType);
+      if (this.sender != null) {
+         this.senderUsername = new Username(NPCDefinition.method5161(this.sender), KeyHandler.loginType);
       } else {
          this.senderUsername = null;
       }
@@ -169,7 +169,7 @@ public class Message extends DualNode {
       garbageValue = "-1905151806"
    )
    public static String method1229(CharSequence var0, LoginType var1) {
-      if(var0 == null) {
+      if (var0 == null) {
          return null;
       } else {
          int var2 = 0;
@@ -177,94 +177,90 @@ public class Message extends DualNode {
          int var3;
          boolean var4;
          char var5;
-         for(var3 = var0.length(); var2 < var3; ++var2) {
+         for (var3 = var0.length(); var2 < var3; ++var2) {
             var5 = var0.charAt(var2);
             var4 = var5 == 160 || var5 == ' ' || var5 == '_' || var5 == '-';
-            if(!var4) {
+            if (!var4) {
                break;
             }
          }
 
-         while(var3 > var2) {
+         while (var3 > var2) {
             var5 = var0.charAt(var3 - 1);
             var4 = var5 == 160 || var5 == ' ' || var5 == '_' || var5 == '-';
-            if(!var4) {
+            if (!var4) {
                break;
             }
 
             --var3;
          }
 
-         int var14 = var3 - var2;
-         if(var14 >= 1) {
-            byte var6;
-            if(var1 == null) {
-               var6 = 12;
+         int var6 = var3 - var2;
+         if (var6 >= 1) {
+            byte var7;
+            if (var1 == null) {
+               var7 = 12;
             } else {
-               switch(var1.__x) {
+               switch(var1.field488) {
                case 7:
-                  var6 = 20;
+                  var7 = 20;
                   break;
                default:
-                  var6 = 12;
+                  var7 = 12;
                }
             }
 
-            if(var14 <= var6) {
-               StringBuilder var12 = new StringBuilder(var14);
+            if (var6 <= var7) {
+               StringBuilder var8 = new StringBuilder(var6);
 
-               for(int var15 = var2; var15 < var3; ++var15) {
-                  char var7 = var0.charAt(var15);
-                  boolean var8;
-                  if(Character.isISOControl(var7)) {
-                     var8 = false;
-                  } else if(VarcInt.isAlphaNumeric(var7)) {
-                     var8 = true;
+               for (int var9 = var2; var9 < var3; ++var9) {
+                  char var10 = var0.charAt(var9);
+                  boolean var11;
+                  if (Character.isISOControl(var10)) {
+                     var11 = false;
+                  } else if (VarcInt.isAlphaNumeric(var10)) {
+                     var11 = true;
                   } else {
-                     char[] var13 = class305.__kb_q;
-                     int var10 = 0;
+                     label151: {
+                        char[] var12 = class305.field1149;
 
-                     label118:
-                     while(true) {
-                        char var11;
-                        if(var10 >= var13.length) {
-                           var13 = class305.__kb_w;
-
-                           for(var10 = 0; var10 < var13.length; ++var10) {
-                              var11 = var13[var10];
-                              if(var7 == var11) {
-                                 var8 = true;
-                                 break label118;
-                              }
+                        int var13;
+                        char var14;
+                        for (var13 = 0; var13 < var12.length; ++var13) {
+                           var14 = var12[var13];
+                           if (var10 == var14) {
+                              var11 = true;
+                              break label151;
                            }
-
-                           var8 = false;
-                           break;
                         }
 
-                        var11 = var13[var10];
-                        if(var7 == var11) {
-                           var8 = true;
-                           break;
+                        var12 = class305.field1150;
+
+                        for (var13 = 0; var13 < var12.length; ++var13) {
+                           var14 = var12[var13];
+                           if (var10 == var14) {
+                              var11 = true;
+                              break label151;
+                           }
                         }
 
-                        ++var10;
+                        var11 = false;
                      }
                   }
 
-                  if(var8) {
-                     char var9;
-                     switch(var7) {
+                  if (var11) {
+                     char var15;
+                     switch(var10) {
                      case ' ':
                      case '-':
                      case '_':
                      case ' ':
-                        var9 = '_';
+                        var15 = '_';
                         break;
                      case '#':
                      case '[':
                      case ']':
-                        var9 = var7;
+                        var15 = var10;
                         break;
                      case 'À':
                      case 'Á':
@@ -276,11 +272,11 @@ public class Message extends DualNode {
                      case 'â':
                      case 'ã':
                      case 'ä':
-                        var9 = 'a';
+                        var15 = 'a';
                         break;
                      case 'Ç':
                      case 'ç':
-                        var9 = 'c';
+                        var15 = 'c';
                         break;
                      case 'È':
                      case 'É':
@@ -290,7 +286,7 @@ public class Message extends DualNode {
                      case 'é':
                      case 'ê':
                      case 'ë':
-                        var9 = 'e';
+                        var15 = 'e';
                         break;
                      case 'Í':
                      case 'Î':
@@ -298,11 +294,11 @@ public class Message extends DualNode {
                      case 'í':
                      case 'î':
                      case 'ï':
-                        var9 = 'i';
+                        var15 = 'i';
                         break;
                      case 'Ñ':
                      case 'ñ':
-                        var9 = 'n';
+                        var15 = 'n';
                         break;
                      case 'Ò':
                      case 'Ó':
@@ -314,7 +310,7 @@ public class Message extends DualNode {
                      case 'ô':
                      case 'õ':
                      case 'ö':
-                        var9 = 'o';
+                        var15 = 'o';
                         break;
                      case 'Ù':
                      case 'Ú':
@@ -324,30 +320,30 @@ public class Message extends DualNode {
                      case 'ú':
                      case 'û':
                      case 'ü':
-                        var9 = 'u';
+                        var15 = 'u';
                         break;
                      case 'ß':
-                        var9 = 'b';
+                        var15 = 'b';
                         break;
                      case 'ÿ':
                      case 'Ÿ':
-                        var9 = 'y';
+                        var15 = 'y';
                         break;
                      default:
-                        var9 = Character.toLowerCase(var7);
+                        var15 = Character.toLowerCase(var10);
                      }
 
-                     if(var9 != 0) {
-                        var12.append(var9);
+                     if (var15 != 0) {
+                        var8.append(var15);
                      }
                   }
                }
 
-               if(var12.length() == 0) {
+               if (var8.length() == 0) {
                   return null;
                }
 
-               return var12.toString();
+               return var8.toString();
             }
          }
 
@@ -361,7 +357,7 @@ public class Message extends DualNode {
       garbageValue = "-1262174034"
    )
    static Message method1226(int var0, int var1) {
-      ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(Integer.valueOf(var0));
+      ChatChannel var2 = (ChatChannel)Messages.Messages_channels.get(var0);
       return var2.getMessage(var1);
    }
 
@@ -371,28 +367,28 @@ public class Message extends DualNode {
       garbageValue = "-2007966264"
    )
    static final void method1228() {
-      if(SoundSystem.plane != Client.__client_ph) {
-         Client.__client_ph = SoundSystem.plane;
+      if (SoundSystem.plane != Client.field125) {
+         Client.field125 = SoundSystem.plane;
          int var0 = SoundSystem.plane;
-         int[] var1 = WidgetGroupParent.sceneMinimapSprite.pixels;
+         int[] var1 = InterfaceParent.sceneMinimapSprite.pixels;
          int var2 = var1.length;
 
          int var3;
-         for(var3 = 0; var3 < var2; ++var3) {
+         for (var3 = 0; var3 < var2; ++var3) {
             var1[var3] = 0;
          }
 
          int var4;
          int var5;
-         for(var3 = 1; var3 < 103; ++var3) {
+         for (var3 = 1; var3 < 103; ++var3) {
             var4 = (103 - var3) * 2048 + 24628;
 
-            for(var5 = 1; var5 < 103; ++var5) {
-               if((Tiles.Tiles_renderFlags[var0][var5][var3] & 24) == 0) {
+            for (var5 = 1; var5 < 103; ++var5) {
+               if ((Tiles.Tiles_renderFlags[var0][var5][var3] & 24) == 0) {
                   class65.scene.drawTileMinimap(var1, var4, 512, var0, var5, var3);
                }
 
-               if(var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) {
+               if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var5][var3] & 8) != 0) {
                   class65.scene.drawTileMinimap(var1, var4, 512, var0 + 1, var5, var3);
                }
 
@@ -402,16 +398,16 @@ public class Message extends DualNode {
 
          var3 = (238 + (int)(Math.random() * 20.0D) - 10 << 16) + (238 + (int)(Math.random() * 20.0D) - 10 << 8) + (238 + (int)(Math.random() * 20.0D) - 10);
          var4 = 238 + (int)(Math.random() * 20.0D) - 10 << 16;
-         WidgetGroupParent.sceneMinimapSprite.setRaster();
+         InterfaceParent.sceneMinimapSprite.setRaster();
 
          int var6;
-         for(var5 = 1; var5 < 103; ++var5) {
-            for(var6 = 1; var6 < 103; ++var6) {
-               if((Tiles.Tiles_renderFlags[var0][var6][var5] & 24) == 0) {
+         for (var5 = 1; var5 < 103; ++var5) {
+            for (var6 = 1; var6 < 103; ++var6) {
+               if ((Tiles.Tiles_renderFlags[var0][var6][var5] & 24) == 0) {
                   MouseRecorder.drawObject(var0, var6, var5, var3, var4);
                }
 
-               if(var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var6][var5] & 8) != 0) {
+               if (var0 < 3 && (Tiles.Tiles_renderFlags[var0 + 1][var6][var5] & 8) != 0) {
                   MouseRecorder.drawObject(var0 + 1, var6, var5, var3, var4);
                }
             }
@@ -419,13 +415,13 @@ public class Message extends DualNode {
 
          Client.mapIconCount = 0;
 
-         for(var5 = 0; var5 < 104; ++var5) {
-            for(var6 = 0; var6 < 104; ++var6) {
+         for (var5 = 0; var5 < 104; ++var5) {
+            for (var6 = 0; var6 < 104; ++var6) {
                long var7 = class65.scene.getFloorDecorationTag(SoundSystem.plane, var5, var6);
-               if(var7 != 0L) {
+               if (var7 != 0L) {
                   int var9 = HitSplatDefinition.method4972(var7);
                   int var10 = class50.getObjectDefinition(var9).mapIconId;
-                  if(var10 >= 0) {
+                  if (var10 >= 0) {
                      Client.mapIcons[Client.mapIconCount] = ViewportMouse.getWorldMapElement(var10).getSprite(false);
                      Client.mapIconXs[Client.mapIconCount] = var5;
                      Client.mapIconYs[Client.mapIconCount] = var6;
@@ -446,25 +442,25 @@ public class Message extends DualNode {
       garbageValue = "1047910257"
    )
    static String method1227(String var0, boolean var1) {
-      String var2 = var1?"https://":"http://";
-      if(Client.gameBuild == 1) {
+      String var2 = var1 ? "https://" : "http://";
+      if (Client.gameBuild == 1) {
          var0 = var0 + "-wtrc";
-      } else if(Client.gameBuild == 2) {
+      } else if (Client.gameBuild == 2) {
          var0 = var0 + "-wtqa";
-      } else if(Client.gameBuild == 3) {
+      } else if (Client.gameBuild == 3) {
          var0 = var0 + "-wtwip";
-      } else if(Client.gameBuild == 5) {
+      } else if (Client.gameBuild == 5) {
          var0 = var0 + "-wti";
-      } else if(Client.gameBuild == 4) {
+      } else if (Client.gameBuild == 4) {
          var0 = "local";
       }
 
       String var3 = "";
-      if(class21.__b_by != null) {
-         var3 = "/p=" + class21.__b_by;
+      if (class21.field1123 != null) {
+         var3 = "/p=" + class21.field1123;
       }
 
       String var4 = "runescape.com";
-      return var2 + var0 + "." + var4 + "/l=" + Client.language + "/a=" + AbstractIndexCache.__ir_bu + var3 + "/";
+      return var2 + var0 + "." + var4 + "/l=" + Client.language + "/a=" + AbstractArchive.field2 + var3 + "/";
    }
 }
diff --git a/runescape-client/src/main/java/Messages.java b/runescape-client/src/main/java/Messages.java
index 4c06de37c8..81e912029f 100644
--- a/runescape-client/src/main/java/Messages.java
+++ b/runescape-client/src/main/java/Messages.java
@@ -37,27 +37,27 @@ public class Messages {
    @Export("soundSystem")
    static SoundSystem soundSystem;
 
-   static {
-      Messages_channels = new HashMap();
-      Messages_hashTable = new IterableNodeHashTable(1024);
-      Messages_queue = new IterableDualNodeQueue();
-      Messages_count = 0;
-   }
-
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "(I)V",
       garbageValue = "103402661"
    )
    static void method2200() {
-      if(Login.Login_username == null || Login.Login_username.length() <= 0) {
-         if(ReflectionCheck.clientPreferences.rememberedUsername != null) {
+      if (Login.Login_username == null || Login.Login_username.length() <= 0) {
+         if (ReflectionCheck.clientPreferences.rememberedUsername != null) {
             Login.Login_username = ReflectionCheck.clientPreferences.rememberedUsername;
             Client.Login_isUsernameRemembered = true;
          } else {
             Client.Login_isUsernameRemembered = false;
          }
-
       }
+
+   }
+
+   static {
+      Messages_channels = new HashMap();
+      Messages_hashTable = new IterableNodeHashTable(1024);
+      Messages_queue = new IterableDualNodeQueue();
+      Messages_count = 0;
    }
 }
diff --git a/runescape-client/src/main/java/MidiFileReader.java b/runescape-client/src/main/java/MidiFileReader.java
index 7425856d16..9e01515cc3 100644
--- a/runescape-client/src/main/java/MidiFileReader.java
+++ b/runescape-client/src/main/java/MidiFileReader.java
@@ -7,7 +7,7 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("MidiFileReader")
 public class MidiFileReader {
    @ObfuscatedName("x")
-   static final byte[] __hs_x;
+   static final byte[] field491;
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "Lgr;"
@@ -27,15 +27,11 @@ public class MidiFileReader {
    @Export("trackLengths")
    int[] trackLengths;
    @ObfuscatedName("u")
-   int[] __u;
+   int[] field492;
    @ObfuscatedName("g")
-   int __g;
+   int field493;
    @ObfuscatedName("e")
-   long __e;
-
-   static {
-      __hs_x = new byte[]{(byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)1, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)2, (byte)0, (byte)1, (byte)2, (byte)1, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0};
-   }
+   long field494;
 
    MidiFileReader(byte[] var1) {
       this.buffer = new Buffer((byte[])null);
@@ -48,34 +44,37 @@ public class MidiFileReader {
 
    @ObfuscatedName("m")
    @Export("parse")
-   void parse(byte[] var1) {
-      this.buffer.array = var1;
+   void parse(byte[] midi) {
+      this.buffer.array = midi;
       this.buffer.index = 10;
-      int var2 = this.buffer.__ag_302();
-      this.division = this.buffer.__ag_302();
-      this.__g = 500000;
+      int var2 = this.buffer.readUnsignedShort();
+      this.division = this.buffer.readUnsignedShort();
+      this.field493 = 500000;
       this.trackStarts = new int[var2];
 
-      int var3;
+      Buffer var3;
+      int var4;
       int var5;
-      for(var3 = 0; var3 < var2; this.buffer.index += var5) {
-         int var4 = this.buffer.readInt();
+      for (var4 = 0; var4 < var2; var3.index += var5) {
+         int var6 = this.buffer.readInt();
          var5 = this.buffer.readInt();
-         if(var4 == 1297379947) {
-            this.trackStarts[var3] = this.buffer.index;
-            ++var3;
+         if (var6 == 1297379947) {
+            this.trackStarts[var4] = this.buffer.index;
+            ++var4;
          }
+
+         var3 = this.buffer;
       }
 
-      this.__e = 0L;
+      this.field494 = 0L;
       this.trackPositions = new int[var2];
 
-      for(var3 = 0; var3 < var2; ++var3) {
-         this.trackPositions[var3] = this.trackStarts[var3];
+      for (var4 = 0; var4 < var2; ++var4) {
+         this.trackPositions[var4] = this.trackStarts[var4];
       }
 
       this.trackLengths = new int[var2];
-      this.__u = new int[var2];
+      this.field492 = new int[var2];
    }
 
    @ObfuscatedName("f")
@@ -85,7 +84,7 @@ public class MidiFileReader {
       this.trackStarts = null;
       this.trackPositions = null;
       this.trackLengths = null;
-      this.__u = null;
+      this.field492 = null;
    }
 
    @ObfuscatedName("q")
@@ -102,14 +101,14 @@ public class MidiFileReader {
 
    @ObfuscatedName("o")
    @Export("gotoTrack")
-   void gotoTrack(int var1) {
-      this.buffer.index = this.trackPositions[var1];
+   void gotoTrack(int trackId) {
+      this.buffer.index = this.trackPositions[trackId];
    }
 
    @ObfuscatedName("u")
    @Export("markTrackPosition")
-   void markTrackPosition(int var1) {
-      this.trackPositions[var1] = this.buffer.index;
+   void markTrackPosition(int trackId) {
+      this.trackPositions[trackId] = this.buffer.index;
    }
 
    @ObfuscatedName("g")
@@ -120,88 +119,94 @@ public class MidiFileReader {
 
    @ObfuscatedName("l")
    @Export("readTrackLength")
-   void readTrackLength(int var1) {
-      int var2 = this.buffer.__as_311();
-      this.trackLengths[var1] += var2;
+   void readTrackLength(int trackId) {
+      int var2 = this.buffer.readVarInt();
+      int[] var3 = this.trackLengths;
+      var3[trackId] += var2;
    }
 
    @ObfuscatedName("e")
    @Export("readMessage")
-   int readMessage(int var1) {
-      int var2 = this.readMessage0(var1);
+   int readMessage(int trackId) {
+      int var2 = this.readMessage0(trackId);
       return var2;
    }
 
    @ObfuscatedName("x")
    @Export("readMessage0")
-   int readMessage0(int var1) {
+   int readMessage0(int trackId) {
       byte var2 = this.buffer.array[this.buffer.index];
-      int var5;
-      if(var2 < 0) {
-         var5 = var2 & 255;
-         this.__u[var1] = var5;
+      int var3;
+      if (var2 < 0) {
+         var3 = var2 & 255;
+         this.field492[trackId] = var3;
          ++this.buffer.index;
       } else {
-         var5 = this.__u[var1];
+         var3 = this.field492[trackId];
       }
 
-      if(var5 != 240 && var5 != 247) {
-         return this.__d_371(var1, var5);
+      if (var3 != 240 && var3 != 247) {
+         return this.method167(trackId, var3);
       } else {
-         int var3 = this.buffer.__as_311();
-         if(var5 == 247 && var3 > 0) {
-            int var4 = this.buffer.array[this.buffer.index] & 255;
-            if(var4 >= 241 && var4 <= 243 || var4 == 246 || var4 == 248 || var4 >= 250 && var4 <= 252 || var4 == 254) {
+         int var4 = this.buffer.readVarInt();
+         if (var3 == 247 && var4 > 0) {
+            int var5 = this.buffer.array[this.buffer.index] & 255;
+            if (var5 >= 241 && var5 <= 243 || var5 == 246 || var5 == 248 || var5 >= 250 && var5 <= 252 || var5 == 254) {
                ++this.buffer.index;
-               this.__u[var1] = var4;
-               return this.__d_371(var1, var4);
+               this.field492[trackId] = var5;
+               return this.method167(trackId, var5);
             }
          }
 
-         this.buffer.index += var3;
+         Buffer var6 = this.buffer;
+         var6.index += var4;
          return 0;
       }
    }
 
    @ObfuscatedName("d")
-   int __d_371(int var1, int var2) {
-      int var4;
-      if(var2 == 255) {
-         int var7 = this.buffer.readUnsignedByte();
-         var4 = this.buffer.__as_311();
-         if(var7 == 47) {
-            this.buffer.index += var4;
+   int method167(int var1, int var2) {
+      int var3;
+      if (var2 == 255) {
+         int var8 = this.buffer.readUnsignedByte();
+         var3 = this.buffer.readVarInt();
+         Buffer var5;
+         if (var8 == 47) {
+            var5 = this.buffer;
+            var5.index += var3;
             return 1;
-         } else if(var7 == 81) {
-            int var5 = this.buffer.readMedium();
-            var4 -= 3;
-            int var6 = this.trackLengths[var1];
-            this.__e += (long)var6 * (long)(this.__g - var5);
-            this.__g = var5;
-            this.buffer.index += var4;
+         } else if (var8 == 81) {
+            int var6 = this.buffer.readMedium();
+            var3 -= 3;
+            int var7 = this.trackLengths[var1];
+            this.field494 += (long)var7 * (long)(this.field493 - var6);
+            this.field493 = var6;
+            var5 = this.buffer;
+            var5.index += var3;
             return 2;
          } else {
-            this.buffer.index += var4;
+            var5 = this.buffer;
+            var5.index += var3;
             return 3;
          }
       } else {
-         byte var3 = __hs_x[var2 - 128];
-         var4 = var2;
-         if(var3 >= 1) {
-            var4 = var2 | this.buffer.readUnsignedByte() << 8;
+         byte var4 = field491[var2 - 128];
+         var3 = var2;
+         if (var4 >= 1) {
+            var3 = var2 | this.buffer.readUnsignedByte() << 8;
          }
 
-         if(var3 >= 2) {
-            var4 |= this.buffer.readUnsignedByte() << 16;
+         if (var4 >= 2) {
+            var3 |= this.buffer.readUnsignedByte() << 16;
          }
 
-         return var4;
+         return var3;
       }
    }
 
    @ObfuscatedName("a")
-   long __a_372(int var1) {
-      return this.__e + (long)var1 * (long)this.__g;
+   long method168(int var1) {
+      return this.field494 + (long)var1 * (long)this.field493;
    }
 
    @ObfuscatedName("z")
@@ -211,8 +216,8 @@ public class MidiFileReader {
       int var2 = -1;
       int var3 = Integer.MAX_VALUE;
 
-      for(int var4 = 0; var4 < var1; ++var4) {
-         if(this.trackPositions[var4] >= 0 && this.trackLengths[var4] < var3) {
+      for (int var4 = 0; var4 < var1; ++var4) {
+         if (this.trackPositions[var4] >= 0 && this.trackLengths[var4] < var3) {
             var2 = var4;
             var3 = this.trackLengths[var4];
          }
@@ -226,8 +231,8 @@ public class MidiFileReader {
    boolean isDone() {
       int var1 = this.trackPositions.length;
 
-      for(int var2 = 0; var2 < var1; ++var2) {
-         if(this.trackPositions[var2] >= 0) {
+      for (int var2 = 0; var2 < var1; ++var2) {
+         if (this.trackPositions[var2] >= 0) {
             return false;
          }
       }
@@ -238,16 +243,20 @@ public class MidiFileReader {
    @ObfuscatedName("s")
    @Export("reset")
    void reset(long var1) {
-      this.__e = var1;
+      this.field494 = var1;
       int var3 = this.trackPositions.length;
 
-      for(int var4 = 0; var4 < var3; ++var4) {
+      for (int var4 = 0; var4 < var3; ++var4) {
          this.trackLengths[var4] = 0;
-         this.__u[var4] = 0;
+         this.field492[var4] = 0;
          this.buffer.index = this.trackStarts[var4];
          this.readTrackLength(var4);
          this.trackPositions[var4] = this.buffer.index;
       }
 
    }
+
+   static {
+      field491 = 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};
+   }
 }
diff --git a/runescape-client/src/main/java/MidiPcmStream.java b/runescape-client/src/main/java/MidiPcmStream.java
index 800b277560..e7abdefd73 100644
--- a/runescape-client/src/main/java/MidiPcmStream.java
+++ b/runescape-client/src/main/java/MidiPcmStream.java
@@ -17,52 +17,52 @@ public class MidiPcmStream extends PcmStream {
    @ObfuscatedGetter(
       intValue = 335918727
    )
-   int __f;
+   int field495;
    @ObfuscatedName("q")
    @ObfuscatedGetter(
       intValue = 2095480747
    )
-   int __q;
+   int field496;
    @ObfuscatedName("o")
-   int[] __o;
+   int[] field497;
    @ObfuscatedName("u")
-   int[] __u;
+   int[] field498;
    @ObfuscatedName("g")
-   int[] __g;
+   int[] field499;
    @ObfuscatedName("l")
-   int[] __l;
+   int[] field500;
    @ObfuscatedName("e")
-   int[] __e;
+   int[] field501;
    @ObfuscatedName("x")
-   int[] __x;
+   int[] field502;
    @ObfuscatedName("d")
-   int[] __d;
+   int[] field503;
    @ObfuscatedName("k")
-   int[] __k;
+   int[] field504;
    @ObfuscatedName("n")
-   int[] __n;
+   int[] field505;
    @ObfuscatedName("y")
-   int[] __y;
+   int[] field506;
    @ObfuscatedName("h")
-   int[] __h;
+   int[] field507;
    @ObfuscatedName("b")
-   int[] __b;
+   int[] field508;
    @ObfuscatedName("c")
-   int[] __c;
+   int[] field509;
    @ObfuscatedName("r")
-   int[] __r;
+   int[] field510;
    @ObfuscatedName("p")
-   int[] __p;
+   int[] field511;
    @ObfuscatedName("v")
    @ObfuscatedSignature(
       signature = "[[Lha;"
    )
-   MusicPatchNode[][] __v;
+   MusicPatchNode[][] field512;
    @ObfuscatedName("ag")
    @ObfuscatedSignature(
       signature = "[[Lha;"
    )
-   MusicPatchNode[][] __ag;
+   MusicPatchNode[][] field513;
    @ObfuscatedName("aq")
    @ObfuscatedSignature(
       signature = "Lhs;"
@@ -70,7 +70,7 @@ public class MidiPcmStream extends PcmStream {
    @Export("midiFile")
    MidiFileReader midiFile;
    @ObfuscatedName("aj")
-   boolean __aj;
+   boolean field514;
    @ObfuscatedName("av")
    @ObfuscatedGetter(
       intValue = 1450922835
@@ -87,12 +87,12 @@ public class MidiPcmStream extends PcmStream {
    @ObfuscatedGetter(
       longValue = -7547625335559871937L
    )
-   long __ac;
+   long field515;
    @ObfuscatedName("ay")
    @ObfuscatedGetter(
       longValue = 3736036110499628937L
    )
-   long __ay;
+   long field516;
    @ObfuscatedName("ah")
    @ObfuscatedSignature(
       signature = "Lhq;"
@@ -101,29 +101,29 @@ public class MidiPcmStream extends PcmStream {
    MusicPatchPcmStream patchStream;
 
    public MidiPcmStream() {
-      this.__f = 256;
-      this.__q = 1000000;
-      this.__o = new int[16];
-      this.__u = new int[16];
-      this.__g = new int[16];
-      this.__l = new int[16];
-      this.__e = new int[16];
-      this.__x = new int[16];
-      this.__d = new int[16];
-      this.__k = new int[16];
-      this.__n = new int[16];
-      this.__y = new int[16];
-      this.__h = new int[16];
-      this.__b = new int[16];
-      this.__c = new int[16];
-      this.__r = new int[16];
-      this.__p = new int[16];
-      this.__v = new MusicPatchNode[16][128];
-      this.__ag = new MusicPatchNode[16][128];
+      this.field495 = 256;
+      this.field496 = 1000000;
+      this.field497 = new int[16];
+      this.field498 = new int[16];
+      this.field499 = new int[16];
+      this.field500 = new int[16];
+      this.field501 = new int[16];
+      this.field502 = new int[16];
+      this.field503 = new int[16];
+      this.field504 = new int[16];
+      this.field505 = new int[16];
+      this.field506 = new int[16];
+      this.field507 = new int[16];
+      this.field508 = new int[16];
+      this.field509 = new int[16];
+      this.field510 = new int[16];
+      this.field511 = new int[16];
+      this.field512 = new MusicPatchNode[16][128];
+      this.field513 = new MusicPatchNode[16][128];
       this.midiFile = new MidiFileReader();
       this.patchStream = new MusicPatchPcmStream(this);
       this.musicPatches = new NodeHashTable(128);
-      this.__at_354();
+      this.method186();
    }
 
    @ObfuscatedName("m")
@@ -131,8 +131,8 @@ public class MidiPcmStream extends PcmStream {
       signature = "(IB)V",
       garbageValue = "92"
    )
-   public synchronized void __m_340(int var1) {
-      this.__f = var1;
+   public synchronized void method169(int var1) {
+      this.field495 = var1;
    }
 
    @ObfuscatedName("f")
@@ -140,8 +140,8 @@ public class MidiPcmStream extends PcmStream {
       signature = "(I)I",
       garbageValue = "2067929289"
    )
-   public int __f_341() {
-      return this.__f;
+   public int method170() {
+      return this.field495;
    }
 
    @ObfuscatedName("q")
@@ -150,20 +150,20 @@ public class MidiPcmStream extends PcmStream {
       garbageValue = "-324121369"
    )
    @Export("loadMusicTrack")
-   public synchronized boolean loadMusicTrack(MusicTrack var1, AbstractIndexCache var2, SoundCache var3, int var4) {
-      var1.__f_381();
+   public synchronized boolean loadMusicTrack(MusicTrack musicTrack, AbstractArchive var2, SoundCache var3, int frequency) {
+      musicTrack.method226();
       boolean var5 = true;
       int[] var6 = null;
-      if(var4 > 0) {
-         var6 = new int[]{var4};
+      if (frequency > 0) {
+         var6 = new int[]{frequency};
       }
 
-      for(ByteArrayNode var7 = (ByteArrayNode)var1.table.first(); var7 != null; var7 = (ByteArrayNode)var1.table.next()) {
+      for (ByteArrayNode var7 = (ByteArrayNode)musicTrack.table.first(); var7 != null; var7 = (ByteArrayNode)musicTrack.table.next()) {
          int var8 = (int)var7.key;
          MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)var8);
-         if(var9 == null) {
+         if (var9 == null) {
             var9 = Login.method2045(var2, var8);
-            if(var9 == null) {
+            if (var9 == null) {
                var5 = false;
                continue;
             }
@@ -171,13 +171,13 @@ public class MidiPcmStream extends PcmStream {
             this.musicPatches.put(var9, (long)var8);
          }
 
-         if(!var9.__f_373(var3, var7.byteArray, var6)) {
+         if (!var9.method218(var3, var7.byteArray, var6)) {
             var5 = false;
          }
       }
 
-      if(var5) {
-         var1.clear();
+      if (var5) {
+         musicTrack.clear();
       }
 
       return var5;
@@ -190,7 +190,7 @@ public class MidiPcmStream extends PcmStream {
    )
    @Export("clearAll")
    public synchronized void clearAll() {
-      for(MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) {
+      for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) {
          var1.clear();
       }
 
@@ -203,7 +203,7 @@ public class MidiPcmStream extends PcmStream {
    )
    @Export("removeAll")
    public synchronized void removeAll() {
-      for(MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) {
+      for (MusicPatch var1 = (MusicPatch)this.musicPatches.first(); var1 != null; var1 = (MusicPatch)this.musicPatches.next()) {
          var1.remove();
       }
 
@@ -228,32 +228,33 @@ public class MidiPcmStream extends PcmStream {
    }
 
    @ObfuscatedName("l")
-   protected synchronized int __l_171() {
+   protected synchronized int vmethod262() {
       return 0;
    }
 
    @ObfuscatedName("e")
-   protected synchronized void __e_172(int[] var1, int var2, int var3) {
-      if(this.midiFile.isReady()) {
-         int var4 = this.midiFile.division * this.__q / class309.PcmPlayer_sampleRate;
+   @Export("fill")
+   protected synchronized void fill(int[] var1, int var2, int var3) {
+      if (this.midiFile.isReady()) {
+         int var4 = this.midiFile.division * this.field496 / class309.PcmPlayer_sampleRate;
 
          do {
-            long var5 = (long)var4 * (long)var3 + this.__ac;
-            if(this.__ay - var5 >= 0L) {
-               this.__ac = var5;
+            long var5 = (long)var4 * (long)var3 + this.field515;
+            if (this.field516 - var5 >= 0L) {
+               this.field515 = var5;
                break;
             }
 
-            int var7 = (int)(((long)var4 + (this.__ay - this.__ac) - 1L) / (long)var4);
-            this.__ac += (long)var4 * (long)var7;
-            this.patchStream.__e_172(var1, var2, var7);
+            int var7 = (int)(((long)var4 + (this.field516 - this.field515) - 1L) / (long)var4);
+            this.field515 += (long)var4 * (long)var7;
+            this.patchStream.fill(var1, var2, var7);
             var2 += var7;
             var3 -= var7;
-            this.__ai_367();
+            this.method194();
          } while(this.midiFile.isReady());
       }
 
-      this.patchStream.__e_172(var1, var2, var3);
+      this.patchStream.fill(var1, var2, var3);
    }
 
    @ObfuscatedName("x")
@@ -262,14 +263,14 @@ public class MidiPcmStream extends PcmStream {
       garbageValue = "-1859383102"
    )
    @Export("setMusicTrack")
-   public synchronized void setMusicTrack(MusicTrack var1, boolean var2) {
+   public synchronized void setMusicTrack(MusicTrack musicTrack, boolean var2) {
       this.clear();
-      this.midiFile.parse(var1.midi);
-      this.__aj = var2;
-      this.__ac = 0L;
+      this.midiFile.parse(musicTrack.midi);
+      this.field514 = var2;
+      this.field515 = 0L;
       int var3 = this.midiFile.trackCount();
 
-      for(int var4 = 0; var4 < var3; ++var4) {
+      for (int var4 = 0; var4 < var3; ++var4) {
          this.midiFile.gotoTrack(var4);
          this.midiFile.readTrackLength(var4);
          this.midiFile.markTrackPosition(var4);
@@ -277,30 +278,31 @@ public class MidiPcmStream extends PcmStream {
 
       this.track = this.midiFile.getPrioritizedTrack();
       this.trackLength = this.midiFile.trackLengths[this.track];
-      this.__ay = this.midiFile.__a_372(this.trackLength);
+      this.field516 = this.midiFile.method168(this.trackLength);
    }
 
    @ObfuscatedName("d")
-   protected synchronized void __d_173(int var1) {
-      if(this.midiFile.isReady()) {
-         int var2 = this.midiFile.division * this.__q / class309.PcmPlayer_sampleRate;
+   @Export("skip")
+   protected synchronized void skip(int var1) {
+      if (this.midiFile.isReady()) {
+         int var2 = this.midiFile.division * this.field496 / class309.PcmPlayer_sampleRate;
 
          do {
-            long var3 = this.__ac + (long)var2 * (long)var1;
-            if(this.__ay - var3 >= 0L) {
-               this.__ac = var3;
+            long var3 = this.field515 + (long)var2 * (long)var1;
+            if (this.field516 - var3 >= 0L) {
+               this.field515 = var3;
                break;
             }
 
-            int var5 = (int)(((long)var2 + (this.__ay - this.__ac) - 1L) / (long)var2);
-            this.__ac += (long)var5 * (long)var2;
-            this.patchStream.__d_173(var5);
+            int var5 = (int)(((long)var2 + (this.field516 - this.field515) - 1L) / (long)var2);
+            this.field515 += (long)var5 * (long)var2;
+            this.patchStream.skip(var5);
             var1 -= var5;
-            this.__ai_367();
+            this.method194();
          } while(this.midiFile.isReady());
       }
 
-      this.patchStream.__d_173(var1);
+      this.patchStream.skip(var1);
    }
 
    @ObfuscatedName("a")
@@ -311,7 +313,7 @@ public class MidiPcmStream extends PcmStream {
    @Export("clear")
    public synchronized void clear() {
       this.midiFile.clear();
-      this.__at_354();
+      this.method186();
    }
 
    @ObfuscatedName("z")
@@ -329,8 +331,8 @@ public class MidiPcmStream extends PcmStream {
       signature = "(III)V",
       garbageValue = "789206119"
    )
-   public synchronized void __j_342(int var1, int var2) {
-      this.__s_343(var1, var2);
+   public synchronized void method174(int var1, int var2) {
+      this.method175(var1, var2);
    }
 
    @ObfuscatedName("s")
@@ -338,10 +340,10 @@ public class MidiPcmStream extends PcmStream {
       signature = "(III)V",
       garbageValue = "-1475022240"
    )
-   void __s_343(int var1, int var2) {
-      this.__l[var1] = var2;
-      this.__x[var1] = var2 & -128;
-      this.__t_344(var1, var2);
+   void method175(int var1, int var2) {
+      this.field500[var1] = var2;
+      this.field502[var1] = var2 & -128;
+      this.method176(var1, var2);
    }
 
    @ObfuscatedName("t")
@@ -349,12 +351,12 @@ public class MidiPcmStream extends PcmStream {
       signature = "(III)V",
       garbageValue = "-213159072"
    )
-   void __t_344(int var1, int var2) {
-      if(var2 != this.__e[var1]) {
-         this.__e[var1] = var2;
+   void method176(int var1, int var2) {
+      if (var2 != this.field501[var1]) {
+         this.field501[var1] = var2;
 
-         for(int var3 = 0; var3 < 128; ++var3) {
-            this.__ag[var1][var3] = null;
+         for (int var3 = 0; var3 < 128; ++var3) {
+            this.field513[var1][var3] = null;
          }
       }
 
@@ -365,67 +367,68 @@ public class MidiPcmStream extends PcmStream {
       signature = "(IIIB)V",
       garbageValue = "15"
    )
-   void __y_345(int var1, int var2, int var3) {
-      this.__b_347(var1, var2, 64);
-      if((this.__y[var1] & 2) != 0) {
-         for(MusicPatchNode var4 = (MusicPatchNode)this.patchStream.queue.first(); var4 != null; var4 = (MusicPatchNode)this.patchStream.queue.next()) {
-            if(var4.__m == var1 && var4.__a < 0) {
-               this.__v[var1][var4.__u] = null;
-               this.__v[var1][var2] = var4;
-               int var5 = (var4.__d * var4.__x >> 12) + var4.__e;
-               var4.__e += var2 - var4.__u << 8;
-               var4.__x = var5 - var4.__e;
-               var4.__d = 4096;
-               var4.__u = var2;
+   void method177(int var1, int var2, int var3) {
+      this.method179(var1, var2, 64);
+      if ((this.field506[var1] & 2) != 0) {
+         for (MusicPatchNode var4 = (MusicPatchNode)this.patchStream.queue.first(); var4 != null; var4 = (MusicPatchNode)this.patchStream.queue.next()) {
+            if (var4.field574 == var1 && var4.field586 < 0) {
+               this.field512[var1][var4.field577] = null;
+               this.field512[var1][var2] = var4;
+               int var5 = (var4.field582 * var4.field581 >> 12) + var4.field580;
+               var4.field580 += var2 - var4.field577 << 8;
+               var4.field581 = var5 - var4.field580;
+               var4.field582 = 4096;
+               var4.field577 = var2;
                return;
             }
          }
       }
 
-      MusicPatch var9 = (MusicPatch)this.musicPatches.get((long)this.__e[var1]);
-      if(var9 != null) {
-         RawSound var8 = var9.rawSounds[var2];
-         if(var8 != null) {
+      MusicPatch var8 = (MusicPatch)this.musicPatches.get((long)this.field501[var1]);
+      if (var8 != null) {
+         RawSound var9 = var8.rawSounds[var2];
+         if (var9 != null) {
             MusicPatchNode var6 = new MusicPatchNode();
-            var6.__m = var1;
-            var6.patch = var9;
-            var6.rawSound = var8;
-            var6.__w = var9.__u[var2];
-            var6.__o = var9.__g[var2];
-            var6.__u = var2;
-            var6.__g = var3 * var3 * var9.__w[var2] * var9.__m + 1024 >> 11;
-            var6.__l = var9.__o[var2] & 255;
-            var6.__e = (var2 << 8) - (var9.__q[var2] & 32767);
-            var6.__k = 0;
-            var6.__n = 0;
-            var6.__i = 0;
-            var6.__a = -1;
-            var6.__z = 0;
-            if(this.__c[var1] == 0) {
-               var6.stream = RawPcmStream.method2524(var8, this.__aa_359(var6), this.__ax_360(var6), this.__af_361(var6));
+            var6.field574 = var1;
+            var6.patch = var8;
+            var6.rawSound = var9;
+            var6.field575 = var8.field571[var2];
+            var6.field576 = var8.field572[var2];
+            var6.field577 = var2;
+            var6.field578 = var3 * var3 * var8.field569[var2] * var8.field567 + 1024 >> 11;
+            var6.field579 = var8.field570[var2] & 255;
+            var6.field580 = (var2 << 8) - (var8.field568[var2] & 32767);
+            var6.field583 = 0;
+            var6.field584 = 0;
+            var6.field585 = 0;
+            var6.field586 = -1;
+            var6.field587 = 0;
+            if (this.field509[var1] == 0) {
+               var6.stream = RawPcmStream.method2524(var9, this.method191(var6), this.method192(var6), this.method193(var6));
             } else {
-               var6.stream = RawPcmStream.method2524(var8, this.__aa_359(var6), 0, this.__af_361(var6));
-               this.__h_346(var6, var9.__q[var2] < 0);
+               var6.stream = RawPcmStream.method2524(var9, this.method191(var6), 0, this.method193(var6));
+               this.method178(var6, var8.field568[var2] < 0);
             }
 
-            if(var9.__q[var2] < 0) {
+            if (var8.field568[var2] < 0) {
                var6.stream.setNumLoops(-1);
             }
 
-            if(var6.__o >= 0) {
-               MusicPatchNode var7 = this.__ag[var1][var6.__o];
-               if(var7 != null && var7.__a < 0) {
-                  this.__v[var1][var7.__u] = null;
-                  var7.__a = 0;
+            if (var6.field576 >= 0) {
+               MusicPatchNode var7 = this.field513[var1][var6.field576];
+               if (var7 != null && var7.field586 < 0) {
+                  this.field512[var1][var7.field577] = null;
+                  var7.field586 = 0;
                }
 
-               this.__ag[var1][var6.__o] = var6;
+               this.field513[var1][var6.field576] = var6;
             }
 
             this.patchStream.queue.addFirst(var6);
-            this.__v[var1][var2] = var6;
+            this.field512[var1][var2] = var6;
          }
       }
+
    }
 
    @ObfuscatedName("h")
@@ -433,22 +436,22 @@ public class MidiPcmStream extends PcmStream {
       signature = "(Lha;ZI)V",
       garbageValue = "-1455849160"
    )
-   void __h_346(MusicPatchNode var1, boolean var2) {
+   void method178(MusicPatchNode var1, boolean var2) {
       int var3 = var1.rawSound.samples.length;
       int var4;
-      if(var2 && var1.rawSound.__o) {
+      if (var2 && var1.rawSound.field756) {
          int var5 = var3 + var3 - var1.rawSound.start;
-         var4 = (int)((long)var5 * (long)this.__c[var1.__m] >> 6);
+         var4 = (int)((long)var5 * (long)this.field509[var1.field574] >> 6);
          var3 <<= 8;
-         if(var4 >= var3) {
+         if (var4 >= var3) {
             var4 = var3 + var3 - 1 - var4;
-            var1.stream.__h_188();
+            var1.stream.method271();
          }
       } else {
-         var4 = (int)((long)this.__c[var1.__m] * (long)var3 >> 6);
+         var4 = (int)((long)this.field509[var1.field574] * (long)var3 >> 6);
       }
 
-      var1.stream.__y_187(var4);
+      var1.stream.method270(var4);
    }
 
    @ObfuscatedName("b")
@@ -456,22 +459,22 @@ public class MidiPcmStream extends PcmStream {
       signature = "(IIII)V",
       garbageValue = "-1244653525"
    )
-   void __b_347(int var1, int var2, int var3) {
-      MusicPatchNode var4 = this.__v[var1][var2];
-      if(var4 != null) {
-         this.__v[var1][var2] = null;
-         if((this.__y[var1] & 2) != 0) {
-            for(MusicPatchNode var5 = (MusicPatchNode)this.patchStream.queue.last(); var5 != null; var5 = (MusicPatchNode)this.patchStream.queue.previous()) {
-               if(var5.__m == var4.__m && var5.__a < 0 && var5 != var4) {
-                  var4.__a = 0;
+   void method179(int var1, int var2, int var3) {
+      MusicPatchNode var4 = this.field512[var1][var2];
+      if (var4 != null) {
+         this.field512[var1][var2] = null;
+         if ((this.field506[var1] & 2) != 0) {
+            for (MusicPatchNode var5 = (MusicPatchNode)this.patchStream.queue.last(); var5 != null; var5 = (MusicPatchNode)this.patchStream.queue.previous()) {
+               if (var5.field574 == var4.field574 && var5.field586 < 0 && var5 != var4) {
+                  var4.field586 = 0;
                   break;
                }
             }
          } else {
-            var4.__a = 0;
+            var4.field586 = 0;
          }
-
       }
+
    }
 
    @ObfuscatedName("c")
@@ -479,7 +482,7 @@ public class MidiPcmStream extends PcmStream {
       signature = "(IIII)V",
       garbageValue = "1055105177"
    )
-   void __c_348(int var1, int var2, int var3) {
+   void method180(int var1, int var2, int var3) {
    }
 
    @ObfuscatedName("p")
@@ -487,7 +490,7 @@ public class MidiPcmStream extends PcmStream {
       signature = "(IIB)V",
       garbageValue = "-43"
    )
-   void __p_349(int var1, int var2) {
+   void method181(int var1, int var2) {
    }
 
    @ObfuscatedName("v")
@@ -495,8 +498,8 @@ public class MidiPcmStream extends PcmStream {
       signature = "(IIB)V",
       garbageValue = "-1"
    )
-   void __v_350(int var1, int var2) {
-      this.__d[var1] = var2;
+   void method182(int var1, int var2) {
+      this.field503[var1] = var2;
    }
 
    @ObfuscatedName("ah")
@@ -504,20 +507,20 @@ public class MidiPcmStream extends PcmStream {
       signature = "(II)V",
       garbageValue = "137929054"
    )
-   void __ah_351(int var1) {
-      for(MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) {
-         if(var1 < 0 || var2.__m == var1) {
-            if(var2.stream != null) {
-               var2.stream.__v_192(class309.PcmPlayer_sampleRate / 100);
-               if(var2.stream.__at_196()) {
+   void method183(int var1) {
+      for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) {
+         if (var1 < 0 || var2.field574 == var1) {
+            if (var2.stream != null) {
+               var2.stream.method275(class309.PcmPlayer_sampleRate / 100);
+               if (var2.stream.method279()) {
                   this.patchStream.mixer.addSubStream(var2.stream);
                }
 
-               var2.__m_370();
+               var2.method219();
             }
 
-            if(var2.__a < 0) {
-               this.__v[var2.__m][var2.__u] = null;
+            if (var2.field586 < 0) {
+               this.field512[var2.field574][var2.field577] = null;
             }
 
             var2.remove();
@@ -531,27 +534,27 @@ public class MidiPcmStream extends PcmStream {
       signature = "(II)V",
       garbageValue = "-59494316"
    )
-   void __ab_352(int var1) {
-      if(var1 >= 0) {
-         this.__o[var1] = 12800;
-         this.__u[var1] = 8192;
-         this.__g[var1] = 16383;
-         this.__d[var1] = 8192;
-         this.__k[var1] = 0;
-         this.__n[var1] = 8192;
-         this.__ad_355(var1);
-         this.__ap_356(var1);
-         this.__y[var1] = 0;
-         this.__h[var1] = 32767;
-         this.__b[var1] = 256;
-         this.__c[var1] = 0;
-         this.__ao_358(var1, 8192);
+   void method184(int var1) {
+      if (var1 >= 0) {
+         this.field497[var1] = 12800;
+         this.field498[var1] = 8192;
+         this.field499[var1] = 16383;
+         this.field503[var1] = 8192;
+         this.field504[var1] = 0;
+         this.field505[var1] = 8192;
+         this.method187(var1);
+         this.method188(var1);
+         this.field506[var1] = 0;
+         this.field507[var1] = 32767;
+         this.field508[var1] = 256;
+         this.field509[var1] = 0;
+         this.method190(var1, 8192);
       } else {
-         for(var1 = 0; var1 < 16; ++var1) {
-            this.__ab_352(var1);
+         for (var1 = 0; var1 < 16; ++var1) {
+            this.method184(var1);
          }
-
       }
+
    }
 
    @ObfuscatedName("ae")
@@ -559,11 +562,11 @@ public class MidiPcmStream extends PcmStream {
       signature = "(II)V",
       garbageValue = "1458917637"
    )
-   void __ae_353(int var1) {
-      for(MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) {
-         if((var1 < 0 || var2.__m == var1) && var2.__a < 0) {
-            this.__v[var2.__m][var2.__u] = null;
-            var2.__a = 0;
+   void method185(int var1) {
+      for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) {
+         if ((var1 < 0 || var2.field574 == var1) && var2.field586 < 0) {
+            this.field512[var2.field574][var2.field577] = null;
+            var2.field586 = 0;
          }
       }
 
@@ -574,17 +577,17 @@ public class MidiPcmStream extends PcmStream {
       signature = "(I)V",
       garbageValue = "808372536"
    )
-   void __at_354() {
-      this.__ah_351(-1);
-      this.__ab_352(-1);
+   void method186() {
+      this.method183(-1);
+      this.method184(-1);
 
       int var1;
-      for(var1 = 0; var1 < 16; ++var1) {
-         this.__e[var1] = this.__l[var1];
+      for (var1 = 0; var1 < 16; ++var1) {
+         this.field501[var1] = this.field500[var1];
       }
 
-      for(var1 = 0; var1 < 16; ++var1) {
-         this.__x[var1] = this.__l[var1] & -128;
+      for (var1 = 0; var1 < 16; ++var1) {
+         this.field502[var1] = this.field500[var1] & -128;
       }
 
    }
@@ -594,11 +597,11 @@ public class MidiPcmStream extends PcmStream {
       signature = "(II)V",
       garbageValue = "-1934460661"
    )
-   void __ad_355(int var1) {
-      if((this.__y[var1] & 2) != 0) {
-         for(MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) {
-            if(var2.__m == var1 && this.__v[var1][var2.__u] == null && var2.__a < 0) {
-               var2.__a = 0;
+   void method187(int var1) {
+      if ((this.field506[var1] & 2) != 0) {
+         for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) {
+            if (var2.field574 == var1 && this.field512[var1][var2.field577] == null && var2.field586 < 0) {
+               var2.field586 = 0;
             }
          }
       }
@@ -610,11 +613,11 @@ public class MidiPcmStream extends PcmStream {
       signature = "(II)V",
       garbageValue = "-1305073262"
    )
-   void __ap_356(int var1) {
-      if((this.__y[var1] & 4) != 0) {
-         for(MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) {
-            if(var2.__m == var1) {
-               var2.__b = 0;
+   void method188(int var1) {
+      if ((this.field506[var1] & 4) != 0) {
+         for (MusicPatchNode var2 = (MusicPatchNode)this.patchStream.queue.last(); var2 != null; var2 = (MusicPatchNode)this.patchStream.queue.previous()) {
+            if (var2.field574 == var1) {
+               var2.field591 = 0;
             }
          }
       }
@@ -626,186 +629,192 @@ public class MidiPcmStream extends PcmStream {
       signature = "(II)V",
       garbageValue = "1168111396"
    )
-   void __au_357(int var1) {
+   void method189(int var1) {
       int var2 = var1 & 240;
       int var3;
       int var4;
       int var5;
-      if(var2 == 128) {
+      if (var2 == 128) {
          var3 = var1 & 15;
          var4 = var1 >> 8 & 127;
          var5 = var1 >> 16 & 127;
-         this.__b_347(var3, var4, var5);
-      } else if(var2 == 144) {
+         this.method179(var3, var4, var5);
+      } else if (var2 == 144) {
          var3 = var1 & 15;
          var4 = var1 >> 8 & 127;
          var5 = var1 >> 16 & 127;
-         if(var5 > 0) {
-            this.__y_345(var3, var4, var5);
+         if (var5 > 0) {
+            this.method177(var3, var4, var5);
          } else {
-            this.__b_347(var3, var4, 64);
+            this.method179(var3, var4, 64);
          }
-
-      } else if(var2 == 160) {
+      } else if (var2 == 160) {
          var3 = var1 & 15;
          var4 = var1 >> 8 & 127;
          var5 = var1 >> 16 & 127;
-         this.__c_348(var3, var4, var5);
-      } else if(var2 == 176) {
+         this.method180(var3, var4, var5);
+      } else if (var2 == 176) {
          var3 = var1 & 15;
          var4 = var1 >> 8 & 127;
          var5 = var1 >> 16 & 127;
-         if(var4 == 0) {
-            this.__x[var3] = (var5 << 14) + (this.__x[var3] & -2080769);
+         if (var4 == 0) {
+            this.field502[var3] = (var5 << 14) + (this.field502[var3] & -2080769);
          }
 
-         if(var4 == 32) {
-            this.__x[var3] = (var5 << 7) + (this.__x[var3] & -16257);
+         if (var4 == 32) {
+            this.field502[var3] = (var5 << 7) + (this.field502[var3] & -16257);
          }
 
-         if(var4 == 1) {
-            this.__k[var3] = (var5 << 7) + (this.__k[var3] & -16257);
+         if (var4 == 1) {
+            this.field504[var3] = (var5 << 7) + (this.field504[var3] & -16257);
          }
 
-         if(var4 == 33) {
-            this.__k[var3] = var5 + (this.__k[var3] & -128);
+         if (var4 == 33) {
+            this.field504[var3] = var5 + (this.field504[var3] & -128);
          }
 
-         if(var4 == 5) {
-            this.__n[var3] = (var5 << 7) + (this.__n[var3] & -16257);
+         if (var4 == 5) {
+            this.field505[var3] = (var5 << 7) + (this.field505[var3] & -16257);
          }
 
-         if(var4 == 37) {
-            this.__n[var3] = var5 + (this.__n[var3] & -128);
+         if (var4 == 37) {
+            this.field505[var3] = var5 + (this.field505[var3] & -128);
          }
 
-         if(var4 == 7) {
-            this.__o[var3] = (var5 << 7) + (this.__o[var3] & -16257);
+         if (var4 == 7) {
+            this.field497[var3] = (var5 << 7) + (this.field497[var3] & -16257);
          }
 
-         if(var4 == 39) {
-            this.__o[var3] = var5 + (this.__o[var3] & -128);
+         if (var4 == 39) {
+            this.field497[var3] = var5 + (this.field497[var3] & -128);
          }
 
-         if(var4 == 10) {
-            this.__u[var3] = (var5 << 7) + (this.__u[var3] & -16257);
+         if (var4 == 10) {
+            this.field498[var3] = (var5 << 7) + (this.field498[var3] & -16257);
          }
 
-         if(var4 == 42) {
-            this.__u[var3] = var5 + (this.__u[var3] & -128);
+         if (var4 == 42) {
+            this.field498[var3] = var5 + (this.field498[var3] & -128);
          }
 
-         if(var4 == 11) {
-            this.__g[var3] = (var5 << 7) + (this.__g[var3] & -16257);
+         if (var4 == 11) {
+            this.field499[var3] = (var5 << 7) + (this.field499[var3] & -16257);
          }
 
-         if(var4 == 43) {
-            this.__g[var3] = var5 + (this.__g[var3] & -128);
+         if (var4 == 43) {
+            this.field499[var3] = var5 + (this.field499[var3] & -128);
          }
 
-         if(var4 == 64) {
-            if(var5 >= 64) {
-               this.__y[var3] |= 1;
+         int[] var6;
+         if (var4 == 64) {
+            if (var5 >= 64) {
+               var6 = this.field506;
+               var6[var3] |= 1;
             } else {
-               this.__y[var3] &= -2;
+               var6 = this.field506;
+               var6[var3] &= -2;
             }
          }
 
-         if(var4 == 65) {
-            if(var5 >= 64) {
-               this.__y[var3] |= 2;
+         if (var4 == 65) {
+            if (var5 >= 64) {
+               var6 = this.field506;
+               var6[var3] |= 2;
             } else {
-               this.__ad_355(var3);
-               this.__y[var3] &= -3;
+               this.method187(var3);
+               var6 = this.field506;
+               var6[var3] &= -3;
             }
          }
 
-         if(var4 == 99) {
-            this.__h[var3] = (var5 << 7) + (this.__h[var3] & 127);
+         if (var4 == 99) {
+            this.field507[var3] = (var5 << 7) + (this.field507[var3] & 127);
          }
 
-         if(var4 == 98) {
-            this.__h[var3] = (this.__h[var3] & 16256) + var5;
+         if (var4 == 98) {
+            this.field507[var3] = (this.field507[var3] & 16256) + var5;
          }
 
-         if(var4 == 101) {
-            this.__h[var3] = (var5 << 7) + (this.__h[var3] & 127) + 16384;
+         if (var4 == 101) {
+            this.field507[var3] = (var5 << 7) + (this.field507[var3] & 127) + 16384;
          }
 
-         if(var4 == 100) {
-            this.__h[var3] = (this.__h[var3] & 16256) + var5 + 16384;
+         if (var4 == 100) {
+            this.field507[var3] = (this.field507[var3] & 16256) + var5 + 16384;
          }
 
-         if(var4 == 120) {
-            this.__ah_351(var3);
+         if (var4 == 120) {
+            this.method183(var3);
          }
 
-         if(var4 == 121) {
-            this.__ab_352(var3);
+         if (var4 == 121) {
+            this.method184(var3);
          }
 
-         if(var4 == 123) {
-            this.__ae_353(var3);
+         if (var4 == 123) {
+            this.method185(var3);
          }
 
-         int var6;
-         if(var4 == 6) {
-            var6 = this.__h[var3];
-            if(var6 == 16384) {
-               this.__b[var3] = (var5 << 7) + (this.__b[var3] & -16257);
+         int var7;
+         if (var4 == 6) {
+            var7 = this.field507[var3];
+            if (var7 == 16384) {
+               this.field508[var3] = (var5 << 7) + (this.field508[var3] & -16257);
             }
          }
 
-         if(var4 == 38) {
-            var6 = this.__h[var3];
-            if(var6 == 16384) {
-               this.__b[var3] = var5 + (this.__b[var3] & -128);
+         if (var4 == 38) {
+            var7 = this.field507[var3];
+            if (var7 == 16384) {
+               this.field508[var3] = var5 + (this.field508[var3] & -128);
             }
          }
 
-         if(var4 == 16) {
-            this.__c[var3] = (var5 << 7) + (this.__c[var3] & -16257);
+         if (var4 == 16) {
+            this.field509[var3] = (var5 << 7) + (this.field509[var3] & -16257);
          }
 
-         if(var4 == 48) {
-            this.__c[var3] = var5 + (this.__c[var3] & -128);
+         if (var4 == 48) {
+            this.field509[var3] = var5 + (this.field509[var3] & -128);
          }
 
-         if(var4 == 81) {
-            if(var5 >= 64) {
-               this.__y[var3] |= 4;
+         if (var4 == 81) {
+            if (var5 >= 64) {
+               var6 = this.field506;
+               var6[var3] |= 4;
             } else {
-               this.__ap_356(var3);
-               this.__y[var3] &= -5;
+               this.method188(var3);
+               var6 = this.field506;
+               var6[var3] &= -5;
             }
          }
 
-         if(var4 == 17) {
-            this.__ao_358(var3, (var5 << 7) + (this.__r[var3] & -16257));
+         if (var4 == 17) {
+            this.method190(var3, (var5 << 7) + (this.field510[var3] & -16257));
          }
 
-         if(var4 == 49) {
-            this.__ao_358(var3, var5 + (this.__r[var3] & -128));
+         if (var4 == 49) {
+            this.method190(var3, var5 + (this.field510[var3] & -128));
          }
-
-      } else if(var2 == 192) {
+      } else if (var2 == 192) {
          var3 = var1 & 15;
          var4 = var1 >> 8 & 127;
-         this.__t_344(var3, var4 + this.__x[var3]);
-      } else if(var2 == 208) {
+         this.method176(var3, var4 + this.field502[var3]);
+      } else if (var2 == 208) {
          var3 = var1 & 15;
          var4 = var1 >> 8 & 127;
-         this.__p_349(var3, var4);
-      } else if(var2 == 224) {
+         this.method181(var3, var4);
+      } else if (var2 == 224) {
          var3 = var1 & 15;
          var4 = (var1 >> 8 & 127) + (var1 >> 9 & 16256);
-         this.__v_350(var3, var4);
+         this.method182(var3, var4);
       } else {
          var2 = var1 & 255;
-         if(var2 == 255) {
-            this.__at_354();
+         if (var2 == 255) {
+            this.method186();
          }
       }
+
    }
 
    @ObfuscatedName("ao")
@@ -813,9 +822,9 @@ public class MidiPcmStream extends PcmStream {
       signature = "(III)V",
       garbageValue = "1380282032"
    )
-   void __ao_358(int var1, int var2) {
-      this.__r[var1] = var2;
-      this.__p[var1] = (int)(2097152.0D * Math.pow(2.0D, 5.4931640625E-4D * (double)var2) + 0.5D);
+   void method190(int var1, int var2) {
+      this.field510[var1] = var2;
+      this.field511[var1] = (int)(2097152.0D * Math.pow(2.0D, 5.4931640625E-4D * (double)var2) + 0.5D);
    }
 
    @ObfuscatedName("aa")
@@ -823,25 +832,25 @@ public class MidiPcmStream extends PcmStream {
       signature = "(Lha;I)I",
       garbageValue = "-1821299983"
    )
-   int __aa_359(MusicPatchNode var1) {
-      int var2 = (var1.__d * var1.__x >> 12) + var1.__e;
-      var2 += (this.__d[var1.__m] - 8192) * this.__b[var1.__m] >> 12;
-      MusicPatchNode2 var3 = var1.__w;
+   int method191(MusicPatchNode var1) {
+      int var2 = (var1.field582 * var1.field581 >> 12) + var1.field580;
+      var2 += (this.field503[var1.field574] - 8192) * this.field508[var1.field574] >> 12;
+      MusicPatchNode2 var3 = var1.field575;
       int var4;
-      if(var3.__l > 0 && (var3.__g > 0 || this.__k[var1.__m] > 0)) {
-         var4 = var3.__g << 2;
-         int var5 = var3.__e << 1;
-         if(var1.__j < var5) {
-            var4 = var4 * var1.__j / var5;
+      if (var3.field600 > 0 && (var3.field599 > 0 || this.field504[var1.field574] > 0)) {
+         var4 = var3.field599 << 2;
+         int var5 = var3.field601 << 1;
+         if (var1.field588 < var5) {
+            var4 = var4 * var1.field588 / var5;
          }
 
-         var4 += this.__k[var1.__m] >> 7;
-         double var6 = Math.sin((double)(var1.__s & 511) * 0.01227184630308513D);
+         var4 += this.field504[var1.field574] >> 7;
+         double var6 = Math.sin((double)(var1.field589 & 511) * 0.01227184630308513D);
          var2 += (int)(var6 * (double)var4);
       }
 
       var4 = (int)((double)(var1.rawSound.sampleRate * 256) * Math.pow(2.0D, (double)var2 * 3.255208333333333E-4D) / (double)class309.PcmPlayer_sampleRate + 0.5D);
-      return var4 < 1?1:var4;
+      return var4 < 1 ? 1 : var4;
    }
 
    @ObfuscatedName("ax")
@@ -849,39 +858,39 @@ public class MidiPcmStream extends PcmStream {
       signature = "(Lha;I)I",
       garbageValue = "24812899"
    )
-   int __ax_360(MusicPatchNode var1) {
-      MusicPatchNode2 var2 = var1.__w;
-      int var3 = this.__o[var1.__m] * this.__g[var1.__m] + 4096 >> 13;
+   int method192(MusicPatchNode var1) {
+      MusicPatchNode2 var2 = var1.field575;
+      int var3 = this.field497[var1.field574] * this.field499[var1.field574] + 4096 >> 13;
       var3 = var3 * var3 + 16384 >> 15;
-      var3 = var3 * var1.__g + 16384 >> 15;
-      var3 = var3 * this.__f + 128 >> 8;
-      if(var2.__q > 0) {
-         var3 = (int)((double)var3 * Math.pow(0.5D, (double)var2.__q * (double)var1.__k * 1.953125E-5D) + 0.5D);
+      var3 = var3 * var1.field578 + 16384 >> 15;
+      var3 = var3 * this.field495 + 128 >> 8;
+      if (var2.field595 > 0) {
+         var3 = (int)((double)var3 * Math.pow(0.5D, (double)var2.field595 * (double)var1.field583 * 1.953125E-5D) + 0.5D);
       }
 
       int var4;
       int var5;
       int var6;
       int var7;
-      if(var2.__m != null) {
-         var4 = var1.__n;
-         var5 = var2.__m[var1.__i + 1];
-         if(var1.__i < var2.__m.length - 2) {
-            var6 = (var2.__m[var1.__i] & 255) << 8;
-            var7 = (var2.__m[var1.__i + 2] & 255) << 8;
-            var5 += (var2.__m[var1.__i + 3] - var5) * (var4 - var6) / (var7 - var6);
+      if (var2.field593 != null) {
+         var4 = var1.field584;
+         var5 = var2.field593[var1.field585 + 1];
+         if (var1.field585 < var2.field593.length - 2) {
+            var6 = (var2.field593[var1.field585] & 255) << 8;
+            var7 = (var2.field593[var1.field585 + 2] & 255) << 8;
+            var5 += (var2.field593[var1.field585 + 3] - var5) * (var4 - var6) / (var7 - var6);
          }
 
          var3 = var5 * var3 + 32 >> 6;
       }
 
-      if(var1.__a > 0 && var2.__f != null) {
-         var4 = var1.__a;
-         var5 = var2.__f[var1.__z + 1];
-         if(var1.__z < var2.__f.length - 2) {
-            var6 = (var2.__f[var1.__z] & 255) << 8;
-            var7 = (var2.__f[var1.__z + 2] & 255) << 8;
-            var5 += (var4 - var6) * (var2.__f[var1.__z + 3] - var5) / (var7 - var6);
+      if (var1.field586 > 0 && var2.field594 != null) {
+         var4 = var1.field586;
+         var5 = var2.field594[var1.field587 + 1];
+         if (var1.field587 < var2.field594.length - 2) {
+            var6 = (var2.field594[var1.field587] & 255) << 8;
+            var7 = (var2.field594[var1.field587 + 2] & 255) << 8;
+            var5 += (var4 - var6) * (var2.field594[var1.field587 + 3] - var5) / (var7 - var6);
          }
 
          var3 = var3 * var5 + 32 >> 6;
@@ -895,9 +904,9 @@ public class MidiPcmStream extends PcmStream {
       signature = "(Lha;I)I",
       garbageValue = "360643400"
    )
-   int __af_361(MusicPatchNode var1) {
-      int var2 = this.__u[var1.__m];
-      return var2 < 8192?var2 * var1.__l + 32 >> 6:16384 - ((128 - var1.__l) * (16384 - var2) + 32 >> 6);
+   int method193(MusicPatchNode var1) {
+      int var2 = this.field498[var1.field574];
+      return var2 < 8192 ? var2 * var1.field579 + 32 >> 6 : 16384 - ((128 - var1.field579) * (16384 - var2) + 32 >> 6);
    }
 
    @ObfuscatedName("ai")
@@ -905,21 +914,21 @@ public class MidiPcmStream extends PcmStream {
       signature = "(B)V",
       garbageValue = "30"
    )
-   void __ai_367() {
+   void method194() {
       int var1 = this.track;
       int var2 = this.trackLength;
 
       long var3;
-      for(var3 = this.__ay; var2 == this.trackLength; var3 = this.midiFile.__a_372(var2)) {
-         while(var2 == this.midiFile.trackLengths[var1]) {
+      for (var3 = this.field516; var2 == this.trackLength; var3 = this.midiFile.method168(var2)) {
+         while (var2 == this.midiFile.trackLengths[var1]) {
             this.midiFile.gotoTrack(var1);
             int var5 = this.midiFile.readMessage(var1);
-            if(var5 == 1) {
+            if (var5 == 1) {
                this.midiFile.setTrackDone();
                this.midiFile.markTrackPosition(var1);
-               if(this.midiFile.isDone()) {
-                  if(!this.__aj || var2 == 0) {
-                     this.__at_354();
+               if (this.midiFile.isDone()) {
+                  if (!this.field514 || var2 == 0) {
+                     this.method186();
                      this.midiFile.clear();
                      return;
                   }
@@ -929,8 +938,8 @@ public class MidiPcmStream extends PcmStream {
                break;
             }
 
-            if((var5 & 128) != 0) {
-               this.__au_357(var5);
+            if ((var5 & 128) != 0) {
+               this.method189(var5);
             }
 
             this.midiFile.readTrackLength(var1);
@@ -943,7 +952,7 @@ public class MidiPcmStream extends PcmStream {
 
       this.track = var1;
       this.trackLength = var2;
-      this.__ay = var3;
+      this.field516 = var3;
    }
 
    @ObfuscatedName("ba")
@@ -951,12 +960,12 @@ public class MidiPcmStream extends PcmStream {
       signature = "(Lha;I)Z",
       garbageValue = "1820762013"
    )
-   boolean __ba_368(MusicPatchNode var1) {
-      if(var1.stream == null) {
-         if(var1.__a >= 0) {
+   boolean method195(MusicPatchNode var1) {
+      if (var1.stream == null) {
+         if (var1.field586 >= 0) {
             var1.remove();
-            if(var1.__o > 0 && var1 == this.__ag[var1.__m][var1.__o]) {
-               this.__ag[var1.__m][var1.__o] = null;
+            if (var1.field576 > 0 && var1 == this.field513[var1.field574][var1.field576]) {
+               this.field513[var1.field574][var1.field576] = null;
             }
          }
 
@@ -971,95 +980,95 @@ public class MidiPcmStream extends PcmStream {
       signature = "(Lha;[IIII)Z",
       garbageValue = "-1605961549"
    )
-   boolean __bb_369(MusicPatchNode var1, int[] var2, int var3, int var4) {
-      var1.__y = class309.PcmPlayer_sampleRate / 100;
-      if(var1.__a < 0 || var1.stream != null && !var1.stream.__ae_195()) {
-         int var5 = var1.__d;
-         if(var5 > 0) {
-            var5 -= (int)(16.0D * Math.pow(2.0D, (double)this.__n[var1.__m] * 4.921259842519685E-4D) + 0.5D);
-            if(var5 < 0) {
+   boolean method196(MusicPatchNode var1, int[] var2, int var3, int var4) {
+      var1.field590 = class309.PcmPlayer_sampleRate / 100;
+      if (var1.field586 < 0 || var1.stream != null && !var1.stream.method278()) {
+         int var5 = var1.field582;
+         if (var5 > 0) {
+            var5 -= (int)(16.0D * Math.pow(2.0D, (double)this.field505[var1.field574] * 4.921259842519685E-4D) + 0.5D);
+            if (var5 < 0) {
                var5 = 0;
             }
 
-            var1.__d = var5;
+            var1.field582 = var5;
          }
 
-         var1.stream.__ah_193(this.__aa_359(var1));
-         MusicPatchNode2 var6 = var1.__w;
+         var1.stream.method276(this.method191(var1));
+         MusicPatchNode2 var6 = var1.field575;
          boolean var7 = false;
-         ++var1.__j;
-         var1.__s += var6.__l;
-         double var8 = 5.086263020833333E-6D * (double)((var1.__u - 60 << 8) + (var1.__x * var1.__d >> 12));
-         if(var6.__q > 0) {
-            if(var6.__u > 0) {
-               var1.__k += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.__u) + 0.5D);
+         ++var1.field588;
+         var1.field589 += var6.field600;
+         double var8 = 5.086263020833333E-6D * (double)((var1.field577 - 60 << 8) + (var1.field581 * var1.field582 >> 12));
+         if (var6.field595 > 0) {
+            if (var6.field598 > 0) {
+               var1.field583 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field598) + 0.5D);
             } else {
-               var1.__k += 128;
+               var1.field583 += 128;
             }
          }
 
-         if(var6.__m != null) {
-            if(var6.__w > 0) {
-               var1.__n += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.__w) + 0.5D);
+         if (var6.field593 != null) {
+            if (var6.field596 > 0) {
+               var1.field584 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field596) + 0.5D);
             } else {
-               var1.__n += 128;
+               var1.field584 += 128;
             }
 
-            while(var1.__i < var6.__m.length - 2 && var1.__n > (var6.__m[var1.__i + 2] & 255) << 8) {
-               var1.__i += 2;
+            while (var1.field585 < var6.field593.length - 2 && var1.field584 > (var6.field593[var1.field585 + 2] & 255) << 8) {
+               var1.field585 += 2;
             }
 
-            if(var6.__m.length - 2 == var1.__i && var6.__m[var1.__i + 1] == 0) {
+            if (var6.field593.length - 2 == var1.field585 && var6.field593[var1.field585 + 1] == 0) {
                var7 = true;
             }
          }
 
-         if(var1.__a >= 0 && var6.__f != null && (this.__y[var1.__m] & 1) == 0 && (var1.__o < 0 || var1 != this.__ag[var1.__m][var1.__o])) {
-            if(var6.__o > 0) {
-               var1.__a += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.__o) + 0.5D);
+         if (var1.field586 >= 0 && var6.field594 != null && (this.field506[var1.field574] & 1) == 0 && (var1.field576 < 0 || var1 != this.field513[var1.field574][var1.field576])) {
+            if (var6.field597 > 0) {
+               var1.field586 += (int)(128.0D * Math.pow(2.0D, var8 * (double)var6.field597) + 0.5D);
             } else {
-               var1.__a += 128;
+               var1.field586 += 128;
             }
 
-            while(var1.__z < var6.__f.length - 2 && var1.__a > (var6.__f[var1.__z + 2] & 255) << 8) {
-               var1.__z += 2;
+            while (var1.field587 < var6.field594.length - 2 && var1.field586 > (var6.field594[var1.field587 + 2] & 255) << 8) {
+               var1.field587 += 2;
             }
 
-            if(var6.__f.length - 2 == var1.__z) {
+            if (var6.field594.length - 2 == var1.field587) {
                var7 = true;
             }
          }
 
-         if(var7) {
-            var1.stream.__v_192(var1.__y);
-            if(var2 != null) {
-               var1.stream.__e_172(var2, var3, var4);
+         if (var7) {
+            var1.stream.method275(var1.field590);
+            if (var2 != null) {
+               var1.stream.fill(var2, var3, var4);
             } else {
-               var1.stream.__d_173(var4);
+               var1.stream.skip(var4);
             }
 
-            if(var1.stream.__at_196()) {
+            if (var1.stream.method279()) {
                this.patchStream.mixer.addSubStream(var1.stream);
             }
 
-            var1.__m_370();
-            if(var1.__a >= 0) {
+            var1.method219();
+            if (var1.field586 >= 0) {
                var1.remove();
-               if(var1.__o > 0 && var1 == this.__ag[var1.__m][var1.__o]) {
-                  this.__ag[var1.__m][var1.__o] = null;
+               if (var1.field576 > 0 && var1 == this.field513[var1.field574][var1.field576]) {
+                  this.field513[var1.field574][var1.field576] = null;
                }
             }
 
             return true;
          } else {
-            var1.stream.__p_191(var1.__y, this.__ax_360(var1), this.__af_361(var1));
+            var1.stream.method274(var1.field590, this.method192(var1), this.method193(var1));
             return false;
          }
       } else {
-         var1.__m_370();
+         var1.method219();
          var1.remove();
-         if(var1.__o > 0 && var1 == this.__ag[var1.__m][var1.__o]) {
-            this.__ag[var1.__m][var1.__o] = null;
+         if (var1.field576 > 0 && var1 == this.field513[var1.field574][var1.field576]) {
+            this.field513[var1.field574][var1.field576] = null;
          }
 
          return true;
@@ -1072,13 +1081,13 @@ public class MidiPcmStream extends PcmStream {
       garbageValue = "30"
    )
    @Export("PcmStream_disable")
-   static final void PcmStream_disable(PcmStream var0) {
-      var0.active = false;
-      if(var0.sound != null) {
-         var0.sound.position = 0;
+   static final void PcmStream_disable(PcmStream stream) {
+      stream.active = false;
+      if (stream.sound != null) {
+         stream.sound.position = 0;
       }
 
-      for(PcmStream var1 = var0.firstSubStream(); var1 != null; var1 = var0.nextSubStream()) {
+      for (PcmStream var1 = stream.firstSubStream(); var1 != null; var1 = stream.nextSubStream()) {
          PcmStream_disable(var1);
       }
 
diff --git a/runescape-client/src/main/java/MilliClock.java b/runescape-client/src/main/java/MilliClock.java
index 14f7d02a67..f66a6ba026 100644
--- a/runescape-client/src/main/java/MilliClock.java
+++ b/runescape-client/src/main/java/MilliClock.java
@@ -14,42 +14,42 @@ public class MilliClock extends Clock {
    @Export("decimator")
    static Decimator decimator;
    @ObfuscatedName("m")
-   long[] __m;
+   long[] field517;
    @ObfuscatedName("f")
    @ObfuscatedGetter(
       intValue = 1940981129
    )
-   int __f;
+   int field518;
    @ObfuscatedName("q")
    @ObfuscatedGetter(
       intValue = 1217137493
    )
-   int __q;
+   int field519;
    @ObfuscatedName("w")
    @ObfuscatedGetter(
       longValue = -8372744267470318611L
    )
-   long __w;
+   long field520;
    @ObfuscatedName("o")
    @ObfuscatedGetter(
       intValue = 250272357
    )
-   int __o;
+   int field521;
    @ObfuscatedName("u")
    @ObfuscatedGetter(
       intValue = 576555527
    )
-   int __u;
+   int field522;
 
    public MilliClock() {
-      this.__m = new long[10];
-      this.__f = 256;
-      this.__q = 1;
-      this.__o = 0;
-      this.__w = class203.currentTimeMs();
+      this.field517 = new long[10];
+      this.field518 = 256;
+      this.field519 = 1;
+      this.field521 = 0;
+      this.field520 = class203.currentTimeMs();
 
-      for(int var1 = 0; var1 < 10; ++var1) {
-         this.__m[var1] = this.__w;
+      for (int var1 = 0; var1 < 10; ++var1) {
+         this.field517[var1] = this.field520;
       }
 
    }
@@ -61,8 +61,8 @@ public class MilliClock extends Clock {
    )
    @Export("mark")
    public void mark() {
-      for(int var1 = 0; var1 < 10; ++var1) {
-         this.__m[var1] = 0L;
+      for (int var1 = 0; var1 < 10; ++var1) {
+         this.field517[var1] = 0L;
       }
 
    }
@@ -73,54 +73,55 @@ public class MilliClock extends Clock {
       garbageValue = "-126803683"
    )
    @Export("wait")
-   public int wait(int var1, int var2) {
-      int var3 = this.__f;
-      int var4 = this.__q;
-      this.__f = 300;
-      this.__q = 1;
-      this.__w = class203.currentTimeMs();
-      if(0L == this.__m[this.__u]) {
-         this.__f = var3;
-         this.__q = var4;
-      } else if(this.__w > this.__m[this.__u]) {
-         this.__f = (int)((long)(var1 * 2560) / (this.__w - this.__m[this.__u]));
+   public int wait(int cycleMs, int minSleepMs) {
+      int var3 = this.field518;
+      int var4 = this.field519;
+      this.field518 = 300;
+      this.field519 = 1;
+      this.field520 = class203.currentTimeMs();
+      if (0L == this.field517[this.field522]) {
+         this.field518 = var3;
+         this.field519 = var4;
+      } else if (this.field520 > this.field517[this.field522]) {
+         this.field518 = (int)((long)(cycleMs * 2560) / (this.field520 - this.field517[this.field522]));
       }
 
-      if(this.__f < 25) {
-         this.__f = 25;
+      if (this.field518 < 25) {
+         this.field518 = 25;
       }
 
-      if(this.__f > 256) {
-         this.__f = 256;
-         this.__q = (int)((long)var1 - (this.__w - this.__m[this.__u]) / 10L);
+      if (this.field518 > 256) {
+         this.field518 = 256;
+         this.field519 = (int)((long)cycleMs - (this.field520 - this.field517[this.field522]) / 10L);
       }
 
-      if(this.__q > var1) {
-         this.__q = var1;
+      if (this.field519 > cycleMs) {
+         this.field519 = cycleMs;
       }
 
-      this.__m[this.__u] = this.__w;
-      this.__u = (this.__u + 1) % 10;
+      this.field517[this.field522] = this.field520;
+      this.field522 = (this.field522 + 1) % 10;
       int var5;
-      if(this.__q > 1) {
-         for(var5 = 0; var5 < 10; ++var5) {
-            if(this.__m[var5] != 0L) {
-               this.__m[var5] += (long)this.__q;
+      if (this.field519 > 1) {
+         for (var5 = 0; var5 < 10; ++var5) {
+            if (this.field517[var5] != 0L) {
+               long[] var6 = this.field517;
+               var6[var5] += (long)this.field519;
             }
          }
       }
 
-      if(this.__q < var2) {
-         this.__q = var2;
+      if (this.field519 < minSleepMs) {
+         this.field519 = minSleepMs;
       }
 
-      class203.method4010((long)this.__q);
+      class203.method4010((long)this.field519);
 
-      for(var5 = 0; this.__o < 256; this.__o += this.__f) {
+      for (var5 = 0; this.field521 < 256; this.field521 += this.field518) {
          ++var5;
       }
 
-      this.__o &= 255;
+      this.field521 &= 255;
       return var5;
    }
 
@@ -129,16 +130,17 @@ public class MilliClock extends Clock {
       signature = "([Lbt;II[I[II)V",
       garbageValue = "-1374398116"
    )
-   static void method3400(World[] var0, int var1, int var2, int[] var3, int[] var4) {
-      if(var1 < var2) {
-         int var5 = var1 - 1;
-         int var6 = var2 + 1;
-         int var7 = (var2 + var1) / 2;
-         World var8 = var0[var7];
-         var0[var7] = var0[var1];
-         var0[var1] = var8;
+   @Export("sortWorlds")
+   static void sortWorlds(World[] worlds, int lowestUnsorted, int highestUnsorted, int[] sortOption1, int[] sortOption2) {
+      if (lowestUnsorted < highestUnsorted) {
+         int var5 = lowestUnsorted - 1;
+         int var6 = highestUnsorted + 1;
+         int var7 = (highestUnsorted + lowestUnsorted) / 2;
+         World var8 = worlds[var7];
+         worlds[var7] = worlds[lowestUnsorted];
+         worlds[lowestUnsorted] = var8;
 
-         while(var5 < var6) {
+         while (var5 < var6) {
             boolean var9 = true;
 
             int var10;
@@ -147,36 +149,36 @@ public class MilliClock extends Clock {
             do {
                --var6;
 
-               for(var10 = 0; var10 < 4; ++var10) {
-                  if(var3[var10] == 2) {
-                     var11 = var0[var6].index;
+               for (var10 = 0; var10 < 4; ++var10) {
+                  if (sortOption1[var10] == 2) {
+                     var11 = worlds[var6].index;
                      var12 = var8.index;
-                  } else if(var3[var10] == 1) {
-                     var11 = var0[var6].population;
+                  } else if (sortOption1[var10] == 1) {
+                     var11 = worlds[var6].population;
                      var12 = var8.population;
-                     if(var11 == -1 && var4[var10] == 1) {
+                     if (var11 == -1 && sortOption2[var10] == 1) {
                         var11 = 2001;
                      }
 
-                     if(var12 == -1 && var4[var10] == 1) {
+                     if (var12 == -1 && sortOption2[var10] == 1) {
                         var12 = 2001;
                      }
-                  } else if(var3[var10] == 3) {
-                     var11 = var0[var6].isMembersOnly()?1:0;
-                     var12 = var8.isMembersOnly()?1:0;
+                  } else if (sortOption1[var10] == 3) {
+                     var11 = worlds[var6].isMembersOnly() ? 1 : 0;
+                     var12 = var8.isMembersOnly() ? 1 : 0;
                   } else {
-                     var11 = var0[var6].id;
+                     var11 = worlds[var6].id;
                      var12 = var8.id;
                   }
 
-                  if(var12 != var11) {
-                     if((var4[var10] != 1 || var11 <= var12) && (var4[var10] != 0 || var11 >= var12)) {
+                  if (var12 != var11) {
+                     if ((sortOption2[var10] != 1 || var11 <= var12) && (sortOption2[var10] != 0 || var11 >= var12)) {
                         var9 = false;
                      }
                      break;
                   }
 
-                  if(var10 == 3) {
+                  if (var10 == 3) {
                      var9 = false;
                   }
                }
@@ -187,50 +189,50 @@ public class MilliClock extends Clock {
             do {
                ++var5;
 
-               for(var10 = 0; var10 < 4; ++var10) {
-                  if(var3[var10] == 2) {
-                     var11 = var0[var5].index;
+               for (var10 = 0; var10 < 4; ++var10) {
+                  if (sortOption1[var10] == 2) {
+                     var11 = worlds[var5].index;
                      var12 = var8.index;
-                  } else if(var3[var10] == 1) {
-                     var11 = var0[var5].population;
+                  } else if (sortOption1[var10] == 1) {
+                     var11 = worlds[var5].population;
                      var12 = var8.population;
-                     if(var11 == -1 && var4[var10] == 1) {
+                     if (var11 == -1 && sortOption2[var10] == 1) {
                         var11 = 2001;
                      }
 
-                     if(var12 == -1 && var4[var10] == 1) {
+                     if (var12 == -1 && sortOption2[var10] == 1) {
                         var12 = 2001;
                      }
-                  } else if(var3[var10] == 3) {
-                     var11 = var0[var5].isMembersOnly()?1:0;
-                     var12 = var8.isMembersOnly()?1:0;
+                  } else if (sortOption1[var10] == 3) {
+                     var11 = worlds[var5].isMembersOnly() ? 1 : 0;
+                     var12 = var8.isMembersOnly() ? 1 : 0;
                   } else {
-                     var11 = var0[var5].id;
+                     var11 = worlds[var5].id;
                      var12 = var8.id;
                   }
 
-                  if(var11 != var12) {
-                     if((var4[var10] != 1 || var11 >= var12) && (var4[var10] != 0 || var11 <= var12)) {
+                  if (var11 != var12) {
+                     if ((sortOption2[var10] != 1 || var11 >= var12) && (sortOption2[var10] != 0 || var11 <= var12)) {
                         var9 = false;
                      }
                      break;
                   }
 
-                  if(var10 == 3) {
+                  if (var10 == 3) {
                      var9 = false;
                   }
                }
             } while(var9);
 
-            if(var5 < var6) {
-               World var13 = var0[var5];
-               var0[var5] = var0[var6];
-               var0[var6] = var13;
+            if (var5 < var6) {
+               World var13 = worlds[var5];
+               worlds[var5] = worlds[var6];
+               worlds[var6] = var13;
             }
          }
 
-         method3400(var0, var1, var6, var3, var4);
-         method3400(var0, var6 + 1, var2, var3, var4);
+         sortWorlds(worlds, lowestUnsorted, var6, sortOption1, sortOption2);
+         sortWorlds(worlds, var6 + 1, highestUnsorted, sortOption1, sortOption2);
       }
 
    }
diff --git a/runescape-client/src/main/java/Model.java b/runescape-client/src/main/java/Model.java
index bd90fa306f..0e010afbf3 100644
--- a/runescape-client/src/main/java/Model.java
+++ b/runescape-client/src/main/java/Model.java
@@ -25,9 +25,9 @@ public class Model extends Entity {
    @Export("Model_sharedSpotAnimationModelFaceAlphas")
    static byte[] Model_sharedSpotAnimationModelFaceAlphas;
    @ObfuscatedName("at")
-   static boolean[] __du_at;
+   static boolean[] field523;
    @ObfuscatedName("ad")
-   static boolean[] __du_ad;
+   static boolean[] field524;
    @ObfuscatedName("ap")
    @Export("modelViewportXs")
    static int[] modelViewportXs;
@@ -35,33 +35,33 @@ public class Model extends Entity {
    @Export("modelViewportYs")
    static int[] modelViewportYs;
    @ObfuscatedName("am")
-   static int[] __du_am;
+   static int[] field525;
    @ObfuscatedName("an")
-   static int[] __du_an;
+   static int[] field526;
    @ObfuscatedName("az")
-   static int[] __du_az;
+   static int[] field527;
    @ObfuscatedName("au")
-   static int[] __du_au;
+   static int[] field528;
    @ObfuscatedName("aa")
-   static int[] __du_aa;
+   static int[] field529;
    @ObfuscatedName("ax")
-   static int[][] __du_ax;
+   static int[][] field530;
    @ObfuscatedName("af")
-   static int[] __du_af;
+   static int[] field531;
    @ObfuscatedName("ai")
-   static int[][] __du_ai;
+   static int[][] field532;
    @ObfuscatedName("ba")
-   static int[] __du_ba;
+   static int[] field533;
    @ObfuscatedName("bb")
-   static int[] __du_bb;
+   static int[] field534;
    @ObfuscatedName("bs")
-   static int[] __du_bs;
+   static int[] field535;
    @ObfuscatedName("bq")
-   static int[] __du_bq;
+   static int[] field536;
    @ObfuscatedName("bn")
-   static int[] __du_bn;
+   static int[] field537;
    @ObfuscatedName("bk")
-   static int[] __du_bk;
+   static int[] field538;
    @ObfuscatedName("bd")
    @Export("Model_transformTempX")
    static int Model_transformTempX;
@@ -72,7 +72,7 @@ public class Model extends Entity {
    @Export("Model_transformTempZ")
    static int Model_transformTempZ;
    @ObfuscatedName("bx")
-   static boolean __du_bx;
+   static boolean field539;
    @ObfuscatedName("bm")
    @Export("Model_sine")
    static int[] Model_sine;
@@ -80,9 +80,9 @@ public class Model extends Entity {
    @Export("Model_cosine")
    static int[] Model_cosine;
    @ObfuscatedName("br")
-   static int[] __du_br;
+   static int[] field540;
    @ObfuscatedName("bj")
-   static int[] __du_bj;
+   static int[] field541;
    @ObfuscatedName("o")
    @Export("verticesCount")
    int verticesCount;
@@ -123,20 +123,20 @@ public class Model extends Entity {
    @Export("faceAlphas")
    byte[] faceAlphas;
    @ObfuscatedName("s")
-   byte[] __s;
+   byte[] field542;
    @ObfuscatedName("t")
    @Export("faceTextures")
    short[] faceTextures;
    @ObfuscatedName("y")
-   byte __y;
+   byte field543;
    @ObfuscatedName("h")
-   int __h;
+   int field544;
    @ObfuscatedName("b")
-   int[] __b;
+   int[] field545;
    @ObfuscatedName("c")
-   int[] __c;
+   int[] field546;
    @ObfuscatedName("r")
-   int[] __r;
+   int[] field547;
    @ObfuscatedName("p")
    @Export("vertexLabels")
    int[][] vertexLabels;
@@ -180,41 +180,11 @@ public class Model extends Entity {
    @Export("zMidOffset")
    int zMidOffset;
 
-   static {
-      Model_sharedSequenceModel = new Model();
-      Model_sharedSequenceModelFaceAlphas = new byte[1];
-      Model_sharedSpotAnimationModel = new Model();
-      Model_sharedSpotAnimationModelFaceAlphas = new byte[1];
-      __du_at = new boolean[4700];
-      __du_ad = new boolean[4700];
-      modelViewportXs = new int[4700];
-      modelViewportYs = new int[4700];
-      __du_am = new int[4700];
-      __du_an = new int[4700];
-      __du_az = new int[4700];
-      __du_au = new int[4700];
-      __du_aa = new int[1600];
-      __du_ax = new int[1600][512];
-      __du_af = new int[12];
-      __du_ai = new int[12][2000];
-      __du_ba = new int[2000];
-      __du_bb = new int[2000];
-      __du_bs = new int[12];
-      __du_bq = new int[10];
-      __du_bn = new int[10];
-      __du_bk = new int[10];
-      __du_bx = true;
-      Model_sine = Rasterizer3D.Rasterizer3D_sine;
-      Model_cosine = Rasterizer3D.Rasterizer3D_cosine;
-      __du_br = Rasterizer3D.Rasterizer3D_colorPalette;
-      __du_bj = Rasterizer3D.__et_p;
-   }
-
    Model() {
       this.verticesCount = 0;
       this.indicesCount = 0;
-      this.__y = 0;
-      this.__h = 0;
+      this.field543 = 0;
+      this.field544 = 0;
       this.isSingleTile = false;
       this.xMidOffset = -1;
       this.yMidOffset = -1;
@@ -227,8 +197,8 @@ public class Model extends Entity {
    public Model(Model[] var1, int var2) {
       this.verticesCount = 0;
       this.indicesCount = 0;
-      this.__y = 0;
-      this.__h = 0;
+      this.field543 = 0;
+      this.field544 = 0;
       this.isSingleTile = false;
       this.xMidOffset = -1;
       this.yMidOffset = -1;
@@ -239,32 +209,32 @@ public class Model extends Entity {
       boolean var6 = false;
       this.verticesCount = 0;
       this.indicesCount = 0;
-      this.__h = 0;
-      this.__y = -1;
+      this.field544 = 0;
+      this.field543 = -1;
 
       int var7;
       Model var8;
-      for(var7 = 0; var7 < var2; ++var7) {
+      for (var7 = 0; var7 < var2; ++var7) {
          var8 = var1[var7];
-         if(var8 != null) {
+         if (var8 != null) {
             this.verticesCount += var8.verticesCount;
             this.indicesCount += var8.indicesCount;
-            this.__h += var8.__h;
-            if(var8.faceRenderPriorities != null) {
+            this.field544 += var8.field544;
+            if (var8.faceRenderPriorities != null) {
                var3 = true;
             } else {
-               if(this.__y == -1) {
-                  this.__y = var8.__y;
+               if (this.field543 == -1) {
+                  this.field543 = var8.field543;
                }
 
-               if(this.__y != var8.__y) {
+               if (this.field543 != var8.field543) {
                   var3 = true;
                }
             }
 
             var4 |= var8.faceAlphas != null;
             var5 |= var8.faceTextures != null;
-            var6 |= var8.__s != null;
+            var6 |= var8.field542 != null;
          }
       }
 
@@ -277,82 +247,82 @@ public class Model extends Entity {
       this.faceColors1 = new int[this.indicesCount];
       this.faceColors2 = new int[this.indicesCount];
       this.faceColors3 = new int[this.indicesCount];
-      if(var3) {
+      if (var3) {
          this.faceRenderPriorities = new byte[this.indicesCount];
       }
 
-      if(var4) {
+      if (var4) {
          this.faceAlphas = new byte[this.indicesCount];
       }
 
-      if(var5) {
+      if (var5) {
          this.faceTextures = new short[this.indicesCount];
       }
 
-      if(var6) {
-         this.__s = new byte[this.indicesCount];
+      if (var6) {
+         this.field542 = new byte[this.indicesCount];
       }
 
-      if(this.__h > 0) {
-         this.__b = new int[this.__h];
-         this.__c = new int[this.__h];
-         this.__r = new int[this.__h];
+      if (this.field544 > 0) {
+         this.field545 = new int[this.field544];
+         this.field546 = new int[this.field544];
+         this.field547 = new int[this.field544];
       }
 
       this.verticesCount = 0;
       this.indicesCount = 0;
-      this.__h = 0;
+      this.field544 = 0;
 
-      for(var7 = 0; var7 < var2; ++var7) {
+      for (var7 = 0; var7 < var2; ++var7) {
          var8 = var1[var7];
-         if(var8 != null) {
+         if (var8 != null) {
             int var9;
-            for(var9 = 0; var9 < var8.indicesCount; ++var9) {
+            for (var9 = 0; var9 < var8.indicesCount; ++var9) {
                this.indices1[this.indicesCount] = this.verticesCount + var8.indices1[var9];
                this.indices2[this.indicesCount] = this.verticesCount + var8.indices2[var9];
                this.indices3[this.indicesCount] = this.verticesCount + var8.indices3[var9];
                this.faceColors1[this.indicesCount] = var8.faceColors1[var9];
                this.faceColors2[this.indicesCount] = var8.faceColors2[var9];
                this.faceColors3[this.indicesCount] = var8.faceColors3[var9];
-               if(var3) {
-                  if(var8.faceRenderPriorities != null) {
+               if (var3) {
+                  if (var8.faceRenderPriorities != null) {
                      this.faceRenderPriorities[this.indicesCount] = var8.faceRenderPriorities[var9];
                   } else {
-                     this.faceRenderPriorities[this.indicesCount] = var8.__y;
+                     this.faceRenderPriorities[this.indicesCount] = var8.field543;
                   }
                }
 
-               if(var4 && var8.faceAlphas != null) {
+               if (var4 && var8.faceAlphas != null) {
                   this.faceAlphas[this.indicesCount] = var8.faceAlphas[var9];
                }
 
-               if(var5) {
-                  if(var8.faceTextures != null) {
+               if (var5) {
+                  if (var8.faceTextures != null) {
                      this.faceTextures[this.indicesCount] = var8.faceTextures[var9];
                   } else {
                      this.faceTextures[this.indicesCount] = -1;
                   }
                }
 
-               if(var6) {
-                  if(var8.__s != null && var8.__s[var9] != -1) {
-                     this.__s[this.indicesCount] = (byte)(this.__h + var8.__s[var9]);
+               if (var6) {
+                  if (var8.field542 != null && var8.field542[var9] != -1) {
+                     this.field542[this.indicesCount] = (byte)(this.field544 + var8.field542[var9]);
                   } else {
-                     this.__s[this.indicesCount] = -1;
+                     this.field542[this.indicesCount] = -1;
                   }
                }
 
                ++this.indicesCount;
             }
 
-            for(var9 = 0; var9 < var8.__h; ++var9) {
-               this.__b[this.__h] = this.verticesCount + var8.__b[var9];
-               this.__c[this.__h] = this.verticesCount + var8.__c[var9];
-               this.__r[this.__h] = this.verticesCount + var8.__r[var9];
-               ++this.__h;
+            for (var9 = 0; var9 < var8.field544; ++var9) {
+               this.field545[this.field544] = this.verticesCount + var8.field545[var9];
+               this.field546[this.field544] = this.verticesCount + var8.field546[var9];
+               this.field547[this.field544] = this.verticesCount + var8.field547[var9];
+               ++this.field544;
             }
 
-            for(var9 = 0; var9 < var8.verticesCount; ++var9) {
+            for (var9 = 0; var9 < var8.verticesCount; ++var9) {
                this.verticesX[this.verticesCount] = var8.verticesX[var9];
                this.verticesY[this.verticesCount] = var8.verticesY[var9];
                this.verticesZ[this.verticesCount] = var8.verticesZ[var9];
@@ -374,20 +344,20 @@ public class Model extends Entity {
       int var8 = var2 + this.xzRadius;
       int var9 = var4 - this.xzRadius;
       int var10 = var4 + this.xzRadius;
-      if(var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) {
+      if (var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) {
          var7 >>= 7;
          var8 = var8 + 127 >> 7;
          var9 >>= 7;
          var10 = var10 + 127 >> 7;
-         if(var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) {
+         if (var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) {
             return this;
          } else {
             Model var11;
-            if(var5) {
+            if (var5) {
                var11 = new Model();
                var11.verticesCount = this.verticesCount;
                var11.indicesCount = this.indicesCount;
-               var11.__h = this.__h;
+               var11.field544 = this.field544;
                var11.verticesX = this.verticesX;
                var11.verticesZ = this.verticesZ;
                var11.indices1 = this.indices1;
@@ -398,12 +368,12 @@ public class Model extends Entity {
                var11.faceColors3 = this.faceColors3;
                var11.faceRenderPriorities = this.faceRenderPriorities;
                var11.faceAlphas = this.faceAlphas;
-               var11.__s = this.__s;
+               var11.field542 = this.field542;
                var11.faceTextures = this.faceTextures;
-               var11.__y = this.__y;
-               var11.__b = this.__b;
-               var11.__c = this.__c;
-               var11.__r = this.__r;
+               var11.field543 = this.field543;
+               var11.field545 = this.field545;
+               var11.field546 = this.field546;
+               var11.field547 = this.field547;
                var11.vertexLabels = this.vertexLabels;
                var11.faceLabelsAlpha = this.faceLabelsAlpha;
                var11.isSingleTile = this.isSingleTile;
@@ -422,8 +392,8 @@ public class Model extends Entity {
             int var19;
             int var20;
             int var21;
-            if(var6 == 0) {
-               for(var12 = 0; var12 < var11.verticesCount; ++var12) {
+            if (var6 == 0) {
+               for (var12 = 0; var12 < var11.verticesCount; ++var12) {
                   var13 = var2 + this.verticesX[var12];
                   var14 = var4 + this.verticesZ[var12];
                   var15 = var13 & 127;
@@ -436,9 +406,9 @@ public class Model extends Entity {
                   var11.verticesY[var12] = var21 + this.verticesY[var12] - var3;
                }
             } else {
-               for(var12 = 0; var12 < var11.verticesCount; ++var12) {
+               for (var12 = 0; var12 < var11.verticesCount; ++var12) {
                   var13 = (-this.verticesY[var12] << 16) / super.height;
-                  if(var13 < var6) {
+                  if (var13 < var6) {
                      var14 = var2 + this.verticesX[var12];
                      var15 = var4 + this.verticesZ[var12];
                      var16 = var14 & 127;
@@ -467,7 +437,7 @@ public class Model extends Entity {
    )
    @Export("toSharedSequenceModel")
    public Model toSharedSequenceModel(boolean var1) {
-      if(!var1 && Model_sharedSequenceModelFaceAlphas.length < this.indicesCount) {
+      if (!var1 && Model_sharedSequenceModelFaceAlphas.length < this.indicesCount) {
          Model_sharedSequenceModelFaceAlphas = new byte[this.indicesCount + 100];
       }
 
@@ -480,7 +450,7 @@ public class Model extends Entity {
    )
    @Export("toSharedSpotAnimationModel")
    public Model toSharedSpotAnimationModel(boolean var1) {
-      if(!var1 && Model_sharedSpotAnimationModelFaceAlphas.length < this.indicesCount) {
+      if (!var1 && Model_sharedSpotAnimationModelFaceAlphas.length < this.indicesCount) {
          Model_sharedSpotAnimationModelFaceAlphas = new byte[this.indicesCount + 100];
       }
 
@@ -495,30 +465,30 @@ public class Model extends Entity {
    Model buildSharedModel(boolean var1, Model var2, byte[] var3) {
       var2.verticesCount = this.verticesCount;
       var2.indicesCount = this.indicesCount;
-      var2.__h = this.__h;
-      if(var2.verticesX == null || var2.verticesX.length < this.verticesCount) {
+      var2.field544 = this.field544;
+      if (var2.verticesX == null || var2.verticesX.length < this.verticesCount) {
          var2.verticesX = new int[this.verticesCount + 100];
          var2.verticesY = new int[this.verticesCount + 100];
          var2.verticesZ = new int[this.verticesCount + 100];
       }
 
       int var4;
-      for(var4 = 0; var4 < this.verticesCount; ++var4) {
+      for (var4 = 0; var4 < this.verticesCount; ++var4) {
          var2.verticesX[var4] = this.verticesX[var4];
          var2.verticesY[var4] = this.verticesY[var4];
          var2.verticesZ[var4] = this.verticesZ[var4];
       }
 
-      if(var1) {
+      if (var1) {
          var2.faceAlphas = this.faceAlphas;
       } else {
          var2.faceAlphas = var3;
-         if(this.faceAlphas == null) {
-            for(var4 = 0; var4 < this.indicesCount; ++var4) {
+         if (this.faceAlphas == null) {
+            for (var4 = 0; var4 < this.indicesCount; ++var4) {
                var2.faceAlphas[var4] = 0;
             }
          } else {
-            for(var4 = 0; var4 < this.indicesCount; ++var4) {
+            for (var4 = 0; var4 < this.indicesCount; ++var4) {
                var2.faceAlphas[var4] = this.faceAlphas[var4];
             }
          }
@@ -531,12 +501,12 @@ public class Model extends Entity {
       var2.faceColors2 = this.faceColors2;
       var2.faceColors3 = this.faceColors3;
       var2.faceRenderPriorities = this.faceRenderPriorities;
-      var2.__s = this.__s;
+      var2.field542 = this.field542;
       var2.faceTextures = this.faceTextures;
-      var2.__y = this.__y;
-      var2.__b = this.__b;
-      var2.__c = this.__c;
-      var2.__r = this.__r;
+      var2.field543 = this.field543;
+      var2.field545 = this.field545;
+      var2.field546 = this.field546;
+      var2.field547 = this.field547;
       var2.vertexLabels = this.vertexLabels;
       var2.faceLabelsAlpha = this.faceLabelsAlpha;
       var2.isSingleTile = this.isSingleTile;
@@ -546,42 +516,42 @@ public class Model extends Entity {
 
    @ObfuscatedName("o")
    @Export("calculateBoundingBox")
-   void calculateBoundingBox(int var1) {
-      if(this.xMidOffset == -1) {
+   void calculateBoundingBox(int yaw) {
+      if (this.xMidOffset == -1) {
          int var2 = 0;
          int var3 = 0;
          int var4 = 0;
          int var5 = 0;
          int var6 = 0;
          int var7 = 0;
-         int var8 = Model_cosine[var1];
-         int var9 = Model_sine[var1];
+         int var8 = Model_cosine[yaw];
+         int var9 = Model_sine[yaw];
 
-         for(int var10 = 0; var10 < this.verticesCount; ++var10) {
+         for (int var10 = 0; var10 < this.verticesCount; ++var10) {
             int var11 = Rasterizer3D.method3039(this.verticesX[var10], this.verticesZ[var10], var8, var9);
             int var12 = this.verticesY[var10];
             int var13 = Rasterizer3D.method3004(this.verticesX[var10], this.verticesZ[var10], var8, var9);
-            if(var11 < var2) {
+            if (var11 < var2) {
                var2 = var11;
             }
 
-            if(var11 > var5) {
+            if (var11 > var5) {
                var5 = var11;
             }
 
-            if(var12 < var3) {
+            if (var12 < var3) {
                var3 = var12;
             }
 
-            if(var12 > var6) {
+            if (var12 > var6) {
                var6 = var12;
             }
 
-            if(var13 < var4) {
+            if (var13 < var4) {
                var4 = var13;
             }
 
-            if(var13 > var7) {
+            if (var13 > var7) {
                var7 = var13;
             }
          }
@@ -592,45 +562,45 @@ public class Model extends Entity {
          this.xMidOffset = (var5 - var2 + 1) / 2;
          this.yMidOffset = (var6 - var3 + 1) / 2;
          this.zMidOffset = (var7 - var4 + 1) / 2;
-         if(this.xMidOffset < 32) {
+         if (this.xMidOffset < 32) {
             this.xMidOffset = 32;
          }
 
-         if(this.zMidOffset < 32) {
+         if (this.zMidOffset < 32) {
             this.zMidOffset = 32;
          }
 
-         if(this.isSingleTile) {
+         if (this.isSingleTile) {
             this.xMidOffset += 8;
             this.zMidOffset += 8;
          }
-
       }
+
    }
 
    @ObfuscatedName("u")
    @Export("calculateBoundsCylinder")
    public void calculateBoundsCylinder() {
-      if(this.boundsType != 1) {
+      if (this.boundsType != 1) {
          this.boundsType = 1;
          super.height = 0;
          this.bottomY = 0;
          this.xzRadius = 0;
 
-         for(int var1 = 0; var1 < this.verticesCount; ++var1) {
+         for (int var1 = 0; var1 < this.verticesCount; ++var1) {
             int var2 = this.verticesX[var1];
             int var3 = this.verticesY[var1];
             int var4 = this.verticesZ[var1];
-            if(-var3 > super.height) {
+            if (-var3 > super.height) {
                super.height = -var3;
             }
 
-            if(var3 > this.bottomY) {
+            if (var3 > this.bottomY) {
                this.bottomY = var3;
             }
 
             int var5 = var2 * var2 + var4 * var4;
-            if(var5 > this.xzRadius) {
+            if (var5 > this.xzRadius) {
                this.xzRadius = var5;
             }
          }
@@ -639,20 +609,21 @@ public class Model extends Entity {
          this.radius = (int)(Math.sqrt((double)(this.xzRadius * this.xzRadius + super.height * super.height)) + 0.99D);
          this.diameter = this.radius + (int)(Math.sqrt((double)(this.xzRadius * this.xzRadius + this.bottomY * this.bottomY)) + 0.99D);
       }
+
    }
 
    @ObfuscatedName("g")
-   void __g_232() {
-      if(this.boundsType != 2) {
+   void method197() {
+      if (this.boundsType != 2) {
          this.boundsType = 2;
          this.xzRadius = 0;
 
-         for(int var1 = 0; var1 < this.verticesCount; ++var1) {
+         for (int var1 = 0; var1 < this.verticesCount; ++var1) {
             int var2 = this.verticesX[var1];
             int var3 = this.verticesY[var1];
             int var4 = this.verticesZ[var1];
             int var5 = var2 * var2 + var4 * var4 + var3 * var3;
-            if(var5 > this.xzRadius) {
+            if (var5 > this.xzRadius) {
                this.xzRadius = var5;
             }
          }
@@ -661,10 +632,11 @@ public class Model extends Entity {
          this.radius = this.xzRadius;
          this.diameter = this.xzRadius + this.xzRadius;
       }
+
    }
 
    @ObfuscatedName("l")
-   public int __l_233() {
+   public int method198() {
       this.calculateBoundsCylinder();
       return this.xzRadius;
    }
@@ -681,23 +653,22 @@ public class Model extends Entity {
       signature = "(Len;I)V"
    )
    @Export("animate")
-   public void animate(Frames var1, int var2) {
-      if(this.vertexLabels != null) {
-         if(var2 != -1) {
-            Animation var3 = var1.frames[var2];
-            Skeleton var4 = var3.skeleton;
-            Model_transformTempX = 0;
-            Model_transformTempY = 0;
-            Model_transformTempZ = 0;
+   public void animate(Frames frames, int frame) {
+      if (this.vertexLabels != null && frame != -1) {
+         Animation var3 = frames.frames[frame];
+         Skeleton var4 = var3.skeleton;
+         Model_transformTempX = 0;
+         Model_transformTempY = 0;
+         Model_transformTempZ = 0;
 
-            for(int var5 = 0; var5 < var3.transformCount; ++var5) {
-               int var6 = var3.transformSkeletonLabels[var5];
-               this.transform(var4.transformTypes[var6], var4.labels[var6], var3.transformXs[var5], var3.transformYs[var5], var3.transformZs[var5]);
-            }
-
-            this.resetBounds();
+         for (int var5 = 0; var5 < var3.transformCount; ++var5) {
+            int var6 = var3.transformSkeletonLabels[var5];
+            this.transform(var4.transformTypes[var6], var4.labels[var6], var3.transformXs[var5], var3.transformYs[var5], var3.transformZs[var5]);
          }
+
+         this.resetBounds();
       }
+
    }
 
    @ObfuscatedName("a")
@@ -706,8 +677,8 @@ public class Model extends Entity {
    )
    @Export("animate2")
    public void animate2(Frames var1, int var2, Frames var3, int var4, int[] var5) {
-      if(var2 != -1) {
-         if(var5 != null && var4 != -1) {
+      if (var2 != -1) {
+         if (var5 != null && var4 != -1) {
             Animation var6 = var1.frames[var2];
             Animation var7 = var3.frames[var4];
             Skeleton var8 = var6.skeleton;
@@ -715,18 +686,17 @@ public class Model extends Entity {
             Model_transformTempY = 0;
             Model_transformTempZ = 0;
             byte var9 = 0;
-            int var13 = var9 + 1;
-            int var10 = var5[var9];
+            int var10 = var9 + 1;
+            int var11 = var5[var9];
 
-            int var11;
             int var12;
-            for(var11 = 0; var11 < var6.transformCount; ++var11) {
-               for(var12 = var6.transformSkeletonLabels[var11]; var12 > var10; var10 = var5[var13++]) {
-                  ;
+            int var13;
+            for (var12 = 0; var12 < var6.transformCount; ++var12) {
+               for (var13 = var6.transformSkeletonLabels[var12]; var13 > var11; var11 = var5[var10++]) {
                }
 
-               if(var12 != var10 || var8.transformTypes[var12] == 0) {
-                  this.transform(var8.transformTypes[var12], var8.labels[var12], var6.transformXs[var11], var6.transformYs[var11], var6.transformZs[var11]);
+               if (var13 != var11 || var8.transformTypes[var13] == 0) {
+                  this.transform(var8.transformTypes[var13], var8.labels[var13], var6.transformXs[var12], var6.transformYs[var12], var6.transformZs[var12]);
                }
             }
 
@@ -734,16 +704,15 @@ public class Model extends Entity {
             Model_transformTempY = 0;
             Model_transformTempZ = 0;
             var9 = 0;
-            var13 = var9 + 1;
-            var10 = var5[var9];
+            var10 = var9 + 1;
+            var11 = var5[var9];
 
-            for(var11 = 0; var11 < var7.transformCount; ++var11) {
-               for(var12 = var7.transformSkeletonLabels[var11]; var12 > var10; var10 = var5[var13++]) {
-                  ;
+            for (var12 = 0; var12 < var7.transformCount; ++var12) {
+               for (var13 = var7.transformSkeletonLabels[var12]; var13 > var11; var11 = var5[var10++]) {
                }
 
-               if(var12 == var10 || var8.transformTypes[var12] == 0) {
-                  this.transform(var8.transformTypes[var12], var8.labels[var12], var7.transformXs[var11], var7.transformYs[var11], var7.transformZs[var11]);
+               if (var13 == var11 || var8.transformTypes[var13] == 0) {
+                  this.transform(var8.transformTypes[var13], var8.labels[var13], var7.transformXs[var12], var7.transformYs[var12], var7.transformZs[var12]);
                }
             }
 
@@ -752,38 +721,40 @@ public class Model extends Entity {
             this.animate(var1, var2);
          }
       }
+
    }
 
    @ObfuscatedName("z")
    @Export("transform")
-   void transform(int var1, int[] var2, int var3, int var4, int var5) {
-      int var6 = var2.length;
+   void transform(int type, int[] labels, int var3, int var4, int var5) {
+      int var6 = labels.length;
       int var7;
       int var8;
-      int var11;
-      int var12;
-      if(var1 == 0) {
+      int var9;
+      int var10;
+      int[] var12;
+      if (type == 0) {
          var7 = 0;
          Model_transformTempX = 0;
          Model_transformTempY = 0;
          Model_transformTempZ = 0;
 
-         for(var8 = 0; var8 < var6; ++var8) {
-            int var9 = var2[var8];
-            if(var9 < this.vertexLabels.length) {
-               int[] var10 = this.vertexLabels[var9];
+         for (var8 = 0; var8 < var6; ++var8) {
+            int var11 = labels[var8];
+            if (var11 < this.vertexLabels.length) {
+               var12 = this.vertexLabels[var11];
 
-               for(var11 = 0; var11 < var10.length; ++var11) {
-                  var12 = var10[var11];
-                  Model_transformTempX += this.verticesX[var12];
-                  Model_transformTempY += this.verticesY[var12];
-                  Model_transformTempZ += this.verticesZ[var12];
+               for (var9 = 0; var9 < var12.length; ++var9) {
+                  var10 = var12[var9];
+                  Model_transformTempX += this.verticesX[var10];
+                  Model_transformTempY += this.verticesY[var10];
+                  Model_transformTempZ += this.verticesZ[var10];
                   ++var7;
                }
             }
          }
 
-         if(var7 > 0) {
+         if (var7 > 0) {
             Model_transformTempX = var3 + Model_transformTempX / var7;
             Model_transformTempY = var4 + Model_transformTempY / var7;
             Model_transformTempZ = var5 + Model_transformTempZ / var7;
@@ -792,124 +763,133 @@ public class Model extends Entity {
             Model_transformTempY = var4;
             Model_transformTempZ = var5;
          }
-
       } else {
-         int[] var18;
-         int var19;
-         if(var1 == 1) {
-            for(var7 = 0; var7 < var6; ++var7) {
-               var8 = var2[var7];
-               if(var8 < this.vertexLabels.length) {
-                  var18 = this.vertexLabels[var8];
+         int var13;
+         int[] var19;
+         if (type == 1) {
+            for (var7 = 0; var7 < var6; ++var7) {
+               var8 = labels[var7];
+               if (var8 < this.vertexLabels.length) {
+                  var12 = this.vertexLabels[var8];
 
-                  for(var19 = 0; var19 < var18.length; ++var19) {
-                     var11 = var18[var19];
-                     this.verticesX[var11] += var3;
-                     this.verticesY[var11] += var4;
-                     this.verticesZ[var11] += var5;
+                  for (var13 = 0; var13 < var12.length; ++var13) {
+                     var9 = var12[var13];
+                     var19 = this.verticesX;
+                     var19[var9] += var3;
+                     var19 = this.verticesY;
+                     var19[var9] += var4;
+                     var19 = this.verticesZ;
+                     var19[var9] += var5;
                   }
                }
             }
+         } else if (type == 2) {
+            for (var7 = 0; var7 < var6; ++var7) {
+               var8 = labels[var7];
+               if (var8 < this.vertexLabels.length) {
+                  var12 = this.vertexLabels[var8];
 
-         } else if(var1 == 2) {
-            for(var7 = 0; var7 < var6; ++var7) {
-               var8 = var2[var7];
-               if(var8 < this.vertexLabels.length) {
-                  var18 = this.vertexLabels[var8];
-
-                  for(var19 = 0; var19 < var18.length; ++var19) {
-                     var11 = var18[var19];
-                     this.verticesX[var11] -= Model_transformTempX;
-                     this.verticesY[var11] -= Model_transformTempY;
-                     this.verticesZ[var11] -= Model_transformTempZ;
-                     var12 = (var3 & 255) * 8;
-                     int var13 = (var4 & 255) * 8;
-                     int var14 = (var5 & 255) * 8;
-                     int var15;
+                  for (var13 = 0; var13 < var12.length; ++var13) {
+                     var9 = var12[var13];
+                     var19 = this.verticesX;
+                     var19[var9] -= Model_transformTempX;
+                     var19 = this.verticesY;
+                     var19[var9] -= Model_transformTempY;
+                     var19 = this.verticesZ;
+                     var19[var9] -= Model_transformTempZ;
+                     var10 = (var3 & 255) * 8;
+                     int var14 = (var4 & 255) * 8;
+                     int var15 = (var5 & 255) * 8;
                      int var16;
                      int var17;
-                     if(var14 != 0) {
-                        var15 = Model_sine[var14];
-                        var16 = Model_cosine[var14];
-                        var17 = var15 * this.verticesY[var11] + var16 * this.verticesX[var11] >> 16;
-                        this.verticesY[var11] = var16 * this.verticesY[var11] - var15 * this.verticesX[var11] >> 16;
-                        this.verticesX[var11] = var17;
+                     int var18;
+                     if (var15 != 0) {
+                        var16 = Model_sine[var15];
+                        var17 = Model_cosine[var15];
+                        var18 = var16 * this.verticesY[var9] + var17 * this.verticesX[var9] >> 16;
+                        this.verticesY[var9] = var17 * this.verticesY[var9] - var16 * this.verticesX[var9] >> 16;
+                        this.verticesX[var9] = var18;
                      }
 
-                     if(var12 != 0) {
-                        var15 = Model_sine[var12];
-                        var16 = Model_cosine[var12];
-                        var17 = var16 * this.verticesY[var11] - var15 * this.verticesZ[var11] >> 16;
-                        this.verticesZ[var11] = var15 * this.verticesY[var11] + var16 * this.verticesZ[var11] >> 16;
-                        this.verticesY[var11] = var17;
+                     if (var10 != 0) {
+                        var16 = Model_sine[var10];
+                        var17 = Model_cosine[var10];
+                        var18 = var17 * this.verticesY[var9] - var16 * this.verticesZ[var9] >> 16;
+                        this.verticesZ[var9] = var16 * this.verticesY[var9] + var17 * this.verticesZ[var9] >> 16;
+                        this.verticesY[var9] = var18;
                      }
 
-                     if(var13 != 0) {
-                        var15 = Model_sine[var13];
-                        var16 = Model_cosine[var13];
-                        var17 = var15 * this.verticesZ[var11] + var16 * this.verticesX[var11] >> 16;
-                        this.verticesZ[var11] = var16 * this.verticesZ[var11] - var15 * this.verticesX[var11] >> 16;
-                        this.verticesX[var11] = var17;
+                     if (var14 != 0) {
+                        var16 = Model_sine[var14];
+                        var17 = Model_cosine[var14];
+                        var18 = var16 * this.verticesZ[var9] + var17 * this.verticesX[var9] >> 16;
+                        this.verticesZ[var9] = var17 * this.verticesZ[var9] - var16 * this.verticesX[var9] >> 16;
+                        this.verticesX[var9] = var18;
                      }
 
-                     this.verticesX[var11] += Model_transformTempX;
-                     this.verticesY[var11] += Model_transformTempY;
-                     this.verticesZ[var11] += Model_transformTempZ;
+                     var19 = this.verticesX;
+                     var19[var9] += Model_transformTempX;
+                     var19 = this.verticesY;
+                     var19[var9] += Model_transformTempY;
+                     var19 = this.verticesZ;
+                     var19[var9] += Model_transformTempZ;
                   }
                }
             }
+         } else if (type == 3) {
+            for (var7 = 0; var7 < var6; ++var7) {
+               var8 = labels[var7];
+               if (var8 < this.vertexLabels.length) {
+                  var12 = this.vertexLabels[var8];
 
-         } else if(var1 == 3) {
-            for(var7 = 0; var7 < var6; ++var7) {
-               var8 = var2[var7];
-               if(var8 < this.vertexLabels.length) {
-                  var18 = this.vertexLabels[var8];
-
-                  for(var19 = 0; var19 < var18.length; ++var19) {
-                     var11 = var18[var19];
-                     this.verticesX[var11] -= Model_transformTempX;
-                     this.verticesY[var11] -= Model_transformTempY;
-                     this.verticesZ[var11] -= Model_transformTempZ;
-                     this.verticesX[var11] = var3 * this.verticesX[var11] / 128;
-                     this.verticesY[var11] = var4 * this.verticesY[var11] / 128;
-                     this.verticesZ[var11] = var5 * this.verticesZ[var11] / 128;
-                     this.verticesX[var11] += Model_transformTempX;
-                     this.verticesY[var11] += Model_transformTempY;
-                     this.verticesZ[var11] += Model_transformTempZ;
+                  for (var13 = 0; var13 < var12.length; ++var13) {
+                     var9 = var12[var13];
+                     var19 = this.verticesX;
+                     var19[var9] -= Model_transformTempX;
+                     var19 = this.verticesY;
+                     var19[var9] -= Model_transformTempY;
+                     var19 = this.verticesZ;
+                     var19[var9] -= Model_transformTempZ;
+                     this.verticesX[var9] = var3 * this.verticesX[var9] / 128;
+                     this.verticesY[var9] = var4 * this.verticesY[var9] / 128;
+                     this.verticesZ[var9] = var5 * this.verticesZ[var9] / 128;
+                     var19 = this.verticesX;
+                     var19[var9] += Model_transformTempX;
+                     var19 = this.verticesY;
+                     var19[var9] += Model_transformTempY;
+                     var19 = this.verticesZ;
+                     var19[var9] += Model_transformTempZ;
                   }
                }
             }
+         } else if (type == 5 && this.faceLabelsAlpha != null && this.faceAlphas != null) {
+            for (var7 = 0; var7 < var6; ++var7) {
+               var8 = labels[var7];
+               if (var8 < this.faceLabelsAlpha.length) {
+                  var12 = this.faceLabelsAlpha[var8];
 
-         } else if(var1 == 5) {
-            if(this.faceLabelsAlpha != null && this.faceAlphas != null) {
-               for(var7 = 0; var7 < var6; ++var7) {
-                  var8 = var2[var7];
-                  if(var8 < this.faceLabelsAlpha.length) {
-                     var18 = this.faceLabelsAlpha[var8];
-
-                     for(var19 = 0; var19 < var18.length; ++var19) {
-                        var11 = var18[var19];
-                        var12 = (this.faceAlphas[var11] & 255) + var3 * 8;
-                        if(var12 < 0) {
-                           var12 = 0;
-                        } else if(var12 > 255) {
-                           var12 = 255;
-                        }
-
-                        this.faceAlphas[var11] = (byte)var12;
+                  for (var13 = 0; var13 < var12.length; ++var13) {
+                     var9 = var12[var13];
+                     var10 = (this.faceAlphas[var9] & 255) + var3 * 8;
+                     if (var10 < 0) {
+                        var10 = 0;
+                     } else if (var10 > 255) {
+                        var10 = 255;
                      }
+
+                     this.faceAlphas[var9] = (byte)var10;
                   }
                }
             }
-
          }
       }
+
    }
 
    @ObfuscatedName("j")
    @Export("rotateY90Ccw")
    public void rotateY90Ccw() {
-      for(int var1 = 0; var1 < this.verticesCount; ++var1) {
+      for (int var1 = 0; var1 < this.verticesCount; ++var1) {
          int var2 = this.verticesX[var1];
          this.verticesX[var1] = this.verticesZ[var1];
          this.verticesZ[var1] = -var2;
@@ -921,7 +901,7 @@ public class Model extends Entity {
    @ObfuscatedName("s")
    @Export("rotateY180")
    public void rotateY180() {
-      for(int var1 = 0; var1 < this.verticesCount; ++var1) {
+      for (int var1 = 0; var1 < this.verticesCount; ++var1) {
          this.verticesX[var1] = -this.verticesX[var1];
          this.verticesZ[var1] = -this.verticesZ[var1];
       }
@@ -932,7 +912,7 @@ public class Model extends Entity {
    @ObfuscatedName("t")
    @Export("rotateY270Ccw")
    public void rotateY270Ccw() {
-      for(int var1 = 0; var1 < this.verticesCount; ++var1) {
+      for (int var1 = 0; var1 < this.verticesCount; ++var1) {
          int var2 = this.verticesZ[var1];
          this.verticesZ[var1] = this.verticesX[var1];
          this.verticesX[var1] = -var2;
@@ -943,11 +923,11 @@ public class Model extends Entity {
 
    @ObfuscatedName("y")
    @Export("rotateZ")
-   public void rotateZ(int var1) {
-      int var2 = Model_sine[var1];
-      int var3 = Model_cosine[var1];
+   public void rotateZ(int pitch) {
+      int var2 = Model_sine[pitch];
+      int var3 = Model_cosine[pitch];
 
-      for(int var4 = 0; var4 < this.verticesCount; ++var4) {
+      for (int var4 = 0; var4 < this.verticesCount; ++var4) {
          int var5 = var3 * this.verticesY[var4] - var2 * this.verticesZ[var4] >> 16;
          this.verticesZ[var4] = var2 * this.verticesY[var4] + var3 * this.verticesZ[var4] >> 16;
          this.verticesY[var4] = var5;
@@ -958,11 +938,14 @@ public class Model extends Entity {
 
    @ObfuscatedName("h")
    @Export("offsetBy")
-   public void offsetBy(int var1, int var2, int var3) {
-      for(int var4 = 0; var4 < this.verticesCount; ++var4) {
-         this.verticesX[var4] += var1;
-         this.verticesY[var4] += var2;
-         this.verticesZ[var4] += var3;
+   public void offsetBy(int x, int y, int var3) {
+      for (int var4 = 0; var4 < this.verticesCount; ++var4) {
+         int[] var5 = this.verticesX;
+         var5[var4] += x;
+         var5 = this.verticesY;
+         var5[var4] += y;
+         var5 = this.verticesZ;
+         var5[var4] += var3;
       }
 
       this.resetBounds();
@@ -970,10 +953,10 @@ public class Model extends Entity {
 
    @ObfuscatedName("b")
    @Export("scale")
-   public void scale(int var1, int var2, int var3) {
-      for(int var4 = 0; var4 < this.verticesCount; ++var4) {
-         this.verticesX[var4] = this.verticesX[var4] * var1 / 128;
-         this.verticesY[var4] = var2 * this.verticesY[var4] / 128;
+   public void scale(int x, int y, int var3) {
+      for (int var4 = 0; var4 < this.verticesCount; ++var4) {
+         this.verticesX[var4] = this.verticesX[var4] * x / 128;
+         this.verticesY[var4] = y * this.verticesY[var4] / 128;
          this.verticesZ[var4] = var3 * this.verticesZ[var4] / 128;
       }
 
@@ -981,10 +964,10 @@ public class Model extends Entity {
    }
 
    @ObfuscatedName("c")
-   public final void __c_234(int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
-      __du_aa[0] = -1;
-      if(this.boundsType != 2 && this.boundsType != 1) {
-         this.__g_232();
+   public final void method199(int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
+      field529[0] = -1;
+      if (this.boundsType != 2 && this.boundsType != 1) {
+         this.method197();
       }
 
       int var8 = Rasterizer3D.Rasterizer3D_clipMidX;
@@ -999,24 +982,24 @@ public class Model extends Entity {
       int var17 = Model_cosine[var4];
       int var18 = var16 * var6 + var17 * var7 >> 16;
 
-      for(int var19 = 0; var19 < this.verticesCount; ++var19) {
+      for (int var19 = 0; var19 < this.verticesCount; ++var19) {
          int var20 = this.verticesX[var19];
          int var21 = this.verticesY[var19];
          int var22 = this.verticesZ[var19];
          int var23;
-         if(var3 != 0) {
+         if (var3 != 0) {
             var23 = var21 * var14 + var20 * var15 >> 16;
             var21 = var21 * var15 - var20 * var14 >> 16;
             var20 = var23;
          }
 
-         if(var1 != 0) {
+         if (var1 != 0) {
             var23 = var21 * var11 - var22 * var10 >> 16;
             var22 = var21 * var10 + var22 * var11 >> 16;
             var21 = var23;
          }
 
-         if(var2 != 0) {
+         if (var2 != 0) {
             var23 = var22 * var12 + var20 * var13 >> 16;
             var22 = var22 * var13 - var20 * var12 >> 16;
             var20 = var23;
@@ -1027,29 +1010,28 @@ public class Model extends Entity {
          var22 += var7;
          var23 = var21 * var17 - var22 * var16 >> 16;
          var22 = var21 * var16 + var22 * var17 >> 16;
-         __du_am[var19] = var22 - var18;
+         field525[var19] = var22 - var18;
          modelViewportXs[var19] = var20 * Rasterizer3D.Rasterizer3D_zoom / var22 + var8;
          modelViewportYs[var19] = var23 * Rasterizer3D.Rasterizer3D_zoom / var22 + var9;
-         if(this.__h > 0) {
-            __du_an[var19] = var20;
-            __du_az[var19] = var23;
-            __du_au[var19] = var22;
+         if (this.field544 > 0) {
+            field526[var19] = var20;
+            field527[var19] = var23;
+            field528[var19] = var22;
          }
       }
 
       try {
          this.draw0(false, false, false, 0L);
-      } catch (Exception var25) {
-         ;
+      } catch (Exception var24) {
       }
 
    }
 
    @ObfuscatedName("p")
-   public final void __p_235(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
-      __du_aa[0] = -1;
-      if(this.boundsType != 2 && this.boundsType != 1) {
-         this.__g_232();
+   public final void method200(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
+      field529[0] = -1;
+      if (this.boundsType != 2 && this.boundsType != 1) {
+         this.method197();
       }
 
       int var9 = Rasterizer3D.Rasterizer3D_clipMidX;
@@ -1064,24 +1046,24 @@ public class Model extends Entity {
       int var18 = Model_cosine[var4];
       int var19 = var17 * var6 + var18 * var7 >> 16;
 
-      for(int var20 = 0; var20 < this.verticesCount; ++var20) {
+      for (int var20 = 0; var20 < this.verticesCount; ++var20) {
          int var21 = this.verticesX[var20];
          int var22 = this.verticesY[var20];
          int var23 = this.verticesZ[var20];
          int var24;
-         if(var3 != 0) {
+         if (var3 != 0) {
             var24 = var22 * var15 + var21 * var16 >> 16;
             var22 = var22 * var16 - var21 * var15 >> 16;
             var21 = var24;
          }
 
-         if(var1 != 0) {
+         if (var1 != 0) {
             var24 = var22 * var12 - var23 * var11 >> 16;
             var23 = var22 * var11 + var23 * var12 >> 16;
             var22 = var24;
          }
 
-         if(var2 != 0) {
+         if (var2 != 0) {
             var24 = var23 * var13 + var21 * var14 >> 16;
             var23 = var23 * var14 - var21 * var13 >> 16;
             var21 = var24;
@@ -1092,20 +1074,19 @@ public class Model extends Entity {
          var23 += var7;
          var24 = var22 * var18 - var23 * var17 >> 16;
          var23 = var22 * var17 + var23 * var18 >> 16;
-         __du_am[var20] = var23 - var19;
+         field525[var20] = var23 - var19;
          modelViewportXs[var20] = var9 + var21 * Rasterizer3D.Rasterizer3D_zoom / var8;
          modelViewportYs[var20] = var10 + var24 * Rasterizer3D.Rasterizer3D_zoom / var8;
-         if(this.__h > 0) {
-            __du_an[var20] = var21;
-            __du_az[var20] = var24;
-            __du_au[var20] = var23;
+         if (this.field544 > 0) {
+            field526[var20] = var21;
+            field527[var20] = var24;
+            field528[var20] = var23;
          }
       }
 
       try {
          this.draw0(false, false, false, 0L);
-      } catch (Exception var26) {
-         ;
+      } catch (Exception var25) {
       }
 
    }
@@ -1113,283 +1094,284 @@ public class Model extends Entity {
    @ObfuscatedName("v")
    @Export("draw0")
    final void draw0(boolean var1, boolean var2, boolean var3, long var4) {
-      if(this.diameter < 1600) {
+      if (this.diameter < 1600) {
          int var6;
-         for(var6 = 0; var6 < this.diameter; ++var6) {
-            __du_aa[var6] = 0;
+         for (var6 = 0; var6 < this.diameter; ++var6) {
+            field529[var6] = 0;
          }
 
-         var6 = var3?20:5;
+         var6 = var3 ? 20 : 5;
 
          int var7;
          int var8;
+         int var9;
          int var10;
          int var11;
          int var12;
          int var13;
+         int var14;
          int var15;
          int var16;
-         int var18;
-         int var27;
-         for(var7 = 0; var7 < this.indicesCount; ++var7) {
-            if(this.faceColors3[var7] != -2) {
+         for (var7 = 0; var7 < this.indicesCount; ++var7) {
+            if (this.faceColors3[var7] != -2) {
                var8 = this.indices1[var7];
-               var27 = this.indices2[var7];
-               var10 = this.indices3[var7];
-               var11 = modelViewportXs[var8];
-               var12 = modelViewportXs[var27];
-               var13 = modelViewportXs[var10];
-               int var14;
-               if(!var1 || var11 != -5000 && var12 != -5000 && var13 != -5000) {
-                  if(var2 && NpcDefinition.method5164(modelViewportYs[var8], modelViewportYs[var27], modelViewportYs[var10], var11, var12, var13, var6)) {
-                     Projectile.method2081(var4);
+               var16 = this.indices2[var7];
+               var9 = this.indices3[var7];
+               var10 = modelViewportXs[var8];
+               var11 = modelViewportXs[var16];
+               var12 = modelViewportXs[var9];
+               int var17;
+               if (!var1 || var10 != -5000 && var11 != -5000 && var12 != -5000) {
+                  if (var2 && NPCDefinition.method5164(modelViewportYs[var8], modelViewportYs[var16], modelViewportYs[var9], var10, var11, var12, var6)) {
+                     Projectile.addEntityTagAtMouse(var4);
                      var2 = false;
                   }
 
-                  if((var11 - var12) * (modelViewportYs[var10] - modelViewportYs[var27]) - (var13 - var12) * (modelViewportYs[var8] - modelViewportYs[var27]) > 0) {
-                     __du_ad[var7] = false;
-                     if(var11 >= 0 && var12 >= 0 && var13 >= 0 && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth && var13 <= Rasterizer3D.Rasterizer3D_clipWidth) {
-                        __du_at[var7] = false;
+                  if ((var10 - var11) * (modelViewportYs[var9] - modelViewportYs[var16]) - (var12 - var11) * (modelViewportYs[var8] - modelViewportYs[var16]) > 0) {
+                     field524[var7] = false;
+                     if (var10 >= 0 && var11 >= 0 && var12 >= 0 && var10 <= Rasterizer3D.Rasterizer3D_clipWidth && var11 <= Rasterizer3D.Rasterizer3D_clipWidth && var12 <= Rasterizer3D.Rasterizer3D_clipWidth) {
+                        field523[var7] = false;
                      } else {
-                        __du_at[var7] = true;
+                        field523[var7] = true;
                      }
 
-                     var14 = (__du_am[var8] + __du_am[var27] + __du_am[var10]) / 3 + this.radius;
-                     __du_ax[var14][__du_aa[var14]++] = var7;
+                     var17 = (field525[var8] + field525[var16] + field525[var9]) / 3 + this.radius;
+                     field530[var17][field529[var17]++] = var7;
                   }
                } else {
-                  var14 = __du_an[var8];
-                  var15 = __du_an[var27];
-                  var16 = __du_an[var10];
-                  int var17 = __du_az[var8];
-                  var18 = __du_az[var27];
-                  int var19 = __du_az[var10];
-                  int var20 = __du_au[var8];
-                  int var21 = __du_au[var27];
-                  int var22 = __du_au[var10];
-                  var14 -= var15;
-                  var16 -= var15;
-                  var17 -= var18;
-                  var19 -= var18;
+                  var17 = field526[var8];
+                  var13 = field526[var16];
+                  var14 = field526[var9];
+                  int var18 = field527[var8];
+                  var15 = field527[var16];
+                  int var19 = field527[var9];
+                  int var20 = field528[var8];
+                  int var21 = field528[var16];
+                  int var22 = field528[var9];
+                  var17 -= var13;
+                  var14 -= var13;
+                  var18 -= var15;
+                  var19 -= var15;
                   var20 -= var21;
                   var22 -= var21;
-                  int var23 = var17 * var22 - var20 * var19;
-                  int var24 = var20 * var16 - var14 * var22;
-                  int var25 = var14 * var19 - var17 * var16;
-                  if(var15 * var23 + var18 * var24 + var21 * var25 > 0) {
-                     __du_ad[var7] = true;
-                     int var26 = (__du_am[var8] + __du_am[var27] + __du_am[var10]) / 3 + this.radius;
-                     __du_ax[var26][__du_aa[var26]++] = var7;
+                  int var23 = var18 * var22 - var20 * var19;
+                  int var24 = var20 * var14 - var17 * var22;
+                  int var25 = var17 * var19 - var18 * var14;
+                  if (var13 * var23 + var15 * var24 + var21 * var25 > 0) {
+                     field524[var7] = true;
+                     int var26 = (field525[var8] + field525[var16] + field525[var9]) / 3 + this.radius;
+                     field530[var26][field529[var26]++] = var7;
                   }
                }
             }
          }
 
-         int[] var9;
-         if(this.faceRenderPriorities == null) {
-            for(var7 = this.diameter - 1; var7 >= 0; --var7) {
-               var8 = __du_aa[var7];
-               if(var8 > 0) {
-                  var9 = __du_ax[var7];
+         int[] var27;
+         if (this.faceRenderPriorities == null) {
+            for (var7 = this.diameter - 1; var7 >= 0; --var7) {
+               var8 = field529[var7];
+               if (var8 > 0) {
+                  var27 = field530[var7];
 
-                  for(var10 = 0; var10 < var8; ++var10) {
-                     this.__ag_236(var9[var10]);
+                  for (var9 = 0; var9 < var8; ++var9) {
+                     this.method201(var27[var9]);
                   }
                }
             }
-
          } else {
-            for(var7 = 0; var7 < 12; ++var7) {
-               __du_af[var7] = 0;
-               __du_bs[var7] = 0;
+            for (var7 = 0; var7 < 12; ++var7) {
+               field531[var7] = 0;
+               field535[var7] = 0;
             }
 
-            for(var7 = this.diameter - 1; var7 >= 0; --var7) {
-               var8 = __du_aa[var7];
-               if(var8 > 0) {
-                  var9 = __du_ax[var7];
+            int[] var30;
+            for (var7 = this.diameter - 1; var7 >= 0; --var7) {
+               var8 = field529[var7];
+               if (var8 > 0) {
+                  var27 = field530[var7];
 
-                  for(var10 = 0; var10 < var8; ++var10) {
-                     var11 = var9[var10];
-                     byte var31 = this.faceRenderPriorities[var11];
-                     var13 = __du_af[var31]++;
-                     __du_ai[var31][var13] = var11;
-                     if(var31 < 10) {
-                        __du_bs[var31] += var7;
-                     } else if(var31 == 10) {
-                        __du_ba[var13] = var7;
+                  for (var9 = 0; var9 < var8; ++var9) {
+                     var10 = var27[var9];
+                     byte var28 = this.faceRenderPriorities[var10];
+                     var12 = field531[var28]++;
+                     field532[var28][var12] = var10;
+                     if (var28 < 10) {
+                        var30 = field535;
+                        var30[var28] += var7;
+                     } else if (var28 == 10) {
+                        field533[var12] = var7;
                      } else {
-                        __du_bb[var13] = var7;
+                        field534[var12] = var7;
                      }
                   }
                }
             }
 
             var7 = 0;
-            if(__du_af[1] > 0 || __du_af[2] > 0) {
-               var7 = (__du_bs[1] + __du_bs[2]) / (__du_af[1] + __du_af[2]);
+            if (field531[1] > 0 || field531[2] > 0) {
+               var7 = (field535[1] + field535[2]) / (field531[1] + field531[2]);
             }
 
             var8 = 0;
-            if(__du_af[3] > 0 || __du_af[4] > 0) {
-               var8 = (__du_bs[3] + __du_bs[4]) / (__du_af[3] + __du_af[4]);
+            if (field531[3] > 0 || field531[4] > 0) {
+               var8 = (field535[3] + field535[4]) / (field531[3] + field531[4]);
             }
 
-            var27 = 0;
-            if(__du_af[6] > 0 || __du_af[8] > 0) {
-               var27 = (__du_bs[8] + __du_bs[6]) / (__du_af[8] + __du_af[6]);
+            var16 = 0;
+            if (field531[6] > 0 || field531[8] > 0) {
+               var16 = (field535[8] + field535[6]) / (field531[8] + field531[6]);
             }
 
-            var11 = 0;
-            var12 = __du_af[10];
-            int[] var28 = __du_ai[10];
-            int[] var29 = __du_ba;
-            if(var11 == var12) {
-               var11 = 0;
-               var12 = __du_af[11];
-               var28 = __du_ai[11];
-               var29 = __du_bb;
+            var10 = 0;
+            var11 = field531[10];
+            int[] var29 = field532[10];
+            var30 = field533;
+            if (var10 == var11) {
+               var10 = 0;
+               var11 = field531[11];
+               var29 = field532[11];
+               var30 = field534;
             }
 
-            if(var11 < var12) {
-               var10 = var29[var11];
+            if (var10 < var11) {
+               var9 = var30[var10];
             } else {
-               var10 = -1000;
+               var9 = -1000;
             }
 
-            for(var15 = 0; var15 < 10; ++var15) {
-               while(var15 == 0 && var10 > var7) {
-                  this.__ag_236(var28[var11++]);
-                  if(var11 == var12 && var28 != __du_ai[11]) {
-                     var11 = 0;
-                     var12 = __du_af[11];
-                     var28 = __du_ai[11];
-                     var29 = __du_bb;
+            for (var13 = 0; var13 < 10; ++var13) {
+               while (var13 == 0 && var9 > var7) {
+                  this.method201(var29[var10++]);
+                  if (var10 == var11 && var29 != field532[11]) {
+                     var10 = 0;
+                     var11 = field531[11];
+                     var29 = field532[11];
+                     var30 = field534;
                   }
 
-                  if(var11 < var12) {
-                     var10 = var29[var11];
+                  if (var10 < var11) {
+                     var9 = var30[var10];
                   } else {
-                     var10 = -1000;
+                     var9 = -1000;
                   }
                }
 
-               while(var15 == 3 && var10 > var8) {
-                  this.__ag_236(var28[var11++]);
-                  if(var11 == var12 && var28 != __du_ai[11]) {
-                     var11 = 0;
-                     var12 = __du_af[11];
-                     var28 = __du_ai[11];
-                     var29 = __du_bb;
+               while (var13 == 3 && var9 > var8) {
+                  this.method201(var29[var10++]);
+                  if (var10 == var11 && var29 != field532[11]) {
+                     var10 = 0;
+                     var11 = field531[11];
+                     var29 = field532[11];
+                     var30 = field534;
                   }
 
-                  if(var11 < var12) {
-                     var10 = var29[var11];
+                  if (var10 < var11) {
+                     var9 = var30[var10];
                   } else {
-                     var10 = -1000;
+                     var9 = -1000;
                   }
                }
 
-               while(var15 == 5 && var10 > var27) {
-                  this.__ag_236(var28[var11++]);
-                  if(var11 == var12 && var28 != __du_ai[11]) {
-                     var11 = 0;
-                     var12 = __du_af[11];
-                     var28 = __du_ai[11];
-                     var29 = __du_bb;
+               while (var13 == 5 && var9 > var16) {
+                  this.method201(var29[var10++]);
+                  if (var10 == var11 && var29 != field532[11]) {
+                     var10 = 0;
+                     var11 = field531[11];
+                     var29 = field532[11];
+                     var30 = field534;
                   }
 
-                  if(var11 < var12) {
-                     var10 = var29[var11];
+                  if (var10 < var11) {
+                     var9 = var30[var10];
                   } else {
-                     var10 = -1000;
+                     var9 = -1000;
                   }
                }
 
-               var16 = __du_af[var15];
-               int[] var30 = __du_ai[var15];
+               var14 = field531[var13];
+               int[] var31 = field532[var13];
 
-               for(var18 = 0; var18 < var16; ++var18) {
-                  this.__ag_236(var30[var18]);
+               for (var15 = 0; var15 < var14; ++var15) {
+                  this.method201(var31[var15]);
                }
             }
 
-            while(var10 != -1000) {
-               this.__ag_236(var28[var11++]);
-               if(var11 == var12 && var28 != __du_ai[11]) {
-                  var11 = 0;
-                  var28 = __du_ai[11];
-                  var12 = __du_af[11];
-                  var29 = __du_bb;
+            while (var9 != -1000) {
+               this.method201(var29[var10++]);
+               if (var10 == var11 && var29 != field532[11]) {
+                  var10 = 0;
+                  var29 = field532[11];
+                  var11 = field531[11];
+                  var30 = field534;
                }
 
-               if(var11 < var12) {
-                  var10 = var29[var11];
+               if (var10 < var11) {
+                  var9 = var30[var10];
                } else {
-                  var10 = -1000;
+                  var9 = -1000;
                }
             }
-
          }
       }
+
    }
 
    @ObfuscatedName("ag")
-   final void __ag_236(int var1) {
-      if(__du_ad[var1]) {
-         this.__aq_237(var1);
+   final void method201(int var1) {
+      if (field524[var1]) {
+         this.method202(var1);
       } else {
          int var2 = this.indices1[var1];
          int var3 = this.indices2[var1];
          int var4 = this.indices3[var1];
-         Rasterizer3D.__et_m = __du_at[var1];
-         if(this.faceAlphas == null) {
+         Rasterizer3D.field739 = field523[var1];
+         if (this.faceAlphas == null) {
             Rasterizer3D.Rasterizer3D_alpha = 0;
          } else {
             Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255;
          }
 
-         if(this.faceTextures != null && this.faceTextures[var1] != -1) {
+         if (this.faceTextures != null && this.faceTextures[var1] != -1) {
             int var5;
             int var6;
             int var7;
-            if(this.__s != null && this.__s[var1] != -1) {
-               int var8 = this.__s[var1] & 255;
-               var5 = this.__b[var8];
-               var6 = this.__c[var8];
-               var7 = this.__r[var8];
+            if (this.field542 != null && this.field542[var1] != -1) {
+               int var8 = this.field542[var1] & 255;
+               var5 = this.field545[var8];
+               var6 = this.field546[var8];
+               var7 = this.field547[var8];
             } else {
                var5 = var2;
                var6 = var3;
                var7 = var4;
             }
 
-            if(this.faceColors3[var1] == -1) {
-               Rasterizer3D.method2986(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], __du_an[var5], __du_an[var6], __du_an[var7], __du_az[var5], __du_az[var6], __du_az[var7], __du_au[var5], __du_au[var6], __du_au[var7], this.faceTextures[var1]);
+            if (this.faceColors3[var1] == -1) {
+               Rasterizer3D.method2986(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field526[var5], field526[var6], field526[var7], field527[var5], field527[var6], field527[var7], field528[var5], field528[var6], field528[var7], this.faceTextures[var1]);
             } else {
-               Rasterizer3D.method2986(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1], __du_an[var5], __du_an[var6], __du_an[var7], __du_az[var5], __du_az[var6], __du_az[var7], __du_au[var5], __du_au[var6], __du_au[var7], this.faceTextures[var1]);
+               Rasterizer3D.method2986(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1], field526[var5], field526[var6], field526[var7], field527[var5], field527[var6], field527[var7], field528[var5], field528[var6], field528[var7], this.faceTextures[var1]);
             }
-         } else if(this.faceColors3[var1] == -1) {
-            Rasterizer3D.method3020(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], __du_br[this.faceColors1[var1]]);
+         } else if (this.faceColors3[var1] == -1) {
+            Rasterizer3D.method3020(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], field540[this.faceColors1[var1]]);
          } else {
             Rasterizer3D.method3037(modelViewportYs[var2], modelViewportYs[var3], modelViewportYs[var4], modelViewportXs[var2], modelViewportXs[var3], modelViewportXs[var4], this.faceColors1[var1], this.faceColors2[var1], this.faceColors3[var1]);
          }
-
       }
+
    }
 
    @ObfuscatedName("aq")
-   final void __aq_237(int var1) {
+   final void method202(int var1) {
       int var2 = Rasterizer3D.Rasterizer3D_clipMidX;
       int var3 = Rasterizer3D.Rasterizer3D_clipMidY;
       int var4 = 0;
       int var5 = this.indices1[var1];
       int var6 = this.indices2[var1];
       int var7 = this.indices3[var1];
-      int var8 = __du_au[var5];
-      int var9 = __du_au[var6];
-      int var10 = __du_au[var7];
-      if(this.faceAlphas == null) {
+      int var8 = field528[var5];
+      int var9 = field528[var6];
+      int var10 = field528[var7];
+      if (this.faceAlphas == null) {
          Rasterizer3D.Rasterizer3D_alpha = 0;
       } else {
          Rasterizer3D.Rasterizer3D_alpha = this.faceAlphas[var1] & 255;
@@ -1399,126 +1381,126 @@ public class Model extends Entity {
       int var12;
       int var13;
       int var14;
-      if(var8 >= 50) {
-         __du_bq[var4] = modelViewportXs[var5];
-         __du_bn[var4] = modelViewportYs[var5];
-         __du_bk[var4++] = this.faceColors1[var1];
+      if (var8 >= 50) {
+         field536[var4] = modelViewportXs[var5];
+         field537[var4] = modelViewportYs[var5];
+         field538[var4++] = this.faceColors1[var1];
       } else {
-         var11 = __du_an[var5];
-         var12 = __du_az[var5];
+         var11 = field526[var5];
+         var12 = field527[var5];
          var13 = this.faceColors1[var1];
-         if(var10 >= 50) {
-            var14 = __du_bj[var10 - var8] * (50 - var8);
-            __du_bq[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((__du_an[var7] - var11) * var14 >> 16)) / 50;
-            __du_bn[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((__du_az[var7] - var12) * var14 >> 16)) / 50;
-            __du_bk[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16);
+         if (var10 >= 50) {
+            var14 = field541[var10 - var8] * (50 - var8);
+            field536[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field526[var7] - var11) * var14 >> 16)) / 50;
+            field537[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field527[var7] - var12) * var14 >> 16)) / 50;
+            field538[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16);
          }
 
-         if(var9 >= 50) {
-            var14 = __du_bj[var9 - var8] * (50 - var8);
-            __du_bq[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((__du_an[var6] - var11) * var14 >> 16)) / 50;
-            __du_bn[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((__du_az[var6] - var12) * var14 >> 16)) / 50;
-            __du_bk[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16);
+         if (var9 >= 50) {
+            var14 = field541[var9 - var8] * (50 - var8);
+            field536[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field526[var6] - var11) * var14 >> 16)) / 50;
+            field537[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field527[var6] - var12) * var14 >> 16)) / 50;
+            field538[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16);
          }
       }
 
-      if(var9 >= 50) {
-         __du_bq[var4] = modelViewportXs[var6];
-         __du_bn[var4] = modelViewportYs[var6];
-         __du_bk[var4++] = this.faceColors2[var1];
+      if (var9 >= 50) {
+         field536[var4] = modelViewportXs[var6];
+         field537[var4] = modelViewportYs[var6];
+         field538[var4++] = this.faceColors2[var1];
       } else {
-         var11 = __du_an[var6];
-         var12 = __du_az[var6];
+         var11 = field526[var6];
+         var12 = field527[var6];
          var13 = this.faceColors2[var1];
-         if(var8 >= 50) {
-            var14 = __du_bj[var8 - var9] * (50 - var9);
-            __du_bq[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((__du_an[var5] - var11) * var14 >> 16)) / 50;
-            __du_bn[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((__du_az[var5] - var12) * var14 >> 16)) / 50;
-            __du_bk[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16);
+         if (var8 >= 50) {
+            var14 = field541[var8 - var9] * (50 - var9);
+            field536[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field526[var5] - var11) * var14 >> 16)) / 50;
+            field537[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field527[var5] - var12) * var14 >> 16)) / 50;
+            field538[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16);
          }
 
-         if(var10 >= 50) {
-            var14 = __du_bj[var10 - var9] * (50 - var9);
-            __du_bq[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((__du_an[var7] - var11) * var14 >> 16)) / 50;
-            __du_bn[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((__du_az[var7] - var12) * var14 >> 16)) / 50;
-            __du_bk[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16);
+         if (var10 >= 50) {
+            var14 = field541[var10 - var9] * (50 - var9);
+            field536[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field526[var7] - var11) * var14 >> 16)) / 50;
+            field537[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field527[var7] - var12) * var14 >> 16)) / 50;
+            field538[var4++] = var13 + ((this.faceColors3[var1] - var13) * var14 >> 16);
          }
       }
 
-      if(var10 >= 50) {
-         __du_bq[var4] = modelViewportXs[var7];
-         __du_bn[var4] = modelViewportYs[var7];
-         __du_bk[var4++] = this.faceColors3[var1];
+      if (var10 >= 50) {
+         field536[var4] = modelViewportXs[var7];
+         field537[var4] = modelViewportYs[var7];
+         field538[var4++] = this.faceColors3[var1];
       } else {
-         var11 = __du_an[var7];
-         var12 = __du_az[var7];
+         var11 = field526[var7];
+         var12 = field527[var7];
          var13 = this.faceColors3[var1];
-         if(var9 >= 50) {
-            var14 = __du_bj[var9 - var10] * (50 - var10);
-            __du_bq[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((__du_an[var6] - var11) * var14 >> 16)) / 50;
-            __du_bn[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((__du_az[var6] - var12) * var14 >> 16)) / 50;
-            __du_bk[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16);
+         if (var9 >= 50) {
+            var14 = field541[var9 - var10] * (50 - var10);
+            field536[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field526[var6] - var11) * var14 >> 16)) / 50;
+            field537[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field527[var6] - var12) * var14 >> 16)) / 50;
+            field538[var4++] = var13 + ((this.faceColors2[var1] - var13) * var14 >> 16);
          }
 
-         if(var8 >= 50) {
-            var14 = __du_bj[var8 - var10] * (50 - var10);
-            __du_bq[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((__du_an[var5] - var11) * var14 >> 16)) / 50;
-            __du_bn[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((__du_az[var5] - var12) * var14 >> 16)) / 50;
-            __du_bk[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16);
+         if (var8 >= 50) {
+            var14 = field541[var8 - var10] * (50 - var10);
+            field536[var4] = var2 + Rasterizer3D.Rasterizer3D_zoom * (var11 + ((field526[var5] - var11) * var14 >> 16)) / 50;
+            field537[var4] = var3 + Rasterizer3D.Rasterizer3D_zoom * (var12 + ((field527[var5] - var12) * var14 >> 16)) / 50;
+            field538[var4++] = var13 + ((this.faceColors1[var1] - var13) * var14 >> 16);
          }
       }
 
-      var11 = __du_bq[0];
-      var12 = __du_bq[1];
-      var13 = __du_bq[2];
-      var14 = __du_bn[0];
-      int var15 = __du_bn[1];
-      int var16 = __du_bn[2];
-      Rasterizer3D.__et_m = false;
+      var11 = field536[0];
+      var12 = field536[1];
+      var13 = field536[2];
+      var14 = field537[0];
+      int var15 = field537[1];
+      int var16 = field537[2];
+      Rasterizer3D.field739 = false;
       int var17;
       int var18;
       int var19;
       int var20;
-      if(var4 == 3) {
-         if(var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth) {
-            Rasterizer3D.__et_m = true;
+      if (var4 == 3) {
+         if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth) {
+            Rasterizer3D.field739 = true;
          }
 
-         if(this.faceTextures != null && this.faceTextures[var1] != -1) {
-            if(this.__s != null && this.__s[var1] != -1) {
-               var20 = this.__s[var1] & 255;
-               var17 = this.__b[var20];
-               var18 = this.__c[var20];
-               var19 = this.__r[var20];
+         if (this.faceTextures != null && this.faceTextures[var1] != -1) {
+            if (this.field542 != null && this.field542[var1] != -1) {
+               var20 = this.field542[var1] & 255;
+               var17 = this.field545[var20];
+               var18 = this.field546[var20];
+               var19 = this.field547[var20];
             } else {
                var17 = var5;
                var18 = var6;
                var19 = var7;
             }
 
-            if(this.faceColors3[var1] == -1) {
-               Rasterizer3D.method2986(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], __du_an[var17], __du_an[var18], __du_an[var19], __du_az[var17], __du_az[var18], __du_az[var19], __du_au[var17], __du_au[var18], __du_au[var19], this.faceTextures[var1]);
+            if (this.faceColors3[var1] == -1) {
+               Rasterizer3D.method2986(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field526[var17], field526[var18], field526[var19], field527[var17], field527[var18], field527[var19], field528[var17], field528[var18], field528[var19], this.faceTextures[var1]);
             } else {
-               Rasterizer3D.method2986(var14, var15, var16, var11, var12, var13, __du_bk[0], __du_bk[1], __du_bk[2], __du_an[var17], __du_an[var18], __du_an[var19], __du_az[var17], __du_az[var18], __du_az[var19], __du_au[var17], __du_au[var18], __du_au[var19], this.faceTextures[var1]);
+               Rasterizer3D.method2986(var14, var15, var16, var11, var12, var13, field538[0], field538[1], field538[2], field526[var17], field526[var18], field526[var19], field527[var17], field527[var18], field527[var19], field528[var17], field528[var18], field528[var19], this.faceTextures[var1]);
             }
-         } else if(this.faceColors3[var1] == -1) {
-            Rasterizer3D.method3020(var14, var15, var16, var11, var12, var13, __du_br[this.faceColors1[var1]]);
+         } else if (this.faceColors3[var1] == -1) {
+            Rasterizer3D.method3020(var14, var15, var16, var11, var12, var13, field540[this.faceColors1[var1]]);
          } else {
-            Rasterizer3D.method3037(var14, var15, var16, var11, var12, var13, __du_bk[0], __du_bk[1], __du_bk[2]);
+            Rasterizer3D.method3037(var14, var15, var16, var11, var12, var13, field538[0], field538[1], field538[2]);
          }
       }
 
-      if(var4 == 4) {
-         if(var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || __du_bq[3] < 0 || __du_bq[3] > Rasterizer3D.Rasterizer3D_clipWidth) {
-            Rasterizer3D.__et_m = true;
+      if (var4 == 4) {
+         if (var11 < 0 || var12 < 0 || var13 < 0 || var11 > Rasterizer3D.Rasterizer3D_clipWidth || var12 > Rasterizer3D.Rasterizer3D_clipWidth || var13 > Rasterizer3D.Rasterizer3D_clipWidth || field536[3] < 0 || field536[3] > Rasterizer3D.Rasterizer3D_clipWidth) {
+            Rasterizer3D.field739 = true;
          }
 
-         if(this.faceTextures != null && this.faceTextures[var1] != -1) {
-            if(this.__s != null && this.__s[var1] != -1) {
-               var20 = this.__s[var1] & 255;
-               var17 = this.__b[var20];
-               var18 = this.__c[var20];
-               var19 = this.__r[var20];
+         if (this.faceTextures != null && this.faceTextures[var1] != -1) {
+            if (this.field542 != null && this.field542[var1] != -1) {
+               var20 = this.field542[var1] & 255;
+               var17 = this.field545[var20];
+               var18 = this.field546[var20];
+               var19 = this.field547[var20];
             } else {
                var17 = var5;
                var18 = var6;
@@ -1526,169 +1508,198 @@ public class Model extends Entity {
             }
 
             short var21 = this.faceTextures[var1];
-            if(this.faceColors3[var1] == -1) {
-               Rasterizer3D.method2986(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], __du_an[var17], __du_an[var18], __du_an[var19], __du_az[var17], __du_az[var18], __du_az[var19], __du_au[var17], __du_au[var18], __du_au[var19], var21);
-               Rasterizer3D.method2986(var14, var16, __du_bn[3], var11, var13, __du_bq[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], __du_an[var17], __du_an[var18], __du_an[var19], __du_az[var17], __du_az[var18], __du_az[var19], __du_au[var17], __du_au[var18], __du_au[var19], var21);
+            if (this.faceColors3[var1] == -1) {
+               Rasterizer3D.method2986(var14, var15, var16, var11, var12, var13, this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field526[var17], field526[var18], field526[var19], field527[var17], field527[var18], field527[var19], field528[var17], field528[var18], field528[var19], var21);
+               Rasterizer3D.method2986(var14, var16, field537[3], var11, var13, field536[3], this.faceColors1[var1], this.faceColors1[var1], this.faceColors1[var1], field526[var17], field526[var18], field526[var19], field527[var17], field527[var18], field527[var19], field528[var17], field528[var18], field528[var19], var21);
             } else {
-               Rasterizer3D.method2986(var14, var15, var16, var11, var12, var13, __du_bk[0], __du_bk[1], __du_bk[2], __du_an[var17], __du_an[var18], __du_an[var19], __du_az[var17], __du_az[var18], __du_az[var19], __du_au[var17], __du_au[var18], __du_au[var19], var21);
-               Rasterizer3D.method2986(var14, var16, __du_bn[3], var11, var13, __du_bq[3], __du_bk[0], __du_bk[2], __du_bk[3], __du_an[var17], __du_an[var18], __du_an[var19], __du_az[var17], __du_az[var18], __du_az[var19], __du_au[var17], __du_au[var18], __du_au[var19], var21);
+               Rasterizer3D.method2986(var14, var15, var16, var11, var12, var13, field538[0], field538[1], field538[2], field526[var17], field526[var18], field526[var19], field527[var17], field527[var18], field527[var19], field528[var17], field528[var18], field528[var19], var21);
+               Rasterizer3D.method2986(var14, var16, field537[3], var11, var13, field536[3], field538[0], field538[2], field538[3], field526[var17], field526[var18], field526[var19], field527[var17], field527[var18], field527[var19], field528[var17], field528[var18], field528[var19], var21);
             }
-         } else if(this.faceColors3[var1] == -1) {
-            var17 = __du_br[this.faceColors1[var1]];
+         } else if (this.faceColors3[var1] == -1) {
+            var17 = field540[this.faceColors1[var1]];
             Rasterizer3D.method3020(var14, var15, var16, var11, var12, var13, var17);
-            Rasterizer3D.method3020(var14, var16, __du_bn[3], var11, var13, __du_bq[3], var17);
+            Rasterizer3D.method3020(var14, var16, field537[3], var11, var13, field536[3], var17);
          } else {
-            Rasterizer3D.method3037(var14, var15, var16, var11, var12, var13, __du_bk[0], __du_bk[1], __du_bk[2]);
-            Rasterizer3D.method3037(var14, var16, __du_bn[3], var11, var13, __du_bq[3], __du_bk[0], __du_bk[2], __du_bk[3]);
+            Rasterizer3D.method3037(var14, var15, var16, var11, var12, var13, field538[0], field538[1], field538[2]);
+            Rasterizer3D.method3037(var14, var16, field537[3], var11, var13, field536[3], field538[0], field538[2], field538[3]);
          }
       }
 
    }
 
    @ObfuscatedName("cy")
-   @Export("renderDraw")
-   void renderDraw(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, long var9) {
-      __du_aa[0] = -1;
-      if(this.boundsType != 1) {
+   @Export("draw")
+   void draw(int yaw, int cameraPitchSine, int cameraPitchCosine, int cameraYawSine, int cameraYawCosine, int x, int y, int z, long tag) {
+      field529[0] = -1;
+      if (this.boundsType != 1) {
          this.calculateBoundsCylinder();
       }
 
-      this.calculateBoundingBox(var1);
-      int var11 = var5 * var8 - var4 * var6 >> 16;
-      int var12 = var2 * var7 + var3 * var11 >> 16;
-      int var13 = var3 * this.xzRadius >> 16;
+      this.calculateBoundingBox(yaw);
+      int var11 = cameraYawCosine * z - cameraYawSine * x >> 16;
+      int var12 = cameraPitchSine * y + cameraPitchCosine * var11 >> 16;
+      int var13 = cameraPitchCosine * this.xzRadius >> 16;
       int var14 = var12 + var13;
-      if(var14 > 50 && var12 < 3500) {
-         int var15 = var8 * var4 + var5 * var6 >> 16;
+      if (var14 > 50 && var12 < 3500) {
+         int var15 = z * cameraYawSine + cameraYawCosine * x >> 16;
          int var16 = (var15 - this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom;
-         if(var16 / var14 < Rasterizer3D.Rasterizer3D_clipMidX2) {
+         if (var16 / var14 < Rasterizer3D.Rasterizer3D_clipMidX2) {
             int var17 = (var15 + this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom;
-            if(var17 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidX) {
-               int var18 = var3 * var7 - var11 * var2 >> 16;
-               int var19 = var2 * this.xzRadius >> 16;
+            if (var17 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidX) {
+               int var18 = cameraPitchCosine * y - var11 * cameraPitchSine >> 16;
+               int var19 = cameraPitchSine * this.xzRadius >> 16;
                int var20 = (var18 + var19) * Rasterizer3D.Rasterizer3D_zoom;
-               if(var20 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidY) {
-                  int var21 = (var3 * super.height >> 16) + var19;
+               if (var20 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidY) {
+                  int var21 = (cameraPitchCosine * super.height >> 16) + var19;
                   int var22 = (var18 - var21) * Rasterizer3D.Rasterizer3D_zoom;
-                  if(var22 / var14 < Rasterizer3D.Rasterizer3D_clipMidY2) {
-                     int var23 = var13 + (var2 * super.height >> 16);
+                  if (var22 / var14 < Rasterizer3D.Rasterizer3D_clipMidY2) {
+                     int var23 = var13 + (cameraPitchSine * super.height >> 16);
                      boolean var24 = false;
                      boolean var25 = false;
-                     if(var12 - var23 <= 50) {
+                     if (var12 - var23 <= 50) {
                         var25 = true;
                      }
 
-                     boolean var26 = var25 || this.__h > 0;
+                     boolean var26 = var25 || this.field544 > 0;
                      int var27 = ViewportMouse.ViewportMouse_x;
-                     int var29 = ViewportMouse.ViewportMouse_y;
-                     boolean var31 = ViewportMouse.ViewportMouse_isInViewport;
-                     boolean var34 = 0L != var9;
-                     boolean var35;
-                     if(var34) {
-                        var35 = (int)(var9 >>> 16 & 1L) == 1;
-                        var34 = !var35;
+                     int var28 = ViewportMouse.ViewportMouse_y;
+                     boolean var29 = ViewportMouse.ViewportMouse_isInViewport;
+                     boolean var30 = 0L != tag;
+                     boolean var31;
+                     if (var30) {
+                        var31 = (int)(tag >>> 16 & 1L) == 1;
+                        var30 = !var31;
                      }
 
-                     var35 = false;
-                     int var37;
-                     int var38;
-                     int var39;
-                     if(var34 && var31) {
-                        boolean var36 = false;
-                        if(__du_bx) {
-                           var36 = Decimator.method2491(this, var6, var7, var8);
+                     var31 = false;
+                     int var32;
+                     int var33;
+                     int var34;
+                     if (var30 && var29) {
+                        boolean var35 = false;
+                        if (field539) {
+                           var35 = Decimator.boundingBoxCheck(this, x, y, z);
                         } else {
-                           var37 = var12 - var13;
-                           if(var37 <= 50) {
-                              var37 = 50;
+                           var32 = var12 - var13;
+                           if (var32 <= 50) {
+                              var32 = 50;
                            }
 
-                           if(var15 > 0) {
+                           if (var15 > 0) {
                               var16 /= var14;
-                              var17 /= var37;
+                              var17 /= var32;
                            } else {
                               var17 /= var14;
-                              var16 /= var37;
+                              var16 /= var32;
                            }
 
-                           if(var18 > 0) {
+                           if (var18 > 0) {
                               var22 /= var14;
-                              var20 /= var37;
+                              var20 /= var32;
                            } else {
                               var20 /= var14;
-                              var22 /= var37;
+                              var22 /= var32;
                            }
 
-                           var38 = var27 - Rasterizer3D.Rasterizer3D_clipMidX;
-                           var39 = var29 - Rasterizer3D.Rasterizer3D_clipMidY;
-                           if(var38 > var16 && var38 < var17 && var39 > var22 && var39 < var20) {
-                              var36 = true;
-                           }
-                        }
-
-                        if(var36) {
-                           if(this.isSingleTile) {
-                              Projectile.method2081(var9);
-                           } else {
+                           var33 = var27 - Rasterizer3D.Rasterizer3D_clipMidX;
+                           var34 = var28 - Rasterizer3D.Rasterizer3D_clipMidY;
+                           if (var33 > var16 && var33 < var17 && var34 > var22 && var34 < var20) {
                               var35 = true;
                            }
                         }
+
+                        if (var35) {
+                           if (this.isSingleTile) {
+                              Projectile.addEntityTagAtMouse(tag);
+                           } else {
+                              var31 = true;
+                           }
+                        }
                      }
 
-                     int var47 = Rasterizer3D.Rasterizer3D_clipMidX;
-                     var37 = Rasterizer3D.Rasterizer3D_clipMidY;
-                     var38 = 0;
-                     var39 = 0;
-                     if(var1 != 0) {
-                        var38 = Model_sine[var1];
-                        var39 = Model_cosine[var1];
+                     int var42 = Rasterizer3D.Rasterizer3D_clipMidX;
+                     var32 = Rasterizer3D.Rasterizer3D_clipMidY;
+                     var33 = 0;
+                     var34 = 0;
+                     if (yaw != 0) {
+                        var33 = Model_sine[yaw];
+                        var34 = Model_cosine[yaw];
                      }
 
-                     for(int var40 = 0; var40 < this.verticesCount; ++var40) {
-                        int var41 = this.verticesX[var40];
-                        int var42 = this.verticesY[var40];
-                        int var43 = this.verticesZ[var40];
-                        int var44;
-                        if(var1 != 0) {
-                           var44 = var43 * var38 + var41 * var39 >> 16;
-                           var43 = var43 * var39 - var41 * var38 >> 16;
-                           var41 = var44;
+                     for (int var36 = 0; var36 < this.verticesCount; ++var36) {
+                        int var37 = this.verticesX[var36];
+                        int var38 = this.verticesY[var36];
+                        int var39 = this.verticesZ[var36];
+                        int var40;
+                        if (yaw != 0) {
+                           var40 = var39 * var33 + var37 * var34 >> 16;
+                           var39 = var39 * var34 - var37 * var33 >> 16;
+                           var37 = var40;
                         }
 
-                        var41 += var6;
-                        var42 += var7;
-                        var43 += var8;
-                        var44 = var43 * var4 + var5 * var41 >> 16;
-                        var43 = var5 * var43 - var41 * var4 >> 16;
-                        var41 = var44;
-                        var44 = var3 * var42 - var43 * var2 >> 16;
-                        var43 = var42 * var2 + var3 * var43 >> 16;
-                        __du_am[var40] = var43 - var12;
-                        if(var43 >= 50) {
-                           modelViewportXs[var40] = var41 * Rasterizer3D.Rasterizer3D_zoom / var43 + var47;
-                           modelViewportYs[var40] = var44 * Rasterizer3D.Rasterizer3D_zoom / var43 + var37;
+                        var37 += x;
+                        var38 += y;
+                        var39 += z;
+                        var40 = var39 * cameraYawSine + cameraYawCosine * var37 >> 16;
+                        var39 = cameraYawCosine * var39 - var37 * cameraYawSine >> 16;
+                        var37 = var40;
+                        var40 = cameraPitchCosine * var38 - var39 * cameraPitchSine >> 16;
+                        var39 = var38 * cameraPitchSine + cameraPitchCosine * var39 >> 16;
+                        field525[var36] = var39 - var12;
+                        if (var39 >= 50) {
+                           modelViewportXs[var36] = var37 * Rasterizer3D.Rasterizer3D_zoom / var39 + var42;
+                           modelViewportYs[var36] = var40 * Rasterizer3D.Rasterizer3D_zoom / var39 + var32;
                         } else {
-                           modelViewportXs[var40] = -5000;
+                           modelViewportXs[var36] = -5000;
                            var24 = true;
                         }
 
-                        if(var26) {
-                           __du_an[var40] = var41;
-                           __du_az[var40] = var44;
-                           __du_au[var40] = var43;
+                        if (var26) {
+                           field526[var36] = var37;
+                           field527[var36] = var40;
+                           field528[var36] = var39;
                         }
                      }
 
                      try {
-                        this.draw0(var24, var35, this.isSingleTile, var9);
-                     } catch (Exception var46) {
-                        ;
+                        this.draw0(var24, var31, this.isSingleTile, tag);
+                     } catch (Exception var41) {
                      }
-
                   }
                }
             }
          }
       }
+
+   }
+
+   static {
+      Model_sharedSequenceModel = new Model();
+      Model_sharedSequenceModelFaceAlphas = new byte[1];
+      Model_sharedSpotAnimationModel = new Model();
+      Model_sharedSpotAnimationModelFaceAlphas = new byte[1];
+      field523 = new boolean[4700];
+      field524 = new boolean[4700];
+      modelViewportXs = new int[4700];
+      modelViewportYs = new int[4700];
+      field525 = new int[4700];
+      field526 = new int[4700];
+      field527 = new int[4700];
+      field528 = new int[4700];
+      field529 = new int[1600];
+      field530 = new int[1600][512];
+      field531 = new int[12];
+      field532 = new int[12][2000];
+      field533 = new int[2000];
+      field534 = new int[2000];
+      field535 = new int[12];
+      field536 = new int[10];
+      field537 = new int[10];
+      field538 = new int[10];
+      field539 = true;
+      Model_sine = Rasterizer3D.Rasterizer3D_sine;
+      Model_cosine = Rasterizer3D.Rasterizer3D_cosine;
+      field540 = Rasterizer3D.Rasterizer3D_colorPalette;
+      field541 = Rasterizer3D.field743;
    }
 }
diff --git a/runescape-client/src/main/java/ModelData.java b/runescape-client/src/main/java/ModelData.java
index a0ce7dd443..009a9a53c6 100644
--- a/runescape-client/src/main/java/ModelData.java
+++ b/runescape-client/src/main/java/ModelData.java
@@ -7,11 +7,11 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("ModelData")
 public class ModelData extends Entity {
    @ObfuscatedName("aw")
-   static int[] __dw_aw;
+   static int[] field548;
    @ObfuscatedName("al")
-   static int[] __dw_al;
+   static int[] field549;
    @ObfuscatedName("ab")
-   static int __dw_ab;
+   static int field550;
    @ObfuscatedName("ae")
    @Export("ModelData_sine")
    static int[] ModelData_sine;
@@ -43,9 +43,9 @@ public class ModelData extends Entity {
    @Export("indices3")
    int[] indices3;
    @ObfuscatedName("e")
-   byte[] __e;
+   byte[] field551;
    @ObfuscatedName("x")
-   byte[] __x;
+   byte[] field552;
    @ObfuscatedName("d")
    @Export("faceAlphas")
    byte[] faceAlphas;
@@ -59,9 +59,9 @@ public class ModelData extends Entity {
    @Export("faceTextures")
    short[] faceTextures;
    @ObfuscatedName("a")
-   byte __a;
+   byte field553;
    @ObfuscatedName("z")
-   int __z;
+   int field554;
    @ObfuscatedName("j")
    @Export("textureRenderTypes")
    byte[] textureRenderTypes;
@@ -75,9 +75,9 @@ public class ModelData extends Entity {
    @Export("texTriangleZ")
    short[] texTriangleZ;
    @ObfuscatedName("h")
-   int[] __h;
+   int[] field555;
    @ObfuscatedName("b")
-   int[] __b;
+   int[] field556;
    @ObfuscatedName("c")
    @Export("vertexLabels")
    int[][] vertexLabels;
@@ -94,42 +94,34 @@ public class ModelData extends Entity {
    @ObfuscatedSignature(
       signature = "[Ldq;"
    )
-   VertexNormal[] __v;
+   VertexNormal[] field557;
    @ObfuscatedName("ag")
    @ObfuscatedSignature(
       signature = "[Ldq;"
    )
-   VertexNormal[] __ag;
+   VertexNormal[] field558;
    @ObfuscatedName("aq")
-   public short __aq;
+   public short field559;
    @ObfuscatedName("aj")
-   public short __aj;
+   public short field560;
    @ObfuscatedName("av")
    @Export("isBoundsCalculated")
    boolean isBoundsCalculated;
    @ObfuscatedName("ar")
-   int __ar;
+   int field561;
    @ObfuscatedName("ac")
-   int __ac;
+   int field562;
    @ObfuscatedName("ay")
-   int __ay;
+   int field563;
    @ObfuscatedName("ah")
-   int __ah;
+   int field564;
    @ObfuscatedName("ak")
-   int __ak;
-
-   static {
-      __dw_aw = new int[10000];
-      __dw_al = new int[10000];
-      __dw_ab = 0;
-      ModelData_sine = Rasterizer3D.Rasterizer3D_sine;
-      ModelData_cosine = Rasterizer3D.Rasterizer3D_cosine;
-   }
+   int field565;
 
    ModelData() {
       this.verticesCount = 0;
       this.faceCount = 0;
-      this.__a = 0;
+      this.field553 = 0;
       this.isBoundsCalculated = false;
    }
 
@@ -139,7 +131,7 @@ public class ModelData extends Entity {
    public ModelData(ModelData[] var1, int var2) {
       this.verticesCount = 0;
       this.faceCount = 0;
-      this.__a = 0;
+      this.field553 = 0;
       this.isBoundsCalculated = false;
       boolean var3 = false;
       boolean var4 = false;
@@ -149,32 +141,32 @@ public class ModelData extends Entity {
       boolean var8 = false;
       this.verticesCount = 0;
       this.faceCount = 0;
-      this.__z = 0;
-      this.__a = -1;
+      this.field554 = 0;
+      this.field553 = -1;
 
       int var9;
       ModelData var10;
-      for(var9 = 0; var9 < var2; ++var9) {
+      for (var9 = 0; var9 < var2; ++var9) {
          var10 = var1[var9];
-         if(var10 != null) {
+         if (var10 != null) {
             this.verticesCount += var10.verticesCount;
             this.faceCount += var10.faceCount;
-            this.__z += var10.__z;
-            if(var10.__x != null) {
+            this.field554 += var10.field554;
+            if (var10.field552 != null) {
                var4 = true;
             } else {
-               if(this.__a == -1) {
-                  this.__a = var10.__a;
+               if (this.field553 == -1) {
+                  this.field553 = var10.field553;
                }
 
-               if(this.__a != var10.__a) {
+               if (this.field553 != var10.field553) {
                   var4 = true;
                }
             }
 
-            var3 |= var10.__e != null;
+            var3 |= var10.field551 != null;
             var5 |= var10.faceAlphas != null;
-            var6 |= var10.__b != null;
+            var6 |= var10.field556 != null;
             var7 |= var10.faceTextures != null;
             var8 |= var10.textureCoords != null;
          }
@@ -183,103 +175,103 @@ public class ModelData extends Entity {
       this.verticesX = new int[this.verticesCount];
       this.verticesY = new int[this.verticesCount];
       this.verticesZ = new int[this.verticesCount];
-      this.__h = new int[this.verticesCount];
+      this.field555 = new int[this.verticesCount];
       this.indices1 = new int[this.faceCount];
       this.indices2 = new int[this.faceCount];
       this.indices3 = new int[this.faceCount];
-      if(var3) {
-         this.__e = new byte[this.faceCount];
+      if (var3) {
+         this.field551 = new byte[this.faceCount];
       }
 
-      if(var4) {
-         this.__x = new byte[this.faceCount];
+      if (var4) {
+         this.field552 = new byte[this.faceCount];
       }
 
-      if(var5) {
+      if (var5) {
          this.faceAlphas = new byte[this.faceCount];
       }
 
-      if(var6) {
-         this.__b = new int[this.faceCount];
+      if (var6) {
+         this.field556 = new int[this.faceCount];
       }
 
-      if(var7) {
+      if (var7) {
          this.faceTextures = new short[this.faceCount];
       }
 
-      if(var8) {
+      if (var8) {
          this.textureCoords = new byte[this.faceCount];
       }
 
       this.faceColors = new short[this.faceCount];
-      if(this.__z > 0) {
-         this.textureRenderTypes = new byte[this.__z];
-         this.texTriangleX = new short[this.__z];
-         this.texTriangleY = new short[this.__z];
-         this.texTriangleZ = new short[this.__z];
+      if (this.field554 > 0) {
+         this.textureRenderTypes = new byte[this.field554];
+         this.texTriangleX = new short[this.field554];
+         this.texTriangleY = new short[this.field554];
+         this.texTriangleZ = new short[this.field554];
       }
 
       this.verticesCount = 0;
       this.faceCount = 0;
-      this.__z = 0;
+      this.field554 = 0;
 
-      for(var9 = 0; var9 < var2; ++var9) {
+      for (var9 = 0; var9 < var2; ++var9) {
          var10 = var1[var9];
-         if(var10 != null) {
+         if (var10 != null) {
             int var11;
-            for(var11 = 0; var11 < var10.faceCount; ++var11) {
-               if(var3 && var10.__e != null) {
-                  this.__e[this.faceCount] = var10.__e[var11];
+            for (var11 = 0; var11 < var10.faceCount; ++var11) {
+               if (var3 && var10.field551 != null) {
+                  this.field551[this.faceCount] = var10.field551[var11];
                }
 
-               if(var4) {
-                  if(var10.__x != null) {
-                     this.__x[this.faceCount] = var10.__x[var11];
+               if (var4) {
+                  if (var10.field552 != null) {
+                     this.field552[this.faceCount] = var10.field552[var11];
                   } else {
-                     this.__x[this.faceCount] = var10.__a;
+                     this.field552[this.faceCount] = var10.field553;
                   }
                }
 
-               if(var5 && var10.faceAlphas != null) {
+               if (var5 && var10.faceAlphas != null) {
                   this.faceAlphas[this.faceCount] = var10.faceAlphas[var11];
                }
 
-               if(var6 && var10.__b != null) {
-                  this.__b[this.faceCount] = var10.__b[var11];
+               if (var6 && var10.field556 != null) {
+                  this.field556[this.faceCount] = var10.field556[var11];
                }
 
-               if(var7) {
-                  if(var10.faceTextures != null) {
+               if (var7) {
+                  if (var10.faceTextures != null) {
                      this.faceTextures[this.faceCount] = var10.faceTextures[var11];
                   } else {
                      this.faceTextures[this.faceCount] = -1;
                   }
                }
 
-               if(var8) {
-                  if(var10.textureCoords != null && var10.textureCoords[var11] != -1) {
-                     this.textureCoords[this.faceCount] = (byte)(this.__z + var10.textureCoords[var11]);
+               if (var8) {
+                  if (var10.textureCoords != null && var10.textureCoords[var11] != -1) {
+                     this.textureCoords[this.faceCount] = (byte)(this.field554 + var10.textureCoords[var11]);
                   } else {
                      this.textureCoords[this.faceCount] = -1;
                   }
                }
 
                this.faceColors[this.faceCount] = var10.faceColors[var11];
-               this.indices1[this.faceCount] = this.__w_217(var10, var10.indices1[var11]);
-               this.indices2[this.faceCount] = this.__w_217(var10, var10.indices2[var11]);
-               this.indices3[this.faceCount] = this.__w_217(var10, var10.indices3[var11]);
+               this.indices1[this.faceCount] = this.method205(var10, var10.indices1[var11]);
+               this.indices2[this.faceCount] = this.method205(var10, var10.indices2[var11]);
+               this.indices3[this.faceCount] = this.method205(var10, var10.indices3[var11]);
                ++this.faceCount;
             }
 
-            for(var11 = 0; var11 < var10.__z; ++var11) {
-               byte var12 = this.textureRenderTypes[this.__z] = var10.textureRenderTypes[var11];
-               if(var12 == 0) {
-                  this.texTriangleX[this.__z] = (short)this.__w_217(var10, var10.texTriangleX[var11]);
-                  this.texTriangleY[this.__z] = (short)this.__w_217(var10, var10.texTriangleY[var11]);
-                  this.texTriangleZ[this.__z] = (short)this.__w_217(var10, var10.texTriangleZ[var11]);
+            for (var11 = 0; var11 < var10.field554; ++var11) {
+               byte var12 = this.textureRenderTypes[this.field554] = var10.textureRenderTypes[var11];
+               if (var12 == 0) {
+                  this.texTriangleX[this.field554] = (short)this.method205(var10, var10.texTriangleX[var11]);
+                  this.texTriangleY[this.field554] = (short)this.method205(var10, var10.texTriangleY[var11]);
+                  this.texTriangleZ[this.field554] = (short)this.method205(var10, var10.texTriangleZ[var11]);
                }
 
-               ++this.__z;
+               ++this.field554;
             }
          }
       }
@@ -289,12 +281,12 @@ public class ModelData extends Entity {
    ModelData(byte[] var1) {
       this.verticesCount = 0;
       this.faceCount = 0;
-      this.__a = 0;
+      this.field553 = 0;
       this.isBoundsCalculated = false;
-      if(var1[var1.length - 1] == -1 && var1[var1.length - 2] == -1) {
-         this.__f_215(var1);
+      if (var1[var1.length - 1] == -1 && var1[var1.length - 2] == -1) {
+         this.method203(var1);
       } else {
-         this.__q_216(var1);
+         this.method204(var1);
       }
 
    }
@@ -306,13 +298,13 @@ public class ModelData extends Entity {
    public ModelData(ModelData var1, boolean var2, boolean var3, boolean var4, boolean var5) {
       this.verticesCount = 0;
       this.faceCount = 0;
-      this.__a = 0;
+      this.field553 = 0;
       this.isBoundsCalculated = false;
       this.verticesCount = var1.verticesCount;
       this.faceCount = var1.faceCount;
-      this.__z = var1.__z;
+      this.field554 = var1.field554;
       int var6;
-      if(var2) {
+      if (var2) {
          this.verticesX = var1.verticesX;
          this.verticesY = var1.verticesY;
          this.verticesZ = var1.verticesZ;
@@ -321,27 +313,27 @@ public class ModelData extends Entity {
          this.verticesY = new int[this.verticesCount];
          this.verticesZ = new int[this.verticesCount];
 
-         for(var6 = 0; var6 < this.verticesCount; ++var6) {
+         for (var6 = 0; var6 < this.verticesCount; ++var6) {
             this.verticesX[var6] = var1.verticesX[var6];
             this.verticesY[var6] = var1.verticesY[var6];
             this.verticesZ[var6] = var1.verticesZ[var6];
          }
       }
 
-      if(var3) {
+      if (var3) {
          this.faceColors = var1.faceColors;
       } else {
          this.faceColors = new short[this.faceCount];
 
-         for(var6 = 0; var6 < this.faceCount; ++var6) {
+         for (var6 = 0; var6 < this.faceCount; ++var6) {
             this.faceColors[var6] = var1.faceColors[var6];
          }
       }
 
-      if(!var4 && var1.faceTextures != null) {
+      if (!var4 && var1.faceTextures != null) {
          this.faceTextures = new short[this.faceCount];
 
-         for(var6 = 0; var6 < this.faceCount; ++var6) {
+         for (var6 = 0; var6 < this.faceCount; ++var6) {
             this.faceTextures[var6] = var1.faceTextures[var6];
          }
       } else {
@@ -352,27 +344,27 @@ public class ModelData extends Entity {
       this.indices1 = var1.indices1;
       this.indices2 = var1.indices2;
       this.indices3 = var1.indices3;
-      this.__e = var1.__e;
-      this.__x = var1.__x;
+      this.field551 = var1.field551;
+      this.field552 = var1.field552;
       this.textureCoords = var1.textureCoords;
-      this.__a = var1.__a;
+      this.field553 = var1.field553;
       this.textureRenderTypes = var1.textureRenderTypes;
       this.texTriangleX = var1.texTriangleX;
       this.texTriangleY = var1.texTriangleY;
       this.texTriangleZ = var1.texTriangleZ;
-      this.__h = var1.__h;
-      this.__b = var1.__b;
+      this.field555 = var1.field555;
+      this.field556 = var1.field556;
       this.vertexLabels = var1.vertexLabels;
       this.faceLabelsAlpha = var1.faceLabelsAlpha;
-      this.__v = var1.__v;
+      this.field557 = var1.field557;
       this.faceNormals = var1.faceNormals;
-      this.__ag = var1.__ag;
-      this.__aq = var1.__aq;
-      this.__aj = var1.__aj;
+      this.field558 = var1.field558;
+      this.field559 = var1.field559;
+      this.field560 = var1.field560;
    }
 
    @ObfuscatedName("f")
-   void __f_215(byte[] var1) {
+   void method203(byte[] var1) {
       Buffer var2 = new Buffer(var1);
       Buffer var3 = new Buffer(var1);
       Buffer var4 = new Buffer(var1);
@@ -381,8 +373,8 @@ public class ModelData extends Entity {
       Buffer var7 = new Buffer(var1);
       Buffer var8 = new Buffer(var1);
       var2.index = var1.length - 23;
-      int var9 = var2.__ag_302();
-      int var10 = var2.__ag_302();
+      int var9 = var2.readUnsignedShort();
+      int var10 = var2.readUnsignedShort();
       int var11 = var2.readUnsignedByte();
       int var12 = var2.readUnsignedByte();
       int var13 = var2.readUnsignedByte();
@@ -390,295 +382,295 @@ public class ModelData extends Entity {
       int var15 = var2.readUnsignedByte();
       int var16 = var2.readUnsignedByte();
       int var17 = var2.readUnsignedByte();
-      int var18 = var2.__ag_302();
-      int var19 = var2.__ag_302();
-      int var20 = var2.__ag_302();
-      int var21 = var2.__ag_302();
-      int var22 = var2.__ag_302();
+      int var18 = var2.readUnsignedShort();
+      int var19 = var2.readUnsignedShort();
+      int var20 = var2.readUnsignedShort();
+      int var21 = var2.readUnsignedShort();
+      int var22 = var2.readUnsignedShort();
       int var23 = 0;
       int var24 = 0;
       int var25 = 0;
       int var26;
-      if(var11 > 0) {
+      if (var11 > 0) {
          this.textureRenderTypes = new byte[var11];
          var2.index = 0;
 
-         for(var26 = 0; var26 < var11; ++var26) {
+         for (var26 = 0; var26 < var11; ++var26) {
             byte var27 = this.textureRenderTypes[var26] = var2.readByte();
-            if(var27 == 0) {
+            if (var27 == 0) {
                ++var23;
             }
 
-            if(var27 >= 1 && var27 <= 3) {
+            if (var27 >= 1 && var27 <= 3) {
                ++var24;
             }
 
-            if(var27 == 2) {
+            if (var27 == 2) {
                ++var25;
             }
          }
       }
 
       var26 = var11 + var9;
-      int var28 = var26;
-      if(var12 == 1) {
+      int var56 = var26;
+      if (var12 == 1) {
          var26 += var10;
       }
 
-      int var29 = var26;
+      int var28 = var26;
       var26 += var10;
+      int var29 = var26;
+      if (var13 == 255) {
+         var26 += var10;
+      }
+
       int var30 = var26;
-      if(var13 == 255) {
+      if (var15 == 1) {
          var26 += var10;
       }
 
       int var31 = var26;
-      if(var15 == 1) {
-         var26 += var10;
-      }
-
-      int var32 = var26;
-      if(var17 == 1) {
+      if (var17 == 1) {
          var26 += var9;
       }
 
-      int var33 = var26;
-      if(var14 == 1) {
+      int var32 = var26;
+      if (var14 == 1) {
          var26 += var10;
       }
 
-      int var34 = var26;
+      int var33 = var26;
       var26 += var21;
-      int var35 = var26;
-      if(var16 == 1) {
+      int var34 = var26;
+      if (var16 == 1) {
          var26 += var10 * 2;
       }
 
-      int var36 = var26;
+      int var35 = var26;
       var26 += var22;
-      int var37 = var26;
+      int var36 = var26;
       var26 += var10 * 2;
-      int var38 = var26;
+      int var37 = var26;
       var26 += var18;
-      int var39 = var26;
+      int var38 = var26;
       var26 += var19;
-      int var40 = var26;
+      int var39 = var26;
       var26 += var20;
-      int var41 = var26;
+      int var40 = var26;
       var26 += var23 * 6;
+      int var41 = var26;
+      var26 += var24 * 6;
       int var42 = var26;
       var26 += var24 * 6;
       int var43 = var26;
-      var26 += var24 * 6;
-      int var44 = var26;
       var26 += var24 * 2;
-      int var45 = var26;
+      int var44 = var26;
       var26 += var24;
-      int var46 = var26;
+      int var45 = var26;
       var26 += var24 * 2 + var25 * 2;
       this.verticesCount = var9;
       this.faceCount = var10;
-      this.__z = var11;
+      this.field554 = var11;
       this.verticesX = new int[var9];
       this.verticesY = new int[var9];
       this.verticesZ = new int[var9];
       this.indices1 = new int[var10];
       this.indices2 = new int[var10];
       this.indices3 = new int[var10];
-      if(var17 == 1) {
-         this.__h = new int[var9];
+      if (var17 == 1) {
+         this.field555 = new int[var9];
       }
 
-      if(var12 == 1) {
-         this.__e = new byte[var10];
+      if (var12 == 1) {
+         this.field551 = new byte[var10];
       }
 
-      if(var13 == 255) {
-         this.__x = new byte[var10];
+      if (var13 == 255) {
+         this.field552 = new byte[var10];
       } else {
-         this.__a = (byte)var13;
+         this.field553 = (byte)var13;
       }
 
-      if(var14 == 1) {
+      if (var14 == 1) {
          this.faceAlphas = new byte[var10];
       }
 
-      if(var15 == 1) {
-         this.__b = new int[var10];
+      if (var15 == 1) {
+         this.field556 = new int[var10];
       }
 
-      if(var16 == 1) {
+      if (var16 == 1) {
          this.faceTextures = new short[var10];
       }
 
-      if(var16 == 1 && var11 > 0) {
+      if (var16 == 1 && var11 > 0) {
          this.textureCoords = new byte[var10];
       }
 
       this.faceColors = new short[var10];
-      if(var11 > 0) {
+      if (var11 > 0) {
          this.texTriangleX = new short[var11];
          this.texTriangleY = new short[var11];
          this.texTriangleZ = new short[var11];
       }
 
       var2.index = var11;
-      var3.index = var38;
-      var4.index = var39;
-      var5.index = var40;
-      var6.index = var32;
+      var3.index = var37;
+      var4.index = var38;
+      var5.index = var39;
+      var6.index = var31;
+      int var46 = 0;
+      int var47 = 0;
       int var48 = 0;
-      int var49 = 0;
-      int var50 = 0;
 
+      int var49;
+      int var50;
       int var51;
       int var52;
       int var53;
-      int var54;
-      int var55;
-      for(var51 = 0; var51 < var9; ++var51) {
-         var52 = var2.readUnsignedByte();
+      for (var49 = 0; var49 < var9; ++var49) {
+         var50 = var2.readUnsignedByte();
+         var51 = 0;
+         if ((var50 & 1) != 0) {
+            var51 = var3.readShortSmart();
+         }
+
+         var52 = 0;
+         if ((var50 & 2) != 0) {
+            var52 = var4.readShortSmart();
+         }
+
          var53 = 0;
-         if((var52 & 1) != 0) {
-            var53 = var3.__ab_306();
+         if ((var50 & 4) != 0) {
+            var53 = var5.readShortSmart();
          }
 
-         var54 = 0;
-         if((var52 & 2) != 0) {
-            var54 = var4.__ab_306();
-         }
-
-         var55 = 0;
-         if((var52 & 4) != 0) {
-            var55 = var5.__ab_306();
-         }
-
-         this.verticesX[var51] = var48 + var53;
-         this.verticesY[var51] = var49 + var54;
-         this.verticesZ[var51] = var50 + var55;
-         var48 = this.verticesX[var51];
-         var49 = this.verticesY[var51];
-         var50 = this.verticesZ[var51];
-         if(var17 == 1) {
-            this.__h[var51] = var6.readUnsignedByte();
+         this.verticesX[var49] = var46 + var51;
+         this.verticesY[var49] = var47 + var52;
+         this.verticesZ[var49] = var48 + var53;
+         var46 = this.verticesX[var49];
+         var47 = this.verticesY[var49];
+         var48 = this.verticesZ[var49];
+         if (var17 == 1) {
+            this.field555[var49] = var6.readUnsignedByte();
          }
       }
 
-      var2.index = var37;
+      var2.index = var36;
+      var3.index = var56;
+      var4.index = var29;
+      var5.index = var32;
+      var6.index = var30;
+      var7.index = var34;
+      var8.index = var35;
+
+      for (var49 = 0; var49 < var10; ++var49) {
+         this.faceColors[var49] = (short)var2.readUnsignedShort();
+         if (var12 == 1) {
+            this.field551[var49] = var3.readByte();
+         }
+
+         if (var13 == 255) {
+            this.field552[var49] = var4.readByte();
+         }
+
+         if (var14 == 1) {
+            this.faceAlphas[var49] = var5.readByte();
+         }
+
+         if (var15 == 1) {
+            this.field556[var49] = var6.readUnsignedByte();
+         }
+
+         if (var16 == 1) {
+            this.faceTextures[var49] = (short)(var7.readUnsignedShort() - 1);
+         }
+
+         if (this.textureCoords != null && this.faceTextures[var49] != -1) {
+            this.textureCoords[var49] = (byte)(var8.readUnsignedByte() - 1);
+         }
+      }
+
+      var2.index = var33;
       var3.index = var28;
-      var4.index = var30;
-      var5.index = var33;
-      var6.index = var31;
-      var7.index = var35;
-      var8.index = var36;
-
-      for(var51 = 0; var51 < var10; ++var51) {
-         this.faceColors[var51] = (short)var2.__ag_302();
-         if(var12 == 1) {
-            this.__e[var51] = var3.readByte();
-         }
-
-         if(var13 == 255) {
-            this.__x[var51] = var4.readByte();
-         }
-
-         if(var14 == 1) {
-            this.faceAlphas[var51] = var5.readByte();
-         }
-
-         if(var15 == 1) {
-            this.__b[var51] = var6.readUnsignedByte();
-         }
-
-         if(var16 == 1) {
-            this.faceTextures[var51] = (short)(var7.__ag_302() - 1);
-         }
-
-         if(this.textureCoords != null && this.faceTextures[var51] != -1) {
-            this.textureCoords[var51] = (byte)(var8.readUnsignedByte() - 1);
-         }
-      }
-
-      var2.index = var34;
-      var3.index = var29;
+      var49 = 0;
+      var50 = 0;
       var51 = 0;
       var52 = 0;
-      var53 = 0;
-      var54 = 0;
 
-      int var56;
-      for(var55 = 0; var55 < var10; ++var55) {
-         var56 = var3.readUnsignedByte();
-         if(var56 == 1) {
-            var51 = var2.__ab_306() + var54;
-            var52 = var2.__ab_306() + var51;
-            var53 = var2.__ab_306() + var52;
-            var54 = var53;
-            this.indices1[var55] = var51;
-            this.indices2[var55] = var52;
-            this.indices3[var55] = var53;
+      int var54;
+      for (var53 = 0; var53 < var10; ++var53) {
+         var54 = var3.readUnsignedByte();
+         if (var54 == 1) {
+            var49 = var2.readShortSmart() + var52;
+            var50 = var2.readShortSmart() + var49;
+            var51 = var2.readShortSmart() + var50;
+            var52 = var51;
+            this.indices1[var53] = var49;
+            this.indices2[var53] = var50;
+            this.indices3[var53] = var51;
          }
 
-         if(var56 == 2) {
-            var52 = var53;
-            var53 = var2.__ab_306() + var54;
-            var54 = var53;
-            this.indices1[var55] = var51;
-            this.indices2[var55] = var52;
-            this.indices3[var55] = var53;
+         if (var54 == 2) {
+            var50 = var51;
+            var51 = var2.readShortSmart() + var52;
+            var52 = var51;
+            this.indices1[var53] = var49;
+            this.indices2[var53] = var50;
+            this.indices3[var53] = var51;
          }
 
-         if(var56 == 3) {
-            var51 = var53;
-            var53 = var2.__ab_306() + var54;
-            var54 = var53;
-            this.indices1[var55] = var51;
-            this.indices2[var55] = var52;
-            this.indices3[var55] = var53;
+         if (var54 == 3) {
+            var49 = var51;
+            var51 = var2.readShortSmart() + var52;
+            var52 = var51;
+            this.indices1[var53] = var49;
+            this.indices2[var53] = var50;
+            this.indices3[var53] = var51;
          }
 
-         if(var56 == 4) {
-            int var57 = var51;
-            var51 = var52;
-            var52 = var57;
-            var53 = var2.__ab_306() + var54;
-            var54 = var53;
-            this.indices1[var55] = var51;
-            this.indices2[var55] = var57;
-            this.indices3[var55] = var53;
+         if (var54 == 4) {
+            int var55 = var49;
+            var49 = var50;
+            var50 = var55;
+            var51 = var2.readShortSmart() + var52;
+            var52 = var51;
+            this.indices1[var53] = var49;
+            this.indices2[var53] = var55;
+            this.indices3[var53] = var51;
          }
       }
 
-      var2.index = var41;
-      var3.index = var42;
-      var4.index = var43;
-      var5.index = var44;
-      var6.index = var45;
-      var7.index = var46;
+      var2.index = var40;
+      var3.index = var41;
+      var4.index = var42;
+      var5.index = var43;
+      var6.index = var44;
+      var7.index = var45;
 
-      for(var55 = 0; var55 < var11; ++var55) {
-         var56 = this.textureRenderTypes[var55] & 255;
-         if(var56 == 0) {
-            this.texTriangleX[var55] = (short)var2.__ag_302();
-            this.texTriangleY[var55] = (short)var2.__ag_302();
-            this.texTriangleZ[var55] = (short)var2.__ag_302();
+      for (var53 = 0; var53 < var11; ++var53) {
+         var54 = this.textureRenderTypes[var53] & 255;
+         if (var54 == 0) {
+            this.texTriangleX[var53] = (short)var2.readUnsignedShort();
+            this.texTriangleY[var53] = (short)var2.readUnsignedShort();
+            this.texTriangleZ[var53] = (short)var2.readUnsignedShort();
          }
       }
 
       var2.index = var26;
-      var55 = var2.readUnsignedByte();
-      if(var55 != 0) {
+      var53 = var2.readUnsignedByte();
+      if (var53 != 0) {
          new ModelData0();
-         var2.__ag_302();
-         var2.__ag_302();
-         var2.__ag_302();
+         var2.readUnsignedShort();
+         var2.readUnsignedShort();
+         var2.readUnsignedShort();
          var2.readInt();
       }
 
    }
 
    @ObfuscatedName("q")
-   void __q_216(byte[] var1) {
+   void method204(byte[] var1) {
       boolean var2 = false;
       boolean var3 = false;
       Buffer var4 = new Buffer(var1);
@@ -687,103 +679,103 @@ public class ModelData extends Entity {
       Buffer var7 = new Buffer(var1);
       Buffer var8 = new Buffer(var1);
       var4.index = var1.length - 18;
-      int var9 = var4.__ag_302();
-      int var10 = var4.__ag_302();
+      int var9 = var4.readUnsignedShort();
+      int var10 = var4.readUnsignedShort();
       int var11 = var4.readUnsignedByte();
       int var12 = var4.readUnsignedByte();
       int var13 = var4.readUnsignedByte();
       int var14 = var4.readUnsignedByte();
       int var15 = var4.readUnsignedByte();
       int var16 = var4.readUnsignedByte();
-      int var17 = var4.__ag_302();
-      int var18 = var4.__ag_302();
-      int var19 = var4.__ag_302();
-      int var20 = var4.__ag_302();
+      int var17 = var4.readUnsignedShort();
+      int var18 = var4.readUnsignedShort();
+      int var19 = var4.readUnsignedShort();
+      int var20 = var4.readUnsignedShort();
       byte var21 = 0;
-      int var45 = var21 + var9;
-      int var23 = var45;
-      var45 += var10;
-      int var24 = var45;
-      if(var13 == 255) {
-         var45 += var10;
+      int var22 = var21 + var9;
+      int var23 = var22;
+      var22 += var10;
+      int var24 = var22;
+      if (var13 == 255) {
+         var22 += var10;
       }
 
-      int var25 = var45;
-      if(var15 == 1) {
-         var45 += var10;
+      int var25 = var22;
+      if (var15 == 1) {
+         var22 += var10;
       }
 
-      int var26 = var45;
-      if(var12 == 1) {
-         var45 += var10;
+      int var26 = var22;
+      if (var12 == 1) {
+         var22 += var10;
       }
 
-      int var27 = var45;
-      if(var16 == 1) {
-         var45 += var9;
+      int var27 = var22;
+      if (var16 == 1) {
+         var22 += var9;
       }
 
-      int var28 = var45;
-      if(var14 == 1) {
-         var45 += var10;
+      int var28 = var22;
+      if (var14 == 1) {
+         var22 += var10;
       }
 
-      int var29 = var45;
-      var45 += var20;
-      int var30 = var45;
-      var45 += var10 * 2;
-      int var31 = var45;
-      var45 += var11 * 6;
-      int var32 = var45;
-      var45 += var17;
-      int var33 = var45;
-      var45 += var18;
-      int var10000 = var45 + var19;
+      int var29 = var22;
+      var22 += var20;
+      int var30 = var22;
+      var22 += var10 * 2;
+      int var31 = var22;
+      var22 += var11 * 6;
+      int var32 = var22;
+      var22 += var17;
+      int var33 = var22;
+      var22 += var18;
+      int var10000 = var22 + var19;
       this.verticesCount = var9;
       this.faceCount = var10;
-      this.__z = var11;
+      this.field554 = var11;
       this.verticesX = new int[var9];
       this.verticesY = new int[var9];
       this.verticesZ = new int[var9];
       this.indices1 = new int[var10];
       this.indices2 = new int[var10];
       this.indices3 = new int[var10];
-      if(var11 > 0) {
+      if (var11 > 0) {
          this.textureRenderTypes = new byte[var11];
          this.texTriangleX = new short[var11];
          this.texTriangleY = new short[var11];
          this.texTriangleZ = new short[var11];
       }
 
-      if(var16 == 1) {
-         this.__h = new int[var9];
+      if (var16 == 1) {
+         this.field555 = new int[var9];
       }
 
-      if(var12 == 1) {
-         this.__e = new byte[var10];
+      if (var12 == 1) {
+         this.field551 = new byte[var10];
          this.textureCoords = new byte[var10];
          this.faceTextures = new short[var10];
       }
 
-      if(var13 == 255) {
-         this.__x = new byte[var10];
+      if (var13 == 255) {
+         this.field552 = new byte[var10];
       } else {
-         this.__a = (byte)var13;
+         this.field553 = (byte)var13;
       }
 
-      if(var14 == 1) {
+      if (var14 == 1) {
          this.faceAlphas = new byte[var10];
       }
 
-      if(var15 == 1) {
-         this.__b = new int[var10];
+      if (var15 == 1) {
+         this.field556 = new int[var10];
       }
 
       this.faceColors = new short[var10];
       var4.index = var21;
       var5.index = var32;
       var6.index = var33;
-      var7.index = var45;
+      var7.index = var22;
       var8.index = var27;
       int var35 = 0;
       int var36 = 0;
@@ -794,21 +786,21 @@ public class ModelData extends Entity {
       int var40;
       int var41;
       int var42;
-      for(var38 = 0; var38 < var9; ++var38) {
+      for (var38 = 0; var38 < var9; ++var38) {
          var39 = var4.readUnsignedByte();
          var40 = 0;
-         if((var39 & 1) != 0) {
-            var40 = var5.__ab_306();
+         if ((var39 & 1) != 0) {
+            var40 = var5.readShortSmart();
          }
 
          var41 = 0;
-         if((var39 & 2) != 0) {
-            var41 = var6.__ab_306();
+         if ((var39 & 2) != 0) {
+            var41 = var6.readShortSmart();
          }
 
          var42 = 0;
-         if((var39 & 4) != 0) {
-            var42 = var7.__ab_306();
+         if ((var39 & 4) != 0) {
+            var42 = var7.readShortSmart();
          }
 
          this.verticesX[var38] = var35 + var40;
@@ -817,8 +809,8 @@ public class ModelData extends Entity {
          var35 = this.verticesX[var38];
          var36 = this.verticesY[var38];
          var37 = this.verticesZ[var38];
-         if(var16 == 1) {
-            this.__h[var38] = var8.readUnsignedByte();
+         if (var16 == 1) {
+            this.field555[var38] = var8.readUnsignedByte();
          }
       }
 
@@ -828,22 +820,22 @@ public class ModelData extends Entity {
       var7.index = var28;
       var8.index = var25;
 
-      for(var38 = 0; var38 < var10; ++var38) {
-         this.faceColors[var38] = (short)var4.__ag_302();
-         if(var12 == 1) {
+      for (var38 = 0; var38 < var10; ++var38) {
+         this.faceColors[var38] = (short)var4.readUnsignedShort();
+         if (var12 == 1) {
             var39 = var5.readUnsignedByte();
-            if((var39 & 1) == 1) {
-               this.__e[var38] = 1;
+            if ((var39 & 1) == 1) {
+               this.field551[var38] = 1;
                var2 = true;
             } else {
-               this.__e[var38] = 0;
+               this.field551[var38] = 0;
             }
 
-            if((var39 & 2) == 2) {
+            if ((var39 & 2) == 2) {
                this.textureCoords[var38] = (byte)(var39 >> 2);
                this.faceTextures[var38] = this.faceColors[var38];
                this.faceColors[var38] = 127;
-               if(this.faceTextures[var38] != -1) {
+               if (this.faceTextures[var38] != -1) {
                   var3 = true;
                }
             } else {
@@ -852,16 +844,16 @@ public class ModelData extends Entity {
             }
          }
 
-         if(var13 == 255) {
-            this.__x[var38] = var6.readByte();
+         if (var13 == 255) {
+            this.field552[var38] = var6.readByte();
          }
 
-         if(var14 == 1) {
+         if (var14 == 1) {
             this.faceAlphas[var38] = var7.readByte();
          }
 
-         if(var15 == 1) {
-            this.__b[var38] = var8.readUnsignedByte();
+         if (var15 == 1) {
+            this.field556[var38] = var8.readUnsignedByte();
          }
       }
 
@@ -874,41 +866,41 @@ public class ModelData extends Entity {
 
       int var43;
       int var44;
-      for(var42 = 0; var42 < var10; ++var42) {
+      for (var42 = 0; var42 < var10; ++var42) {
          var43 = var5.readUnsignedByte();
-         if(var43 == 1) {
-            var38 = var4.__ab_306() + var41;
-            var39 = var4.__ab_306() + var38;
-            var40 = var4.__ab_306() + var39;
+         if (var43 == 1) {
+            var38 = var4.readShortSmart() + var41;
+            var39 = var4.readShortSmart() + var38;
+            var40 = var4.readShortSmart() + var39;
             var41 = var40;
             this.indices1[var42] = var38;
             this.indices2[var42] = var39;
             this.indices3[var42] = var40;
          }
 
-         if(var43 == 2) {
+         if (var43 == 2) {
             var39 = var40;
-            var40 = var4.__ab_306() + var41;
+            var40 = var4.readShortSmart() + var41;
             var41 = var40;
             this.indices1[var42] = var38;
             this.indices2[var42] = var39;
             this.indices3[var42] = var40;
          }
 
-         if(var43 == 3) {
+         if (var43 == 3) {
             var38 = var40;
-            var40 = var4.__ab_306() + var41;
+            var40 = var4.readShortSmart() + var41;
             var41 = var40;
             this.indices1[var42] = var38;
             this.indices2[var42] = var39;
             this.indices3[var42] = var40;
          }
 
-         if(var43 == 4) {
+         if (var43 == 4) {
             var44 = var38;
             var38 = var39;
             var39 = var44;
-            var40 = var4.__ab_306() + var41;
+            var40 = var4.readShortSmart() + var41;
             var41 = var40;
             this.indices1[var42] = var38;
             this.indices2[var42] = var44;
@@ -918,38 +910,38 @@ public class ModelData extends Entity {
 
       var4.index = var31;
 
-      for(var42 = 0; var42 < var11; ++var42) {
+      for (var42 = 0; var42 < var11; ++var42) {
          this.textureRenderTypes[var42] = 0;
-         this.texTriangleX[var42] = (short)var4.__ag_302();
-         this.texTriangleY[var42] = (short)var4.__ag_302();
-         this.texTriangleZ[var42] = (short)var4.__ag_302();
+         this.texTriangleX[var42] = (short)var4.readUnsignedShort();
+         this.texTriangleY[var42] = (short)var4.readUnsignedShort();
+         this.texTriangleZ[var42] = (short)var4.readUnsignedShort();
       }
 
-      if(this.textureCoords != null) {
-         boolean var46 = false;
+      if (this.textureCoords != null) {
+         boolean var45 = false;
 
-         for(var43 = 0; var43 < var10; ++var43) {
+         for (var43 = 0; var43 < var10; ++var43) {
             var44 = this.textureCoords[var43] & 255;
-            if(var44 != 255) {
-               if(this.indices1[var43] == (this.texTriangleX[var44] & '\uffff') && this.indices2[var43] == (this.texTriangleY[var44] & '\uffff') && this.indices3[var43] == (this.texTriangleZ[var44] & '\uffff')) {
+            if (var44 != 255) {
+               if (this.indices1[var43] == (this.texTriangleX[var44] & '\uffff') && this.indices2[var43] == (this.texTriangleY[var44] & '\uffff') && this.indices3[var43] == (this.texTriangleZ[var44] & '\uffff')) {
                   this.textureCoords[var43] = -1;
                } else {
-                  var46 = true;
+                  var45 = true;
                }
             }
          }
 
-         if(!var46) {
+         if (!var45) {
             this.textureCoords = null;
          }
       }
 
-      if(!var3) {
+      if (!var3) {
          this.faceTextures = null;
       }
 
-      if(!var2) {
-         this.__e = null;
+      if (!var2) {
+         this.field551 = null;
       }
 
    }
@@ -958,25 +950,25 @@ public class ModelData extends Entity {
    @ObfuscatedSignature(
       signature = "(Ldw;I)I"
    )
-   final int __w_217(ModelData var1, int var2) {
+   final int method205(ModelData var1, int var2) {
       int var3 = -1;
       int var4 = var1.verticesX[var2];
       int var5 = var1.verticesY[var2];
       int var6 = var1.verticesZ[var2];
 
-      for(int var7 = 0; var7 < this.verticesCount; ++var7) {
-         if(var4 == this.verticesX[var7] && var5 == this.verticesY[var7] && var6 == this.verticesZ[var7]) {
+      for (int var7 = 0; var7 < this.verticesCount; ++var7) {
+         if (var4 == this.verticesX[var7] && var5 == this.verticesY[var7] && var6 == this.verticesZ[var7]) {
             var3 = var7;
             break;
          }
       }
 
-      if(var3 == -1) {
+      if (var3 == -1) {
          this.verticesX[this.verticesCount] = var4;
          this.verticesY[this.verticesCount] = var5;
          this.verticesZ[this.verticesCount] = var6;
-         if(var1.__h != null) {
-            this.__h[this.verticesCount] = var1.__h[var2];
+         if (var1.field555 != null) {
+            this.field555[this.verticesCount] = var1.field555[var2];
          }
 
          var3 = this.verticesCount++;
@@ -989,43 +981,43 @@ public class ModelData extends Entity {
    @ObfuscatedSignature(
       signature = "()Ldw;"
    )
-   public ModelData __o_218() {
+   public ModelData method206() {
       ModelData var1 = new ModelData();
-      if(this.__e != null) {
-         var1.__e = new byte[this.faceCount];
+      if (this.field551 != null) {
+         var1.field551 = new byte[this.faceCount];
 
-         for(int var2 = 0; var2 < this.faceCount; ++var2) {
-            var1.__e[var2] = this.__e[var2];
+         for (int var2 = 0; var2 < this.faceCount; ++var2) {
+            var1.field551[var2] = this.field551[var2];
          }
       }
 
       var1.verticesCount = this.verticesCount;
       var1.faceCount = this.faceCount;
-      var1.__z = this.__z;
+      var1.field554 = this.field554;
       var1.verticesX = this.verticesX;
       var1.verticesY = this.verticesY;
       var1.verticesZ = this.verticesZ;
       var1.indices1 = this.indices1;
       var1.indices2 = this.indices2;
       var1.indices3 = this.indices3;
-      var1.__x = this.__x;
+      var1.field552 = this.field552;
       var1.faceAlphas = this.faceAlphas;
       var1.textureCoords = this.textureCoords;
       var1.faceColors = this.faceColors;
       var1.faceTextures = this.faceTextures;
-      var1.__a = this.__a;
+      var1.field553 = this.field553;
       var1.textureRenderTypes = this.textureRenderTypes;
       var1.texTriangleX = this.texTriangleX;
       var1.texTriangleY = this.texTriangleY;
       var1.texTriangleZ = this.texTriangleZ;
-      var1.__h = this.__h;
-      var1.__b = this.__b;
+      var1.field555 = this.field555;
+      var1.field556 = this.field556;
       var1.vertexLabels = this.vertexLabels;
       var1.faceLabelsAlpha = this.faceLabelsAlpha;
-      var1.__v = this.__v;
+      var1.field557 = this.field557;
       var1.faceNormals = this.faceNormals;
-      var1.__aq = this.__aq;
-      var1.__aj = this.__aj;
+      var1.field559 = this.field559;
+      var1.field560 = this.field560;
       return var1;
    }
 
@@ -1033,46 +1025,46 @@ public class ModelData extends Entity {
    @ObfuscatedSignature(
       signature = "([[IIIIZI)Ldw;"
    )
-   public ModelData __u_219(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) {
-      this.__c_229();
-      int var7 = var2 + this.__ac;
-      int var8 = var2 + this.__ay;
-      int var9 = var4 + this.__ak;
-      int var10 = var4 + this.__ah;
-      if(var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) {
+   public ModelData method207(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) {
+      this.method217();
+      int var7 = var2 + this.field562;
+      int var8 = var2 + this.field563;
+      int var9 = var4 + this.field565;
+      int var10 = var4 + this.field564;
+      if (var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) {
          var7 >>= 7;
          var8 = var8 + 127 >> 7;
          var9 >>= 7;
          var10 = var10 + 127 >> 7;
-         if(var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) {
+         if (var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) {
             return this;
          } else {
             ModelData var11 = new ModelData();
             var11.verticesCount = this.verticesCount;
             var11.faceCount = this.faceCount;
-            var11.__z = this.__z;
+            var11.field554 = this.field554;
             var11.verticesX = this.verticesX;
             var11.verticesZ = this.verticesZ;
             var11.indices1 = this.indices1;
             var11.indices2 = this.indices2;
             var11.indices3 = this.indices3;
-            var11.__e = this.__e;
-            var11.__x = this.__x;
+            var11.field551 = this.field551;
+            var11.field552 = this.field552;
             var11.faceAlphas = this.faceAlphas;
             var11.textureCoords = this.textureCoords;
             var11.faceColors = this.faceColors;
             var11.faceTextures = this.faceTextures;
-            var11.__a = this.__a;
+            var11.field553 = this.field553;
             var11.textureRenderTypes = this.textureRenderTypes;
             var11.texTriangleX = this.texTriangleX;
             var11.texTriangleY = this.texTriangleY;
             var11.texTriangleZ = this.texTriangleZ;
-            var11.__h = this.__h;
-            var11.__b = this.__b;
+            var11.field555 = this.field555;
+            var11.field556 = this.field556;
             var11.vertexLabels = this.vertexLabels;
             var11.faceLabelsAlpha = this.faceLabelsAlpha;
-            var11.__aq = this.__aq;
-            var11.__aj = this.__aj;
+            var11.field559 = this.field559;
+            var11.field560 = this.field560;
             var11.verticesY = new int[var11.verticesCount];
             int var12;
             int var13;
@@ -1084,8 +1076,8 @@ public class ModelData extends Entity {
             int var19;
             int var20;
             int var21;
-            if(var6 == 0) {
-               for(var12 = 0; var12 < var11.verticesCount; ++var12) {
+            if (var6 == 0) {
+               for (var12 = 0; var12 < var11.verticesCount; ++var12) {
                   var13 = var2 + this.verticesX[var12];
                   var14 = var4 + this.verticesZ[var12];
                   var15 = var13 & 127;
@@ -1098,9 +1090,9 @@ public class ModelData extends Entity {
                   var11.verticesY[var12] = var21 + this.verticesY[var12] - var3;
                }
             } else {
-               for(var12 = 0; var12 < var11.verticesCount; ++var12) {
+               for (var12 = 0; var12 < var11.verticesCount; ++var12) {
                   var13 = (-this.verticesY[var12] << 16) / super.height;
-                  if(var13 < var6) {
+                  if (var13 < var6) {
                      var14 = var2 + this.verticesX[var12];
                      var15 = var4 + this.verticesZ[var12];
                      var16 = var14 & 127;
@@ -1124,68 +1116,69 @@ public class ModelData extends Entity {
    }
 
    @ObfuscatedName("g")
-   void __g_220() {
+   void method208() {
       int[] var1;
       int var2;
-      int var3;
+      int var10003;
       int var4;
-      if(this.__h != null) {
+      int var5;
+      if (this.field555 != null) {
          var1 = new int[256];
          var2 = 0;
 
-         for(var3 = 0; var3 < this.verticesCount; ++var3) {
-            var4 = this.__h[var3];
-            ++var1[var4];
-            if(var4 > var2) {
-               var2 = var4;
+         for (var4 = 0; var4 < this.verticesCount; ++var4) {
+            var5 = this.field555[var4];
+            var10003 = var1[var5]++;
+            if (var5 > var2) {
+               var2 = var5;
             }
          }
 
          this.vertexLabels = new int[var2 + 1][];
 
-         for(var3 = 0; var3 <= var2; ++var3) {
-            this.vertexLabels[var3] = new int[var1[var3]];
-            var1[var3] = 0;
+         for (var4 = 0; var4 <= var2; ++var4) {
+            this.vertexLabels[var4] = new int[var1[var4]];
+            var1[var4] = 0;
          }
 
-         for(var3 = 0; var3 < this.verticesCount; this.vertexLabels[var4][var1[var4]++] = var3++) {
-            var4 = this.__h[var3];
+         for (var4 = 0; var4 < this.verticesCount; this.vertexLabels[var5][var1[var5]++] = var4++) {
+            var5 = this.field555[var4];
          }
 
-         this.__h = null;
+         this.field555 = null;
       }
 
-      if(this.__b != null) {
+      if (this.field556 != null) {
          var1 = new int[256];
          var2 = 0;
 
-         for(var3 = 0; var3 < this.faceCount; ++var3) {
-            var4 = this.__b[var3];
-            ++var1[var4];
-            if(var4 > var2) {
-               var2 = var4;
+         for (var4 = 0; var4 < this.faceCount; ++var4) {
+            var5 = this.field556[var4];
+            var10003 = var1[var5]++;
+            if (var5 > var2) {
+               var2 = var5;
             }
          }
 
          this.faceLabelsAlpha = new int[var2 + 1][];
 
-         for(var3 = 0; var3 <= var2; ++var3) {
-            this.faceLabelsAlpha[var3] = new int[var1[var3]];
-            var1[var3] = 0;
+         for (var4 = 0; var4 <= var2; ++var4) {
+            this.faceLabelsAlpha[var4] = new int[var1[var4]];
+            var1[var4] = 0;
          }
 
-         for(var3 = 0; var3 < this.faceCount; this.faceLabelsAlpha[var4][var1[var4]++] = var3++) {
-            var4 = this.__b[var3];
+         for (var4 = 0; var4 < this.faceCount; this.faceLabelsAlpha[var5][var1[var5]++] = var4++) {
+            var5 = this.field556[var4];
          }
 
-         this.__b = null;
+         this.field556 = null;
       }
 
    }
 
    @ObfuscatedName("l")
-   public void __l_221() {
-      for(int var1 = 0; var1 < this.verticesCount; ++var1) {
+   public void method209() {
+      for (int var1 = 0; var1 < this.verticesCount; ++var1) {
          int var2 = this.verticesX[var1];
          this.verticesX[var1] = this.verticesZ[var1];
          this.verticesZ[var1] = -var2;
@@ -1195,8 +1188,8 @@ public class ModelData extends Entity {
    }
 
    @ObfuscatedName("x")
-   public void __x_222() {
-      for(int var1 = 0; var1 < this.verticesCount; ++var1) {
+   public void method210() {
+      for (int var1 = 0; var1 < this.verticesCount; ++var1) {
          this.verticesX[var1] = -this.verticesX[var1];
          this.verticesZ[var1] = -this.verticesZ[var1];
       }
@@ -1205,8 +1198,8 @@ public class ModelData extends Entity {
    }
 
    @ObfuscatedName("d")
-   public void __d_223() {
-      for(int var1 = 0; var1 < this.verticesCount; ++var1) {
+   public void method211() {
+      for (int var1 = 0; var1 < this.verticesCount; ++var1) {
          int var2 = this.verticesZ[var1];
          this.verticesZ[var1] = this.verticesX[var1];
          this.verticesX[var1] = -var2;
@@ -1216,11 +1209,11 @@ public class ModelData extends Entity {
    }
 
    @ObfuscatedName("a")
-   public void __a_224(int var1) {
+   public void method212(int var1) {
       int var2 = ModelData_sine[var1];
       int var3 = ModelData_cosine[var1];
 
-      for(int var4 = 0; var4 < this.verticesCount; ++var4) {
+      for (int var4 = 0; var4 < this.verticesCount; ++var4) {
          int var5 = var2 * this.verticesZ[var4] + var3 * this.verticesX[var4] >> 16;
          this.verticesZ[var4] = var3 * this.verticesZ[var4] - var2 * this.verticesX[var4] >> 16;
          this.verticesX[var4] = var5;
@@ -1230,11 +1223,14 @@ public class ModelData extends Entity {
    }
 
    @ObfuscatedName("z")
-   public void __z_225(int var1, int var2, int var3) {
-      for(int var4 = 0; var4 < this.verticesCount; ++var4) {
-         this.verticesX[var4] += var1;
-         this.verticesY[var4] += var2;
-         this.verticesZ[var4] += var3;
+   public void method213(int var1, int var2, int var3) {
+      for (int var4 = 0; var4 < this.verticesCount; ++var4) {
+         int[] var5 = this.verticesX;
+         var5[var4] += var1;
+         var5 = this.verticesY;
+         var5[var4] += var2;
+         var5 = this.verticesZ;
+         var5[var4] += var3;
       }
 
       this.invalidate();
@@ -1242,9 +1238,9 @@ public class ModelData extends Entity {
 
    @ObfuscatedName("j")
    @Export("recolor")
-   public void recolor(short var1, short var2) {
-      for(int var3 = 0; var3 < this.faceCount; ++var3) {
-         if(this.faceColors[var3] == var1) {
+   public void recolor(short from, short var2) {
+      for (int var3 = 0; var3 < this.faceCount; ++var3) {
+         if (this.faceColors[var3] == from) {
             this.faceColors[var3] = var2;
          }
       }
@@ -1253,25 +1249,25 @@ public class ModelData extends Entity {
 
    @ObfuscatedName("s")
    @Export("retexture")
-   public void retexture(short var1, short var2) {
-      if(this.faceTextures != null) {
-         for(int var3 = 0; var3 < this.faceCount; ++var3) {
-            if(this.faceTextures[var3] == var1) {
+   public void retexture(short from, short var2) {
+      if (this.faceTextures != null) {
+         for (int var3 = 0; var3 < this.faceCount; ++var3) {
+            if (this.faceTextures[var3] == from) {
                this.faceTextures[var3] = var2;
             }
          }
-
       }
+
    }
 
    @ObfuscatedName("t")
-   public void __t_226() {
+   public void method214() {
       int var1;
-      for(var1 = 0; var1 < this.verticesCount; ++var1) {
+      for (var1 = 0; var1 < this.verticesCount; ++var1) {
          this.verticesZ[var1] = -this.verticesZ[var1];
       }
 
-      for(var1 = 0; var1 < this.faceCount; ++var1) {
+      for (var1 = 0; var1 < this.faceCount; ++var1) {
          int var2 = this.indices1[var1];
          this.indices1[var1] = this.indices3[var1];
          this.indices3[var1] = var2;
@@ -1281,8 +1277,8 @@ public class ModelData extends Entity {
    }
 
    @ObfuscatedName("y")
-   public void __y_227(int var1, int var2, int var3) {
-      for(int var4 = 0; var4 < this.verticesCount; ++var4) {
+   public void method215(int var1, int var2, int var3) {
+      for (int var4 = 0; var4 < this.verticesCount; ++var4) {
          this.verticesX[var4] = this.verticesX[var4] * var1 / 128;
          this.verticesY[var4] = var2 * this.verticesY[var4] / 128;
          this.verticesZ[var4] = var3 * this.verticesZ[var4] / 128;
@@ -1292,16 +1288,16 @@ public class ModelData extends Entity {
    }
 
    @ObfuscatedName("h")
-   public void __h_228() {
-      if(this.__v == null) {
-         this.__v = new VertexNormal[this.verticesCount];
+   public void method216() {
+      if (this.field557 == null) {
+         this.field557 = new VertexNormal[this.verticesCount];
 
          int var1;
-         for(var1 = 0; var1 < this.verticesCount; ++var1) {
-            this.__v[var1] = new VertexNormal();
+         for (var1 = 0; var1 < this.verticesCount; ++var1) {
+            this.field557[var1] = new VertexNormal();
          }
 
-         for(var1 = 0; var1 < this.faceCount; ++var1) {
+         for (var1 = 0; var1 < this.faceCount; ++var1) {
             int var2 = this.indices1[var1];
             int var3 = this.indices2[var1];
             int var4 = this.indices3[var1];
@@ -1315,13 +1311,13 @@ public class ModelData extends Entity {
             int var12 = var7 * var8 - var10 * var5;
 
             int var13;
-            for(var13 = var5 * var9 - var8 * var6; var11 > 8192 || var12 > 8192 || var13 > 8192 || var11 < -8192 || var12 < -8192 || var13 < -8192; var13 >>= 1) {
+            for (var13 = var5 * var9 - var8 * var6; var11 > 8192 || var12 > 8192 || var13 > 8192 || var11 < -8192 || var12 < -8192 || var13 < -8192; var13 >>= 1) {
                var11 >>= 1;
                var12 >>= 1;
             }
 
             int var14 = (int)Math.sqrt((double)(var11 * var11 + var12 * var12 + var13 * var13));
-            if(var14 <= 0) {
+            if (var14 <= 0) {
                var14 = 1;
             }
 
@@ -1329,93 +1325,94 @@ public class ModelData extends Entity {
             var12 = var12 * 256 / var14;
             var13 = var13 * 256 / var14;
             byte var15;
-            if(this.__e == null) {
+            if (this.field551 == null) {
                var15 = 0;
             } else {
-               var15 = this.__e[var1];
+               var15 = this.field551[var1];
             }
 
-            if(var15 == 0) {
-               VertexNormal var16 = this.__v[var2];
-               var16.__m += var11;
-               var16.__f += var12;
-               var16.__q += var13;
-               ++var16.__w;
-               var16 = this.__v[var3];
-               var16.__m += var11;
-               var16.__f += var12;
-               var16.__q += var13;
-               ++var16.__w;
-               var16 = this.__v[var4];
-               var16.__m += var11;
-               var16.__f += var12;
-               var16.__q += var13;
-               ++var16.__w;
-            } else if(var15 == 1) {
-               if(this.faceNormals == null) {
+            if (var15 == 0) {
+               VertexNormal var16 = this.field557[var2];
+               var16.field947 += var11;
+               var16.field948 += var12;
+               var16.field949 += var13;
+               ++var16.field950;
+               var16 = this.field557[var3];
+               var16.field947 += var11;
+               var16.field948 += var12;
+               var16.field949 += var13;
+               ++var16.field950;
+               var16 = this.field557[var4];
+               var16.field947 += var11;
+               var16.field948 += var12;
+               var16.field949 += var13;
+               ++var16.field950;
+            } else if (var15 == 1) {
+               if (this.faceNormals == null) {
                   this.faceNormals = new FaceNormal[this.faceCount];
                }
 
                FaceNormal var17 = this.faceNormals[var1] = new FaceNormal();
-               var17.__m = var11;
-               var17.__f = var12;
-               var17.__q = var13;
+               var17.field346 = var11;
+               var17.field347 = var12;
+               var17.field348 = var13;
             }
          }
-
       }
+
    }
 
    @ObfuscatedName("b")
    @Export("invalidate")
    void invalidate() {
-      this.__v = null;
-      this.__ag = null;
+      this.field557 = null;
+      this.field558 = null;
       this.faceNormals = null;
       this.isBoundsCalculated = false;
    }
 
    @ObfuscatedName("c")
-   void __c_229() {
-      if(!this.isBoundsCalculated) {
+   void method217() {
+      if (!this.isBoundsCalculated) {
          super.height = 0;
-         this.__ar = 0;
-         this.__ac = 999999;
-         this.__ay = -999999;
-         this.__ah = -99999;
-         this.__ak = 99999;
+         this.field561 = 0;
+         this.field562 = 999999;
+         this.field563 = -999999;
+         this.field564 = -99999;
+         this.field565 = 99999;
 
-         for(int var1 = 0; var1 < this.verticesCount; ++var1) {
+         for (int var1 = 0; var1 < this.verticesCount; ++var1) {
             int var2 = this.verticesX[var1];
             int var3 = this.verticesY[var1];
             int var4 = this.verticesZ[var1];
-            if(var2 < this.__ac) {
-               this.__ac = var2;
+            if (var2 < this.field562) {
+               this.field562 = var2;
             }
 
-            if(var2 > this.__ay) {
-               this.__ay = var2;
+            if (var2 > this.field563) {
+               this.field563 = var2;
             }
 
-            if(var4 < this.__ak) {
-               this.__ak = var4;
+            if (var4 < this.field565) {
+               this.field565 = var4;
             }
 
-            if(var4 > this.__ah) {
-               this.__ah = var4;
+            if (var4 > this.field564) {
+               this.field564 = var4;
             }
 
-            if(-var3 > super.height) {
+            if (-var3 > super.height) {
                super.height = -var3;
             }
 
-            if(var3 > this.__ar) {
-               this.__ar = var3;
+            if (var3 > this.field561) {
+               this.field561 = var3;
             }
          }
 
          this.isBoundsCalculated = true;
       }
+
    }
 
    @ObfuscatedName("v")
@@ -1424,170 +1421,170 @@ public class ModelData extends Entity {
    )
    @Export("toModel")
    public final Model toModel(int var1, int var2, int var3, int var4, int var5) {
-      this.__h_228();
+      this.method216();
       int var6 = (int)Math.sqrt((double)(var5 * var5 + var3 * var3 + var4 * var4));
       int var7 = var6 * var2 >> 8;
       Model var8 = new Model();
       var8.faceColors1 = new int[this.faceCount];
       var8.faceColors2 = new int[this.faceCount];
       var8.faceColors3 = new int[this.faceCount];
-      if(this.__z > 0 && this.textureCoords != null) {
-         int[] var9 = new int[this.__z];
+      if (this.field554 > 0 && this.textureCoords != null) {
+         int[] var9 = new int[this.field554];
 
          int var10;
-         for(var10 = 0; var10 < this.faceCount; ++var10) {
-            if(this.textureCoords[var10] != -1) {
+         for (var10 = 0; var10 < this.faceCount; ++var10) {
+            if (this.textureCoords[var10] != -1) {
                ++var9[this.textureCoords[var10] & 255];
             }
          }
 
-         var8.__h = 0;
+         var8.field544 = 0;
 
-         for(var10 = 0; var10 < this.__z; ++var10) {
-            if(var9[var10] > 0 && this.textureRenderTypes[var10] == 0) {
-               ++var8.__h;
+         for (var10 = 0; var10 < this.field554; ++var10) {
+            if (var9[var10] > 0 && this.textureRenderTypes[var10] == 0) {
+               ++var8.field544;
             }
          }
 
-         var8.__b = new int[var8.__h];
-         var8.__c = new int[var8.__h];
-         var8.__r = new int[var8.__h];
+         var8.field545 = new int[var8.field544];
+         var8.field546 = new int[var8.field544];
+         var8.field547 = new int[var8.field544];
          var10 = 0;
 
          int var11;
-         for(var11 = 0; var11 < this.__z; ++var11) {
-            if(var9[var11] > 0 && this.textureRenderTypes[var11] == 0) {
-               var8.__b[var10] = this.texTriangleX[var11] & '\uffff';
-               var8.__c[var10] = this.texTriangleY[var11] & '\uffff';
-               var8.__r[var10] = this.texTriangleZ[var11] & '\uffff';
+         for (var11 = 0; var11 < this.field554; ++var11) {
+            if (var9[var11] > 0 && this.textureRenderTypes[var11] == 0) {
+               var8.field545[var10] = this.texTriangleX[var11] & '\uffff';
+               var8.field546[var10] = this.texTriangleY[var11] & '\uffff';
+               var8.field547[var10] = this.texTriangleZ[var11] & '\uffff';
                var9[var11] = var10++;
             } else {
                var9[var11] = -1;
             }
          }
 
-         var8.__s = new byte[this.faceCount];
+         var8.field542 = new byte[this.faceCount];
 
-         for(var11 = 0; var11 < this.faceCount; ++var11) {
-            if(this.textureCoords[var11] != -1) {
-               var8.__s[var11] = (byte)var9[this.textureCoords[var11] & 255];
+         for (var11 = 0; var11 < this.faceCount; ++var11) {
+            if (this.textureCoords[var11] != -1) {
+               var8.field542[var11] = (byte)var9[this.textureCoords[var11] & 255];
             } else {
-               var8.__s[var11] = -1;
+               var8.field542[var11] = -1;
             }
          }
       }
 
-      for(int var16 = 0; var16 < this.faceCount; ++var16) {
-         byte var17;
-         if(this.__e == null) {
-            var17 = 0;
-         } else {
-            var17 = this.__e[var16];
-         }
-
+      for (int var17 = 0; var17 < this.faceCount; ++var17) {
          byte var18;
-         if(this.faceAlphas == null) {
+         if (this.field551 == null) {
             var18 = 0;
          } else {
-            var18 = this.faceAlphas[var16];
+            var18 = this.field551[var17];
+         }
+
+         byte var19;
+         if (this.faceAlphas == null) {
+            var19 = 0;
+         } else {
+            var19 = this.faceAlphas[var17];
          }
 
          short var12;
-         if(this.faceTextures == null) {
+         if (this.faceTextures == null) {
             var12 = -1;
          } else {
-            var12 = this.faceTextures[var16];
+            var12 = this.faceTextures[var17];
          }
 
-         if(var18 == -2) {
-            var17 = 3;
+         if (var19 == -2) {
+            var18 = 3;
          }
 
-         if(var18 == -1) {
-            var17 = 2;
+         if (var19 == -1) {
+            var18 = 2;
          }
 
          VertexNormal var13;
          int var14;
-         FaceNormal var19;
-         if(var12 == -1) {
-            if(var17 != 0) {
-               if(var17 == 1) {
-                  var19 = this.faceNormals[var16];
-                  var14 = (var4 * var19.__f + var5 * var19.__q + var3 * var19.__m) / (var7 / 2 + var7) + var1;
-                  var8.faceColors1[var16] = method2802(this.faceColors[var16] & '\uffff', var14);
-                  var8.faceColors3[var16] = -1;
-               } else if(var17 == 3) {
-                  var8.faceColors1[var16] = 128;
-                  var8.faceColors3[var16] = -1;
+         FaceNormal var15;
+         if (var12 == -1) {
+            if (var18 != 0) {
+               if (var18 == 1) {
+                  var15 = this.faceNormals[var17];
+                  var14 = (var4 * var15.field347 + var5 * var15.field348 + var3 * var15.field346) / (var7 / 2 + var7) + var1;
+                  var8.faceColors1[var17] = method2802(this.faceColors[var17] & '\uffff', var14);
+                  var8.faceColors3[var17] = -1;
+               } else if (var18 == 3) {
+                  var8.faceColors1[var17] = 128;
+                  var8.faceColors3[var17] = -1;
                } else {
-                  var8.faceColors3[var16] = -2;
+                  var8.faceColors3[var17] = -2;
                }
             } else {
-               int var15 = this.faceColors[var16] & '\uffff';
-               if(this.__ag != null && this.__ag[this.indices1[var16]] != null) {
-                  var13 = this.__ag[this.indices1[var16]];
+               int var16 = this.faceColors[var17] & '\uffff';
+               if (this.field558 != null && this.field558[this.indices1[var17]] != null) {
+                  var13 = this.field558[this.indices1[var17]];
                } else {
-                  var13 = this.__v[this.indices1[var16]];
+                  var13 = this.field557[this.indices1[var17]];
                }
 
-               var14 = (var4 * var13.__f + var5 * var13.__q + var3 * var13.__m) / (var7 * var13.__w) + var1;
-               var8.faceColors1[var16] = method2802(var15, var14);
-               if(this.__ag != null && this.__ag[this.indices2[var16]] != null) {
-                  var13 = this.__ag[this.indices2[var16]];
+               var14 = (var4 * var13.field948 + var5 * var13.field949 + var3 * var13.field947) / (var7 * var13.field950) + var1;
+               var8.faceColors1[var17] = method2802(var16, var14);
+               if (this.field558 != null && this.field558[this.indices2[var17]] != null) {
+                  var13 = this.field558[this.indices2[var17]];
                } else {
-                  var13 = this.__v[this.indices2[var16]];
+                  var13 = this.field557[this.indices2[var17]];
                }
 
-               var14 = (var4 * var13.__f + var5 * var13.__q + var3 * var13.__m) / (var7 * var13.__w) + var1;
-               var8.faceColors2[var16] = method2802(var15, var14);
-               if(this.__ag != null && this.__ag[this.indices3[var16]] != null) {
-                  var13 = this.__ag[this.indices3[var16]];
+               var14 = (var4 * var13.field948 + var5 * var13.field949 + var3 * var13.field947) / (var7 * var13.field950) + var1;
+               var8.faceColors2[var17] = method2802(var16, var14);
+               if (this.field558 != null && this.field558[this.indices3[var17]] != null) {
+                  var13 = this.field558[this.indices3[var17]];
                } else {
-                  var13 = this.__v[this.indices3[var16]];
+                  var13 = this.field557[this.indices3[var17]];
                }
 
-               var14 = (var4 * var13.__f + var5 * var13.__q + var3 * var13.__m) / (var7 * var13.__w) + var1;
-               var8.faceColors3[var16] = method2802(var15, var14);
+               var14 = (var4 * var13.field948 + var5 * var13.field949 + var3 * var13.field947) / (var7 * var13.field950) + var1;
+               var8.faceColors3[var17] = method2802(var16, var14);
             }
-         } else if(var17 != 0) {
-            if(var17 == 1) {
-               var19 = this.faceNormals[var16];
-               var14 = (var4 * var19.__f + var5 * var19.__q + var3 * var19.__m) / (var7 / 2 + var7) + var1;
-               var8.faceColors1[var16] = method2803(var14);
-               var8.faceColors3[var16] = -1;
+         } else if (var18 != 0) {
+            if (var18 == 1) {
+               var15 = this.faceNormals[var17];
+               var14 = (var4 * var15.field347 + var5 * var15.field348 + var3 * var15.field346) / (var7 / 2 + var7) + var1;
+               var8.faceColors1[var17] = method2803(var14);
+               var8.faceColors3[var17] = -1;
             } else {
-               var8.faceColors3[var16] = -2;
+               var8.faceColors3[var17] = -2;
             }
          } else {
-            if(this.__ag != null && this.__ag[this.indices1[var16]] != null) {
-               var13 = this.__ag[this.indices1[var16]];
+            if (this.field558 != null && this.field558[this.indices1[var17]] != null) {
+               var13 = this.field558[this.indices1[var17]];
             } else {
-               var13 = this.__v[this.indices1[var16]];
+               var13 = this.field557[this.indices1[var17]];
             }
 
-            var14 = (var4 * var13.__f + var5 * var13.__q + var3 * var13.__m) / (var7 * var13.__w) + var1;
-            var8.faceColors1[var16] = method2803(var14);
-            if(this.__ag != null && this.__ag[this.indices2[var16]] != null) {
-               var13 = this.__ag[this.indices2[var16]];
+            var14 = (var4 * var13.field948 + var5 * var13.field949 + var3 * var13.field947) / (var7 * var13.field950) + var1;
+            var8.faceColors1[var17] = method2803(var14);
+            if (this.field558 != null && this.field558[this.indices2[var17]] != null) {
+               var13 = this.field558[this.indices2[var17]];
             } else {
-               var13 = this.__v[this.indices2[var16]];
+               var13 = this.field557[this.indices2[var17]];
             }
 
-            var14 = (var4 * var13.__f + var5 * var13.__q + var3 * var13.__m) / (var7 * var13.__w) + var1;
-            var8.faceColors2[var16] = method2803(var14);
-            if(this.__ag != null && this.__ag[this.indices3[var16]] != null) {
-               var13 = this.__ag[this.indices3[var16]];
+            var14 = (var4 * var13.field948 + var5 * var13.field949 + var3 * var13.field947) / (var7 * var13.field950) + var1;
+            var8.faceColors2[var17] = method2803(var14);
+            if (this.field558 != null && this.field558[this.indices3[var17]] != null) {
+               var13 = this.field558[this.indices3[var17]];
             } else {
-               var13 = this.__v[this.indices3[var16]];
+               var13 = this.field557[this.indices3[var17]];
             }
 
-            var14 = (var4 * var13.__f + var5 * var13.__q + var3 * var13.__m) / (var7 * var13.__w) + var1;
-            var8.faceColors3[var16] = method2803(var14);
+            var14 = (var4 * var13.field948 + var5 * var13.field949 + var3 * var13.field947) / (var7 * var13.field950) + var1;
+            var8.faceColors3[var17] = method2803(var14);
          }
       }
 
-      this.__g_220();
+      this.method208();
       var8.verticesCount = this.verticesCount;
       var8.verticesX = this.verticesX;
       var8.verticesY = this.verticesY;
@@ -1596,9 +1593,9 @@ public class ModelData extends Entity {
       var8.indices1 = this.indices1;
       var8.indices2 = this.indices2;
       var8.indices3 = this.indices3;
-      var8.faceRenderPriorities = this.__x;
+      var8.faceRenderPriorities = this.field552;
       var8.faceAlphas = this.faceAlphas;
-      var8.__y = this.__a;
+      var8.field543 = this.field553;
       var8.vertexLabels = this.vertexLabels;
       var8.faceLabelsAlpha = this.faceLabelsAlpha;
       var8.faceTextures = this.faceTextures;
@@ -1609,9 +1606,9 @@ public class ModelData extends Entity {
    @ObfuscatedSignature(
       signature = "(Lir;II)Ldw;"
    )
-   public static ModelData method2788(AbstractIndexCache var0, int var1, int var2) {
-      byte[] var3 = var0.takeRecord(var1, var2);
-      return var3 == null?null:new ModelData(var3);
+   public static ModelData method2788(AbstractArchive var0, int var1, int var2) {
+      byte[] var3 = var0.takeFile(var1, var2);
+      return var3 == null ? null : new ModelData(var3);
    }
 
    @ObfuscatedName("p")
@@ -1619,57 +1616,57 @@ public class ModelData extends Entity {
       signature = "(Ldw;Ldw;IIIZ)V"
    )
    static void method2800(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) {
-      var0.__c_229();
-      var0.__h_228();
-      var1.__c_229();
-      var1.__h_228();
-      ++__dw_ab;
+      var0.method217();
+      var0.method216();
+      var1.method217();
+      var1.method216();
+      ++field550;
       int var6 = 0;
       int[] var7 = var1.verticesX;
       int var8 = var1.verticesCount;
 
       int var9;
-      for(var9 = 0; var9 < var0.verticesCount; ++var9) {
-         VertexNormal var10 = var0.__v[var9];
-         if(var10.__w != 0) {
+      for (var9 = 0; var9 < var0.verticesCount; ++var9) {
+         VertexNormal var10 = var0.field557[var9];
+         if (var10.field950 != 0) {
             int var11 = var0.verticesY[var9] - var3;
-            if(var11 <= var1.__ar) {
+            if (var11 <= var1.field561) {
                int var12 = var0.verticesX[var9] - var2;
-               if(var12 >= var1.__ac && var12 <= var1.__ay) {
+               if (var12 >= var1.field562 && var12 <= var1.field563) {
                   int var13 = var0.verticesZ[var9] - var4;
-                  if(var13 >= var1.__ak && var13 <= var1.__ah) {
-                     for(int var14 = 0; var14 < var8; ++var14) {
-                        VertexNormal var15 = var1.__v[var14];
-                        if(var12 == var7[var14] && var13 == var1.verticesZ[var14] && var11 == var1.verticesY[var14] && var15.__w != 0) {
-                           if(var0.__ag == null) {
-                              var0.__ag = new VertexNormal[var0.verticesCount];
+                  if (var13 >= var1.field565 && var13 <= var1.field564) {
+                     for (int var14 = 0; var14 < var8; ++var14) {
+                        VertexNormal var15 = var1.field557[var14];
+                        if (var12 == var7[var14] && var13 == var1.verticesZ[var14] && var11 == var1.verticesY[var14] && var15.field950 != 0) {
+                           if (var0.field558 == null) {
+                              var0.field558 = new VertexNormal[var0.verticesCount];
                            }
 
-                           if(var1.__ag == null) {
-                              var1.__ag = new VertexNormal[var8];
+                           if (var1.field558 == null) {
+                              var1.field558 = new VertexNormal[var8];
                            }
 
-                           VertexNormal var16 = var0.__ag[var9];
-                           if(var16 == null) {
-                              var16 = var0.__ag[var9] = new VertexNormal(var10);
+                           VertexNormal var16 = var0.field558[var9];
+                           if (var16 == null) {
+                              var16 = var0.field558[var9] = new VertexNormal(var10);
                            }
 
-                           VertexNormal var17 = var1.__ag[var14];
-                           if(var17 == null) {
-                              var17 = var1.__ag[var14] = new VertexNormal(var15);
+                           VertexNormal var17 = var1.field558[var14];
+                           if (var17 == null) {
+                              var17 = var1.field558[var14] = new VertexNormal(var15);
                            }
 
-                           var16.__m += var15.__m;
-                           var16.__f += var15.__f;
-                           var16.__q += var15.__q;
-                           var16.__w += var15.__w;
-                           var17.__m += var10.__m;
-                           var17.__f += var10.__f;
-                           var17.__q += var10.__q;
-                           var17.__w += var10.__w;
+                           var16.field947 += var15.field947;
+                           var16.field948 += var15.field948;
+                           var16.field949 += var15.field949;
+                           var16.field950 += var15.field950;
+                           var17.field947 += var10.field947;
+                           var17.field948 += var10.field948;
+                           var17.field949 += var10.field949;
+                           var17.field950 += var10.field950;
                            ++var6;
-                           __dw_aw[var9] = __dw_ab;
-                           __dw_al[var14] = __dw_ab;
+                           field548[var9] = field550;
+                           field549[var14] = field550;
                         }
                      }
                   }
@@ -1678,36 +1675,36 @@ public class ModelData extends Entity {
          }
       }
 
-      if(var6 >= 3 && var5) {
-         for(var9 = 0; var9 < var0.faceCount; ++var9) {
-            if(__dw_aw[var0.indices1[var9]] == __dw_ab && __dw_aw[var0.indices2[var9]] == __dw_ab && __dw_aw[var0.indices3[var9]] == __dw_ab) {
-               if(var0.__e == null) {
-                  var0.__e = new byte[var0.faceCount];
+      if (var6 >= 3 && var5) {
+         for (var9 = 0; var9 < var0.faceCount; ++var9) {
+            if (field548[var0.indices1[var9]] == field550 && field548[var0.indices2[var9]] == field550 && field548[var0.indices3[var9]] == field550) {
+               if (var0.field551 == null) {
+                  var0.field551 = new byte[var0.faceCount];
                }
 
-               var0.__e[var9] = 2;
+               var0.field551[var9] = 2;
             }
          }
 
-         for(var9 = 0; var9 < var1.faceCount; ++var9) {
-            if(__dw_ab == __dw_al[var1.indices1[var9]] && __dw_ab == __dw_al[var1.indices2[var9]] && __dw_ab == __dw_al[var1.indices3[var9]]) {
-               if(var1.__e == null) {
-                  var1.__e = new byte[var1.faceCount];
+         for (var9 = 0; var9 < var1.faceCount; ++var9) {
+            if (field550 == field549[var1.indices1[var9]] && field550 == field549[var1.indices2[var9]] && field550 == field549[var1.indices3[var9]]) {
+               if (var1.field551 == null) {
+                  var1.field551 = new byte[var1.faceCount];
                }
 
-               var1.__e[var9] = 2;
+               var1.field551[var9] = 2;
             }
          }
-
       }
+
    }
 
    @ObfuscatedName("ag")
    static final int method2802(int var0, int var1) {
       var1 = (var0 & 127) * var1 >> 7;
-      if(var1 < 2) {
+      if (var1 < 2) {
          var1 = 2;
-      } else if(var1 > 126) {
+      } else if (var1 > 126) {
          var1 = 126;
       }
 
@@ -1716,12 +1713,20 @@ public class ModelData extends Entity {
 
    @ObfuscatedName("aq")
    static final int method2803(int var0) {
-      if(var0 < 2) {
+      if (var0 < 2) {
          var0 = 2;
-      } else if(var0 > 126) {
+      } else if (var0 > 126) {
          var0 = 126;
       }
 
       return var0;
    }
+
+   static {
+      field548 = new int[10000];
+      field549 = new int[10000];
+      field550 = 0;
+      ModelData_sine = Rasterizer3D.Rasterizer3D_sine;
+      ModelData_cosine = Rasterizer3D.Rasterizer3D_cosine;
+   }
 }
diff --git a/runescape-client/src/main/java/MouseHandler.java b/runescape-client/src/main/java/MouseHandler.java
index e43304e3e5..7334e28bc0 100644
--- a/runescape-client/src/main/java/MouseHandler.java
+++ b/runescape-client/src/main/java/MouseHandler.java
@@ -130,42 +130,19 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
    @Export("oculusOrbFocalPointX")
    static int oculusOrbFocalPointX;
 
-   static {
-      MouseHandler_instance = new MouseHandler();
-      MouseHandler_idleCycles = 0;
-      MouseHandler_currentButton0 = 0;
-      MouseHandler_x0 = -1;
-      MouseHandler_y0 = -1;
-      MouseHandler_millis0 = -1L;
-      MouseHandler_currentButton = 0;
-      MouseHandler_x = 0;
-      MouseHandler_y = 0;
-      MouseHandler_millis = 0L;
-      MouseHandler_lastButton0 = 0;
-      MouseHandler_lastPressedX0 = 0;
-      MouseHandler_lastPressedY0 = 0;
-      MouseHandler_lastPressedTimeMillis0 = 0L;
-      MouseHandler_lastButton = 0;
-      MouseHandler_lastPressedX = 0;
-      MouseHandler_lastPressedY = 0;
-      MouseHandler_lastPressedTimeMillis = 0L;
-   }
-
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "(Ljava/awt/event/MouseEvent;I)I",
       garbageValue = "-965288682"
    )
    @Export("getButton")
-   final int getButton(MouseEvent var1) {
-      int var2 = var1.getButton();
-      return !var1.isAltDown() && var2 != 2?(!var1.isMetaDown() && var2 != 3?1:2):4;
+   final int getButton(MouseEvent mouseEvent) {
+      int var2 = mouseEvent.getButton();
+      return !mouseEvent.isAltDown() && var2 != 2 ? (!mouseEvent.isMetaDown() && var2 != 3 ? 1 : 2) : 4;
    }
 
-   @Export("mouseMoved")
-   @ObfuscatedName("mouseMoved")
    public final synchronized void mouseMoved(MouseEvent var1) {
-      if(MouseHandler_instance != null) {
+      if (MouseHandler_instance != null) {
          MouseHandler_idleCycles = 0;
          MouseHandler_x0 = var1.getX();
          MouseHandler_y0 = var1.getY();
@@ -174,35 +151,31 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
 
    }
 
-   @Export("mousePressed")
-   @ObfuscatedName("mousePressed")
    public final synchronized void mousePressed(MouseEvent var1) {
-      if(MouseHandler_instance != null) {
+      if (MouseHandler_instance != null) {
          MouseHandler_idleCycles = 0;
          MouseHandler_lastPressedX0 = var1.getX();
          MouseHandler_lastPressedY0 = var1.getY();
          MouseHandler_lastPressedTimeMillis0 = class203.currentTimeMs();
          MouseHandler_lastButton0 = this.getButton(var1);
-         if(MouseHandler_lastButton0 != 0) {
+         if (MouseHandler_lastButton0 != 0) {
             MouseHandler_currentButton0 = MouseHandler_lastButton0;
          }
       }
 
-      if(var1.isPopupTrigger()) {
+      if (var1.isPopupTrigger()) {
          var1.consume();
       }
 
    }
 
-   @Export("mouseReleased")
-   @ObfuscatedName("mouseReleased")
    public final synchronized void mouseReleased(MouseEvent var1) {
-      if(MouseHandler_instance != null) {
+      if (MouseHandler_instance != null) {
          MouseHandler_idleCycles = 0;
          MouseHandler_currentButton0 = 0;
       }
 
-      if(var1.isPopupTrigger()) {
+      if (var1.isPopupTrigger()) {
          var1.consume();
       }
 
@@ -211,7 +184,7 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
    @Export("mouseClicked")
    @ObfuscatedName("mouseClicked")
    public final void mouseClicked(MouseEvent var1) {
-      if(var1.isPopupTrigger()) {
+      if (var1.isPopupTrigger()) {
          var1.consume();
       }
 
@@ -220,7 +193,7 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
    @Export("mouseExited")
    @ObfuscatedName("mouseExited")
    public final synchronized void mouseExited(MouseEvent var1) {
-      if(MouseHandler_instance != null) {
+      if (MouseHandler_instance != null) {
          MouseHandler_idleCycles = 0;
          MouseHandler_x0 = -1;
          MouseHandler_y0 = -1;
@@ -229,28 +202,20 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
 
    }
 
-   @Export("mouseDragged")
-   @ObfuscatedName("mouseDragged")
    public final synchronized void mouseDragged(MouseEvent var1) {
       this.mouseMoved(var1);
    }
 
-   @Export("focusGained")
-   @ObfuscatedName("focusGained")
    public final void focusGained(FocusEvent var1) {
    }
 
-   @Export("focusLost")
-   @ObfuscatedName("focusLost")
    public final synchronized void focusLost(FocusEvent var1) {
-      if(MouseHandler_instance != null) {
+      if (MouseHandler_instance != null) {
          MouseHandler_currentButton0 = 0;
       }
 
    }
 
-   @Export("mouseEntered")
-   @ObfuscatedName("mouseEntered")
    public final synchronized void mouseEntered(MouseEvent var1) {
       this.mouseMoved(var1);
    }
@@ -283,11 +248,32 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi
       Login.Login_response2 = "Enter your username/email & password.";
       Login.Login_response3 = "";
       Login.loginIndex = 2;
-      if(var0) {
+      if (var0) {
          Login.Login_password = "";
       }
 
       Messages.method2200();
       class196.method3740();
    }
+
+   static {
+      MouseHandler_instance = new MouseHandler();
+      MouseHandler_idleCycles = 0;
+      MouseHandler_currentButton0 = 0;
+      MouseHandler_x0 = -1;
+      MouseHandler_y0 = -1;
+      MouseHandler_millis0 = -1L;
+      MouseHandler_currentButton = 0;
+      MouseHandler_x = 0;
+      MouseHandler_y = 0;
+      MouseHandler_millis = 0L;
+      MouseHandler_lastButton0 = 0;
+      MouseHandler_lastPressedX0 = 0;
+      MouseHandler_lastPressedY0 = 0;
+      MouseHandler_lastPressedTimeMillis0 = 0L;
+      MouseHandler_lastButton = 0;
+      MouseHandler_lastPressedX = 0;
+      MouseHandler_lastPressedY = 0;
+      MouseHandler_lastPressedTimeMillis = 0L;
+   }
 }
diff --git a/runescape-client/src/main/java/MouseRecorder.java b/runescape-client/src/main/java/MouseRecorder.java
index 22f81c03b4..99f0dff651 100644
--- a/runescape-client/src/main/java/MouseRecorder.java
+++ b/runescape-client/src/main/java/MouseRecorder.java
@@ -17,7 +17,7 @@ public class MouseRecorder implements Runnable {
    @ObfuscatedGetter(
       intValue = 1075569245
    )
-   static int __bu_hy;
+   static int field566;
    @ObfuscatedName("m")
    @Export("isRunning")
    boolean isRunning;
@@ -49,13 +49,11 @@ public class MouseRecorder implements Runnable {
       this.millis = new long[500];
    }
 
-   @Export("run")
-   @ObfuscatedName("run")
    public void run() {
-      for(; this.isRunning; class203.method4010(50L)) {
+      for (; this.isRunning; class203.method4010(50L)) {
          Object var1 = this.lock;
          synchronized(this.lock) {
-            if(this.index < 500) {
+            if (this.index < 500) {
                this.xs[this.index] = MouseHandler.MouseHandler_x;
                this.ys[this.index] = MouseHandler.MouseHandler_y;
                this.millis[this.index] = MouseHandler.MouseHandler_millis;
@@ -73,154 +71,158 @@ public class MouseRecorder implements Runnable {
    )
    @Export("drawObject")
    static final void drawObject(int var0, int var1, int var2, int var3, int var4) {
-      long var5 = class65.scene.__ar_244(var0, var1, var2);
+      long var5 = class65.scene.getBoundaryObjectTag(var0, var1, var2);
       int var7;
       int var8;
       int var9;
       int var10;
-      int var14;
-      int var26;
-      if(var5 != 0L) {
+      int var11;
+      int var12;
+      int var13;
+      if (var5 != 0L) {
          var7 = class65.scene.getObjectFlags(var0, var1, var2, var5);
          var8 = var7 >> 6 & 3;
          var9 = var7 & 31;
          var10 = var3;
-         boolean var12 = var5 != 0L;
-         if(var12) {
-            boolean var13 = (int)(var5 >>> 16 & 1L) == 1;
-            var12 = !var13;
+         boolean var14 = var5 != 0L;
+         if (var14) {
+            boolean var15 = (int)(var5 >>> 16 & 1L) == 1;
+            var14 = !var15;
          }
 
-         if(var12) {
+         if (var14) {
             var10 = var4;
          }
 
-         int[] var19 = WidgetGroupParent.sceneMinimapSprite.pixels;
-         var26 = var1 * 4 + (103 - var2) * 2048 + 24624;
-         var14 = HitSplatDefinition.method4972(var5);
-         ObjectDefinition var15 = class50.getObjectDefinition(var14);
-         if(var15.mapSceneId != -1) {
-            IndexedSprite var16 = class192.mapSceneSprites[var15.mapSceneId];
-            if(var16 != null) {
-               int var17 = (var15.sizeX * 4 - var16.subWidth) / 2;
-               int var18 = (var15.sizeY * 4 - var16.subHeight) / 2;
-               var16.drawAt(var1 * 4 + var17 + 48, (104 - var2 - var15.sizeY) * 4 + var18 + 48);
+         int[] var20 = InterfaceParent.sceneMinimapSprite.pixels;
+         var12 = var1 * 4 + (103 - var2) * 2048 + 24624;
+         var11 = HitSplatDefinition.method4972(var5);
+         ObjectDefinition var16 = class50.getObjectDefinition(var11);
+         if (var16.mapSceneId != -1) {
+            IndexedSprite var17 = class192.mapSceneSprites[var16.mapSceneId];
+            if (var17 != null) {
+               var13 = (var16.sizeX * 4 - var17.subWidth) / 2;
+               int var18 = (var16.sizeY * 4 - var17.subHeight) / 2;
+               var17.drawAt(var1 * 4 + var13 + 48, (104 - var2 - var16.sizeY) * 4 + var18 + 48);
             }
          } else {
-            if(var9 == 0 || var9 == 2) {
-               if(var8 == 0) {
-                  var19[var26] = var10;
-                  var19[var26 + 512] = var10;
-                  var19[var26 + 1024] = var10;
-                  var19[var26 + 1536] = var10;
-               } else if(var8 == 1) {
-                  var19[var26] = var10;
-                  var19[var26 + 1] = var10;
-                  var19[var26 + 2] = var10;
-                  var19[var26 + 3] = var10;
-               } else if(var8 == 2) {
-                  var19[var26 + 3] = var10;
-                  var19[var26 + 512 + 3] = var10;
-                  var19[var26 + 1024 + 3] = var10;
-                  var19[var26 + 1536 + 3] = var10;
-               } else if(var8 == 3) {
-                  var19[var26 + 1536] = var10;
-                  var19[var26 + 1536 + 1] = var10;
-                  var19[var26 + 1536 + 2] = var10;
-                  var19[var26 + 1536 + 3] = var10;
+            if (var9 == 0 || var9 == 2) {
+               if (var8 == 0) {
+                  var20[var12] = var10;
+                  var20[var12 + 512] = var10;
+                  var20[var12 + 1024] = var10;
+                  var20[var12 + 1536] = var10;
+               } else if (var8 == 1) {
+                  var20[var12] = var10;
+                  var20[var12 + 1] = var10;
+                  var20[var12 + 2] = var10;
+                  var20[var12 + 3] = var10;
+               } else if (var8 == 2) {
+                  var20[var12 + 3] = var10;
+                  var20[var12 + 512 + 3] = var10;
+                  var20[var12 + 1024 + 3] = var10;
+                  var20[var12 + 1536 + 3] = var10;
+               } else if (var8 == 3) {
+                  var20[var12 + 1536] = var10;
+                  var20[var12 + 1536 + 1] = var10;
+                  var20[var12 + 1536 + 2] = var10;
+                  var20[var12 + 1536 + 3] = var10;
                }
             }
 
-            if(var9 == 3) {
-               if(var8 == 0) {
-                  var19[var26] = var10;
-               } else if(var8 == 1) {
-                  var19[var26 + 3] = var10;
-               } else if(var8 == 2) {
-                  var19[var26 + 1536 + 3] = var10;
-               } else if(var8 == 3) {
-                  var19[var26 + 1536] = var10;
+            if (var9 == 3) {
+               if (var8 == 0) {
+                  var20[var12] = var10;
+               } else if (var8 == 1) {
+                  var20[var12 + 3] = var10;
+               } else if (var8 == 2) {
+                  var20[var12 + 1536 + 3] = var10;
+               } else if (var8 == 3) {
+                  var20[var12 + 1536] = var10;
                }
             }
 
-            if(var9 == 2) {
-               if(var8 == 3) {
-                  var19[var26] = var10;
-                  var19[var26 + 512] = var10;
-                  var19[var26 + 1024] = var10;
-                  var19[var26 + 1536] = var10;
-               } else if(var8 == 0) {
-                  var19[var26] = var10;
-                  var19[var26 + 1] = var10;
-                  var19[var26 + 2] = var10;
-                  var19[var26 + 3] = var10;
-               } else if(var8 == 1) {
-                  var19[var26 + 3] = var10;
-                  var19[var26 + 512 + 3] = var10;
-                  var19[var26 + 1024 + 3] = var10;
-                  var19[var26 + 1536 + 3] = var10;
-               } else if(var8 == 2) {
-                  var19[var26 + 1536] = var10;
-                  var19[var26 + 1536 + 1] = var10;
-                  var19[var26 + 1536 + 2] = var10;
-                  var19[var26 + 1536 + 3] = var10;
+            if (var9 == 2) {
+               if (var8 == 3) {
+                  var20[var12] = var10;
+                  var20[var12 + 512] = var10;
+                  var20[var12 + 1024] = var10;
+                  var20[var12 + 1536] = var10;
+               } else if (var8 == 0) {
+                  var20[var12] = var10;
+                  var20[var12 + 1] = var10;
+                  var20[var12 + 2] = var10;
+                  var20[var12 + 3] = var10;
+               } else if (var8 == 1) {
+                  var20[var12 + 3] = var10;
+                  var20[var12 + 512 + 3] = var10;
+                  var20[var12 + 1024 + 3] = var10;
+                  var20[var12 + 1536 + 3] = var10;
+               } else if (var8 == 2) {
+                  var20[var12 + 1536] = var10;
+                  var20[var12 + 1536 + 1] = var10;
+                  var20[var12 + 1536 + 2] = var10;
+                  var20[var12 + 1536 + 3] = var10;
                }
             }
          }
       }
 
-      var5 = class65.scene.__ay_246(var0, var1, var2);
-      if(0L != var5) {
+      var5 = class65.scene.getGameObjectTag(var0, var1, var2);
+      ObjectDefinition var19;
+      IndexedSprite var21;
+      int var22;
+      if (0L != var5) {
          var7 = class65.scene.getObjectFlags(var0, var1, var2, var5);
          var8 = var7 >> 6 & 3;
          var9 = var7 & 31;
          var10 = HitSplatDefinition.method4972(var5);
-         ObjectDefinition var20 = class50.getObjectDefinition(var10);
-         if(var20.mapSceneId != -1) {
-            IndexedSprite var28 = class192.mapSceneSprites[var20.mapSceneId];
-            if(var28 != null) {
-               var26 = (var20.sizeX * 4 - var28.subWidth) / 2;
-               var14 = (var20.sizeY * 4 - var28.subHeight) / 2;
-               var28.drawAt(var26 + var1 * 4 + 48, (104 - var2 - var20.sizeY) * 4 + var14 + 48);
+         var19 = class50.getObjectDefinition(var10);
+         if (var19.mapSceneId != -1) {
+            var21 = class192.mapSceneSprites[var19.mapSceneId];
+            if (var21 != null) {
+               var12 = (var19.sizeX * 4 - var21.subWidth) / 2;
+               var11 = (var19.sizeY * 4 - var21.subHeight) / 2;
+               var21.drawAt(var12 + var1 * 4 + 48, (104 - var2 - var19.sizeY) * 4 + var11 + 48);
             }
-         } else if(var9 == 9) {
-            int var25 = 15658734;
-            boolean var27 = 0L != var5;
-            if(var27) {
-               boolean var23 = (int)(var5 >>> 16 & 1L) == 1;
-               var27 = !var23;
+         } else if (var9 == 9) {
+            var22 = 15658734;
+            boolean var23 = 0L != var5;
+            if (var23) {
+               boolean var24 = (int)(var5 >>> 16 & 1L) == 1;
+               var23 = !var24;
             }
 
-            if(var27) {
-               var25 = 15597568;
+            if (var23) {
+               var22 = 15597568;
             }
 
-            int[] var24 = WidgetGroupParent.sceneMinimapSprite.pixels;
-            int var29 = var1 * 4 + (103 - var2) * 2048 + 24624;
-            if(var8 != 0 && var8 != 2) {
-               var24[var29] = var25;
-               var24[var29 + 1 + 512] = var25;
-               var24[var29 + 1024 + 2] = var25;
-               var24[var29 + 1536 + 3] = var25;
+            int[] var25 = InterfaceParent.sceneMinimapSprite.pixels;
+            var13 = var1 * 4 + (103 - var2) * 2048 + 24624;
+            if (var8 != 0 && var8 != 2) {
+               var25[var13] = var22;
+               var25[var13 + 1 + 512] = var22;
+               var25[var13 + 1024 + 2] = var22;
+               var25[var13 + 1536 + 3] = var22;
             } else {
-               var24[var29 + 1536] = var25;
-               var24[var29 + 1 + 1024] = var25;
-               var24[var29 + 512 + 2] = var25;
-               var24[var29 + 3] = var25;
+               var25[var13 + 1536] = var22;
+               var25[var13 + 1 + 1024] = var22;
+               var25[var13 + 512 + 2] = var22;
+               var25[var13 + 3] = var22;
             }
          }
       }
 
       var5 = class65.scene.getFloorDecorationTag(var0, var1, var2);
-      if(var5 != 0L) {
+      if (var5 != 0L) {
          var7 = HitSplatDefinition.method4972(var5);
-         ObjectDefinition var21 = class50.getObjectDefinition(var7);
-         if(var21.mapSceneId != -1) {
-            IndexedSprite var22 = class192.mapSceneSprites[var21.mapSceneId];
-            if(var22 != null) {
-               var10 = (var21.sizeX * 4 - var22.subWidth) / 2;
-               int var11 = (var21.sizeY * 4 - var22.subHeight) / 2;
-               var22.drawAt(var10 + var1 * 4 + 48, var11 + (104 - var2 - var21.sizeY) * 4 + 48);
+         var19 = class50.getObjectDefinition(var7);
+         if (var19.mapSceneId != -1) {
+            var21 = class192.mapSceneSprites[var19.mapSceneId];
+            if (var21 != null) {
+               var10 = (var19.sizeX * 4 - var21.subWidth) / 2;
+               var22 = (var19.sizeY * 4 - var21.subHeight) / 2;
+               var21.drawAt(var10 + var1 * 4 + 48, var22 + (104 - var2 - var19.sizeY) * 4 + 48);
             }
          }
       }
@@ -233,24 +235,24 @@ public class MouseRecorder implements Runnable {
       garbageValue = "17"
    )
    static String method1194(String var0, Widget var1) {
-      if(var0.indexOf("%") != -1) {
-         for(int var2 = 1; var2 <= 5; ++var2) {
-            while(true) {
+      if (var0.indexOf("%") != -1) {
+         for (int var2 = 1; var2 <= 5; ++var2) {
+            while (true) {
                int var3 = var0.indexOf("%" + var2);
-               if(var3 == -1) {
+               if (var3 == -1) {
                   break;
                }
 
                String var4 = var0.substring(0, var3);
-               int var6 = class16.method187(var1, var2 - 1);
-               String var5;
-               if(var6 < 999999999) {
-                  var5 = Integer.toString(var6);
+               int var5 = class16.method187(var1, var2 - 1);
+               String var6;
+               if (var5 < 999999999) {
+                  var6 = Integer.toString(var5);
                } else {
-                  var5 = "*";
+                  var6 = "*";
                }
 
-               var0 = var4 + var5 + var0.substring(var3 + 2);
+               var0 = var4 + var6 + var0.substring(var3 + 2);
             }
          }
       }
@@ -266,117 +268,126 @@ public class MouseRecorder implements Runnable {
    static final void method1189(Widget var0, int var1, int var2, int var3) {
       class13.playPcmPlayers();
       SpriteMask var4 = var0.getSpriteMask(false);
-      if(var4 != null) {
+      if (var4 != null) {
          Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height);
-         if(Client.minimapState != 2 && Client.minimapState != 5) {
-            int var5 = Client.minimapOrientation & 2047;
+         if (Client.minimapState != 2 && Client.minimapState != 5) {
+            int var5 = Client.camAngleY & 2047;
             int var6 = Canvas.localPlayer.x / 32 + 48;
             int var7 = 464 - Canvas.localPlayer.y / 32;
-            WidgetGroupParent.sceneMinimapSprite.__ay_513(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths);
+            InterfaceParent.sceneMinimapSprite.method315(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths);
 
             int var8;
             int var9;
             int var10;
-            for(var8 = 0; var8 < Client.mapIconCount; ++var8) {
+            for (var8 = 0; var8 < Client.mapIconCount; ++var8) {
                var9 = Client.mapIconXs[var8] * 4 + 2 - Canvas.localPlayer.x / 32;
                var10 = Client.mapIconYs[var8] * 4 + 2 - Canvas.localPlayer.y / 32;
                NetFileRequest.method4554(var1, var2, var9, var10, Client.mapIcons[var8], var4);
             }
 
-            int var11;
-            int var12;
-            for(var8 = 0; var8 < 104; ++var8) {
-               for(var9 = 0; var9 < 104; ++var9) {
-                  NodeDeque var15 = Client.groundItems[SoundSystem.plane][var8][var9];
-                  if(var15 != null) {
+            var8 = 0;
+
+            while (true) {
+               int var11;
+               int var12;
+               if (var8 >= 104) {
+                  for (var8 = 0; var8 < Client.npcCount; ++var8) {
+                     NPC var17 = Client.npcs[Client.npcIndices[var8]];
+                     if (var17 != null && var17.isVisible()) {
+                        NPCDefinition var14 = var17.definition;
+                        if (var14 != null && var14.transforms != null) {
+                           var14 = var14.transform();
+                        }
+
+                        if (var14 != null && var14.drawMapDot && var14.isInteractable) {
+                           var11 = var17.x / 32 - Canvas.localPlayer.x / 32;
+                           var12 = var17.y / 32 - Canvas.localPlayer.y / 32;
+                           NetFileRequest.method4554(var1, var2, var11, var12, class39.mapDotSprites[1], var4);
+                        }
+                     }
+                  }
+
+                  var8 = Players.Players_count;
+                  int[] var18 = Players.Players_indices;
+
+                  Player var19;
+                  for (var10 = 0; var10 < var8; ++var10) {
+                     var19 = Client.players[var18[var10]];
+                     if (var19 != null && var19.isVisible() && !var19.isHidden && var19 != Canvas.localPlayer) {
+                        var12 = var19.x / 32 - Canvas.localPlayer.x / 32;
+                        int var15 = var19.y / 32 - Canvas.localPlayer.y / 32;
+                        boolean var16 = false;
+                        if (Canvas.localPlayer.team != 0 && var19.team != 0 && var19.team == Canvas.localPlayer.team) {
+                           var16 = true;
+                        }
+
+                        if (var19.isFriend()) {
+                           NetFileRequest.method4554(var1, var2, var12, var15, class39.mapDotSprites[3], var4);
+                        } else if (var16) {
+                           NetFileRequest.method4554(var1, var2, var12, var15, class39.mapDotSprites[4], var4);
+                        } else if (var19.isClanMember()) {
+                           NetFileRequest.method4554(var1, var2, var12, var15, class39.mapDotSprites[5], var4);
+                        } else {
+                           NetFileRequest.method4554(var1, var2, var12, var15, class39.mapDotSprites[2], var4);
+                        }
+                     }
+                  }
+
+                  if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) {
+                     if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) {
+                        NPC var20 = Client.npcs[Client.hintArrowNpcIndex];
+                        if (var20 != null) {
+                           var11 = var20.x / 32 - Canvas.localPlayer.x / 32;
+                           var12 = var20.y / 32 - Canvas.localPlayer.y / 32;
+                           UserComparator5.worldToMinimap(var1, var2, var11, var12, class16.mapMarkerSprites[1], var4);
+                        }
+                     }
+
+                     if (Client.hintArrowType == 2) {
+                        var10 = Client.hintArrowX * 4 - class50.baseX * 4 + 2 - Canvas.localPlayer.x / 32;
+                        var11 = Client.hintArrowY * 4 - GraphicsObject.baseY * 4 + 2 - Canvas.localPlayer.y / 32;
+                        UserComparator5.worldToMinimap(var1, var2, var10, var11, class16.mapMarkerSprites[1], var4);
+                     }
+
+                     if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) {
+                        var19 = Client.players[Client.hintArrowPlayerIndex];
+                        if (var19 != null) {
+                           var11 = var19.x / 32 - Canvas.localPlayer.x / 32;
+                           var12 = var19.y / 32 - Canvas.localPlayer.y / 32;
+                           UserComparator5.worldToMinimap(var1, var2, var11, var12, class16.mapMarkerSprites[1], var4);
+                        }
+                     }
+                  }
+
+                  if (Client.destinationX != 0) {
+                     var10 = Client.destinationX * 4 + 2 - Canvas.localPlayer.x / 32;
+                     var11 = Client.destinationY * 4 + 2 - Canvas.localPlayer.y / 32;
+                     NetFileRequest.method4554(var1, var2, var10, var11, class16.mapMarkerSprites[0], var4);
+                  }
+
+                  if (!Canvas.localPlayer.isHidden) {
+                     Rasterizer2D.Rasterizer2D_fillRectangle(var4.width / 2 + var1 - 1, var4.height / 2 + var2 - 1, 3, 3, 16777215);
+                  }
+                  break;
+               }
+
+               for (var9 = 0; var9 < 104; ++var9) {
+                  NodeDeque var13 = Client.groundItems[SoundSystem.plane][var8][var9];
+                  if (var13 != null) {
                      var11 = var8 * 4 + 2 - Canvas.localPlayer.x / 32;
                      var12 = var9 * 4 + 2 - Canvas.localPlayer.y / 32;
                      NetFileRequest.method4554(var1, var2, var11, var12, class39.mapDotSprites[0], var4);
                   }
                }
-            }
 
-            for(var8 = 0; var8 < Client.npcCount; ++var8) {
-               Npc var16 = Client.npcs[Client.npcIndices[var8]];
-               if(var16 != null && var16.isVisible()) {
-                  NpcDefinition var18 = var16.definition;
-                  if(var18 != null && var18.transforms != null) {
-                     var18 = var18.transform();
-                  }
-
-                  if(var18 != null && var18.drawMapDot && var18.isInteractable) {
-                     var11 = var16.x / 32 - Canvas.localPlayer.x / 32;
-                     var12 = var16.y / 32 - Canvas.localPlayer.y / 32;
-                     NetFileRequest.method4554(var1, var2, var11, var12, class39.mapDotSprites[1], var4);
-                  }
-               }
-            }
-
-            var8 = Players.Players_count;
-            int[] var19 = Players.Players_indices;
-
-            for(var10 = 0; var10 < var8; ++var10) {
-               Player var17 = Client.players[var19[var10]];
-               if(var17 != null && var17.isVisible() && !var17.isHidden && var17 != Canvas.localPlayer) {
-                  var12 = var17.x / 32 - Canvas.localPlayer.x / 32;
-                  int var13 = var17.y / 32 - Canvas.localPlayer.y / 32;
-                  boolean var14 = false;
-                  if(Canvas.localPlayer.team != 0 && var17.team != 0 && var17.team == Canvas.localPlayer.team) {
-                     var14 = true;
-                  }
-
-                  if(var17.isFriend()) {
-                     NetFileRequest.method4554(var1, var2, var12, var13, class39.mapDotSprites[3], var4);
-                  } else if(var14) {
-                     NetFileRequest.method4554(var1, var2, var12, var13, class39.mapDotSprites[4], var4);
-                  } else if(var17.isClanMember()) {
-                     NetFileRequest.method4554(var1, var2, var12, var13, class39.mapDotSprites[5], var4);
-                  } else {
-                     NetFileRequest.method4554(var1, var2, var12, var13, class39.mapDotSprites[2], var4);
-                  }
-               }
-            }
-
-            if(Client.hintArrowType != 0 && Client.cycle % 20 < 10) {
-               if(Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) {
-                  Npc var20 = Client.npcs[Client.hintArrowNpcIndex];
-                  if(var20 != null) {
-                     var11 = var20.x / 32 - Canvas.localPlayer.x / 32;
-                     var12 = var20.y / 32 - Canvas.localPlayer.y / 32;
-                     UserComparator5.worldToMinimap(var1, var2, var11, var12, class16.mapMarkerSprites[1], var4);
-                  }
-               }
-
-               if(Client.hintArrowType == 2) {
-                  var10 = Client.hintArrowX * 4 - class50.baseX * 4 + 2 - Canvas.localPlayer.x / 32;
-                  var11 = Client.hintArrowY * 4 - GraphicsObject.baseY * 4 + 2 - Canvas.localPlayer.y / 32;
-                  UserComparator5.worldToMinimap(var1, var2, var10, var11, class16.mapMarkerSprites[1], var4);
-               }
-
-               if(Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) {
-                  Player var21 = Client.players[Client.hintArrowPlayerIndex];
-                  if(var21 != null) {
-                     var11 = var21.x / 32 - Canvas.localPlayer.x / 32;
-                     var12 = var21.y / 32 - Canvas.localPlayer.y / 32;
-                     UserComparator5.worldToMinimap(var1, var2, var11, var12, class16.mapMarkerSprites[1], var4);
-                  }
-               }
-            }
-
-            if(Client.destinationX != 0) {
-               var10 = Client.destinationX * 4 + 2 - Canvas.localPlayer.x / 32;
-               var11 = Client.destinationY * 4 + 2 - Canvas.localPlayer.y / 32;
-               NetFileRequest.method4554(var1, var2, var10, var11, class16.mapMarkerSprites[0], var4);
-            }
-
-            if(!Canvas.localPlayer.isHidden) {
-               Rasterizer2D.Rasterizer2D_fillRectangle(var4.width / 2 + var1 - 1, var4.height / 2 + var2 - 1, 3, 3, 16777215);
+               ++var8;
             }
          } else {
             Rasterizer2D.method5948(var1, var2, 0, var4.xStarts, var4.xWidths);
          }
 
-         Client.__client_ot[var3] = true;
+         Client.field102[var3] = true;
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/MouseWheelHandler.java b/runescape-client/src/main/java/MouseWheelHandler.java
index 62907185a1..008e033335 100644
--- a/runescape-client/src/main/java/MouseWheelHandler.java
+++ b/runescape-client/src/main/java/MouseWheelHandler.java
@@ -27,8 +27,8 @@ public final class MouseWheelHandler implements MouseWheel, MouseWheelListener {
       garbageValue = "-28"
    )
    @Export("addTo")
-   void addTo(Component var1) {
-      var1.addMouseWheelListener(this);
+   void addTo(Component component) {
+      component.addMouseWheelListener(this);
    }
 
    @ObfuscatedName("f")
@@ -37,8 +37,8 @@ public final class MouseWheelHandler implements MouseWheel, MouseWheelListener {
       garbageValue = "-544062729"
    )
    @Export("removeFrom")
-   void removeFrom(Component var1) {
-      var1.removeMouseWheelListener(this);
+   void removeFrom(Component component) {
+      component.removeMouseWheelListener(this);
    }
 
    @ObfuscatedName("q")
diff --git a/runescape-client/src/main/java/MusicPatch.java b/runescape-client/src/main/java/MusicPatch.java
index a51914bfd3..753ae666df 100644
--- a/runescape-client/src/main/java/MusicPatch.java
+++ b/runescape-client/src/main/java/MusicPatch.java
@@ -11,7 +11,7 @@ public class MusicPatch extends Node {
    @ObfuscatedGetter(
       intValue = 574200865
    )
-   int __m;
+   int field567;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "[Lcx;"
@@ -19,40 +19,39 @@ public class MusicPatch extends Node {
    @Export("rawSounds")
    RawSound[] rawSounds;
    @ObfuscatedName("q")
-   short[] __q;
+   short[] field568;
    @ObfuscatedName("w")
-   byte[] __w;
+   byte[] field569;
    @ObfuscatedName("o")
-   byte[] __o;
+   byte[] field570;
    @ObfuscatedName("u")
    @ObfuscatedSignature(
       signature = "[Lhd;"
    )
-   MusicPatchNode2[] __u;
+   MusicPatchNode2[] field571;
    @ObfuscatedName("g")
-   byte[] __g;
+   byte[] field572;
    @ObfuscatedName("l")
-   int[] __l;
+   int[] field573;
 
    MusicPatch(byte[] var1) {
       this.rawSounds = new RawSound[128];
-      this.__q = new short[128];
-      this.__w = new byte[128];
-      this.__o = new byte[128];
-      this.__u = new MusicPatchNode2[128];
-      this.__g = new byte[128];
-      this.__l = new int[128];
+      this.field568 = new short[128];
+      this.field569 = new byte[128];
+      this.field570 = new byte[128];
+      this.field571 = new MusicPatchNode2[128];
+      this.field572 = new byte[128];
+      this.field573 = new int[128];
       Buffer var2 = new Buffer(var1);
 
       int var3;
-      for(var3 = 0; var2.array[var3 + var2.index] != 0; ++var3) {
-         ;
+      for (var3 = 0; var2.array[var3 + var2.index] != 0; ++var3) {
       }
 
       byte[] var4 = new byte[var3];
 
       int var5;
-      for(var5 = 0; var5 < var3; ++var5) {
+      for (var5 = 0; var5 < var3; ++var5) {
          var4[var5] = var2.readByte();
       }
 
@@ -62,14 +61,13 @@ public class MusicPatch extends Node {
       var2.index += var3;
 
       int var6;
-      for(var6 = 0; var2.array[var6 + var2.index] != 0; ++var6) {
-         ;
+      for (var6 = 0; var2.array[var6 + var2.index] != 0; ++var6) {
       }
 
       byte[] var7 = new byte[var6];
 
       int var8;
-      for(var8 = 0; var8 < var6; ++var8) {
+      for (var8 = 0; var8 < var6; ++var8) {
          var7[var8] = var2.readByte();
       }
 
@@ -79,407 +77,405 @@ public class MusicPatch extends Node {
       var2.index += var6;
 
       int var9;
-      for(var9 = 0; var2.array[var9 + var2.index] != 0; ++var9) {
-         ;
+      for (var9 = 0; var2.array[var9 + var2.index] != 0; ++var9) {
       }
 
       byte[] var10 = new byte[var9];
 
-      for(int var11 = 0; var11 < var9; ++var11) {
+      for (int var11 = 0; var11 < var9; ++var11) {
          var10[var11] = var2.readByte();
       }
 
       ++var2.index;
       ++var9;
-      byte[] var38 = new byte[var9];
+      byte[] var42 = new byte[var9];
       int var12;
-      int var14;
-      if(var9 > 1) {
-         var38[1] = 1;
-         int var13 = 1;
+      int var13;
+      if (var9 > 1) {
+         var42[1] = 1;
+         int var14 = 1;
          var12 = 2;
 
-         for(var14 = 2; var14 < var9; ++var14) {
+         for (var13 = 2; var13 < var9; ++var13) {
             int var15 = var2.readUnsignedByte();
-            if(var15 == 0) {
-               var13 = var12++;
+            if (var15 == 0) {
+               var14 = var12++;
             } else {
-               if(var15 <= var13) {
+               if (var15 <= var14) {
                   --var15;
                }
 
-               var13 = var15;
+               var14 = var15;
             }
 
-            var38[var14] = (byte)var13;
+            var42[var13] = (byte)var14;
          }
       } else {
          var12 = var9;
       }
 
-      MusicPatchNode2[] var39 = new MusicPatchNode2[var12];
+      MusicPatchNode2[] var43 = new MusicPatchNode2[var12];
 
-      MusicPatchNode2 var40;
-      for(var14 = 0; var14 < var39.length; ++var14) {
-         var40 = var39[var14] = new MusicPatchNode2();
+      MusicPatchNode2 var44;
+      for (var13 = 0; var13 < var43.length; ++var13) {
+         var44 = var43[var13] = new MusicPatchNode2();
          int var16 = var2.readUnsignedByte();
-         if(var16 > 0) {
-            var40.__m = new byte[var16 * 2];
+         if (var16 > 0) {
+            var44.field593 = new byte[var16 * 2];
          }
 
          var16 = var2.readUnsignedByte();
-         if(var16 > 0) {
-            var40.__f = new byte[var16 * 2 + 2];
-            var40.__f[1] = 64;
+         if (var16 > 0) {
+            var44.field594 = new byte[var16 * 2 + 2];
+            var44.field594[1] = 64;
          }
       }
 
-      var14 = var2.readUnsignedByte();
-      byte[] var47 = var14 > 0?new byte[var14 * 2]:null;
-      var14 = var2.readUnsignedByte();
-      byte[] var41 = var14 > 0?new byte[var14 * 2]:null;
+      var13 = var2.readUnsignedByte();
+      byte[] var45 = var13 > 0 ? new byte[var13 * 2] : null;
+      var13 = var2.readUnsignedByte();
+      byte[] var17 = var13 > 0 ? new byte[var13 * 2] : null;
 
-      int var17;
-      for(var17 = 0; var2.array[var17 + var2.index] != 0; ++var17) {
-         ;
+      int var18;
+      for (var18 = 0; var2.array[var18 + var2.index] != 0; ++var18) {
       }
 
-      byte[] var18 = new byte[var17];
+      byte[] var19 = new byte[var18];
 
-      int var19;
-      for(var19 = 0; var19 < var17; ++var19) {
-         var18[var19] = var2.readByte();
+      int var20;
+      for (var20 = 0; var20 < var18; ++var20) {
+         var19[var20] = var2.readByte();
       }
 
       ++var2.index;
-      ++var17;
-      var19 = 0;
+      ++var18;
+      var20 = 0;
 
-      int var20;
-      for(var20 = 0; var20 < 128; ++var20) {
-         var19 += var2.readUnsignedByte();
-         this.__q[var20] = (short)var19;
-      }
-
-      var19 = 0;
-
-      for(var20 = 0; var20 < 128; ++var20) {
-         var19 += var2.readUnsignedByte();
-         this.__q[var20] = (short)(this.__q[var20] + (var19 << 8));
+      int var21;
+      for (var21 = 0; var21 < 128; ++var21) {
+         var20 += var2.readUnsignedByte();
+         this.field568[var21] = (short)var20;
       }
 
       var20 = 0;
-      int var21 = 0;
-      int var22 = 0;
 
-      int var23;
-      for(var23 = 0; var23 < 128; ++var23) {
-         if(var20 == 0) {
-            if(var21 < var18.length) {
-               var20 = var18[var21++];
-            } else {
-               var20 = -1;
-            }
-
-            var22 = var2.__as_311();
-         }
-
-         this.__q[var23] = (short)(this.__q[var23] + ((var22 - 1 & 2) << 14));
-         this.__l[var23] = var22;
-         --var20;
+      for (var21 = 0; var21 < 128; ++var21) {
+         var20 += var2.readUnsignedByte();
+         this.field568[var21] = (short)(this.field568[var21] + (var20 << 8));
       }
 
-      var20 = 0;
       var21 = 0;
-      var23 = 0;
+      int var22 = 0;
+      int var23 = 0;
 
       int var24;
-      for(var24 = 0; var24 < 128; ++var24) {
-         if(this.__l[var24] != 0) {
-            if(var20 == 0) {
-               if(var21 < var4.length) {
-                  var20 = var4[var21++];
-               } else {
-                  var20 = -1;
-               }
-
-               var23 = var2.array[var5++] - 1;
+      for (var24 = 0; var24 < 128; ++var24) {
+         if (var21 == 0) {
+            if (var22 < var19.length) {
+               var21 = var19[var22++];
+            } else {
+               var21 = -1;
             }
 
-            this.__g[var24] = (byte)var23;
-            --var20;
+            var23 = var2.readVarInt();
          }
+
+         this.field568[var24] = (short)(this.field568[var24] + ((var23 - 1 & 2) << 14));
+         this.field573[var24] = var23;
+         --var21;
       }
 
-      var20 = 0;
       var21 = 0;
+      var22 = 0;
       var24 = 0;
 
-      for(int var25 = 0; var25 < 128; ++var25) {
-         if(this.__l[var25] != 0) {
-            if(var20 == 0) {
-               if(var21 < var7.length) {
-                  var20 = var7[var21++];
+      int var25;
+      for (var25 = 0; var25 < 128; ++var25) {
+         if (this.field573[var25] != 0) {
+            if (var21 == 0) {
+               if (var22 < var4.length) {
+                  var21 = var4[var22++];
                } else {
-                  var20 = -1;
+                  var21 = -1;
                }
 
-               var24 = var2.array[var8++] + 16 << 2;
+               var24 = var2.array[var5++] - 1;
             }
 
-            this.__o[var25] = (byte)var24;
-            --var20;
+            this.field572[var25] = (byte)var24;
+            --var21;
          }
       }
 
-      var20 = 0;
       var21 = 0;
-      MusicPatchNode2 var42 = null;
+      var22 = 0;
+      var25 = 0;
 
-      int var26;
-      for(var26 = 0; var26 < 128; ++var26) {
-         if(this.__l[var26] != 0) {
-            if(var20 == 0) {
-               var42 = var39[var38[var21]];
-               if(var21 < var10.length) {
-                  var20 = var10[var21++];
+      for (int var26 = 0; var26 < 128; ++var26) {
+         if (this.field573[var26] != 0) {
+            if (var21 == 0) {
+               if (var22 < var7.length) {
+                  var21 = var7[var22++];
                } else {
-                  var20 = -1;
+                  var21 = -1;
                }
+
+               var25 = var2.array[var8++] + 16 << 2;
             }
 
-            this.__u[var26] = var42;
-            --var20;
+            this.field570[var26] = (byte)var25;
+            --var21;
          }
       }
 
-      var20 = 0;
       var21 = 0;
-      var26 = 0;
+      var22 = 0;
+      MusicPatchNode2 var46 = null;
 
       int var27;
-      for(var27 = 0; var27 < 128; ++var27) {
-         if(var20 == 0) {
-            if(var21 < var18.length) {
-               var20 = var18[var21++];
+      for (var27 = 0; var27 < 128; ++var27) {
+         if (this.field573[var27] != 0) {
+            if (var21 == 0) {
+               var46 = var43[var42[var22]];
+               if (var22 < var10.length) {
+                  var21 = var10[var22++];
+               } else {
+                  var21 = -1;
+               }
+            }
+
+            this.field571[var27] = var46;
+            --var21;
+         }
+      }
+
+      var21 = 0;
+      var22 = 0;
+      var27 = 0;
+
+      int var28;
+      for (var28 = 0; var28 < 128; ++var28) {
+         if (var21 == 0) {
+            if (var22 < var19.length) {
+               var21 = var19[var22++];
             } else {
-               var20 = -1;
+               var21 = -1;
             }
 
-            if(this.__l[var27] > 0) {
-               var26 = var2.readUnsignedByte() + 1;
+            if (this.field573[var28] > 0) {
+               var27 = var2.readUnsignedByte() + 1;
             }
          }
 
-         this.__w[var27] = (byte)var26;
-         --var20;
+         this.field569[var28] = (byte)var27;
+         --var21;
       }
 
-      this.__m = var2.readUnsignedByte() + 1;
+      this.field567 = var2.readUnsignedByte() + 1;
 
-      MusicPatchNode2 var28;
-      int var29;
-      for(var27 = 0; var27 < var12; ++var27) {
-         var28 = var39[var27];
-         if(var28.__m != null) {
-            for(var29 = 1; var29 < var28.__m.length; var29 += 2) {
-               var28.__m[var29] = var2.readByte();
+      MusicPatchNode2 var29;
+      int var30;
+      for (var28 = 0; var28 < var12; ++var28) {
+         var29 = var43[var28];
+         if (var29.field593 != null) {
+            for (var30 = 1; var30 < var29.field593.length; var30 += 2) {
+               var29.field593[var30] = var2.readByte();
             }
          }
 
-         if(var28.__f != null) {
-            for(var29 = 3; var29 < var28.__f.length - 2; var29 += 2) {
-               var28.__f[var29] = var2.readByte();
+         if (var29.field594 != null) {
+            for (var30 = 3; var30 < var29.field594.length - 2; var30 += 2) {
+               var29.field594[var30] = var2.readByte();
             }
          }
       }
 
-      if(var47 != null) {
-         for(var27 = 1; var27 < var47.length; var27 += 2) {
-            var47[var27] = var2.readByte();
+      if (var45 != null) {
+         for (var28 = 1; var28 < var45.length; var28 += 2) {
+            var45[var28] = var2.readByte();
          }
       }
 
-      if(var41 != null) {
-         for(var27 = 1; var27 < var41.length; var27 += 2) {
-            var41[var27] = var2.readByte();
+      if (var17 != null) {
+         for (var28 = 1; var28 < var17.length; var28 += 2) {
+            var17[var28] = var2.readByte();
          }
       }
 
-      for(var27 = 0; var27 < var12; ++var27) {
-         var28 = var39[var27];
-         if(var28.__f != null) {
-            var19 = 0;
+      for (var28 = 0; var28 < var12; ++var28) {
+         var29 = var43[var28];
+         if (var29.field594 != null) {
+            var20 = 0;
 
-            for(var29 = 2; var29 < var28.__f.length; var29 += 2) {
-               var19 = 1 + var19 + var2.readUnsignedByte();
-               var28.__f[var29] = (byte)var19;
+            for (var30 = 2; var30 < var29.field594.length; var30 += 2) {
+               var20 = 1 + var20 + var2.readUnsignedByte();
+               var29.field594[var30] = (byte)var20;
             }
          }
       }
 
-      for(var27 = 0; var27 < var12; ++var27) {
-         var28 = var39[var27];
-         if(var28.__m != null) {
-            var19 = 0;
+      for (var28 = 0; var28 < var12; ++var28) {
+         var29 = var43[var28];
+         if (var29.field593 != null) {
+            var20 = 0;
 
-            for(var29 = 2; var29 < var28.__m.length; var29 += 2) {
-               var19 = 1 + var19 + var2.readUnsignedByte();
-               var28.__m[var29] = (byte)var19;
+            for (var30 = 2; var30 < var29.field593.length; var30 += 2) {
+               var20 = 1 + var20 + var2.readUnsignedByte();
+               var29.field593[var30] = (byte)var20;
             }
          }
       }
 
-      byte var30;
+      byte var31;
       int var32;
       int var33;
       int var34;
       int var35;
       int var36;
-      int var44;
-      byte var46;
-      if(var47 != null) {
-         var19 = var2.readUnsignedByte();
-         var47[0] = (byte)var19;
+      int var37;
+      byte var38;
+      if (var45 != null) {
+         var20 = var2.readUnsignedByte();
+         var45[0] = (byte)var20;
 
-         for(var27 = 2; var27 < var47.length; var27 += 2) {
-            var19 = 1 + var19 + var2.readUnsignedByte();
-            var47[var27] = (byte)var19;
+         for (var28 = 2; var28 < var45.length; var28 += 2) {
+            var20 = 1 + var20 + var2.readUnsignedByte();
+            var45[var28] = (byte)var20;
          }
 
-         var46 = var47[0];
-         byte var43 = var47[1];
+         var38 = var45[0];
+         byte var39 = var45[1];
 
-         for(var29 = 0; var29 < var46; ++var29) {
-            this.__w[var29] = (byte)(var43 * this.__w[var29] + 32 >> 6);
+         for (var30 = 0; var30 < var38; ++var30) {
+            this.field569[var30] = (byte)(var39 * this.field569[var30] + 32 >> 6);
          }
 
-         for(var29 = 2; var29 < var47.length; var29 += 2) {
-            var30 = var47[var29];
-            byte var31 = var47[var29 + 1];
-            var32 = var43 * (var30 - var46) + (var30 - var46) / 2;
+         for (var30 = 2; var30 < var45.length; var30 += 2) {
+            var31 = var45[var30];
+            byte var40 = var45[var30 + 1];
+            var32 = var39 * (var31 - var38) + (var31 - var38) / 2;
 
-            for(var33 = var46; var33 < var30; ++var33) {
-               var35 = var30 - var46;
+            for (var33 = var38; var33 < var31; ++var33) {
+               var35 = var31 - var38;
                var36 = var32 >>> 31;
                var34 = (var32 + var36) / var35 - var36;
-               this.__w[var33] = (byte)(var34 * this.__w[var33] + 32 >> 6);
-               var32 += var31 - var43;
+               this.field569[var33] = (byte)(var34 * this.field569[var33] + 32 >> 6);
+               var32 += var40 - var39;
             }
 
-            var46 = var30;
-            var43 = var31;
+            var38 = var31;
+            var39 = var40;
          }
 
-         for(var44 = var46; var44 < 128; ++var44) {
-            this.__w[var44] = (byte)(var43 * this.__w[var44] + 32 >> 6);
+         for (var37 = var38; var37 < 128; ++var37) {
+            this.field569[var37] = (byte)(var39 * this.field569[var37] + 32 >> 6);
          }
 
-         var40 = null;
+         var44 = null;
       }
 
-      if(var41 != null) {
-         var19 = var2.readUnsignedByte();
-         var41[0] = (byte)var19;
+      if (var17 != null) {
+         var20 = var2.readUnsignedByte();
+         var17[0] = (byte)var20;
 
-         for(var27 = 2; var27 < var41.length; var27 += 2) {
-            var19 = 1 + var19 + var2.readUnsignedByte();
-            var41[var27] = (byte)var19;
+         for (var28 = 2; var28 < var17.length; var28 += 2) {
+            var20 = 1 + var20 + var2.readUnsignedByte();
+            var17[var28] = (byte)var20;
          }
 
-         var46 = var41[0];
-         int var49 = var41[1] << 1;
+         var38 = var17[0];
+         int var47 = var17[1] << 1;
 
-         for(var29 = 0; var29 < var46; ++var29) {
-            var44 = var49 + (this.__o[var29] & 255);
-            if(var44 < 0) {
-               var44 = 0;
+         for (var30 = 0; var30 < var38; ++var30) {
+            var37 = var47 + (this.field570[var30] & 255);
+            if (var37 < 0) {
+               var37 = 0;
             }
 
-            if(var44 > 128) {
-               var44 = 128;
+            if (var37 > 128) {
+               var37 = 128;
             }
 
-            this.__o[var29] = (byte)var44;
+            this.field570[var30] = (byte)var37;
          }
 
-         int var45;
-         for(var29 = 2; var29 < var41.length; var29 += 2) {
-            var30 = var41[var29];
-            var45 = var41[var29 + 1] << 1;
-            var32 = var49 * (var30 - var46) + (var30 - var46) / 2;
+         int var48;
+         for (var30 = 2; var30 < var17.length; var30 += 2) {
+            var31 = var17[var30];
+            var48 = var17[var30 + 1] << 1;
+            var32 = var47 * (var31 - var38) + (var31 - var38) / 2;
 
-            for(var33 = var46; var33 < var30; ++var33) {
-               var35 = var30 - var46;
+            for (var33 = var38; var33 < var31; ++var33) {
+               var35 = var31 - var38;
                var36 = var32 >>> 31;
                var34 = (var32 + var36) / var35 - var36;
-               int var37 = var34 + (this.__o[var33] & 255);
-               if(var37 < 0) {
-                  var37 = 0;
+               int var41 = var34 + (this.field570[var33] & 255);
+               if (var41 < 0) {
+                  var41 = 0;
                }
 
-               if(var37 > 128) {
-                  var37 = 128;
+               if (var41 > 128) {
+                  var41 = 128;
                }
 
-               this.__o[var33] = (byte)var37;
-               var32 += var45 - var49;
+               this.field570[var33] = (byte)var41;
+               var32 += var48 - var47;
             }
 
-            var46 = var30;
-            var49 = var45;
+            var38 = var31;
+            var47 = var48;
          }
 
-         for(var44 = var46; var44 < 128; ++var44) {
-            var45 = var49 + (this.__o[var44] & 255);
-            if(var45 < 0) {
-               var45 = 0;
+         for (var37 = var38; var37 < 128; ++var37) {
+            var48 = var47 + (this.field570[var37] & 255);
+            if (var48 < 0) {
+               var48 = 0;
             }
 
-            if(var45 > 128) {
-               var45 = 128;
+            if (var48 > 128) {
+               var48 = 128;
             }
 
-            this.__o[var44] = (byte)var45;
+            this.field570[var37] = (byte)var48;
          }
 
-         Object var48 = null;
+         Object var49 = null;
       }
 
-      for(var27 = 0; var27 < var12; ++var27) {
-         var39[var27].__q = var2.readUnsignedByte();
+      for (var28 = 0; var28 < var12; ++var28) {
+         var43[var28].field595 = var2.readUnsignedByte();
       }
 
-      for(var27 = 0; var27 < var12; ++var27) {
-         var28 = var39[var27];
-         if(var28.__m != null) {
-            var28.__w = var2.readUnsignedByte();
+      for (var28 = 0; var28 < var12; ++var28) {
+         var29 = var43[var28];
+         if (var29.field593 != null) {
+            var29.field596 = var2.readUnsignedByte();
          }
 
-         if(var28.__f != null) {
-            var28.__o = var2.readUnsignedByte();
+         if (var29.field594 != null) {
+            var29.field597 = var2.readUnsignedByte();
          }
 
-         if(var28.__q > 0) {
-            var28.__u = var2.readUnsignedByte();
+         if (var29.field595 > 0) {
+            var29.field598 = var2.readUnsignedByte();
          }
       }
 
-      for(var27 = 0; var27 < var12; ++var27) {
-         var39[var27].__l = var2.readUnsignedByte();
+      for (var28 = 0; var28 < var12; ++var28) {
+         var43[var28].field600 = var2.readUnsignedByte();
       }
 
-      for(var27 = 0; var27 < var12; ++var27) {
-         var28 = var39[var27];
-         if(var28.__l > 0) {
-            var28.__g = var2.readUnsignedByte();
+      for (var28 = 0; var28 < var12; ++var28) {
+         var29 = var43[var28];
+         if (var29.field600 > 0) {
+            var29.field599 = var2.readUnsignedByte();
          }
       }
 
-      for(var27 = 0; var27 < var12; ++var27) {
-         var28 = var39[var27];
-         if(var28.__g > 0) {
-            var28.__e = var2.readUnsignedByte();
+      for (var28 = 0; var28 < var12; ++var28) {
+         var29 = var43[var28];
+         if (var29.field599 > 0) {
+            var29.field601 = var2.readUnsignedByte();
          }
       }
 
@@ -490,31 +486,31 @@ public class MusicPatch extends Node {
       signature = "(Ldt;[B[II)Z",
       garbageValue = "1828768318"
    )
-   boolean __f_373(SoundCache var1, byte[] var2, int[] var3) {
+   boolean method218(SoundCache var1, byte[] var2, int[] var3) {
       boolean var4 = true;
       int var5 = 0;
       RawSound var6 = null;
 
-      for(int var7 = 0; var7 < 128; ++var7) {
-         if(var2 == null || var2[var7] != 0) {
-            int var8 = this.__l[var7];
-            if(var8 != 0) {
-               if(var8 != var5) {
+      for (int var7 = 0; var7 < 128; ++var7) {
+         if (var2 == null || var2[var7] != 0) {
+            int var8 = this.field573[var7];
+            if (var8 != 0) {
+               if (var8 != var5) {
                   var5 = var8--;
-                  if((var8 & 1) == 0) {
+                  if ((var8 & 1) == 0) {
                      var6 = var1.getSoundEffect(var8 >> 2, var3);
                   } else {
                      var6 = var1.getMusicSample(var8 >> 2, var3);
                   }
 
-                  if(var6 == null) {
+                  if (var6 == null) {
                      var4 = false;
                   }
                }
 
-               if(var6 != null) {
+               if (var6 != null) {
                   this.rawSounds[var7] = var6;
-                  this.__l[var7] = 0;
+                  this.field573[var7] = 0;
                }
             }
          }
@@ -530,6 +526,6 @@ public class MusicPatch extends Node {
    )
    @Export("clear")
    void clear() {
-      this.__l = null;
+      this.field573 = null;
    }
 }
diff --git a/runescape-client/src/main/java/MusicPatchNode.java b/runescape-client/src/main/java/MusicPatchNode.java
index 66f778d7ee..4615410c85 100644
--- a/runescape-client/src/main/java/MusicPatchNode.java
+++ b/runescape-client/src/main/java/MusicPatchNode.java
@@ -17,7 +17,7 @@ public class MusicPatchNode extends Node {
    @ObfuscatedGetter(
       intValue = 801157533
    )
-   int __m;
+   int field574;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Lhl;"
@@ -34,77 +34,77 @@ public class MusicPatchNode extends Node {
    @ObfuscatedSignature(
       signature = "Lhd;"
    )
-   MusicPatchNode2 __w;
+   MusicPatchNode2 field575;
    @ObfuscatedName("o")
    @ObfuscatedGetter(
       intValue = -2058553171
    )
-   int __o;
+   int field576;
    @ObfuscatedName("u")
    @ObfuscatedGetter(
       intValue = 62958303
    )
-   int __u;
+   int field577;
    @ObfuscatedName("g")
    @ObfuscatedGetter(
       intValue = -836502917
    )
-   int __g;
+   int field578;
    @ObfuscatedName("l")
    @ObfuscatedGetter(
       intValue = -308599455
    )
-   int __l;
+   int field579;
    @ObfuscatedName("e")
    @ObfuscatedGetter(
       intValue = -471899285
    )
-   int __e;
+   int field580;
    @ObfuscatedName("x")
    @ObfuscatedGetter(
       intValue = -1520706641
    )
-   int __x;
+   int field581;
    @ObfuscatedName("d")
    @ObfuscatedGetter(
       intValue = -852988281
    )
-   int __d;
+   int field582;
    @ObfuscatedName("k")
    @ObfuscatedGetter(
       intValue = -439388365
    )
-   int __k;
+   int field583;
    @ObfuscatedName("n")
    @ObfuscatedGetter(
       intValue = 476852577
    )
-   int __n;
+   int field584;
    @ObfuscatedName("i")
    @ObfuscatedGetter(
       intValue = -2136855685
    )
-   int __i;
+   int field585;
    @ObfuscatedName("a")
    @ObfuscatedGetter(
       intValue = -2083252379
    )
-   int __a;
+   int field586;
    @ObfuscatedName("z")
    @ObfuscatedGetter(
       intValue = 1605236771
    )
-   int __z;
+   int field587;
    @ObfuscatedName("j")
    @ObfuscatedGetter(
       intValue = 173672931
    )
-   int __j;
+   int field588;
    @ObfuscatedName("s")
    @ObfuscatedGetter(
       intValue = 219840779
    )
-   int __s;
+   int field589;
    @ObfuscatedName("t")
    @ObfuscatedSignature(
       signature = "Lds;"
@@ -115,22 +115,22 @@ public class MusicPatchNode extends Node {
    @ObfuscatedGetter(
       intValue = -666877449
    )
-   int __y;
+   int field590;
    @ObfuscatedName("b")
    @ObfuscatedGetter(
       intValue = 1359854411
    )
-   int __b;
+   int field591;
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "(B)V",
       garbageValue = "39"
    )
-   void __m_370() {
+   void method219() {
       this.patch = null;
       this.rawSound = null;
-      this.__w = null;
+      this.field575 = null;
       this.stream = null;
    }
 }
diff --git a/runescape-client/src/main/java/MusicPatchNode2.java b/runescape-client/src/main/java/MusicPatchNode2.java
index 71625b12cc..c6d425a0a6 100644
--- a/runescape-client/src/main/java/MusicPatchNode2.java
+++ b/runescape-client/src/main/java/MusicPatchNode2.java
@@ -1,4 +1,3 @@
-import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
@@ -10,44 +9,44 @@ public class MusicPatchNode2 {
    @ObfuscatedGetter(
       longValue = -6780258776884306463L
    )
-   static long __hd_fc;
+   static long field592;
    @ObfuscatedName("m")
-   byte[] __m;
+   byte[] field593;
    @ObfuscatedName("f")
-   byte[] __f;
+   byte[] field594;
    @ObfuscatedName("q")
    @ObfuscatedGetter(
       intValue = 140046797
    )
-   int __q;
+   int field595;
    @ObfuscatedName("w")
    @ObfuscatedGetter(
       intValue = -249046051
    )
-   int __w;
+   int field596;
    @ObfuscatedName("o")
    @ObfuscatedGetter(
       intValue = -1455145595
    )
-   int __o;
+   int field597;
    @ObfuscatedName("u")
    @ObfuscatedGetter(
       intValue = 1577527995
    )
-   int __u;
+   int field598;
    @ObfuscatedName("g")
    @ObfuscatedGetter(
       intValue = 391670135
    )
-   int __g;
+   int field599;
    @ObfuscatedName("l")
    @ObfuscatedGetter(
       intValue = 320761691
    )
-   int __l;
+   int field600;
    @ObfuscatedName("e")
    @ObfuscatedGetter(
       intValue = 1984131473
    )
-   int __e;
+   int field601;
 }
diff --git a/runescape-client/src/main/java/MusicPatchPcmStream.java b/runescape-client/src/main/java/MusicPatchPcmStream.java
index 664d11868d..f8cd4f1e2c 100644
--- a/runescape-client/src/main/java/MusicPatchPcmStream.java
+++ b/runescape-client/src/main/java/MusicPatchPcmStream.java
@@ -11,7 +11,7 @@ public class MusicPatchPcmStream extends PcmStream {
    @ObfuscatedGetter(
       intValue = -1367955455
    )
-   static int __hq_qg;
+   static int field602;
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "Lhm;"
@@ -45,49 +45,49 @@ public class MusicPatchPcmStream extends PcmStream {
       signature = "(Lha;[IIIII)V",
       garbageValue = "1988628167"
    )
-   void __m_379(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) {
-      if((this.superStream.__y[var1.__m] & 4) != 0 && var1.__a < 0) {
-         int var6 = this.superStream.__p[var1.__m] / class309.PcmPlayer_sampleRate;
+   void method220(MusicPatchNode var1, int[] var2, int var3, int var4, int var5) {
+      if ((this.superStream.field506[var1.field574] & 4) != 0 && var1.field586 < 0) {
+         int var6 = this.superStream.field511[var1.field574] / class309.PcmPlayer_sampleRate;
 
-         while(true) {
-            int var7 = (var6 + 1048575 - var1.__b) / var6;
-            if(var7 > var4) {
-               var1.__b += var4 * var6;
+         while (true) {
+            int var7 = (var6 + 1048575 - var1.field591) / var6;
+            if (var7 > var4) {
+               var1.field591 += var4 * var6;
                break;
             }
 
-            var1.stream.__e_172(var2, var3, var7);
+            var1.stream.fill(var2, var3, var7);
             var3 += var7;
             var4 -= var7;
-            var1.__b += var7 * var6 - 1048576;
+            var1.field591 += var7 * var6 - 1048576;
             int var8 = class309.PcmPlayer_sampleRate / 100;
             int var9 = 262144 / var6;
-            if(var9 < var8) {
+            if (var9 < var8) {
                var8 = var9;
             }
 
             RawPcmStream var10 = var1.stream;
-            if(this.superStream.__c[var1.__m] == 0) {
-               var1.stream = RawPcmStream.method2524(var1.rawSound, var10.__ab_194(), var10.__s_185(), var10.__t_186());
+            if (this.superStream.field509[var1.field574] == 0) {
+               var1.stream = RawPcmStream.method2524(var1.rawSound, var10.method277(), var10.method268(), var10.method269());
             } else {
-               var1.stream = RawPcmStream.method2524(var1.rawSound, var10.__ab_194(), 0, var10.__t_186());
-               this.superStream.__h_346(var1, var1.patch.__q[var1.__u] < 0);
-               var1.stream.__c_190(var8, var10.__s_185());
+               var1.stream = RawPcmStream.method2524(var1.rawSound, var10.method277(), 0, var10.method269());
+               this.superStream.method178(var1, var1.patch.field568[var1.field577] < 0);
+               var1.stream.method273(var8, var10.method268());
             }
 
-            if(var1.patch.__q[var1.__u] < 0) {
+            if (var1.patch.field568[var1.field577] < 0) {
                var1.stream.setNumLoops(-1);
             }
 
-            var10.__v_192(var8);
-            var10.__e_172(var2, var3, var5 - var3);
-            if(var10.__at_196()) {
+            var10.method275(var8);
+            var10.fill(var2, var3, var5 - var3);
+            if (var10.method279()) {
                this.mixer.addSubStream(var10);
             }
          }
       }
 
-      var1.stream.__e_172(var2, var3, var4);
+      var1.stream.fill(var2, var3, var4);
    }
 
    @ObfuscatedName("f")
@@ -95,28 +95,28 @@ public class MusicPatchPcmStream extends PcmStream {
       signature = "(Lha;II)V",
       garbageValue = "1882591412"
    )
-   void __f_380(MusicPatchNode var1, int var2) {
-      if((this.superStream.__y[var1.__m] & 4) != 0 && var1.__a < 0) {
-         int var3 = this.superStream.__p[var1.__m] / class309.PcmPlayer_sampleRate;
-         int var4 = (var3 + 1048575 - var1.__b) / var3;
-         var1.__b = var3 * var2 + var1.__b & 1048575;
-         if(var4 <= var2) {
-            if(this.superStream.__c[var1.__m] == 0) {
-               var1.stream = RawPcmStream.method2524(var1.rawSound, var1.stream.__ab_194(), var1.stream.__s_185(), var1.stream.__t_186());
+   void method221(MusicPatchNode var1, int var2) {
+      if ((this.superStream.field506[var1.field574] & 4) != 0 && var1.field586 < 0) {
+         int var3 = this.superStream.field511[var1.field574] / class309.PcmPlayer_sampleRate;
+         int var4 = (var3 + 1048575 - var1.field591) / var3;
+         var1.field591 = var3 * var2 + var1.field591 & 1048575;
+         if (var4 <= var2) {
+            if (this.superStream.field509[var1.field574] == 0) {
+               var1.stream = RawPcmStream.method2524(var1.rawSound, var1.stream.method277(), var1.stream.method268(), var1.stream.method269());
             } else {
-               var1.stream = RawPcmStream.method2524(var1.rawSound, var1.stream.__ab_194(), 0, var1.stream.__t_186());
-               this.superStream.__h_346(var1, var1.patch.__q[var1.__u] < 0);
+               var1.stream = RawPcmStream.method2524(var1.rawSound, var1.stream.method277(), 0, var1.stream.method269());
+               this.superStream.method178(var1, var1.patch.field568[var1.field577] < 0);
             }
 
-            if(var1.patch.__q[var1.__u] < 0) {
+            if (var1.patch.field568[var1.field577] < 0) {
                var1.stream.setNumLoops(-1);
             }
 
-            var2 = var1.__b / var3;
+            var2 = var1.field591 / var3;
          }
       }
 
-      var1.stream.__d_173(var2);
+      var1.stream.skip(var2);
    }
 
    @ObfuscatedName("u")
@@ -126,7 +126,7 @@ public class MusicPatchPcmStream extends PcmStream {
    @Export("firstSubStream")
    protected PcmStream firstSubStream() {
       MusicPatchNode var1 = (MusicPatchNode)this.queue.last();
-      return (PcmStream)(var1 == null?null:(var1.stream != null?var1.stream:this.nextSubStream()));
+      return (PcmStream)(var1 == null ? null : (var1.stream != null ? var1.stream : this.nextSubStream()));
    }
 
    @ObfuscatedName("g")
@@ -138,7 +138,7 @@ public class MusicPatchPcmStream extends PcmStream {
       MusicPatchNode var1;
       do {
          var1 = (MusicPatchNode)this.queue.previous();
-         if(var1 == null) {
+         if (var1 == null) {
             return null;
          }
       } while(var1.stream == null);
@@ -147,53 +147,55 @@ public class MusicPatchPcmStream extends PcmStream {
    }
 
    @ObfuscatedName("l")
-   protected int __l_171() {
+   protected int vmethod262() {
       return 0;
    }
 
    @ObfuscatedName("e")
-   protected void __e_172(int[] var1, int var2, int var3) {
-      this.mixer.__e_172(var1, var2, var3);
+   @Export("fill")
+   protected void fill(int[] var1, int var2, int var3) {
+      this.mixer.fill(var1, var2, var3);
 
-      for(MusicPatchNode var6 = (MusicPatchNode)this.queue.last(); var6 != null; var6 = (MusicPatchNode)this.queue.previous()) {
-         if(!this.superStream.__ba_368(var6)) {
-            int var4 = var2;
-            int var5 = var3;
+      for (MusicPatchNode var4 = (MusicPatchNode)this.queue.last(); var4 != null; var4 = (MusicPatchNode)this.queue.previous()) {
+         if (!this.superStream.method195(var4)) {
+            int var5 = var2;
+            int var6 = var3;
 
             do {
-               if(var5 <= var6.__y) {
-                  this.__m_379(var6, var1, var4, var5, var5 + var4);
-                  var6.__y -= var5;
+               if (var6 <= var4.field590) {
+                  this.method220(var4, var1, var5, var6, var6 + var5);
+                  var4.field590 -= var6;
                   break;
                }
 
-               this.__m_379(var6, var1, var4, var6.__y, var5 + var4);
-               var4 += var6.__y;
-               var5 -= var6.__y;
-            } while(!this.superStream.__bb_369(var6, var1, var4, var5));
+               this.method220(var4, var1, var5, var4.field590, var6 + var5);
+               var5 += var4.field590;
+               var6 -= var4.field590;
+            } while(!this.superStream.method196(var4, var1, var5, var6));
          }
       }
 
    }
 
    @ObfuscatedName("d")
-   protected void __d_173(int var1) {
-      this.mixer.__d_173(var1);
+   @Export("skip")
+   protected void skip(int var1) {
+      this.mixer.skip(var1);
 
-      for(MusicPatchNode var3 = (MusicPatchNode)this.queue.last(); var3 != null; var3 = (MusicPatchNode)this.queue.previous()) {
-         if(!this.superStream.__ba_368(var3)) {
-            int var2 = var1;
+      for (MusicPatchNode var2 = (MusicPatchNode)this.queue.last(); var2 != null; var2 = (MusicPatchNode)this.queue.previous()) {
+         if (!this.superStream.method195(var2)) {
+            int var3 = var1;
 
             do {
-               if(var2 <= var3.__y) {
-                  this.__f_380(var3, var2);
-                  var3.__y -= var2;
+               if (var3 <= var2.field590) {
+                  this.method221(var2, var3);
+                  var2.field590 -= var3;
                   break;
                }
 
-               this.__f_380(var3, var3.__y);
-               var2 -= var3.__y;
-            } while(!this.superStream.__bb_369(var3, (int[])null, 0, var2));
+               this.method221(var2, var2.field590);
+               var3 -= var2.field590;
+            } while(!this.superStream.method196(var2, (int[])null, 0, var3));
          }
       }
 
diff --git a/runescape-client/src/main/java/MusicSample.java b/runescape-client/src/main/java/MusicSample.java
index 7c5cb71a6a..182e0b9278 100644
--- a/runescape-client/src/main/java/MusicSample.java
+++ b/runescape-client/src/main/java/MusicSample.java
@@ -7,15 +7,15 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("MusicSample")
 public class MusicSample extends Node {
    @ObfuscatedName("g")
-   static byte[] __cd_g;
+   static byte[] field603;
    @ObfuscatedName("l")
-   static int __cd_l;
+   static int field604;
    @ObfuscatedName("e")
-   static int __cd_e;
+   static int field605;
    @ObfuscatedName("x")
-   static int __cd_x;
+   static int field606;
    @ObfuscatedName("d")
-   static int __cd_d;
+   static int field607;
    @ObfuscatedName("k")
    @ObfuscatedSignature(
       signature = "[Lcc;"
@@ -37,31 +37,31 @@ public class MusicSample extends Node {
    )
    static class114[] field1326;
    @ObfuscatedName("z")
-   static boolean[] __cd_z;
+   static boolean[] field608;
    @ObfuscatedName("j")
-   static int[] __cd_j;
+   static int[] field609;
    @ObfuscatedName("s")
-   static boolean __cd_s;
+   static boolean field610;
    @ObfuscatedName("c")
-   static float[] __cd_c;
+   static float[] field611;
    @ObfuscatedName("r")
-   static float[] __cd_r;
+   static float[] field612;
    @ObfuscatedName("p")
-   static float[] __cd_p;
+   static float[] field613;
    @ObfuscatedName("v")
-   static float[] __cd_v;
+   static float[] field614;
    @ObfuscatedName("ag")
-   static float[] __cd_ag;
+   static float[] field615;
    @ObfuscatedName("aq")
-   static float[] __cd_aq;
+   static float[] field616;
    @ObfuscatedName("aj")
-   static float[] __cd_aj;
+   static float[] field617;
    @ObfuscatedName("av")
-   static int[] __cd_av;
+   static int[] field618;
    @ObfuscatedName("ar")
-   static int[] __cd_ar;
+   static int[] field619;
    @ObfuscatedName("m")
-   byte[][] __m;
+   byte[][] field620;
    @ObfuscatedName("f")
    @Export("sampleRate")
    int sampleRate;
@@ -75,26 +75,22 @@ public class MusicSample extends Node {
    @Export("end")
    int end;
    @ObfuscatedName("u")
-   boolean __u;
+   boolean field621;
    @ObfuscatedName("t")
-   float[] __t;
+   float[] field622;
    @ObfuscatedName("y")
-   int __y;
+   int field623;
    @ObfuscatedName("h")
-   int __h;
+   int field624;
    @ObfuscatedName("b")
-   boolean __b;
+   boolean field625;
    @ObfuscatedName("ac")
    @Export("samples")
    byte[] samples;
    @ObfuscatedName("ay")
-   int __ay;
+   int field626;
    @ObfuscatedName("ah")
-   int __ah;
-
-   static {
-      __cd_s = false;
-   }
+   int field627;
 
    MusicSample(byte[] var1) {
       this.read(var1);
@@ -108,15 +104,15 @@ public class MusicSample extends Node {
       this.sampleCount = var2.readInt();
       this.start = var2.readInt();
       this.end = var2.readInt();
-      if(this.end < 0) {
+      if (this.end < 0) {
          this.end = ~this.end;
-         this.__u = true;
+         this.field621 = true;
       }
 
       int var3 = var2.readInt();
-      this.__m = new byte[var3][];
+      this.field620 = new byte[var3][];
 
-      for(int var4 = 0; var4 < var3; ++var4) {
+      for (int var4 = 0; var4 < var3; ++var4) {
          int var5 = 0;
 
          int var6;
@@ -126,22 +122,22 @@ public class MusicSample extends Node {
          } while(var6 >= 255);
 
          byte[] var7 = new byte[var5];
-         var2.__al_305(var7, 0, var5);
-         this.__m[var4] = var7;
+         var2.readBytes(var7, 0, var5);
+         this.field620[var4] = var7;
       }
 
    }
 
    @ObfuscatedName("g")
-   float[] __g_175(int var1) {
-      method2337(this.__m[var1], 0);
+   float[] method225(int var1) {
+      method2337(this.field620[var1], 0);
       method2338();
-      int var2 = method2352(WorldMapCacheName.method634(__cd_j.length - 1));
-      boolean var3 = __cd_z[var2];
-      int var4 = var3?__cd_d:__cd_x;
+      int var2 = method2352(WorldMapCacheName.method634(field609.length - 1));
+      boolean var3 = field608[var2];
+      int var4 = var3 ? field607 : field606;
       boolean var5 = false;
       boolean var6 = false;
-      if(var3) {
+      if (var3) {
          var5 = method2338() != 0;
          var6 = method2338() != 0;
       }
@@ -150,10 +146,10 @@ public class MusicSample extends Node {
       int var8;
       int var9;
       int var10;
-      if(var3 && !var5) {
-         var8 = (var4 >> 2) - (__cd_x >> 2);
-         var9 = (__cd_x >> 2) + (var4 >> 2);
-         var10 = __cd_x >> 1;
+      if (var3 && !var5) {
+         var8 = (var4 >> 2) - (field606 >> 2);
+         var9 = (field606 >> 2) + (var4 >> 2);
+         var10 = field606 >> 1;
       } else {
          var8 = 0;
          var9 = var7;
@@ -163,224 +159,228 @@ public class MusicSample extends Node {
       int var11;
       int var12;
       int var13;
-      if(var3 && !var6) {
-         var11 = var4 - (var4 >> 2) - (__cd_x >> 2);
-         var12 = (__cd_x >> 2) + (var4 - (var4 >> 2));
-         var13 = __cd_x >> 1;
+      if (var3 && !var6) {
+         var11 = var4 - (var4 >> 2) - (field606 >> 2);
+         var12 = (field606 >> 2) + (var4 - (var4 >> 2));
+         var13 = field606 >> 1;
       } else {
          var11 = var7;
          var12 = var4;
          var13 = var4 >> 1;
       }
 
-      class114 var14 = field1326[__cd_j[var2]];
-      int var16 = var14.field1454;
-      int var17 = var14.field1452[var16];
-      boolean var15 = !field1324[var17].method2367();
-      boolean var45 = var15;
+      class114 var14 = field1326[field609[var2]];
+      int var15 = var14.field1454;
+      int var16 = var14.field1452[var15];
+      boolean var17 = !field1324[var16].method2367();
+      boolean var18 = var17;
 
-      for(var17 = 0; var17 < var14.field1453; ++var17) {
-         class109 var18 = field1344[var14.field1455[var17]];
-         float[] var19 = __cd_c;
-         var18.method2473(var19, var4 >> 1, var45);
+      float[] var20;
+      for (var16 = 0; var16 < var14.field1453; ++var16) {
+         class109 var19 = field1344[var14.field1455[var16]];
+         var20 = field611;
+         var19.method2473(var20, var4 >> 1, var18);
       }
 
-      int var40;
-      if(!var15) {
-         var17 = var14.field1454;
-         var40 = var14.field1452[var17];
-         field1324[var40].method2375(__cd_c, var4 >> 1);
+      int var48;
+      if (!var17) {
+         var16 = var14.field1454;
+         var48 = var14.field1452[var16];
+         field1324[var48].method2375(field611, var4 >> 1);
       }
 
-      int var42;
-      if(var15) {
-         for(var17 = var4 >> 1; var17 < var4; ++var17) {
-            __cd_c[var17] = 0.0F;
+      int var21;
+      int var22;
+      float[] var23;
+      if (var17) {
+         for (var16 = var4 >> 1; var16 < var4; ++var16) {
+            field611[var16] = 0.0F;
          }
       } else {
-         var17 = var4 >> 1;
-         var40 = var4 >> 2;
-         var42 = var4 >> 3;
-         float[] var43 = __cd_c;
+         var16 = var4 >> 1;
+         var48 = var4 >> 2;
+         var22 = var4 >> 3;
+         var20 = field611;
 
-         int var21;
-         for(var21 = 0; var21 < var17; ++var21) {
-            var43[var21] *= 0.5F;
+         for (var21 = 0; var21 < var16; ++var21) {
+            var20[var21] *= 0.5F;
          }
 
-         for(var21 = var17; var21 < var4; ++var21) {
-            var43[var21] = -var43[var4 - var21 - 1];
+         for (var21 = var16; var21 < var4; ++var21) {
+            var20[var21] = -var20[var4 - var21 - 1];
          }
 
-         float[] var44 = var3?__cd_ag:__cd_r;
-         float[] var22 = var3?__cd_aq:__cd_p;
-         float[] var23 = var3?__cd_aj:__cd_v;
-         int[] var24 = var3?__cd_ar:__cd_av;
+         var23 = var3 ? field615 : field612;
+         float[] var24 = var3 ? field616 : field613;
+         float[] var25 = var3 ? field617 : field614;
+         int[] var26 = var3 ? field619 : field618;
 
-         int var25;
-         float var26;
-         float var27;
+         int var27;
          float var28;
          float var29;
-         for(var25 = 0; var25 < var40; ++var25) {
-            var26 = var43[var25 * 4] - var43[var4 - var25 * 4 - 1];
-            var27 = var43[var25 * 4 + 2] - var43[var4 - var25 * 4 - 3];
-            var28 = var44[var25 * 2];
-            var29 = var44[var25 * 2 + 1];
-            var43[var4 - var25 * 4 - 1] = var26 * var28 - var27 * var29;
-            var43[var4 - var25 * 4 - 3] = var26 * var29 + var27 * var28;
-         }
-
          float var30;
          float var31;
-         for(var25 = 0; var25 < var42; ++var25) {
-            var26 = var43[var17 + var25 * 4 + 3];
-            var27 = var43[var17 + var25 * 4 + 1];
-            var28 = var43[var25 * 4 + 3];
-            var29 = var43[var25 * 4 + 1];
-            var43[var17 + var25 * 4 + 3] = var26 + var28;
-            var43[var17 + var25 * 4 + 1] = var27 + var29;
-            var30 = var44[var17 - 4 - var25 * 4];
-            var31 = var44[var17 - 3 - var25 * 4];
-            var43[var25 * 4 + 3] = (var26 - var28) * var30 - (var27 - var29) * var31;
-            var43[var25 * 4 + 1] = (var27 - var29) * var30 + (var26 - var28) * var31;
+         for (var27 = 0; var27 < var48; ++var27) {
+            var28 = var20[var27 * 4] - var20[var4 - var27 * 4 - 1];
+            var29 = var20[var27 * 4 + 2] - var20[var4 - var27 * 4 - 3];
+            var30 = var23[var27 * 2];
+            var31 = var23[var27 * 2 + 1];
+            var20[var4 - var27 * 4 - 1] = var28 * var30 - var29 * var31;
+            var20[var4 - var27 * 4 - 3] = var28 * var31 + var29 * var30;
          }
 
-         var25 = WorldMapCacheName.method634(var4 - 1);
+         float var32;
+         float var33;
+         for (var27 = 0; var27 < var22; ++var27) {
+            var28 = var20[var16 + var27 * 4 + 3];
+            var29 = var20[var16 + var27 * 4 + 1];
+            var30 = var20[var27 * 4 + 3];
+            var31 = var20[var27 * 4 + 1];
+            var20[var16 + var27 * 4 + 3] = var28 + var30;
+            var20[var16 + var27 * 4 + 1] = var29 + var31;
+            var32 = var23[var16 - 4 - var27 * 4];
+            var33 = var23[var16 - 3 - var27 * 4];
+            var20[var27 * 4 + 3] = (var28 - var30) * var32 - (var29 - var31) * var33;
+            var20[var27 * 4 + 1] = (var29 - var31) * var32 + (var28 - var30) * var33;
+         }
 
-         int var47;
-         int var48;
-         int var49;
-         int var50;
-         for(var47 = 0; var47 < var25 - 3; ++var47) {
-            var48 = var4 >> var47 + 2;
-            var49 = 8 << var47;
+         var27 = WorldMapCacheName.method634(var4 - 1);
 
-            for(var50 = 0; var50 < 2 << var47; ++var50) {
-               int var51 = var4 - var48 * var50 * 2;
-               int var52 = var4 - var48 * (var50 * 2 + 1);
+         int var34;
+         int var35;
+         int var36;
+         int var37;
+         for (var34 = 0; var34 < var27 - 3; ++var34) {
+            var35 = var4 >> var34 + 2;
+            var36 = 8 << var34;
 
-               for(int var32 = 0; var32 < var4 >> var47 + 4; ++var32) {
-                  int var33 = var32 * 4;
-                  float var34 = var43[var51 - 1 - var33];
-                  float var35 = var43[var51 - 3 - var33];
-                  float var36 = var43[var52 - 1 - var33];
-                  float var37 = var43[var52 - 3 - var33];
-                  var43[var51 - 1 - var33] = var34 + var36;
-                  var43[var51 - 3 - var33] = var35 + var37;
-                  float var38 = var44[var32 * var49];
-                  float var39 = var44[var32 * var49 + 1];
-                  var43[var52 - 1 - var33] = (var34 - var36) * var38 - (var35 - var37) * var39;
-                  var43[var52 - 3 - var33] = (var35 - var37) * var38 + (var34 - var36) * var39;
+            for (var37 = 0; var37 < 2 << var34; ++var37) {
+               int var38 = var4 - var35 * var37 * 2;
+               int var39 = var4 - var35 * (var37 * 2 + 1);
+
+               for (int var40 = 0; var40 < var4 >> var34 + 4; ++var40) {
+                  int var41 = var40 * 4;
+                  float var42 = var20[var38 - 1 - var41];
+                  float var43 = var20[var38 - 3 - var41];
+                  float var44 = var20[var39 - 1 - var41];
+                  float var45 = var20[var39 - 3 - var41];
+                  var20[var38 - 1 - var41] = var42 + var44;
+                  var20[var38 - 3 - var41] = var43 + var45;
+                  float var46 = var23[var40 * var36];
+                  float var47 = var23[var40 * var36 + 1];
+                  var20[var39 - 1 - var41] = (var42 - var44) * var46 - (var43 - var45) * var47;
+                  var20[var39 - 3 - var41] = (var43 - var45) * var46 + (var42 - var44) * var47;
                }
             }
          }
 
-         for(var47 = 1; var47 < var42 - 1; ++var47) {
-            var48 = var24[var47];
-            if(var47 < var48) {
-               var49 = var47 * 8;
-               var50 = var48 * 8;
-               var30 = var43[var49 + 1];
-               var43[var49 + 1] = var43[var50 + 1];
-               var43[var50 + 1] = var30;
-               var30 = var43[var49 + 3];
-               var43[var49 + 3] = var43[var50 + 3];
-               var43[var50 + 3] = var30;
-               var30 = var43[var49 + 5];
-               var43[var49 + 5] = var43[var50 + 5];
-               var43[var50 + 5] = var30;
-               var30 = var43[var49 + 7];
-               var43[var49 + 7] = var43[var50 + 7];
-               var43[var50 + 7] = var30;
+         for (var34 = 1; var34 < var22 - 1; ++var34) {
+            var35 = var26[var34];
+            if (var34 < var35) {
+               var36 = var34 * 8;
+               var37 = var35 * 8;
+               var32 = var20[var36 + 1];
+               var20[var36 + 1] = var20[var37 + 1];
+               var20[var37 + 1] = var32;
+               var32 = var20[var36 + 3];
+               var20[var36 + 3] = var20[var37 + 3];
+               var20[var37 + 3] = var32;
+               var32 = var20[var36 + 5];
+               var20[var36 + 5] = var20[var37 + 5];
+               var20[var37 + 5] = var32;
+               var32 = var20[var36 + 7];
+               var20[var36 + 7] = var20[var37 + 7];
+               var20[var37 + 7] = var32;
             }
          }
 
-         for(var47 = 0; var47 < var17; ++var47) {
-            var43[var47] = var43[var47 * 2 + 1];
+         for (var34 = 0; var34 < var16; ++var34) {
+            var20[var34] = var20[var34 * 2 + 1];
          }
 
-         for(var47 = 0; var47 < var42; ++var47) {
-            var43[var4 - 1 - var47 * 2] = var43[var47 * 4];
-            var43[var4 - 2 - var47 * 2] = var43[var47 * 4 + 1];
-            var43[var4 - var40 - 1 - var47 * 2] = var43[var47 * 4 + 2];
-            var43[var4 - var40 - 2 - var47 * 2] = var43[var47 * 4 + 3];
+         for (var34 = 0; var34 < var22; ++var34) {
+            var20[var4 - 1 - var34 * 2] = var20[var34 * 4];
+            var20[var4 - 2 - var34 * 2] = var20[var34 * 4 + 1];
+            var20[var4 - var48 - 1 - var34 * 2] = var20[var34 * 4 + 2];
+            var20[var4 - var48 - 2 - var34 * 2] = var20[var34 * 4 + 3];
          }
 
-         for(var47 = 0; var47 < var42; ++var47) {
-            var27 = var23[var47 * 2];
-            var28 = var23[var47 * 2 + 1];
-            var29 = var43[var17 + var47 * 2];
-            var30 = var43[var17 + var47 * 2 + 1];
-            var31 = var43[var4 - 2 - var47 * 2];
-            float var53 = var43[var4 - 1 - var47 * 2];
-            float var54 = var28 * (var29 - var31) + var27 * (var30 + var53);
-            var43[var17 + var47 * 2] = (var29 + var31 + var54) * 0.5F;
-            var43[var4 - 2 - var47 * 2] = (var29 + var31 - var54) * 0.5F;
-            var54 = var28 * (var30 + var53) - var27 * (var29 - var31);
-            var43[var17 + var47 * 2 + 1] = (var30 - var53 + var54) * 0.5F;
-            var43[var4 - 1 - var47 * 2] = (-var30 + var53 + var54) * 0.5F;
+         for (var34 = 0; var34 < var22; ++var34) {
+            var29 = var25[var34 * 2];
+            var30 = var25[var34 * 2 + 1];
+            var31 = var20[var16 + var34 * 2];
+            var32 = var20[var16 + var34 * 2 + 1];
+            var33 = var20[var4 - 2 - var34 * 2];
+            float var49 = var20[var4 - 1 - var34 * 2];
+            float var51 = var30 * (var31 - var33) + var29 * (var32 + var49);
+            var20[var16 + var34 * 2] = (var31 + var33 + var51) * 0.5F;
+            var20[var4 - 2 - var34 * 2] = (var31 + var33 - var51) * 0.5F;
+            var51 = var30 * (var32 + var49) - var29 * (var31 - var33);
+            var20[var16 + var34 * 2 + 1] = (var32 - var49 + var51) * 0.5F;
+            var20[var4 - 1 - var34 * 2] = (-var32 + var49 + var51) * 0.5F;
          }
 
-         for(var47 = 0; var47 < var40; ++var47) {
-            var43[var47] = var43[var17 + var47 * 2] * var22[var47 * 2] + var43[var17 + var47 * 2 + 1] * var22[var47 * 2 + 1];
-            var43[var17 - 1 - var47] = var43[var17 + var47 * 2] * var22[var47 * 2 + 1] - var43[var17 + var47 * 2 + 1] * var22[var47 * 2];
+         for (var34 = 0; var34 < var48; ++var34) {
+            var20[var34] = var20[var16 + var34 * 2] * var24[var34 * 2] + var20[var16 + var34 * 2 + 1] * var24[var34 * 2 + 1];
+            var20[var16 - 1 - var34] = var20[var16 + var34 * 2] * var24[var34 * 2 + 1] - var20[var16 + var34 * 2 + 1] * var24[var34 * 2];
          }
 
-         for(var47 = 0; var47 < var40; ++var47) {
-            var43[var47 + (var4 - var40)] = -var43[var47];
+         for (var34 = 0; var34 < var48; ++var34) {
+            var20[var34 + (var4 - var48)] = -var20[var34];
          }
 
-         for(var47 = 0; var47 < var40; ++var47) {
-            var43[var47] = var43[var40 + var47];
+         for (var34 = 0; var34 < var48; ++var34) {
+            var20[var34] = var20[var48 + var34];
          }
 
-         for(var47 = 0; var47 < var40; ++var47) {
-            var43[var40 + var47] = -var43[var40 - var47 - 1];
+         for (var34 = 0; var34 < var48; ++var34) {
+            var20[var48 + var34] = -var20[var48 - var34 - 1];
          }
 
-         for(var47 = 0; var47 < var40; ++var47) {
-            var43[var17 + var47] = var43[var4 - var47 - 1];
+         for (var34 = 0; var34 < var48; ++var34) {
+            var20[var16 + var34] = var20[var4 - var34 - 1];
          }
 
-         for(var47 = var8; var47 < var9; ++var47) {
-            var27 = (float)Math.sin(((double)(var47 - var8) + 0.5D) / (double)var10 * 0.5D * 3.141592653589793D);
-            __cd_c[var47] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27);
+         float[] var50;
+         for (var34 = var8; var34 < var9; ++var34) {
+            var29 = (float)Math.sin(((double)(var34 - var8) + 0.5D) / (double)var10 * 0.5D * 3.141592653589793D);
+            var50 = field611;
+            var50[var34] *= (float)Math.sin(1.5707963267948966D * (double)var29 * (double)var29);
          }
 
-         for(var47 = var11; var47 < var12; ++var47) {
-            var27 = (float)Math.sin(((double)(var47 - var11) + 0.5D) / (double)var13 * 0.5D * 3.141592653589793D + 1.5707963267948966D);
-            __cd_c[var47] *= (float)Math.sin(1.5707963267948966D * (double)var27 * (double)var27);
+         for (var34 = var11; var34 < var12; ++var34) {
+            var29 = (float)Math.sin(((double)(var34 - var11) + 0.5D) / (double)var13 * 0.5D * 3.141592653589793D + 1.5707963267948966D);
+            var50 = field611;
+            var50[var34] *= (float)Math.sin(1.5707963267948966D * (double)var29 * (double)var29);
          }
       }
 
-      float[] var41 = null;
-      if(this.__y > 0) {
-         var40 = var4 + this.__y >> 2;
-         var41 = new float[var40];
-         int var20;
-         if(!this.__b) {
-            for(var42 = 0; var42 < this.__h; ++var42) {
-               var20 = var42 + (this.__y >> 1);
-               var41[var42] += this.__t[var20];
+      var20 = null;
+      if (this.field623 > 0) {
+         var48 = var4 + this.field623 >> 2;
+         var20 = new float[var48];
+         if (!this.field625) {
+            for (var22 = 0; var22 < this.field624; ++var22) {
+               var21 = var22 + (this.field623 >> 1);
+               var20[var22] += this.field622[var21];
             }
          }
 
-         if(!var15) {
-            for(var42 = var8; var42 < var4 >> 1; ++var42) {
-               var20 = var41.length - (var4 >> 1) + var42;
-               var41[var20] += __cd_c[var42];
+         if (!var17) {
+            for (var22 = var8; var22 < var4 >> 1; ++var22) {
+               var21 = var20.length - (var4 >> 1) + var22;
+               var20[var21] += field611[var22];
             }
          }
       }
 
-      float[] var46 = this.__t;
-      this.__t = __cd_c;
-      __cd_c = var46;
-      this.__y = var4;
-      this.__h = var12 - (var4 >> 1);
-      this.__b = var15;
-      return var41;
+      var23 = this.field622;
+      this.field622 = field611;
+      field611 = var23;
+      this.field623 = var4;
+      this.field624 = var12 - (var4 >> 1);
+      this.field625 = var17;
+      return var20;
    }
 
    @ObfuscatedName("x")
@@ -389,51 +389,51 @@ public class MusicSample extends Node {
    )
    @Export("toRawSound")
    RawSound toRawSound(int[] var1) {
-      if(var1 != null && var1[0] <= 0) {
+      if (var1 != null && var1[0] <= 0) {
          return null;
       } else {
-         if(this.samples == null) {
-            this.__y = 0;
-            this.__t = new float[__cd_d];
+         if (this.samples == null) {
+            this.field623 = 0;
+            this.field622 = new float[field607];
             this.samples = new byte[this.sampleCount];
-            this.__ay = 0;
-            this.__ah = 0;
+            this.field626 = 0;
+            this.field627 = 0;
          }
 
-         for(; this.__ah < this.__m.length; ++this.__ah) {
-            if(var1 != null && var1[0] <= 0) {
+         for (; this.field627 < this.field620.length; ++this.field627) {
+            if (var1 != null && var1[0] <= 0) {
                return null;
             }
 
-            float[] var2 = this.__g_175(this.__ah);
-            if(var2 != null) {
-               int var3 = this.__ay;
+            float[] var2 = this.method225(this.field627);
+            if (var2 != null) {
+               int var3 = this.field626;
                int var4 = var2.length;
-               if(var4 > this.sampleCount - var3) {
+               if (var4 > this.sampleCount - var3) {
                   var4 = this.sampleCount - var3;
                }
 
-               for(int var5 = 0; var5 < var4; ++var5) {
+               for (int var5 = 0; var5 < var4; ++var5) {
                   int var6 = (int)(128.0F + var2[var5] * 128.0F);
-                  if((var6 & -256) != 0) {
+                  if ((var6 & -256) != 0) {
                      var6 = ~var6 >> 31;
                   }
 
                   this.samples[var3++] = (byte)(var6 - 128);
                }
 
-               if(var1 != null) {
-                  var1[0] -= var3 - this.__ay;
+               if (var1 != null) {
+                  var1[0] -= var3 - this.field626;
                }
 
-               this.__ay = var3;
+               this.field626 = var3;
             }
          }
 
-         this.__t = null;
+         this.field622 = null;
          byte[] var7 = this.samples;
          this.samples = null;
-         return new RawSound(this.sampleRate, var7, this.start, this.end, this.__u);
+         return new RawSound(this.sampleRate, var7, this.start, this.end, this.field621);
       }
    }
 
@@ -442,7 +442,7 @@ public class MusicSample extends Node {
       int var1 = var0 & 2097151;
       int var2 = var0 & Integer.MIN_VALUE;
       int var3 = (var0 & 2145386496) >> 21;
-      if(var2 != 0) {
+      if (var2 != 0) {
          var1 = -var1;
       }
 
@@ -451,17 +451,17 @@ public class MusicSample extends Node {
 
    @ObfuscatedName("f")
    static void method2337(byte[] var0, int var1) {
-      __cd_g = var0;
-      __cd_l = var1;
-      __cd_e = 0;
+      field603 = var0;
+      field604 = var1;
+      field605 = 0;
    }
 
    @ObfuscatedName("q")
    static int method2338() {
-      int var0 = __cd_g[__cd_l] >> __cd_e & 1;
-      ++__cd_e;
-      __cd_l += __cd_e >> 3;
-      __cd_e &= 7;
+      int var0 = field603[field604] >> field605 & 1;
+      ++field605;
+      field604 += field605 >> 3;
+      field605 &= 7;
       return var0;
    }
 
@@ -471,19 +471,19 @@ public class MusicSample extends Node {
 
       int var2;
       int var3;
-      for(var2 = 0; var0 >= 8 - __cd_e; var0 -= var3) {
-         var3 = 8 - __cd_e;
+      for (var2 = 0; var0 >= 8 - field605; var0 -= var3) {
+         var3 = 8 - field605;
          int var4 = (1 << var3) - 1;
-         var1 += (__cd_g[__cd_l] >> __cd_e & var4) << var2;
-         __cd_e = 0;
-         ++__cd_l;
+         var1 += (field603[field604] >> field605 & var4) << var2;
+         field605 = 0;
+         ++field604;
          var2 += var3;
       }
 
-      if(var0 > 0) {
+      if (var0 > 0) {
          var3 = (1 << var0) - 1;
-         var1 += (__cd_g[__cd_l] >> __cd_e & var3) << var2;
-         __cd_e += var0;
+         var1 += (field603[field604] >> field605 & var3) << var2;
+         field605 += var0;
       }
 
       return var1;
@@ -492,104 +492,104 @@ public class MusicSample extends Node {
    @ObfuscatedName("u")
    static void method2341(byte[] var0) {
       method2337(var0, 0);
-      __cd_x = 1 << method2352(4);
-      __cd_d = 1 << method2352(4);
-      __cd_c = new float[__cd_d];
+      field606 = 1 << method2352(4);
+      field607 = 1 << method2352(4);
+      field611 = new float[field607];
 
       int var1;
       int var2;
       int var3;
       int var4;
       int var5;
-      for(var1 = 0; var1 < 2; ++var1) {
-         var2 = var1 != 0?__cd_d:__cd_x;
+      for (var1 = 0; var1 < 2; ++var1) {
+         var2 = var1 != 0 ? field607 : field606;
          var3 = var2 >> 1;
          var4 = var2 >> 2;
          var5 = var2 >> 3;
          float[] var6 = new float[var3];
 
-         for(int var7 = 0; var7 < var4; ++var7) {
+         for (int var7 = 0; var7 < var4; ++var7) {
             var6[var7 * 2] = (float)Math.cos((double)(var7 * 4) * 3.141592653589793D / (double)var2);
             var6[var7 * 2 + 1] = -((float)Math.sin((double)(var7 * 4) * 3.141592653589793D / (double)var2));
          }
 
-         float[] var12 = new float[var3];
+         float[] var13 = new float[var3];
 
-         for(int var8 = 0; var8 < var4; ++var8) {
-            var12[var8 * 2] = (float)Math.cos((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2));
-            var12[var8 * 2 + 1] = (float)Math.sin((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2));
+         for (int var8 = 0; var8 < var4; ++var8) {
+            var13[var8 * 2] = (float)Math.cos((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2));
+            var13[var8 * 2 + 1] = (float)Math.sin((double)(var8 * 2 + 1) * 3.141592653589793D / (double)(var2 * 2));
          }
 
-         float[] var13 = new float[var4];
+         float[] var14 = new float[var4];
 
-         for(int var9 = 0; var9 < var5; ++var9) {
-            var13[var9 * 2] = (float)Math.cos((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2);
-            var13[var9 * 2 + 1] = -((float)Math.sin((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2));
+         for (int var9 = 0; var9 < var5; ++var9) {
+            var14[var9 * 2] = (float)Math.cos((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2);
+            var14[var9 * 2 + 1] = -((float)Math.sin((double)(var9 * 4 + 2) * 3.141592653589793D / (double)var2));
          }
 
-         int[] var14 = new int[var5];
+         int[] var15 = new int[var5];
          int var10 = WorldMapCacheName.method634(var5 - 1);
 
-         for(int var11 = 0; var11 < var5; ++var11) {
-            var14[var11] = GrandExchangeEvent.method87(var11, var10);
+         for (int var11 = 0; var11 < var5; ++var11) {
+            var15[var11] = GrandExchangeEvent.method87(var11, var10);
          }
 
-         if(var1 != 0) {
-            __cd_ag = var6;
-            __cd_aq = var12;
-            __cd_aj = var13;
-            __cd_ar = var14;
+         if (var1 != 0) {
+            field615 = var6;
+            field616 = var13;
+            field617 = var14;
+            field619 = var15;
          } else {
-            __cd_r = var6;
-            __cd_p = var12;
-            __cd_v = var13;
-            __cd_av = var14;
+            field612 = var6;
+            field613 = var13;
+            field614 = var14;
+            field618 = var15;
          }
       }
 
       var1 = method2352(8) + 1;
       field1323 = new class98[var1];
 
-      for(var2 = 0; var2 < var1; ++var2) {
+      for (var2 = 0; var2 < var1; ++var2) {
          field1323[var2] = new class98();
       }
 
       var2 = method2352(6) + 1;
 
-      for(var3 = 0; var3 < var2; ++var3) {
+      for (var3 = 0; var3 < var2; ++var3) {
          method2352(16);
       }
 
       var2 = method2352(6) + 1;
       field1324 = new class102[var2];
 
-      for(var3 = 0; var3 < var2; ++var3) {
+      for (var3 = 0; var3 < var2; ++var3) {
          field1324[var3] = new class102();
       }
 
       var3 = method2352(6) + 1;
       field1344 = new class109[var3];
 
-      for(var4 = 0; var4 < var3; ++var4) {
+      for (var4 = 0; var4 < var3; ++var4) {
          field1344[var4] = new class109();
       }
 
       var4 = method2352(6) + 1;
       field1326 = new class114[var4];
 
-      for(var5 = 0; var5 < var4; ++var5) {
+      for (var5 = 0; var5 < var4; ++var5) {
          field1326[var5] = new class114();
       }
 
       var5 = method2352(6) + 1;
-      __cd_z = new boolean[var5];
-      __cd_j = new int[var5];
+      field608 = new boolean[var5];
+      field609 = new int[var5];
 
-      for(int var15 = 0; var15 < var5; ++var15) {
-         __cd_z[var15] = method2338() != 0;
+      for (int var12 = 0; var12 < var5; ++var12) {
+         field608[var12] = method2338() != 0;
          method2352(16);
          method2352(16);
-         __cd_j[var15] = method2352(8);
+         field609[var12] = method2352(8);
       }
 
    }
@@ -598,15 +598,15 @@ public class MusicSample extends Node {
    @ObfuscatedSignature(
       signature = "(Lir;)Z"
    )
-   static boolean method2343(AbstractIndexCache var0) {
-      if(!__cd_s) {
-         byte[] var1 = var0.takeRecord(0, 0);
-         if(var1 == null) {
+   static boolean method2343(AbstractArchive var0) {
+      if (!field610) {
+         byte[] var1 = var0.takeFile(0, 0);
+         if (var1 == null) {
             return false;
          }
 
          method2341(var1);
-         __cd_s = true;
+         field610 = true;
       }
 
       return true;
@@ -617,13 +617,17 @@ public class MusicSample extends Node {
       signature = "(Lir;II)Lcd;"
    )
    @Export("readMusicSample")
-   static MusicSample readMusicSample(AbstractIndexCache var0, int var1, int var2) {
-      if(!method2343(var0)) {
-         var0.tryLoadRecord(var1, var2);
+   static MusicSample readMusicSample(AbstractArchive var0, int var1, int var2) {
+      if (!method2343(var0)) {
+         var0.tryLoadFile(var1, var2);
          return null;
       } else {
-         byte[] var3 = var0.takeRecord(var1, var2);
-         return var3 == null?null:new MusicSample(var3);
+         byte[] var3 = var0.takeFile(var1, var2);
+         return var3 == null ? null : new MusicSample(var3);
       }
    }
+
+   static {
+      field610 = false;
+   }
 }
diff --git a/runescape-client/src/main/java/MusicTrack.java b/runescape-client/src/main/java/MusicTrack.java
index bd207d4761..7c5b88f066 100644
--- a/runescape-client/src/main/java/MusicTrack.java
+++ b/runescape-client/src/main/java/MusicTrack.java
@@ -22,7 +22,7 @@ public class MusicTrack extends Node {
    MusicTrack(Buffer var1) {
       var1.index = var1.array.length - 3;
       int var2 = var1.readUnsignedByte();
-      int var3 = var1.__ag_302();
+      int var3 = var1.readUnsignedShort();
       int var4 = var2 * 10 + 14;
       var1.index = 0;
       int var5 = 0;
@@ -37,36 +37,36 @@ public class MusicTrack extends Node {
       int var13;
       int var14;
       int var15;
-      for(var13 = 0; var13 < var2; ++var13) {
+      for (var13 = 0; var13 < var2; ++var13) {
          var14 = -1;
 
-         while(true) {
+         while (true) {
             var15 = var1.readUnsignedByte();
-            if(var15 != var14) {
+            if (var15 != var14) {
                ++var4;
             }
 
             var14 = var15 & 15;
-            if(var15 == 7) {
+            if (var15 == 7) {
                break;
             }
 
-            if(var15 == 23) {
+            if (var15 == 23) {
                ++var5;
-            } else if(var14 == 0) {
+            } else if (var14 == 0) {
                ++var7;
-            } else if(var14 == 1) {
+            } else if (var14 == 1) {
                ++var8;
-            } else if(var14 == 2) {
+            } else if (var14 == 2) {
                ++var6;
-            } else if(var14 == 3) {
+            } else if (var14 == 3) {
                ++var9;
-            } else if(var14 == 4) {
+            } else if (var14 == 4) {
                ++var10;
-            } else if(var14 == 5) {
+            } else if (var14 == 5) {
                ++var11;
             } else {
-               if(var14 != 6) {
+               if (var14 != 6) {
                   throw new RuntimeException();
                }
 
@@ -81,8 +81,8 @@ public class MusicTrack extends Node {
       var13 = var1.index;
       var14 = var2 + var5 + var6 + var7 + var8 + var9 + var10 + var11 + var12;
 
-      for(var15 = 0; var15 < var14; ++var15) {
-         var1.__as_311();
+      for (var15 = 0; var15 < var14; ++var15) {
+         var1.readVarInt();
       }
 
       var4 += var1.index - var13;
@@ -102,30 +102,30 @@ public class MusicTrack extends Node {
       int var28 = 0;
 
       int var29;
-      for(var29 = 0; var29 < var6; ++var29) {
+      for (var29 = 0; var29 < var6; ++var29) {
          var28 = var28 + var1.readUnsignedByte() & 127;
-         if(var28 != 0 && var28 != 32) {
-            if(var28 == 1) {
+         if (var28 != 0 && var28 != 32) {
+            if (var28 == 1) {
                ++var16;
-            } else if(var28 == 33) {
+            } else if (var28 == 33) {
                ++var17;
-            } else if(var28 == 7) {
+            } else if (var28 == 7) {
                ++var18;
-            } else if(var28 == 39) {
+            } else if (var28 == 39) {
                ++var19;
-            } else if(var28 == 10) {
+            } else if (var28 == 10) {
                ++var20;
-            } else if(var28 == 42) {
+            } else if (var28 == 42) {
                ++var21;
-            } else if(var28 == 99) {
+            } else if (var28 == 99) {
                ++var22;
-            } else if(var28 == 98) {
+            } else if (var28 == 98) {
                ++var23;
-            } else if(var28 == 101) {
+            } else if (var28 == 101) {
                ++var24;
-            } else if(var28 == 100) {
+            } else if (var28 == 100) {
                ++var25;
-            } else if(var28 != 64 && var28 != 65 && var28 != 120 && var28 != 121 && var28 != 123) {
+            } else if (var28 != 64 && var28 != 65 && var28 != 120 && var28 != 121 && var28 != 123) {
                ++var27;
             } else {
                ++var26;
@@ -182,7 +182,7 @@ public class MusicTrack extends Node {
       Buffer var51 = new Buffer(this.midi);
       var51.writeInt(1297377380);
       var51.writeInt(6);
-      var51.writeShort(var2 > 1?1:0);
+      var51.writeShort(var2 > 1 ? 1 : 0);
       var51.writeShort(var2);
       var51.writeShort(var3);
       var1.index = var13;
@@ -196,33 +196,33 @@ public class MusicTrack extends Node {
       int[] var59 = new int[128];
       var28 = 0;
 
-      label231:
-      for(int var60 = 0; var60 < var2; ++var60) {
+      label222:
+      for (int var60 = 0; var60 < var2; ++var60) {
          var51.writeInt(1297379947);
          var51.index += 4;
          int var61 = var51.index;
          int var62 = -1;
 
-         while(true) {
-            while(true) {
-               int var63 = var1.__as_311();
-               var51.__c_301(var63);
+         while (true) {
+            while (true) {
+               int var63 = var1.readVarInt();
+               var51.writeVarInt(var63);
                int var64 = var1.array[var29++] & 255;
                boolean var65 = var64 != var62;
                var62 = var64 & 15;
-               if(var64 == 7) {
-                  if(var65) {
+               if (var64 == 7) {
+                  if (var65) {
                      var51.writeByte(255);
                   }
 
                   var51.writeByte(47);
                   var51.writeByte(0);
-                  var51.__t_298(var51.index - var61);
-                  continue label231;
+                  var51.writeLengthInt(var51.index - var61);
+                  continue label222;
                }
 
-               if(var64 == 23) {
-                  if(var65) {
+               if (var64 == 23) {
+                  if (var65) {
                      var51.writeByte(255);
                   }
 
@@ -233,8 +233,8 @@ public class MusicTrack extends Node {
                   var51.writeByte(var1.array[var50++]);
                } else {
                   var52 ^= var64 >> 4;
-                  if(var62 == 0) {
-                     if(var65) {
+                  if (var62 == 0) {
+                     if (var65) {
                         var51.writeByte(var52 + 144);
                      }
 
@@ -242,8 +242,8 @@ public class MusicTrack extends Node {
                      var54 += var1.array[var38++];
                      var51.writeByte(var53 & 127);
                      var51.writeByte(var54 & 127);
-                  } else if(var62 == 1) {
-                     if(var65) {
+                  } else if (var62 == 1) {
+                     if (var65) {
                         var51.writeByte(var52 + 128);
                      }
 
@@ -251,36 +251,36 @@ public class MusicTrack extends Node {
                      var55 += var1.array[var40++];
                      var51.writeByte(var53 & 127);
                      var51.writeByte(var55 & 127);
-                  } else if(var62 == 2) {
-                     if(var65) {
+                  } else if (var62 == 2) {
+                     if (var65) {
                         var51.writeByte(var52 + 176);
                      }
 
                      var28 = var28 + var1.array[var15++] & 127;
                      var51.writeByte(var28);
                      byte var66;
-                     if(var28 != 0 && var28 != 32) {
-                        if(var28 == 1) {
+                     if (var28 != 0 && var28 != 32) {
+                        if (var28 == 1) {
                            var66 = var1.array[var34++];
-                        } else if(var28 == 33) {
+                        } else if (var28 == 33) {
                            var66 = var1.array[var41++];
-                        } else if(var28 == 7) {
+                        } else if (var28 == 7) {
                            var66 = var1.array[var35++];
-                        } else if(var28 == 39) {
+                        } else if (var28 == 39) {
                            var66 = var1.array[var42++];
-                        } else if(var28 == 10) {
+                        } else if (var28 == 10) {
                            var66 = var1.array[var36++];
-                        } else if(var28 == 42) {
+                        } else if (var28 == 42) {
                            var66 = var1.array[var43++];
-                        } else if(var28 == 99) {
+                        } else if (var28 == 99) {
                            var66 = var1.array[var46++];
-                        } else if(var28 == 98) {
+                        } else if (var28 == 98) {
                            var66 = var1.array[var47++];
-                        } else if(var28 == 101) {
+                        } else if (var28 == 101) {
                            var66 = var1.array[var48++];
-                        } else if(var28 == 100) {
+                        } else if (var28 == 100) {
                            var66 = var1.array[var49++];
-                        } else if(var28 != 64 && var28 != 65 && var28 != 120 && var28 != 121 && var28 != 123) {
+                        } else if (var28 != 64 && var28 != 65 && var28 != 120 && var28 != 121 && var28 != 123) {
                            var66 = var1.array[var39++];
                         } else {
                            var66 = var1.array[var30++];
@@ -292,8 +292,8 @@ public class MusicTrack extends Node {
                      int var67 = var66 + var59[var28];
                      var59[var28] = var67;
                      var51.writeByte(var67 & 127);
-                  } else if(var62 == 3) {
-                     if(var65) {
+                  } else if (var62 == 3) {
+                     if (var65) {
                         var51.writeByte(var52 + 224);
                      }
 
@@ -301,15 +301,15 @@ public class MusicTrack extends Node {
                      var56 += var1.array[var33++] << 7;
                      var51.writeByte(var56 & 127);
                      var51.writeByte(var56 >> 7 & 127);
-                  } else if(var62 == 4) {
-                     if(var65) {
+                  } else if (var62 == 4) {
+                     if (var65) {
                         var51.writeByte(var52 + 208);
                      }
 
                      var57 += var1.array[var32++];
                      var51.writeByte(var57 & 127);
-                  } else if(var62 == 5) {
-                     if(var65) {
+                  } else if (var62 == 5) {
+                     if (var65) {
                         var51.writeByte(var52 + 160);
                      }
 
@@ -318,11 +318,11 @@ public class MusicTrack extends Node {
                      var51.writeByte(var53 & 127);
                      var51.writeByte(var58 & 127);
                   } else {
-                     if(var62 != 6) {
+                     if (var62 != 6) {
                         throw new RuntimeException();
                      }
 
-                     if(var65) {
+                     if (var65) {
                         var51.writeByte(var52 + 192);
                      }
 
@@ -336,84 +336,84 @@ public class MusicTrack extends Node {
    }
 
    @ObfuscatedName("f")
-   void __f_381() {
-      if(this.table == null) {
+   void method226() {
+      if (this.table == null) {
          this.table = new NodeHashTable(16);
          int[] var1 = new int[16];
          int[] var2 = new int[16];
          var2[9] = 128;
          var1[9] = 128;
-         MidiFileReader var4 = new MidiFileReader(this.midi);
-         int var5 = var4.trackCount();
+         MidiFileReader var3 = new MidiFileReader(this.midi);
+         int var4 = var3.trackCount();
 
-         int var6;
-         for(var6 = 0; var6 < var5; ++var6) {
-            var4.gotoTrack(var6);
-            var4.readTrackLength(var6);
-            var4.markTrackPosition(var6);
+         int var5;
+         for (var5 = 0; var5 < var4; ++var5) {
+            var3.gotoTrack(var5);
+            var3.readTrackLength(var5);
+            var3.markTrackPosition(var5);
          }
 
-         label53:
+         label56:
          do {
-            while(true) {
-               var6 = var4.getPrioritizedTrack();
-               int var7 = var4.trackLengths[var6];
+            while (true) {
+               var5 = var3.getPrioritizedTrack();
+               int var6 = var3.trackLengths[var5];
 
-               while(var7 == var4.trackLengths[var6]) {
-                  var4.gotoTrack(var6);
-                  int var8 = var4.readMessage(var6);
-                  if(var8 == 1) {
-                     var4.setTrackDone();
-                     var4.markTrackPosition(var6);
-                     continue label53;
+               while (var6 == var3.trackLengths[var5]) {
+                  var3.gotoTrack(var5);
+                  int var7 = var3.readMessage(var5);
+                  if (var7 == 1) {
+                     var3.setTrackDone();
+                     var3.markTrackPosition(var5);
+                     continue label56;
                   }
 
-                  int var9 = var8 & 240;
+                  int var8 = var7 & 240;
+                  int var9;
                   int var10;
                   int var11;
-                  int var12;
-                  if(var9 == 176) {
-                     var10 = var8 & 15;
-                     var11 = var8 >> 8 & 127;
-                     var12 = var8 >> 16 & 127;
-                     if(var11 == 0) {
-                        var1[var10] = (var12 << 14) + (var1[var10] & -2080769);
+                  if (var8 == 176) {
+                     var9 = var7 & 15;
+                     var10 = var7 >> 8 & 127;
+                     var11 = var7 >> 16 & 127;
+                     if (var10 == 0) {
+                        var1[var9] = (var11 << 14) + (var1[var9] & -2080769);
                      }
 
-                     if(var11 == 32) {
-                        var1[var10] = (var1[var10] & -16257) + (var12 << 7);
+                     if (var10 == 32) {
+                        var1[var9] = (var1[var9] & -16257) + (var11 << 7);
                      }
                   }
 
-                  if(var9 == 192) {
-                     var10 = var8 & 15;
-                     var11 = var8 >> 8 & 127;
-                     var2[var10] = var11 + var1[var10];
+                  if (var8 == 192) {
+                     var9 = var7 & 15;
+                     var10 = var7 >> 8 & 127;
+                     var2[var9] = var10 + var1[var9];
                   }
 
-                  if(var9 == 144) {
-                     var10 = var8 & 15;
-                     var11 = var8 >> 8 & 127;
-                     var12 = var8 >> 16 & 127;
-                     if(var12 > 0) {
-                        int var13 = var2[var10];
-                        ByteArrayNode var14 = (ByteArrayNode)this.table.get((long)var13);
-                        if(var14 == null) {
-                           var14 = new ByteArrayNode(new byte[128]);
-                           this.table.put(var14, (long)var13);
+                  if (var8 == 144) {
+                     var9 = var7 & 15;
+                     var10 = var7 >> 8 & 127;
+                     var11 = var7 >> 16 & 127;
+                     if (var11 > 0) {
+                        int var12 = var2[var9];
+                        ByteArrayNode var13 = (ByteArrayNode)this.table.get((long)var12);
+                        if (var13 == null) {
+                           var13 = new ByteArrayNode(new byte[128]);
+                           this.table.put(var13, (long)var12);
                         }
 
-                        var14.byteArray[var11] = 1;
+                        var13.byteArray[var10] = 1;
                      }
                   }
 
-                  var4.readTrackLength(var6);
-                  var4.markTrackPosition(var6);
+                  var3.readTrackLength(var5);
+                  var3.markTrackPosition(var5);
                }
             }
-         } while(!var4.isDone());
-
+         } while(!var3.isDone());
       }
+
    }
 
    @ObfuscatedName("q")
@@ -427,8 +427,8 @@ public class MusicTrack extends Node {
       signature = "(Lir;II)Lhe;"
    )
    @Export("readTrack")
-   public static MusicTrack readTrack(AbstractIndexCache var0, int var1, int var2) {
-      byte[] var3 = var0.takeRecord(var1, var2);
-      return var3 == null?null:new MusicTrack(new Buffer(var3));
+   public static MusicTrack readTrack(AbstractArchive var0, int var1, int var2) {
+      byte[] var3 = var0.takeFile(var1, var2);
+      return var3 == null ? null : new MusicTrack(new Buffer(var3));
    }
 }
diff --git a/runescape-client/src/main/java/Npc.java b/runescape-client/src/main/java/NPC.java
similarity index 59%
rename from runescape-client/src/main/java/Npc.java
rename to runescape-client/src/main/java/NPC.java
index eb11180d3b..29b6330f94 100644
--- a/runescape-client/src/main/java/Npc.java
+++ b/runescape-client/src/main/java/NPC.java
@@ -5,67 +5,67 @@ import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("cv")
 @Implements("NPC")
-public final class Npc extends Actor {
+public final class NPC extends Actor {
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "Ljz;"
    )
    @Export("definition")
-   NpcDefinition definition;
+   NPCDefinition definition;
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "(IBI)V",
       garbageValue = "306250019"
    )
-   final void __m_162(int var1, byte var2) {
+   final void method227(int var1, byte var2) {
       int var3 = super.pathX[0];
       int var4 = super.pathY[0];
-      if(var1 == 0) {
+      if (var1 == 0) {
          --var3;
          ++var4;
       }
 
-      if(var1 == 1) {
+      if (var1 == 1) {
          ++var4;
       }
 
-      if(var1 == 2) {
+      if (var1 == 2) {
          ++var3;
          ++var4;
       }
 
-      if(var1 == 3) {
+      if (var1 == 3) {
          --var3;
       }
 
-      if(var1 == 4) {
+      if (var1 == 4) {
          ++var3;
       }
 
-      if(var1 == 5) {
+      if (var1 == 5) {
          --var3;
          --var4;
       }
 
-      if(var1 == 6) {
+      if (var1 == 6) {
          --var4;
       }
 
-      if(var1 == 7) {
+      if (var1 == 7) {
          ++var3;
          --var4;
       }
 
-      if(super.sequence != -1 && WorldMapAreaData.getSequenceDefinition(super.sequence).__s == 1) {
+      if (super.sequence != -1 && WorldMapAreaData.getSequenceDefinition(super.sequence).field782 == 1) {
          super.sequence = -1;
       }
 
-      if(super.pathLength < 9) {
+      if (super.pathLength < 9) {
          ++super.pathLength;
       }
 
-      for(int var5 = super.pathLength; var5 > 0; --var5) {
+      for (int var5 = super.pathLength; var5 > 0; --var5) {
          super.pathX[var5] = super.pathX[var5 - 1];
          super.pathY[var5] = super.pathY[var5 - 1];
          super.pathTraversed[var5] = super.pathTraversed[var5 - 1];
@@ -81,20 +81,20 @@ public final class Npc extends Actor {
       signature = "(IIZI)V",
       garbageValue = "-1647134110"
    )
-   final void __f_163(int var1, int var2, boolean var3) {
-      if(super.sequence != -1 && WorldMapAreaData.getSequenceDefinition(super.sequence).__s == 1) {
+   final void method228(int var1, int var2, boolean var3) {
+      if (super.sequence != -1 && WorldMapAreaData.getSequenceDefinition(super.sequence).field782 == 1) {
          super.sequence = -1;
       }
 
-      if(!var3) {
+      if (!var3) {
          int var4 = var1 - super.pathX[0];
          int var5 = var2 - super.pathY[0];
-         if(var4 >= -8 && var4 <= 8 && var5 >= -8 && var5 <= 8) {
-            if(super.pathLength < 9) {
+         if (var4 >= -8 && var4 <= 8 && var5 >= -8 && var5 <= 8) {
+            if (super.pathLength < 9) {
                ++super.pathLength;
             }
 
-            for(int var6 = super.pathLength; var6 > 0; --var6) {
+            for (int var6 = super.pathLength; var6 > 0; --var6) {
                super.pathX[var6] = super.pathX[var6 - 1];
                super.pathY[var6] = super.pathY[var6 - 1];
                super.pathTraversed[var6] = super.pathTraversed[var6 - 1];
@@ -108,8 +108,8 @@ public final class Npc extends Actor {
       }
 
       super.pathLength = 0;
-      super.__ch = 0;
-      super.__cq = 0;
+      super.field25 = 0;
+      super.field24 = 0;
       super.pathX[0] = var1;
       super.pathY[0] = var2;
       super.x = super.size * 64 + super.pathX[0] * 128;
@@ -123,27 +123,27 @@ public final class Npc extends Actor {
    )
    @Export("getModel")
    protected final Model getModel() {
-      if(this.definition == null) {
+      if (this.definition == null) {
          return null;
       } else {
-         SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0?WorldMapAreaData.getSequenceDefinition(super.sequence):null;
-         SequenceDefinition var2 = super.movementSequence != -1 && (super.movementSequence != super.idleSequence || var1 == null)?WorldMapAreaData.getSequenceDefinition(super.movementSequence):null;
+         SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? WorldMapAreaData.getSequenceDefinition(super.sequence) : null;
+         SequenceDefinition var2 = super.movementSequence != -1 && (super.movementSequence != super.readySequence || var1 == null) ? WorldMapAreaData.getSequenceDefinition(super.movementSequence) : null;
          Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame);
-         if(var3 == null) {
+         if (var3 == null) {
             return null;
          } else {
             var3.calculateBoundsCylinder();
             super.defaultHeight = var3.height;
-            if(super.spotAnimation != -1 && super.spotAnimationFrame != -1) {
+            if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) {
                Model var4 = class50.getSpotAnimationDefinition(super.spotAnimation).getModel(super.spotAnimationFrame);
-               if(var4 != null) {
+               if (var4 != null) {
                   var4.offsetBy(0, -super.heightOffset, 0);
                   Model[] var5 = new Model[]{var3, var4};
                   var3 = new Model(var5, 2);
                }
             }
 
-            if(this.definition.size == 1) {
+            if (this.definition.size == 1) {
                var3.isSingleTile = true;
             }
 
@@ -167,27 +167,27 @@ public final class Npc extends Actor {
       signature = "(ILff;Lit;B)V",
       garbageValue = "-51"
    )
-   static void method2009(int var0, IndexStore var1, IndexCache var2) {
-      IndexStoreAction var3 = new IndexStoreAction();
+   static void method2009(int var0, ArchiveDisk var1, Archive var2) {
+      ArchiveDiskAction var3 = new ArchiveDiskAction();
       var3.type = 1;
       var3.key = (long)var0;
-      var3.indexStore = var1;
-      var3.indexCache = var2;
-      NodeDeque var4 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue;
-      synchronized(IndexStoreActionHandler.IndexStoreActionHandler_requestQueue) {
-         IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.addFirst(var3);
+      var3.archiveDisk = var1;
+      var3.archive = var2;
+      NodeDeque var4 = ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue;
+      synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) {
+         ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3);
       }
 
-      Object var9 = IndexStoreActionHandler.IndexStoreActionHandler_lock;
-      synchronized(IndexStoreActionHandler.IndexStoreActionHandler_lock) {
-         if(IndexStoreActionHandler.__iv_q == 0) {
-            Frames.IndexStoreActionHandler_thread = new Thread(new IndexStoreActionHandler());
-            Frames.IndexStoreActionHandler_thread.setDaemon(true);
-            Frames.IndexStoreActionHandler_thread.start();
-            Frames.IndexStoreActionHandler_thread.setPriority(5);
+      Object var5 = ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock;
+      synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) {
+         if (ArchiveDiskActionHandler.field412 == 0) {
+            Frames.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler());
+            Frames.ArchiveDiskActionHandler_thread.setDaemon(true);
+            Frames.ArchiveDiskActionHandler_thread.start();
+            Frames.ArchiveDiskActionHandler_thread.setPriority(5);
          }
 
-         IndexStoreActionHandler.__iv_q = 600;
+         ArchiveDiskActionHandler.field412 = 600;
       }
    }
 }
diff --git a/runescape-client/src/main/java/NpcDefinition.java b/runescape-client/src/main/java/NPCDefinition.java
similarity index 59%
rename from runescape-client/src/main/java/NpcDefinition.java
rename to runescape-client/src/main/java/NPCDefinition.java
index 8161c2cc1e..f12aa595fa 100644
--- a/runescape-client/src/main/java/NpcDefinition.java
+++ b/runescape-client/src/main/java/NPCDefinition.java
@@ -11,19 +11,19 @@ import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("jz")
 @Implements("NPCDefinition")
-public class NpcDefinition extends DualNode {
+public class NPCDefinition extends DualNode {
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   @Export("NpcDefinition_indexCache")
-   static AbstractIndexCache NpcDefinition_indexCache;
+   @Export("NpcDefinition_archive")
+   static AbstractArchive NpcDefinition_archive;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   @Export("NpcDefinition_modelIndexCache")
-   static AbstractIndexCache NpcDefinition_modelIndexCache;
+   @Export("NpcDefinition_modelArchive")
+   static AbstractArchive NpcDefinition_modelArchive;
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Ler;"
@@ -52,16 +52,16 @@ public class NpcDefinition extends DualNode {
    @Export("size")
    public int size;
    @ObfuscatedName("l")
-   @Export("archives")
-   int[] archives;
+   @Export("models")
+   int[] models;
    @ObfuscatedName("e")
-   int[] __e;
+   int[] field636;
    @ObfuscatedName("x")
    @ObfuscatedGetter(
       intValue = 275200787
    )
-   @Export("idleSequence")
-   public int idleSequence;
+   @Export("readySequence")
+   public int readySequence;
    @ObfuscatedName("d")
    @ObfuscatedGetter(
       intValue = 819690597
@@ -84,20 +84,20 @@ public class NpcDefinition extends DualNode {
    @ObfuscatedGetter(
       intValue = 1952230339
    )
-   @Export("walkTurnSequence")
-   public int walkTurnSequence;
+   @Export("walkBackSequence")
+   public int walkBackSequence;
    @ObfuscatedName("a")
    @ObfuscatedGetter(
       intValue = -1213774321
    )
-   @Export("walkTurnLeftSequence")
-   public int walkTurnLeftSequence;
+   @Export("walkLeftSequence")
+   public int walkLeftSequence;
    @ObfuscatedName("z")
    @ObfuscatedGetter(
       intValue = -96930503
    )
-   @Export("walkTurnRightSequence")
-   public int walkTurnRightSequence;
+   @Export("walkRightSequence")
+   public int walkRightSequence;
    @ObfuscatedName("j")
    @Export("recolorFrom")
    short[] recolorFrom;
@@ -141,12 +141,12 @@ public class NpcDefinition extends DualNode {
    @ObfuscatedGetter(
       intValue = -1235927151
    )
-   int __ag;
+   int field637;
    @ObfuscatedName("aq")
    @ObfuscatedGetter(
       intValue = 1962875903
    )
-   int __aq;
+   int field638;
    @ObfuscatedName("aj")
    @ObfuscatedGetter(
       intValue = 235824283
@@ -157,7 +157,7 @@ public class NpcDefinition extends DualNode {
    @ObfuscatedGetter(
       intValue = -506638747
    )
-   public int __av;
+   public int field639;
    @ObfuscatedName("ar")
    @Export("transforms")
    public int[] transforms;
@@ -189,31 +189,26 @@ public class NpcDefinition extends DualNode {
    @Export("params")
    IterableNodeHashTable params;
 
-   static {
-      NpcDefinition_cached = new EvictingDualNodeHashTable(64);
-      NpcDefinition_cachedModels = new EvictingDualNodeHashTable(50);
-   }
-
-   NpcDefinition() {
+   NPCDefinition() {
       this.name = "null";
       this.size = 1;
-      this.idleSequence = -1;
+      this.readySequence = -1;
       this.turnLeftSequence = -1;
       this.turnRightSequence = -1;
       this.walkSequence = -1;
-      this.walkTurnSequence = -1;
-      this.walkTurnLeftSequence = -1;
-      this.walkTurnRightSequence = -1;
+      this.walkBackSequence = -1;
+      this.walkLeftSequence = -1;
+      this.walkRightSequence = -1;
       this.actions = new String[5];
       this.drawMapDot = true;
       this.combatLevel = -1;
       this.widthScale = 128;
       this.heightScale = 128;
       this.isVisible = false;
-      this.__ag = 0;
-      this.__aq = 0;
+      this.field637 = 0;
+      this.field638 = 0;
       this.headIconPrayer = -1;
-      this.__av = 32;
+      this.field639 = 32;
       this.transformVarbit = -1;
       this.transformVarp = -1;
       this.isInteractable = true;
@@ -226,8 +221,8 @@ public class NpcDefinition extends DualNode {
       signature = "(I)V",
       garbageValue = "482179419"
    )
-   @Export("init")
-   void init() {
+   @Export("postDecode")
+   void postDecode() {
    }
 
    @ObfuscatedName("w")
@@ -235,15 +230,15 @@ public class NpcDefinition extends DualNode {
       signature = "(Lgr;I)V",
       garbageValue = "-893102766"
    )
-   @Export("read")
-   void read(Buffer var1) {
-      while(true) {
+   @Export("decode")
+   void decode(Buffer var1) {
+      while (true) {
          int var2 = var1.readUnsignedByte();
-         if(var2 == 0) {
+         if (var2 == 0) {
             return;
          }
 
-         this.readNext(var1, var2);
+         this.decodeNext(var1, var2);
       }
    }
 
@@ -252,107 +247,107 @@ public class NpcDefinition extends DualNode {
       signature = "(Lgr;IB)V",
       garbageValue = "-98"
    )
-   @Export("readNext")
-   void readNext(Buffer var1, int var2) {
+   @Export("decodeNext")
+   void decodeNext(Buffer var1, int var2) {
       int var3;
       int var4;
-      if(var2 == 1) {
+      if (var2 == 1) {
          var3 = var1.readUnsignedByte();
-         this.archives = new int[var3];
+         this.models = new int[var3];
 
-         for(var4 = 0; var4 < var3; ++var4) {
-            this.archives[var4] = var1.__ag_302();
+         for (var4 = 0; var4 < var3; ++var4) {
+            this.models[var4] = var1.readUnsignedShort();
          }
-      } else if(var2 == 2) {
+      } else if (var2 == 2) {
          this.name = var1.readStringCp1252NullTerminated();
-      } else if(var2 == 12) {
+      } else if (var2 == 12) {
          this.size = var1.readUnsignedByte();
-      } else if(var2 == 13) {
-         this.idleSequence = var1.__ag_302();
-      } else if(var2 == 14) {
-         this.walkSequence = var1.__ag_302();
-      } else if(var2 == 15) {
-         this.turnLeftSequence = var1.__ag_302();
-      } else if(var2 == 16) {
-         this.turnRightSequence = var1.__ag_302();
-      } else if(var2 == 17) {
-         this.walkSequence = var1.__ag_302();
-         this.walkTurnSequence = var1.__ag_302();
-         this.walkTurnLeftSequence = var1.__ag_302();
-         this.walkTurnRightSequence = var1.__ag_302();
-      } else if(var2 >= 30 && var2 < 35) {
+      } else if (var2 == 13) {
+         this.readySequence = var1.readUnsignedShort();
+      } else if (var2 == 14) {
+         this.walkSequence = var1.readUnsignedShort();
+      } else if (var2 == 15) {
+         this.turnLeftSequence = var1.readUnsignedShort();
+      } else if (var2 == 16) {
+         this.turnRightSequence = var1.readUnsignedShort();
+      } else if (var2 == 17) {
+         this.walkSequence = var1.readUnsignedShort();
+         this.walkBackSequence = var1.readUnsignedShort();
+         this.walkLeftSequence = var1.readUnsignedShort();
+         this.walkRightSequence = var1.readUnsignedShort();
+      } else if (var2 >= 30 && var2 < 35) {
          this.actions[var2 - 30] = var1.readStringCp1252NullTerminated();
-         if(this.actions[var2 - 30].equalsIgnoreCase("Hidden")) {
+         if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) {
             this.actions[var2 - 30] = null;
          }
-      } else if(var2 == 40) {
+      } else if (var2 == 40) {
          var3 = var1.readUnsignedByte();
          this.recolorFrom = new short[var3];
          this.recolorTo = new short[var3];
 
-         for(var4 = 0; var4 < var3; ++var4) {
-            this.recolorFrom[var4] = (short)var1.__ag_302();
-            this.recolorTo[var4] = (short)var1.__ag_302();
+         for (var4 = 0; var4 < var3; ++var4) {
+            this.recolorFrom[var4] = (short)var1.readUnsignedShort();
+            this.recolorTo[var4] = (short)var1.readUnsignedShort();
          }
-      } else if(var2 == 41) {
+      } else if (var2 == 41) {
          var3 = var1.readUnsignedByte();
          this.retextureFrom = new short[var3];
          this.retextureTo = new short[var3];
 
-         for(var4 = 0; var4 < var3; ++var4) {
-            this.retextureFrom[var4] = (short)var1.__ag_302();
-            this.retextureTo[var4] = (short)var1.__ag_302();
+         for (var4 = 0; var4 < var3; ++var4) {
+            this.retextureFrom[var4] = (short)var1.readUnsignedShort();
+            this.retextureTo[var4] = (short)var1.readUnsignedShort();
          }
-      } else if(var2 == 60) {
+      } else if (var2 == 60) {
          var3 = var1.readUnsignedByte();
-         this.__e = new int[var3];
+         this.field636 = new int[var3];
 
-         for(var4 = 0; var4 < var3; ++var4) {
-            this.__e[var4] = var1.__ag_302();
+         for (var4 = 0; var4 < var3; ++var4) {
+            this.field636[var4] = var1.readUnsignedShort();
          }
-      } else if(var2 == 93) {
+      } else if (var2 == 93) {
          this.drawMapDot = false;
-      } else if(var2 == 95) {
-         this.combatLevel = var1.__ag_302();
-      } else if(var2 == 97) {
-         this.widthScale = var1.__ag_302();
-      } else if(var2 == 98) {
-         this.heightScale = var1.__ag_302();
-      } else if(var2 == 99) {
+      } else if (var2 == 95) {
+         this.combatLevel = var1.readUnsignedShort();
+      } else if (var2 == 97) {
+         this.widthScale = var1.readUnsignedShort();
+      } else if (var2 == 98) {
+         this.heightScale = var1.readUnsignedShort();
+      } else if (var2 == 99) {
          this.isVisible = true;
-      } else if(var2 == 100) {
-         this.__ag = var1.readByte();
-      } else if(var2 == 101) {
-         this.__aq = var1.readByte();
-      } else if(var2 == 102) {
-         this.headIconPrayer = var1.__ag_302();
-      } else if(var2 == 103) {
-         this.__av = var1.__ag_302();
-      } else if(var2 != 106 && var2 != 118) {
-         if(var2 == 107) {
+      } else if (var2 == 100) {
+         this.field637 = var1.readByte();
+      } else if (var2 == 101) {
+         this.field638 = var1.readByte();
+      } else if (var2 == 102) {
+         this.headIconPrayer = var1.readUnsignedShort();
+      } else if (var2 == 103) {
+         this.field639 = var1.readUnsignedShort();
+      } else if (var2 != 106 && var2 != 118) {
+         if (var2 == 107) {
             this.isInteractable = false;
-         } else if(var2 == 109) {
+         } else if (var2 == 109) {
             this.isClickable = false;
-         } else if(var2 == 111) {
+         } else if (var2 == 111) {
             this.isFollower = true;
-         } else if(var2 == 249) {
-            this.params = AbstractIndexCache.readStringIntParameters(var1, this.params);
+         } else if (var2 == 249) {
+            this.params = AbstractArchive.readStringIntParameters(var1, this.params);
          }
       } else {
-         this.transformVarbit = var1.__ag_302();
-         if(this.transformVarbit == 65535) {
+         this.transformVarbit = var1.readUnsignedShort();
+         if (this.transformVarbit == 65535) {
             this.transformVarbit = -1;
          }
 
-         this.transformVarp = var1.__ag_302();
-         if(this.transformVarp == 65535) {
+         this.transformVarp = var1.readUnsignedShort();
+         if (this.transformVarp == 65535) {
             this.transformVarp = -1;
          }
 
          var3 = -1;
-         if(var2 == 118) {
-            var3 = var1.__ag_302();
-            if(var3 == 65535) {
+         if (var2 == 118) {
+            var3 = var1.readUnsignedShort();
+            if (var3 == 65535) {
                var3 = -1;
             }
          }
@@ -360,9 +355,9 @@ public class NpcDefinition extends DualNode {
          var4 = var1.readUnsignedByte();
          this.transforms = new int[var4 + 2];
 
-         for(int var5 = 0; var5 <= var4; ++var5) {
-            this.transforms[var5] = var1.__ag_302();
-            if(this.transforms[var5] == 65535) {
+         for (int var5 = 0; var5 <= var4; ++var5) {
+            this.transforms[var5] = var1.readUnsignedShort();
+            if (this.transforms[var5] == 65535) {
                this.transforms[var5] = -1;
             }
          }
@@ -379,66 +374,66 @@ public class NpcDefinition extends DualNode {
    )
    @Export("getModel")
    public final Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) {
-      if(this.transforms != null) {
-         NpcDefinition var12 = this.transform();
-         return var12 == null?null:var12.getModel(var1, var2, var3, var4);
+      if (this.transforms != null) {
+         NPCDefinition var11 = this.transform();
+         return var11 == null ? null : var11.getModel(var1, var2, var3, var4);
       } else {
          Model var5 = (Model)NpcDefinition_cachedModels.get((long)this.id);
-         if(var5 == null) {
+         if (var5 == null) {
             boolean var6 = false;
 
-            for(int var7 = 0; var7 < this.archives.length; ++var7) {
-               if(!NpcDefinition_modelIndexCache.tryLoadRecord(this.archives[var7], 0)) {
+            for (int var7 = 0; var7 < this.models.length; ++var7) {
+               if (!NpcDefinition_modelArchive.tryLoadFile(this.models[var7], 0)) {
                   var6 = true;
                }
             }
 
-            if(var6) {
+            if (var6) {
                return null;
             }
 
-            ModelData[] var8 = new ModelData[this.archives.length];
+            ModelData[] var12 = new ModelData[this.models.length];
 
-            int var9;
-            for(var9 = 0; var9 < this.archives.length; ++var9) {
-               var8[var9] = ModelData.method2788(NpcDefinition_modelIndexCache, this.archives[var9], 0);
+            int var8;
+            for (var8 = 0; var8 < this.models.length; ++var8) {
+               var12[var8] = ModelData.method2788(NpcDefinition_modelArchive, this.models[var8], 0);
             }
 
-            ModelData var11;
-            if(var8.length == 1) {
-               var11 = var8[0];
+            ModelData var9;
+            if (var12.length == 1) {
+               var9 = var12[0];
             } else {
-               var11 = new ModelData(var8, var8.length);
+               var9 = new ModelData(var12, var12.length);
             }
 
-            if(this.recolorFrom != null) {
-               for(var9 = 0; var9 < this.recolorFrom.length; ++var9) {
-                  var11.recolor(this.recolorFrom[var9], this.recolorTo[var9]);
+            if (this.recolorFrom != null) {
+               for (var8 = 0; var8 < this.recolorFrom.length; ++var8) {
+                  var9.recolor(this.recolorFrom[var8], this.recolorTo[var8]);
                }
             }
 
-            if(this.retextureFrom != null) {
-               for(var9 = 0; var9 < this.retextureFrom.length; ++var9) {
-                  var11.retexture(this.retextureFrom[var9], this.retextureTo[var9]);
+            if (this.retextureFrom != null) {
+               for (var8 = 0; var8 < this.retextureFrom.length; ++var8) {
+                  var9.retexture(this.retextureFrom[var8], this.retextureTo[var8]);
                }
             }
 
-            var5 = var11.toModel(this.__ag + 64, this.__aq * 5 + 850, -30, -50, -30);
+            var5 = var9.toModel(this.field637 + 64, this.field638 * 5 + 850, -30, -50, -30);
             NpcDefinition_cachedModels.put(var5, (long)this.id);
          }
 
          Model var10;
-         if(var1 != null && var3 != null) {
+         if (var1 != null && var3 != null) {
             var10 = var1.animateSequence2(var5, var2, var3, var4);
-         } else if(var1 != null) {
+         } else if (var1 != null) {
             var10 = var1.animateSequence(var5, var2);
-         } else if(var3 != null) {
+         } else if (var3 != null) {
             var10 = var3.animateSequence(var5, var4);
          } else {
             var10 = var5.toSharedSequenceModel(true);
          }
 
-         if(this.widthScale != 128 || this.heightScale != 128) {
+         if (this.widthScale != 128 || this.heightScale != 128) {
             var10.scale(this.widthScale, this.heightScale, this.widthScale);
          }
 
@@ -453,45 +448,45 @@ public class NpcDefinition extends DualNode {
    )
    @Export("getModelData")
    public final ModelData getModelData() {
-      if(this.transforms != null) {
-         NpcDefinition var1 = this.transform();
-         return var1 == null?null:var1.getModelData();
-      } else if(this.__e == null) {
+      if (this.transforms != null) {
+         NPCDefinition var5 = this.transform();
+         return var5 == null ? null : var5.getModelData();
+      } else if (this.field636 == null) {
          return null;
       } else {
-         boolean var5 = false;
+         boolean var1 = false;
 
-         for(int var2 = 0; var2 < this.__e.length; ++var2) {
-            if(!NpcDefinition_modelIndexCache.tryLoadRecord(this.__e[var2], 0)) {
-               var5 = true;
+         for (int var2 = 0; var2 < this.field636.length; ++var2) {
+            if (!NpcDefinition_modelArchive.tryLoadFile(this.field636[var2], 0)) {
+               var1 = true;
             }
          }
 
-         if(var5) {
+         if (var1) {
             return null;
          } else {
-            ModelData[] var6 = new ModelData[this.__e.length];
+            ModelData[] var6 = new ModelData[this.field636.length];
 
-            for(int var3 = 0; var3 < this.__e.length; ++var3) {
-               var6[var3] = ModelData.method2788(NpcDefinition_modelIndexCache, this.__e[var3], 0);
+            for (int var3 = 0; var3 < this.field636.length; ++var3) {
+               var6[var3] = ModelData.method2788(NpcDefinition_modelArchive, this.field636[var3], 0);
             }
 
             ModelData var7;
-            if(var6.length == 1) {
+            if (var6.length == 1) {
                var7 = var6[0];
             } else {
                var7 = new ModelData(var6, var6.length);
             }
 
             int var4;
-            if(this.recolorFrom != null) {
-               for(var4 = 0; var4 < this.recolorFrom.length; ++var4) {
+            if (this.recolorFrom != null) {
+               for (var4 = 0; var4 < this.recolorFrom.length; ++var4) {
                   var7.recolor(this.recolorFrom[var4], this.recolorTo[var4]);
                }
             }
 
-            if(this.retextureFrom != null) {
-               for(var4 = 0; var4 < this.retextureFrom.length; ++var4) {
+            if (this.retextureFrom != null) {
+               for (var4 = 0; var4 < this.retextureFrom.length; ++var4) {
                   var7.retexture(this.retextureFrom[var4], this.retextureTo[var4]);
                }
             }
@@ -507,22 +502,22 @@ public class NpcDefinition extends DualNode {
       garbageValue = "-113"
    )
    @Export("transform")
-   public final NpcDefinition transform() {
+   public final NPCDefinition transform() {
       int var1 = -1;
-      if(this.transformVarbit != -1) {
-         var1 = WorldMapSection2.getVarbit(this.transformVarbit);
-      } else if(this.transformVarp != -1) {
+      if (this.transformVarbit != -1) {
+         var1 = WorldMapSection0.getVarbit(this.transformVarbit);
+      } else if (this.transformVarp != -1) {
          var1 = Varps.Varps_main[this.transformVarp];
       }
 
       int var2;
-      if(var1 >= 0 && var1 < this.transforms.length - 1) {
+      if (var1 >= 0 && var1 < this.transforms.length - 1) {
          var2 = this.transforms[var1];
       } else {
          var2 = this.transforms[this.transforms.length - 1];
       }
 
-      return var2 != -1?ObjectDefinition.getNpcDefinition(var2):null;
+      return var2 != -1 ? ObjectDefinition.getNpcDefinition(var2) : null;
    }
 
    @ObfuscatedName("e")
@@ -530,18 +525,18 @@ public class NpcDefinition extends DualNode {
       signature = "(I)Z",
       garbageValue = "853540088"
    )
-   public boolean __e_435() {
-      if(this.transforms == null) {
+   public boolean method229() {
+      if (this.transforms == null) {
          return true;
       } else {
          int var1 = -1;
-         if(this.transformVarbit != -1) {
-            var1 = WorldMapSection2.getVarbit(this.transformVarbit);
-         } else if(this.transformVarp != -1) {
+         if (this.transformVarbit != -1) {
+            var1 = WorldMapSection0.getVarbit(this.transformVarbit);
+         } else if (this.transformVarp != -1) {
             var1 = Varps.Varps_main[this.transformVarp];
          }
 
-         return var1 >= 0 && var1 < this.transforms.length?this.transforms[var1] != -1:this.transforms[this.transforms.length - 1] != -1;
+         return var1 >= 0 && var1 < this.transforms.length ? this.transforms[var1] != -1 : this.transforms[this.transforms.length - 1] != -1;
       }
    }
 
@@ -552,20 +547,20 @@ public class NpcDefinition extends DualNode {
    )
    @Export("getIntParam")
    public int getIntParam(int var1, int var2) {
-      IterableNodeHashTable var4 = this.params;
-      int var3;
-      if(var4 == null) {
-         var3 = var2;
+      IterableNodeHashTable var3 = this.params;
+      int var4;
+      if (var3 == null) {
+         var4 = var2;
       } else {
-         IntegerNode var5 = (IntegerNode)var4.get((long)var1);
-         if(var5 == null) {
-            var3 = var2;
+         IntegerNode var5 = (IntegerNode)var3.get((long)var1);
+         if (var5 == null) {
+            var4 = var2;
          } else {
-            var3 = var5.integer;
+            var4 = var5.integer;
          }
       }
 
-      return var3;
+      return var4;
    }
 
    @ObfuscatedName("d")
@@ -585,17 +580,17 @@ public class NpcDefinition extends DualNode {
    )
    @Export("sendStackTrace")
    public static void sendStackTrace(String var0, Throwable var1) {
-      if(var1 != null) {
+      if (var1 != null) {
          var1.printStackTrace();
       } else {
          try {
             String var2 = "";
-            if(var1 != null) {
+            if (var1 != null) {
                var2 = Canvas.method860(var1);
             }
 
-            if(var0 != null) {
-               if(var1 != null) {
+            if (var0 != null) {
+               if (var1 != null) {
                   var2 = var2 + " | ";
                }
 
@@ -607,19 +602,18 @@ public class NpcDefinition extends DualNode {
             var2 = var2.replace('@', '_');
             var2 = var2.replace('&', '_');
             var2 = var2.replace('#', '_');
-            if(RunException.applet == null) {
+            if (RunException.applet == null) {
                return;
             }
 
-            URL var3 = new URL(RunException.applet.getCodeBase(), "clienterror.ws?c=" + RunException.revision + "&u=" + RunException.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + RunException.__fx_w + "&e=" + var2);
+            URL var3 = new URL(RunException.applet.getCodeBase(), "clienterror.ws?c=" + RunException.revision + "&u=" + RunException.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + RunException.field761 + "&e=" + var2);
             DataInputStream var4 = new DataInputStream(var3.openStream());
             var4.read();
             var4.close();
          } catch (Exception var5) {
-            ;
          }
-
       }
+
    }
 
    @ObfuscatedName("e")
@@ -629,15 +623,15 @@ public class NpcDefinition extends DualNode {
    )
    static final boolean method5164(int var0, int var1, int var2, int var3, int var4, int var5, int var6) {
       int var7 = ViewportMouse.ViewportMouse_y + var6;
-      if(var7 < var0 && var7 < var1 && var7 < var2) {
+      if (var7 < var0 && var7 < var1 && var7 < var2) {
          return false;
       } else {
          var7 = ViewportMouse.ViewportMouse_y - var6;
-         if(var7 > var0 && var7 > var1 && var7 > var2) {
+         if (var7 > var0 && var7 > var1 && var7 > var2) {
             return false;
          } else {
             var7 = ViewportMouse.ViewportMouse_x + var6;
-            if(var7 < var3 && var7 < var4 && var7 < var5) {
+            if (var7 < var3 && var7 < var4 && var7 < var5) {
                return false;
             } else {
                var7 = ViewportMouse.ViewportMouse_x - var6;
@@ -654,52 +648,52 @@ public class NpcDefinition extends DualNode {
    )
    static void method5162() {
       Login.Login_username = Login.Login_username.trim();
-      if(Login.Login_username.length() == 0) {
+      if (Login.Login_username.length() == 0) {
          class54.method1089("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address.");
       } else {
-         long var1;
+         long var0;
          try {
-            URL var3 = new URL(Message.method1227("services", false) + "m=accountappeal/login.ws");
-            URLConnection var4 = var3.openConnection();
-            var4.setRequestProperty("connection", "close");
-            var4.setDoInput(true);
-            var4.setDoOutput(true);
-            var4.setConnectTimeout(5000);
-            OutputStreamWriter var5 = new OutputStreamWriter(var4.getOutputStream());
-            var5.write("data1=req");
-            var5.flush();
-            InputStream var6 = var4.getInputStream();
-            Buffer var7 = new Buffer(new byte[1000]);
+            URL var2 = new URL(Message.method1227("services", false) + "m=accountappeal/login.ws");
+            URLConnection var3 = var2.openConnection();
+            var3.setRequestProperty("connection", "close");
+            var3.setDoInput(true);
+            var3.setDoOutput(true);
+            var3.setConnectTimeout(5000);
+            OutputStreamWriter var4 = new OutputStreamWriter(var3.getOutputStream());
+            var4.write("data1=req");
+            var4.flush();
+            InputStream var5 = var3.getInputStream();
+            Buffer var6 = new Buffer(new byte[1000]);
 
-            while(true) {
-               int var8 = var6.read(var7.array, var7.index, 1000 - var7.index);
-               if(var8 == -1) {
-                  var7.index = 0;
-                  long var10 = var7.readLong();
-                  var1 = var10;
+            while (true) {
+               int var7 = var5.read(var6.array, var6.index, 1000 - var6.index);
+               if (var7 == -1) {
+                  var6.index = 0;
+                  long var8 = var6.readLong();
+                  var0 = var8;
                   break;
                }
 
-               var7.index += var8;
-               if(var7.index >= 1000) {
-                  var1 = 0L;
+               var6.index += var7;
+               if (var6.index >= 1000) {
+                  var0 = 0L;
                   break;
                }
             }
-         } catch (Exception var14) {
-            var1 = 0L;
+         } catch (Exception var10) {
+            var0 = 0L;
          }
 
-         int var0;
-         if(var1 == 0L) {
-            var0 = 5;
+         int var11;
+         if (var0 == 0L) {
+            var11 = 5;
          } else {
-            var0 = LoginScreenAnimation.method1778(var1, Login.Login_username);
+            var11 = LoginScreenAnimation.method1778(var0, Login.Login_username);
          }
 
-         switch(var0) {
+         switch(var11) {
          case 2:
-            class54.method1089(Strings.__id_jr, Strings.__id_jv, Strings.__id_ju);
+            class54.method1089(Strings.field882, Strings.field883, Strings.field884);
             Login.loginIndex = 6;
             break;
          case 3:
@@ -717,8 +711,8 @@ public class NpcDefinition extends DualNode {
          case 7:
             class54.method1089("You must enter a valid login to proceed. For accounts", "created after 24th November 2010, please use your", "email address. Otherwise please use your username.");
          }
-
       }
+
    }
 
    @ObfuscatedName("kw")
@@ -729,9 +723,9 @@ public class NpcDefinition extends DualNode {
    static String method5161(String var0) {
       PlayerType[] var1 = class48.method865();
 
-      for(int var2 = 0; var2 < var1.length; ++var2) {
+      for (int var2 = 0; var2 < var1.length; ++var2) {
          PlayerType var3 = var1[var2];
-         if(var3.modIcon != -1 && var0.startsWith(ItemContainer.method1170(var3.modIcon))) {
+         if (var3.modIcon != -1 && var0.startsWith(ItemContainer.method1170(var3.modIcon))) {
             var0 = var0.substring(6 + Integer.toString(var3.modIcon).length());
             break;
          }
@@ -739,4 +733,9 @@ public class NpcDefinition extends DualNode {
 
       return var0;
    }
+
+   static {
+      NpcDefinition_cached = new EvictingDualNodeHashTable(64);
+      NpcDefinition_cachedModels = new EvictingDualNodeHashTable(50);
+   }
 }
diff --git a/runescape-client/src/main/java/NanoClock.java b/runescape-client/src/main/java/NanoClock.java
index 22fb3b32eb..27dda9d57e 100644
--- a/runescape-client/src/main/java/NanoClock.java
+++ b/runescape-client/src/main/java/NanoClock.java
@@ -34,10 +34,10 @@ public class NanoClock extends Clock {
       garbageValue = "-126803683"
    )
    @Export("wait")
-   public int wait(int var1, int var2) {
-      long var3 = 1000000L * (long)var2;
+   public int wait(int cycleMs, int minSleepMs) {
+      long var3 = 1000000L * (long)minSleepMs;
       long var5 = this.lastTimeNano - System.nanoTime();
-      if(var5 < var3) {
+      if (var5 < var3) {
          var5 = var3;
       }
 
@@ -45,11 +45,11 @@ public class NanoClock extends Clock {
       long var7 = System.nanoTime();
 
       int var9;
-      for(var9 = 0; var9 < 10 && (var9 < 1 || this.lastTimeNano < var7); this.lastTimeNano += 1000000L * (long)var1) {
+      for (var9 = 0; var9 < 10 && (var9 < 1 || this.lastTimeNano < var7); this.lastTimeNano += 1000000L * (long)cycleMs) {
          ++var9;
       }
 
-      if(this.lastTimeNano < var7) {
+      if (this.lastTimeNano < var7) {
          this.lastTimeNano = var7;
       }
 
diff --git a/runescape-client/src/main/java/NetCache.java b/runescape-client/src/main/java/NetCache.java
index 660896990b..8373742355 100644
--- a/runescape-client/src/main/java/NetCache.java
+++ b/runescape-client/src/main/java/NetCache.java
@@ -18,12 +18,12 @@ public class NetCache {
    @ObfuscatedGetter(
       intValue = 948359621
    )
-   public static int __iq_f;
+   public static int field628;
    @ObfuscatedName("q")
    @ObfuscatedGetter(
       longValue = -4580427166942649525L
    )
-   public static long __iq_q;
+   public static long field629;
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "Lld;"
@@ -88,7 +88,7 @@ public class NetCache {
    @ObfuscatedGetter(
       intValue = 840549915
    )
-   public static int __iq_j;
+   public static int field630;
    @ObfuscatedName("t")
    @Export("NetCache_crc")
    public static CRC32 NetCache_crc;
@@ -96,10 +96,10 @@ public class NetCache {
    @ObfuscatedSignature(
       signature = "[Lit;"
    )
-   @Export("NetCache_indexCaches")
-   public static IndexCache[] NetCache_indexCaches;
+   @Export("NetCache_archives")
+   public static Archive[] NetCache_archives;
    @ObfuscatedName("b")
-   public static byte __iq_b;
+   public static byte field631;
    @ObfuscatedName("c")
    @ObfuscatedGetter(
       intValue = -1404585009
@@ -113,8 +113,17 @@ public class NetCache {
    @Export("NetCache_ioExceptions")
    public static int NetCache_ioExceptions;
 
+   @ObfuscatedName("w")
+   @ObfuscatedSignature(
+      signature = "(IB)Lbm;",
+      garbageValue = "31"
+   )
+   static Message method4708(int var0) {
+      return (Message)Messages.Messages_hashTable.get((long)var0);
+   }
+
    static {
-      __iq_f = 0;
+      field628 = 0;
       NetCache_pendingPriorityWrites = new NodeHashTable(4096);
       NetCache_pendingPriorityWritesCount = 0;
       NetCache_pendingPriorityResponses = new NodeHashTable(32);
@@ -125,20 +134,11 @@ public class NetCache {
       NetCache_pendingResponses = new NodeHashTable(4096);
       NetCache_pendingResponsesCount = 0;
       NetCache_responseHeaderBuffer = new Buffer(8);
-      __iq_j = 0;
+      field630 = 0;
       NetCache_crc = new CRC32();
-      NetCache_indexCaches = new IndexCache[256];
-      __iq_b = 0;
+      NetCache_archives = new Archive[256];
+      field631 = 0;
       NetCache_crcMismatches = 0;
       NetCache_ioExceptions = 0;
    }
-
-   @ObfuscatedName("w")
-   @ObfuscatedSignature(
-      signature = "(IB)Lbm;",
-      garbageValue = "31"
-   )
-   static Message method4708(int var0) {
-      return (Message)Messages.Messages_hashTable.get((long)var0);
-   }
 }
diff --git a/runescape-client/src/main/java/NetFileRequest.java b/runescape-client/src/main/java/NetFileRequest.java
index 7420f200e2..19788c8a3b 100644
--- a/runescape-client/src/main/java/NetFileRequest.java
+++ b/runescape-client/src/main/java/NetFileRequest.java
@@ -11,8 +11,8 @@ public class NetFileRequest extends DualNode {
    @ObfuscatedSignature(
       signature = "Lit;"
    )
-   @Export("indexCache")
-   public IndexCache indexCache;
+   @Export("archive")
+   public Archive archive;
    @ObfuscatedName("f")
    @ObfuscatedGetter(
       intValue = 1487103265
@@ -29,44 +29,44 @@ public class NetFileRequest extends DualNode {
       garbageValue = "1807602893"
    )
    static final void method4555(Widget[] var0, int var1) {
-      for(int var2 = 0; var2 < var0.length; ++var2) {
+      for (int var2 = 0; var2 < var0.length; ++var2) {
          Widget var3 = var0[var2];
-         if(var3 != null && var3.parentId == var1 && (!var3.isIf3 || !PacketBufferNode.method3673(var3))) {
-            if(var3.type == 0) {
-               if(!var3.isIf3 && PacketBufferNode.method3673(var3) && var3 != Clock.mousedOverWidgetIf1) {
+         if (var3 != null && var3.parentId == var1 && (!var3.isIf3 || !PacketBufferNode.isComponentHidden(var3))) {
+            if (var3.type == 0) {
+               if (!var3.isIf3 && PacketBufferNode.isComponentHidden(var3) && var3 != Clock.mousedOverWidgetIf1) {
                   continue;
                }
 
                method4555(var0, var3.id);
-               if(var3.children != null) {
+               if (var3.children != null) {
                   method4555(var3.children, var3.id);
                }
 
-               WidgetGroupParent var7 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var3.id);
-               if(var7 != null) {
-                  ClientPreferences.method1809(var7.group);
+               InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id);
+               if (var4 != null) {
+                  ClientPreferences.method1809(var4.group);
                }
             }
 
-            if(var3.type == 6) {
-               int var5;
-               if(var3.sequenceId != -1 || var3.sequenceId2 != -1) {
-                  boolean var4 = class238.runCs1(var3);
-                  if(var4) {
-                     var5 = var3.sequenceId2;
+            if (var3.type == 6) {
+               int var7;
+               if (var3.sequenceId != -1 || var3.sequenceId2 != -1) {
+                  boolean var5 = class238.runCs1(var3);
+                  if (var5) {
+                     var7 = var3.sequenceId2;
                   } else {
-                     var5 = var3.sequenceId;
+                     var7 = var3.sequenceId;
                   }
 
-                  if(var5 != -1) {
-                     SequenceDefinition var6 = WorldMapAreaData.getSequenceDefinition(var5);
+                  if (var7 != -1) {
+                     SequenceDefinition var6 = WorldMapAreaData.getSequenceDefinition(var7);
 
-                     for(var3.modelFrameCycle += Client.__client_gy; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; class22.method295(var3)) {
+                     for (var3.modelFrameCycle += Client.field183; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; WorldMapRectangle.method295(var3)) {
                         var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame];
                         ++var3.modelFrame;
-                        if(var3.modelFrame >= var6.frameIds.length) {
+                        if (var3.modelFrame >= var6.frameIds.length) {
                            var3.modelFrame -= var6.frameCount;
-                           if(var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) {
+                           if (var3.modelFrame < 0 || var3.modelFrame >= var6.frameIds.length) {
                               var3.modelFrame = 0;
                            }
                         }
@@ -74,14 +74,14 @@ public class NetFileRequest extends DualNode {
                   }
                }
 
-               if(var3.__bh != 0 && !var3.isIf3) {
-                  int var8 = var3.__bh >> 16;
-                  var5 = var3.__bh << 16 >> 16;
-                  var8 *= Client.__client_gy;
-                  var5 *= Client.__client_gy;
+               if (var3.field963 != 0 && !var3.isIf3) {
+                  int var8 = var3.field963 >> 16;
+                  var7 = var3.field963 << 16 >> 16;
+                  var8 *= Client.field183;
+                  var7 *= Client.field183;
                   var3.modelAngleX = var8 + var3.modelAngleX & 2047;
-                  var3.modelAngleY = var5 + var3.modelAngleY & 2047;
-                  class22.method295(var3);
+                  var3.modelAngleY = var7 + var3.modelAngleY & 2047;
+                  WorldMapRectangle.method295(var3);
                }
             }
          }
@@ -95,21 +95,21 @@ public class NetFileRequest extends DualNode {
       garbageValue = "-37"
    )
    static final void method4554(int var0, int var1, int var2, int var3, Sprite var4, SpriteMask var5) {
-      if(var4 != null) {
-         int var6 = Client.minimapOrientation & 2047;
+      if (var4 != null) {
+         int var6 = Client.camAngleY & 2047;
          int var7 = var3 * var3 + var2 * var2;
-         if(var7 <= 6400) {
+         if (var7 <= 6400) {
             int var8 = Rasterizer3D.Rasterizer3D_sine[var6];
             int var9 = Rasterizer3D.Rasterizer3D_cosine[var6];
             int var10 = var3 * var8 + var9 * var2 >> 16;
             int var11 = var3 * var9 - var8 * var2 >> 16;
-            if(var7 > 2500) {
-               var4.__ac_512(var10 + var5.width / 2 - var4.width / 2, var5.height / 2 - var11 - var4.height / 2, var0, var1, var5.width, var5.height, var5.xStarts, var5.xWidths);
+            if (var7 > 2500) {
+               var4.method314(var10 + var5.width / 2 - var4.width / 2, var5.height / 2 - var11 - var4.height / 2, var0, var1, var5.width, var5.height, var5.xStarts, var5.xWidths);
             } else {
                var4.drawAt2(var0 + var10 + var5.width / 2 - var4.width / 2, var5.height / 2 + var1 - var11 - var4.height / 2);
             }
-
          }
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/NetSocket.java b/runescape-client/src/main/java/NetSocket.java
index f01da8362d..867629e386 100644
--- a/runescape-client/src/main/java/NetSocket.java
+++ b/runescape-client/src/main/java/NetSocket.java
@@ -49,12 +49,12 @@ public final class NetSocket extends AbstractSocket implements Runnable {
    @ObfuscatedGetter(
       intValue = -738185459
    )
-   int __l;
+   int field632;
    @ObfuscatedName("e")
    @ObfuscatedGetter(
       intValue = 2057244853
    )
-   int __e;
+   int field633;
    @ObfuscatedName("x")
    @Export("exceptionWriting")
    boolean exceptionWriting;
@@ -62,25 +62,25 @@ public final class NetSocket extends AbstractSocket implements Runnable {
    @ObfuscatedGetter(
       intValue = -1644762957
    )
-   final int __d;
+   final int field634;
    @ObfuscatedName("k")
    @ObfuscatedGetter(
       intValue = -782964015
    )
-   final int __k;
+   final int field635;
 
    @ObfuscatedSignature(
       signature = "(Ljava/net/Socket;Lfz;I)V"
    )
    public NetSocket(Socket var1, TaskHandler var2, int var3) throws IOException {
       this.isClosed = false;
-      this.__l = 0;
-      this.__e = 0;
+      this.field632 = 0;
+      this.field633 = 0;
       this.exceptionWriting = false;
       this.taskHandler = var2;
       this.socket = var1;
-      this.__d = var3;
-      this.__k = var3 - 100;
+      this.field634 = var3;
+      this.field635 = var3 - 100;
       this.socket.setSoTimeout(30000);
       this.socket.setTcpNoDelay(true);
       this.socket.setReceiveBufferSize(65536);
@@ -95,8 +95,8 @@ public final class NetSocket extends AbstractSocket implements Runnable {
       garbageValue = "1765046516"
    )
    @Export("isAvailable")
-   public boolean isAvailable(int var1) throws IOException {
-      return this.isClosed?false:this.inputStream.available() >= var1;
+   public boolean isAvailable(int length) throws IOException {
+      return this.isClosed ? false : this.inputStream.available() >= length;
    }
 
    @ObfuscatedName("q")
@@ -106,7 +106,7 @@ public final class NetSocket extends AbstractSocket implements Runnable {
    )
    @Export("available")
    public int available() throws IOException {
-      return this.isClosed?0:this.inputStream.available();
+      return this.isClosed ? 0 : this.inputStream.available();
    }
 
    @ObfuscatedName("w")
@@ -116,7 +116,7 @@ public final class NetSocket extends AbstractSocket implements Runnable {
    )
    @Export("readUnsignedByte")
    public int readUnsignedByte() throws IOException {
-      return this.isClosed?0:this.inputStream.read();
+      return this.isClosed ? 0 : this.inputStream.read();
    }
 
    @ObfuscatedName("o")
@@ -125,19 +125,19 @@ public final class NetSocket extends AbstractSocket implements Runnable {
       garbageValue = "-1089665746"
    )
    @Export("read")
-   public int read(byte[] var1, int var2, int var3) throws IOException {
-      if(this.isClosed) {
+   public int read(byte[] dst, int dstIndex, int length) throws IOException {
+      if (this.isClosed) {
          return 0;
       } else {
          int var4;
          int var5;
-         for(var4 = var3; var3 > 0; var3 -= var5) {
-            var5 = this.inputStream.read(var1, var2, var3);
-            if(var5 <= 0) {
+         for (var4 = length; length > 0; length -= var5) {
+            var5 = this.inputStream.read(dst, dstIndex, length);
+            if (var5 <= 0) {
                throw new EOFException();
             }
 
-            var2 += var5;
+            dstIndex += var5;
          }
 
          return var4;
@@ -150,8 +150,8 @@ public final class NetSocket extends AbstractSocket implements Runnable {
       garbageValue = "-86"
    )
    @Export("write")
-   public void write(byte[] var1, int var2, int var3) throws IOException {
-      this.write0(var1, var2, var3);
+   public void write(byte[] src, int srcIndex, int length) throws IOException {
+      this.write0(src, srcIndex, length);
    }
 
    @ObfuscatedName("g")
@@ -161,28 +161,28 @@ public final class NetSocket extends AbstractSocket implements Runnable {
    )
    @Export("close")
    public void close() {
-      if(!this.isClosed) {
+      if (!this.isClosed) {
          synchronized(this) {
             this.isClosed = true;
             this.notifyAll();
          }
 
-         if(this.task != null) {
-            while(this.task.status == 0) {
+         if (this.task != null) {
+            while (this.task.status == 0) {
                class203.method4010(1L);
             }
 
-            if(this.task.status == 1) {
+            if (this.task.status == 1) {
                try {
                   ((Thread)this.task.result).join();
                } catch (InterruptedException var3) {
-                  ;
                }
             }
          }
 
          this.task = null;
       }
+
    }
 
    @ObfuscatedName("ay")
@@ -191,107 +191,104 @@ public final class NetSocket extends AbstractSocket implements Runnable {
       garbageValue = "-77"
    )
    @Export("write0")
-   void write0(byte[] var1, int var2, int var3) throws IOException {
-      if(!this.isClosed) {
-         if(this.exceptionWriting) {
+   void write0(byte[] src, int srcIndex, int length) throws IOException {
+      if (!this.isClosed) {
+         if (this.exceptionWriting) {
             this.exceptionWriting = false;
             throw new IOException();
-         } else {
-            if(this.array == null) {
-               this.array = new byte[this.__d];
+         }
+
+         if (this.array == null) {
+            this.array = new byte[this.field634];
+         }
+
+         synchronized(this) {
+            for (int var5 = 0; var5 < length; ++var5) {
+               this.array[this.field633] = src[var5 + srcIndex];
+               this.field633 = (this.field633 + 1) % this.field634;
+               if ((this.field635 + this.field632) % this.field634 == this.field633) {
+                  throw new IOException();
+               }
             }
 
-            synchronized(this) {
-               for(int var5 = 0; var5 < var3; ++var5) {
-                  this.array[this.__e] = var1[var5 + var2];
-                  this.__e = (this.__e + 1) % this.__d;
-                  if((this.__k + this.__l) % this.__d == this.__e) {
-                     throw new IOException();
-                  }
-               }
-
-               if(this.task == null) {
-                  this.task = this.taskHandler.newThreadTask(this, 3);
-               }
-
-               this.notifyAll();
+            if (this.task == null) {
+               this.task = this.taskHandler.newThreadTask(this, 3);
             }
+
+            this.notifyAll();
          }
       }
+
    }
 
-   @Export("run")
-   @ObfuscatedName("run")
    public void run() {
       try {
-         while(true) {
+         while (true) {
             label84: {
                int var1;
                int var2;
                synchronized(this) {
-                  if(this.__e == this.__l) {
-                     if(this.isClosed) {
+                  if (this.field633 == this.field632) {
+                     if (this.isClosed) {
                         break label84;
                      }
 
                      try {
                         this.wait();
-                     } catch (InterruptedException var10) {
-                        ;
+                     } catch (InterruptedException var9) {
                      }
                   }
 
-                  var2 = this.__l;
-                  if(this.__e >= this.__l) {
-                     var1 = this.__e - this.__l;
+                  var2 = this.field632;
+                  if (this.field633 >= this.field632) {
+                     var1 = this.field633 - this.field632;
                   } else {
-                     var1 = this.__d - this.__l;
+                     var1 = this.field634 - this.field632;
                   }
                }
 
-               if(var1 <= 0) {
+               if (var1 <= 0) {
                   continue;
                }
 
                try {
                   this.outputStream.write(this.array, var2, var1);
-               } catch (IOException var9) {
+               } catch (IOException var8) {
                   this.exceptionWriting = true;
                }
 
-               this.__l = (var1 + this.__l) % this.__d;
+               this.field632 = (var1 + this.field632) % this.field634;
 
                try {
-                  if(this.__e == this.__l) {
+                  if (this.field633 == this.field632) {
                      this.outputStream.flush();
                   }
-               } catch (IOException var8) {
+               } catch (IOException var7) {
                   this.exceptionWriting = true;
                }
                continue;
             }
 
             try {
-               if(this.inputStream != null) {
+               if (this.inputStream != null) {
                   this.inputStream.close();
                }
 
-               if(this.outputStream != null) {
+               if (this.outputStream != null) {
                   this.outputStream.close();
                }
 
-               if(this.socket != null) {
+               if (this.socket != null) {
                   this.socket.close();
                }
-            } catch (IOException var7) {
-               ;
+            } catch (IOException var6) {
             }
 
             this.array = null;
             break;
          }
-      } catch (Exception var12) {
-         NpcDefinition.sendStackTrace((String)null, var12);
+      } catch (Exception var11) {
+         NPCDefinition.sendStackTrace((String)null, var11);
       }
 
    }
@@ -308,227 +305,228 @@ public final class NetSocket extends AbstractSocket implements Runnable {
       garbageValue = "-98"
    )
    @Export("calculateRoute")
-   public static int calculateRoute(int srcX, int srcY, int srcSize, RouteStrategy strategy, CollisionMap collisionMap, boolean var5, int[] bufferX, int[] bufferY) {
-      int graphBaseX;
-      for(int var8 = 0; var8 < 128; ++var8) {
-         for(graphBaseX = 0; graphBaseX < 128; ++graphBaseX) {
-            class178.directions[var8][graphBaseX] = 0;
-            class178.distances[var8][graphBaseX] = 99999999;
+   public static int calculateRoute(int var0, int var1, int var2, RouteStrategy var3, CollisionMap var4, boolean var5, int[] var6, int[] var7) {
+      int var8;
+      int var9;
+      for (var9 = 0; var9 < 128; ++var9) {
+         for (var8 = 0; var8 < 128; ++var8) {
+            class178.directions[var9][var8] = 0;
+            class178.distances[var9][var8] = 99999999;
          }
       }
 
-      int graphBaseY;
-      int endX;
-      byte var13;
-      int lowestDistance;
+      int var10;
+      byte var11;
+      int var12;
+      int var13;
+      int var14;
       int var15;
-      int approxDestY;
-      int approxDestSizeY;
-      int checkX;
-      int checkY;
-      boolean found;
-      int endY;
-      int lowestCost;
-      int approxDestX;
-      if(srcSize == 1) {
-         graphBaseY = srcX;
-         endX = srcY;
-         byte var12 = 64;
-         var13 = 64;
-         lowestDistance = srcX - var12;
-         var15 = srcY - var13;
-         class178.directions[var12][var13] = 99;
-         class178.distances[var12][var13] = 0;
-         byte var16 = 0;
-         approxDestY = 0;
-         class178.bufferX[var16] = srcX;
-         approxDestX = var16 + 1;
-         class178.bufferY[var16] = srcY;
-         int[][] var18 = collisionMap.flags;
+      int var16;
+      int var17;
+      boolean var18;
+      int var19;
+      int var20;
+      int var21;
+      byte var22;
+      if (var2 == 1) {
+         var9 = var0;
+         var10 = var1;
+         var22 = 64;
+         var11 = 64;
+         var12 = var0 - var22;
+         var13 = var1 - var11;
+         class178.directions[var22][var11] = 99;
+         class178.distances[var22][var11] = 0;
+         byte var23 = 0;
+         var14 = 0;
+         class178.bufferX[var23] = var0;
+         var21 = var23 + 1;
+         class178.bufferY[var23] = var1;
+         int[][] var24 = var4.flags;
 
-         boolean var29;
-         while(true) {
-            if(approxDestX == approxDestY) {
-               WidgetGroupParent.__bx_o = graphBaseY;
-               UrlRequester.__eo_u = endX;
-               var29 = false;
+         boolean var25;
+         while (true) {
+            if (var21 == var14) {
+               InterfaceParent.field986 = var9;
+               UrlRequester.field929 = var10;
+               var25 = false;
                break;
             }
 
-            graphBaseY = class178.bufferX[approxDestY];
-            endX = class178.bufferY[approxDestY];
-            approxDestY = approxDestY + 1 & 4095;
-            endY = graphBaseY - lowestDistance;
-            lowestCost = endX - var15;
-            approxDestSizeY = graphBaseY - collisionMap.xInset;
-            checkX = endX - collisionMap.yInset;
-            if(strategy.vmethod3644(1, graphBaseY, endX, collisionMap)) {
-               WidgetGroupParent.__bx_o = graphBaseY;
-               UrlRequester.__eo_u = endX;
-               var29 = true;
+            var9 = class178.bufferX[var14];
+            var10 = class178.bufferY[var14];
+            var14 = var14 + 1 & 4095;
+            var19 = var9 - var12;
+            var20 = var10 - var13;
+            var15 = var9 - var4.xInset;
+            var16 = var10 - var4.yInset;
+            if (var3.vmethod3644(1, var9, var10, var4)) {
+               InterfaceParent.field986 = var9;
+               UrlRequester.field929 = var10;
+               var25 = true;
                break;
             }
 
-            checkY = class178.distances[endY][lowestCost] + 1;
-            if(endY > 0 && class178.directions[endY - 1][lowestCost] == 0 && (var18[approxDestSizeY - 1][checkX] & 19136776) == 0) {
-               class178.bufferX[approxDestX] = graphBaseY - 1;
-               class178.bufferY[approxDestX] = endX;
-               approxDestX = approxDestX + 1 & 4095;
-               class178.directions[endY - 1][lowestCost] = 2;
-               class178.distances[endY - 1][lowestCost] = checkY;
+            var17 = class178.distances[var19][var20] + 1;
+            if (var19 > 0 && class178.directions[var19 - 1][var20] == 0 && (var24[var15 - 1][var16] & 19136776) == 0) {
+               class178.bufferX[var21] = var9 - 1;
+               class178.bufferY[var21] = var10;
+               var21 = var21 + 1 & 4095;
+               class178.directions[var19 - 1][var20] = 2;
+               class178.distances[var19 - 1][var20] = var17;
             }
 
-            if(endY < 127 && class178.directions[endY + 1][lowestCost] == 0 && (var18[approxDestSizeY + 1][checkX] & 19136896) == 0) {
-               class178.bufferX[approxDestX] = graphBaseY + 1;
-               class178.bufferY[approxDestX] = endX;
-               approxDestX = approxDestX + 1 & 4095;
-               class178.directions[endY + 1][lowestCost] = 8;
-               class178.distances[endY + 1][lowestCost] = checkY;
+            if (var19 < 127 && class178.directions[var19 + 1][var20] == 0 && (var24[var15 + 1][var16] & 19136896) == 0) {
+               class178.bufferX[var21] = var9 + 1;
+               class178.bufferY[var21] = var10;
+               var21 = var21 + 1 & 4095;
+               class178.directions[var19 + 1][var20] = 8;
+               class178.distances[var19 + 1][var20] = var17;
             }
 
-            if(lowestCost > 0 && class178.directions[endY][lowestCost - 1] == 0 && (var18[approxDestSizeY][checkX - 1] & 19136770) == 0) {
-               class178.bufferX[approxDestX] = graphBaseY;
-               class178.bufferY[approxDestX] = endX - 1;
-               approxDestX = approxDestX + 1 & 4095;
-               class178.directions[endY][lowestCost - 1] = 1;
-               class178.distances[endY][lowestCost - 1] = checkY;
+            if (var20 > 0 && class178.directions[var19][var20 - 1] == 0 && (var24[var15][var16 - 1] & 19136770) == 0) {
+               class178.bufferX[var21] = var9;
+               class178.bufferY[var21] = var10 - 1;
+               var21 = var21 + 1 & 4095;
+               class178.directions[var19][var20 - 1] = 1;
+               class178.distances[var19][var20 - 1] = var17;
             }
 
-            if(lowestCost < 127 && class178.directions[endY][lowestCost + 1] == 0 && (var18[approxDestSizeY][checkX + 1] & 19136800) == 0) {
-               class178.bufferX[approxDestX] = graphBaseY;
-               class178.bufferY[approxDestX] = endX + 1;
-               approxDestX = approxDestX + 1 & 4095;
-               class178.directions[endY][lowestCost + 1] = 4;
-               class178.distances[endY][lowestCost + 1] = checkY;
+            if (var20 < 127 && class178.directions[var19][var20 + 1] == 0 && (var24[var15][var16 + 1] & 19136800) == 0) {
+               class178.bufferX[var21] = var9;
+               class178.bufferY[var21] = var10 + 1;
+               var21 = var21 + 1 & 4095;
+               class178.directions[var19][var20 + 1] = 4;
+               class178.distances[var19][var20 + 1] = var17;
             }
 
-            if(endY > 0 && lowestCost > 0 && class178.directions[endY - 1][lowestCost - 1] == 0 && (var18[approxDestSizeY - 1][checkX - 1] & 19136782) == 0 && (var18[approxDestSizeY - 1][checkX] & 19136776) == 0 && (var18[approxDestSizeY][checkX - 1] & 19136770) == 0) {
-               class178.bufferX[approxDestX] = graphBaseY - 1;
-               class178.bufferY[approxDestX] = endX - 1;
-               approxDestX = approxDestX + 1 & 4095;
-               class178.directions[endY - 1][lowestCost - 1] = 3;
-               class178.distances[endY - 1][lowestCost - 1] = checkY;
+            if (var19 > 0 && var20 > 0 && class178.directions[var19 - 1][var20 - 1] == 0 && (var24[var15 - 1][var16 - 1] & 19136782) == 0 && (var24[var15 - 1][var16] & 19136776) == 0 && (var24[var15][var16 - 1] & 19136770) == 0) {
+               class178.bufferX[var21] = var9 - 1;
+               class178.bufferY[var21] = var10 - 1;
+               var21 = var21 + 1 & 4095;
+               class178.directions[var19 - 1][var20 - 1] = 3;
+               class178.distances[var19 - 1][var20 - 1] = var17;
             }
 
-            if(endY < 127 && lowestCost > 0 && class178.directions[endY + 1][lowestCost - 1] == 0 && (var18[approxDestSizeY + 1][checkX - 1] & 19136899) == 0 && (var18[approxDestSizeY + 1][checkX] & 19136896) == 0 && (var18[approxDestSizeY][checkX - 1] & 19136770) == 0) {
-               class178.bufferX[approxDestX] = graphBaseY + 1;
-               class178.bufferY[approxDestX] = endX - 1;
-               approxDestX = approxDestX + 1 & 4095;
-               class178.directions[endY + 1][lowestCost - 1] = 9;
-               class178.distances[endY + 1][lowestCost - 1] = checkY;
+            if (var19 < 127 && var20 > 0 && class178.directions[var19 + 1][var20 - 1] == 0 && (var24[var15 + 1][var16 - 1] & 19136899) == 0 && (var24[var15 + 1][var16] & 19136896) == 0 && (var24[var15][var16 - 1] & 19136770) == 0) {
+               class178.bufferX[var21] = var9 + 1;
+               class178.bufferY[var21] = var10 - 1;
+               var21 = var21 + 1 & 4095;
+               class178.directions[var19 + 1][var20 - 1] = 9;
+               class178.distances[var19 + 1][var20 - 1] = var17;
             }
 
-            if(endY > 0 && lowestCost < 127 && class178.directions[endY - 1][lowestCost + 1] == 0 && (var18[approxDestSizeY - 1][checkX + 1] & 19136824) == 0 && (var18[approxDestSizeY - 1][checkX] & 19136776) == 0 && (var18[approxDestSizeY][checkX + 1] & 19136800) == 0) {
-               class178.bufferX[approxDestX] = graphBaseY - 1;
-               class178.bufferY[approxDestX] = endX + 1;
-               approxDestX = approxDestX + 1 & 4095;
-               class178.directions[endY - 1][lowestCost + 1] = 6;
-               class178.distances[endY - 1][lowestCost + 1] = checkY;
+            if (var19 > 0 && var20 < 127 && class178.directions[var19 - 1][var20 + 1] == 0 && (var24[var15 - 1][var16 + 1] & 19136824) == 0 && (var24[var15 - 1][var16] & 19136776) == 0 && (var24[var15][var16 + 1] & 19136800) == 0) {
+               class178.bufferX[var21] = var9 - 1;
+               class178.bufferY[var21] = var10 + 1;
+               var21 = var21 + 1 & 4095;
+               class178.directions[var19 - 1][var20 + 1] = 6;
+               class178.distances[var19 - 1][var20 + 1] = var17;
             }
 
-            if(endY < 127 && lowestCost < 127 && class178.directions[endY + 1][lowestCost + 1] == 0 && (var18[approxDestSizeY + 1][checkX + 1] & 19136992) == 0 && (var18[approxDestSizeY + 1][checkX] & 19136896) == 0 && (var18[approxDestSizeY][checkX + 1] & 19136800) == 0) {
-               class178.bufferX[approxDestX] = graphBaseY + 1;
-               class178.bufferY[approxDestX] = endX + 1;
-               approxDestX = approxDestX + 1 & 4095;
-               class178.directions[endY + 1][lowestCost + 1] = 12;
-               class178.distances[endY + 1][lowestCost + 1] = checkY;
+            if (var19 < 127 && var20 < 127 && class178.directions[var19 + 1][var20 + 1] == 0 && (var24[var15 + 1][var16 + 1] & 19136992) == 0 && (var24[var15 + 1][var16] & 19136896) == 0 && (var24[var15][var16 + 1] & 19136800) == 0) {
+               class178.bufferX[var21] = var9 + 1;
+               class178.bufferY[var21] = var10 + 1;
+               var21 = var21 + 1 & 4095;
+               class178.directions[var19 + 1][var20 + 1] = 12;
+               class178.distances[var19 + 1][var20 + 1] = var17;
             }
          }
 
-         found = var29; // Vars are weird above here cause that's an inlined method
-      } else if(srcSize == 2) {
-         found = WorldMapSection2.method593(srcX, srcY, strategy, collisionMap);
+         var18 = var25;
+      } else if (var2 == 2) {
+         var18 = WorldMapSection0.method593(var0, var1, var3, var4);
       } else {
-         found = IndexStore.method3585(srcX, srcY, srcSize, strategy, collisionMap);
+         var18 = ArchiveDisk.method3585(var0, var1, var2, var3, var4);
       }
 
-      graphBaseX = srcX - 64;
-      graphBaseY = srcY - 64;
-      endX = WidgetGroupParent.__bx_o;
-      endY = UrlRequester.__eo_u;
-      if(!found) {
-         lowestCost = Integer.MAX_VALUE;
-         lowestDistance = Integer.MAX_VALUE;
-         byte alternativeRouteRange = 10;
-         approxDestX = strategy.approxDestinationX;
-         approxDestY = strategy.approxDestinationY;
-         int approxDestSizeX = strategy.approxDestinationSizeX;
-         approxDestSizeY = strategy.approxDestinationSizeY;
+      var8 = var0 - 64;
+      var9 = var1 - 64;
+      var10 = InterfaceParent.field986;
+      var19 = UrlRequester.field929;
+      if (!var18) {
+         var20 = Integer.MAX_VALUE;
+         var12 = Integer.MAX_VALUE;
+         var22 = 10;
+         var21 = var3.approxDestinationX;
+         var14 = var3.approxDestinationY;
+         int var29 = var3.approxDestinationSizeX;
+         var15 = var3.approxDestinationSizeY;
 
-         for(checkX = approxDestX - alternativeRouteRange; checkX <= alternativeRouteRange + approxDestX; ++checkX) {
-            for(checkY = approxDestY - alternativeRouteRange; checkY <= approxDestY + alternativeRouteRange; ++checkY) {
-               int graphX = checkX - graphBaseX;
-               int graphY = checkY - graphBaseY;
-               if(graphX >= 0 && graphY >= 0 && graphX < 128 && graphY < 128 && class178.distances[graphX][graphY] < 100) {
-                  int deltaX = 0;
-                  if(checkX < approxDestX) {
-                     deltaX = approxDestX - checkX;
-                  } else if(checkX > approxDestSizeX + approxDestX - 1) {
-                     deltaX = checkX - (approxDestSizeX + approxDestX - 1);
+         for (var16 = var21 - var22; var16 <= var22 + var21; ++var16) {
+            for (var17 = var14 - var22; var17 <= var14 + var22; ++var17) {
+               int var30 = var16 - var8;
+               int var31 = var17 - var9;
+               if (var30 >= 0 && var31 >= 0 && var30 < 128 && var31 < 128 && class178.distances[var30][var31] < 100) {
+                  int var26 = 0;
+                  if (var16 < var21) {
+                     var26 = var21 - var16;
+                  } else if (var16 > var29 + var21 - 1) {
+                     var26 = var16 - (var29 + var21 - 1);
                   }
 
-                  int deltaY = 0;
-                  if(checkY < approxDestY) {
-                     deltaY = approxDestY - checkY;
-                  } else if(checkY > approxDestSizeY + approxDestY - 1) {
-                     deltaY = checkY - (approxDestSizeY + approxDestY - 1);
+                  int var27 = 0;
+                  if (var17 < var14) {
+                     var27 = var14 - var17;
+                  } else if (var17 > var15 + var14 - 1) {
+                     var27 = var17 - (var15 + var14 - 1);
                   }
 
-                  int cost = deltaY * deltaY + deltaX * deltaX;
-                  if(cost < lowestCost || cost == lowestCost && class178.distances[graphX][graphY] < lowestDistance) {
-                     lowestCost = cost;
-                     lowestDistance = class178.distances[graphX][graphY];
-                     endX = checkX;
-                     endY = checkY;
+                  int var28 = var27 * var27 + var26 * var26;
+                  if (var28 < var20 || var28 == var20 && class178.distances[var30][var31] < var12) {
+                     var20 = var28;
+                     var12 = class178.distances[var30][var31];
+                     var10 = var16;
+                     var19 = var17;
                   }
                }
             }
          }
 
-         if(lowestCost == Integer.MAX_VALUE) {
+         if (var20 == Integer.MAX_VALUE) {
             return -1;
          }
       }
 
-      if(srcX == endX && endY == srcY) {
+      if (var0 == var10 && var19 == var1) {
          return 0;
-      } else { // Inlined again after this I think
-         var13 = 0;
-         class178.bufferX[var13] = endX;
-         lowestCost = var13 + 1;
-         class178.bufferY[var13] = endY;
+      } else {
+         var11 = 0;
+         class178.bufferX[var11] = var10;
+         var20 = var11 + 1;
+         class178.bufferY[var11] = var19;
 
-         for(lowestDistance = var15 = class178.directions[endX - graphBaseX][endY - graphBaseY]; srcX != endX || endY != srcY; lowestDistance = class178.directions[endX - graphBaseX][endY - graphBaseY]) {
-            if(lowestDistance != var15) {
-               var15 = lowestDistance;
-               class178.bufferX[lowestCost] = endX;
-               class178.bufferY[lowestCost++] = endY;
+         for (var12 = var13 = class178.directions[var10 - var8][var19 - var9]; var0 != var10 || var19 != var1; var12 = class178.directions[var10 - var8][var19 - var9]) {
+            if (var12 != var13) {
+               var13 = var12;
+               class178.bufferX[var20] = var10;
+               class178.bufferY[var20++] = var19;
             }
 
-            if((lowestDistance & 2) != 0) {
-               ++endX;
-            } else if((lowestDistance & 8) != 0) {
-               --endX;
+            if ((var12 & 2) != 0) {
+               ++var10;
+            } else if ((var12 & 8) != 0) {
+               --var10;
             }
 
-            if((lowestDistance & 1) != 0) {
-               ++endY;
-            } else if((lowestDistance & 4) != 0) {
-               --endY;
+            if ((var12 & 1) != 0) {
+               ++var19;
+            } else if ((var12 & 4) != 0) {
+               --var19;
             }
          }
 
-         approxDestX = 0;
+         var21 = 0;
 
-         while(lowestCost-- > 0) {
-            bufferX[approxDestX] = class178.bufferX[lowestCost];
-            bufferY[approxDestX++] = class178.bufferY[lowestCost];
-            if(approxDestX >= bufferX.length) {
+         while (var20-- > 0) {
+            var6[var21] = class178.bufferX[var20];
+            var7[var21++] = class178.bufferY[var20];
+            if (var21 >= var6.length) {
                break;
             }
          }
 
-         return approxDestX;
+         return var21;
       }
    }
 
@@ -537,10 +535,10 @@ public final class NetSocket extends AbstractSocket implements Runnable {
       signature = "(Lir;Lir;Lir;Lhm;I)Z",
       garbageValue = "-590103687"
    )
-   public static boolean method3537(AbstractIndexCache var0, AbstractIndexCache var1, AbstractIndexCache var2, MidiPcmStream var3) {
-      class1.__f_m = var0;
-      class214.__hf_f = var1;
-      class214.__hf_q = var2;
+   public static boolean method3537(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, MidiPcmStream var3) {
+      class1.field1105 = var0;
+      class214.field1127 = var1;
+      class214.field1128 = var2;
       class214.midiPcmStream = var3;
       return true;
    }
diff --git a/runescape-client/src/main/java/Node.java b/runescape-client/src/main/java/Node.java
index 56baec5554..938753e5bc 100644
--- a/runescape-client/src/main/java/Node.java
+++ b/runescape-client/src/main/java/Node.java
@@ -25,12 +25,13 @@ public class Node {
    @ObfuscatedName("es")
    @Export("remove")
    public void remove() {
-      if(this.next != null) {
+      if (this.next != null) {
          this.next.previous = this.previous;
          this.previous.next = this.next;
          this.previous = null;
          this.next = null;
       }
+
    }
 
    @ObfuscatedName("eg")
diff --git a/runescape-client/src/main/java/NodeDeque.java b/runescape-client/src/main/java/NodeDeque.java
index f2b7a54fbb..b7d3eb37a3 100644
--- a/runescape-client/src/main/java/NodeDeque.java
+++ b/runescape-client/src/main/java/NodeDeque.java
@@ -28,9 +28,9 @@ public class NodeDeque {
    @ObfuscatedName("m")
    @Export("clear")
    public void clear() {
-      while(true) {
+      while (true) {
          Node var1 = this.sentinel.previous;
-         if(var1 == this.sentinel) {
+         if (var1 == this.sentinel) {
             this.current = null;
             return;
          }
@@ -44,15 +44,15 @@ public class NodeDeque {
       signature = "(Lgw;)V"
    )
    @Export("addFirst")
-   public void addFirst(Node var1) {
-      if(var1.next != null) {
-         var1.remove();
+   public void addFirst(Node node) {
+      if (node.next != null) {
+         node.remove();
       }
 
-      var1.next = this.sentinel.next;
-      var1.previous = this.sentinel;
-      var1.next.previous = var1;
-      var1.previous.next = var1;
+      node.next = this.sentinel.next;
+      node.previous = this.sentinel;
+      node.next.previous = node;
+      node.previous.next = node;
    }
 
    @ObfuscatedName("q")
@@ -60,15 +60,15 @@ public class NodeDeque {
       signature = "(Lgw;)V"
    )
    @Export("addLast")
-   public void addLast(Node var1) {
-      if(var1.next != null) {
-         var1.remove();
+   public void addLast(Node node) {
+      if (node.next != null) {
+         node.remove();
       }
 
-      var1.next = this.sentinel;
-      var1.previous = this.sentinel.previous;
-      var1.next.previous = var1;
-      var1.previous.next = var1;
+      node.next = this.sentinel;
+      node.previous = this.sentinel.previous;
+      node.next.previous = node;
+      node.previous.next = node;
    }
 
    @ObfuscatedName("o")
@@ -78,7 +78,7 @@ public class NodeDeque {
    @Export("removeLast")
    public Node removeLast() {
       Node var1 = this.sentinel.previous;
-      if(var1 == this.sentinel) {
+      if (var1 == this.sentinel) {
          return null;
       } else {
          var1.remove();
@@ -93,7 +93,7 @@ public class NodeDeque {
    @Export("removeFirst")
    public Node removeFirst() {
       Node var1 = this.sentinel.next;
-      if(var1 == this.sentinel) {
+      if (var1 == this.sentinel) {
          return null;
       } else {
          var1.remove();
@@ -108,7 +108,7 @@ public class NodeDeque {
    @Export("last")
    public Node last() {
       Node var1 = this.sentinel.previous;
-      if(var1 == this.sentinel) {
+      if (var1 == this.sentinel) {
          this.current = null;
          return null;
       } else {
@@ -124,7 +124,7 @@ public class NodeDeque {
    @Export("first")
    public Node first() {
       Node var1 = this.sentinel.next;
-      if(var1 == this.sentinel) {
+      if (var1 == this.sentinel) {
          this.current = null;
          return null;
       } else {
@@ -140,7 +140,7 @@ public class NodeDeque {
    @Export("previous")
    public Node previous() {
       Node var1 = this.current;
-      if(var1 == this.sentinel) {
+      if (var1 == this.sentinel) {
          this.current = null;
          return null;
       } else {
@@ -156,7 +156,7 @@ public class NodeDeque {
    @Export("next")
    public Node next() {
       Node var1 = this.current;
-      if(var1 == this.sentinel) {
+      if (var1 == this.sentinel) {
          this.current = null;
          return null;
       } else {
@@ -169,8 +169,9 @@ public class NodeDeque {
    @ObfuscatedSignature(
       signature = "(Lgw;Lgw;)V"
    )
-   public static void method5270(Node var0, Node var1) {
-      if(var0.next != null) {
+   @Export("NodeDeque_addBefore")
+   public static void NodeDeque_addBefore(Node var0, Node var1) {
+      if (var0.next != null) {
          var0.remove();
       }
 
diff --git a/runescape-client/src/main/java/NodeHashTable.java b/runescape-client/src/main/java/NodeHashTable.java
index 2e4fcbf1bb..d2f8c773d8 100644
--- a/runescape-client/src/main/java/NodeHashTable.java
+++ b/runescape-client/src/main/java/NodeHashTable.java
@@ -36,7 +36,7 @@ public final class NodeHashTable {
       this.size = var1;
       this.buckets = new Node[var1];
 
-      for(int var2 = 0; var2 < var1; ++var2) {
+      for (int var2 = 0; var2 < var1; ++var2) {
          Node var3 = this.buckets[var2] = new Node();
          var3.previous = var3;
          var3.next = var3;
@@ -49,11 +49,11 @@ public final class NodeHashTable {
       signature = "(J)Lgw;"
    )
    @Export("get")
-   public Node get(long var1) {
-      Node var3 = this.buckets[(int)(var1 & (long)(this.size - 1))];
+   public Node get(long key) {
+      Node var3 = this.buckets[(int)(key & (long)(this.size - 1))];
 
-      for(this.currentGet = var3.previous; var3 != this.currentGet; this.currentGet = this.currentGet.previous) {
-         if(this.currentGet.key == var1) {
+      for (this.currentGet = var3.previous; var3 != this.currentGet; this.currentGet = this.currentGet.previous) {
+         if (this.currentGet.key == key) {
             Node var4 = this.currentGet;
             this.currentGet = this.currentGet.previous;
             return var4;
@@ -69,28 +69,28 @@ public final class NodeHashTable {
       signature = "(Lgw;J)V"
    )
    @Export("put")
-   public void put(Node var1, long var2) {
-      if(var1.next != null) {
-         var1.remove();
+   public void put(Node node, long key) {
+      if (node.next != null) {
+         node.remove();
       }
 
-      Node var4 = this.buckets[(int)(var2 & (long)(this.size - 1))];
-      var1.next = var4.next;
-      var1.previous = var4;
-      var1.next.previous = var1;
-      var1.previous.next = var1;
-      var1.key = var2;
+      Node var4 = this.buckets[(int)(key & (long)(this.size - 1))];
+      node.next = var4.next;
+      node.previous = var4;
+      node.next.previous = node;
+      node.previous.next = node;
+      node.key = key;
    }
 
    @ObfuscatedName("q")
    @Export("clear")
    public void clear() {
-      for(int var1 = 0; var1 < this.size; ++var1) {
+      for (int var1 = 0; var1 < this.size; ++var1) {
          Node var2 = this.buckets[var1];
 
-         while(true) {
+         while (true) {
             Node var3 = var2.previous;
-            if(var3 == var2) {
+            if (var3 == var2) {
                break;
             }
 
@@ -119,13 +119,13 @@ public final class NodeHashTable {
    @Export("next")
    public Node next() {
       Node var1;
-      if(this.index > 0 && this.buckets[this.index - 1] != this.current) {
+      if (this.index > 0 && this.buckets[this.index - 1] != this.current) {
          var1 = this.current;
          this.current = var1.previous;
          return var1;
       } else {
          do {
-            if(this.index >= this.size) {
+            if (this.index >= this.size) {
                return null;
             }
 
diff --git a/runescape-client/src/main/java/ObjectDefinition.java b/runescape-client/src/main/java/ObjectDefinition.java
index 0599790b68..6a6a68db6f 100644
--- a/runescape-client/src/main/java/ObjectDefinition.java
+++ b/runescape-client/src/main/java/ObjectDefinition.java
@@ -14,13 +14,13 @@ public class ObjectDefinition extends DualNode {
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   @Export("ObjectDefinition_indexCache")
-   static AbstractIndexCache ObjectDefinition_indexCache;
+   @Export("ObjectDefinition_archive")
+   static AbstractArchive ObjectDefinition_archive;
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   static AbstractIndexCache __jr_q;
+   static AbstractArchive field640;
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "Ler;"
@@ -31,12 +31,12 @@ public class ObjectDefinition extends DualNode {
    @ObfuscatedSignature(
       signature = "Ler;"
    )
-   public static EvictingDualNodeHashTable __jr_o;
+   public static EvictingDualNodeHashTable field641;
    @ObfuscatedName("u")
    @ObfuscatedSignature(
       signature = "Ler;"
    )
-   static EvictingDualNodeHashTable __jr_u;
+   static EvictingDualNodeHashTable field642;
    @ObfuscatedName("g")
    @ObfuscatedSignature(
       signature = "Ler;"
@@ -47,7 +47,7 @@ public class ObjectDefinition extends DualNode {
    @ObfuscatedSignature(
       signature = "[Ldw;"
    )
-   static ModelData[] __jr_l;
+   static ModelData[] field643;
    @ObfuscatedName("e")
    @ObfuscatedGetter(
       intValue = -2034835389
@@ -55,9 +55,9 @@ public class ObjectDefinition extends DualNode {
    @Export("id")
    public int id;
    @ObfuscatedName("x")
-   int[] __x;
+   int[] field644;
    @ObfuscatedName("d")
-   int[] __d;
+   int[] field645;
    @ObfuscatedName("k")
    @Export("name")
    public String name;
@@ -218,8 +218,8 @@ public class ObjectDefinition extends DualNode {
    @ObfuscatedGetter(
       intValue = -2119965579
    )
-   @Export("transformConfigId")
-   int transformConfigId;
+   @Export("transformVarp")
+   int transformVarp;
    @ObfuscatedName("az")
    @ObfuscatedGetter(
       intValue = 374616127
@@ -245,7 +245,7 @@ public class ObjectDefinition extends DualNode {
    @Export("int6")
    public int int6;
    @ObfuscatedName("ax")
-   public int[] __ax;
+   public int[] field646;
    @ObfuscatedName("af")
    @ObfuscatedSignature(
       signature = "Llh;"
@@ -253,15 +253,6 @@ public class ObjectDefinition extends DualNode {
    @Export("params")
    IterableNodeHashTable params;
 
-   static {
-      ObjectDefinition_isLowDetail = false;
-      ObjectDefinition_cached = new EvictingDualNodeHashTable(4096);
-      __jr_o = new EvictingDualNodeHashTable(500);
-      __jr_u = new EvictingDualNodeHashTable(30);
-      ObjectDefinition_cachedModels = new EvictingDualNodeHashTable(30);
-      __jr_l = new ModelData[4];
-   }
-
    ObjectDefinition() {
       this.name = "null";
       this.sizeX = 1;
@@ -291,7 +282,7 @@ public class ObjectDefinition extends DualNode {
       this.isSolid = false;
       this.int3 = -1;
       this.transformVarbit = -1;
-      this.transformConfigId = -1;
+      this.transformVarp = -1;
       this.ambientSoundId = -1;
       this.int4 = 0;
       this.int5 = 0;
@@ -303,23 +294,23 @@ public class ObjectDefinition extends DualNode {
       signature = "(I)V",
       garbageValue = "-245255765"
    )
-   @Export("init")
-   void init() {
-      if(this.int1 == -1) {
+   @Export("postDecode")
+   void postDecode() {
+      if (this.int1 == -1) {
          this.int1 = 0;
-         if(this.__x != null && (this.__d == null || this.__d[0] == 10)) {
+         if (this.field644 != null && (this.field645 == null || this.field645[0] == 10)) {
             this.int1 = 1;
          }
 
-         for(int var1 = 0; var1 < 5; ++var1) {
-            if(this.actions[var1] != null) {
+         for (int var1 = 0; var1 < 5; ++var1) {
+            if (this.actions[var1] != null) {
                this.int1 = 1;
             }
          }
       }
 
-      if(this.int3 == -1) {
-         this.int3 = this.interactType != 0?1:0;
+      if (this.int3 == -1) {
+         this.int3 = this.interactType != 0 ? 1 : 0;
       }
 
    }
@@ -329,15 +320,15 @@ public class ObjectDefinition extends DualNode {
       signature = "(Lgr;I)V",
       garbageValue = "1210669830"
    )
-   @Export("read")
-   void read(Buffer var1) {
-      while(true) {
+   @Export("decode")
+   void decode(Buffer var1) {
+      while (true) {
          int var2 = var1.readUnsignedByte();
-         if(var2 == 0) {
+         if (var2 == 0) {
             return;
          }
 
-         this.readNext(var1, var2);
+         this.decodeNext(var1, var2);
       }
    }
 
@@ -346,156 +337,156 @@ public class ObjectDefinition extends DualNode {
       signature = "(Lgr;II)V",
       garbageValue = "-2044409717"
    )
-   @Export("readNext")
-   void readNext(Buffer var1, int var2) {
+   @Export("decodeNext")
+   void decodeNext(Buffer var1, int var2) {
       int var3;
       int var4;
-      if(var2 == 1) {
+      if (var2 == 1) {
          var3 = var1.readUnsignedByte();
-         if(var3 > 0) {
-            if(this.__x != null && !ObjectDefinition_isLowDetail) {
+         if (var3 > 0) {
+            if (this.field644 != null && !ObjectDefinition_isLowDetail) {
                var1.index += var3 * 3;
             } else {
-               this.__d = new int[var3];
-               this.__x = new int[var3];
+               this.field645 = new int[var3];
+               this.field644 = new int[var3];
 
-               for(var4 = 0; var4 < var3; ++var4) {
-                  this.__x[var4] = var1.__ag_302();
-                  this.__d[var4] = var1.readUnsignedByte();
+               for (var4 = 0; var4 < var3; ++var4) {
+                  this.field644[var4] = var1.readUnsignedShort();
+                  this.field645[var4] = var1.readUnsignedByte();
                }
             }
          }
-      } else if(var2 == 2) {
+      } else if (var2 == 2) {
          this.name = var1.readStringCp1252NullTerminated();
-      } else if(var2 == 5) {
+      } else if (var2 == 5) {
          var3 = var1.readUnsignedByte();
-         if(var3 > 0) {
-            if(this.__x != null && !ObjectDefinition_isLowDetail) {
+         if (var3 > 0) {
+            if (this.field644 != null && !ObjectDefinition_isLowDetail) {
                var1.index += var3 * 2;
             } else {
-               this.__d = null;
-               this.__x = new int[var3];
+               this.field645 = null;
+               this.field644 = new int[var3];
 
-               for(var4 = 0; var4 < var3; ++var4) {
-                  this.__x[var4] = var1.__ag_302();
+               for (var4 = 0; var4 < var3; ++var4) {
+                  this.field644[var4] = var1.readUnsignedShort();
                }
             }
          }
-      } else if(var2 == 14) {
+      } else if (var2 == 14) {
          this.sizeX = var1.readUnsignedByte();
-      } else if(var2 == 15) {
+      } else if (var2 == 15) {
          this.sizeY = var1.readUnsignedByte();
-      } else if(var2 == 17) {
+      } else if (var2 == 17) {
          this.interactType = 0;
          this.boolean1 = false;
-      } else if(var2 == 18) {
+      } else if (var2 == 18) {
          this.boolean1 = false;
-      } else if(var2 == 19) {
+      } else if (var2 == 19) {
          this.int1 = var1.readUnsignedByte();
-      } else if(var2 == 21) {
+      } else if (var2 == 21) {
          this.clipType = 0;
-      } else if(var2 == 22) {
+      } else if (var2 == 22) {
          this.nonFlatShading = true;
-      } else if(var2 == 23) {
+      } else if (var2 == 23) {
          this.modelClipped = true;
-      } else if(var2 == 24) {
-         this.animationId = var1.__ag_302();
-         if(this.animationId == 65535) {
+      } else if (var2 == 24) {
+         this.animationId = var1.readUnsignedShort();
+         if (this.animationId == 65535) {
             this.animationId = -1;
          }
-      } else if(var2 == 27) {
+      } else if (var2 == 27) {
          this.interactType = 1;
-      } else if(var2 == 28) {
+      } else if (var2 == 28) {
          this.int2 = var1.readUnsignedByte();
-      } else if(var2 == 29) {
+      } else if (var2 == 29) {
          this.ambient = var1.readByte();
-      } else if(var2 == 39) {
+      } else if (var2 == 39) {
          this.contrast = var1.readByte() * 25;
-      } else if(var2 >= 30 && var2 < 35) {
+      } else if (var2 >= 30 && var2 < 35) {
          this.actions[var2 - 30] = var1.readStringCp1252NullTerminated();
-         if(this.actions[var2 - 30].equalsIgnoreCase("Hidden")) {
+         if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) {
             this.actions[var2 - 30] = null;
          }
-      } else if(var2 == 40) {
+      } else if (var2 == 40) {
          var3 = var1.readUnsignedByte();
          this.recolorFrom = new short[var3];
          this.recolorTo = new short[var3];
 
-         for(var4 = 0; var4 < var3; ++var4) {
-            this.recolorFrom[var4] = (short)var1.__ag_302();
-            this.recolorTo[var4] = (short)var1.__ag_302();
+         for (var4 = 0; var4 < var3; ++var4) {
+            this.recolorFrom[var4] = (short)var1.readUnsignedShort();
+            this.recolorTo[var4] = (short)var1.readUnsignedShort();
          }
-      } else if(var2 == 41) {
+      } else if (var2 == 41) {
          var3 = var1.readUnsignedByte();
          this.retextureFrom = new short[var3];
          this.retextureTo = new short[var3];
 
-         for(var4 = 0; var4 < var3; ++var4) {
-            this.retextureFrom[var4] = (short)var1.__ag_302();
-            this.retextureTo[var4] = (short)var1.__ag_302();
+         for (var4 = 0; var4 < var3; ++var4) {
+            this.retextureFrom[var4] = (short)var1.readUnsignedShort();
+            this.retextureTo[var4] = (short)var1.readUnsignedShort();
          }
-      } else if(var2 == 62) {
+      } else if (var2 == 62) {
          this.isRotated = true;
-      } else if(var2 == 64) {
+      } else if (var2 == 64) {
          this.clipped = false;
-      } else if(var2 == 65) {
-         this.modelSizeX = var1.__ag_302();
-      } else if(var2 == 66) {
-         this.modelHeight = var1.__ag_302();
-      } else if(var2 == 67) {
-         this.modelSizeY = var1.__ag_302();
-      } else if(var2 == 68) {
-         this.mapSceneId = var1.__ag_302();
-      } else if(var2 == 69) {
+      } else if (var2 == 65) {
+         this.modelSizeX = var1.readUnsignedShort();
+      } else if (var2 == 66) {
+         this.modelHeight = var1.readUnsignedShort();
+      } else if (var2 == 67) {
+         this.modelSizeY = var1.readUnsignedShort();
+      } else if (var2 == 68) {
+         this.mapSceneId = var1.readUnsignedShort();
+      } else if (var2 == 69) {
          var1.readUnsignedByte();
-      } else if(var2 == 70) {
-         this.offsetX = var1.__aq_303();
-      } else if(var2 == 71) {
-         this.offsetHeight = var1.__aq_303();
-      } else if(var2 == 72) {
-         this.offsetY = var1.__aq_303();
-      } else if(var2 == 73) {
+      } else if (var2 == 70) {
+         this.offsetX = var1.readShort();
+      } else if (var2 == 71) {
+         this.offsetHeight = var1.readShort();
+      } else if (var2 == 72) {
+         this.offsetY = var1.readShort();
+      } else if (var2 == 73) {
          this.boolean2 = true;
-      } else if(var2 == 74) {
+      } else if (var2 == 74) {
          this.isSolid = true;
-      } else if(var2 == 75) {
+      } else if (var2 == 75) {
          this.int3 = var1.readUnsignedByte();
-      } else if(var2 != 77 && var2 != 92) {
-         if(var2 == 78) {
-            this.ambientSoundId = var1.__ag_302();
+      } else if (var2 != 77 && var2 != 92) {
+         if (var2 == 78) {
+            this.ambientSoundId = var1.readUnsignedShort();
             this.int4 = var1.readUnsignedByte();
-         } else if(var2 == 79) {
-            this.int5 = var1.__ag_302();
-            this.int6 = var1.__ag_302();
+         } else if (var2 == 79) {
+            this.int5 = var1.readUnsignedShort();
+            this.int6 = var1.readUnsignedShort();
             this.int4 = var1.readUnsignedByte();
             var3 = var1.readUnsignedByte();
-            this.__ax = new int[var3];
+            this.field646 = new int[var3];
 
-            for(var4 = 0; var4 < var3; ++var4) {
-               this.__ax[var4] = var1.__ag_302();
+            for (var4 = 0; var4 < var3; ++var4) {
+               this.field646[var4] = var1.readUnsignedShort();
             }
-         } else if(var2 == 81) {
+         } else if (var2 == 81) {
             this.clipType = var1.readUnsignedByte() * 256;
-         } else if(var2 == 82) {
-            this.mapIconId = var1.__ag_302();
-         } else if(var2 == 249) {
-            this.params = AbstractIndexCache.readStringIntParameters(var1, this.params);
+         } else if (var2 == 82) {
+            this.mapIconId = var1.readUnsignedShort();
+         } else if (var2 == 249) {
+            this.params = AbstractArchive.readStringIntParameters(var1, this.params);
          }
       } else {
-         this.transformVarbit = var1.__ag_302();
-         if(this.transformVarbit == 65535) {
+         this.transformVarbit = var1.readUnsignedShort();
+         if (this.transformVarbit == 65535) {
             this.transformVarbit = -1;
          }
 
-         this.transformConfigId = var1.__ag_302();
-         if(this.transformConfigId == 65535) {
-            this.transformConfigId = -1;
+         this.transformVarp = var1.readUnsignedShort();
+         if (this.transformVarp == 65535) {
+            this.transformVarp = -1;
          }
 
          var3 = -1;
-         if(var2 == 92) {
-            var3 = var1.__ag_302();
-            if(var3 == 65535) {
+         if (var2 == 92) {
+            var3 = var1.readUnsignedShort();
+            if (var3 == 65535) {
                var3 = -1;
             }
          }
@@ -503,9 +494,9 @@ public class ObjectDefinition extends DualNode {
          var4 = var1.readUnsignedByte();
          this.transforms = new int[var4 + 2];
 
-         for(int var5 = 0; var5 <= var4; ++var5) {
-            this.transforms[var5] = var1.__ag_302();
-            if(this.transforms[var5] == 65535) {
+         for (int var5 = 0; var5 <= var4; ++var5) {
+            this.transforms[var5] = var1.readUnsignedShort();
+            if (this.transforms[var5] == 65535) {
                this.transforms[var5] = -1;
             }
          }
@@ -520,24 +511,24 @@ public class ObjectDefinition extends DualNode {
       signature = "(II)Z",
       garbageValue = "1880172029"
    )
-   public final boolean __u_421(int var1) {
-      if(this.__d != null) {
-         for(int var4 = 0; var4 < this.__d.length; ++var4) {
-            if(this.__d[var4] == var1) {
-               return __jr_q.tryLoadRecord(this.__x[var4] & 65535, 0);
+   public final boolean method230(int var1) {
+      if (this.field645 != null) {
+         for (int var4 = 0; var4 < this.field645.length; ++var4) {
+            if (this.field645[var4] == var1) {
+               return field640.tryLoadFile(this.field644[var4] & 65535, 0);
             }
          }
 
          return true;
-      } else if(this.__x == null) {
+      } else if (this.field644 == null) {
          return true;
-      } else if(var1 != 10) {
+      } else if (var1 != 10) {
          return true;
       } else {
          boolean var2 = true;
 
-         for(int var3 = 0; var3 < this.__x.length; ++var3) {
-            var2 &= __jr_q.tryLoadRecord(this.__x[var3] & 65535, 0);
+         for (int var3 = 0; var3 < this.field644.length; ++var3) {
+            var2 &= field640.tryLoadFile(this.field644[var3] & 65535, 0);
          }
 
          return var2;
@@ -549,14 +540,14 @@ public class ObjectDefinition extends DualNode {
       signature = "(I)Z",
       garbageValue = "-666846742"
    )
-   public final boolean __g_422() {
-      if(this.__x == null) {
+   public final boolean method231() {
+      if (this.field644 == null) {
          return true;
       } else {
          boolean var1 = true;
 
-         for(int var2 = 0; var2 < this.__x.length; ++var2) {
-            var1 &= __jr_q.tryLoadRecord(this.__x[var2] & 65535, 0);
+         for (int var2 = 0; var2 < this.field644.length; ++var2) {
+            var1 &= field640.tryLoadFile(this.field644[var2] & 65535, 0);
          }
 
          return var1;
@@ -568,42 +559,42 @@ public class ObjectDefinition extends DualNode {
       signature = "(II[[IIIIS)Lex;",
       garbageValue = "-27831"
    )
-   public final Entity __l_423(int var1, int var2, int[][] var3, int var4, int var5, int var6) {
+   public final Entity method232(int var1, int var2, int[][] var3, int var4, int var5, int var6) {
       long var7;
-      if(this.__d == null) {
+      if (this.field645 == null) {
          var7 = (long)(var2 + (this.id << 10));
       } else {
          var7 = (long)(var2 + (var1 << 3) + (this.id << 10));
       }
 
-      Object var9 = (Entity)__jr_u.get(var7);
-      if(var9 == null) {
+      Object var9 = (Entity)field642.get(var7);
+      if (var9 == null) {
          ModelData var10 = this.getModelData(var1, var2);
-         if(var10 == null) {
+         if (var10 == null) {
             return null;
          }
 
-         if(!this.nonFlatShading) {
+         if (!this.nonFlatShading) {
             var9 = var10.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50);
          } else {
-            var10.__aq = (short)(this.ambient + 64);
-            var10.__aj = (short)(this.contrast + 768);
-            var10.__h_228();
+            var10.field559 = (short)(this.ambient + 64);
+            var10.field560 = (short)(this.contrast + 768);
+            var10.method216();
             var9 = var10;
          }
 
-         __jr_u.put((DualNode)var9, var7);
+         field642.put((DualNode)var9, var7);
       }
 
-      if(this.nonFlatShading) {
-         var9 = ((ModelData)var9).__o_218();
+      if (this.nonFlatShading) {
+         var9 = ((ModelData)var9).method206();
       }
 
-      if(this.clipType >= 0) {
-         if(var9 instanceof Model) {
+      if (this.clipType >= 0) {
+         if (var9 instanceof Model) {
             var9 = ((Model)var9).contourGround(var3, var4, var5, var6, true, this.clipType);
-         } else if(var9 instanceof ModelData) {
-            var9 = ((ModelData)var9).__u_219(var3, var4, var5, var6, true, this.clipType);
+         } else if (var9 instanceof ModelData) {
+            var9 = ((ModelData)var9).method207(var3, var4, var5, var6, true, this.clipType);
          }
       }
 
@@ -618,16 +609,16 @@ public class ObjectDefinition extends DualNode {
    @Export("getModel")
    public final Model getModel(int var1, int var2, int[][] var3, int var4, int var5, int var6) {
       long var7;
-      if(this.__d == null) {
+      if (this.field645 == null) {
          var7 = (long)(var2 + (this.id << 10));
       } else {
          var7 = (long)(var2 + (var1 << 3) + (this.id << 10));
       }
 
       Model var9 = (Model)ObjectDefinition_cachedModels.get(var7);
-      if(var9 == null) {
+      if (var9 == null) {
          ModelData var10 = this.getModelData(var1, var2);
-         if(var10 == null) {
+         if (var10 == null) {
             return null;
          }
 
@@ -635,7 +626,7 @@ public class ObjectDefinition extends DualNode {
          ObjectDefinition_cachedModels.put(var9, var7);
       }
 
-      if(this.clipType >= 0) {
+      if (this.clipType >= 0) {
          var9 = var9.contourGround(var3, var4, var5, var6, true, this.clipType);
       }
 
@@ -650,16 +641,16 @@ public class ObjectDefinition extends DualNode {
    @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.__d == null) {
+      if (this.field645 == null) {
          var9 = (long)(var2 + (this.id << 10));
       } else {
          var9 = (long)(var2 + (var1 << 3) + (this.id << 10));
       }
 
       Model var11 = (Model)ObjectDefinition_cachedModels.get(var9);
-      if(var11 == null) {
+      if (var11 == null) {
          ModelData var12 = this.getModelData(var1, var2);
-         if(var12 == null) {
+         if (var12 == null) {
             return null;
          }
 
@@ -667,16 +658,16 @@ public class ObjectDefinition extends DualNode {
          ObjectDefinition_cachedModels.put(var11, var9);
       }
 
-      if(var7 == null && this.clipType == -1) {
+      if (var7 == null && this.clipType == -1) {
          return var11;
       } else {
-         if(var7 != null) {
+         if (var7 != null) {
             var11 = var7.animateObject(var11, var8, var2);
          } else {
             var11 = var11.toSharedSequenceModel(true);
          }
 
-         if(this.clipType >= 0) {
+         if (this.clipType >= 0) {
             var11 = var11.contourGround(var3, var4, var5, var6, false, this.clipType);
          }
 
@@ -694,135 +685,136 @@ public class ObjectDefinition extends DualNode {
       ModelData var3 = null;
       boolean var4;
       int var5;
+      int var6;
       int var7;
-      if(this.__d == null) {
-         if(var1 != 10) {
+      boolean var8;
+      if (this.field645 == null) {
+         if (var1 != 10) {
             return null;
          }
 
-         if(this.__x == null) {
+         if (this.field644 == null) {
             return null;
          }
 
          var4 = this.isRotated;
-         if(var1 == 2 && var2 > 3) {
+         if (var1 == 2 && var2 > 3) {
             var4 = !var4;
          }
 
-         var5 = this.__x.length;
+         var5 = this.field644.length;
 
-         for(int var6 = 0; var6 < var5; ++var6) {
-            var7 = this.__x[var6];
-            if(var4) {
-               var7 += 65536;
+         for (var7 = 0; var7 < var5; ++var7) {
+            var6 = this.field644[var7];
+            if (var4) {
+               var6 += 65536;
             }
 
-            var3 = (ModelData)__jr_o.get((long)var7);
-            if(var3 == null) {
-               var3 = ModelData.method2788(__jr_q, var7 & 65535, 0);
-               if(var3 == null) {
+            var3 = (ModelData)field641.get((long)var6);
+            if (var3 == null) {
+               var3 = ModelData.method2788(field640, var6 & 65535, 0);
+               if (var3 == null) {
                   return null;
                }
 
-               if(var4) {
-                  var3.__t_226();
+               if (var4) {
+                  var3.method214();
                }
 
-               __jr_o.put(var3, (long)var7);
+               field641.put(var3, (long)var6);
             }
 
-            if(var5 > 1) {
-               __jr_l[var6] = var3;
+            if (var5 > 1) {
+               field643[var7] = var3;
             }
          }
 
-         if(var5 > 1) {
-            var3 = new ModelData(__jr_l, var5);
+         if (var5 > 1) {
+            var3 = new ModelData(field643, var5);
          }
       } else {
-         int var9 = -1;
+         var7 = -1;
 
-         for(var5 = 0; var5 < this.__d.length; ++var5) {
-            if(this.__d[var5] == var1) {
-               var9 = var5;
+         for (var5 = 0; var5 < this.field645.length; ++var5) {
+            if (this.field645[var5] == var1) {
+               var7 = var5;
                break;
             }
          }
 
-         if(var9 == -1) {
+         if (var7 == -1) {
             return null;
          }
 
-         var5 = this.__x[var9];
-         boolean var10 = this.isRotated ^ var2 > 3;
-         if(var10) {
+         var5 = this.field644[var7];
+         var8 = this.isRotated ^ var2 > 3;
+         if (var8) {
             var5 += 65536;
          }
 
-         var3 = (ModelData)__jr_o.get((long)var5);
-         if(var3 == null) {
-            var3 = ModelData.method2788(__jr_q, var5 & 65535, 0);
-            if(var3 == null) {
+         var3 = (ModelData)field641.get((long)var5);
+         if (var3 == null) {
+            var3 = ModelData.method2788(field640, var5 & 65535, 0);
+            if (var3 == null) {
                return null;
             }
 
-            if(var10) {
-               var3.__t_226();
+            if (var8) {
+               var3.method214();
             }
 
-            __jr_o.put(var3, (long)var5);
+            field641.put(var3, (long)var5);
          }
       }
 
-      if(this.modelSizeX == 128 && this.modelHeight == 128 && this.modelSizeY == 128) {
+      if (this.modelSizeX == 128 && this.modelHeight == 128 && this.modelSizeY == 128) {
          var4 = false;
       } else {
          var4 = true;
       }
 
-      boolean var11;
-      if(this.offsetX == 0 && this.offsetHeight == 0 && this.offsetY == 0) {
-         var11 = false;
+      if (this.offsetX == 0 && this.offsetHeight == 0 && this.offsetY == 0) {
+         var8 = false;
       } else {
-         var11 = true;
+         var8 = true;
       }
 
-      ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, this.recolorFrom == null, null == this.retextureFrom, true);
-      if(var1 == 4 && var2 > 3) {
-         var8.__a_224(256);
-         var8.__z_225(45, 0, -45);
+      ModelData var9 = new ModelData(var3, var2 == 0 && !var4 && !var8, this.recolorFrom == null, null == this.retextureFrom, true);
+      if (var1 == 4 && var2 > 3) {
+         var9.method212(256);
+         var9.method213(45, 0, -45);
       }
 
       var2 &= 3;
-      if(var2 == 1) {
-         var8.__l_221();
-      } else if(var2 == 2) {
-         var8.__x_222();
-      } else if(var2 == 3) {
-         var8.__d_223();
+      if (var2 == 1) {
+         var9.method209();
+      } else if (var2 == 2) {
+         var9.method210();
+      } else if (var2 == 3) {
+         var9.method211();
       }
 
-      if(this.recolorFrom != null) {
-         for(var7 = 0; var7 < this.recolorFrom.length; ++var7) {
-            var8.recolor(this.recolorFrom[var7], this.recolorTo[var7]);
+      if (this.recolorFrom != null) {
+         for (var6 = 0; var6 < this.recolorFrom.length; ++var6) {
+            var9.recolor(this.recolorFrom[var6], this.recolorTo[var6]);
          }
       }
 
-      if(this.retextureFrom != null) {
-         for(var7 = 0; var7 < this.retextureFrom.length; ++var7) {
-            var8.retexture(this.retextureFrom[var7], this.retextureTo[var7]);
+      if (this.retextureFrom != null) {
+         for (var6 = 0; var6 < this.retextureFrom.length; ++var6) {
+            var9.retexture(this.retextureFrom[var6], this.retextureTo[var6]);
          }
       }
 
-      if(var4) {
-         var8.__y_227(this.modelSizeX, this.modelHeight, this.modelSizeY);
+      if (var4) {
+         var9.method215(this.modelSizeX, this.modelHeight, this.modelSizeY);
       }
 
-      if(var11) {
-         var8.__z_225(this.offsetX, this.offsetHeight, this.offsetY);
+      if (var8) {
+         var9.method213(this.offsetX, this.offsetHeight, this.offsetY);
       }
 
-      return var8;
+      return var9;
    }
 
    @ObfuscatedName("a")
@@ -833,20 +825,20 @@ public class ObjectDefinition extends DualNode {
    @Export("transform")
    public final ObjectDefinition transform() {
       int var1 = -1;
-      if(this.transformVarbit != -1) {
-         var1 = WorldMapSection2.getVarbit(this.transformVarbit);
-      } else if(this.transformConfigId != -1) {
-         var1 = Varps.Varps_main[this.transformConfigId];
+      if (this.transformVarbit != -1) {
+         var1 = WorldMapSection0.getVarbit(this.transformVarbit);
+      } else if (this.transformVarp != -1) {
+         var1 = Varps.Varps_main[this.transformVarp];
       }
 
       int var2;
-      if(var1 >= 0 && var1 < this.transforms.length - 1) {
+      if (var1 >= 0 && var1 < this.transforms.length - 1) {
          var2 = this.transforms[var1];
       } else {
          var2 = this.transforms[this.transforms.length - 1];
       }
 
-      return var2 != -1?class50.getObjectDefinition(var2):null;
+      return var2 != -1 ? class50.getObjectDefinition(var2) : null;
    }
 
    @ObfuscatedName("z")
@@ -856,20 +848,20 @@ public class ObjectDefinition extends DualNode {
    )
    @Export("getIntParam")
    public int getIntParam(int var1, int var2) {
-      IterableNodeHashTable var4 = this.params;
-      int var3;
-      if(var4 == null) {
-         var3 = var2;
+      IterableNodeHashTable var3 = this.params;
+      int var4;
+      if (var3 == null) {
+         var4 = var2;
       } else {
-         IntegerNode var5 = (IntegerNode)var4.get((long)var1);
-         if(var5 == null) {
-            var3 = var2;
+         IntegerNode var5 = (IntegerNode)var3.get((long)var1);
+         if (var5 == null) {
+            var4 = var2;
          } else {
-            var3 = var5.integer;
+            var4 = var5.integer;
          }
       }
 
-      return var3;
+      return var4;
    }
 
    @ObfuscatedName("j")
@@ -887,14 +879,14 @@ public class ObjectDefinition extends DualNode {
       signature = "(I)Z",
       garbageValue = "8470625"
    )
-   public boolean __t_424() {
-      if(this.transforms == null) {
-         return this.ambientSoundId != -1 || this.__ax != null;
+   public boolean method233() {
+      if (this.transforms == null) {
+         return this.ambientSoundId != -1 || this.field646 != null;
       } else {
-         for(int var1 = 0; var1 < this.transforms.length; ++var1) {
-            if(this.transforms[var1] != -1) {
+         for (int var1 = 0; var1 < this.transforms.length; ++var1) {
+            if (this.transforms[var1] != -1) {
                ObjectDefinition var2 = class50.getObjectDefinition(this.transforms[var1]);
-               if(var2.ambientSoundId != -1 || var2.__ax != null) {
+               if (var2.ambientSoundId != -1 || var2.field646 != null) {
                   return true;
                }
             }
@@ -910,20 +902,20 @@ public class ObjectDefinition extends DualNode {
       garbageValue = "-1284680749"
    )
    @Export("getNpcDefinition")
-   public static NpcDefinition getNpcDefinition(int var0) {
-      NpcDefinition var1 = (NpcDefinition)NpcDefinition.NpcDefinition_cached.get((long)var0);
-      if(var1 != null) {
+   public static NPCDefinition getNpcDefinition(int var0) {
+      NPCDefinition var1 = (NPCDefinition)NPCDefinition.NpcDefinition_cached.get((long)var0);
+      if (var1 != null) {
          return var1;
       } else {
-         byte[] var2 = NpcDefinition.NpcDefinition_indexCache.takeRecord(9, var0);
-         var1 = new NpcDefinition();
+         byte[] var2 = NPCDefinition.NpcDefinition_archive.takeFile(9, var0);
+         var1 = new NPCDefinition();
          var1.id = var0;
-         if(var2 != null) {
-            var1.read(new Buffer(var2));
+         if (var2 != null) {
+            var1.decode(new Buffer(var2));
          }
 
-         var1.init();
-         NpcDefinition.NpcDefinition_cached.put(var1, (long)var0);
+         var1.postDecode();
+         NPCDefinition.NpcDefinition_cached.put(var1, (long)var0);
          return var1;
       }
    }
@@ -936,4 +928,13 @@ public class ObjectDefinition extends DualNode {
    public static void method5041() {
       ItemDefinition.Sprite_cached.clear();
    }
+
+   static {
+      ObjectDefinition_isLowDetail = false;
+      ObjectDefinition_cached = new EvictingDualNodeHashTable(4096);
+      field641 = new EvictingDualNodeHashTable(500);
+      field642 = new EvictingDualNodeHashTable(30);
+      ObjectDefinition_cachedModels = new EvictingDualNodeHashTable(30);
+      field643 = new ModelData[4];
+   }
 }
diff --git a/runescape-client/src/main/java/ObjectSound.java b/runescape-client/src/main/java/ObjectSound.java
index 773f32dc91..f9a0dde47d 100644
--- a/runescape-client/src/main/java/ObjectSound.java
+++ b/runescape-client/src/main/java/ObjectSound.java
@@ -17,38 +17,38 @@ public final class ObjectSound extends Node {
    @ObfuscatedSignature(
       signature = "Lit;"
    )
-   @Export("indexCache2")
-   static IndexCache indexCache2;
+   @Export("archive2")
+   static Archive archive2;
    @ObfuscatedName("f")
    @ObfuscatedGetter(
       intValue = 647270745
    )
-   int __f;
+   int field647;
    @ObfuscatedName("q")
    @ObfuscatedGetter(
       intValue = -800464493
    )
-   int __q;
+   int field648;
    @ObfuscatedName("w")
    @ObfuscatedGetter(
       intValue = -85911525
    )
-   int __w;
+   int field649;
    @ObfuscatedName("o")
    @ObfuscatedGetter(
       intValue = -211591209
    )
-   int __o;
+   int field650;
    @ObfuscatedName("u")
    @ObfuscatedGetter(
       intValue = 512258949
    )
-   int __u;
+   int field651;
    @ObfuscatedName("g")
    @ObfuscatedGetter(
       intValue = 1344558633
    )
-   int __g;
+   int field652;
    @ObfuscatedName("l")
    @ObfuscatedGetter(
       intValue = -731474443
@@ -65,12 +65,12 @@ public final class ObjectSound extends Node {
    @ObfuscatedGetter(
       intValue = -1608400407
    )
-   int __x;
+   int field653;
    @ObfuscatedName("d")
    @ObfuscatedGetter(
       intValue = 1748890449
    )
-   int __d;
+   int field654;
    @ObfuscatedName("k")
    @Export("soundEffectIds")
    int[] soundEffectIds;
@@ -78,7 +78,7 @@ public final class ObjectSound extends Node {
    @ObfuscatedGetter(
       intValue = -1041508847
    )
-   int __n;
+   int field655;
    @ObfuscatedName("i")
    @ObfuscatedSignature(
       signature = "Lds;"
@@ -92,10 +92,6 @@ public final class ObjectSound extends Node {
    @Export("obj")
    ObjectDefinition obj;
 
-   static {
-      objectSounds = new NodeDeque();
-   }
-
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "(I)V",
@@ -105,24 +101,28 @@ public final class ObjectSound extends Node {
    void set() {
       int var1 = this.soundEffectId;
       ObjectDefinition var2 = this.obj.transform();
-      if(var2 != null) {
+      if (var2 != null) {
          this.soundEffectId = var2.ambientSoundId;
-         this.__g = var2.int4 * 128;
-         this.__x = var2.int5;
-         this.__d = var2.int6;
-         this.soundEffectIds = var2.__ax;
+         this.field652 = var2.int4 * 128;
+         this.field653 = var2.int5;
+         this.field654 = var2.int6;
+         this.soundEffectIds = var2.field646;
       } else {
          this.soundEffectId = -1;
-         this.__g = 0;
-         this.__x = 0;
-         this.__d = 0;
+         this.field652 = 0;
+         this.field653 = 0;
+         this.field654 = 0;
          this.soundEffectIds = null;
       }
 
-      if(var1 != this.soundEffectId && this.stream1 != null) {
+      if (var1 != this.soundEffectId && this.stream1 != null) {
          TaskHandler.pcmStreamMixer.removeSubStream(this.stream1);
          this.stream1 = null;
       }
 
    }
+
+   static {
+      objectSounds = new NodeDeque();
+   }
 }
diff --git a/runescape-client/src/main/java/Occluder.java b/runescape-client/src/main/java/Occluder.java
index ba1f42329d..ea90eddf8e 100644
--- a/runescape-client/src/main/java/Occluder.java
+++ b/runescape-client/src/main/java/Occluder.java
@@ -77,52 +77,53 @@ public final class Occluder {
    @ObfuscatedGetter(
       intValue = 826041747
    )
-   int __k;
+   int field656;
    @ObfuscatedName("n")
    @ObfuscatedGetter(
       intValue = -407777817
    )
-   int __n;
+   int field657;
    @ObfuscatedName("i")
    @ObfuscatedGetter(
       intValue = 1324959981
    )
-   int __i;
+   int field658;
    @ObfuscatedName("a")
    @ObfuscatedGetter(
       intValue = -1527021367
    )
-   int __a;
+   int field659;
    @ObfuscatedName("z")
    @ObfuscatedGetter(
       intValue = -570391007
    )
-   int __z;
+   int field660;
    @ObfuscatedName("j")
    @ObfuscatedGetter(
       intValue = -373839103
    )
-   int __j;
+   int field661;
    @ObfuscatedName("s")
    @ObfuscatedGetter(
       intValue = -1334433969
    )
-   int __s;
+   int field662;
 
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "(IB)Lia;",
       garbageValue = "16"
    )
-   public static VarbitDefinition method3255(int var0) {
+   @Export("getVarbitDefinition")
+   public static VarbitDefinition getVarbitDefinition(int var0) {
       VarbitDefinition var1 = (VarbitDefinition)VarbitDefinition.VarbitDefinition_cached.get((long)var0);
-      if(var1 != null) {
+      if (var1 != null) {
          return var1;
       } else {
-         byte[] var2 = VarbitDefinition.VarbitDefinition_indexCache.takeRecord(14, var0);
+         byte[] var2 = VarbitDefinition.VarbitDefinition_archive.takeFile(14, var0);
          var1 = new VarbitDefinition();
-         if(var2 != null) {
-            var1.read(new Buffer(var2));
+         if (var2 != null) {
+            var1.decode(new Buffer(var2));
          }
 
          VarbitDefinition.VarbitDefinition_cached.put(var1, (long)var0);
@@ -136,30 +137,30 @@ public final class Occluder {
       garbageValue = "-1164060583"
    )
    @Export("newScript")
-   static Script newScript(byte[] var0) {
+   static Script newScript(byte[] bytes) {
       Script var1 = new Script();
-      Buffer var2 = new Buffer(var0);
+      Buffer var2 = new Buffer(bytes);
       var2.index = var2.array.length - 2;
-      int var3 = var2.__ag_302();
+      int var3 = var2.readUnsignedShort();
       int var4 = var2.array.length - 2 - var3 - 12;
       var2.index = var4;
       int var5 = var2.readInt();
-      var1.localIntCount = var2.__ag_302();
-      var1.localStringCount = var2.__ag_302();
-      var1.intArgumentCount = var2.__ag_302();
-      var1.stringArgumentCount = var2.__ag_302();
+      var1.localIntCount = var2.readUnsignedShort();
+      var1.localStringCount = var2.readUnsignedShort();
+      var1.intArgumentCount = var2.readUnsignedShort();
+      var1.stringArgumentCount = var2.readUnsignedShort();
       int var6 = var2.readUnsignedByte();
       int var7;
       int var8;
-      if(var6 > 0) {
-         var1.switches = var1.__o_164(var6);
+      if (var6 > 0) {
+         var1.switches = var1.method302(var6);
 
-         for(var7 = 0; var7 < var6; ++var7) {
-            var8 = var2.__ag_302();
-            IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0?World.method1759(var8):1);
+         for (var7 = 0; var7 < var6; ++var7) {
+            var8 = var2.readUnsignedShort();
+            IterableNodeHashTable var9 = new IterableNodeHashTable(var8 > 0 ? World.method1759(var8) : 1);
             var1.switches[var7] = var9;
 
-            while(var8-- > 0) {
+            while (var8-- > 0) {
                int var10 = var2.readInt();
                int var11 = var2.readInt();
                var9.put(new IntegerNode(var11), (long)var10);
@@ -173,11 +174,11 @@ public final class Occluder {
       var1.intOperands = new int[var5];
       var1.stringOperands = new String[var5];
 
-      for(var7 = 0; var2.index < var4; var1.opcodes[var7++] = var8) {
-         var8 = var2.__ag_302();
-         if(var8 == 3) {
+      for (var7 = 0; var2.index < var4; var1.opcodes[var7++] = var8) {
+         var8 = var2.readUnsignedShort();
+         if (var8 == 3) {
             var1.stringOperands[var7] = var2.readStringCp1252NullTerminated();
-         } else if(var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) {
+         } else if (var8 < 100 && var8 != 21 && var8 != 38 && var8 != 39) {
             var1.intOperands[var7] = var2.readInt();
          } else {
             var1.intOperands[var7] = var2.readUnsignedByte();
diff --git a/runescape-client/src/main/java/PacketBuffer.java b/runescape-client/src/main/java/PacketBuffer.java
index 308a9d2a77..2c70890ad6 100644
--- a/runescape-client/src/main/java/PacketBuffer.java
+++ b/runescape-client/src/main/java/PacketBuffer.java
@@ -14,13 +14,13 @@ public final class PacketBuffer extends Buffer {
    @ObfuscatedGetter(
       intValue = 701739159
    )
-   public static int __hx_z;
+   public static int field667;
    @ObfuscatedName("e")
    @ObfuscatedSignature(
       signature = "Lhn;"
    )
-   @Export("isaacCipher0")
-   IsaacCipher isaacCipher0;
+   @Export("isaacCipher")
+   IsaacCipher isaacCipher;
    @ObfuscatedName("d")
    @ObfuscatedGetter(
       intValue = -1048718919
@@ -28,10 +28,6 @@ public final class PacketBuffer extends Buffer {
    @Export("bitIndex")
    int bitIndex;
 
-   static {
-      PacketBuffer_masks = 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};
-   }
-
    public PacketBuffer(int var1) {
       super(var1);
    }
@@ -42,8 +38,8 @@ public final class PacketBuffer extends Buffer {
       garbageValue = "-763699765"
    )
    @Export("newIsaacCipher")
-   public void newIsaacCipher(int[] var1) {
-      this.isaacCipher0 = new IsaacCipher(var1);
+   public void newIsaacCipher(int[] array) {
+      this.isaacCipher = new IsaacCipher(array);
    }
 
    @ObfuscatedName("ih")
@@ -52,8 +48,8 @@ public final class PacketBuffer extends Buffer {
       garbageValue = "0"
    )
    @Export("setIsaacCipher")
-   public void setIsaacCipher(IsaacCipher var1) {
-      this.isaacCipher0 = var1;
+   public void setIsaacCipher(IsaacCipher isaacCipher) {
+      this.isaacCipher = isaacCipher;
    }
 
    @ObfuscatedName("im")
@@ -63,7 +59,7 @@ public final class PacketBuffer extends Buffer {
    )
    @Export("writeByteIsaac")
    public void writeByteIsaac(int var1) {
-      super.array[++super.index - 1] = (byte)(var1 + this.isaacCipher0.__m_336());
+      super.array[++super.index - 1] = (byte)(var1 + this.isaacCipher.nextInt());
    }
 
    @ObfuscatedName("ii")
@@ -73,7 +69,7 @@ public final class PacketBuffer extends Buffer {
    )
    @Export("readByteIsaac")
    public int readByteIsaac() {
-      return super.array[++super.index - 1] - this.isaacCipher0.__m_336() & 255;
+      return super.array[++super.index - 1] - this.isaacCipher.nextInt() & 255;
    }
 
    @ObfuscatedName("ig")
@@ -81,8 +77,8 @@ public final class PacketBuffer extends Buffer {
       signature = "(B)Z",
       garbageValue = "101"
    )
-   public boolean __ig_334() {
-      int var1 = super.array[super.index] - this.isaacCipher0.__f_337() & 255;
+   public boolean method236() {
+      int var1 = super.array[super.index] - this.isaacCipher.method137() & 255;
       return var1 >= 128;
    }
 
@@ -93,8 +89,8 @@ public final class PacketBuffer extends Buffer {
    )
    @Export("readSmartByteShortIsaac")
    public int readSmartByteShortIsaac() {
-      int var1 = super.array[++super.index - 1] - this.isaacCipher0.__m_336() & 255;
-      return var1 < 128?var1:(var1 - 128 << 8) + (super.array[++super.index - 1] - this.isaacCipher0.__m_336() & 255);
+      int var1 = super.array[++super.index - 1] - this.isaacCipher.nextInt() & 255;
+      return var1 < 128 ? var1 : (var1 - 128 << 8) + (super.array[++super.index - 1] - this.isaacCipher.nextInt() & 255);
    }
 
    @ObfuscatedName("jb")
@@ -102,9 +98,9 @@ public final class PacketBuffer extends Buffer {
       signature = "([BIII)V",
       garbageValue = "-1168019189"
    )
-   public void __jb_335(byte[] var1, int var2, int var3) {
-      for(int var4 = 0; var4 < var3; ++var4) {
-         var1[var4 + var2] = (byte)(super.array[++super.index - 1] - this.isaacCipher0.__m_336());
+   public void method237(byte[] var1, int var2, int var3) {
+      for (int var4 = 0; var4 < var3; ++var4) {
+         var1[var4 + var2] = (byte)(super.array[++super.index - 1] - this.isaacCipher.nextInt());
       }
 
    }
@@ -125,20 +121,20 @@ public final class PacketBuffer extends Buffer {
       garbageValue = "1710439720"
    )
    @Export("readBits")
-   public int readBits(int var1) {
+   public int readBits(int bits) {
       int var2 = this.bitIndex >> 3;
       int var3 = 8 - (this.bitIndex & 7);
       int var4 = 0;
 
-      for(this.bitIndex += var1; var1 > var3; var3 = 8) {
-         var4 += (super.array[var2++] & PacketBuffer_masks[var3]) << var1 - var3;
-         var1 -= var3;
+      for (this.bitIndex += bits; bits > var3; var3 = 8) {
+         var4 += (super.array[var2++] & PacketBuffer_masks[var3]) << bits - var3;
+         bits -= var3;
       }
 
-      if(var3 == var1) {
+      if (var3 == bits) {
          var4 += super.array[var2] & PacketBuffer_masks[var3];
       } else {
-         var4 += super.array[var2] >> var3 - var1 & PacketBuffer_masks[var1];
+         var4 += super.array[var2] >> var3 - bits & PacketBuffer_masks[bits];
       }
 
       return var4;
@@ -160,8 +156,8 @@ public final class PacketBuffer extends Buffer {
       garbageValue = "-141269845"
    )
    @Export("bitsRemaining")
-   public int bitsRemaining(int var1) {
-      return var1 * 8 - this.bitIndex;
+   public int bitsRemaining(int index) {
+      return index * 8 - this.bitIndex;
    }
 
    @ObfuscatedName("m")
@@ -179,34 +175,33 @@ public final class PacketBuffer extends Buffer {
       garbageValue = "-1562700981"
    )
    @Export("requestNetFile")
-   static void requestNetFile(IndexCache var0, int var1, int var2, int var3, byte var4, boolean var5) {
+   static void requestNetFile(Archive archive, int var1, int var2, int var3, byte var4, boolean priority) {
       long var6 = (long)((var1 << 16) + var2);
       NetFileRequest var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.get(var6);
-      if(var8 == null) {
+      if (var8 == null) {
          var8 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var6);
-         if(var8 == null) {
+         if (var8 == null) {
             var8 = (NetFileRequest)NetCache.NetCache_pendingWrites.get(var6);
-            if(var8 != null) {
-               if(var5) {
+            if (var8 != null) {
+               if (priority) {
                   var8.removeDual();
                   NetCache.NetCache_pendingPriorityWrites.put(var8, var6);
                   --NetCache.NetCache_pendingWritesCount;
                   ++NetCache.NetCache_pendingPriorityWritesCount;
                }
-
             } else {
-               if(!var5) {
+               if (!priority) {
                   var8 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var6);
-                  if(var8 != null) {
+                  if (var8 != null) {
                      return;
                   }
                }
 
                var8 = new NetFileRequest();
-               var8.indexCache = var0;
+               var8.archive = archive;
                var8.crc = var3;
                var8.padding = var4;
-               if(var5) {
+               if (priority) {
                   NetCache.NetCache_pendingPriorityWrites.put(var8, var6);
                   ++NetCache.NetCache_pendingPriorityWritesCount;
                } else {
@@ -214,10 +209,10 @@ public final class PacketBuffer extends Buffer {
                   NetCache.NetCache_pendingWrites.put(var8, var6);
                   ++NetCache.NetCache_pendingWritesCount;
                }
-
             }
          }
       }
+
    }
 
    @ObfuscatedName("f")
@@ -228,4 +223,8 @@ public final class PacketBuffer extends Buffer {
    public static int method4081(int var0, int var1) {
       return (var0 + 40000 << 8) + var1;
    }
+
+   static {
+      PacketBuffer_masks = 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};
+   }
 }
diff --git a/runescape-client/src/main/java/PacketBufferNode.java b/runescape-client/src/main/java/PacketBufferNode.java
index 4db93c1b8c..551145d4b0 100644
--- a/runescape-client/src/main/java/PacketBufferNode.java
+++ b/runescape-client/src/main/java/PacketBufferNode.java
@@ -17,17 +17,17 @@ public class PacketBufferNode extends Node {
    @ObfuscatedGetter(
       intValue = -1583654139
    )
-   public static int __gg_u;
+   public static int field668;
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "Lgs;"
    )
-   public ClientPacket __m;
+   public ClientPacket field669;
    @ObfuscatedName("f")
    @ObfuscatedGetter(
       intValue = 1433542775
    )
-   public int __f;
+   public int field670;
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Lhx;"
@@ -38,22 +38,18 @@ public class PacketBufferNode extends Node {
    @ObfuscatedGetter(
       intValue = -2051819203
    )
-   public int __w;
-
-   static {
-      packetBufferNodes = new PacketBufferNode[300];
-      __gg_u = 0;
-   }
+   public int field671;
 
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "(I)V",
       garbageValue = "-1987685511"
    )
-   public void __f_292() {
-      if(__gg_u < packetBufferNodes.length) {
-         packetBufferNodes[++__gg_u - 1] = this;
+   public void method238() {
+      if (field668 < packetBufferNodes.length) {
+         packetBufferNodes[++field668 - 1] = this;
       }
+
    }
 
    @ObfuscatedName("kq")
@@ -61,7 +57,13 @@ public class PacketBufferNode extends Node {
       signature = "(Lho;I)Z",
       garbageValue = "-739353556"
    )
-   static boolean method3673(Widget var0) {
-      return var0.isHidden;
+   @Export("isComponentHidden")
+   static boolean isComponentHidden(Widget component) {
+      return component.isHidden;
+   }
+
+   static {
+      packetBufferNodes = new PacketBufferNode[300];
+      field668 = 0;
    }
 }
diff --git a/runescape-client/src/main/java/PacketWriter.java b/runescape-client/src/main/java/PacketWriter.java
index d01f2bce26..55e9f56060 100644
--- a/runescape-client/src/main/java/PacketWriter.java
+++ b/runescape-client/src/main/java/PacketWriter.java
@@ -30,7 +30,7 @@ public class PacketWriter {
    @ObfuscatedGetter(
       intValue = -1028046199
    )
-   int __q;
+   int field672;
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "Lgr;"
@@ -62,43 +62,43 @@ public class PacketWriter {
    @Export("serverPacket0Length")
    int serverPacket0Length;
    @ObfuscatedName("e")
-   boolean __e;
+   boolean field673;
    @ObfuscatedName("x")
    @ObfuscatedGetter(
       intValue = 120570975
    )
-   int __x;
+   int field674;
    @ObfuscatedName("d")
    @ObfuscatedGetter(
       intValue = 1672229609
    )
-   int __d;
+   int field675;
    @ObfuscatedName("k")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   ServerPacket __k;
+   ServerPacket field676;
    @ObfuscatedName("n")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   ServerPacket __n;
+   ServerPacket field677;
    @ObfuscatedName("i")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   ServerPacket __i;
+   ServerPacket field678;
 
    PacketWriter() {
       this.packetBufferNodes = new IterableNodeDeque();
-      this.__q = 0;
+      this.field672 = 0;
       this.buffer = new Buffer(5000);
       this.packetBuffer = new PacketBuffer(40000);
       this.serverPacket0 = null;
       this.serverPacket0Length = 0;
-      this.__e = true;
-      this.__x = 0;
-      this.__d = 0;
+      this.field673 = true;
+      this.field674 = 0;
+      this.field675 = 0;
    }
 
    @ObfuscatedName("m")
@@ -106,9 +106,9 @@ public class PacketWriter {
       signature = "(I)V",
       garbageValue = "1561094077"
    )
-   final void __m_165() {
+   final void method239() {
       this.packetBufferNodes.clear();
-      this.__q = 0;
+      this.field672 = 0;
    }
 
    @ObfuscatedName("f")
@@ -116,23 +116,23 @@ public class PacketWriter {
       signature = "(I)V",
       garbageValue = "-1839929685"
    )
-   final void __f_166() throws IOException {
-      if(this.socket0 != null && this.__q > 0) {
+   final void method240() throws IOException {
+      if (this.socket0 != null && this.field672 > 0) {
          this.buffer.index = 0;
 
-         while(true) {
+         while (true) {
             PacketBufferNode var1 = (PacketBufferNode)this.packetBufferNodes.last();
-            if(var1 == null || var1.__w > this.buffer.array.length - this.buffer.index) {
+            if (var1 == null || var1.field671 > this.buffer.array.length - this.buffer.index) {
                this.socket0.write(this.buffer.array, 0, this.buffer.index);
-               this.__d = 0;
+               this.field675 = 0;
                break;
             }
 
-            this.buffer.__s_297(var1.packetBuffer.array, 0, var1.__w);
-            this.__q -= var1.__w;
+            this.buffer.writeBytes(var1.packetBuffer.array, 0, var1.field671);
+            this.field672 -= var1.field671;
             var1.remove();
-            var1.packetBuffer.__f_295();
-            var1.__f_292();
+            var1.packetBuffer.method36();
+            var1.method238();
          }
       }
 
@@ -143,11 +143,11 @@ public class PacketWriter {
       signature = "(Lgg;I)V",
       garbageValue = "599379248"
    )
-   public final void __q_167(PacketBufferNode var1) {
+   public final void method241(PacketBufferNode var1) {
       this.packetBufferNodes.addFirst(var1);
-      var1.__w = var1.packetBuffer.index;
+      var1.field671 = var1.packetBuffer.index;
       var1.packetBuffer.index = 0;
-      this.__q += var1.__w;
+      this.field672 += var1.field671;
    }
 
    @ObfuscatedName("w")
@@ -156,8 +156,8 @@ public class PacketWriter {
       garbageValue = "111"
    )
    @Export("setSocket")
-   void setSocket(AbstractSocket var1) {
-      this.socket0 = var1;
+   void setSocket(AbstractSocket socket) {
+      this.socket0 = socket;
    }
 
    @ObfuscatedName("o")
@@ -167,7 +167,7 @@ public class PacketWriter {
    )
    @Export("close")
    void close() {
-      if(this.socket0 != null) {
+      if (this.socket0 != null) {
          this.socket0.close();
          this.socket0 = null;
       }
diff --git a/runescape-client/src/main/java/ParamDefinition.java b/runescape-client/src/main/java/ParamDefinition.java
new file mode 100644
index 0000000000..dc7c2c46d0
--- /dev/null
+++ b/runescape-client/src/main/java/ParamDefinition.java
@@ -0,0 +1,398 @@
+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("jb")
+@Implements("ParamDefinition")
+public class ParamDefinition extends DualNode {
+   @ObfuscatedName("m")
+   @ObfuscatedSignature(
+      signature = "Lir;"
+   )
+   @Export("ParamDefinition_archive")
+   public static AbstractArchive ParamDefinition_archive;
+   @ObfuscatedName("f")
+   @ObfuscatedSignature(
+      signature = "Ler;"
+   )
+   @Export("ParamDefinition_cached")
+   static EvictingDualNodeHashTable ParamDefinition_cached;
+   @ObfuscatedName("q")
+   @Export("type")
+   char type;
+   @ObfuscatedName("w")
+   @ObfuscatedGetter(
+      intValue = 1133042753
+   )
+   @Export("defaultInt")
+   public int defaultInt;
+   @ObfuscatedName("o")
+   @Export("defaultStr")
+   public String defaultStr;
+   @ObfuscatedName("u")
+   @Export("autoDisable")
+   boolean autoDisable;
+
+   ParamDefinition() {
+      this.autoDisable = true;
+   }
+
+   @ObfuscatedName("f")
+   @ObfuscatedSignature(
+      signature = "(B)V",
+      garbageValue = "121"
+   )
+   @Export("postDecode")
+   void postDecode() {
+   }
+
+   @ObfuscatedName("q")
+   @ObfuscatedSignature(
+      signature = "(Lgr;I)V",
+      garbageValue = "-975533635"
+   )
+   @Export("decode")
+   void decode(Buffer var1) {
+      while (true) {
+         int var2 = var1.readUnsignedByte();
+         if (var2 == 0) {
+            return;
+         }
+
+         this.decodeNext(var1, var2);
+      }
+   }
+
+   @ObfuscatedName("w")
+   @ObfuscatedSignature(
+      signature = "(Lgr;II)V",
+      garbageValue = "1664350313"
+   )
+   @Export("decodeNext")
+   void decodeNext(Buffer var1, int var2) {
+      if (var2 == 1) {
+         this.type = class14.method171(var1.readByte());
+      } else if (var2 == 2) {
+         this.defaultInt = var1.readInt();
+      } else if (var2 == 4) {
+         this.autoDisable = false;
+      } else if (var2 == 5) {
+         this.defaultStr = var1.readStringCp1252NullTerminated();
+      }
+
+   }
+
+   @ObfuscatedName("o")
+   @ObfuscatedSignature(
+      signature = "(I)Z",
+      garbageValue = "-1897943299"
+   )
+   @Export("isString")
+   public boolean isString() {
+      return this.type == 's';
+   }
+
+   @ObfuscatedName("hs")
+   @ObfuscatedSignature(
+      signature = "(IIIIIIII)V",
+      garbageValue = "-904254947"
+   )
+   @Export("addPendingSpawnToScene")
+   static final void addPendingSpawnToScene(int plane, int objectType, int x, int y, int id, int orientation, int var6) {
+      if (x >= 1 && y >= 1 && x <= 102 && y <= 102) {
+         if (Client.isLowDetail && plane != SoundSystem.plane) {
+            return;
+         }
+
+         long var7 = 0L;
+         boolean var9 = true;
+         boolean var10 = false;
+         boolean var11 = false;
+         if (objectType == 0) {
+            var7 = class65.scene.getBoundaryObjectTag(plane, x, y);
+         }
+
+         if (objectType == 1) {
+            var7 = class65.scene.getWallDecorationTag(plane, x, y);
+         }
+
+         if (objectType == 2) {
+            var7 = class65.scene.getGameObjectTag(plane, x, y);
+         }
+
+         if (objectType == 3) {
+            var7 = class65.scene.getFloorDecorationTag(plane, x, y);
+         }
+
+         int var12;
+         if (0L != var7) {
+            var12 = class65.scene.getObjectFlags(plane, x, y, var7);
+            int var13 = HitSplatDefinition.method4972(var7);
+            int var14 = var12 & 31;
+            int var15 = var12 >> 6 & 3;
+            ObjectDefinition var16;
+            if (objectType == 0) {
+               class65.scene.removeBoundaryObject(plane, x, y);
+               var16 = class50.getObjectDefinition(var13);
+               if (var16.interactType != 0) {
+                  Client.collisionMaps[plane].method95(x, y, var14, var15, var16.boolean1);
+               }
+            }
+
+            if (objectType == 1) {
+               class65.scene.removeWallDecoration(plane, x, y);
+            }
+
+            if (objectType == 2) {
+               class65.scene.method288(plane, x, y);
+               var16 = class50.getObjectDefinition(var13);
+               if (x + var16.sizeX > 103 || y + var16.sizeX > 103 || x + var16.sizeY > 103 || y + var16.sizeY > 103) {
+                  return;
+               }
+
+               if (var16.interactType != 0) {
+                  Client.collisionMaps[plane].method96(x, y, var16.sizeX, var16.sizeY, var15, var16.boolean1);
+               }
+            }
+
+            if (objectType == 3) {
+               class65.scene.removeFloorDecoration(plane, x, y);
+               var16 = class50.getObjectDefinition(var13);
+               if (var16.interactType == 1) {
+                  Client.collisionMaps[plane].method98(x, y);
+               }
+            }
+         }
+
+         if (id >= 0) {
+            var12 = plane;
+            if (plane < 3 && (Tiles.Tiles_renderFlags[1][x][y] & 2) == 2) {
+               var12 = plane + 1;
+            }
+
+            Scene var36 = class65.scene;
+            CollisionMap var37 = Client.collisionMaps[plane];
+            ObjectDefinition var38 = class50.getObjectDefinition(id);
+            int var17;
+            int var39;
+            if (orientation != 1 && orientation != 3) {
+               var17 = var38.sizeX;
+               var39 = var38.sizeY;
+            } else {
+               var17 = var38.sizeY;
+               var39 = var38.sizeX;
+            }
+
+            int var18;
+            int var19;
+            if (var17 + x <= 104) {
+               var18 = (var17 >> 1) + x;
+               var19 = x + (var17 + 1 >> 1);
+            } else {
+               var18 = x;
+               var19 = x + 1;
+            }
+
+            int var20;
+            int var21;
+            if (y + var39 <= 104) {
+               var20 = y + (var39 >> 1);
+               var21 = y + (var39 + 1 >> 1);
+            } else {
+               var20 = y;
+               var21 = y + 1;
+            }
+
+            int[][] var22 = Tiles.Tiles_heights[var12];
+            int var23 = var22[var18][var21] + var22[var19][var20] + var22[var18][var20] + var22[var19][var21] >> 2;
+            int var24 = (x << 7) + (var17 << 6);
+            int var25 = (y << 7) + (var39 << 6);
+            long var26 = FontName.calculateTag(x, y, 2, var38.int1 == 0, id);
+            int var28 = (orientation << 6) + var6;
+            if (var38.int3 == 1) {
+               var28 += 256;
+            }
+
+            Object var29;
+            if (var6 == 22) {
+               if (var38.animationId == -1 && var38.transforms == null) {
+                  var29 = var38.getModel(22, orientation, var22, var24, var23, var25);
+               } else {
+                  var29 = new DynamicObject(id, 22, orientation, var12, x, y, var38.animationId, true, (Entity)null);
+               }
+
+               var36.newFloorDecoration(plane, x, y, var23, (Entity)var29, var26, var28);
+               if (var38.interactType == 1) {
+                  var37.method93(x, y);
+               }
+            } else if (var6 != 10 && var6 != 11) {
+               if (var6 >= 12) {
+                  if (var38.animationId == -1 && var38.transforms == null) {
+                     var29 = var38.getModel(var6, orientation, var22, var24, var23, var25);
+                  } else {
+                     var29 = new DynamicObject(id, var6, orientation, var12, x, y, var38.animationId, true, (Entity)null);
+                  }
+
+                  var36.method284(plane, x, y, var23, 1, 1, (Entity)var29, 0, var26, var28);
+                  if (var38.interactType != 0) {
+                     var37.method91(x, y, var17, var39, var38.boolean1);
+                  }
+               } else if (var6 == 0) {
+                  if (var38.animationId == -1 && var38.transforms == null) {
+                     var29 = var38.getModel(0, orientation, var22, var24, var23, var25);
+                  } else {
+                     var29 = new DynamicObject(id, 0, orientation, var12, x, y, var38.animationId, true, (Entity)null);
+                  }
+
+                  var36.newBoundaryObject(plane, x, y, var23, (Entity)var29, (Entity)null, Tiles.field911[orientation], 0, var26, var28);
+                  if (var38.interactType != 0) {
+                     var37.method90(x, y, var6, orientation, var38.boolean1);
+                  }
+               } else if (var6 == 1) {
+                  if (var38.animationId == -1 && var38.transforms == null) {
+                     var29 = var38.getModel(1, orientation, var22, var24, var23, var25);
+                  } else {
+                     var29 = new DynamicObject(id, 1, orientation, var12, x, y, var38.animationId, true, (Entity)null);
+                  }
+
+                  var36.newBoundaryObject(plane, x, y, var23, (Entity)var29, (Entity)null, Tiles.field912[orientation], 0, var26, var28);
+                  if (var38.interactType != 0) {
+                     var37.method90(x, y, var6, orientation, var38.boolean1);
+                  }
+               } else {
+                  int var30;
+                  Object var31;
+                  if (var6 == 2) {
+                     var30 = orientation + 1 & 3;
+                     Object var32;
+                     if (var38.animationId == -1 && var38.transforms == null) {
+                        var31 = var38.getModel(2, orientation + 4, var22, var24, var23, var25);
+                        var32 = var38.getModel(2, var30, var22, var24, var23, var25);
+                     } else {
+                        var31 = new DynamicObject(id, 2, orientation + 4, var12, x, y, var38.animationId, true, (Entity)null);
+                        var32 = new DynamicObject(id, 2, var30, var12, x, y, var38.animationId, true, (Entity)null);
+                     }
+
+                     var36.newBoundaryObject(plane, x, y, var23, (Entity)var31, (Entity)var32, Tiles.field911[orientation], Tiles.field911[var30], var26, var28);
+                     if (var38.interactType != 0) {
+                        var37.method90(x, y, var6, orientation, var38.boolean1);
+                     }
+                  } else if (var6 == 3) {
+                     if (var38.animationId == -1 && var38.transforms == null) {
+                        var29 = var38.getModel(3, orientation, var22, var24, var23, var25);
+                     } else {
+                        var29 = new DynamicObject(id, 3, orientation, var12, x, y, var38.animationId, true, (Entity)null);
+                     }
+
+                     var36.newBoundaryObject(plane, x, y, var23, (Entity)var29, (Entity)null, Tiles.field912[orientation], 0, var26, var28);
+                     if (var38.interactType != 0) {
+                        var37.method90(x, y, var6, orientation, var38.boolean1);
+                     }
+                  } else if (var6 == 9) {
+                     if (var38.animationId == -1 && var38.transforms == null) {
+                        var29 = var38.getModel(var6, orientation, var22, var24, var23, var25);
+                     } else {
+                        var29 = new DynamicObject(id, var6, orientation, var12, x, y, var38.animationId, true, (Entity)null);
+                     }
+
+                     var36.method284(plane, x, y, var23, 1, 1, (Entity)var29, 0, var26, var28);
+                     if (var38.interactType != 0) {
+                        var37.method91(x, y, var17, var39, var38.boolean1);
+                     }
+                  } else if (var6 == 4) {
+                     if (var38.animationId == -1 && var38.transforms == null) {
+                        var29 = var38.getModel(4, orientation, var22, var24, var23, var25);
+                     } else {
+                        var29 = new DynamicObject(id, 4, orientation, var12, x, y, var38.animationId, true, (Entity)null);
+                     }
+
+                     var36.newWallDecoration(plane, x, y, var23, (Entity)var29, (Entity)null, Tiles.field911[orientation], 0, 0, 0, var26, var28);
+                  } else {
+                     long var40;
+                     if (var6 == 5) {
+                        var30 = 16;
+                        var40 = var36.getBoundaryObjectTag(plane, x, y);
+                        if (var40 != 0L) {
+                           var30 = class50.getObjectDefinition(HitSplatDefinition.method4972(var40)).int2;
+                        }
+
+                        if (var38.animationId == -1 && var38.transforms == null) {
+                           var31 = var38.getModel(4, orientation, var22, var24, var23, var25);
+                        } else {
+                           var31 = new DynamicObject(id, 4, orientation, var12, x, y, var38.animationId, true, (Entity)null);
+                        }
+
+                        var36.newWallDecoration(plane, x, y, var23, (Entity)var31, (Entity)null, Tiles.field911[orientation], 0, var30 * Tiles.field913[orientation], var30 * Tiles.field914[orientation], var26, var28);
+                     } else if (var6 == 6) {
+                        var30 = 8;
+                        var40 = var36.getBoundaryObjectTag(plane, x, y);
+                        if (var40 != 0L) {
+                           var30 = class50.getObjectDefinition(HitSplatDefinition.method4972(var40)).int2 / 2;
+                        }
+
+                        if (var38.animationId == -1 && var38.transforms == null) {
+                           var31 = var38.getModel(4, orientation + 4, var22, var24, var23, var25);
+                        } else {
+                           var31 = new DynamicObject(id, 4, orientation + 4, var12, x, y, var38.animationId, true, (Entity)null);
+                        }
+
+                        var36.newWallDecoration(plane, x, y, var23, (Entity)var31, (Entity)null, 256, orientation, var30 * Tiles.field915[orientation], var30 * Tiles.field916[orientation], var26, var28);
+                     } else {
+                        int var34;
+                        if (var6 == 7) {
+                           var34 = orientation + 2 & 3;
+                           if (var38.animationId == -1 && var38.transforms == null) {
+                              var29 = var38.getModel(4, var34 + 4, var22, var24, var23, var25);
+                           } else {
+                              var29 = new DynamicObject(id, 4, var34 + 4, var12, x, y, var38.animationId, true, (Entity)null);
+                           }
+
+                           var36.newWallDecoration(plane, x, y, var23, (Entity)var29, (Entity)null, 256, var34, 0, 0, var26, var28);
+                        } else if (var6 == 8) {
+                           var30 = 8;
+                           var40 = var36.getBoundaryObjectTag(plane, x, y);
+                           if (var40 != 0L) {
+                              var30 = class50.getObjectDefinition(HitSplatDefinition.method4972(var40)).int2 / 2;
+                           }
+
+                           var34 = orientation + 2 & 3;
+                           Object var35;
+                           if (var38.animationId == -1 && var38.transforms == null) {
+                              var31 = var38.getModel(4, orientation + 4, var22, var24, var23, var25);
+                              var35 = var38.getModel(4, var34 + 4, var22, var24, var23, var25);
+                           } else {
+                              var31 = new DynamicObject(id, 4, orientation + 4, var12, x, y, var38.animationId, true, (Entity)null);
+                              var35 = new DynamicObject(id, 4, var34 + 4, var12, x, y, var38.animationId, true, (Entity)null);
+                           }
+
+                           var36.newWallDecoration(plane, x, y, var23, (Entity)var31, (Entity)var35, 256, orientation, var30 * Tiles.field915[orientation], var30 * Tiles.field916[orientation], var26, var28);
+                        }
+                     }
+                  }
+               }
+            } else {
+               if (var38.animationId == -1 && var38.transforms == null) {
+                  var29 = var38.getModel(10, orientation, var22, var24, var23, var25);
+               } else {
+                  var29 = new DynamicObject(id, 10, orientation, var12, x, y, var38.animationId, true, (Entity)null);
+               }
+
+               if (var29 != null) {
+                  var36.method284(plane, x, y, var23, var17, var39, (Entity)var29, var6 == 11 ? 256 : 0, var26, var28);
+               }
+
+               if (var38.interactType != 0) {
+                  var37.method91(x, y, var17, var39, var38.boolean1);
+               }
+            }
+         }
+      }
+
+   }
+
+   static {
+      ParamDefinition_cached = new EvictingDualNodeHashTable(64);
+   }
+}
diff --git a/runescape-client/src/main/java/ParamKeyDefinition.java b/runescape-client/src/main/java/ParamKeyDefinition.java
deleted file mode 100644
index c5b54db627..0000000000
--- a/runescape-client/src/main/java/ParamKeyDefinition.java
+++ /dev/null
@@ -1,394 +0,0 @@
-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("jb")
-@Implements("ParamKeyDefinition")
-public class ParamKeyDefinition extends DualNode {
-   @ObfuscatedName("m")
-   @ObfuscatedSignature(
-      signature = "Lir;"
-   )
-   public static AbstractIndexCache __jb_m;
-   @ObfuscatedName("f")
-   @ObfuscatedSignature(
-      signature = "Ler;"
-   )
-   @Export("ParamKeyDefinition_cached")
-   static EvictingDualNodeHashTable ParamKeyDefinition_cached;
-   @ObfuscatedName("q")
-   @Export("type")
-   char type;
-   @ObfuscatedName("w")
-   @ObfuscatedGetter(
-      intValue = 1133042753
-   )
-   @Export("keyInt")
-   public int keyInt;
-   @ObfuscatedName("o")
-   @Export("keyString")
-   public String keyString;
-   @ObfuscatedName("u")
-   @Export("isMembersOnly")
-   boolean isMembersOnly;
-
-   static {
-      ParamKeyDefinition_cached = new EvictingDualNodeHashTable(64);
-   }
-
-   ParamKeyDefinition() {
-      this.isMembersOnly = true;
-   }
-
-   @ObfuscatedName("f")
-   @ObfuscatedSignature(
-      signature = "(B)V",
-      garbageValue = "121"
-   )
-   @Export("init")
-   void init() {
-   }
-
-   @ObfuscatedName("q")
-   @ObfuscatedSignature(
-      signature = "(Lgr;I)V",
-      garbageValue = "-975533635"
-   )
-   @Export("read")
-   void read(Buffer var1) {
-      while(true) {
-         int var2 = var1.readUnsignedByte();
-         if(var2 == 0) {
-            return;
-         }
-
-         this.readNext(var1, var2);
-      }
-   }
-
-   @ObfuscatedName("w")
-   @ObfuscatedSignature(
-      signature = "(Lgr;II)V",
-      garbageValue = "1664350313"
-   )
-   @Export("readNext")
-   void readNext(Buffer var1, int var2) {
-      if(var2 == 1) {
-         this.type = class14.method171(var1.readByte());
-      } else if(var2 == 2) {
-         this.keyInt = var1.readInt();
-      } else if(var2 == 4) {
-         this.isMembersOnly = false;
-      } else if(var2 == 5) {
-         this.keyString = var1.readStringCp1252NullTerminated();
-      }
-
-   }
-
-   @ObfuscatedName("o")
-   @ObfuscatedSignature(
-      signature = "(I)Z",
-      garbageValue = "-1897943299"
-   )
-   @Export("isString")
-   public boolean isString() {
-      return this.type == 's';
-   }
-
-   @ObfuscatedName("hs")
-   @ObfuscatedSignature(
-      signature = "(IIIIIIII)V",
-      garbageValue = "-904254947"
-   )
-   static final void method4933(int var0, int var1, int var2, int var3, int var4, int var5, int var6) {
-      if(var2 >= 1 && var3 >= 1 && var2 <= 102 && var3 <= 102) {
-         if(Client.isLowDetail && var0 != SoundSystem.plane) {
-            return;
-         }
-
-         long var7 = 0L;
-         boolean var9 = true;
-         boolean var10 = false;
-         boolean var11 = false;
-         if(var1 == 0) {
-            var7 = class65.scene.__ar_244(var0, var2, var3);
-         }
-
-         if(var1 == 1) {
-            var7 = class65.scene.__ac_245(var0, var2, var3);
-         }
-
-         if(var1 == 2) {
-            var7 = class65.scene.__ay_246(var0, var2, var3);
-         }
-
-         if(var1 == 3) {
-            var7 = class65.scene.getFloorDecorationTag(var0, var2, var3);
-         }
-
-         int var12;
-         if(0L != var7) {
-            var12 = class65.scene.getObjectFlags(var0, var2, var3, var7);
-            int var39 = HitSplatDefinition.method4972(var7);
-            int var40 = var12 & 31;
-            int var41 = var12 >> 6 & 3;
-            ObjectDefinition var13;
-            if(var1 == 0) {
-               class65.scene.removeBoundaryObject(var0, var2, var3);
-               var13 = class50.getObjectDefinition(var39);
-               if(var13.interactType != 0) {
-                  Client.collisionMaps[var0].__g_288(var2, var3, var40, var41, var13.boolean1);
-               }
-            }
-
-            if(var1 == 1) {
-               class65.scene.removeWallDecoration(var0, var2, var3);
-            }
-
-            if(var1 == 2) {
-               class65.scene.__c_242(var0, var2, var3);
-               var13 = class50.getObjectDefinition(var39);
-               if(var2 + var13.sizeX > 103 || var3 + var13.sizeX > 103 || var2 + var13.sizeY > 103 || var3 + var13.sizeY > 103) {
-                  return;
-               }
-
-               if(var13.interactType != 0) {
-                  Client.collisionMaps[var0].__l_289(var2, var3, var13.sizeX, var13.sizeY, var41, var13.boolean1);
-               }
-            }
-
-            if(var1 == 3) {
-               class65.scene.removeFloorDecoration(var0, var2, var3);
-               var13 = class50.getObjectDefinition(var39);
-               if(var13.interactType == 1) {
-                  Client.collisionMaps[var0].__x_291(var2, var3);
-               }
-            }
-         }
-
-         if(var4 >= 0) {
-            var12 = var0;
-            if(var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) {
-               var12 = var0 + 1;
-            }
-
-            Scene var42 = class65.scene;
-            CollisionMap var14 = Client.collisionMaps[var0];
-            ObjectDefinition var15 = class50.getObjectDefinition(var4);
-            int var16;
-            int var17;
-            if(var5 != 1 && var5 != 3) {
-               var16 = var15.sizeX;
-               var17 = var15.sizeY;
-            } else {
-               var16 = var15.sizeY;
-               var17 = var15.sizeX;
-            }
-
-            int var18;
-            int var19;
-            if(var16 + var2 <= 104) {
-               var18 = (var16 >> 1) + var2;
-               var19 = var2 + (var16 + 1 >> 1);
-            } else {
-               var18 = var2;
-               var19 = var2 + 1;
-            }
-
-            int var20;
-            int var21;
-            if(var3 + var17 <= 104) {
-               var20 = var3 + (var17 >> 1);
-               var21 = var3 + (var17 + 1 >> 1);
-            } else {
-               var20 = var3;
-               var21 = var3 + 1;
-            }
-
-            int[][] var22 = Tiles.Tiles_heights[var12];
-            int var23 = var22[var18][var21] + var22[var19][var20] + var22[var18][var20] + var22[var19][var21] >> 2;
-            int var24 = (var2 << 7) + (var16 << 6);
-            int var25 = (var3 << 7) + (var17 << 6);
-            long var26 = FontName.method5637(var2, var3, 2, var15.int1 == 0, var4);
-            int var28 = (var5 << 6) + var6;
-            if(var15.int3 == 1) {
-               var28 += 256;
-            }
-
-            Object var29;
-            if(var6 == 22) {
-               if(var15.animationId == -1 && var15.transforms == null) {
-                  var29 = var15.getModel(22, var5, var22, var24, var23, var25);
-               } else {
-                  var29 = new DynamicObject(var4, 22, var5, var12, var2, var3, var15.animationId, true, (Entity)null);
-               }
-
-               var42.newFloorDecoration(var0, var2, var3, var23, (Entity)var29, var26, var28);
-               if(var15.interactType == 1) {
-                  var14.__o_286(var2, var3);
-               }
-            } else if(var6 != 10 && var6 != 11) {
-               if(var6 >= 12) {
-                  if(var15.animationId == -1 && var15.transforms == null) {
-                     var29 = var15.getModel(var6, var5, var22, var24, var23, var25);
-                  } else {
-                     var29 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, true, (Entity)null);
-                  }
-
-                  var42.__d_238(var0, var2, var3, var23, 1, 1, (Entity)var29, 0, var26, var28);
-                  if(var15.interactType != 0) {
-                     var14.__q_284(var2, var3, var16, var17, var15.boolean1);
-                  }
-               } else if(var6 == 0) {
-                  if(var15.animationId == -1 && var15.transforms == null) {
-                     var29 = var15.getModel(0, var5, var22, var24, var23, var25);
-                  } else {
-                     var29 = new DynamicObject(var4, 0, var5, var12, var2, var3, var15.animationId, true, (Entity)null);
-                  }
-
-                  var42.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.__bq_t[var5], 0, var26, var28);
-                  if(var15.interactType != 0) {
-                     var14.__f_283(var2, var3, var6, var5, var15.boolean1);
-                  }
-               } else if(var6 == 1) {
-                  if(var15.animationId == -1 && var15.transforms == null) {
-                     var29 = var15.getModel(1, var5, var22, var24, var23, var25);
-                  } else {
-                     var29 = new DynamicObject(var4, 1, var5, var12, var2, var3, var15.animationId, true, (Entity)null);
-                  }
-
-                  var42.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.__bq_y[var5], 0, var26, var28);
-                  if(var15.interactType != 0) {
-                     var14.__f_283(var2, var3, var6, var5, var15.boolean1);
-                  }
-               } else {
-                  int var35;
-                  if(var6 == 2) {
-                     var35 = var5 + 1 & 3;
-                     Object var30;
-                     Object var31;
-                     if(var15.animationId == -1 && var15.transforms == null) {
-                        var30 = var15.getModel(2, var5 + 4, var22, var24, var23, var25);
-                        var31 = var15.getModel(2, var35, var22, var24, var23, var25);
-                     } else {
-                        var30 = new DynamicObject(var4, 2, var5 + 4, var12, var2, var3, var15.animationId, true, (Entity)null);
-                        var31 = new DynamicObject(var4, 2, var35, var12, var2, var3, var15.animationId, true, (Entity)null);
-                     }
-
-                     var42.newBoundaryObject(var0, var2, var3, var23, (Entity)var30, (Entity)var31, Tiles.__bq_t[var5], Tiles.__bq_t[var35], var26, var28);
-                     if(var15.interactType != 0) {
-                        var14.__f_283(var2, var3, var6, var5, var15.boolean1);
-                     }
-                  } else if(var6 == 3) {
-                     if(var15.animationId == -1 && var15.transforms == null) {
-                        var29 = var15.getModel(3, var5, var22, var24, var23, var25);
-                     } else {
-                        var29 = new DynamicObject(var4, 3, var5, var12, var2, var3, var15.animationId, true, (Entity)null);
-                     }
-
-                     var42.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.__bq_y[var5], 0, var26, var28);
-                     if(var15.interactType != 0) {
-                        var14.__f_283(var2, var3, var6, var5, var15.boolean1);
-                     }
-                  } else if(var6 == 9) {
-                     if(var15.animationId == -1 && var15.transforms == null) {
-                        var29 = var15.getModel(var6, var5, var22, var24, var23, var25);
-                     } else {
-                        var29 = new DynamicObject(var4, var6, var5, var12, var2, var3, var15.animationId, true, (Entity)null);
-                     }
-
-                     var42.__d_238(var0, var2, var3, var23, 1, 1, (Entity)var29, 0, var26, var28);
-                     if(var15.interactType != 0) {
-                        var14.__q_284(var2, var3, var16, var17, var15.boolean1);
-                     }
-                  } else if(var6 == 4) {
-                     if(var15.animationId == -1 && var15.transforms == null) {
-                        var29 = var15.getModel(4, var5, var22, var24, var23, var25);
-                     } else {
-                        var29 = new DynamicObject(var4, 4, var5, var12, var2, var3, var15.animationId, true, (Entity)null);
-                     }
-
-                     var42.newWallDecoration(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.__bq_t[var5], 0, 0, 0, var26, var28);
-                  } else {
-                     Object var32;
-                     long var36;
-                     if(var6 == 5) {
-                        var35 = 16;
-                        var36 = var42.__ar_244(var0, var2, var3);
-                        if(var36 != 0L) {
-                           var35 = class50.getObjectDefinition(HitSplatDefinition.method4972(var36)).int2;
-                        }
-
-                        if(var15.animationId == -1 && var15.transforms == null) {
-                           var32 = var15.getModel(4, var5, var22, var24, var23, var25);
-                        } else {
-                           var32 = new DynamicObject(var4, 4, var5, var12, var2, var3, var15.animationId, true, (Entity)null);
-                        }
-
-                        var42.newWallDecoration(var0, var2, var3, var23, (Entity)var32, (Entity)null, Tiles.__bq_t[var5], 0, var35 * Tiles.__bq_h[var5], var35 * Tiles.__bq_b[var5], var26, var28);
-                     } else if(var6 == 6) {
-                        var35 = 8;
-                        var36 = var42.__ar_244(var0, var2, var3);
-                        if(var36 != 0L) {
-                           var35 = class50.getObjectDefinition(HitSplatDefinition.method4972(var36)).int2 / 2;
-                        }
-
-                        if(var15.animationId == -1 && var15.transforms == null) {
-                           var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25);
-                        } else {
-                           var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, true, (Entity)null);
-                        }
-
-                        var42.newWallDecoration(var0, var2, var3, var23, (Entity)var32, (Entity)null, 256, var5, var35 * Tiles.__bq_c[var5], var35 * Tiles.__bq_r[var5], var26, var28);
-                     } else if(var6 == 7) {
-                        int var38 = var5 + 2 & 3;
-                        if(var15.animationId == -1 && var15.transforms == null) {
-                           var29 = var15.getModel(4, var38 + 4, var22, var24, var23, var25);
-                        } else {
-                           var29 = new DynamicObject(var4, 4, var38 + 4, var12, var2, var3, var15.animationId, true, (Entity)null);
-                        }
-
-                        var42.newWallDecoration(var0, var2, var3, var23, (Entity)var29, (Entity)null, 256, var38, 0, 0, var26, var28);
-                     } else if(var6 == 8) {
-                        var35 = 8;
-                        var36 = var42.__ar_244(var0, var2, var3);
-                        if(var36 != 0L) {
-                           var35 = class50.getObjectDefinition(HitSplatDefinition.method4972(var36)).int2 / 2;
-                        }
-
-                        int var34 = var5 + 2 & 3;
-                        Object var33;
-                        if(var15.animationId == -1 && var15.transforms == null) {
-                           var32 = var15.getModel(4, var5 + 4, var22, var24, var23, var25);
-                           var33 = var15.getModel(4, var34 + 4, var22, var24, var23, var25);
-                        } else {
-                           var32 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var15.animationId, true, (Entity)null);
-                           var33 = new DynamicObject(var4, 4, var34 + 4, var12, var2, var3, var15.animationId, true, (Entity)null);
-                        }
-
-                        var42.newWallDecoration(var0, var2, var3, var23, (Entity)var32, (Entity)var33, 256, var5, var35 * Tiles.__bq_c[var5], var35 * Tiles.__bq_r[var5], var26, var28);
-                     }
-                  }
-               }
-            } else {
-               if(var15.animationId == -1 && var15.transforms == null) {
-                  var29 = var15.getModel(10, var5, var22, var24, var23, var25);
-               } else {
-                  var29 = new DynamicObject(var4, 10, var5, var12, var2, var3, var15.animationId, true, (Entity)null);
-               }
-
-               if(var29 != null) {
-                  var42.__d_238(var0, var2, var3, var23, var16, var17, (Entity)var29, var6 == 11?256:0, var26, var28);
-               }
-
-               if(var15.interactType != 0) {
-                  var14.__q_284(var2, var3, var16, var17, var15.boolean1);
-               }
-            }
-         }
-      }
-
-   }
-}
diff --git a/runescape-client/src/main/java/PcmPlayer.java b/runescape-client/src/main/java/PcmPlayer.java
index 296ae184e5..ef333e2f0f 100644
--- a/runescape-client/src/main/java/PcmPlayer.java
+++ b/runescape-client/src/main/java/PcmPlayer.java
@@ -17,13 +17,13 @@ public class PcmPlayer {
    @ObfuscatedSignature(
       signature = "Ldc;"
    )
-   @Export("stream0")
-   PcmStream stream0;
+   @Export("stream")
+   PcmStream stream;
    @ObfuscatedName("z")
    @ObfuscatedGetter(
       intValue = 1125788887
    )
-   int __z;
+   int field680;
    @ObfuscatedName("j")
    @ObfuscatedGetter(
       longValue = -8124323644430480811L
@@ -46,7 +46,7 @@ public class PcmPlayer {
    @ObfuscatedGetter(
       intValue = 1907203055
    )
-   int __y;
+   int field681;
    @ObfuscatedName("h")
    @ObfuscatedGetter(
       longValue = -200656835998283411L
@@ -57,12 +57,12 @@ public class PcmPlayer {
    @ObfuscatedGetter(
       intValue = 48658021
    )
-   int __b;
+   int field682;
    @ObfuscatedName("c")
    @ObfuscatedGetter(
       intValue = 1624619697
    )
-   int __c;
+   int field683;
    @ObfuscatedName("r")
    @ObfuscatedGetter(
       intValue = -1586398263
@@ -73,37 +73,37 @@ public class PcmPlayer {
    @ObfuscatedGetter(
       longValue = -8188447292076890879L
    )
-   long __p;
+   long field684;
    @ObfuscatedName("v")
-   boolean __v;
+   boolean field685;
    @ObfuscatedName("ac")
    @ObfuscatedGetter(
       intValue = -645495803
    )
-   int __ac;
+   int field686;
    @ObfuscatedName("ay")
    @ObfuscatedSignature(
       signature = "[Ldc;"
    )
-   PcmStream[] __ay;
+   PcmStream[] field687;
    @ObfuscatedName("ah")
    @ObfuscatedSignature(
       signature = "[Ldc;"
    )
-   PcmStream[] __ah;
+   PcmStream[] field688;
 
    protected PcmPlayer() {
-      this.__z = 32;
+      this.field680 = 32;
       this.timeMs = class203.currentTimeMs();
       this.retryTimeMs = 0L;
-      this.__b = 0;
-      this.__c = 0;
+      this.field682 = 0;
+      this.field683 = 0;
       this.nextPosition = 0;
-      this.__p = 0L;
-      this.__v = true;
-      this.__ac = 0;
-      this.__ay = new PcmStream[8];
-      this.__ah = new PcmStream[8];
+      this.field684 = 0L;
+      this.field685 = true;
+      this.field686 = 0;
+      this.field687 = new PcmStream[8];
+      this.field688 = new PcmStream[8];
    }
 
    @ObfuscatedName("m")
@@ -121,7 +121,7 @@ public class PcmPlayer {
       garbageValue = "-1738349775"
    )
    @Export("open")
-   protected void open(int var1) throws Exception {
+   protected void open(int bufferSize) throws Exception {
    }
 
    @ObfuscatedName("q")
@@ -163,8 +163,8 @@ public class PcmPlayer {
       garbageValue = "2106357590"
    )
    @Export("setStream")
-   public final synchronized void setStream(PcmStream var1) {
-      this.stream0 = var1;
+   public final synchronized void setStream(PcmStream stream) {
+      this.stream = stream;
    }
 
    @ObfuscatedName("ar")
@@ -174,90 +174,90 @@ public class PcmPlayer {
    )
    @Export("run")
    public final synchronized void run() {
-      if(this.samples != null) {
+      if (this.samples != null) {
          long var1 = class203.currentTimeMs();
 
          try {
-            if(0L != this.retryTimeMs) {
-               if(var1 < this.retryTimeMs) {
+            if (0L != this.retryTimeMs) {
+               if (var1 < this.retryTimeMs) {
                   return;
                }
 
                this.open(this.capacity);
                this.retryTimeMs = 0L;
-               this.__v = true;
+               this.field685 = true;
             }
 
             int var3 = this.position();
-            if(this.nextPosition - var3 > this.__b) {
-               this.__b = this.nextPosition - var3;
+            if (this.nextPosition - var3 > this.field682) {
+               this.field682 = this.nextPosition - var3;
             }
 
-            int var4 = this.__y + this.frequency;
-            if(var4 + 256 > 16384) {
+            int var4 = this.field681 + this.frequency;
+            if (var4 + 256 > 16384) {
                var4 = 16128;
             }
 
-            if(var4 + 256 > this.capacity) {
+            if (var4 + 256 > this.capacity) {
                this.capacity += 1024;
-               if(this.capacity > 16384) {
+               if (this.capacity > 16384) {
                   this.capacity = 16384;
                }
 
                this.close();
                this.open(this.capacity);
                var3 = 0;
-               this.__v = true;
-               if(var4 + 256 > this.capacity) {
+               this.field685 = true;
+               if (var4 + 256 > this.capacity) {
                   var4 = this.capacity - 256;
-                  this.__y = var4 - this.frequency;
+                  this.field681 = var4 - this.frequency;
                }
             }
 
-            while(var3 < var4) {
+            while (var3 < var4) {
                this.fill(this.samples, 256);
                this.write();
                var3 += 256;
             }
 
-            if(var1 > this.__p) {
-               if(!this.__v) {
-                  if(this.__b == 0 && this.__c == 0) {
+            if (var1 > this.field684) {
+               if (!this.field685) {
+                  if (this.field682 == 0 && this.field683 == 0) {
                      this.close();
                      this.retryTimeMs = 2000L + var1;
                      return;
                   }
 
-                  this.__y = Math.min(this.__c, this.__b);
-                  this.__c = this.__b;
+                  this.field681 = Math.min(this.field683, this.field682);
+                  this.field683 = this.field682;
                } else {
-                  this.__v = false;
+                  this.field685 = false;
                }
 
-               this.__b = 0;
-               this.__p = 2000L + var1;
+               this.field682 = 0;
+               this.field684 = 2000L + var1;
             }
 
             this.nextPosition = var3;
-         } catch (Exception var7) {
+         } catch (Exception var6) {
             this.close();
             this.retryTimeMs = var1 + 2000L;
          }
 
          try {
-            if(var1 > this.timeMs + 500000L) {
+            if (var1 > this.timeMs + 500000L) {
                var1 = this.timeMs;
             }
 
-            while(var1 > 5000L + this.timeMs) {
+            while (var1 > 5000L + this.timeMs) {
                this.skip(256);
                this.timeMs += (long)(256000 / class309.PcmPlayer_sampleRate);
             }
-         } catch (Exception var6) {
+         } catch (Exception var5) {
             this.timeMs = var1;
          }
-
       }
+
    }
 
    @ObfuscatedName("ac")
@@ -265,8 +265,8 @@ public class PcmPlayer {
       signature = "(I)V",
       garbageValue = "-922069005"
    )
-   public final void __ac_176() {
-      this.__v = true;
+   public final void method242() {
+      this.field685 = true;
    }
 
    @ObfuscatedName("ay")
@@ -276,7 +276,7 @@ public class PcmPlayer {
    )
    @Export("tryDiscard")
    public final synchronized void tryDiscard() {
-      this.__v = true;
+      this.field685 = true;
 
       try {
          this.discard();
@@ -294,20 +294,20 @@ public class PcmPlayer {
    )
    @Export("shutdown")
    public final synchronized void shutdown() {
-      if(Messages.soundSystem != null) {
+      if (Messages.soundSystem != null) {
          boolean var1 = true;
 
-         for(int var2 = 0; var2 < 2; ++var2) {
-            if(this == Messages.soundSystem.players[var2]) {
+         for (int var2 = 0; var2 < 2; ++var2) {
+            if (this == Messages.soundSystem.players[var2]) {
                Messages.soundSystem.players[var2] = null;
             }
 
-            if(Messages.soundSystem.players[var2] != null) {
+            if (Messages.soundSystem.players[var2] != null) {
                var1 = false;
             }
          }
 
-         if(var1) {
+         if (var1) {
             Friend.soundSystemExecutor.shutdownNow();
             Friend.soundSystemExecutor = null;
             Messages.soundSystem = null;
@@ -324,96 +324,96 @@ public class PcmPlayer {
       garbageValue = "-424358259"
    )
    @Export("skip")
-   final void skip(int var1) {
-      this.__ac -= var1;
-      if(this.__ac < 0) {
-         this.__ac = 0;
+   final void skip(int length) {
+      this.field686 -= length;
+      if (this.field686 < 0) {
+         this.field686 = 0;
       }
 
-      if(this.stream0 != null) {
-         this.stream0.__d_173(var1);
+      if (this.stream != null) {
+         this.stream.skip(length);
       }
 
    }
 
    @ObfuscatedName("aw")
    @Export("fill")
-   final void fill(int[] var1, int var2) {
-      int var3 = var2;
-      if(isStereo) {
-         var3 = var2 << 1;
+   final void fill(int[] buffer, int length) {
+      int var3 = length;
+      if (isStereo) {
+         var3 = length << 1;
       }
 
-      class212.clearIntArray(var1, 0, var3);
-      this.__ac -= var2;
-      if(this.stream0 != null && this.__ac <= 0) {
-         this.__ac += class309.PcmPlayer_sampleRate >> 4;
-         MidiPcmStream.PcmStream_disable(this.stream0);
-         this.__ab_177(this.stream0, this.stream0.__az_179());
+      class212.clearIntArray(buffer, 0, var3);
+      this.field686 -= length;
+      if (this.stream != null && this.field686 <= 0) {
+         this.field686 += class309.PcmPlayer_sampleRate >> 4;
+         MidiPcmStream.PcmStream_disable(this.stream);
+         this.method243(this.stream, this.stream.vmethod282());
          int var4 = 0;
          int var5 = 255;
 
          int var6;
-         PcmStream var10;
-         label104:
-         for(var6 = 7; var5 != 0; --var6) {
-            int var7;
+         PcmStream var7;
+         label106:
+         for (var6 = 7; var5 != 0; --var6) {
             int var8;
-            if(var6 < 0) {
-               var7 = var6 & 3;
-               var8 = -(var6 >> 2);
+            int var9;
+            if (var6 < 0) {
+               var8 = var6 & 3;
+               var9 = -(var6 >> 2);
             } else {
-               var7 = var6;
-               var8 = 0;
+               var8 = var6;
+               var9 = 0;
             }
 
-            for(int var9 = var5 >>> var7 & 286331153; var9 != 0; var9 >>>= 4) {
-               if((var9 & 1) != 0) {
-                  var5 &= ~(1 << var7);
-                  var10 = null;
-                  PcmStream var11 = this.__ay[var7];
+            for (int var10 = var5 >>> var8 & 286331153; var10 != 0; var10 >>>= 4) {
+               if ((var10 & 1) != 0) {
+                  var5 &= ~(1 << var8);
+                  var7 = null;
+                  PcmStream var11 = this.field687[var8];
 
-                  label98:
-                  while(true) {
-                     while(true) {
-                        if(var11 == null) {
-                           break label98;
+                  label100:
+                  while (true) {
+                     while (true) {
+                        if (var11 == null) {
+                           break label100;
                         }
 
                         AbstractSound var12 = var11.sound;
-                        if(var12 != null && var12.position > var8) {
-                           var5 |= 1 << var7;
-                           var10 = var11;
+                        if (var12 != null && var12.position > var9) {
+                           var5 |= 1 << var8;
+                           var7 = var11;
                            var11 = var11.after;
                         } else {
                            var11.active = true;
-                           int var13 = var11.__l_171();
+                           int var13 = var11.vmethod262();
                            var4 += var13;
-                           if(var12 != null) {
+                           if (var12 != null) {
                               var12.position += var13;
                            }
 
-                           if(var4 >= this.__z) {
-                              break label104;
+                           if (var4 >= this.field680) {
+                              break label106;
                            }
 
                            PcmStream var14 = var11.firstSubStream();
-                           if(var14 != null) {
-                              for(int var15 = var11.__s; var14 != null; var14 = var11.nextSubStream()) {
-                                 this.__ab_177(var14, var15 * var14.__az_179() >> 8);
+                           if (var14 != null) {
+                              for (int var15 = var11.field689; var14 != null; var14 = var11.nextSubStream()) {
+                                 this.method243(var14, var15 * var14.vmethod282() >> 8);
                               }
                            }
 
                            PcmStream var18 = var11.after;
                            var11.after = null;
-                           if(var10 == null) {
-                              this.__ay[var7] = var18;
+                           if (var7 == null) {
+                              this.field687[var8] = var18;
                            } else {
-                              var10.after = var18;
+                              var7.after = var18;
                            }
 
-                           if(var18 == null) {
-                              this.__ah[var7] = var10;
+                           if (var18 == null) {
+                              this.field688[var8] = var7;
                            }
 
                            var11 = var18;
@@ -422,29 +422,29 @@ public class PcmPlayer {
                   }
                }
 
-               var7 += 4;
-               ++var8;
+               var8 += 4;
+               ++var9;
             }
          }
 
-         for(var6 = 0; var6 < 8; ++var6) {
-            PcmStream var16 = this.__ay[var6];
-            PcmStream[] var17 = this.__ay;
-            this.__ah[var6] = null;
+         for (var6 = 0; var6 < 8; ++var6) {
+            PcmStream var16 = this.field687[var6];
+            PcmStream[] var17 = this.field687;
+            this.field688[var6] = null;
 
-            for(var17[var6] = null; var16 != null; var16 = var10) {
-               var10 = var16.after;
+            for (var17[var6] = null; var16 != null; var16 = var7) {
+               var7 = var16.after;
                var16.after = null;
             }
          }
       }
 
-      if(this.__ac < 0) {
-         this.__ac = 0;
+      if (this.field686 < 0) {
+         this.field686 = 0;
       }
 
-      if(this.stream0 != null) {
-         this.stream0.__e_172(var1, 0, var2);
+      if (this.stream != null) {
+         this.stream.fill(buffer, 0, length);
       }
 
       this.timeMs = class203.currentTimeMs();
@@ -455,16 +455,16 @@ public class PcmPlayer {
       signature = "(Ldc;II)V",
       garbageValue = "-1884182540"
    )
-   final void __ab_177(PcmStream var1, int var2) {
+   final void method243(PcmStream var1, int var2) {
       int var3 = var2 >> 5;
-      PcmStream var4 = this.__ah[var3];
-      if(var4 == null) {
-         this.__ay[var3] = var1;
+      PcmStream var4 = this.field688[var3];
+      if (var4 == null) {
+         this.field687[var3] = var1;
       } else {
          var4.after = var1;
       }
 
-      this.__ah[var3] = var1;
-      var1.__s = var2;
+      this.field688[var3] = var1;
+      var1.field689 = var2;
    }
 }
diff --git a/runescape-client/src/main/java/PcmStream.java b/runescape-client/src/main/java/PcmStream.java
index 0518a56eee..b7e6a9af70 100644
--- a/runescape-client/src/main/java/PcmStream.java
+++ b/runescape-client/src/main/java/PcmStream.java
@@ -16,7 +16,7 @@ public abstract class PcmStream extends Node {
    @Export("after")
    PcmStream after;
    @ObfuscatedName("s")
-   int __s;
+   int field689;
    @ObfuscatedName("t")
    @ObfuscatedSignature(
       signature = "Ldd;"
@@ -43,26 +43,28 @@ public abstract class PcmStream extends Node {
    protected abstract PcmStream nextSubStream();
 
    @ObfuscatedName("l")
-   protected abstract int __l_171();
+   protected abstract int vmethod262();
 
    @ObfuscatedName("e")
-   protected abstract void __e_172(int[] var1, int var2, int var3);
+   @Export("fill")
+   protected abstract void fill(int[] buffer, int start, int end);
 
    @ObfuscatedName("d")
-   protected abstract void __d_173(int var1);
+   @Export("skip")
+   protected abstract void skip(int length);
 
    @ObfuscatedName("az")
-   int __az_179() {
+   int vmethod282() {
       return 255;
    }
 
    @ObfuscatedName("ef")
    @Export("update")
-   final void update(int[] var1, int var2, int var3) {
-      if(this.active) {
-         this.__e_172(var1, var2, var3);
+   final void update(int[] buffer, int start, int end) {
+      if (this.active) {
+         this.fill(buffer, start, end);
       } else {
-         this.__d_173(var3);
+         this.skip(end);
       }
 
    }
diff --git a/runescape-client/src/main/java/PcmStreamMixer.java b/runescape-client/src/main/java/PcmStreamMixer.java
index 205d7ca61f..95c0469546 100644
--- a/runescape-client/src/main/java/PcmStreamMixer.java
+++ b/runescape-client/src/main/java/PcmStreamMixer.java
@@ -16,17 +16,17 @@ public class PcmStreamMixer extends PcmStream {
    @ObfuscatedSignature(
       signature = "Lje;"
    )
-   NodeDeque __f;
+   NodeDeque field690;
    @ObfuscatedName("q")
-   int __q;
+   int field691;
    @ObfuscatedName("o")
-   int __o;
+   int field692;
 
    public PcmStreamMixer() {
       this.subStreams = new NodeDeque();
-      this.__f = new NodeDeque();
-      this.__q = 0;
-      this.__o = -1;
+      this.field690 = new NodeDeque();
+      this.field691 = 0;
+      this.field692 = -1;
    }
 
    @ObfuscatedName("m")
@@ -34,8 +34,8 @@ public class PcmStreamMixer extends PcmStream {
       signature = "(Ldc;)V"
    )
    @Export("addSubStream")
-   public final synchronized void addSubStream(PcmStream var1) {
-      this.subStreams.addLast(var1);
+   public final synchronized void addSubStream(PcmStream subStream) {
+      this.subStreams.addLast(subStream);
    }
 
    @ObfuscatedName("f")
@@ -43,19 +43,19 @@ public class PcmStreamMixer extends PcmStream {
       signature = "(Ldc;)V"
    )
    @Export("removeSubStream")
-   public final synchronized void removeSubStream(PcmStream var1) {
-      var1.remove();
+   public final synchronized void removeSubStream(PcmStream subStream) {
+      subStream.remove();
    }
 
    @ObfuscatedName("q")
-   void __q_168() {
-      if(this.__q > 0) {
-         for(PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.__f.last(); var1 != null; var1 = (PcmStreamMixerListener)this.__f.previous()) {
-            var1.__m -= this.__q;
+   void method248() {
+      if (this.field691 > 0) {
+         for (PcmStreamMixerListener var1 = (PcmStreamMixerListener)this.field690.last(); var1 != null; var1 = (PcmStreamMixerListener)this.field690.previous()) {
+            var1.field693 -= this.field691;
          }
 
-         this.__o -= this.__q;
-         this.__q = 0;
+         this.field692 -= this.field691;
+         this.field691 = 0;
       }
 
    }
@@ -64,27 +64,27 @@ public class PcmStreamMixer extends PcmStream {
    @ObfuscatedSignature(
       signature = "(Lgw;Ldf;)V"
    )
-   void __w_169(Node var1, PcmStreamMixerListener var2) {
-      while(this.__f.sentinel != var1 && ((PcmStreamMixerListener)var1).__m <= var2.__m) {
+   void method249(Node var1, PcmStreamMixerListener var2) {
+      while (this.field690.sentinel != var1 && ((PcmStreamMixerListener)var1).field693 <= var2.field693) {
          var1 = var1.previous;
       }
 
-      NodeDeque.method5270(var2, var1);
-      this.__o = ((PcmStreamMixerListener)this.__f.sentinel.previous).__m;
+      NodeDeque.NodeDeque_addBefore(var2, var1);
+      this.field692 = ((PcmStreamMixerListener)this.field690.sentinel.previous).field693;
    }
 
    @ObfuscatedName("o")
    @ObfuscatedSignature(
       signature = "(Ldf;)V"
    )
-   void __o_170(PcmStreamMixerListener var1) {
+   void method250(PcmStreamMixerListener var1) {
       var1.remove();
       var1.remove2();
-      Node var2 = this.__f.sentinel.previous;
-      if(var2 == this.__f.sentinel) {
-         this.__o = -1;
+      Node var2 = this.field690.sentinel.previous;
+      if (var2 == this.field690.sentinel) {
+         this.field692 = -1;
       } else {
-         this.__o = ((PcmStreamMixerListener)var2).__m;
+         this.field692 = ((PcmStreamMixerListener)var2).field693;
       }
 
    }
@@ -108,39 +108,40 @@ public class PcmStreamMixer extends PcmStream {
    }
 
    @ObfuscatedName("l")
-   protected int __l_171() {
+   protected int vmethod262() {
       return 0;
    }
 
    @ObfuscatedName("e")
-   public final synchronized void __e_172(int[] var1, int var2, int var3) {
+   @Export("fill")
+   public final synchronized void fill(int[] var1, int var2, int var3) {
       do {
-         if(this.__o < 0) {
+         if (this.field692 < 0) {
             this.updateSubStreams(var1, var2, var3);
             return;
          }
 
-         if(var3 + this.__q < this.__o) {
-            this.__q += var3;
+         if (var3 + this.field691 < this.field692) {
+            this.field691 += var3;
             this.updateSubStreams(var1, var2, var3);
             return;
          }
 
-         int var4 = this.__o - this.__q;
+         int var4 = this.field692 - this.field691;
          this.updateSubStreams(var1, var2, var4);
          var2 += var4;
          var3 -= var4;
-         this.__q += var4;
-         this.__q_168();
-         PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.__f.last();
+         this.field691 += var4;
+         this.method248();
+         PcmStreamMixerListener var5 = (PcmStreamMixerListener)this.field690.last();
          synchronized(var5) {
             int var7 = var5.update();
-            if(var7 < 0) {
-               var5.__m = 0;
-               this.__o_170(var5);
+            if (var7 < 0) {
+               var5.field693 = 0;
+               this.method250(var5);
             } else {
-               var5.__m = var7;
-               this.__w_169(var5.previous, var5);
+               var5.field693 = var7;
+               this.method249(var5.previous, var5);
             }
          }
       } while(var3 != 0);
@@ -149,41 +150,42 @@ public class PcmStreamMixer extends PcmStream {
 
    @ObfuscatedName("x")
    @Export("updateSubStreams")
-   void updateSubStreams(int[] var1, int var2, int var3) {
-      for(PcmStream var4 = (PcmStream)this.subStreams.last(); var4 != null; var4 = (PcmStream)this.subStreams.previous()) {
-         var4.update(var1, var2, var3);
+   void updateSubStreams(int[] buffer, int start, int end) {
+      for (PcmStream var4 = (PcmStream)this.subStreams.last(); var4 != null; var4 = (PcmStream)this.subStreams.previous()) {
+         var4.update(buffer, start, end);
       }
 
    }
 
    @ObfuscatedName("d")
-   public final synchronized void __d_173(int var1) {
+   @Export("skip")
+   public final synchronized void skip(int var1) {
       do {
-         if(this.__o < 0) {
+         if (this.field692 < 0) {
             this.skipSubStreams(var1);
             return;
          }
 
-         if(this.__q + var1 < this.__o) {
-            this.__q += var1;
+         if (this.field691 + var1 < this.field692) {
+            this.field691 += var1;
             this.skipSubStreams(var1);
             return;
          }
 
-         int var2 = this.__o - this.__q;
+         int var2 = this.field692 - this.field691;
          this.skipSubStreams(var2);
          var1 -= var2;
-         this.__q += var2;
-         this.__q_168();
-         PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.__f.last();
+         this.field691 += var2;
+         this.method248();
+         PcmStreamMixerListener var3 = (PcmStreamMixerListener)this.field690.last();
          synchronized(var3) {
             int var5 = var3.update();
-            if(var5 < 0) {
-               var3.__m = 0;
-               this.__o_170(var3);
+            if (var5 < 0) {
+               var3.field693 = 0;
+               this.method250(var3);
             } else {
-               var3.__m = var5;
-               this.__w_169(var3.previous, var3);
+               var3.field693 = var5;
+               this.method249(var3.previous, var3);
             }
          }
       } while(var1 != 0);
@@ -192,9 +194,9 @@ public class PcmStreamMixer extends PcmStream {
 
    @ObfuscatedName("a")
    @Export("skipSubStreams")
-   void skipSubStreams(int var1) {
-      for(PcmStream var2 = (PcmStream)this.subStreams.last(); var2 != null; var2 = (PcmStream)this.subStreams.previous()) {
-         var2.__d_173(var1);
+   void skipSubStreams(int length) {
+      for (PcmStream var2 = (PcmStream)this.subStreams.last(); var2 != null; var2 = (PcmStream)this.subStreams.previous()) {
+         var2.skip(length);
       }
 
    }
diff --git a/runescape-client/src/main/java/PcmStreamMixerListener.java b/runescape-client/src/main/java/PcmStreamMixerListener.java
index 4e696ca7c1..a1db067cc7 100644
--- a/runescape-client/src/main/java/PcmStreamMixerListener.java
+++ b/runescape-client/src/main/java/PcmStreamMixerListener.java
@@ -7,7 +7,7 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("PcmStreamMixerListener")
 public abstract class PcmStreamMixerListener extends Node {
    @ObfuscatedName("m")
-   int __m;
+   int field693;
 
    @ObfuscatedName("m")
    @Export("remove2")
diff --git a/runescape-client/src/main/java/class68.java b/runescape-client/src/main/java/PendingSpawn.java
similarity index 73%
rename from runescape-client/src/main/java/class68.java
rename to runescape-client/src/main/java/PendingSpawn.java
index b72668100c..5712ee43e4 100644
--- a/runescape-client/src/main/java/class68.java
+++ b/runescape-client/src/main/java/PendingSpawn.java
@@ -1,30 +1,36 @@
 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("bi")
-public final class class68 extends Node {
+@Implements("PendingSpawn")
+public final class PendingSpawn extends Node {
    @ObfuscatedName("m")
    @ObfuscatedGetter(
       intValue = 1439936951
    )
-   int field911;
+   @Export("plane")
+   int plane;
    @ObfuscatedName("f")
    @ObfuscatedGetter(
       intValue = -1471611383
    )
-   int field906;
+   @Export("type")
+   int type;
    @ObfuscatedName("q")
    @ObfuscatedGetter(
       intValue = 1059464897
    )
-   int field913;
+   @Export("x")
+   int x;
    @ObfuscatedName("w")
    @ObfuscatedGetter(
       intValue = -1306474107
    )
-   int field901;
+   @Export("y")
+   int y;
    @ObfuscatedName("o")
    @ObfuscatedGetter(
       intValue = -1889242993
@@ -44,12 +50,14 @@ public final class class68 extends Node {
    @ObfuscatedGetter(
       intValue = 1986990761
    )
-   int field899;
+   @Export("id")
+   int id;
    @ObfuscatedName("e")
    @ObfuscatedGetter(
       intValue = 1768602131
    )
-   int field907;
+   @Export("orientation")
+   int orientation;
    @ObfuscatedName("x")
    @ObfuscatedGetter(
       intValue = 1989829133
@@ -59,16 +67,18 @@ public final class class68 extends Node {
    @ObfuscatedGetter(
       intValue = -715662659
    )
-   int field909;
+   @Export("delay")
+   int delay;
    @ObfuscatedName("k")
    @ObfuscatedGetter(
       intValue = -2141472019
    )
-   int field910;
+   @Export("hitpoints")
+   int hitpoints;
 
-   class68() {
-      this.field909 = 0;
-      this.field910 = -1;
+   PendingSpawn() {
+      this.delay = 0;
+      this.hitpoints = -1;
    }
 
    @ObfuscatedName("m")
@@ -86,12 +96,12 @@ public final class class68 extends Node {
       garbageValue = "1641191614"
    )
    public static void method1695(int var0, int var1) {
-      VarbitDefinition var2 = Occluder.method3255(var0);
-      int var3 = var2.varp;
-      int var4 = var2.lowBit;
-      int var5 = var2.highBit;
+      VarbitDefinition var2 = Occluder.getVarbitDefinition(var0);
+      int var3 = var2.baseVar;
+      int var4 = var2.startBit;
+      int var5 = var2.endBit;
       int var6 = Varps.Varps_masks[var5 - var4];
-      if(var1 < 0 || var1 > var6) {
+      if (var1 < 0 || var1 > var6) {
          var1 = 0;
       }
 
@@ -106,7 +116,7 @@ public final class class68 extends Node {
    )
    @Export("drawLoadingMessage")
    static final void drawLoadingMessage(String var0, boolean var1) {
-      if(Client.showLoadingMessages) {
+      if (Client.showLoadingMessages) {
          byte var2 = 4;
          int var3 = var2 + 6;
          int var4 = var2 + 6;
@@ -116,7 +126,7 @@ public final class class68 extends Node {
          Rasterizer2D.Rasterizer2D_drawRectangle(var3 - var2, var4 - var2, var5 + var2 + var2, var2 + var2 + var6, 16777215);
          DevicePcmPlayerProvider.fontPlain12.drawLines(var0, var3, var4, var5, var6, 16777215, -1, 1, 1, 0);
          Players.method2112(var3 - var2, var4 - var2, var2 + var5 + var2, var6 + var2 + var2);
-         if(var1) {
+         if (var1) {
             class197.rasterProvider.drawFull(0, 0);
          } else {
             int var7 = var3;
@@ -124,13 +134,13 @@ public final class class68 extends Node {
             int var9 = var5;
             int var10 = var6;
 
-            for(int var11 = 0; var11 < Client.rootWidgetCount; ++var11) {
-               if(Client.rootWidgetWidths[var11] + Client.rootWidgetXs[var11] > var7 && Client.rootWidgetXs[var11] < var9 + var7 && Client.rootWidgetHeights[var11] + Client.rootWidgetYs[var11] > var8 && Client.rootWidgetYs[var11] < var10 + var8) {
-                  Client.__client_ot[var11] = true;
+            for (int var11 = 0; var11 < Client.rootWidgetCount; ++var11) {
+               if (Client.rootWidgetWidths[var11] + Client.rootWidgetXs[var11] > var7 && Client.rootWidgetXs[var11] < var9 + var7 && Client.rootWidgetHeights[var11] + Client.rootWidgetYs[var11] > var8 && Client.rootWidgetYs[var11] < var10 + var8) {
+                  Client.field102[var11] = true;
                }
             }
          }
-
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/PlatformInfo.java b/runescape-client/src/main/java/PlatformInfo.java
index 6a8fa2e1dd..d3cd3d6756 100644
--- a/runescape-client/src/main/java/PlatformInfo.java
+++ b/runescape-client/src/main/java/PlatformInfo.java
@@ -11,125 +11,125 @@ public class PlatformInfo extends Node {
    @ObfuscatedGetter(
       intValue = 1318366785
    )
-   int __ay;
+   int field694;
    @ObfuscatedName("ah")
-   boolean __ah;
+   boolean field695;
    @ObfuscatedName("ak")
    @ObfuscatedGetter(
       intValue = 703904161
    )
-   int __ak;
+   int field696;
    @ObfuscatedName("aw")
    @ObfuscatedGetter(
       intValue = 467004305
    )
-   int __aw;
+   int field697;
    @ObfuscatedName("al")
    @ObfuscatedGetter(
       intValue = 2097018521
    )
-   int __al;
+   int field698;
    @ObfuscatedName("ab")
    @ObfuscatedGetter(
       intValue = -1667177301
    )
-   int __ab;
+   int field699;
    @ObfuscatedName("ae")
    @ObfuscatedGetter(
       intValue = 385109109
    )
-   int __ae;
+   int field700;
    @ObfuscatedName("at")
-   boolean __at;
+   boolean field701;
    @ObfuscatedName("ad")
    @ObfuscatedGetter(
       intValue = -1765017
    )
-   int __ad;
+   int field702;
    @ObfuscatedName("ap")
    @ObfuscatedGetter(
       intValue = -817941105
    )
-   int __ap;
+   int field703;
    @ObfuscatedName("am")
    @ObfuscatedGetter(
       intValue = 30207059
    )
-   int __am;
+   int field704;
    @ObfuscatedName("an")
    @ObfuscatedGetter(
       intValue = 890109053
    )
-   int __an;
+   int field705;
    @ObfuscatedName("az")
-   String __az;
+   String field706;
    @ObfuscatedName("au")
-   String __au;
+   String field707;
    @ObfuscatedName("ao")
-   String __ao;
+   String field708;
    @ObfuscatedName("aa")
-   String __aa;
+   String field709;
    @ObfuscatedName("ax")
    @ObfuscatedGetter(
       intValue = 871094255
    )
-   int __ax;
+   int field710;
    @ObfuscatedName("af")
    @ObfuscatedGetter(
       intValue = 1955966365
    )
-   int __af;
+   int field711;
    @ObfuscatedName("ai")
    @ObfuscatedGetter(
       intValue = 1196598207
    )
-   int __ai;
+   int field712;
    @ObfuscatedName("ba")
    @ObfuscatedGetter(
       intValue = -170839105
    )
-   int __ba;
+   int field713;
    @ObfuscatedName("bb")
-   String __bb;
+   String field714;
    @ObfuscatedName("bs")
-   String __bs;
+   String field715;
    @ObfuscatedName("bq")
-   int[] __bq;
+   int[] field716;
    @ObfuscatedName("bn")
    @ObfuscatedGetter(
       intValue = 1466207635
    )
-   int __bn;
+   int field717;
    @ObfuscatedName("bk")
-   String __bk;
+   String field718;
 
    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.__bq = new int[3];
-      this.__ay = var1;
-      this.__ah = var2;
-      this.__ak = var3;
-      this.__aw = var4;
-      this.__al = var5;
-      this.__ab = var6;
-      this.__ae = var7;
-      this.__at = var8;
-      this.__ad = var9;
-      this.__ap = var10;
-      this.__am = var11;
-      this.__an = var12;
-      this.__az = var13;
-      this.__au = var14;
-      this.__ao = var15;
-      this.__aa = var16;
-      this.__ax = var17;
-      this.__af = var18;
-      this.__ai = var19;
-      this.__ba = var20;
-      this.__bb = var21;
-      this.__bs = var22;
-      this.__bq = var23;
-      this.__bn = var24;
-      this.__bk = var25;
+      this.field716 = new int[3];
+      this.field694 = var1;
+      this.field695 = var2;
+      this.field696 = var3;
+      this.field697 = var4;
+      this.field698 = var5;
+      this.field699 = var6;
+      this.field700 = var7;
+      this.field701 = var8;
+      this.field702 = var9;
+      this.field703 = var10;
+      this.field704 = var11;
+      this.field705 = var12;
+      this.field706 = var13;
+      this.field707 = var14;
+      this.field708 = var15;
+      this.field709 = var16;
+      this.field710 = var17;
+      this.field711 = var18;
+      this.field712 = var19;
+      this.field713 = var20;
+      this.field714 = var21;
+      this.field715 = var22;
+      this.field716 = var23;
+      this.field717 = var24;
+      this.field718 = var25;
    }
 
    @ObfuscatedName("m")
@@ -138,37 +138,37 @@ public class PlatformInfo extends Node {
       garbageValue = "1518809220"
    )
    @Export("write")
-   public void write(Buffer var1) {
-      var1.writeByte(7);
-      var1.writeByte(this.__ay);
-      var1.writeByte(this.__ah?1:0);
-      var1.writeByte(this.__ak);
-      var1.writeByte(this.__aw);
-      var1.writeByte(this.__al);
-      var1.writeByte(this.__ab);
-      var1.writeByte(this.__ae);
-      var1.writeByte(this.__at?1:0);
-      var1.writeShort(this.__ad);
-      var1.writeByte(this.__ap);
-      var1.writeMedium(this.__am);
-      var1.writeShort(this.__an);
-      var1.writeStringCp1252NullCircumfixed(this.__az);
-      var1.writeStringCp1252NullCircumfixed(this.__au);
-      var1.writeStringCp1252NullCircumfixed(this.__ao);
-      var1.writeStringCp1252NullCircumfixed(this.__aa);
-      var1.writeByte(this.__af);
-      var1.writeShort(this.__ax);
-      var1.writeStringCp1252NullCircumfixed(this.__bb);
-      var1.writeStringCp1252NullCircumfixed(this.__bs);
-      var1.writeByte(this.__ai);
-      var1.writeByte(this.__ba);
+   public void write(Buffer buffer) {
+      buffer.writeByte(7);
+      buffer.writeByte(this.field694);
+      buffer.writeByte(this.field695 ? 1 : 0);
+      buffer.writeByte(this.field696);
+      buffer.writeByte(this.field697);
+      buffer.writeByte(this.field698);
+      buffer.writeByte(this.field699);
+      buffer.writeByte(this.field700);
+      buffer.writeByte(this.field701 ? 1 : 0);
+      buffer.writeShort(this.field702);
+      buffer.writeByte(this.field703);
+      buffer.writeMedium(this.field704);
+      buffer.writeShort(this.field705);
+      buffer.writeStringCp1252NullCircumfixed(this.field706);
+      buffer.writeStringCp1252NullCircumfixed(this.field707);
+      buffer.writeStringCp1252NullCircumfixed(this.field708);
+      buffer.writeStringCp1252NullCircumfixed(this.field709);
+      buffer.writeByte(this.field711);
+      buffer.writeShort(this.field710);
+      buffer.writeStringCp1252NullCircumfixed(this.field714);
+      buffer.writeStringCp1252NullCircumfixed(this.field715);
+      buffer.writeByte(this.field712);
+      buffer.writeByte(this.field713);
 
-      for(int var2 = 0; var2 < this.__bq.length; ++var2) {
-         var1.writeInt(this.__bq[var2]);
+      for (int var2 = 0; var2 < this.field716.length; ++var2) {
+         buffer.writeInt(this.field716[var2]);
       }
 
-      var1.writeInt(this.__bn);
-      var1.writeStringCp1252NullCircumfixed(this.__bk);
+      buffer.writeInt(this.field717);
+      buffer.writeStringCp1252NullCircumfixed(this.field718);
    }
 
    @ObfuscatedName("f")
@@ -179,13 +179,13 @@ public class PlatformInfo extends Node {
    @Export("size")
    public int size() {
       byte var1 = 38;
-      int var2 = var1 + Client.method1692(this.__az);
-      var2 += Client.method1692(this.__au);
-      var2 += Client.method1692(this.__ao);
-      var2 += Client.method1692(this.__aa);
-      var2 += Client.method1692(this.__bb);
-      var2 += Client.method1692(this.__bs);
-      var2 += Client.method1692(this.__bk);
+      int var2 = var1 + Client.method1692(this.field706);
+      var2 += Client.method1692(this.field707);
+      var2 += Client.method1692(this.field708);
+      var2 += Client.method1692(this.field709);
+      var2 += Client.method1692(this.field714);
+      var2 += Client.method1692(this.field715);
+      var2 += Client.method1692(this.field718);
       return var2;
    }
 }
diff --git a/runescape-client/src/main/java/Player.java b/runescape-client/src/main/java/Player.java
index 54cb0e8f4d..f51c19a45e 100644
--- a/runescape-client/src/main/java/Player.java
+++ b/runescape-client/src/main/java/Player.java
@@ -74,7 +74,7 @@ public final class Player extends Actor {
    @ObfuscatedGetter(
       intValue = 665272587
    )
-   int __k;
+   int field719;
    @ObfuscatedName("n")
    @ObfuscatedGetter(
       intValue = -1624108131
@@ -85,7 +85,7 @@ public final class Player extends Actor {
    @ObfuscatedGetter(
       intValue = -1771431457
    )
-   int __i;
+   int field720;
    @ObfuscatedName("a")
    @ObfuscatedSignature(
       signature = "Ldu;"
@@ -96,22 +96,22 @@ public final class Player extends Actor {
    @ObfuscatedGetter(
       intValue = 1610462047
    )
-   int __z;
+   int field721;
    @ObfuscatedName("j")
    @ObfuscatedGetter(
       intValue = 224552403
    )
-   int __j;
+   int field722;
    @ObfuscatedName("s")
    @ObfuscatedGetter(
       intValue = 305969541
    )
-   int __s;
+   int field723;
    @ObfuscatedName("t")
    @ObfuscatedGetter(
       intValue = 892671055
    )
-   int __t;
+   int field724;
    @ObfuscatedName("y")
    @Export("isUnanimated")
    boolean isUnanimated;
@@ -149,7 +149,7 @@ public final class Player extends Actor {
    @Export("isInClanChat")
    TriBool isInClanChat;
    @ObfuscatedName("ag")
-   boolean __ag;
+   boolean field725;
    @ObfuscatedName("aq")
    @ObfuscatedGetter(
       intValue = -539678769
@@ -168,7 +168,7 @@ public final class Player extends Actor {
       this.headIconPrayer = -1;
       this.actions = new String[3];
 
-      for(int var1 = 0; var1 < 3; ++var1) {
+      for (int var1 = 0; var1 < 3; ++var1) {
          this.actions[var1] = "";
       }
 
@@ -181,7 +181,7 @@ public final class Player extends Actor {
       this.isHidden = false;
       this.isFriendTriBool = TriBool.TriBool_unknown;
       this.isInClanChat = TriBool.TriBool_unknown;
-      this.__ag = false;
+      this.field725 = false;
    }
 
    @ObfuscatedName("m")
@@ -190,32 +190,32 @@ public final class Player extends Actor {
       garbageValue = "-801926003"
    )
    @Export("read")
-   final void read(Buffer var1) {
-      var1.index = 0;
-      int var2 = var1.readUnsignedByte();
-      this.headIconPk = var1.readByte();
-      this.headIconPrayer = var1.readByte();
+   final void read(Buffer buffer) {
+      buffer.index = 0;
+      int var2 = buffer.readUnsignedByte();
+      this.headIconPk = buffer.readByte();
+      this.headIconPrayer = buffer.readByte();
       int var3 = -1;
       this.team = 0;
       int[] var4 = new int[12];
 
+      int var5;
       int var6;
-      int var7;
-      for(int var5 = 0; var5 < 12; ++var5) {
-         var6 = var1.readUnsignedByte();
-         if(var6 == 0) {
-            var4[var5] = 0;
+      for (int var7 = 0; var7 < 12; ++var7) {
+         var5 = buffer.readUnsignedByte();
+         if (var5 == 0) {
+            var4[var7] = 0;
          } else {
-            var7 = var1.readUnsignedByte();
-            var4[var5] = var7 + (var6 << 8);
-            if(var5 == 0 && var4[0] == 65535) {
-               var3 = var1.__ag_302();
+            var6 = buffer.readUnsignedByte();
+            var4[var7] = var6 + (var5 << 8);
+            if (var7 == 0 && var4[0] == 65535) {
+               var3 = buffer.readUnsignedShort();
                break;
             }
 
-            if(var4[var5] >= 512) {
-               int var8 = Skills.getItemDefinition(var4[var5] - 512).int1;
-               if(var8 != 0) {
+            if (var4[var7] >= 512) {
+               int var8 = Skills.getItemDefinition(var4[var7] - 512).team;
+               if (var8 != 0) {
                   this.team = var8;
                }
             }
@@ -224,70 +224,70 @@ public final class Player extends Actor {
 
       int[] var9 = new int[5];
 
-      for(var6 = 0; var6 < 5; ++var6) {
-         var7 = var1.readUnsignedByte();
-         if(var7 < 0 || var7 >= class229.__hz_l[var6].length) {
-            var7 = 0;
+      for (var5 = 0; var5 < 5; ++var5) {
+         var6 = buffer.readUnsignedByte();
+         if (var6 < 0 || var6 >= class229.field1137[var5].length) {
+            var6 = 0;
          }
 
-         var9[var6] = var7;
+         var9[var5] = var6;
       }
 
-      super.idleSequence = var1.__ag_302();
-      if(super.idleSequence == 65535) {
-         super.idleSequence = -1;
+      super.readySequence = buffer.readUnsignedShort();
+      if (super.readySequence == 65535) {
+         super.readySequence = -1;
       }
 
-      super.turnLeftSequence = var1.__ag_302();
-      if(super.turnLeftSequence == 65535) {
+      super.turnLeftSequence = buffer.readUnsignedShort();
+      if (super.turnLeftSequence == 65535) {
          super.turnLeftSequence = -1;
       }
 
       super.turnRightSequence = super.turnLeftSequence;
-      super.walkSequence = var1.__ag_302();
-      if(super.walkSequence == 65535) {
+      super.walkSequence = buffer.readUnsignedShort();
+      if (super.walkSequence == 65535) {
          super.walkSequence = -1;
       }
 
-      super.walkTurnSequence = var1.__ag_302();
-      if(super.walkTurnSequence == 65535) {
-         super.walkTurnSequence = -1;
+      super.walkBackSequence = buffer.readUnsignedShort();
+      if (super.walkBackSequence == 65535) {
+         super.walkBackSequence = -1;
       }
 
-      super.walkTurnLeftSequence = var1.__ag_302();
-      if(super.walkTurnLeftSequence == 65535) {
-         super.walkTurnLeftSequence = -1;
+      super.walkLeftSequence = buffer.readUnsignedShort();
+      if (super.walkLeftSequence == 65535) {
+         super.walkLeftSequence = -1;
       }
 
-      super.walkTurnRightSequence = var1.__ag_302();
-      if(super.walkTurnRightSequence == 65535) {
-         super.walkTurnRightSequence = -1;
+      super.walkRightSequence = buffer.readUnsignedShort();
+      if (super.walkRightSequence == 65535) {
+         super.walkRightSequence = -1;
       }
 
-      super.runSequence = var1.__ag_302();
-      if(super.runSequence == 65535) {
+      super.runSequence = buffer.readUnsignedShort();
+      if (super.runSequence == 65535) {
          super.runSequence = -1;
       }
 
-      this.username = new Username(var1.readStringCp1252NullTerminated(), KeyHandler.loginType);
+      this.username = new Username(buffer.readStringCp1252NullTerminated(), KeyHandler.loginType);
       this.clearIsFriend();
       this.clearIsInClanChat();
-      if(this == Canvas.localPlayer) {
+      if (this == Canvas.localPlayer) {
          RunException.localPlayerName = this.username.getName();
       }
 
-      this.combatLevel = var1.readUnsignedByte();
-      this.skillLevel = var1.__ag_302();
-      this.isHidden = var1.readUnsignedByte() == 1;
-      if(Client.gameBuild == 0 && Client.rights >= 2) {
+      this.combatLevel = buffer.readUnsignedByte();
+      this.skillLevel = buffer.readUnsignedShort();
+      this.isHidden = buffer.readUnsignedByte() == 1;
+      if (Client.gameBuild == 0 && Client.staffModLevel >= 2) {
          this.isHidden = false;
       }
 
-      if(this.appearance == null) {
+      if (this.appearance == null) {
          this.appearance = new PlayerAppearance();
       }
 
-      this.appearance.__m_385(var4, var9, var2 == 1, var3);
+      this.appearance.update(var4, var9, var2 == 1, var3);
    }
 
    @ObfuscatedName("f")
@@ -297,7 +297,7 @@ public final class Player extends Actor {
    )
    @Export("isFriend")
    boolean isFriend() {
-      if(this.isFriendTriBool == TriBool.TriBool_unknown) {
+      if (this.isFriendTriBool == TriBool.TriBool_unknown) {
          this.checkIsFriend();
       }
 
@@ -321,7 +321,7 @@ public final class Player extends Actor {
    )
    @Export("checkIsFriend")
    void checkIsFriend() {
-      this.isFriendTriBool = WorldMapArea.friendSystem.isFriendAndHasWorld(this.username)?TriBool.TriBool_true:TriBool.TriBool_false;
+      this.isFriendTriBool = WorldMapArea.friendSystem.isFriendAndHasWorld(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false;
    }
 
    @ObfuscatedName("o")
@@ -331,7 +331,7 @@ public final class Player extends Actor {
    )
    @Export("isClanMember")
    boolean isClanMember() {
-      if(this.isInClanChat == TriBool.TriBool_unknown) {
+      if (this.isInClanChat == TriBool.TriBool_unknown) {
          this.updateIsInClanChat();
       }
 
@@ -355,7 +355,7 @@ public final class Player extends Actor {
    )
    @Export("updateIsInClanChat")
    void updateIsInClanChat() {
-      this.isInClanChat = PacketWriter.clanChat != null && PacketWriter.clanChat.contains(this.username)?TriBool.TriBool_true:TriBool.TriBool_false;
+      this.isInClanChat = PacketWriter.clanChat != null && PacketWriter.clanChat.contains(this.username) ? TriBool.TriBool_true : TriBool.TriBool_false;
    }
 
    @ObfuscatedName("l")
@@ -365,7 +365,7 @@ public final class Player extends Actor {
    )
    @Export("transformedSize")
    int transformedSize() {
-      return this.appearance != null && this.appearance.npcTransformId != -1?ObjectDefinition.getNpcDefinition(this.appearance.npcTransformId).size:1;
+      return this.appearance != null && this.appearance.npcTransformId != -1 ? ObjectDefinition.getNpcDefinition(this.appearance.npcTransformId).size : 1;
    }
 
    @ObfuscatedName("e")
@@ -375,61 +375,61 @@ public final class Player extends Actor {
    )
    @Export("getModel")
    protected final Model getModel() {
-      if(this.appearance == null) {
+      if (this.appearance == null) {
          return null;
       } else {
-         SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0?WorldMapAreaData.getSequenceDefinition(super.sequence):null;
-         SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.idleSequence == super.movementSequence && var1 != null?null:WorldMapAreaData.getSequenceDefinition(super.movementSequence);
+         SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? WorldMapAreaData.getSequenceDefinition(super.sequence) : null;
+         SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.readySequence == super.movementSequence && var1 != null ? null : WorldMapAreaData.getSequenceDefinition(super.movementSequence);
          Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame);
-         if(var3 == null) {
+         if (var3 == null) {
             return null;
          } else {
             var3.calculateBoundsCylinder();
             super.defaultHeight = var3.height;
             Model var4;
             Model[] var5;
-            if(!this.isUnanimated && super.spotAnimation != -1 && super.spotAnimationFrame != -1) {
+            if (!this.isUnanimated && super.spotAnimation != -1 && super.spotAnimationFrame != -1) {
                var4 = class50.getSpotAnimationDefinition(super.spotAnimation).getModel(super.spotAnimationFrame);
-               if(var4 != null) {
+               if (var4 != null) {
                   var4.offsetBy(0, -super.heightOffset, 0);
                   var5 = new Model[]{var3, var4};
                   var3 = new Model(var5, 2);
                }
             }
 
-            if(!this.isUnanimated && this.model0 != null) {
-               if(Client.cycle >= this.animationCycleEnd) {
+            if (!this.isUnanimated && this.model0 != null) {
+               if (Client.cycle >= this.animationCycleEnd) {
                   this.model0 = null;
                }
 
-               if(Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) {
+               if (Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) {
                   var4 = this.model0;
-                  var4.offsetBy(this.__k - super.x, this.tileHeight2 - this.tileHeight, this.__i - super.y);
-                  if(super.orientation == 512) {
+                  var4.offsetBy(this.field719 - super.x, this.tileHeight2 - this.tileHeight, this.field720 - super.y);
+                  if (super.orientation == 512) {
                      var4.rotateY90Ccw();
                      var4.rotateY90Ccw();
                      var4.rotateY90Ccw();
-                  } else if(super.orientation == 1024) {
+                  } else if (super.orientation == 1024) {
                      var4.rotateY90Ccw();
                      var4.rotateY90Ccw();
-                  } else if(super.orientation == 1536) {
+                  } else if (super.orientation == 1536) {
                      var4.rotateY90Ccw();
                   }
 
                   var5 = new Model[]{var3, var4};
                   var3 = new Model(var5, 2);
-                  if(super.orientation == 512) {
+                  if (super.orientation == 512) {
                      var4.rotateY90Ccw();
-                  } else if(super.orientation == 1024) {
+                  } else if (super.orientation == 1024) {
                      var4.rotateY90Ccw();
                      var4.rotateY90Ccw();
-                  } else if(super.orientation == 1536) {
+                  } else if (super.orientation == 1536) {
                      var4.rotateY90Ccw();
                      var4.rotateY90Ccw();
                      var4.rotateY90Ccw();
                   }
 
-                  var4.offsetBy(super.x - this.__k, this.tileHeight - this.tileHeight2, super.y - this.__i);
+                  var4.offsetBy(super.x - this.field719, this.tileHeight - this.tileHeight2, super.y - this.field720);
                }
             }
 
@@ -444,19 +444,19 @@ public final class Player extends Actor {
       signature = "(IIBI)V",
       garbageValue = "-2066158770"
    )
-   final void __x_130(int var1, int var2, byte var3) {
-      if(super.sequence != -1 && WorldMapAreaData.getSequenceDefinition(super.sequence).__s == 1) {
+   final void method254(int var1, int var2, byte var3) {
+      if (super.sequence != -1 && WorldMapAreaData.getSequenceDefinition(super.sequence).field782 == 1) {
          super.sequence = -1;
       }
 
-      super.__bc = -1;
-      if(var1 >= 0 && var1 < 104 && var2 >= 0 && var2 < 104) {
-         if(super.pathX[0] >= 0 && super.pathX[0] < 104 && super.pathY[0] >= 0 && super.pathY[0] < 104) {
-            if(var3 == 2) {
+      super.field12 = -1;
+      if (var1 >= 0 && var1 < 104 && var2 >= 0 && var2 < 104) {
+         if (super.pathX[0] >= 0 && super.pathX[0] < 104 && super.pathY[0] >= 0 && super.pathY[0] < 104) {
+            if (var3 == 2) {
                WorldMapIcon2.method316(this, var1, var2, (byte)2);
             }
 
-            this.__a_131(var1, var2, var3);
+            this.method255(var1, var2, var3);
          } else {
             this.resetPath(var1, var2);
          }
@@ -472,12 +472,12 @@ public final class Player extends Actor {
       garbageValue = "1966552419"
    )
    @Export("resetPath")
-   void resetPath(int var1, int var2) {
+   void resetPath(int x, int y) {
       super.pathLength = 0;
-      super.__ch = 0;
-      super.__cq = 0;
-      super.pathX[0] = var1;
-      super.pathY[0] = var2;
+      super.field25 = 0;
+      super.field24 = 0;
+      super.pathX[0] = x;
+      super.pathY[0] = y;
       int var3 = this.transformedSize();
       super.x = super.pathX[0] * 128 + var3 * 64;
       super.y = super.pathY[0] * 128 + var3 * 64;
@@ -488,12 +488,12 @@ public final class Player extends Actor {
       signature = "(IIBI)V",
       garbageValue = "-1280043751"
    )
-   final void __a_131(int var1, int var2, byte var3) {
-      if(super.pathLength < 9) {
+   final void method255(int var1, int var2, byte var3) {
+      if (super.pathLength < 9) {
          ++super.pathLength;
       }
 
-      for(int var4 = super.pathLength; var4 > 0; --var4) {
+      for (int var4 = super.pathLength; var4 > 0; --var4) {
          super.pathX[var4] = super.pathX[var4 - 1];
          super.pathY[var4] = super.pathY[var4 - 1];
          super.pathTraversed[var4] = super.pathTraversed[var4 - 1];
@@ -520,17 +520,18 @@ public final class Player extends Actor {
       garbageValue = "13"
    )
    static void method1281() {
-      if(Client.isSpellSelected) {
-         Widget var0 = class204.getWidgetChild(ServerBuild.__iy_lo, Client.__client_lc);
-         if(var0 != null && var0.onTargetLeave != null) {
+      if (Client.isSpellSelected) {
+         Widget var0 = class204.getWidgetChild(ServerBuild.field788, Client.field220);
+         if (var0 != null && var0.onTargetLeave != null) {
             ScriptEvent var1 = new ScriptEvent();
             var1.widget = var0;
             var1.args0 = var0.onTargetLeave;
-            AbstractIndexCache.runScript(var1);
+            AbstractArchive.runScript(var1);
          }
 
          Client.isSpellSelected = false;
-         class22.method295(var0);
+         WorldMapRectangle.method295(var0);
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/PlayerAppearance.java b/runescape-client/src/main/java/PlayerAppearance.java
index 4a360ac4ce..ad5de3e57f 100644
--- a/runescape-client/src/main/java/PlayerAppearance.java
+++ b/runescape-client/src/main/java/PlayerAppearance.java
@@ -8,9 +8,10 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("PlayerAppearance")
 public class PlayerAppearance {
    @ObfuscatedName("g")
-   public static short[] __hi_g;
+   public static short[] field726;
    @ObfuscatedName("d")
-   static final int[] __hi_d;
+   @Export("equipmentIndices")
+   static final int[] equipmentIndices;
    @ObfuscatedName("k")
    @ObfuscatedSignature(
       signature = "Ler;"
@@ -36,42 +37,38 @@ public class PlayerAppearance {
    @ObfuscatedGetter(
       longValue = -3506189412688081513L
    )
-   long __o;
+   long field728;
    @ObfuscatedName("u")
    @ObfuscatedGetter(
       longValue = 8217880921734028425L
    )
-   long __u;
-
-   static {
-      __hi_d = new int[]{8, 11, 4, 6, 9, 7, 10};
-      PlayerAppearance_cachedModels = new EvictingDualNodeHashTable(260);
-   }
+   long field729;
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "([I[IZII)V",
       garbageValue = "727056871"
    )
-   public void __m_385(int[] var1, int[] var2, boolean var3, int var4) {
-      if(var1 == null) {
-         var1 = new int[12];
+   @Export("update")
+   public void update(int[] equipment, int[] bodyColors, boolean isFemale, int npcTransformId) {
+      if (equipment == null) {
+         equipment = new int[12];
 
-         for(int var5 = 0; var5 < 7; ++var5) {
-            for(int var6 = 0; var6 < KitDefinition.__im_q; ++var6) {
-               KitDefinition var7 = WorldMapSection1.getKitDefinition(var6);
-               if(var7 != null && !var7.__k && var5 + (var3?7:0) == var7.__o) {
-                  var1[__hi_d[var5]] = var6 + 256;
+         for (int var5 = 0; var5 < 7; ++var5) {
+            for (int var6 = 0; var6 < KitDefinition.KitDefinition_totalCount; ++var6) {
+               KitDefinition var7 = WorldMapSection2.getKitDefinition(var6);
+               if (var7 != null && !var7.nonSelectable && var5 + (isFemale ? 7 : 0) == var7.bodypartID) {
+                  equipment[equipmentIndices[var5]] = var6 + 256;
                   break;
                }
             }
          }
       }
 
-      this.equipment = var1;
-      this.bodyColors = var2;
-      this.isFemale = var3;
-      this.npcTransformId = var4;
+      this.equipment = equipment;
+      this.bodyColors = bodyColors;
+      this.isFemale = isFemale;
+      this.npcTransformId = npcTransformId;
       this.setHash();
    }
 
@@ -80,33 +77,38 @@ public class PlayerAppearance {
       signature = "(IZI)V",
       garbageValue = "-581016899"
    )
-   public void __f_386(int var1, boolean var2) {
-      if(var1 != 1 || !this.isFemale) {
-         int var3 = this.equipment[__hi_d[var1]];
-         if(var3 != 0) {
+   public void method257(int var1, boolean var2) {
+      if (var1 != 1 || !this.isFemale) {
+         int var3 = this.equipment[equipmentIndices[var1]];
+         if (var3 != 0) {
             var3 -= 256;
 
             KitDefinition var4;
             do {
-               if(!var2) {
-                  --var3;
-                  if(var3 < 0) {
-                     var3 = KitDefinition.__im_q - 1;
-                  }
-               } else {
-                  ++var3;
-                  if(var3 >= KitDefinition.__im_q) {
-                     var3 = 0;
-                  }
-               }
+               do {
+                  do {
+                     if (!var2) {
+                        --var3;
+                        if (var3 < 0) {
+                           var3 = KitDefinition.KitDefinition_totalCount - 1;
+                        }
+                     } else {
+                        ++var3;
+                        if (var3 >= KitDefinition.KitDefinition_totalCount) {
+                           var3 = 0;
+                        }
+                     }
 
-               var4 = WorldMapSection1.getKitDefinition(var3);
-            } while(var4 == null || var4.__k || var1 + (this.isFemale?7:0) != var4.__o);
+                     var4 = WorldMapSection2.getKitDefinition(var3);
+                  } while(var4 == null);
+               } while(var4.nonSelectable);
+            } while(var1 + (this.isFemale ? 7 : 0) != var4.bodypartID);
 
-            this.equipment[__hi_d[var1]] = var3 + 256;
+            this.equipment[equipmentIndices[var1]] = var3 + 256;
             this.setHash();
          }
       }
+
    }
 
    @ObfuscatedName("q")
@@ -114,19 +116,19 @@ public class PlayerAppearance {
       signature = "(IZI)V",
       garbageValue = "1416503110"
    )
-   public void __q_387(int var1, boolean var2) {
+   public void method258(int var1, boolean var2) {
       int var3 = this.bodyColors[var1];
-      if(!var2) {
+      if (!var2) {
          do {
             --var3;
-            if(var3 < 0) {
-               var3 = class229.__hz_l[var1].length - 1;
+            if (var3 < 0) {
+               var3 = class229.field1137[var1].length - 1;
             }
          } while(!PacketBuffer.method4062(var1, var3));
       } else {
          do {
             ++var3;
-            if(var3 >= class229.__hz_l[var1].length) {
+            if (var3 >= class229.field1137[var1].length) {
                var3 = 0;
             }
          } while(!PacketBuffer.method4062(var1, var3));
@@ -141,10 +143,11 @@ public class PlayerAppearance {
       signature = "(ZB)V",
       garbageValue = "-90"
    )
-   public void __w_388(boolean var1) {
-      if(this.isFemale != var1) {
-         this.__m_385((int[])null, this.bodyColors, var1, -1);
+   public void method259(boolean var1) {
+      if (this.isFemale != var1) {
+         this.update((int[])null, this.bodyColors, var1, -1);
       }
+
    }
 
    @ObfuscatedName("o")
@@ -152,20 +155,20 @@ public class PlayerAppearance {
       signature = "(Lgr;I)V",
       garbageValue = "779254645"
    )
-   public void __o_389(Buffer var1) {
-      var1.writeByte(this.isFemale?1:0);
+   public void method260(Buffer var1) {
+      var1.writeByte(this.isFemale ? 1 : 0);
 
       int var2;
-      for(var2 = 0; var2 < 7; ++var2) {
-         int var3 = this.equipment[__hi_d[var2]];
-         if(var3 == 0) {
+      for (var2 = 0; var2 < 7; ++var2) {
+         int var3 = this.equipment[equipmentIndices[var2]];
+         if (var3 == 0) {
             var1.writeByte(-1);
          } else {
             var1.writeByte(var3 - 256);
          }
       }
 
-      for(var2 = 0; var2 < 5; ++var2) {
+      for (var2 = 0; var2 < 5; ++var2) {
          var1.writeByte(this.bodyColors[var2]);
       }
 
@@ -178,39 +181,39 @@ public class PlayerAppearance {
    )
    @Export("setHash")
    void setHash() {
-      long var1 = this.__o;
+      long var1 = this.field728;
       int var3 = this.equipment[5];
       int var4 = this.equipment[9];
       this.equipment[5] = var4;
       this.equipment[9] = var3;
-      this.__o = 0L;
+      this.field728 = 0L;
 
       int var5;
-      for(var5 = 0; var5 < 12; ++var5) {
-         this.__o <<= 4;
-         if(this.equipment[var5] >= 256) {
-            this.__o += (long)(this.equipment[var5] - 256);
+      for (var5 = 0; var5 < 12; ++var5) {
+         this.field728 <<= 4;
+         if (this.equipment[var5] >= 256) {
+            this.field728 += (long)(this.equipment[var5] - 256);
          }
       }
 
-      if(this.equipment[0] >= 256) {
-         this.__o += (long)(this.equipment[0] - 256 >> 4);
+      if (this.equipment[0] >= 256) {
+         this.field728 += (long)(this.equipment[0] - 256 >> 4);
       }
 
-      if(this.equipment[1] >= 256) {
-         this.__o += (long)(this.equipment[1] - 256 >> 8);
+      if (this.equipment[1] >= 256) {
+         this.field728 += (long)(this.equipment[1] - 256 >> 8);
       }
 
-      for(var5 = 0; var5 < 5; ++var5) {
-         this.__o <<= 3;
-         this.__o += (long)this.bodyColors[var5];
+      for (var5 = 0; var5 < 5; ++var5) {
+         this.field728 <<= 3;
+         this.field728 += (long)this.bodyColors[var5];
       }
 
-      this.__o <<= 1;
-      this.__o += (long)(this.isFemale?1:0);
+      this.field728 <<= 1;
+      this.field728 += (long)(this.isFemale ? 1 : 0);
       this.equipment[5] = var3;
       this.equipment[9] = var4;
-      if(var1 != 0L && this.__o != var1) {
+      if (var1 != 0L && this.field728 != var1) {
          PlayerAppearance_cachedModels.remove(var1);
       }
 
@@ -223,109 +226,109 @@ public class PlayerAppearance {
    )
    @Export("getModel")
    public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) {
-      if(this.npcTransformId != -1) {
+      if (this.npcTransformId != -1) {
          return ObjectDefinition.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4);
       } else {
-         long var5 = this.__o;
+         long var5 = this.field728;
          int[] var7 = this.equipment;
-         if(var1 != null && (var1.shield >= 0 || var1.weapon >= 0)) {
+         if (var1 != null && (var1.shield >= 0 || var1.weapon >= 0)) {
             var7 = new int[12];
 
-            for(int var15 = 0; var15 < 12; ++var15) {
-               var7[var15] = this.equipment[var15];
+            for (int var8 = 0; var8 < 12; ++var8) {
+               var7[var8] = this.equipment[var8];
             }
 
-            if(var1.shield >= 0) {
+            if (var1.shield >= 0) {
                var5 += (long)(var1.shield - this.equipment[5] << 40);
                var7[5] = var1.shield;
             }
 
-            if(var1.weapon >= 0) {
+            if (var1.weapon >= 0) {
                var5 += (long)(var1.weapon - this.equipment[3] << 48);
                var7[3] = var1.weapon;
             }
          }
 
-         Model var8 = (Model)PlayerAppearance_cachedModels.get(var5);
-         if(var8 == null) {
+         Model var15 = (Model)PlayerAppearance_cachedModels.get(var5);
+         if (var15 == null) {
             boolean var9 = false;
 
-            int var11;
-            for(int var10 = 0; var10 < 12; ++var10) {
-               var11 = var7[var10];
-               if(var11 >= 256 && var11 < 512 && !WorldMapSection1.getKitDefinition(var11 - 256).__w_413()) {
+            int var10;
+            for (int var11 = 0; var11 < 12; ++var11) {
+               var10 = var7[var11];
+               if (var10 >= 256 && var10 < 512 && !WorldMapSection2.getKitDefinition(var10 - 256).ready()) {
                   var9 = true;
                }
 
-               if(var11 >= 512 && !Skills.getItemDefinition(var11 - 512).__z_431(this.isFemale)) {
+               if (var10 >= 512 && !Skills.getItemDefinition(var10 - 512).method145(this.isFemale)) {
                   var9 = true;
                }
             }
 
-            if(var9) {
-               if(this.__u != -1L) {
-                  var8 = (Model)PlayerAppearance_cachedModels.get(this.__u);
+            if (var9) {
+               if (this.field729 != -1L) {
+                  var15 = (Model)PlayerAppearance_cachedModels.get(this.field729);
                }
 
-               if(var8 == null) {
+               if (var15 == null) {
                   return null;
                }
             }
 
-            if(var8 == null) {
-               ModelData[] var16 = new ModelData[12];
-               var11 = 0;
+            if (var15 == null) {
+               ModelData[] var17 = new ModelData[12];
+               var10 = 0;
 
-               int var13;
-               for(int var12 = 0; var12 < 12; ++var12) {
-                  var13 = var7[var12];
+               int var12;
+               for (int var13 = 0; var13 < 12; ++var13) {
+                  var12 = var7[var13];
                   ModelData var14;
-                  if(var13 >= 256 && var13 < 512) {
-                     var14 = WorldMapSection1.getKitDefinition(var13 - 256).__o_414();
-                     if(var14 != null) {
-                        var16[var11++] = var14;
+                  if (var12 >= 256 && var12 < 512) {
+                     var14 = WorldMapSection2.getKitDefinition(var12 - 256).getModelData();
+                     if (var14 != null) {
+                        var17[var10++] = var14;
                      }
                   }
 
-                  if(var13 >= 512) {
-                     var14 = Skills.getItemDefinition(var13 - 512).__j_432(this.isFemale);
-                     if(var14 != null) {
-                        var16[var11++] = var14;
+                  if (var12 >= 512) {
+                     var14 = Skills.getItemDefinition(var12 - 512).method146(this.isFemale);
+                     if (var14 != null) {
+                        var17[var10++] = var14;
                      }
                   }
                }
 
-               ModelData var18 = new ModelData(var16, var11);
+               ModelData var18 = new ModelData(var17, var10);
 
-               for(var13 = 0; var13 < 5; ++var13) {
-                  if(this.bodyColors[var13] < class229.__hz_l[var13].length) {
-                     var18.recolor(__hi_g[var13], class229.__hz_l[var13][this.bodyColors[var13]]);
+               for (var12 = 0; var12 < 5; ++var12) {
+                  if (this.bodyColors[var12] < class229.field1137[var12].length) {
+                     var18.recolor(field726[var12], class229.field1137[var12][this.bodyColors[var12]]);
                   }
 
-                  if(this.bodyColors[var13] < IndexCacheLoader.__bd_x[var13].length) {
-                     var18.recolor(class227.__hj_e[var13], IndexCacheLoader.__bd_x[var13][this.bodyColors[var13]]);
+                  if (this.bodyColors[var12] < ArchiveLoader.field406[var12].length) {
+                     var18.recolor(class227.field1136[var12], ArchiveLoader.field406[var12][this.bodyColors[var12]]);
                   }
                }
 
-               var8 = var18.toModel(64, 850, -30, -50, -30);
-               PlayerAppearance_cachedModels.put(var8, var5);
-               this.__u = var5;
+               var15 = var18.toModel(64, 850, -30, -50, -30);
+               PlayerAppearance_cachedModels.put(var15, var5);
+               this.field729 = var5;
             }
          }
 
-         if(var1 == null && var3 == null) {
-            return var8;
+         if (var1 == null && var3 == null) {
+            return var15;
          } else {
-            Model var17;
-            if(var1 != null && var3 != null) {
-               var17 = var1.animateSequence2(var8, var2, var3, var4);
-            } else if(var1 != null) {
-               var17 = var1.animateSequence(var8, var2);
+            Model var16;
+            if (var1 != null && var3 != null) {
+               var16 = var1.animateSequence2(var15, var2, var3, var4);
+            } else if (var1 != null) {
+               var16 = var1.animateSequence(var15, var2);
             } else {
-               var17 = var3.animateSequence(var8, var4);
+               var16 = var3.animateSequence(var15, var4);
             }
 
-            return var17;
+            return var16;
          }
       }
    }
@@ -337,57 +340,57 @@ public class PlayerAppearance {
    )
    @Export("getModelData")
    ModelData getModelData() {
-      if(this.npcTransformId != -1) {
+      if (this.npcTransformId != -1) {
          return ObjectDefinition.getNpcDefinition(this.npcTransformId).getModelData();
       } else {
          boolean var1 = false;
 
-         int var3;
-         for(int var2 = 0; var2 < 12; ++var2) {
-            var3 = this.equipment[var2];
-            if(var3 >= 256 && var3 < 512 && !WorldMapSection1.getKitDefinition(var3 - 256).__u_415()) {
+         int var2;
+         for (int var3 = 0; var3 < 12; ++var3) {
+            var2 = this.equipment[var3];
+            if (var2 >= 256 && var2 < 512 && !WorldMapSection2.getKitDefinition(var2 - 256).method161()) {
                var1 = true;
             }
 
-            if(var3 >= 512 && !Skills.getItemDefinition(var3 - 512).__s_433(this.isFemale)) {
+            if (var2 >= 512 && !Skills.getItemDefinition(var2 - 512).method147(this.isFemale)) {
                var1 = true;
             }
          }
 
-         if(var1) {
+         if (var1) {
             return null;
          } else {
             ModelData[] var7 = new ModelData[12];
-            var3 = 0;
+            var2 = 0;
 
-            int var5;
-            for(int var4 = 0; var4 < 12; ++var4) {
-               var5 = this.equipment[var4];
+            int var4;
+            for (int var5 = 0; var5 < 12; ++var5) {
+               var4 = this.equipment[var5];
                ModelData var6;
-               if(var5 >= 256 && var5 < 512) {
-                  var6 = WorldMapSection1.getKitDefinition(var5 - 256).__g_416();
-                  if(var6 != null) {
-                     var7[var3++] = var6;
+               if (var4 >= 256 && var4 < 512) {
+                  var6 = WorldMapSection2.getKitDefinition(var4 - 256).method162();
+                  if (var6 != null) {
+                     var7[var2++] = var6;
                   }
                }
 
-               if(var5 >= 512) {
-                  var6 = Skills.getItemDefinition(var5 - 512).__t_434(this.isFemale);
-                  if(var6 != null) {
-                     var7[var3++] = var6;
+               if (var4 >= 512) {
+                  var6 = Skills.getItemDefinition(var4 - 512).method148(this.isFemale);
+                  if (var6 != null) {
+                     var7[var2++] = var6;
                   }
                }
             }
 
-            ModelData var8 = new ModelData(var7, var3);
+            ModelData var8 = new ModelData(var7, var2);
 
-            for(var5 = 0; var5 < 5; ++var5) {
-               if(this.bodyColors[var5] < class229.__hz_l[var5].length) {
-                  var8.recolor(__hi_g[var5], class229.__hz_l[var5][this.bodyColors[var5]]);
+            for (var4 = 0; var4 < 5; ++var4) {
+               if (this.bodyColors[var4] < class229.field1137[var4].length) {
+                  var8.recolor(field726[var4], class229.field1137[var4][this.bodyColors[var4]]);
                }
 
-               if(this.bodyColors[var5] < IndexCacheLoader.__bd_x[var5].length) {
-                  var8.recolor(class227.__hj_e[var5], IndexCacheLoader.__bd_x[var5][this.bodyColors[var5]]);
+               if (this.bodyColors[var4] < ArchiveLoader.field406[var4].length) {
+                  var8.recolor(class227.field1136[var4], ArchiveLoader.field406[var4][this.bodyColors[var4]]);
                }
             }
 
@@ -403,6 +406,11 @@ public class PlayerAppearance {
    )
    @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 + ObjectDefinition.getNpcDefinition(this.npcTransformId).id;
+      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 + ObjectDefinition.getNpcDefinition(this.npcTransformId).id;
+   }
+
+   static {
+      equipmentIndices = new int[]{8, 11, 4, 6, 9, 7, 10};
+      PlayerAppearance_cachedModels = new EvictingDualNodeHashTable(260);
    }
 }
diff --git a/runescape-client/src/main/java/PlayerType.java b/runescape-client/src/main/java/PlayerType.java
index 8d3c185b3e..e42ad431ce 100644
--- a/runescape-client/src/main/java/PlayerType.java
+++ b/runescape-client/src/main/java/PlayerType.java
@@ -44,8 +44,9 @@ public enum PlayerType implements Enumerated {
    )
    @Export("PlayerType_hardcoreIronman")
    PlayerType_hardcoreIronman(5, 10, false, false, true);
+
    @ObfuscatedName("ak")
-   static Image __ij_ak;
+   static Image field730;
    @ObfuscatedName("g")
    @ObfuscatedGetter(
       intValue = 1999564657
@@ -65,7 +66,7 @@ public enum PlayerType implements Enumerated {
    @Export("isUser")
    public final boolean isUser;
 
-   PlayerType(int var3, int var4, boolean var5, boolean var6, boolean var7) {
+   private PlayerType(int var3, int var4, boolean var5, boolean var6, boolean var7) {
       this.id = var3;
       this.modIcon = var4;
       this.isPrivileged = var6;
@@ -90,12 +91,12 @@ public enum PlayerType implements Enumerated {
    @Export("clearItemContainer")
    static void clearItemContainer(int var0) {
       ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
-      if(var1 != null) {
-         for(int var2 = 0; var2 < var1.ids.length; ++var2) {
+      if (var1 != null) {
+         for (int var2 = 0; var2 < var1.ids.length; ++var2) {
             var1.ids[var2] = -1;
             var1.quantities[var2] = 0;
          }
-
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/Players.java b/runescape-client/src/main/java/Players.java
index 5a6fc3c3c4..031248e6ca 100644
--- a/runescape-client/src/main/java/Players.java
+++ b/runescape-client/src/main/java/Players.java
@@ -10,14 +10,14 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("Players")
 public class Players {
    @ObfuscatedName("q")
-   static byte[] __cq_q;
+   static byte[] field731;
    @ObfuscatedName("w")
-   static byte[] __cq_w;
+   static byte[] field732;
    @ObfuscatedName("o")
    @ObfuscatedSignature(
       signature = "[Lgr;"
    )
-   static Buffer[] __cq_o;
+   static Buffer[] field733;
    @ObfuscatedName("u")
    @ObfuscatedGetter(
       intValue = -766468303
@@ -31,9 +31,9 @@ public class Players {
    @ObfuscatedGetter(
       intValue = 945250525
    )
-   static int __cq_l;
+   static int field734;
    @ObfuscatedName("e")
-   static int[] __cq_e;
+   static int[] field735;
    @ObfuscatedName("x")
    @Export("Players_regions")
    static int[] Players_regions;
@@ -47,14 +47,14 @@ public class Players {
    @ObfuscatedGetter(
       intValue = -22568397
    )
-   static int __cq_n;
+   static int field736;
    @ObfuscatedName("i")
-   static int[] __cq_i;
+   static int[] field737;
    @ObfuscatedName("a")
    @ObfuscatedSignature(
       signature = "Lgr;"
    )
-   static Buffer __cq_a;
+   static Buffer field738;
    @ObfuscatedName("y")
    @ObfuscatedSignature(
       signature = "Lgr;"
@@ -62,29 +62,13 @@ public class Players {
    @Export("NetCache_reference")
    public static Buffer NetCache_reference;
 
-   static {
-      __cq_q = new byte[2048];
-      __cq_w = new byte[2048];
-      __cq_o = new Buffer[2048];
-      Players_count = 0;
-      Players_indices = new int[2048];
-      __cq_l = 0;
-      __cq_e = new int[2048];
-      Players_regions = new int[2048];
-      Players_orientations = new int[2048];
-      Players_targetIndices = new int[2048];
-      __cq_n = 0;
-      __cq_i = new int[2048];
-      __cq_a = new Buffer(new byte[5000]);
-   }
-
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "(Ljava/lang/Throwable;Ljava/lang/String;)Lfx;"
    )
    public static RunException method2120(Throwable var0, String var1) {
       RunException var2;
-      if(var0 instanceof RunException) {
+      if (var0 instanceof RunException) {
          var2 = (RunException)var0;
          var2.string = var2.string + ' ' + var1;
       } else {
@@ -101,30 +85,30 @@ public class Players {
    )
    @Export("newPcmPlayer")
    public static final PcmPlayer newPcmPlayer(TaskHandler var0, int var1, int var2) {
-      if(var1 >= 0 && var1 < 2) {
-         if(var2 < 256) {
+      if (var1 >= 0 && var1 < 2) {
+         if (var2 < 256) {
             var2 = 256;
          }
 
          try {
             PcmPlayer var3 = class65.pcmPlayerProvider.player();
-            var3.samples = new int[(PcmPlayer.isStereo?2:1) * 256];
+            var3.samples = new int[(PcmPlayer.isStereo ? 2 : 1) * 256];
             var3.frequency = var2;
             var3.init();
             var3.capacity = (var2 & -1024) + 1024;
-            if(var3.capacity > 16384) {
+            if (var3.capacity > 16384) {
                var3.capacity = 16384;
             }
 
             var3.open(var3.capacity);
-            if(Login.pcmPlayerCount > 0 && Messages.soundSystem == null) {
+            if (Login.pcmPlayerCount > 0 && Messages.soundSystem == null) {
                Messages.soundSystem = new SoundSystem();
                Friend.soundSystemExecutor = Executors.newScheduledThreadPool(1);
                Friend.soundSystemExecutor.scheduleAtFixedRate(Messages.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS);
             }
 
-            if(Messages.soundSystem != null) {
-               if(Messages.soundSystem.players[var1] != null) {
+            if (Messages.soundSystem != null) {
+               if (Messages.soundSystem.players[var1] != null) {
                   throw new IllegalArgumentException();
                }
 
@@ -146,9 +130,9 @@ public class Players {
       garbageValue = "46802049"
    )
    static final void method2112(int var0, int var1, int var2, int var3) {
-      for(int var4 = 0; var4 < Client.rootWidgetCount; ++var4) {
-         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) {
-            Client.__client_od[var4] = true;
+      for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) {
+         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) {
+            Client.field100[var4] = true;
          }
       }
 
@@ -160,26 +144,40 @@ public class Players {
       garbageValue = "-1991202495"
    )
    @Export("clickWidget")
-   static final void clickWidget(Widget var0, int var1, int var2) {
-      if(Client.clickedWidget == null && !Client.isMenuOpen) {
-         if(var0 != null && class48.method869(var0) != null) {
-            Client.clickedWidget = var0;
-            Client.clickedWidgetParent = class48.method869(var0);
-            Client.widgetClickX = var1;
-            Client.widgetClickY = var2;
-            MouseRecorder.widgetDragDuration = 0;
-            Client.isDraggingWidget = false;
-            int var3 = Client.menuOptionsCount - 1;
-            if(var3 != -1) {
-               UnitPriceComparator.tempMenuAction = new MenuAction();
-               UnitPriceComparator.tempMenuAction.argument1 = Client.menuArguments1[var3];
-               UnitPriceComparator.tempMenuAction.argument2 = Client.menuArguments2[var3];
-               UnitPriceComparator.tempMenuAction.opcode = Client.menuOpcodes[var3];
-               UnitPriceComparator.tempMenuAction.argument0 = Client.menuArguments0[var3];
-               UnitPriceComparator.tempMenuAction.action = Client.menuActions[var3];
-            }
-
+   static final void clickWidget(Widget component, int x, int y) {
+      if (Client.clickedWidget == null && !Client.isMenuOpen && component != null && class48.method869(component) != null) {
+         Client.clickedWidget = component;
+         Client.clickedWidgetParent = class48.method869(component);
+         Client.widgetClickX = x;
+         Client.widgetClickY = y;
+         MouseRecorder.widgetDragDuration = 0;
+         Client.isDraggingWidget = false;
+         int var3 = Client.menuOptionsCount - 1;
+         if (var3 != -1) {
+            GrandExchangeOfferUnitPriceComparator.tempMenuAction = new MenuAction();
+            GrandExchangeOfferUnitPriceComparator.tempMenuAction.argument1 = Client.menuArguments1[var3];
+            GrandExchangeOfferUnitPriceComparator.tempMenuAction.argument2 = Client.menuArguments2[var3];
+            GrandExchangeOfferUnitPriceComparator.tempMenuAction.opcode = Client.menuOpcodes[var3];
+            GrandExchangeOfferUnitPriceComparator.tempMenuAction.argument0 = Client.menuArguments0[var3];
+            GrandExchangeOfferUnitPriceComparator.tempMenuAction.action = Client.menuActions[var3];
          }
       }
+
+   }
+
+   static {
+      field731 = new byte[2048];
+      field732 = new byte[2048];
+      field733 = new Buffer[2048];
+      Players_count = 0;
+      Players_indices = new int[2048];
+      field734 = 0;
+      field735 = new int[2048];
+      Players_regions = new int[2048];
+      Players_orientations = new int[2048];
+      Players_targetIndices = new int[2048];
+      field736 = 0;
+      field737 = new int[2048];
+      field738 = new Buffer(new byte[5000]);
    }
 }
diff --git a/runescape-client/src/main/java/Projectile.java b/runescape-client/src/main/java/Projectile.java
index e3e2945ea1..1712df6d1e 100644
--- a/runescape-client/src/main/java/Projectile.java
+++ b/runescape-client/src/main/java/Projectile.java
@@ -154,7 +154,7 @@ public final class Projectile extends Entity {
       this.endHeight = var11;
       this.isMoving = false;
       int var12 = class50.getSpotAnimationDefinition(this.id).sequence;
-      if(var12 != -1) {
+      if (var12 != -1) {
          this.sequenceDefinition = WorldMapAreaData.getSequenceDefinition(var12);
       } else {
          this.sequenceDefinition = null;
@@ -168,26 +168,26 @@ public final class Projectile extends Entity {
       garbageValue = "-553495769"
    )
    @Export("setDestination")
-   final void setDestination(int var1, int var2, int var3, int var4) {
+   final void setDestination(int x, int y, int height, int cycle) {
       double var5;
-      if(!this.isMoving) {
-         var5 = (double)(var1 - this.sourceX);
-         double var7 = (double)(var2 - this.sourceY);
+      if (!this.isMoving) {
+         var5 = (double)(x - this.sourceX);
+         double var7 = (double)(y - this.sourceY);
          double var9 = Math.sqrt(var5 * var5 + var7 * var7);
          this.x = (double)this.sourceX + var5 * (double)this.startHeight / var9;
          this.y = (double)this.sourceY + (double)this.startHeight * var7 / var9;
          this.z = (double)this.sourceZ;
       }
 
-      var5 = (double)(this.cycleEnd + 1 - var4);
-      this.speedX = ((double)var1 - this.x) / var5;
-      this.speedY = ((double)var2 - this.y) / var5;
+      var5 = (double)(this.cycleEnd + 1 - cycle);
+      this.speedX = ((double)x - this.x) / var5;
+      this.speedY = ((double)y - this.y) / var5;
       this.speed = Math.sqrt(this.speedY * this.speedY + this.speedX * this.speedX);
-      if(!this.isMoving) {
+      if (!this.isMoving) {
          this.speedZ = -this.speed * Math.tan(0.02454369D * (double)this.slope);
       }
 
-      this.accelerationZ = ((double)var3 - this.z - var5 * this.speedZ) * 2.0D / (var5 * var5);
+      this.accelerationZ = ((double)height - this.z - var5 * this.speedZ) * 2.0D / (var5 * var5);
    }
 
    @ObfuscatedName("f")
@@ -196,21 +196,21 @@ public final class Projectile extends Entity {
       garbageValue = "1351865817"
    )
    @Export("advance")
-   final void advance(int var1) {
+   final void advance(int cycles) {
       this.isMoving = true;
-      this.x += this.speedX * (double)var1;
-      this.y += (double)var1 * this.speedY;
-      this.z += (double)var1 * this.accelerationZ * 0.5D * (double)var1 + this.speedZ * (double)var1;
-      this.speedZ += this.accelerationZ * (double)var1;
+      this.x += this.speedX * (double)cycles;
+      this.y += (double)cycles * this.speedY;
+      this.z += (double)cycles * this.accelerationZ * 0.5D * (double)cycles + this.speedZ * (double)cycles;
+      this.speedZ += this.accelerationZ * (double)cycles;
       this.yaw = (int)(Math.atan2(this.speedX, this.speedY) * 325.949D) + 1024 & 2047;
       this.pitch = (int)(Math.atan2(this.speedZ, this.speed) * 325.949D) & 2047;
-      if(this.sequenceDefinition != null) {
-         this.frameCycle += var1;
+      if (this.sequenceDefinition != null) {
+         this.frameCycle += cycles;
 
-         while(true) {
+         while (true) {
             do {
                do {
-                  if(this.frameCycle <= this.sequenceDefinition.frameLengths[this.frame]) {
+                  if (this.frameCycle <= this.sequenceDefinition.frameLengths[this.frame]) {
                      return;
                   }
 
@@ -235,7 +235,7 @@ public final class Projectile extends Entity {
    protected final Model getModel() {
       SpotAnimationDefinition var1 = class50.getSpotAnimationDefinition(this.id);
       Model var2 = var1.getModel(this.frame);
-      if(var2 == null) {
+      if (var2 == null) {
          return null;
       } else {
          var2.rotateZ(this.pitch);
@@ -249,26 +249,27 @@ public final class Projectile extends Entity {
       garbageValue = "95"
    )
    @Export("byteArrayToObject")
-   public static Object byteArrayToObject(byte[] var0, boolean var1) {
-      if(var0 == null) {
+   public static Object byteArrayToObject(byte[] bytes, boolean copyArray) {
+      if (bytes == null) {
          return null;
       } else {
-         if(var0.length > 136 && !AbstractByteArrayCopier.directBufferUnavailable) {
+         if (bytes.length > 136 && !AbstractByteArrayCopier.directBufferUnavailable) {
             try {
                DirectByteArrayCopier var2 = new DirectByteArrayCopier();
-               var2.set(var0);
+               var2.set(bytes);
                return var2;
             } catch (Throwable var3) {
                AbstractByteArrayCopier.directBufferUnavailable = true;
             }
          }
 
-         return var0;
+         return bytes;
       }
    }
 
    @ObfuscatedName("g")
-   static final void method2081(long var0) {
+   @Export("addEntityTagAtMouse")
+   static final void addEntityTagAtMouse(long var0) {
       ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var0;
    }
 
diff --git a/runescape-client/src/main/java/RasterProvider.java b/runescape-client/src/main/java/RasterProvider.java
index 1de95514a1..af00547fa4 100644
--- a/runescape-client/src/main/java/RasterProvider.java
+++ b/runescape-client/src/main/java/RasterProvider.java
@@ -52,8 +52,8 @@ public final class RasterProvider extends AbstractRasterProvider {
       garbageValue = "-430495007"
    )
    @Export("drawFull")
-   public final void drawFull(int var1, int var2) {
-      this.drawFull0(this.component0.getGraphics(), var1, var2);
+   public final void drawFull(int x, int y) {
+      this.drawFull0(this.component0.getGraphics(), x, y);
    }
 
    @ObfuscatedName("q")
@@ -62,8 +62,8 @@ public final class RasterProvider extends AbstractRasterProvider {
       garbageValue = "18"
    )
    @Export("draw")
-   public final void draw(int var1, int var2, int var3, int var4) {
-      this.draw0(this.component0.getGraphics(), var1, var2, var3, var4);
+   public final void draw(int x, int y, int width, int height) {
+      this.draw0(this.component0.getGraphics(), x, y, width, height);
    }
 
    @ObfuscatedName("w")
@@ -72,9 +72,9 @@ public final class RasterProvider extends AbstractRasterProvider {
       garbageValue = "-2102440865"
    )
    @Export("drawFull0")
-   final void drawFull0(Graphics var1, int var2, int var3) {
+   final void drawFull0(Graphics graphics, int x, int y) {
       try {
-         var1.drawImage(this.image, var2, var3, this.component0);
+         graphics.drawImage(this.image, x, y, this.component0);
       } catch (Exception var5) {
          this.component0.repaint();
       }
@@ -87,12 +87,12 @@ public final class RasterProvider extends AbstractRasterProvider {
       garbageValue = "3"
    )
    @Export("draw0")
-   final void draw0(Graphics var1, int var2, int var3, int var4, int var5) {
+   final void draw0(Graphics graphics, int x, int y, int width, int height) {
       try {
-         Shape var6 = var1.getClip();
-         var1.clipRect(var2, var3, var4, var5);
-         var1.drawImage(this.image, 0, 0, this.component0);
-         var1.setClip(var6);
+         Shape var6 = graphics.getClip();
+         graphics.clipRect(x, y, width, height);
+         graphics.drawImage(this.image, 0, 0, this.component0);
+         graphics.setClip(var6);
       } catch (Exception var7) {
          this.component0.repaint();
       }
diff --git a/runescape-client/src/main/java/Rasterizer2D.java b/runescape-client/src/main/java/Rasterizer2D.java
index 477a8d02cc..181dc8e39c 100644
--- a/runescape-client/src/main/java/Rasterizer2D.java
+++ b/runescape-client/src/main/java/Rasterizer2D.java
@@ -28,20 +28,13 @@ public class Rasterizer2D extends DualNode {
    @Export("Rasterizer2D_xClipEnd")
    public static int Rasterizer2D_xClipEnd;
 
-   static {
-      Rasterizer2D_yClipStart = 0;
-      Rasterizer2D_yClipEnd = 0;
-      Rasterizer2D_xClipStart = 0;
-      Rasterizer2D_xClipEnd = 0;
-   }
-
    @ObfuscatedName("dp")
    @Export("Rasterizer2D_replace")
-   public static void Rasterizer2D_replace(int[] var0, int var1, int var2) {
-      Rasterizer2D_pixels = var0;
-      Rasterizer2D_width = var1;
-      Rasterizer2D_height = var2;
-      Rasterizer2D_setClip(0, 0, var1, var2);
+   public static void Rasterizer2D_replace(int[] pixels, int width, int height) {
+      Rasterizer2D_pixels = pixels;
+      Rasterizer2D_width = width;
+      Rasterizer2D_height = height;
+      Rasterizer2D_setClip(0, 0, width, height);
    }
 
    @ObfuscatedName("ds")
@@ -55,66 +48,66 @@ public class Rasterizer2D extends DualNode {
 
    @ObfuscatedName("di")
    @Export("Rasterizer2D_setClip")
-   public static void Rasterizer2D_setClip(int var0, int var1, int var2, int var3) {
-      if(var0 < 0) {
-         var0 = 0;
+   public static void Rasterizer2D_setClip(int xStart, int yStart, int xEnd, int yEnd) {
+      if (xStart < 0) {
+         xStart = 0;
       }
 
-      if(var1 < 0) {
-         var1 = 0;
+      if (yStart < 0) {
+         yStart = 0;
       }
 
-      if(var2 > Rasterizer2D_width) {
-         var2 = Rasterizer2D_width;
+      if (xEnd > Rasterizer2D_width) {
+         xEnd = Rasterizer2D_width;
       }
 
-      if(var3 > Rasterizer2D_height) {
-         var3 = Rasterizer2D_height;
+      if (yEnd > Rasterizer2D_height) {
+         yEnd = Rasterizer2D_height;
       }
 
-      Rasterizer2D_xClipStart = var0;
-      Rasterizer2D_yClipStart = var1;
-      Rasterizer2D_xClipEnd = var2;
-      Rasterizer2D_yClipEnd = var3;
+      Rasterizer2D_xClipStart = xStart;
+      Rasterizer2D_yClipStart = yStart;
+      Rasterizer2D_xClipEnd = xEnd;
+      Rasterizer2D_yClipEnd = yEnd;
    }
 
    @ObfuscatedName("dc")
    @Export("Rasterizer2D_expandClip")
-   public static void Rasterizer2D_expandClip(int var0, int var1, int var2, int var3) {
-      if(Rasterizer2D_xClipStart < var0) {
-         Rasterizer2D_xClipStart = var0;
+   public static void Rasterizer2D_expandClip(int xStart, int yStart, int xEnd, int yEnd) {
+      if (Rasterizer2D_xClipStart < xStart) {
+         Rasterizer2D_xClipStart = xStart;
       }
 
-      if(Rasterizer2D_yClipStart < var1) {
-         Rasterizer2D_yClipStart = var1;
+      if (Rasterizer2D_yClipStart < yStart) {
+         Rasterizer2D_yClipStart = yStart;
       }
 
-      if(Rasterizer2D_xClipEnd > var2) {
-         Rasterizer2D_xClipEnd = var2;
+      if (Rasterizer2D_xClipEnd > xEnd) {
+         Rasterizer2D_xClipEnd = xEnd;
       }
 
-      if(Rasterizer2D_yClipEnd > var3) {
-         Rasterizer2D_yClipEnd = var3;
+      if (Rasterizer2D_yClipEnd > yEnd) {
+         Rasterizer2D_yClipEnd = yEnd;
       }
 
    }
 
    @ObfuscatedName("dg")
    @Export("Rasterizer2D_getClipArray")
-   public static void Rasterizer2D_getClipArray(int[] var0) {
-      var0[0] = Rasterizer2D_xClipStart;
-      var0[1] = Rasterizer2D_yClipStart;
-      var0[2] = Rasterizer2D_xClipEnd;
-      var0[3] = Rasterizer2D_yClipEnd;
+   public static void Rasterizer2D_getClipArray(int[] dst) {
+      dst[0] = Rasterizer2D_xClipStart;
+      dst[1] = Rasterizer2D_yClipStart;
+      dst[2] = Rasterizer2D_xClipEnd;
+      dst[3] = Rasterizer2D_yClipEnd;
    }
 
    @ObfuscatedName("db")
    @Export("Rasterizer2D_setClipArray")
-   public static void Rasterizer2D_setClipArray(int[] var0) {
-      Rasterizer2D_xClipStart = var0[0];
-      Rasterizer2D_yClipStart = var0[1];
-      Rasterizer2D_xClipEnd = var0[2];
-      Rasterizer2D_yClipEnd = var0[3];
+   public static void Rasterizer2D_setClipArray(int[] src) {
+      Rasterizer2D_xClipStart = src[0];
+      Rasterizer2D_yClipStart = src[1];
+      Rasterizer2D_xClipEnd = src[2];
+      Rasterizer2D_yClipEnd = src[3];
    }
 
    @ObfuscatedName("dd")
@@ -123,7 +116,7 @@ public class Rasterizer2D extends DualNode {
       int var0 = 0;
 
       int var1;
-      for(var1 = Rasterizer2D_width * Rasterizer2D_height - 7; var0 < var1; Rasterizer2D_pixels[var0++] = 0) {
+      for (var1 = Rasterizer2D_width * Rasterizer2D_height - 7; var0 < var1; Rasterizer2D_pixels[var0++] = 0) {
          Rasterizer2D_pixels[var0++] = 0;
          Rasterizer2D_pixels[var0++] = 0;
          Rasterizer2D_pixels[var0++] = 0;
@@ -133,8 +126,7 @@ public class Rasterizer2D extends DualNode {
          Rasterizer2D_pixels[var0++] = 0;
       }
 
-      for(var1 += 7; var0 < var1; Rasterizer2D_pixels[var0++] = 0) {
-         ;
+      for (var1 += 7; var0 < var1; Rasterizer2D_pixels[var0++] = 0) {
       }
 
    }
@@ -142,20 +134,20 @@ public class Rasterizer2D extends DualNode {
    @Export("drawCircle")
    @ObfuscatedName("dy")
    static void drawCircle(int var0, int var1, int var2, int var3) {
-      if(var2 == 0) {
+      if (var2 == 0) {
          Rasterizer2D_setPixel(var0, var1, var3);
       } else {
-         if(var2 < 0) {
+         if (var2 < 0) {
             var2 = -var2;
          }
 
          int var4 = var1 - var2;
-         if(var4 < Rasterizer2D_yClipStart) {
+         if (var4 < Rasterizer2D_yClipStart) {
             var4 = Rasterizer2D_yClipStart;
          }
 
          int var5 = var2 + var1 + 1;
-         if(var5 > Rasterizer2D_yClipEnd) {
+         if (var5 > Rasterizer2D_yClipEnd) {
             var5 = Rasterizer2D_yClipEnd;
          }
 
@@ -165,7 +157,7 @@ public class Rasterizer2D extends DualNode {
          int var9 = var1 - var4;
          int var10 = var9 * var9;
          int var11 = var10 - var9;
-         if(var1 > var5) {
+         if (var1 > var5) {
             var1 = var5;
          }
 
@@ -173,25 +165,25 @@ public class Rasterizer2D extends DualNode {
          int var13;
          int var14;
          int var15;
-         while(var6 < var1) {
-            while(var11 <= var7 || var10 <= var7) {
+         while (var6 < var1) {
+            while (var11 <= var7 || var10 <= var7) {
                var10 = var10 + var8 + var8;
                var11 += var8++ + var8;
             }
 
             var12 = var0 - var8 + 1;
-            if(var12 < Rasterizer2D_xClipStart) {
+            if (var12 < Rasterizer2D_xClipStart) {
                var12 = Rasterizer2D_xClipStart;
             }
 
             var13 = var0 + var8;
-            if(var13 > Rasterizer2D_xClipEnd) {
+            if (var13 > Rasterizer2D_xClipEnd) {
                var13 = Rasterizer2D_xClipEnd;
             }
 
             var14 = var12 + var6 * Rasterizer2D_width;
 
-            for(var15 = var12; var15 < var13; ++var15) {
+            for (var15 = var12; var15 < var13; ++var15) {
                Rasterizer2D_pixels[var14++] = var3;
             }
 
@@ -205,166 +197,166 @@ public class Rasterizer2D extends DualNode {
          var11 = var7 + var9 * var9;
          var10 = var11 - var2;
 
-         for(var11 -= var9; var6 < var5; var10 += var9++ + var9) {
-            while(var11 > var7 && var10 > var7) {
+         for (var11 -= var9; var6 < var5; var10 += var9++ + var9) {
+            while (var11 > var7 && var10 > var7) {
                var11 -= var8-- + var8;
                var10 -= var8 + var8;
             }
 
             var12 = var0 - var8;
-            if(var12 < Rasterizer2D_xClipStart) {
+            if (var12 < Rasterizer2D_xClipStart) {
                var12 = Rasterizer2D_xClipStart;
             }
 
             var13 = var0 + var8;
-            if(var13 > Rasterizer2D_xClipEnd - 1) {
+            if (var13 > Rasterizer2D_xClipEnd - 1) {
                var13 = Rasterizer2D_xClipEnd - 1;
             }
 
             var14 = var12 + var6 * Rasterizer2D_width;
 
-            for(var15 = var12; var15 <= var13; ++var15) {
+            for (var15 = var12; var15 <= var13; ++var15) {
                Rasterizer2D_pixels[var14++] = var3;
             }
 
             ++var6;
             var11 = var11 + var9 + var9;
          }
-
       }
+
    }
 
    @ObfuscatedName("dk")
    @Export("Rasterizer2D_drawCircleAlpha")
-   public static void Rasterizer2D_drawCircleAlpha(int var0, int var1, int var2, int var3, int var4) {
-      if(var4 != 0) {
-         if(var4 == 256) {
+   public static void Rasterizer2D_drawCircleAlpha(int var0, int var1, int var2, int var3, int opacity) {
+      if (opacity != 0) {
+         if (opacity == 256) {
             drawCircle(var0, var1, var2, var3);
          } else {
-            if(var2 < 0) {
+            if (var2 < 0) {
                var2 = -var2;
             }
 
-            int var5 = 256 - var4;
-            int var6 = (var3 >> 16 & 255) * var4;
-            int var7 = (var3 >> 8 & 255) * var4;
-            int var8 = var4 * (var3 & 255);
-            int var12 = var1 - var2;
-            if(var12 < Rasterizer2D_yClipStart) {
-               var12 = Rasterizer2D_yClipStart;
+            int var5 = 256 - opacity;
+            int var6 = (var3 >> 16 & 255) * opacity;
+            int var7 = (var3 >> 8 & 255) * opacity;
+            int var8 = opacity * (var3 & 255);
+            int var9 = var1 - var2;
+            if (var9 < Rasterizer2D_yClipStart) {
+               var9 = Rasterizer2D_yClipStart;
             }
 
-            int var13 = var2 + var1 + 1;
-            if(var13 > Rasterizer2D_yClipEnd) {
-               var13 = Rasterizer2D_yClipEnd;
+            int var10 = var2 + var1 + 1;
+            if (var10 > Rasterizer2D_yClipEnd) {
+               var10 = Rasterizer2D_yClipEnd;
             }
 
-            int var14 = var12;
-            int var15 = var2 * var2;
-            int var16 = 0;
-            int var17 = var1 - var12;
-            int var18 = var17 * var17;
-            int var19 = var18 - var17;
-            if(var1 > var13) {
-               var1 = var13;
+            int var11 = var9;
+            int var12 = var2 * var2;
+            int var13 = 0;
+            int var14 = var1 - var9;
+            int var15 = var14 * var14;
+            int var16 = var15 - var14;
+            if (var1 > var10) {
+               var1 = var10;
             }
 
-            int var9;
-            int var10;
-            int var11;
+            int var17;
+            int var18;
+            int var19;
             int var20;
             int var21;
             int var22;
             int var23;
             int var24;
-            while(var14 < var1) {
-               while(var19 <= var15 || var18 <= var15) {
-                  var18 = var18 + var16 + var16;
-                  var19 += var16++ + var16;
+            while (var11 < var1) {
+               while (var16 <= var12 || var15 <= var12) {
+                  var15 = var15 + var13 + var13;
+                  var16 += var13++ + var13;
                }
 
-               var20 = var0 - var16 + 1;
-               if(var20 < Rasterizer2D_xClipStart) {
+               var20 = var0 - var13 + 1;
+               if (var20 < Rasterizer2D_xClipStart) {
                   var20 = Rasterizer2D_xClipStart;
                }
 
-               var21 = var0 + var16;
-               if(var21 > Rasterizer2D_xClipEnd) {
+               var21 = var0 + var13;
+               if (var21 > Rasterizer2D_xClipEnd) {
                   var21 = Rasterizer2D_xClipEnd;
                }
 
-               var22 = var20 + var14 * Rasterizer2D_width;
+               var22 = var20 + var11 * Rasterizer2D_width;
 
-               for(var23 = var20; var23 < var21; ++var23) {
-                  var9 = var5 * (Rasterizer2D_pixels[var22] >> 16 & 255);
-                  var10 = (Rasterizer2D_pixels[var22] >> 8 & 255) * var5;
-                  var11 = var5 * (Rasterizer2D_pixels[var22] & 255);
-                  var24 = (var8 + var11 >> 8) + (var6 + var9 >> 8 << 16) + (var7 + var10 >> 8 << 8);
+               for (var23 = var20; var23 < var21; ++var23) {
+                  var17 = var5 * (Rasterizer2D_pixels[var22] >> 16 & 255);
+                  var18 = (Rasterizer2D_pixels[var22] >> 8 & 255) * var5;
+                  var19 = var5 * (Rasterizer2D_pixels[var22] & 255);
+                  var24 = (var8 + var19 >> 8) + (var6 + var17 >> 8 << 16) + (var7 + var18 >> 8 << 8);
                   Rasterizer2D_pixels[var22++] = var24;
                }
 
-               ++var14;
-               var18 -= var17-- + var17;
-               var19 -= var17 + var17;
+               ++var11;
+               var15 -= var14-- + var14;
+               var16 -= var14 + var14;
             }
 
-            var16 = var2;
-            var17 = -var17;
-            var19 = var15 + var17 * var17;
-            var18 = var19 - var2;
+            var13 = var2;
+            var14 = -var14;
+            var16 = var12 + var14 * var14;
+            var15 = var16 - var2;
 
-            for(var19 -= var17; var14 < var13; var18 += var17++ + var17) {
-               while(var19 > var15 && var18 > var15) {
-                  var19 -= var16-- + var16;
-                  var18 -= var16 + var16;
+            for (var16 -= var14; var11 < var10; var15 += var14++ + var14) {
+               while (var16 > var12 && var15 > var12) {
+                  var16 -= var13-- + var13;
+                  var15 -= var13 + var13;
                }
 
-               var20 = var0 - var16;
-               if(var20 < Rasterizer2D_xClipStart) {
+               var20 = var0 - var13;
+               if (var20 < Rasterizer2D_xClipStart) {
                   var20 = Rasterizer2D_xClipStart;
                }
 
-               var21 = var0 + var16;
-               if(var21 > Rasterizer2D_xClipEnd - 1) {
+               var21 = var0 + var13;
+               if (var21 > Rasterizer2D_xClipEnd - 1) {
                   var21 = Rasterizer2D_xClipEnd - 1;
                }
 
-               var22 = var20 + var14 * Rasterizer2D_width;
+               var22 = var20 + var11 * Rasterizer2D_width;
 
-               for(var23 = var20; var23 <= var21; ++var23) {
-                  var9 = var5 * (Rasterizer2D_pixels[var22] >> 16 & 255);
-                  var10 = (Rasterizer2D_pixels[var22] >> 8 & 255) * var5;
-                  var11 = var5 * (Rasterizer2D_pixels[var22] & 255);
-                  var24 = (var8 + var11 >> 8) + (var6 + var9 >> 8 << 16) + (var7 + var10 >> 8 << 8);
+               for (var23 = var20; var23 <= var21; ++var23) {
+                  var17 = var5 * (Rasterizer2D_pixels[var22] >> 16 & 255);
+                  var18 = (Rasterizer2D_pixels[var22] >> 8 & 255) * var5;
+                  var19 = var5 * (Rasterizer2D_pixels[var22] & 255);
+                  var24 = (var8 + var19 >> 8) + (var6 + var17 >> 8 << 16) + (var7 + var18 >> 8 << 8);
                   Rasterizer2D_pixels[var22++] = var24;
                }
 
-               ++var14;
-               var19 = var19 + var17 + var17;
+               ++var11;
+               var16 = var16 + var14 + var14;
             }
-
          }
       }
+
    }
 
    @ObfuscatedName("dl")
    @Export("Rasterizer2D_fillRectangleAlpha")
    public static void Rasterizer2D_fillRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) {
-      if(var0 < Rasterizer2D_xClipStart) {
+      if (var0 < Rasterizer2D_xClipStart) {
          var2 -= Rasterizer2D_xClipStart - var0;
          var0 = Rasterizer2D_xClipStart;
       }
 
-      if(var1 < Rasterizer2D_yClipStart) {
+      if (var1 < Rasterizer2D_yClipStart) {
          var3 -= Rasterizer2D_yClipStart - var1;
          var1 = Rasterizer2D_yClipStart;
       }
 
-      if(var0 + var2 > Rasterizer2D_xClipEnd) {
+      if (var0 + var2 > Rasterizer2D_xClipEnd) {
          var2 = Rasterizer2D_xClipEnd - var0;
       }
 
-      if(var3 + var1 > Rasterizer2D_yClipEnd) {
+      if (var3 + var1 > Rasterizer2D_yClipEnd) {
          var3 = Rasterizer2D_yClipEnd - var1;
       }
 
@@ -373,8 +365,8 @@ public class Rasterizer2D extends DualNode {
       int var7 = Rasterizer2D_width - var2;
       int var8 = var0 + Rasterizer2D_width * var1;
 
-      for(int var9 = 0; var9 < var3; ++var9) {
-         for(int var10 = -var2; var10 < 0; ++var10) {
+      for (int var9 = 0; var9 < var3; ++var9) {
+         for (int var10 = -var2; var10 < 0; ++var10) {
             int var11 = Rasterizer2D_pixels[var8];
             var11 = ((var11 & 16711935) * var6 >> 8 & 16711935) + (var6 * (var11 & 65280) >> 8 & 65280);
             Rasterizer2D_pixels[var8++] = var11 + var4;
@@ -387,31 +379,31 @@ public class Rasterizer2D extends DualNode {
 
    @ObfuscatedName("dr")
    @Export("Rasterizer2D_fillRectangle")
-   public static void Rasterizer2D_fillRectangle(int var0, int var1, int var2, int var3, int var4) {
-      if(var0 < Rasterizer2D_xClipStart) {
-         var2 -= Rasterizer2D_xClipStart - var0;
-         var0 = Rasterizer2D_xClipStart;
+   public static void Rasterizer2D_fillRectangle(int x, int y, int width, int height, int color) {
+      if (x < Rasterizer2D_xClipStart) {
+         width -= Rasterizer2D_xClipStart - x;
+         x = Rasterizer2D_xClipStart;
       }
 
-      if(var1 < Rasterizer2D_yClipStart) {
-         var3 -= Rasterizer2D_yClipStart - var1;
-         var1 = Rasterizer2D_yClipStart;
+      if (y < Rasterizer2D_yClipStart) {
+         height -= Rasterizer2D_yClipStart - y;
+         y = Rasterizer2D_yClipStart;
       }
 
-      if(var0 + var2 > Rasterizer2D_xClipEnd) {
-         var2 = Rasterizer2D_xClipEnd - var0;
+      if (x + width > Rasterizer2D_xClipEnd) {
+         width = Rasterizer2D_xClipEnd - x;
       }
 
-      if(var3 + var1 > Rasterizer2D_yClipEnd) {
-         var3 = Rasterizer2D_yClipEnd - var1;
+      if (height + y > Rasterizer2D_yClipEnd) {
+         height = Rasterizer2D_yClipEnd - y;
       }
 
-      int var5 = Rasterizer2D_width - var2;
-      int var6 = var0 + Rasterizer2D_width * var1;
+      int var5 = Rasterizer2D_width - width;
+      int var6 = x + Rasterizer2D_width * y;
 
-      for(int var7 = -var3; var7 < 0; ++var7) {
-         for(int var8 = -var2; var8 < 0; ++var8) {
-            Rasterizer2D_pixels[var6++] = var4;
+      for (int var7 = -height; var7 < 0; ++var7) {
+         for (int var8 = -width; var8 < 0; ++var8) {
+            Rasterizer2D_pixels[var6++] = color;
          }
 
          var6 += var5;
@@ -419,93 +411,93 @@ public class Rasterizer2D extends DualNode {
 
    }
 
-   @Export("drawGradient")
+   @Export("Rasterizer2D_fillRectangleGradient")
    @ObfuscatedName("dw")
-   public static void drawGradient(int var0, int var1, int var2, int var3, int var4, int var5) {
-      if(var2 > 0 && var3 > 0) {
+   public static void Rasterizer2D_fillRectangleGradient(int x, int y, int width, int height, int rgbTop, int rgbBot) {
+      if (width > 0 && height > 0) {
          int var6 = 0;
-         int var7 = 65536 / var3;
-         if(var0 < Rasterizer2D_xClipStart) {
-            var2 -= Rasterizer2D_xClipStart - var0;
-            var0 = Rasterizer2D_xClipStart;
+         int var7 = 65536 / height;
+         if (x < Rasterizer2D_xClipStart) {
+            width -= Rasterizer2D_xClipStart - x;
+            x = Rasterizer2D_xClipStart;
          }
 
-         if(var1 < Rasterizer2D_yClipStart) {
-            var6 += (Rasterizer2D_yClipStart - var1) * var7;
-            var3 -= Rasterizer2D_yClipStart - var1;
-            var1 = Rasterizer2D_yClipStart;
+         if (y < Rasterizer2D_yClipStart) {
+            var6 += (Rasterizer2D_yClipStart - y) * var7;
+            height -= Rasterizer2D_yClipStart - y;
+            y = Rasterizer2D_yClipStart;
          }
 
-         if(var0 + var2 > Rasterizer2D_xClipEnd) {
-            var2 = Rasterizer2D_xClipEnd - var0;
+         if (x + width > Rasterizer2D_xClipEnd) {
+            width = Rasterizer2D_xClipEnd - x;
          }
 
-         if(var3 + var1 > Rasterizer2D_yClipEnd) {
-            var3 = Rasterizer2D_yClipEnd - var1;
+         if (height + y > Rasterizer2D_yClipEnd) {
+            height = Rasterizer2D_yClipEnd - y;
          }
 
-         int var8 = Rasterizer2D_width - var2;
-         int var9 = var0 + Rasterizer2D_width * var1;
+         int var8 = Rasterizer2D_width - width;
+         int var9 = x + Rasterizer2D_width * y;
 
-         for(int var10 = -var3; var10 < 0; ++var10) {
+         for (int var10 = -height; var10 < 0; ++var10) {
             int var11 = 65536 - var6 >> 8;
             int var12 = var6 >> 8;
-            int var13 = (var12 * (var5 & 16711935) + var11 * (var4 & 16711935) & -16711936) + (var12 * (var5 & 65280) + var11 * (var4 & 65280) & 16711680) >>> 8;
+            int var13 = (var12 * (rgbBot & 16711935) + var11 * (rgbTop & 16711935) & -16711936) + (var12 * (rgbBot & 65280) + var11 * (rgbTop & 65280) & 16711680) >>> 8;
 
-            for(int var14 = -var2; var14 < 0; ++var14) {
+            for (int var14 = -width; var14 < 0; ++var14) {
                Rasterizer2D_pixels[var9++] = var13;
             }
 
             var9 += var8;
             var6 += var7;
          }
-
       }
+
    }
 
    @ObfuscatedName("dv")
-   @Export("drawGradientAlpha")
-   public static void drawGradientAlpha(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
-      if(var2 > 0 && var3 > 0) {
+   @Export("Rasterizer2D_fillRectangleGradientAlpha")
+   public static void Rasterizer2D_fillRectangleGradientAlpha(int x, int y, int width, int height, int rgbTop, int rgbBot, int alphaTop, int alphaBot) {
+      if (width > 0 && height > 0) {
          int var8 = 0;
-         int var9 = 65536 / var3;
-         if(var0 < Rasterizer2D_xClipStart) {
-            var2 -= Rasterizer2D_xClipStart - var0;
-            var0 = Rasterizer2D_xClipStart;
+         int var9 = 65536 / height;
+         if (x < Rasterizer2D_xClipStart) {
+            width -= Rasterizer2D_xClipStart - x;
+            x = Rasterizer2D_xClipStart;
          }
 
-         if(var1 < Rasterizer2D_yClipStart) {
-            var8 += (Rasterizer2D_yClipStart - var1) * var9;
-            var3 -= Rasterizer2D_yClipStart - var1;
-            var1 = Rasterizer2D_yClipStart;
+         if (y < Rasterizer2D_yClipStart) {
+            var8 += (Rasterizer2D_yClipStart - y) * var9;
+            height -= Rasterizer2D_yClipStart - y;
+            y = Rasterizer2D_yClipStart;
          }
 
-         if(var0 + var2 > Rasterizer2D_xClipEnd) {
-            var2 = Rasterizer2D_xClipEnd - var0;
+         if (x + width > Rasterizer2D_xClipEnd) {
+            width = Rasterizer2D_xClipEnd - x;
          }
 
-         if(var3 + var1 > Rasterizer2D_yClipEnd) {
-            var3 = Rasterizer2D_yClipEnd - var1;
+         if (height + y > Rasterizer2D_yClipEnd) {
+            height = Rasterizer2D_yClipEnd - y;
          }
 
-         int var10 = Rasterizer2D_width - var2;
-         int var11 = var0 + Rasterizer2D_width * var1;
+         int var10 = Rasterizer2D_width - width;
+         int var11 = x + Rasterizer2D_width * y;
 
-         for(int var12 = -var3; var12 < 0; ++var12) {
+         for (int var12 = -height; var12 < 0; ++var12) {
             int var13 = 65536 - var8 >> 8;
             int var14 = var8 >> 8;
-            int var15 = (var13 * var6 + var14 * var7 & 65280) >>> 8;
-            if(var15 == 0) {
+            int var15 = (var13 * alphaTop + var14 * alphaBot & 65280) >>> 8;
+            if (var15 == 0) {
                var11 += Rasterizer2D_width;
                var8 += var9;
             } else {
-               int var16 = (var14 * (var5 & 16711935) + var13 * (var4 & 16711935) & -16711936) + (var14 * (var5 & 65280) + var13 * (var4 & 65280) & 16711680) >>> 8;
+               int var16 = (var14 * (rgbBot & 16711935) + var13 * (rgbTop & 16711935) & -16711936) + (var14 * (rgbBot & 65280) + var13 * (rgbTop & 65280) & 16711680) >>> 8;
                int var17 = 255 - var15;
                int var18 = ((var16 & 16711935) * var15 >> 8 & 16711935) + (var15 * (var16 & 65280) >> 8 & 65280);
 
-               for(int var19 = -var2; var19 < 0; ++var19) {
+               for (int var19 = -width; var19 < 0; ++var19) {
                   int var20 = Rasterizer2D_pixels[var11];
-                  if(var20 == 0) {
+                  if (var20 == 0) {
                      Rasterizer2D_pixels[var11++] = var18;
                   } else {
                      var20 = ((var20 & 16711935) * var17 >> 8 & 16711935) + (var17 * (var20 & 65280) >> 8 & 65280);
@@ -517,8 +509,8 @@ public class Rasterizer2D extends DualNode {
                var8 += var9;
             }
          }
-
       }
+
    }
 
    @ObfuscatedName("do")
@@ -527,305 +519,302 @@ public class Rasterizer2D extends DualNode {
       garbageValue = "1"
    )
    @Export("raster2d7")
-   public static void raster2d7(int var0, int var1, int var2, int var3, int var4, int var5, byte[] var6, int var7) {
-      if(var0 + var2 >= 0 && var3 + var1 >= 0) {
-         if(var0 < Rasterizer2D_width && var1 < Rasterizer2D_height) {
-            int var8 = 0;
-            int var9 = 0;
-            if(var0 < 0) {
-               var8 -= var0;
-               var2 += var0;
+   public static void raster2d7(int x, int y, int width, int height, int var4, int var5, byte[] var6, int var7) {
+      if (x + width >= 0 && height + y >= 0 && x < Rasterizer2D_width && y < Rasterizer2D_height) {
+         int var8 = 0;
+         int var9 = 0;
+         if (x < 0) {
+            var8 -= x;
+            width += x;
+         }
+
+         if (y < 0) {
+            var9 -= y;
+            height += y;
+         }
+
+         if (x + width > Rasterizer2D_width) {
+            width = Rasterizer2D_width - x;
+         }
+
+         if (height + y > Rasterizer2D_height) {
+            height = Rasterizer2D_height - y;
+         }
+
+         int var10 = var6.length / var7;
+         int var11 = Rasterizer2D_width - width;
+         int var12 = var4 >>> 24;
+         int var13 = var5 >>> 24;
+         int var14;
+         int var15;
+         int var16;
+         int var17;
+         int var18;
+         if (var12 == 255 && var13 == 255) {
+            var14 = x + var8 + (var9 + y) * Rasterizer2D_width;
+
+            for (var15 = var9 + y; var15 < height + var9 + y; ++var15) {
+               for (var16 = x + var8; var16 < x + var8 + width; ++var16) {
+                  var17 = (var15 - y) % var10;
+                  var18 = (var16 - x) % var7;
+                  if (var6[var18 + var17 * var7] != 0) {
+                     Rasterizer2D_pixels[var14++] = var5;
+                  } else {
+                     Rasterizer2D_pixels[var14++] = var4;
+                  }
+               }
+
+               var14 += var11;
             }
+         } else {
+            var14 = x + var8 + (var9 + y) * Rasterizer2D_width;
 
-            if(var1 < 0) {
-               var9 -= var1;
-               var3 += var1;
-            }
-
-            if(var0 + var2 > Rasterizer2D_width) {
-               var2 = Rasterizer2D_width - var0;
-            }
-
-            if(var3 + var1 > Rasterizer2D_height) {
-               var3 = Rasterizer2D_height - var1;
-            }
-
-            int var10 = var6.length / var7;
-            int var11 = Rasterizer2D_width - var2;
-            int var12 = var4 >>> 24;
-            int var13 = var5 >>> 24;
-            int var14;
-            int var15;
-            int var16;
-            int var17;
-            int var18;
-            if(var12 == 255 && var13 == 255) {
-               var14 = var0 + var8 + (var9 + var1) * Rasterizer2D_width;
-
-               for(var15 = var9 + var1; var15 < var3 + var9 + var1; ++var15) {
-                  for(var16 = var0 + var8; var16 < var0 + var8 + var2; ++var16) {
-                     var17 = (var15 - var1) % var10;
-                     var18 = (var16 - var0) % var7;
-                     if(var6[var18 + var17 * var7] != 0) {
-                        Rasterizer2D_pixels[var14++] = var5;
-                     } else {
-                        Rasterizer2D_pixels[var14++] = var4;
-                     }
+            for (var15 = var9 + y; var15 < height + var9 + y; ++var15) {
+               for (var16 = x + var8; var16 < x + var8 + width; ++var16) {
+                  var17 = (var15 - y) % var10;
+                  var18 = (var16 - x) % var7;
+                  int var19 = var4;
+                  if (var6[var18 + var17 * var7] != 0) {
+                     var19 = var5;
                   }
 
-                  var14 += var11;
+                  int var20 = var19 >>> 24;
+                  int var21 = 255 - var20;
+                  int var22 = Rasterizer2D_pixels[var14];
+                  int var23 = ((var19 & 16711935) * var20 + (var22 & 16711935) * var21 & -16711936) + (var20 * (var19 & 65280) + var21 * (var22 & 65280) & 16711680) >> 8;
+                  Rasterizer2D_pixels[var14++] = var23;
                }
-            } else {
-               var14 = var0 + var8 + (var9 + var1) * Rasterizer2D_width;
 
-               for(var15 = var9 + var1; var15 < var3 + var9 + var1; ++var15) {
-                  for(var16 = var0 + var8; var16 < var0 + var8 + var2; ++var16) {
-                     var17 = (var15 - var1) % var10;
-                     var18 = (var16 - var0) % var7;
-                     int var19 = var4;
-                     if(var6[var18 + var17 * var7] != 0) {
-                        var19 = var5;
-                     }
-
-                     int var20 = var19 >>> 24;
-                     int var21 = 255 - var20;
-                     int var22 = Rasterizer2D_pixels[var14];
-                     int var23 = ((var19 & 16711935) * var20 + (var22 & 16711935) * var21 & -16711936) + (var20 * (var19 & 65280) + var21 * (var22 & 65280) & 16711680) >> 8;
-                     Rasterizer2D_pixels[var14++] = var23;
-                  }
-
-                  var14 += var11;
-               }
+               var14 += var11;
             }
-
          }
       }
+
    }
 
    @ObfuscatedName("dh")
    @Export("Rasterizer2D_drawRectangle")
-   public static void Rasterizer2D_drawRectangle(int var0, int var1, int var2, int var3, int var4) {
-      Rasterizer2D_drawHorizontalLine(var0, var1, var2, var4);
-      Rasterizer2D_drawHorizontalLine(var0, var3 + var1 - 1, var2, var4);
-      Rasterizer2D_drawVerticalLine(var0, var1, var3, var4);
-      Rasterizer2D_drawVerticalLine(var0 + var2 - 1, var1, var3, var4);
+   public static void Rasterizer2D_drawRectangle(int x, int y, int width, int height, int color) {
+      Rasterizer2D_drawHorizontalLine(x, y, width, color);
+      Rasterizer2D_drawHorizontalLine(x, height + y - 1, width, color);
+      Rasterizer2D_drawVerticalLine(x, y, height, color);
+      Rasterizer2D_drawVerticalLine(x + width - 1, y, height, color);
    }
 
    @ObfuscatedName("dz")
    @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);
-      Rasterizer2D_drawHorizontalLineAlpha(var0, var3 + var1 - 1, var2, var4, var5);
-      if(var3 >= 3) {
-         Rasterizer2D_drawVerticalLineAlpha(var0, var1 + 1, var3 - 2, var4, var5);
-         Rasterizer2D_drawVerticalLineAlpha(var0 + var2 - 1, var1 + 1, var3 - 2, var4, var5);
+   public static void Rasterizer2D_drawRectangleAlpha(int x, int y, int width, int height, int rgb, int alpha) {
+      Rasterizer2D_drawHorizontalLineAlpha(x, y, width, rgb, alpha);
+      Rasterizer2D_drawHorizontalLineAlpha(x, height + y - 1, width, rgb, alpha);
+      if (height >= 3) {
+         Rasterizer2D_drawVerticalLineAlpha(x, y + 1, height - 2, rgb, alpha);
+         Rasterizer2D_drawVerticalLineAlpha(x + width - 1, y + 1, height - 2, rgb, alpha);
       }
 
    }
 
    @ObfuscatedName("dj")
    @Export("Rasterizer2D_drawHorizontalLine")
-   public static void Rasterizer2D_drawHorizontalLine(int var0, int var1, int var2, int var3) {
-      if(var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) {
-         if(var0 < Rasterizer2D_xClipStart) {
-            var2 -= Rasterizer2D_xClipStart - var0;
-            var0 = Rasterizer2D_xClipStart;
+   public static void Rasterizer2D_drawHorizontalLine(int x, int y, int length, int color) {
+      if (y >= Rasterizer2D_yClipStart && y < Rasterizer2D_yClipEnd) {
+         if (x < Rasterizer2D_xClipStart) {
+            length -= Rasterizer2D_xClipStart - x;
+            x = Rasterizer2D_xClipStart;
          }
 
-         if(var0 + var2 > Rasterizer2D_xClipEnd) {
-            var2 = Rasterizer2D_xClipEnd - var0;
+         if (x + length > Rasterizer2D_xClipEnd) {
+            length = Rasterizer2D_xClipEnd - x;
          }
 
-         int var4 = var0 + Rasterizer2D_width * var1;
+         int var4 = x + Rasterizer2D_width * y;
 
-         for(int var5 = 0; var5 < var2; ++var5) {
-            Rasterizer2D_pixels[var4 + var5] = var3; // XXX
+         for (int var5 = 0; var5 < length; ++var5) {
+            Rasterizer2D_pixels[var4 + var5] = color;
          }
-
       }
+
    }
 
    @ObfuscatedName("du")
    @Export("Rasterizer2D_drawHorizontalLineAlpha")
-   static void Rasterizer2D_drawHorizontalLineAlpha(int var0, int var1, int var2, int var3, int var4) {
-      if(var1 >= Rasterizer2D_yClipStart && var1 < Rasterizer2D_yClipEnd) {
-         if(var0 < Rasterizer2D_xClipStart) {
-            var2 -= Rasterizer2D_xClipStart - var0;
-            var0 = Rasterizer2D_xClipStart;
+   static void Rasterizer2D_drawHorizontalLineAlpha(int x, int y, int length, int rgb, int alpha) {
+      if (y >= Rasterizer2D_yClipStart && y < Rasterizer2D_yClipEnd) {
+         if (x < Rasterizer2D_xClipStart) {
+            length -= Rasterizer2D_xClipStart - x;
+            x = Rasterizer2D_xClipStart;
          }
 
-         if(var0 + var2 > Rasterizer2D_xClipEnd) {
-            var2 = Rasterizer2D_xClipEnd - var0;
+         if (x + length > Rasterizer2D_xClipEnd) {
+            length = Rasterizer2D_xClipEnd - x;
          }
 
-         int var5 = 256 - var4;
-         int var6 = (var3 >> 16 & 255) * var4;
-         int var7 = (var3 >> 8 & 255) * var4;
-         int var8 = var4 * (var3 & 255);
-         int var12 = var0 + Rasterizer2D_width * var1;
+         int var5 = 256 - alpha;
+         int var6 = (rgb >> 16 & 255) * alpha;
+         int var7 = (rgb >> 8 & 255) * alpha;
+         int var8 = alpha * (rgb & 255);
+         int var9 = x + Rasterizer2D_width * y;
 
-         for(int var13 = 0; var13 < var2; ++var13) {
-            int var9 = var5 * (Rasterizer2D_pixels[var12] >> 16 & 255);
-            int var10 = (Rasterizer2D_pixels[var12] >> 8 & 255) * var5;
-            int var11 = var5 * (Rasterizer2D_pixels[var12] & 255);
-            int var14 = (var8 + var11 >> 8) + (var6 + var9 >> 8 << 16) + (var7 + var10 >> 8 << 8);
-            Rasterizer2D_pixels[var12++] = var14;
+         for (int var10 = 0; var10 < length; ++var10) {
+            int var11 = var5 * (Rasterizer2D_pixels[var9] >> 16 & 255);
+            int var12 = (Rasterizer2D_pixels[var9] >> 8 & 255) * var5;
+            int var13 = var5 * (Rasterizer2D_pixels[var9] & 255);
+            int var14 = (var8 + var13 >> 8) + (var6 + var11 >> 8 << 16) + (var7 + var12 >> 8 << 8);
+            Rasterizer2D_pixels[var9++] = var14;
          }
-
       }
+
    }
 
    @ObfuscatedName("dm")
    @Export("Rasterizer2D_drawVerticalLine")
-   public static void Rasterizer2D_drawVerticalLine(int var0, int var1, int var2, int var3) {
-      if(var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) {
-         if(var1 < Rasterizer2D_yClipStart) {
-            var2 -= Rasterizer2D_yClipStart - var1;
-            var1 = Rasterizer2D_yClipStart;
+   public static void Rasterizer2D_drawVerticalLine(int x, int y, int length, int color) {
+      if (x >= Rasterizer2D_xClipStart && x < Rasterizer2D_xClipEnd) {
+         if (y < Rasterizer2D_yClipStart) {
+            length -= Rasterizer2D_yClipStart - y;
+            y = Rasterizer2D_yClipStart;
          }
 
-         if(var2 + var1 > Rasterizer2D_yClipEnd) {
-            var2 = Rasterizer2D_yClipEnd - var1;
+         if (length + y > Rasterizer2D_yClipEnd) {
+            length = Rasterizer2D_yClipEnd - y;
          }
 
-         int var4 = var0 + Rasterizer2D_width * var1;
+         int var4 = x + Rasterizer2D_width * y;
 
-         for(int var5 = 0; var5 < var2; ++var5) {
-            Rasterizer2D_pixels[var4 + var5 * Rasterizer2D_width] = var3;
+         for (int var5 = 0; var5 < length; ++var5) {
+            Rasterizer2D_pixels[var4 + var5 * Rasterizer2D_width] = color;
          }
-
       }
+
    }
 
    @ObfuscatedName("dq")
    @Export("Rasterizer2D_drawVerticalLineAlpha")
-   static void Rasterizer2D_drawVerticalLineAlpha(int var0, int var1, int var2, int var3, int var4) {
-      if(var0 >= Rasterizer2D_xClipStart && var0 < Rasterizer2D_xClipEnd) {
-         if(var1 < Rasterizer2D_yClipStart) {
-            var2 -= Rasterizer2D_yClipStart - var1;
-            var1 = Rasterizer2D_yClipStart;
+   static void Rasterizer2D_drawVerticalLineAlpha(int x, int y, int length, int rgb, int alpha) {
+      if (x >= Rasterizer2D_xClipStart && x < Rasterizer2D_xClipEnd) {
+         if (y < Rasterizer2D_yClipStart) {
+            length -= Rasterizer2D_yClipStart - y;
+            y = Rasterizer2D_yClipStart;
          }
 
-         if(var2 + var1 > Rasterizer2D_yClipEnd) {
-            var2 = Rasterizer2D_yClipEnd - var1;
+         if (length + y > Rasterizer2D_yClipEnd) {
+            length = Rasterizer2D_yClipEnd - y;
          }
 
-         int var5 = 256 - var4;
-         int var6 = (var3 >> 16 & 255) * var4;
-         int var7 = (var3 >> 8 & 255) * var4;
-         int var8 = var4 * (var3 & 255);
-         int var12 = var0 + Rasterizer2D_width * var1;
+         int var5 = 256 - alpha;
+         int var6 = (rgb >> 16 & 255) * alpha;
+         int var7 = (rgb >> 8 & 255) * alpha;
+         int var8 = alpha * (rgb & 255);
+         int var9 = x + Rasterizer2D_width * y;
 
-         for(int var13 = 0; var13 < var2; ++var13) {
-            int var9 = var5 * (Rasterizer2D_pixels[var12] >> 16 & 255);
-            int var10 = (Rasterizer2D_pixels[var12] >> 8 & 255) * var5;
-            int var11 = var5 * (Rasterizer2D_pixels[var12] & 255);
-            int var14 = (var8 + var11 >> 8) + (var6 + var9 >> 8 << 16) + (var7 + var10 >> 8 << 8);
-            Rasterizer2D_pixels[var12] = var14;
-            var12 += Rasterizer2D_width;
+         for (int var10 = 0; var10 < length; ++var10) {
+            int var11 = var5 * (Rasterizer2D_pixels[var9] >> 16 & 255);
+            int var12 = (Rasterizer2D_pixels[var9] >> 8 & 255) * var5;
+            int var13 = var5 * (Rasterizer2D_pixels[var9] & 255);
+            int var14 = (var8 + var13 >> 8) + (var6 + var11 >> 8 << 16) + (var7 + var12 >> 8 << 8);
+            Rasterizer2D_pixels[var9] = var14;
+            var9 += Rasterizer2D_width;
          }
-
       }
+
    }
 
    @ObfuscatedName("et")
    @Export("Rasterizer2D_drawLine")
-   public static void Rasterizer2D_drawLine(int var0, int var1, int var2, int var3, int var4) {
-      var2 -= var0;
-      var3 -= var1;
-      if(var3 == 0) {
-         if(var2 >= 0) {
-            Rasterizer2D_drawHorizontalLine(var0, var1, var2 + 1, var4);
+   public static void Rasterizer2D_drawLine(int x0, int y0, int x1, int y1, int color) {
+      x1 -= x0;
+      y1 -= y0;
+      if (y1 == 0) {
+         if (x1 >= 0) {
+            Rasterizer2D_drawHorizontalLine(x0, y0, x1 + 1, color);
          } else {
-            Rasterizer2D_drawHorizontalLine(var0 + var2, var1, -var2 + 1, var4);
+            Rasterizer2D_drawHorizontalLine(x0 + x1, y0, -x1 + 1, color);
          }
-
-      } else if(var2 == 0) {
-         if(var3 >= 0) {
-            Rasterizer2D_drawVerticalLine(var0, var1, var3 + 1, var4);
+      } else if (x1 == 0) {
+         if (y1 >= 0) {
+            Rasterizer2D_drawVerticalLine(x0, y0, y1 + 1, color);
          } else {
-            Rasterizer2D_drawVerticalLine(var0, var3 + var1, -var3 + 1, var4);
+            Rasterizer2D_drawVerticalLine(x0, y1 + y0, -y1 + 1, color);
          }
-
       } else {
-         if(var3 + var2 < 0) {
-            var0 += var2;
-            var2 = -var2;
-            var1 += var3;
-            var3 = -var3;
+         if (y1 + x1 < 0) {
+            x0 += x1;
+            x1 = -x1;
+            y0 += y1;
+            y1 = -y1;
          }
 
          int var5;
          int var6;
-         if(var2 > var3) {
-            var1 <<= 16;
-            var1 += 32768;
-            var3 <<= 16;
-            var5 = (int)Math.floor((double)var3 / (double)var2 + 0.5D);
-            var2 += var0;
-            if(var0 < Rasterizer2D_xClipStart) {
-               var1 += var5 * (Rasterizer2D_xClipStart - var0);
-               var0 = Rasterizer2D_xClipStart;
+         if (x1 > y1) {
+            y0 <<= 16;
+            y0 += 32768;
+            y1 <<= 16;
+            var5 = (int)Math.floor((double)y1 / (double)x1 + 0.5D);
+            x1 += x0;
+            if (x0 < Rasterizer2D_xClipStart) {
+               y0 += var5 * (Rasterizer2D_xClipStart - x0);
+               x0 = Rasterizer2D_xClipStart;
             }
 
-            if(var2 >= Rasterizer2D_xClipEnd) {
-               var2 = Rasterizer2D_xClipEnd - 1;
+            if (x1 >= Rasterizer2D_xClipEnd) {
+               x1 = Rasterizer2D_xClipEnd - 1;
             }
 
-            while(var0 <= var2) {
-               var6 = var1 >> 16;
-               if(var6 >= Rasterizer2D_yClipStart && var6 < Rasterizer2D_yClipEnd) {
-                  Rasterizer2D_pixels[var0 + var6 * Rasterizer2D_width] = var4;
+            while (x0 <= x1) {
+               var6 = y0 >> 16;
+               if (var6 >= Rasterizer2D_yClipStart && var6 < Rasterizer2D_yClipEnd) {
+                  Rasterizer2D_pixels[x0 + var6 * Rasterizer2D_width] = color;
                }
 
-               var1 += var5;
-               ++var0;
+               y0 += var5;
+               ++x0;
             }
          } else {
-            var0 <<= 16;
-            var0 += 32768;
-            var2 <<= 16;
-            var5 = (int)Math.floor((double)var2 / (double)var3 + 0.5D);
-            var3 += var1;
-            if(var1 < Rasterizer2D_yClipStart) {
-               var0 += (Rasterizer2D_yClipStart - var1) * var5;
-               var1 = Rasterizer2D_yClipStart;
+            x0 <<= 16;
+            x0 += 32768;
+            x1 <<= 16;
+            var5 = (int)Math.floor((double)x1 / (double)y1 + 0.5D);
+            y1 += y0;
+            if (y0 < Rasterizer2D_yClipStart) {
+               x0 += (Rasterizer2D_yClipStart - y0) * var5;
+               y0 = Rasterizer2D_yClipStart;
             }
 
-            if(var3 >= Rasterizer2D_yClipEnd) {
-               var3 = Rasterizer2D_yClipEnd - 1;
+            if (y1 >= Rasterizer2D_yClipEnd) {
+               y1 = Rasterizer2D_yClipEnd - 1;
             }
 
-            while(var1 <= var3) {
-               var6 = var0 >> 16;
-               if(var6 >= Rasterizer2D_xClipStart && var6 < Rasterizer2D_xClipEnd) {
-                  Rasterizer2D_pixels[var6 + Rasterizer2D_width * var1] = var4;
+            while (y0 <= y1) {
+               var6 = x0 >> 16;
+               if (var6 >= Rasterizer2D_xClipStart && var6 < Rasterizer2D_xClipEnd) {
+                  Rasterizer2D_pixels[var6 + Rasterizer2D_width * y0] = color;
                }
 
-               var0 += var5;
-               ++var1;
+               x0 += var5;
+               ++y0;
             }
          }
-
       }
+
    }
 
    @ObfuscatedName("eb")
    @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) {
-         Rasterizer2D_pixels[var0 + Rasterizer2D_width * var1] = var2;
+   static void Rasterizer2D_setPixel(int x, int y, int color) {
+      if (x >= Rasterizer2D_xClipStart && y >= Rasterizer2D_yClipStart && x < Rasterizer2D_xClipEnd && y < Rasterizer2D_yClipEnd) {
+         Rasterizer2D_pixels[x + Rasterizer2D_width * y] = color;
       }
+
    }
 
    @ObfuscatedName("ek")
    public static void method5948(int var0, int var1, int var2, int[] var3, int[] var4) {
       int var5 = var0 + Rasterizer2D_width * var1;
 
-      for(var1 = 0; var1 < var3.length; ++var1) {
+      for (var1 = 0; var1 < var3.length; ++var1) {
          int var6 = var5 + var3[var1];
 
-         for(var0 = -var4[var1]; var0 < 0; ++var0) {
+         for (var0 = -var4[var1]; var0 < 0; ++var0) {
             Rasterizer2D_pixels[var6++] = var2;
          }
 
@@ -833,4 +822,11 @@ public class Rasterizer2D extends DualNode {
       }
 
    }
+
+   static {
+      Rasterizer2D_yClipStart = 0;
+      Rasterizer2D_yClipEnd = 0;
+      Rasterizer2D_xClipStart = 0;
+      Rasterizer2D_xClipEnd = 0;
+   }
 }
diff --git a/runescape-client/src/main/java/Rasterizer3D.java b/runescape-client/src/main/java/Rasterizer3D.java
index b242467b4e..992dff9e1b 100644
--- a/runescape-client/src/main/java/Rasterizer3D.java
+++ b/runescape-client/src/main/java/Rasterizer3D.java
@@ -7,14 +7,14 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("Rasterizer3D")
 public class Rasterizer3D extends Rasterizer2D {
    @ObfuscatedName("m")
-   static boolean __et_m;
+   static boolean field739;
    @ObfuscatedName("f")
-   static boolean __et_f;
+   static boolean field740;
    @ObfuscatedName("q")
    @Export("Rasterizer3D_isLowDetailTexture")
    static boolean Rasterizer3D_isLowDetailTexture;
    @ObfuscatedName("w")
-   public static boolean __et_w;
+   public static boolean field741;
    @ObfuscatedName("o")
    @Export("Rasterizer3D_alpha")
    static int Rasterizer3D_alpha;
@@ -58,9 +58,9 @@ public class Rasterizer3D extends Rasterizer2D {
    @Export("Rasterizer3D_textureLoader")
    public static TextureLoader Rasterizer3D_textureLoader;
    @ObfuscatedName("r")
-   static int[] __et_r;
+   static int[] field742;
    @ObfuscatedName("p")
-   static int[] __et_p;
+   static int[] field743;
    @ObfuscatedName("v")
    @Export("Rasterizer3D_sine")
    public static int[] Rasterizer3D_sine;
@@ -68,55 +68,25 @@ public class Rasterizer3D extends Rasterizer2D {
    @Export("Rasterizer3D_cosine")
    public static int[] Rasterizer3D_cosine;
 
-   static {
-      __et_m = false;
-      __et_f = false;
-      Rasterizer3D_isLowDetailTexture = false;
-      __et_w = true;
-      Rasterizer3D_alpha = 0;
-      Rasterizer3D_zoom = 512;
-      Rasterizer3D_rowOffsets = new int[1024];
-      Rasterizer3D_colorPalette = new int[65536];
-      __et_r = new int[512];
-      __et_p = new int[2048];
-      Rasterizer3D_sine = new int[2048];
-      Rasterizer3D_cosine = new int[2048];
-
-      int var0;
-      for(var0 = 1; var0 < 512; ++var0) {
-         __et_r[var0] = 32768 / var0;
-      }
-
-      for(var0 = 1; var0 < 2048; ++var0) {
-         __et_p[var0] = 65536 / var0;
-      }
-
-      for(var0 = 0; var0 < 2048; ++var0) {
-         Rasterizer3D_sine[var0] = (int)(65536.0D * Math.sin((double)var0 * 0.0030679615D));
-         Rasterizer3D_cosine[var0] = (int)(65536.0D * Math.cos((double)var0 * 0.0030679615D));
-      }
-
-   }
-
    @ObfuscatedName("m")
-   @Export("Rasterizer3D_method1")
-   public static final void Rasterizer3D_method1() {
+   @Export("Rasterizer3D_setClipFromRasterizer2D")
+   public static final void Rasterizer3D_setClipFromRasterizer2D() {
       Rasterizer3D_setClip(Rasterizer2D.Rasterizer2D_xClipStart, Rasterizer2D.Rasterizer2D_yClipStart, Rasterizer2D.Rasterizer2D_xClipEnd, Rasterizer2D.Rasterizer2D_yClipEnd);
    }
 
    @ObfuscatedName("f")
    @Export("Rasterizer3D_setClip")
-   static final void Rasterizer3D_setClip(int var0, int var1, int var2, int var3) {
-      Rasterizer3D_clipWidth = var2 - var0;
-      Rasterizer3D_clipHeight = var3 - var1;
+   static final void Rasterizer3D_setClip(int xStart, int yStart, int xEnd, int yEnd) {
+      Rasterizer3D_clipWidth = xEnd - xStart;
+      Rasterizer3D_clipHeight = yEnd - yStart;
       Rasterizer3D_method3();
-      if(Rasterizer3D_rowOffsets.length < Rasterizer3D_clipHeight) {
+      if (Rasterizer3D_rowOffsets.length < Rasterizer3D_clipHeight) {
          Rasterizer3D_rowOffsets = new int[World.method1759(Rasterizer3D_clipHeight)];
       }
 
-      int var4 = var0 + Rasterizer2D.Rasterizer2D_width * var1;
+      int var4 = xStart + Rasterizer2D.Rasterizer2D_width * yStart;
 
-      for(int var5 = 0; var5 < Rasterizer3D_clipHeight; ++var5) {
+      for (int var5 = 0; var5 < Rasterizer3D_clipHeight; ++var5) {
          Rasterizer3D_rowOffsets[var5] = var4;
          var4 += Rasterizer2D.Rasterizer2D_width;
       }
@@ -152,33 +122,33 @@ public class Rasterizer3D extends Rasterizer2D {
       signature = "(Lei;)V"
    )
    @Export("Rasterizer3D_setTextureLoader")
-   public static final void Rasterizer3D_setTextureLoader(TextureLoader var0) {
-      Rasterizer3D_textureLoader = var0;
+   public static final void Rasterizer3D_setTextureLoader(TextureLoader textureLoader) {
+      Rasterizer3D_textureLoader = textureLoader;
    }
 
    @ObfuscatedName("u")
    @Export("Rasterizer3D_setBrightness")
-   public static final void Rasterizer3D_setBrightness(double var0) {
-      Rasterizer3D_buildPalette(var0, 0, 512);
+   public static final void Rasterizer3D_setBrightness(double brightness) {
+      Rasterizer3D_buildPalette(brightness, 0, 512);
    }
 
    @ObfuscatedName("g")
    @Export("Rasterizer3D_buildPalette")
-   static final void Rasterizer3D_buildPalette(double var0, int var2, int var3) {
-      int var4 = var2 * 128;
+   static final void Rasterizer3D_buildPalette(double brightness, int hsMin, int hsMax) {
+      int var4 = hsMin * 128;
 
-      for(int var5 = var2; var5 < var3; ++var5) {
+      for (int var5 = hsMin; var5 < hsMax; ++var5) {
          double var6 = (double)(var5 >> 3) / 64.0D + 0.0078125D;
          double var8 = (double)(var5 & 7) / 8.0D + 0.0625D;
 
-         for(int var10 = 0; var10 < 128; ++var10) {
+         for (int var10 = 0; var10 < 128; ++var10) {
             double var11 = (double)var10 / 128.0D;
             double var13 = var11;
             double var15 = var11;
             double var17 = var11;
-            if(var8 != 0.0D) {
+            if (var8 != 0.0D) {
                double var19;
-               if(var11 < 0.5D) {
+               if (var11 < 0.5D) {
                   var19 = var11 * (1.0D + var8);
                } else {
                   var19 = var11 + var8 - var11 * var8;
@@ -186,52 +156,52 @@ public class Rasterizer3D extends Rasterizer2D {
 
                double var21 = 2.0D * var11 - var19;
                double var23 = var6 + 0.3333333333333333D;
-               if(var23 > 1.0D) {
+               if (var23 > 1.0D) {
                   --var23;
                }
 
-               double var27 = var6 - 0.3333333333333333D;
-               if(var27 < 0.0D) {
-                  ++var27;
+               double var25 = var6 - 0.3333333333333333D;
+               if (var25 < 0.0D) {
+                  ++var25;
                }
 
-               if(6.0D * var23 < 1.0D) {
+               if (6.0D * var23 < 1.0D) {
                   var13 = var21 + (var19 - var21) * 6.0D * var23;
-               } else if(2.0D * var23 < 1.0D) {
+               } else if (2.0D * var23 < 1.0D) {
                   var13 = var19;
-               } else if(3.0D * var23 < 2.0D) {
+               } else if (3.0D * var23 < 2.0D) {
                   var13 = var21 + (var19 - var21) * (0.6666666666666666D - var23) * 6.0D;
                } else {
                   var13 = var21;
                }
 
-               if(6.0D * var6 < 1.0D) {
+               if (6.0D * var6 < 1.0D) {
                   var15 = var21 + (var19 - var21) * 6.0D * var6;
-               } else if(2.0D * var6 < 1.0D) {
+               } else if (2.0D * var6 < 1.0D) {
                   var15 = var19;
-               } else if(3.0D * var6 < 2.0D) {
+               } else if (3.0D * var6 < 2.0D) {
                   var15 = var21 + (var19 - var21) * (0.6666666666666666D - var6) * 6.0D;
                } else {
                   var15 = var21;
                }
 
-               if(6.0D * var27 < 1.0D) {
-                  var17 = var21 + (var19 - var21) * 6.0D * var27;
-               } else if(2.0D * var27 < 1.0D) {
+               if (6.0D * var25 < 1.0D) {
+                  var17 = var21 + (var19 - var21) * 6.0D * var25;
+               } else if (2.0D * var25 < 1.0D) {
                   var17 = var19;
-               } else if(3.0D * var27 < 2.0D) {
-                  var17 = var21 + (var19 - var21) * (0.6666666666666666D - var27) * 6.0D;
+               } else if (3.0D * var25 < 2.0D) {
+                  var17 = var21 + (var19 - var21) * (0.6666666666666666D - var25) * 6.0D;
                } else {
                   var17 = var21;
                }
             }
 
-            int var29 = (int)(var13 * 256.0D);
+            int var28 = (int)(var13 * 256.0D);
             int var20 = (int)(var15 * 256.0D);
-            int var30 = (int)(var17 * 256.0D);
-            int var22 = var30 + (var20 << 8) + (var29 << 16);
-            var22 = Rasterizer3D_brighten(var22, var0);
-            if(var22 == 0) {
+            int var27 = (int)(var17 * 256.0D);
+            int var22 = var27 + (var20 << 8) + (var28 << 16);
+            var22 = Rasterizer3D_brighten(var22, brightness);
+            if (var22 == 0) {
                var22 = 1;
             }
 
@@ -243,13 +213,13 @@ public class Rasterizer3D extends Rasterizer2D {
 
    @ObfuscatedName("l")
    @Export("Rasterizer3D_brighten")
-   static int Rasterizer3D_brighten(int var0, double var1) {
-      double var3 = (double)(var0 >> 16) / 256.0D;
-      double var5 = (double)(var0 >> 8 & 255) / 256.0D;
-      double var7 = (double)(var0 & 255) / 256.0D;
-      var3 = Math.pow(var3, var1);
-      var5 = Math.pow(var5, var1);
-      var7 = Math.pow(var7, var1);
+   static int Rasterizer3D_brighten(int rgb, double brightness) {
+      double var3 = (double)(rgb >> 16) / 256.0D;
+      double var5 = (double)(rgb >> 8 & 255) / 256.0D;
+      double var7 = (double)(rgb & 255) / 256.0D;
+      var3 = Math.pow(var3, brightness);
+      var5 = Math.pow(var5, brightness);
+      var7 = Math.pow(var7, brightness);
       int var9 = (int)(var3 * 256.0D);
       int var10 = (int)(var5 * 256.0D);
       int var11 = (int)(var7 * 256.0D);
@@ -258,7 +228,7 @@ public class Rasterizer3D extends Rasterizer2D {
 
    @ObfuscatedName("e")
    public static void method2985(int var0, int var1, int var2) {
-      __et_m = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth;
+      field739 = var0 < 0 || var0 > Rasterizer3D_clipWidth || var1 < 0 || var1 > Rasterizer3D_clipWidth || var2 < 0 || var2 > Rasterizer3D_clipWidth;
    }
 
    @ObfuscatedName("x")
@@ -270,44 +240,44 @@ public class Rasterizer3D extends Rasterizer2D {
       int var13 = var7 - var6;
       int var14 = var8 - var6;
       int var15;
-      if(var2 != var1) {
+      if (var2 != var1) {
          var15 = (var5 - var4 << 14) / (var2 - var1);
       } else {
          var15 = 0;
       }
 
       int var16;
-      if(var0 != var1) {
+      if (var0 != var1) {
          var16 = (var9 << 14) / var10;
       } else {
          var16 = 0;
       }
 
       int var17;
-      if(var0 != var2) {
+      if (var0 != var2) {
          var17 = (var11 << 14) / var12;
       } else {
          var17 = 0;
       }
 
       int var18 = var9 * var12 - var11 * var10;
-      if(var18 != 0) {
+      if (var18 != 0) {
          int var19 = (var13 * var12 - var14 * var10 << 8) / var18;
          int var20 = (var14 * var9 - var13 * var11 << 8) / var18;
-         if(var0 <= var1 && var0 <= var2) {
-            if(var0 < Rasterizer3D_clipHeight) {
-               if(var1 > Rasterizer3D_clipHeight) {
+         if (var0 <= var1 && var0 <= var2) {
+            if (var0 < Rasterizer3D_clipHeight) {
+               if (var1 > Rasterizer3D_clipHeight) {
                   var1 = Rasterizer3D_clipHeight;
                }
 
-               if(var2 > Rasterizer3D_clipHeight) {
+               if (var2 > Rasterizer3D_clipHeight) {
                   var2 = Rasterizer3D_clipHeight;
                }
 
                var6 = var19 + ((var6 << 8) - var3 * var19);
-               if(var1 < var2) {
+               if (var1 < var2) {
                   var5 = var3 <<= 14;
-                  if(var0 < 0) {
+                  if (var0 < 0) {
                      var5 -= var0 * var17;
                      var3 -= var0 * var16;
                      var6 -= var0 * var20;
@@ -315,22 +285,22 @@ public class Rasterizer3D extends Rasterizer2D {
                   }
 
                   var4 <<= 14;
-                  if(var1 < 0) {
+                  if (var1 < 0) {
                      var4 -= var15 * var1;
                      var1 = 0;
                   }
 
-                  if(var0 != var1 && var17 < var16 || var0 == var1 && var17 > var15) {
+                  if (var0 != var1 && var17 < var16 || var0 == var1 && var17 > var15) {
                      var2 -= var1;
                      var1 -= var0;
                      var0 = Rasterizer3D_rowOffsets[var0];
 
-                     while(true) {
+                     while (true) {
                         --var1;
-                        if(var1 < 0) {
-                           while(true) {
+                        if (var1 < 0) {
+                           while (true) {
                               --var2;
-                              if(var2 < 0) {
+                              if (var2 < 0) {
                                  return;
                               }
 
@@ -348,123 +318,123 @@ public class Rasterizer3D extends Rasterizer2D {
                         var6 += var20;
                         var0 += Rasterizer2D.Rasterizer2D_width;
                      }
-                  } else {
-                     var2 -= var1;
-                     var1 -= var0;
-                     var0 = Rasterizer3D_rowOffsets[var0];
-
-                     while(true) {
-                        --var1;
-                        if(var1 < 0) {
-                           while(true) {
-                              --var2;
-                              if(var2 < 0) {
-                                 return;
-                              }
-
-                              Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var5 >> 14, var6, var19);
-                              var5 += var17;
-                              var4 += var15;
-                              var6 += var20;
-                              var0 += Rasterizer2D.Rasterizer2D_width;
-                           }
-                        }
-
-                        Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var5 >> 14, var6, var19);
-                        var5 += var17;
-                        var3 += var16;
-                        var6 += var20;
-                        var0 += Rasterizer2D.Rasterizer2D_width;
-                     }
-                  }
-               } else {
-                  var4 = var3 <<= 14;
-                  if(var0 < 0) {
-                     var4 -= var0 * var17;
-                     var3 -= var0 * var16;
-                     var6 -= var0 * var20;
-                     var0 = 0;
                   }
 
-                  var5 <<= 14;
-                  if(var2 < 0) {
-                     var5 -= var15 * var2;
-                     var2 = 0;
-                  }
+                  var2 -= var1;
+                  var1 -= var0;
+                  var0 = Rasterizer3D_rowOffsets[var0];
 
-                  if(var0 != var2 && var17 < var16 || var0 == var2 && var15 > var16) {
-                     var1 -= var2;
-                     var2 -= var0;
-                     var0 = Rasterizer3D_rowOffsets[var0];
-
-                     while(true) {
-                        --var2;
-                        if(var2 < 0) {
-                           while(true) {
-                              --var1;
-                              if(var1 < 0) {
-                                 return;
-                              }
-
-                              Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var3 >> 14, var6, var19);
-                              var5 += var15;
-                              var3 += var16;
-                              var6 += var20;
-                              var0 += Rasterizer2D.Rasterizer2D_width;
+                  while (true) {
+                     --var1;
+                     if (var1 < 0) {
+                        while (true) {
+                           --var2;
+                           if (var2 < 0) {
+                              return;
                            }
+
+                           Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var5 >> 14, var6, var19);
+                           var5 += var17;
+                           var4 += var15;
+                           var6 += var20;
+                           var0 += Rasterizer2D.Rasterizer2D_width;
                         }
-
-                        Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var3 >> 14, var6, var19);
-                        var4 += var17;
-                        var3 += var16;
-                        var6 += var20;
-                        var0 += Rasterizer2D.Rasterizer2D_width;
                      }
-                  } else {
-                     var1 -= var2;
-                     var2 -= var0;
-                     var0 = Rasterizer3D_rowOffsets[var0];
 
-                     while(true) {
-                        --var2;
-                        if(var2 < 0) {
-                           while(true) {
-                              --var1;
-                              if(var1 < 0) {
-                                 return;
-                              }
-
-                              Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var5 >> 14, var6, var19);
-                              var5 += var15;
-                              var3 += var16;
-                              var6 += var20;
-                              var0 += Rasterizer2D.Rasterizer2D_width;
-                           }
-                        }
-
-                        Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var4 >> 14, var6, var19);
-                        var4 += var17;
-                        var3 += var16;
-                        var6 += var20;
-                        var0 += Rasterizer2D.Rasterizer2D_width;
-                     }
+                     Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var5 >> 14, var6, var19);
+                     var5 += var17;
+                     var3 += var16;
+                     var6 += var20;
+                     var0 += Rasterizer2D.Rasterizer2D_width;
                   }
                }
+
+               var4 = var3 <<= 14;
+               if (var0 < 0) {
+                  var4 -= var0 * var17;
+                  var3 -= var0 * var16;
+                  var6 -= var0 * var20;
+                  var0 = 0;
+               }
+
+               var5 <<= 14;
+               if (var2 < 0) {
+                  var5 -= var15 * var2;
+                  var2 = 0;
+               }
+
+               if ((var0 == var2 || var17 >= var16) && (var0 != var2 || var15 <= var16)) {
+                  var1 -= var2;
+                  var2 -= var0;
+                  var0 = Rasterizer3D_rowOffsets[var0];
+
+                  while (true) {
+                     --var2;
+                     if (var2 < 0) {
+                        while (true) {
+                           --var1;
+                           if (var1 < 0) {
+                              return;
+                           }
+
+                           Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var5 >> 14, var6, var19);
+                           var5 += var15;
+                           var3 += var16;
+                           var6 += var20;
+                           var0 += Rasterizer2D.Rasterizer2D_width;
+                        }
+                     }
+
+                     Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var4 >> 14, var6, var19);
+                     var4 += var17;
+                     var3 += var16;
+                     var6 += var20;
+                     var0 += Rasterizer2D.Rasterizer2D_width;
+                  }
+               }
+
+               var1 -= var2;
+               var2 -= var0;
+               var0 = Rasterizer3D_rowOffsets[var0];
+
+               while (true) {
+                  --var2;
+                  if (var2 < 0) {
+                     while (true) {
+                        --var1;
+                        if (var1 < 0) {
+                           return;
+                        }
+
+                        Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var3 >> 14, var6, var19);
+                        var5 += var15;
+                        var3 += var16;
+                        var6 += var20;
+                        var0 += Rasterizer2D.Rasterizer2D_width;
+                     }
+                  }
+
+                  Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var3 >> 14, var6, var19);
+                  var4 += var17;
+                  var3 += var16;
+                  var6 += var20;
+                  var0 += Rasterizer2D.Rasterizer2D_width;
+               }
             }
-         } else if(var1 <= var2) {
-            if(var1 < Rasterizer3D_clipHeight) {
-               if(var2 > Rasterizer3D_clipHeight) {
+         } else if (var1 <= var2) {
+            if (var1 < Rasterizer3D_clipHeight) {
+               if (var2 > Rasterizer3D_clipHeight) {
                   var2 = Rasterizer3D_clipHeight;
                }
 
-               if(var0 > Rasterizer3D_clipHeight) {
+               if (var0 > Rasterizer3D_clipHeight) {
                   var0 = Rasterizer3D_clipHeight;
                }
 
                var7 = var19 + ((var7 << 8) - var19 * var4);
-               if(var2 < var0) {
+               if (var2 < var0) {
                   var3 = var4 <<= 14;
-                  if(var1 < 0) {
+                  if (var1 < 0) {
                      var3 -= var16 * var1;
                      var4 -= var15 * var1;
                      var7 -= var20 * var1;
@@ -472,22 +442,22 @@ public class Rasterizer3D extends Rasterizer2D {
                   }
 
                   var5 <<= 14;
-                  if(var2 < 0) {
+                  if (var2 < 0) {
                      var5 -= var17 * var2;
                      var2 = 0;
                   }
 
-                  if(var2 != var1 && var16 < var15 || var2 == var1 && var16 > var17) {
+                  if (var2 != var1 && var16 < var15 || var2 == var1 && var16 > var17) {
                      var0 -= var2;
                      var2 -= var1;
                      var1 = Rasterizer3D_rowOffsets[var1];
 
-                     while(true) {
+                     while (true) {
                         --var2;
-                        if(var2 < 0) {
-                           while(true) {
+                        if (var2 < 0) {
+                           while (true) {
                               --var0;
-                              if(var0 < 0) {
+                              if (var0 < 0) {
                                  return;
                               }
 
@@ -505,122 +475,122 @@ public class Rasterizer3D extends Rasterizer2D {
                         var7 += var20;
                         var1 += Rasterizer2D.Rasterizer2D_width;
                      }
-                  } else {
-                     var0 -= var2;
-                     var2 -= var1;
-                     var1 = Rasterizer3D_rowOffsets[var1];
+                  }
 
-                     while(true) {
-                        --var2;
-                        if(var2 < 0) {
-                           while(true) {
-                              --var0;
-                              if(var0 < 0) {
-                                 return;
-                              }
+                  var0 -= var2;
+                  var2 -= var1;
+                  var1 = Rasterizer3D_rowOffsets[var1];
 
-                              Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var3 >> 14, var7, var19);
-                              var3 += var16;
-                              var5 += var17;
-                              var7 += var20;
-                              var1 += Rasterizer2D.Rasterizer2D_width;
+                  while (true) {
+                     --var2;
+                     if (var2 < 0) {
+                        while (true) {
+                           --var0;
+                           if (var0 < 0) {
+                              return;
                            }
+
+                           Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var3 >> 14, var7, var19);
+                           var3 += var16;
+                           var5 += var17;
+                           var7 += var20;
+                           var1 += Rasterizer2D.Rasterizer2D_width;
+                        }
+                     }
+
+                     Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var3 >> 14, var7, var19);
+                     var3 += var16;
+                     var4 += var15;
+                     var7 += var20;
+                     var1 += Rasterizer2D.Rasterizer2D_width;
+                  }
+               }
+
+               var5 = var4 <<= 14;
+               if (var1 < 0) {
+                  var5 -= var16 * var1;
+                  var4 -= var15 * var1;
+                  var7 -= var20 * var1;
+                  var1 = 0;
+               }
+
+               var3 <<= 14;
+               if (var0 < 0) {
+                  var3 -= var0 * var17;
+                  var0 = 0;
+               }
+
+               if (var16 < var15) {
+                  var2 -= var0;
+                  var0 -= var1;
+                  var1 = Rasterizer3D_rowOffsets[var1];
+
+                  while (true) {
+                     --var0;
+                     if (var0 < 0) {
+                        while (true) {
+                           --var2;
+                           if (var2 < 0) {
+                              return;
+                           }
+
+                           Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var4 >> 14, var7, var19);
+                           var3 += var17;
+                           var4 += var15;
+                           var7 += var20;
+                           var1 += Rasterizer2D.Rasterizer2D_width;
+                        }
+                     }
+
+                     Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var4 >> 14, var7, var19);
+                     var5 += var16;
+                     var4 += var15;
+                     var7 += var20;
+                     var1 += Rasterizer2D.Rasterizer2D_width;
+                  }
+               }
+
+               var2 -= var0;
+               var0 -= var1;
+               var1 = Rasterizer3D_rowOffsets[var1];
+
+               while (true) {
+                  --var0;
+                  if (var0 < 0) {
+                     while (true) {
+                        --var2;
+                        if (var2 < 0) {
+                           return;
                         }
 
                         Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var3 >> 14, var7, var19);
-                        var3 += var16;
+                        var3 += var17;
                         var4 += var15;
                         var7 += var20;
                         var1 += Rasterizer2D.Rasterizer2D_width;
                      }
                   }
-               } else {
-                  var5 = var4 <<= 14;
-                  if(var1 < 0) {
-                     var5 -= var16 * var1;
-                     var4 -= var15 * var1;
-                     var7 -= var20 * var1;
-                     var1 = 0;
-                  }
 
-                  var3 <<= 14;
-                  if(var0 < 0) {
-                     var3 -= var0 * var17;
-                     var0 = 0;
-                  }
-
-                  if(var16 < var15) {
-                     var2 -= var0;
-                     var0 -= var1;
-                     var1 = Rasterizer3D_rowOffsets[var1];
-
-                     while(true) {
-                        --var0;
-                        if(var0 < 0) {
-                           while(true) {
-                              --var2;
-                              if(var2 < 0) {
-                                 return;
-                              }
-
-                              Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var4 >> 14, var7, var19);
-                              var3 += var17;
-                              var4 += var15;
-                              var7 += var20;
-                              var1 += Rasterizer2D.Rasterizer2D_width;
-                           }
-                        }
-
-                        Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var4 >> 14, var7, var19);
-                        var5 += var16;
-                        var4 += var15;
-                        var7 += var20;
-                        var1 += Rasterizer2D.Rasterizer2D_width;
-                     }
-                  } else {
-                     var2 -= var0;
-                     var0 -= var1;
-                     var1 = Rasterizer3D_rowOffsets[var1];
-
-                     while(true) {
-                        --var0;
-                        if(var0 < 0) {
-                           while(true) {
-                              --var2;
-                              if(var2 < 0) {
-                                 return;
-                              }
-
-                              Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var3 >> 14, var7, var19);
-                              var3 += var17;
-                              var4 += var15;
-                              var7 += var20;
-                              var1 += Rasterizer2D.Rasterizer2D_width;
-                           }
-                        }
-
-                        Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var5 >> 14, var7, var19);
-                        var5 += var16;
-                        var4 += var15;
-                        var7 += var20;
-                        var1 += Rasterizer2D.Rasterizer2D_width;
-                     }
-                  }
+                  Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var5 >> 14, var7, var19);
+                  var5 += var16;
+                  var4 += var15;
+                  var7 += var20;
+                  var1 += Rasterizer2D.Rasterizer2D_width;
                }
             }
-         } else if(var2 < Rasterizer3D_clipHeight) {
-            if(var0 > Rasterizer3D_clipHeight) {
+         } else if (var2 < Rasterizer3D_clipHeight) {
+            if (var0 > Rasterizer3D_clipHeight) {
                var0 = Rasterizer3D_clipHeight;
             }
 
-            if(var1 > Rasterizer3D_clipHeight) {
+            if (var1 > Rasterizer3D_clipHeight) {
                var1 = Rasterizer3D_clipHeight;
             }
 
             var8 = var19 + ((var8 << 8) - var5 * var19);
-            if(var0 < var1) {
+            if (var0 < var1) {
                var4 = var5 <<= 14;
-               if(var2 < 0) {
+               if (var2 < 0) {
                   var4 -= var15 * var2;
                   var5 -= var17 * var2;
                   var8 -= var20 * var2;
@@ -628,22 +598,22 @@ public class Rasterizer3D extends Rasterizer2D {
                }
 
                var3 <<= 14;
-               if(var0 < 0) {
+               if (var0 < 0) {
                   var3 -= var0 * var16;
                   var0 = 0;
                }
 
-               if(var15 < var17) {
+               if (var15 < var17) {
                   var1 -= var0;
                   var0 -= var2;
                   var2 = Rasterizer3D_rowOffsets[var2];
 
-                  while(true) {
+                  while (true) {
                      --var0;
-                     if(var0 < 0) {
-                        while(true) {
+                     if (var0 < 0) {
+                        while (true) {
                            --var1;
-                           if(var1 < 0) {
+                           if (var1 < 0) {
                               return;
                            }
 
@@ -661,136 +631,137 @@ public class Rasterizer3D extends Rasterizer2D {
                      var8 += var20;
                      var2 += Rasterizer2D.Rasterizer2D_width;
                   }
-               } else {
-                  var1 -= var0;
-                  var0 -= var2;
-                  var2 = Rasterizer3D_rowOffsets[var2];
+               }
 
-                  while(true) {
-                     --var0;
-                     if(var0 < 0) {
-                        while(true) {
-                           --var1;
-                           if(var1 < 0) {
-                              return;
-                           }
+               var1 -= var0;
+               var0 -= var2;
+               var2 = Rasterizer3D_rowOffsets[var2];
 
-                           Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var4 >> 14, var8, var19);
-                           var4 += var15;
-                           var3 += var16;
-                           var8 += var20;
-                           var2 += Rasterizer2D.Rasterizer2D_width;
+               while (true) {
+                  --var0;
+                  if (var0 < 0) {
+                     while (true) {
+                        --var1;
+                        if (var1 < 0) {
+                           return;
                         }
+
+                        Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var4 >> 14, var8, var19);
+                        var4 += var15;
+                        var3 += var16;
+                        var8 += var20;
+                        var2 += Rasterizer2D.Rasterizer2D_width;
+                     }
+                  }
+
+                  Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var8, var19);
+                  var4 += var15;
+                  var5 += var17;
+                  var8 += var20;
+                  var2 += Rasterizer2D.Rasterizer2D_width;
+               }
+            }
+
+            var3 = var5 <<= 14;
+            if (var2 < 0) {
+               var3 -= var15 * var2;
+               var5 -= var17 * var2;
+               var8 -= var20 * var2;
+               var2 = 0;
+            }
+
+            var4 <<= 14;
+            if (var1 < 0) {
+               var4 -= var16 * var1;
+               var1 = 0;
+            }
+
+            if (var15 < var17) {
+               var0 -= var1;
+               var1 -= var2;
+               var2 = Rasterizer3D_rowOffsets[var2];
+
+               while (true) {
+                  --var1;
+                  if (var1 < 0) {
+                     while (true) {
+                        --var0;
+                        if (var0 < 0) {
+                           return;
+                        }
+
+                        Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var8, var19);
+                        var4 += var16;
+                        var5 += var17;
+                        var8 += var20;
+                        var2 += Rasterizer2D.Rasterizer2D_width;
+                     }
+                  }
+
+                  Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var5 >> 14, var8, var19);
+                  var3 += var15;
+                  var5 += var17;
+                  var8 += var20;
+                  var2 += Rasterizer2D.Rasterizer2D_width;
+               }
+            }
+
+            var0 -= var1;
+            var1 -= var2;
+            var2 = Rasterizer3D_rowOffsets[var2];
+
+            while (true) {
+               --var1;
+               if (var1 < 0) {
+                  while (true) {
+                     --var0;
+                     if (var0 < 0) {
+                        return;
                      }
 
                      Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var8, var19);
-                     var4 += var15;
+                     var4 += var16;
                      var5 += var17;
                      var8 += var20;
                      var2 += Rasterizer2D.Rasterizer2D_width;
                   }
                }
-            } else {
-               var3 = var5 <<= 14;
-               if(var2 < 0) {
-                  var3 -= var15 * var2;
-                  var5 -= var17 * var2;
-                  var8 -= var20 * var2;
-                  var2 = 0;
-               }
 
-               var4 <<= 14;
-               if(var1 < 0) {
-                  var4 -= var16 * var1;
-                  var1 = 0;
-               }
-
-               if(var15 < var17) {
-                  var0 -= var1;
-                  var1 -= var2;
-                  var2 = Rasterizer3D_rowOffsets[var2];
-
-                  while(true) {
-                     --var1;
-                     if(var1 < 0) {
-                        while(true) {
-                           --var0;
-                           if(var0 < 0) {
-                              return;
-                           }
-
-                           Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var8, var19);
-                           var4 += var16;
-                           var5 += var17;
-                           var8 += var20;
-                           var2 += Rasterizer2D.Rasterizer2D_width;
-                        }
-                     }
-
-                     Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var5 >> 14, var8, var19);
-                     var3 += var15;
-                     var5 += var17;
-                     var8 += var20;
-                     var2 += Rasterizer2D.Rasterizer2D_width;
-                  }
-               } else {
-                  var0 -= var1;
-                  var1 -= var2;
-                  var2 = Rasterizer3D_rowOffsets[var2];
-
-                  while(true) {
-                     --var1;
-                     if(var1 < 0) {
-                        while(true) {
-                           --var0;
-                           if(var0 < 0) {
-                              return;
-                           }
-
-                           Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var8, var19);
-                           var4 += var16;
-                           var5 += var17;
-                           var8 += var20;
-                           var2 += Rasterizer2D.Rasterizer2D_width;
-                        }
-                     }
-
-                     Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var3 >> 14, var8, var19);
-                     var3 += var15;
-                     var5 += var17;
-                     var8 += var20;
-                     var2 += Rasterizer2D.Rasterizer2D_width;
-                  }
-               }
+               Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var3 >> 14, var8, var19);
+               var3 += var15;
+               var5 += var17;
+               var8 += var20;
+               var2 += Rasterizer2D.Rasterizer2D_width;
             }
          }
       }
+
    }
 
    @ObfuscatedName("d")
    @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(__et_m) {
-         if(var5 > Rasterizer3D_clipWidth) {
+      if (field739) {
+         if (var5 > Rasterizer3D_clipWidth) {
             var5 = Rasterizer3D_clipWidth;
          }
 
-         if(var4 < 0) {
+         if (var4 < 0) {
             var4 = 0;
          }
       }
 
-      if(var4 < var5) {
+      if (var4 < var5) {
          var1 += var4;
          var6 += var4 * var7;
          int var8;
          int var9;
          int var10;
-         if(__et_w) {
+         if (field741) {
             var3 = var5 - var4 >> 2;
             var7 <<= 2;
-            if(Rasterizer3D_alpha == 0) {
-               if(var3 > 0) {
+            if (Rasterizer3D_alpha == 0) {
+               if (var3 > 0) {
                   do {
                      var2 = Rasterizer3D_colorPalette[var6 >> 8];
                      var6 += var7;
@@ -803,7 +774,7 @@ public class Rasterizer3D extends Rasterizer2D {
                }
 
                var3 = var5 - var4 & 3;
-               if(var3 > 0) {
+               if (var3 > 0) {
                   var2 = Rasterizer3D_colorPalette[var6 >> 8];
 
                   do {
@@ -814,7 +785,7 @@ public class Rasterizer3D extends Rasterizer2D {
             } else {
                var8 = Rasterizer3D_alpha;
                var9 = 256 - Rasterizer3D_alpha;
-               if(var3 > 0) {
+               if (var3 > 0) {
                   do {
                      var2 = Rasterizer3D_colorPalette[var6 >> 8];
                      var6 += var7;
@@ -832,7 +803,7 @@ public class Rasterizer3D extends Rasterizer2D {
                }
 
                var3 = var5 - var4 & 3;
-               if(var3 > 0) {
+               if (var3 > 0) {
                   var2 = Rasterizer3D_colorPalette[var6 >> 8];
                   var2 = (var9 * (var2 & 65280) >> 8 & 65280) + (var9 * (var2 & 16711935) >> 8 & 16711935);
 
@@ -843,10 +814,9 @@ public class Rasterizer3D extends Rasterizer2D {
                   } while(var3 > 0);
                }
             }
-
          } else {
             var3 = var5 - var4;
-            if(Rasterizer3D_alpha == 0) {
+            if (Rasterizer3D_alpha == 0) {
                do {
                   var0[var1++] = Rasterizer3D_colorPalette[var6 >> 8];
                   var6 += var7;
@@ -865,63 +835,63 @@ public class Rasterizer3D extends Rasterizer2D {
                   --var3;
                } while(var3 > 0);
             }
-
          }
       }
+
    }
 
    @ObfuscatedName("a")
    public static final void method3020(int var0, int var1, int var2, int var3, int var4, int var5, int var6) {
       int var7 = 0;
-      if(var0 != var1) {
+      if (var0 != var1) {
          var7 = (var4 - var3 << 14) / (var1 - var0);
       }
 
       int var8 = 0;
-      if(var2 != var1) {
+      if (var2 != var1) {
          var8 = (var5 - var4 << 14) / (var2 - var1);
       }
 
       int var9 = 0;
-      if(var0 != var2) {
+      if (var0 != var2) {
          var9 = (var3 - var5 << 14) / (var0 - var2);
       }
 
-      if(var0 <= var1 && var0 <= var2) {
-         if(var0 < Rasterizer3D_clipHeight) {
-            if(var1 > Rasterizer3D_clipHeight) {
+      if (var0 <= var1 && var0 <= var2) {
+         if (var0 < Rasterizer3D_clipHeight) {
+            if (var1 > Rasterizer3D_clipHeight) {
                var1 = Rasterizer3D_clipHeight;
             }
 
-            if(var2 > Rasterizer3D_clipHeight) {
+            if (var2 > Rasterizer3D_clipHeight) {
                var2 = Rasterizer3D_clipHeight;
             }
 
-            if(var1 < var2) {
+            if (var1 < var2) {
                var5 = var3 <<= 14;
-               if(var0 < 0) {
+               if (var0 < 0) {
                   var5 -= var0 * var9;
                   var3 -= var0 * var7;
                   var0 = 0;
                }
 
                var4 <<= 14;
-               if(var1 < 0) {
+               if (var1 < 0) {
                   var4 -= var8 * var1;
                   var1 = 0;
                }
 
-               if((var0 == var1 || var9 >= var7) && (var0 != var1 || var9 <= var8)) {
+               if ((var0 == var1 || var9 >= var7) && (var0 != var1 || var9 <= var8)) {
                   var2 -= var1;
                   var1 -= var0;
                   var0 = Rasterizer3D_rowOffsets[var0];
 
-                  while(true) {
+                  while (true) {
                      --var1;
-                     if(var1 < 0) {
-                        while(true) {
+                     if (var1 < 0) {
+                        while (true) {
                            --var2;
-                           if(var2 < 0) {
+                           if (var2 < 0) {
                               return;
                            }
 
@@ -937,137 +907,137 @@ public class Rasterizer3D extends Rasterizer2D {
                      var3 += var7;
                      var0 += Rasterizer2D.Rasterizer2D_width;
                   }
-               } else {
-                  var2 -= var1;
-                  var1 -= var0;
-                  var0 = Rasterizer3D_rowOffsets[var0];
-
-                  while(true) {
-                     --var1;
-                     if(var1 < 0) {
-                        while(true) {
-                           --var2;
-                           if(var2 < 0) {
-                              return;
-                           }
-
-                           Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var4 >> 14);
-                           var5 += var9;
-                           var4 += var8;
-                           var0 += Rasterizer2D.Rasterizer2D_width;
-                        }
-                     }
-
-                     Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14);
-                     var5 += var9;
-                     var3 += var7;
-                     var0 += Rasterizer2D.Rasterizer2D_width;
-                  }
-               }
-            } else {
-               var4 = var3 <<= 14;
-               if(var0 < 0) {
-                  var4 -= var0 * var9;
-                  var3 -= var0 * var7;
-                  var0 = 0;
                }
 
-               var5 <<= 14;
-               if(var2 < 0) {
-                  var5 -= var8 * var2;
-                  var2 = 0;
-               }
+               var2 -= var1;
+               var1 -= var0;
+               var0 = Rasterizer3D_rowOffsets[var0];
 
-               if(var0 != var2 && var9 < var7 || var0 == var2 && var8 > var7) {
-                  var1 -= var2;
-                  var2 -= var0;
-                  var0 = Rasterizer3D_rowOffsets[var0];
-
-                  while(true) {
-                     --var2;
-                     if(var2 < 0) {
-                        while(true) {
-                           --var1;
-                           if(var1 < 0) {
-                              return;
-                           }
-
-                           Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14);
-                           var5 += var8;
-                           var3 += var7;
-                           var0 += Rasterizer2D.Rasterizer2D_width;
+               while (true) {
+                  --var1;
+                  if (var1 < 0) {
+                     while (true) {
+                        --var2;
+                        if (var2 < 0) {
+                           return;
                         }
+
+                        Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var4 >> 14);
+                        var5 += var9;
+                        var4 += var8;
+                        var0 += Rasterizer2D.Rasterizer2D_width;
                      }
-
-                     Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var4 >> 14, var3 >> 14);
-                     var4 += var9;
-                     var3 += var7;
-                     var0 += Rasterizer2D.Rasterizer2D_width;
                   }
-               } else {
-                  var1 -= var2;
-                  var2 -= var0;
-                  var0 = Rasterizer3D_rowOffsets[var0];
 
-                  while(true) {
-                     --var2;
-                     if(var2 < 0) {
-                        while(true) {
-                           --var1;
-                           if(var1 < 0) {
-                              return;
-                           }
-
-                           Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14);
-                           var5 += var8;
-                           var3 += var7;
-                           var0 += Rasterizer2D.Rasterizer2D_width;
-                        }
-                     }
-
-                     Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var4 >> 14);
-                     var4 += var9;
-                     var3 += var7;
-                     var0 += Rasterizer2D.Rasterizer2D_width;
-                  }
+                  Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14);
+                  var5 += var9;
+                  var3 += var7;
+                  var0 += Rasterizer2D.Rasterizer2D_width;
                }
             }
+
+            var4 = var3 <<= 14;
+            if (var0 < 0) {
+               var4 -= var0 * var9;
+               var3 -= var0 * var7;
+               var0 = 0;
+            }
+
+            var5 <<= 14;
+            if (var2 < 0) {
+               var5 -= var8 * var2;
+               var2 = 0;
+            }
+
+            if (var0 != var2 && var9 < var7 || var0 == var2 && var8 > var7) {
+               var1 -= var2;
+               var2 -= var0;
+               var0 = Rasterizer3D_rowOffsets[var0];
+
+               while (true) {
+                  --var2;
+                  if (var2 < 0) {
+                     while (true) {
+                        --var1;
+                        if (var1 < 0) {
+                           return;
+                        }
+
+                        Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14);
+                        var5 += var8;
+                        var3 += var7;
+                        var0 += Rasterizer2D.Rasterizer2D_width;
+                     }
+                  }
+
+                  Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var4 >> 14, var3 >> 14);
+                  var4 += var9;
+                  var3 += var7;
+                  var0 += Rasterizer2D.Rasterizer2D_width;
+               }
+            }
+
+            var1 -= var2;
+            var2 -= var0;
+            var0 = Rasterizer3D_rowOffsets[var0];
+
+            while (true) {
+               --var2;
+               if (var2 < 0) {
+                  while (true) {
+                     --var1;
+                     if (var1 < 0) {
+                        return;
+                     }
+
+                     Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14);
+                     var5 += var8;
+                     var3 += var7;
+                     var0 += Rasterizer2D.Rasterizer2D_width;
+                  }
+               }
+
+               Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var4 >> 14);
+               var4 += var9;
+               var3 += var7;
+               var0 += Rasterizer2D.Rasterizer2D_width;
+            }
          }
-      } else if(var1 <= var2) {
-         if(var1 < Rasterizer3D_clipHeight) {
-            if(var2 > Rasterizer3D_clipHeight) {
+      } else if (var1 <= var2) {
+         if (var1 < Rasterizer3D_clipHeight) {
+            if (var2 > Rasterizer3D_clipHeight) {
                var2 = Rasterizer3D_clipHeight;
             }
 
-            if(var0 > Rasterizer3D_clipHeight) {
+            if (var0 > Rasterizer3D_clipHeight) {
                var0 = Rasterizer3D_clipHeight;
             }
 
-            if(var2 < var0) {
+            if (var2 < var0) {
                var3 = var4 <<= 14;
-               if(var1 < 0) {
+               if (var1 < 0) {
                   var3 -= var7 * var1;
                   var4 -= var8 * var1;
                   var1 = 0;
                }
 
                var5 <<= 14;
-               if(var2 < 0) {
+               if (var2 < 0) {
                   var5 -= var9 * var2;
                   var2 = 0;
                }
 
-               if((var2 == var1 || var7 >= var8) && (var2 != var1 || var7 <= var9)) {
+               if ((var2 == var1 || var7 >= var8) && (var2 != var1 || var7 <= var9)) {
                   var0 -= var2;
                   var2 -= var1;
                   var1 = Rasterizer3D_rowOffsets[var1];
 
-                  while(true) {
+                  while (true) {
                      --var2;
-                     if(var2 < 0) {
-                        while(true) {
+                     if (var2 < 0) {
+                        while (true) {
                            --var0;
-                           if(var0 < 0) {
+                           if (var0 < 0) {
                               return;
                            }
 
@@ -1083,136 +1053,136 @@ public class Rasterizer3D extends Rasterizer2D {
                      var4 += var8;
                      var1 += Rasterizer2D.Rasterizer2D_width;
                   }
-               } else {
-                  var0 -= var2;
-                  var2 -= var1;
-                  var1 = Rasterizer3D_rowOffsets[var1];
-
-                  while(true) {
-                     --var2;
-                     if(var2 < 0) {
-                        while(true) {
-                           --var0;
-                           if(var0 < 0) {
-                              return;
-                           }
-
-                           Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var5 >> 14);
-                           var3 += var7;
-                           var5 += var9;
-                           var1 += Rasterizer2D.Rasterizer2D_width;
-                        }
-                     }
-
-                     Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14);
-                     var3 += var7;
-                     var4 += var8;
-                     var1 += Rasterizer2D.Rasterizer2D_width;
-                  }
-               }
-            } else {
-               var5 = var4 <<= 14;
-               if(var1 < 0) {
-                  var5 -= var7 * var1;
-                  var4 -= var8 * var1;
-                  var1 = 0;
                }
 
-               var3 <<= 14;
-               if(var0 < 0) {
-                  var3 -= var0 * var9;
-                  var0 = 0;
-               }
+               var0 -= var2;
+               var2 -= var1;
+               var1 = Rasterizer3D_rowOffsets[var1];
 
-               if(var7 < var8) {
-                  var2 -= var0;
-                  var0 -= var1;
-                  var1 = Rasterizer3D_rowOffsets[var1];
-
-                  while(true) {
-                     --var0;
-                     if(var0 < 0) {
-                        while(true) {
-                           --var2;
-                           if(var2 < 0) {
-                              return;
-                           }
-
-                           Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14);
-                           var3 += var9;
-                           var4 += var8;
-                           var1 += Rasterizer2D.Rasterizer2D_width;
+               while (true) {
+                  --var2;
+                  if (var2 < 0) {
+                     while (true) {
+                        --var0;
+                        if (var0 < 0) {
+                           return;
                         }
+
+                        Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var5 >> 14);
+                        var3 += var7;
+                        var5 += var9;
+                        var1 += Rasterizer2D.Rasterizer2D_width;
                      }
-
-                     Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var5 >> 14, var4 >> 14);
-                     var5 += var7;
-                     var4 += var8;
-                     var1 += Rasterizer2D.Rasterizer2D_width;
                   }
-               } else {
-                  var2 -= var0;
-                  var0 -= var1;
-                  var1 = Rasterizer3D_rowOffsets[var1];
 
-                  while(true) {
-                     --var0;
-                     if(var0 < 0) {
-                        while(true) {
-                           --var2;
-                           if(var2 < 0) {
-                              return;
-                           }
-
-                           Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var3 >> 14);
-                           var3 += var9;
-                           var4 += var8;
-                           var1 += Rasterizer2D.Rasterizer2D_width;
-                        }
-                     }
-
-                     Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var5 >> 14);
-                     var5 += var7;
-                     var4 += var8;
-                     var1 += Rasterizer2D.Rasterizer2D_width;
-                  }
+                  Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14);
+                  var3 += var7;
+                  var4 += var8;
+                  var1 += Rasterizer2D.Rasterizer2D_width;
                }
             }
+
+            var5 = var4 <<= 14;
+            if (var1 < 0) {
+               var5 -= var7 * var1;
+               var4 -= var8 * var1;
+               var1 = 0;
+            }
+
+            var3 <<= 14;
+            if (var0 < 0) {
+               var3 -= var0 * var9;
+               var0 = 0;
+            }
+
+            if (var7 < var8) {
+               var2 -= var0;
+               var0 -= var1;
+               var1 = Rasterizer3D_rowOffsets[var1];
+
+               while (true) {
+                  --var0;
+                  if (var0 < 0) {
+                     while (true) {
+                        --var2;
+                        if (var2 < 0) {
+                           return;
+                        }
+
+                        Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14);
+                        var3 += var9;
+                        var4 += var8;
+                        var1 += Rasterizer2D.Rasterizer2D_width;
+                     }
+                  }
+
+                  Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var5 >> 14, var4 >> 14);
+                  var5 += var7;
+                  var4 += var8;
+                  var1 += Rasterizer2D.Rasterizer2D_width;
+               }
+            }
+
+            var2 -= var0;
+            var0 -= var1;
+            var1 = Rasterizer3D_rowOffsets[var1];
+
+            while (true) {
+               --var0;
+               if (var0 < 0) {
+                  while (true) {
+                     --var2;
+                     if (var2 < 0) {
+                        return;
+                     }
+
+                     Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var3 >> 14);
+                     var3 += var9;
+                     var4 += var8;
+                     var1 += Rasterizer2D.Rasterizer2D_width;
+                  }
+               }
+
+               Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var5 >> 14);
+               var5 += var7;
+               var4 += var8;
+               var1 += Rasterizer2D.Rasterizer2D_width;
+            }
          }
-      } else if(var2 < Rasterizer3D_clipHeight) {
-         if(var0 > Rasterizer3D_clipHeight) {
+      } else if (var2 < Rasterizer3D_clipHeight) {
+         if (var0 > Rasterizer3D_clipHeight) {
             var0 = Rasterizer3D_clipHeight;
          }
 
-         if(var1 > Rasterizer3D_clipHeight) {
+         if (var1 > Rasterizer3D_clipHeight) {
             var1 = Rasterizer3D_clipHeight;
          }
 
-         if(var0 < var1) {
+         if (var0 < var1) {
             var4 = var5 <<= 14;
-            if(var2 < 0) {
+            if (var2 < 0) {
                var4 -= var8 * var2;
                var5 -= var9 * var2;
                var2 = 0;
             }
 
             var3 <<= 14;
-            if(var0 < 0) {
+            if (var0 < 0) {
                var3 -= var0 * var7;
                var0 = 0;
             }
 
-            if(var8 < var9) {
+            if (var8 < var9) {
                var1 -= var0;
                var0 -= var2;
                var2 = Rasterizer3D_rowOffsets[var2];
 
-               while(true) {
+               while (true) {
                   --var0;
-                  if(var0 < 0) {
-                     while(true) {
+                  if (var0 < 0) {
+                     while (true) {
                         --var1;
-                        if(var1 < 0) {
+                        if (var1 < 0) {
                            return;
                         }
 
@@ -1228,130 +1198,131 @@ public class Rasterizer3D extends Rasterizer2D {
                   var5 += var9;
                   var2 += Rasterizer2D.Rasterizer2D_width;
                }
-            } else {
-               var1 -= var0;
-               var0 -= var2;
-               var2 = Rasterizer3D_rowOffsets[var2];
+            }
 
-               while(true) {
-                  --var0;
-                  if(var0 < 0) {
-                     while(true) {
-                        --var1;
-                        if(var1 < 0) {
-                           return;
-                        }
+            var1 -= var0;
+            var0 -= var2;
+            var2 = Rasterizer3D_rowOffsets[var2];
 
-                        Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var4 >> 14);
-                        var4 += var8;
-                        var3 += var7;
-                        var2 += Rasterizer2D.Rasterizer2D_width;
+            while (true) {
+               --var0;
+               if (var0 < 0) {
+                  while (true) {
+                     --var1;
+                     if (var1 < 0) {
+                        return;
                      }
+
+                     Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var4 >> 14);
+                     var4 += var8;
+                     var3 += var7;
+                     var2 += Rasterizer2D.Rasterizer2D_width;
+                  }
+               }
+
+               Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var4 >> 14);
+               var4 += var8;
+               var5 += var9;
+               var2 += Rasterizer2D.Rasterizer2D_width;
+            }
+         }
+
+         var3 = var5 <<= 14;
+         if (var2 < 0) {
+            var3 -= var8 * var2;
+            var5 -= var9 * var2;
+            var2 = 0;
+         }
+
+         var4 <<= 14;
+         if (var1 < 0) {
+            var4 -= var7 * var1;
+            var1 = 0;
+         }
+
+         if (var8 < var9) {
+            var0 -= var1;
+            var1 -= var2;
+            var2 = Rasterizer3D_rowOffsets[var2];
+
+            while (true) {
+               --var1;
+               if (var1 < 0) {
+                  while (true) {
+                     --var0;
+                     if (var0 < 0) {
+                        return;
+                     }
+
+                     Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var5 >> 14);
+                     var4 += var7;
+                     var5 += var9;
+                     var2 += Rasterizer2D.Rasterizer2D_width;
+                  }
+               }
+
+               Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var5 >> 14);
+               var3 += var8;
+               var5 += var9;
+               var2 += Rasterizer2D.Rasterizer2D_width;
+            }
+         }
+
+         var0 -= var1;
+         var1 -= var2;
+         var2 = Rasterizer3D_rowOffsets[var2];
+
+         while (true) {
+            --var1;
+            if (var1 < 0) {
+               while (true) {
+                  --var0;
+                  if (var0 < 0) {
+                     return;
                   }
 
                   Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var4 >> 14);
-                  var4 += var8;
+                  var4 += var7;
                   var5 += var9;
                   var2 += Rasterizer2D.Rasterizer2D_width;
                }
             }
-         } else {
-            var3 = var5 <<= 14;
-            if(var2 < 0) {
-               var3 -= var8 * var2;
-               var5 -= var9 * var2;
-               var2 = 0;
-            }
 
-            var4 <<= 14;
-            if(var1 < 0) {
-               var4 -= var7 * var1;
-               var1 = 0;
-            }
-
-            if(var8 < var9) {
-               var0 -= var1;
-               var1 -= var2;
-               var2 = Rasterizer3D_rowOffsets[var2];
-
-               while(true) {
-                  --var1;
-                  if(var1 < 0) {
-                     while(true) {
-                        --var0;
-                        if(var0 < 0) {
-                           return;
-                        }
-
-                        Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var5 >> 14);
-                        var4 += var7;
-                        var5 += var9;
-                        var2 += Rasterizer2D.Rasterizer2D_width;
-                     }
-                  }
-
-                  Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var5 >> 14);
-                  var3 += var8;
-                  var5 += var9;
-                  var2 += Rasterizer2D.Rasterizer2D_width;
-               }
-            } else {
-               var0 -= var1;
-               var1 -= var2;
-               var2 = Rasterizer3D_rowOffsets[var2];
-
-               while(true) {
-                  --var1;
-                  if(var1 < 0) {
-                     while(true) {
-                        --var0;
-                        if(var0 < 0) {
-                           return;
-                        }
-
-                        Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var4 >> 14);
-                        var4 += var7;
-                        var5 += var9;
-                        var2 += Rasterizer2D.Rasterizer2D_width;
-                     }
-                  }
-
-                  Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var3 >> 14);
-                  var3 += var8;
-                  var5 += var9;
-                  var2 += Rasterizer2D.Rasterizer2D_width;
-               }
-            }
+            Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var3 >> 14);
+            var3 += var8;
+            var5 += var9;
+            var2 += Rasterizer2D.Rasterizer2D_width;
          }
       }
+
    }
 
    @ObfuscatedName("z")
    @Export("Rasterizer3D_horizAlpha")
    static final void Rasterizer3D_horizAlpha(int[] var0, int var1, int var2, int var3, int var4, int var5) {
-      if(__et_m) {
-         if(var5 > Rasterizer3D_clipWidth) {
+      if (field739) {
+         if (var5 > Rasterizer3D_clipWidth) {
             var5 = Rasterizer3D_clipWidth;
          }
 
-         if(var4 < 0) {
+         if (var4 < 0) {
             var4 = 0;
          }
       }
 
-      if(var4 < var5) {
+      if (var4 < var5) {
          var1 += var4;
          var3 = var5 - var4 >> 2;
-         if(Rasterizer3D_alpha != 0) {
-            if(Rasterizer3D_alpha == 254) {
-               while(true) {
+         if (Rasterizer3D_alpha != 0) {
+            if (Rasterizer3D_alpha == 254) {
+               while (true) {
                   --var3;
-                  if(var3 < 0) {
+                  if (var3 < 0) {
                      var3 = var5 - var4 & 3;
 
-                     while(true) {
+                     while (true) {
                         --var3;
-                        if(var3 < 0) {
+                        if (var3 < 0) {
                            return;
                         }
 
@@ -1369,15 +1340,15 @@ public class Rasterizer3D extends Rasterizer2D {
                int var7 = 256 - Rasterizer3D_alpha;
                var2 = (var7 * (var2 & 65280) >> 8 & 65280) + (var7 * (var2 & 16711935) >> 8 & 16711935);
 
-               while(true) {
+               while (true) {
                   --var3;
                   int var8;
-                  if(var3 < 0) {
+                  if (var3 < 0) {
                      var3 = var5 - var4 & 3;
 
-                     while(true) {
+                     while (true) {
                         --var3;
-                        if(var3 < 0) {
+                        if (var3 < 0) {
                            return;
                         }
 
@@ -1397,14 +1368,14 @@ public class Rasterizer3D extends Rasterizer2D {
                }
             }
          } else {
-            while(true) {
+            while (true) {
                --var3;
-               if(var3 < 0) {
+               if (var3 < 0) {
                   var3 = var5 - var4 & 3;
 
-                  while(true) {
+                  while (true) {
                      --var3;
-                     if(var3 < 0) {
+                     if (var3 < 0) {
                         return;
                      }
 
@@ -1425,12 +1396,12 @@ public class Rasterizer3D extends Rasterizer2D {
    static final void method2986(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.load(var18);
       int var20;
-      if(var19 == null) {
-         var20 = Rasterizer3D_textureLoader.__w_213(var18);
+      if (var19 == null) {
+         var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18);
          method3037(var0, var1, var2, var3, var4, var5, method3040(var20, var6), method3040(var20, var7), method3040(var20, var8));
       } else {
          Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18);
-         __et_f = Rasterizer3D_textureLoader.__o_214(var18);
+         field740 = Rasterizer3D_textureLoader.vmethod325(var18);
          var20 = var4 - var3;
          int var21 = var1 - var0;
          int var22 = var5 - var3;
@@ -1438,22 +1409,22 @@ public class Rasterizer3D extends Rasterizer2D {
          int var24 = var7 - var6;
          int var25 = var8 - var6;
          int var26 = 0;
-         if(var0 != var1) {
+         if (var0 != var1) {
             var26 = (var4 - var3 << 14) / (var1 - var0);
          }
 
          int var27 = 0;
-         if(var2 != var1) {
+         if (var2 != var1) {
             var27 = (var5 - var4 << 14) / (var2 - var1);
          }
 
          int var28 = 0;
-         if(var0 != var2) {
+         if (var0 != var2) {
             var28 = (var3 - var5 << 14) / (var0 - var2);
          }
 
          int var29 = var20 * var23 - var22 * var21;
-         if(var29 != 0) {
+         if (var29 != 0) {
             int var30 = (var24 * var23 - var25 * var21 << 9) / var29;
             int var31 = (var25 * var20 - var24 * var22 << 9) / var29;
             var10 = var9 - var10;
@@ -1472,20 +1443,20 @@ public class Rasterizer3D extends Rasterizer2D {
             int var39 = (int)(((long)(var16 * var14 - var13 * var17) << 3 << 14) / (long)Rasterizer3D_zoom);
             int var40 = (int)(((long)(var17 * var10 - var11 * var16) << 14) / (long)Rasterizer3D_zoom);
             int var41;
-            if(var0 <= var1 && var0 <= var2) {
-               if(var0 < Rasterizer3D_clipHeight) {
-                  if(var1 > Rasterizer3D_clipHeight) {
+            if (var0 <= var1 && var0 <= var2) {
+               if (var0 < Rasterizer3D_clipHeight) {
+                  if (var1 > Rasterizer3D_clipHeight) {
                      var1 = Rasterizer3D_clipHeight;
                   }
 
-                  if(var2 > Rasterizer3D_clipHeight) {
+                  if (var2 > Rasterizer3D_clipHeight) {
                      var2 = Rasterizer3D_clipHeight;
                   }
 
                   var6 = var30 + ((var6 << 9) - var3 * var30);
-                  if(var1 < var2) {
+                  if (var1 < var2) {
                      var5 = var3 <<= 14;
-                     if(var0 < 0) {
+                     if (var0 < 0) {
                         var5 -= var0 * var28;
                         var3 -= var0 * var26;
                         var6 -= var0 * var31;
@@ -1493,7 +1464,7 @@ public class Rasterizer3D extends Rasterizer2D {
                      }
 
                      var4 <<= 14;
-                     if(var1 < 0) {
+                     if (var1 < 0) {
                         var4 -= var27 * var1;
                         var1 = 0;
                      }
@@ -1502,17 +1473,17 @@ public class Rasterizer3D extends Rasterizer2D {
                      var32 += var34 * var41;
                      var35 += var37 * var41;
                      var38 += var40 * var41;
-                     if(var0 != var1 && var28 < var26 || var0 == var1 && var28 > var27) {
+                     if (var0 != var1 && var28 < var26 || var0 == var1 && var28 > var27) {
                         var2 -= var1;
                         var1 -= var0;
                         var0 = Rasterizer3D_rowOffsets[var0];
 
-                        while(true) {
+                        while (true) {
                            --var1;
-                           if(var1 < 0) {
-                              while(true) {
+                           if (var1 < 0) {
+                              while (true) {
                                  --var2;
-                                 if(var2 < 0) {
+                                 if (var2 < 0) {
                                     return;
                                  }
 
@@ -1536,33 +1507,112 @@ public class Rasterizer3D extends Rasterizer2D {
                            var35 += var37;
                            var38 += var40;
                         }
-                     } else {
-                        var2 -= var1;
-                        var1 -= var0;
-                        var0 = Rasterizer3D_rowOffsets[var0];
+                     }
 
-                        while(true) {
-                           --var1;
-                           if(var1 < 0) {
-                              while(true) {
-                                 --var2;
-                                 if(var2 < 0) {
-                                    return;
-                                 }
+                     var2 -= var1;
+                     var1 -= var0;
+                     var0 = Rasterizer3D_rowOffsets[var0];
 
-                                 Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
-                                 var5 += var28;
-                                 var4 += var27;
-                                 var6 += var31;
-                                 var0 += Rasterizer2D.Rasterizer2D_width;
-                                 var32 += var34;
-                                 var35 += var37;
-                                 var38 += var40;
+                     while (true) {
+                        --var1;
+                        if (var1 < 0) {
+                           while (true) {
+                              --var2;
+                              if (var2 < 0) {
+                                 return;
                               }
+
+                              Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
+                              var5 += var28;
+                              var4 += var27;
+                              var6 += var31;
+                              var0 += Rasterizer2D.Rasterizer2D_width;
+                              var32 += var34;
+                              var35 += var37;
+                              var38 += var40;
+                           }
+                        }
+
+                        Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
+                        var5 += var28;
+                        var3 += var26;
+                        var6 += var31;
+                        var0 += Rasterizer2D.Rasterizer2D_width;
+                        var32 += var34;
+                        var35 += var37;
+                        var38 += var40;
+                     }
+                  }
+
+                  var4 = var3 <<= 14;
+                  if (var0 < 0) {
+                     var4 -= var0 * var28;
+                     var3 -= var0 * var26;
+                     var6 -= var0 * var31;
+                     var0 = 0;
+                  }
+
+                  var5 <<= 14;
+                  if (var2 < 0) {
+                     var5 -= var27 * var2;
+                     var2 = 0;
+                  }
+
+                  var41 = var0 - Rasterizer3D_clipMidY;
+                  var32 += var34 * var41;
+                  var35 += var37 * var41;
+                  var38 += var40 * var41;
+                  if (var0 != var2 && var28 < var26 || var0 == var2 && var27 > var26) {
+                     var1 -= var2;
+                     var2 -= var0;
+                     var0 = Rasterizer3D_rowOffsets[var0];
+
+                     while (true) {
+                        --var2;
+                        if (var2 < 0) {
+                           while (true) {
+                              --var1;
+                              if (var1 < 0) {
+                                 return;
+                              }
+
+                              Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
+                              var5 += var27;
+                              var3 += var26;
+                              var6 += var31;
+                              var0 += Rasterizer2D.Rasterizer2D_width;
+                              var32 += var34;
+                              var35 += var37;
+                              var38 += var40;
+                           }
+                        }
+
+                        Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
+                        var4 += var28;
+                        var3 += var26;
+                        var6 += var31;
+                        var0 += Rasterizer2D.Rasterizer2D_width;
+                        var32 += var34;
+                        var35 += var37;
+                        var38 += var40;
+                     }
+                  }
+
+                  var1 -= var2;
+                  var2 -= var0;
+                  var0 = Rasterizer3D_rowOffsets[var0];
+
+                  while (true) {
+                     --var2;
+                     if (var2 < 0) {
+                        while (true) {
+                           --var1;
+                           if (var1 < 0) {
+                              return;
                            }
 
                            Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
-                           var5 += var28;
+                           var5 += var27;
                            var3 += var26;
                            var6 += var31;
                            var0 += Rasterizer2D.Rasterizer2D_width;
@@ -1571,110 +1621,31 @@ public class Rasterizer3D extends Rasterizer2D {
                            var38 += var40;
                         }
                      }
-                  } else {
-                     var4 = var3 <<= 14;
-                     if(var0 < 0) {
-                        var4 -= var0 * var28;
-                        var3 -= var0 * var26;
-                        var6 -= var0 * var31;
-                        var0 = 0;
-                     }
 
-                     var5 <<= 14;
-                     if(var2 < 0) {
-                        var5 -= var27 * var2;
-                        var2 = 0;
-                     }
-
-                     var41 = var0 - Rasterizer3D_clipMidY;
-                     var32 += var34 * var41;
-                     var35 += var37 * var41;
-                     var38 += var40 * var41;
-                     if(var0 != var2 && var28 < var26 || var0 == var2 && var27 > var26) {
-                        var1 -= var2;
-                        var2 -= var0;
-                        var0 = Rasterizer3D_rowOffsets[var0];
-
-                        while(true) {
-                           --var2;
-                           if(var2 < 0) {
-                              while(true) {
-                                 --var1;
-                                 if(var1 < 0) {
-                                    return;
-                                 }
-
-                                 Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
-                                 var5 += var27;
-                                 var3 += var26;
-                                 var6 += var31;
-                                 var0 += Rasterizer2D.Rasterizer2D_width;
-                                 var32 += var34;
-                                 var35 += var37;
-                                 var38 += var40;
-                              }
-                           }
-
-                           Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
-                           var4 += var28;
-                           var3 += var26;
-                           var6 += var31;
-                           var0 += Rasterizer2D.Rasterizer2D_width;
-                           var32 += var34;
-                           var35 += var37;
-                           var38 += var40;
-                        }
-                     } else {
-                        var1 -= var2;
-                        var2 -= var0;
-                        var0 = Rasterizer3D_rowOffsets[var0];
-
-                        while(true) {
-                           --var2;
-                           if(var2 < 0) {
-                              while(true) {
-                                 --var1;
-                                 if(var1 < 0) {
-                                    return;
-                                 }
-
-                                 Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
-                                 var5 += var27;
-                                 var3 += var26;
-                                 var6 += var31;
-                                 var0 += Rasterizer2D.Rasterizer2D_width;
-                                 var32 += var34;
-                                 var35 += var37;
-                                 var38 += var40;
-                              }
-                           }
-
-                           Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
-                           var4 += var28;
-                           var3 += var26;
-                           var6 += var31;
-                           var0 += Rasterizer2D.Rasterizer2D_width;
-                           var32 += var34;
-                           var35 += var37;
-                           var38 += var40;
-                        }
-                     }
+                     Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
+                     var4 += var28;
+                     var3 += var26;
+                     var6 += var31;
+                     var0 += Rasterizer2D.Rasterizer2D_width;
+                     var32 += var34;
+                     var35 += var37;
+                     var38 += var40;
                   }
                }
-            } else if(var1 <= var2) {
-               if(var1 < Rasterizer3D_clipHeight) {
-                  if(var2 > Rasterizer3D_clipHeight) {
+            } else if (var1 <= var2) {
+               if (var1 < Rasterizer3D_clipHeight) {
+                  if (var2 > Rasterizer3D_clipHeight) {
                      var2 = Rasterizer3D_clipHeight;
                   }
 
-                  if(var0 > Rasterizer3D_clipHeight) {
+                  if (var0 > Rasterizer3D_clipHeight) {
                      var0 = Rasterizer3D_clipHeight;
                   }
 
                   var7 = var30 + ((var7 << 9) - var30 * var4);
-                  if(var2 < var0) {
+                  if (var2 < var0) {
                      var3 = var4 <<= 14;
-                     if(var1 < 0) {
+                     if (var1 < 0) {
                         var3 -= var26 * var1;
                         var4 -= var27 * var1;
                         var7 -= var31 * var1;
@@ -1682,7 +1653,7 @@ public class Rasterizer3D extends Rasterizer2D {
                      }
 
                      var5 <<= 14;
-                     if(var2 < 0) {
+                     if (var2 < 0) {
                         var5 -= var28 * var2;
                         var2 = 0;
                      }
@@ -1691,17 +1662,17 @@ public class Rasterizer3D extends Rasterizer2D {
                      var32 += var34 * var41;
                      var35 += var37 * var41;
                      var38 += var40 * var41;
-                     if(var2 != var1 && var26 < var27 || var2 == var1 && var26 > var28) {
+                     if (var2 != var1 && var26 < var27 || var2 == var1 && var26 > var28) {
                         var0 -= var2;
                         var2 -= var1;
                         var1 = Rasterizer3D_rowOffsets[var1];
 
-                        while(true) {
+                        while (true) {
                            --var2;
-                           if(var2 < 0) {
-                              while(true) {
+                           if (var2 < 0) {
+                              while (true) {
                                  --var0;
-                                 if(var0 < 0) {
+                                 if (var0 < 0) {
                                     return;
                                  }
 
@@ -1725,33 +1696,112 @@ public class Rasterizer3D extends Rasterizer2D {
                            var35 += var37;
                            var38 += var40;
                         }
-                     } else {
-                        var0 -= var2;
-                        var2 -= var1;
-                        var1 = Rasterizer3D_rowOffsets[var1];
+                     }
 
-                        while(true) {
-                           --var2;
-                           if(var2 < 0) {
-                              while(true) {
-                                 --var0;
-                                 if(var0 < 0) {
-                                    return;
-                                 }
+                     var0 -= var2;
+                     var2 -= var1;
+                     var1 = Rasterizer3D_rowOffsets[var1];
 
-                                 Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
-                                 var3 += var26;
-                                 var5 += var28;
-                                 var7 += var31;
-                                 var1 += Rasterizer2D.Rasterizer2D_width;
-                                 var32 += var34;
-                                 var35 += var37;
-                                 var38 += var40;
+                     while (true) {
+                        --var2;
+                        if (var2 < 0) {
+                           while (true) {
+                              --var0;
+                              if (var0 < 0) {
+                                 return;
                               }
+
+                              Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
+                              var3 += var26;
+                              var5 += var28;
+                              var7 += var31;
+                              var1 += Rasterizer2D.Rasterizer2D_width;
+                              var32 += var34;
+                              var35 += var37;
+                              var38 += var40;
+                           }
+                        }
+
+                        Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
+                        var3 += var26;
+                        var4 += var27;
+                        var7 += var31;
+                        var1 += Rasterizer2D.Rasterizer2D_width;
+                        var32 += var34;
+                        var35 += var37;
+                        var38 += var40;
+                     }
+                  }
+
+                  var5 = var4 <<= 14;
+                  if (var1 < 0) {
+                     var5 -= var26 * var1;
+                     var4 -= var27 * var1;
+                     var7 -= var31 * var1;
+                     var1 = 0;
+                  }
+
+                  var3 <<= 14;
+                  if (var0 < 0) {
+                     var3 -= var0 * var28;
+                     var0 = 0;
+                  }
+
+                  var41 = var1 - Rasterizer3D_clipMidY;
+                  var32 += var34 * var41;
+                  var35 += var37 * var41;
+                  var38 += var40 * var41;
+                  if (var26 < var27) {
+                     var2 -= var0;
+                     var0 -= var1;
+                     var1 = Rasterizer3D_rowOffsets[var1];
+
+                     while (true) {
+                        --var0;
+                        if (var0 < 0) {
+                           while (true) {
+                              --var2;
+                              if (var2 < 0) {
+                                 return;
+                              }
+
+                              Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
+                              var3 += var28;
+                              var4 += var27;
+                              var7 += var31;
+                              var1 += Rasterizer2D.Rasterizer2D_width;
+                              var32 += var34;
+                              var35 += var37;
+                              var38 += var40;
+                           }
+                        }
+
+                        Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
+                        var5 += var26;
+                        var4 += var27;
+                        var7 += var31;
+                        var1 += Rasterizer2D.Rasterizer2D_width;
+                        var32 += var34;
+                        var35 += var37;
+                        var38 += var40;
+                     }
+                  }
+
+                  var2 -= var0;
+                  var0 -= var1;
+                  var1 = Rasterizer3D_rowOffsets[var1];
+
+                  while (true) {
+                     --var0;
+                     if (var0 < 0) {
+                        while (true) {
+                           --var2;
+                           if (var2 < 0) {
+                              return;
                            }
 
                            Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
-                           var3 += var26;
+                           var3 += var28;
                            var4 += var27;
                            var7 += var31;
                            var1 += Rasterizer2D.Rasterizer2D_width;
@@ -1760,109 +1810,30 @@ public class Rasterizer3D extends Rasterizer2D {
                            var38 += var40;
                         }
                      }
-                  } else {
-                     var5 = var4 <<= 14;
-                     if(var1 < 0) {
-                        var5 -= var26 * var1;
-                        var4 -= var27 * var1;
-                        var7 -= var31 * var1;
-                        var1 = 0;
-                     }
 
-                     var3 <<= 14;
-                     if(var0 < 0) {
-                        var3 -= var0 * var28;
-                        var0 = 0;
-                     }
-
-                     var41 = var1 - Rasterizer3D_clipMidY;
-                     var32 += var34 * var41;
-                     var35 += var37 * var41;
-                     var38 += var40 * var41;
-                     if(var26 < var27) {
-                        var2 -= var0;
-                        var0 -= var1;
-                        var1 = Rasterizer3D_rowOffsets[var1];
-
-                        while(true) {
-                           --var0;
-                           if(var0 < 0) {
-                              while(true) {
-                                 --var2;
-                                 if(var2 < 0) {
-                                    return;
-                                 }
-
-                                 Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
-                                 var3 += var28;
-                                 var4 += var27;
-                                 var7 += var31;
-                                 var1 += Rasterizer2D.Rasterizer2D_width;
-                                 var32 += var34;
-                                 var35 += var37;
-                                 var38 += var40;
-                              }
-                           }
-
-                           Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
-                           var5 += var26;
-                           var4 += var27;
-                           var7 += var31;
-                           var1 += Rasterizer2D.Rasterizer2D_width;
-                           var32 += var34;
-                           var35 += var37;
-                           var38 += var40;
-                        }
-                     } else {
-                        var2 -= var0;
-                        var0 -= var1;
-                        var1 = Rasterizer3D_rowOffsets[var1];
-
-                        while(true) {
-                           --var0;
-                           if(var0 < 0) {
-                              while(true) {
-                                 --var2;
-                                 if(var2 < 0) {
-                                    return;
-                                 }
-
-                                 Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
-                                 var3 += var28;
-                                 var4 += var27;
-                                 var7 += var31;
-                                 var1 += Rasterizer2D.Rasterizer2D_width;
-                                 var32 += var34;
-                                 var35 += var37;
-                                 var38 += var40;
-                              }
-                           }
-
-                           Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
-                           var5 += var26;
-                           var4 += var27;
-                           var7 += var31;
-                           var1 += Rasterizer2D.Rasterizer2D_width;
-                           var32 += var34;
-                           var35 += var37;
-                           var38 += var40;
-                        }
-                     }
+                     Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
+                     var5 += var26;
+                     var4 += var27;
+                     var7 += var31;
+                     var1 += Rasterizer2D.Rasterizer2D_width;
+                     var32 += var34;
+                     var35 += var37;
+                     var38 += var40;
                   }
                }
-            } else if(var2 < Rasterizer3D_clipHeight) {
-               if(var0 > Rasterizer3D_clipHeight) {
+            } else if (var2 < Rasterizer3D_clipHeight) {
+               if (var0 > Rasterizer3D_clipHeight) {
                   var0 = Rasterizer3D_clipHeight;
                }
 
-               if(var1 > Rasterizer3D_clipHeight) {
+               if (var1 > Rasterizer3D_clipHeight) {
                   var1 = Rasterizer3D_clipHeight;
                }
 
                var8 = (var8 << 9) - var5 * var30 + var30;
-               if(var0 < var1) {
+               if (var0 < var1) {
                   var4 = var5 <<= 14;
-                  if(var2 < 0) {
+                  if (var2 < 0) {
                      var4 -= var27 * var2;
                      var5 -= var28 * var2;
                      var8 -= var31 * var2;
@@ -1870,7 +1841,7 @@ public class Rasterizer3D extends Rasterizer2D {
                   }
 
                   var3 <<= 14;
-                  if(var0 < 0) {
+                  if (var0 < 0) {
                      var3 -= var0 * var26;
                      var0 = 0;
                   }
@@ -1879,17 +1850,17 @@ public class Rasterizer3D extends Rasterizer2D {
                   var32 += var34 * var41;
                   var35 += var37 * var41;
                   var38 += var40 * var41;
-                  if(var27 < var28) {
+                  if (var27 < var28) {
                      var1 -= var0;
                      var0 -= var2;
                      var2 = Rasterizer3D_rowOffsets[var2];
 
-                     while(true) {
+                     while (true) {
                         --var0;
-                        if(var0 < 0) {
-                           while(true) {
+                        if (var0 < 0) {
+                           while (true) {
                               --var1;
-                              if(var1 < 0) {
+                              if (var1 < 0) {
                                  return;
                               }
 
@@ -1913,33 +1884,112 @@ public class Rasterizer3D extends Rasterizer2D {
                         var35 += var37;
                         var38 += var40;
                      }
-                  } else {
-                     var1 -= var0;
-                     var0 -= var2;
-                     var2 = Rasterizer3D_rowOffsets[var2];
+                  }
 
-                     while(true) {
-                        --var0;
-                        if(var0 < 0) {
-                           while(true) {
-                              --var1;
-                              if(var1 < 0) {
-                                 return;
-                              }
+                  var1 -= var0;
+                  var0 -= var2;
+                  var2 = Rasterizer3D_rowOffsets[var2];
 
-                              Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
-                              var4 += var27;
-                              var3 += var26;
-                              var8 += var31;
-                              var2 += Rasterizer2D.Rasterizer2D_width;
-                              var32 += var34;
-                              var35 += var37;
-                              var38 += var40;
+                  while (true) {
+                     --var0;
+                     if (var0 < 0) {
+                        while (true) {
+                           --var1;
+                           if (var1 < 0) {
+                              return;
                            }
+
+                           Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
+                           var4 += var27;
+                           var3 += var26;
+                           var8 += var31;
+                           var2 += Rasterizer2D.Rasterizer2D_width;
+                           var32 += var34;
+                           var35 += var37;
+                           var38 += var40;
+                        }
+                     }
+
+                     Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
+                     var4 += var27;
+                     var5 += var28;
+                     var8 += var31;
+                     var2 += Rasterizer2D.Rasterizer2D_width;
+                     var32 += var34;
+                     var35 += var37;
+                     var38 += var40;
+                  }
+               }
+
+               var3 = var5 <<= 14;
+               if (var2 < 0) {
+                  var3 -= var27 * var2;
+                  var5 -= var28 * var2;
+                  var8 -= var31 * var2;
+                  var2 = 0;
+               }
+
+               var4 <<= 14;
+               if (var1 < 0) {
+                  var4 -= var26 * var1;
+                  var1 = 0;
+               }
+
+               var41 = var2 - Rasterizer3D_clipMidY;
+               var32 += var34 * var41;
+               var35 += var37 * var41;
+               var38 += var40 * var41;
+               if (var27 < var28) {
+                  var0 -= var1;
+                  var1 -= var2;
+                  var2 = Rasterizer3D_rowOffsets[var2];
+
+                  while (true) {
+                     --var1;
+                     if (var1 < 0) {
+                        while (true) {
+                           --var0;
+                           if (var0 < 0) {
+                              return;
+                           }
+
+                           Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
+                           var4 += var26;
+                           var5 += var28;
+                           var8 += var31;
+                           var2 += Rasterizer2D.Rasterizer2D_width;
+                           var32 += var34;
+                           var35 += var37;
+                           var38 += var40;
+                        }
+                     }
+
+                     Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
+                     var3 += var27;
+                     var5 += var28;
+                     var8 += var31;
+                     var2 += Rasterizer2D.Rasterizer2D_width;
+                     var32 += var34;
+                     var35 += var37;
+                     var38 += var40;
+                  }
+               }
+
+               var0 -= var1;
+               var1 -= var2;
+               var2 = Rasterizer3D_rowOffsets[var2];
+
+               while (true) {
+                  --var1;
+                  if (var1 < 0) {
+                     while (true) {
+                        --var0;
+                        if (var0 < 0) {
+                           return;
                         }
 
                         Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
-                        var4 += var27;
+                        var4 += var26;
                         var5 += var28;
                         var8 += var31;
                         var2 += Rasterizer2D.Rasterizer2D_width;
@@ -1948,118 +1998,39 @@ public class Rasterizer3D extends Rasterizer2D {
                         var38 += var40;
                      }
                   }
-               } else {
-                  var3 = var5 <<= 14;
-                  if(var2 < 0) {
-                     var3 -= var27 * var2;
-                     var5 -= var28 * var2;
-                     var8 -= var31 * var2;
-                     var2 = 0;
-                  }
 
-                  var4 <<= 14;
-                  if(var1 < 0) {
-                     var4 -= var26 * var1;
-                     var1 = 0;
-                  }
-
-                  var41 = var2 - Rasterizer3D_clipMidY;
-                  var32 += var34 * var41;
-                  var35 += var37 * var41;
-                  var38 += var40 * var41;
-                  if(var27 < var28) {
-                     var0 -= var1;
-                     var1 -= var2;
-                     var2 = Rasterizer3D_rowOffsets[var2];
-
-                     while(true) {
-                        --var1;
-                        if(var1 < 0) {
-                           while(true) {
-                              --var0;
-                              if(var0 < 0) {
-                                 return;
-                              }
-
-                              Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
-                              var4 += var26;
-                              var5 += var28;
-                              var8 += var31;
-                              var2 += Rasterizer2D.Rasterizer2D_width;
-                              var32 += var34;
-                              var35 += var37;
-                              var38 += var40;
-                           }
-                        }
-
-                        Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
-                        var3 += var27;
-                        var5 += var28;
-                        var8 += var31;
-                        var2 += Rasterizer2D.Rasterizer2D_width;
-                        var32 += var34;
-                        var35 += var37;
-                        var38 += var40;
-                     }
-                  } else {
-                     var0 -= var1;
-                     var1 -= var2;
-                     var2 = Rasterizer3D_rowOffsets[var2];
-
-                     while(true) {
-                        --var1;
-                        if(var1 < 0) {
-                           while(true) {
-                              --var0;
-                              if(var0 < 0) {
-                                 return;
-                              }
-
-                              Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
-                              var4 += var26;
-                              var5 += var28;
-                              var8 += var31;
-                              var2 += Rasterizer2D.Rasterizer2D_width;
-                              var32 += var34;
-                              var35 += var37;
-                              var38 += var40;
-                           }
-                        }
-
-                        Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
-                        var3 += var27;
-                        var5 += var28;
-                        var8 += var31;
-                        var2 += Rasterizer2D.Rasterizer2D_width;
-                        var32 += var34;
-                        var35 += var37;
-                        var38 += var40;
-                     }
-                  }
+                  Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
+                  var3 += var27;
+                  var5 += var28;
+                  var8 += var31;
+                  var2 += Rasterizer2D.Rasterizer2D_width;
+                  var32 += var34;
+                  var35 += var37;
+                  var38 += var40;
                }
             }
          }
       }
+
    }
 
    @ObfuscatedName("s")
    @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(__et_m) {
-         if(var6 > Rasterizer3D_clipWidth) {
+      if (field739) {
+         if (var6 > Rasterizer3D_clipWidth) {
             var6 = Rasterizer3D_clipWidth;
          }
 
-         if(var5 < 0) {
+         if (var5 < 0) {
             var5 = 0;
          }
       }
 
-      if(var5 < var6) {
+      if (var5 < var6) {
          var4 += var5;
          var7 += var5 * var8;
-         int var17 = var6 - var5;
-         int var15;
+         int var15 = var6 - var5;
          int var16;
          int var10000;
          int var18;
@@ -2068,411 +2039,412 @@ public class Rasterizer3D extends Rasterizer2D {
          int var21;
          int var22;
          int var23;
-         if(Rasterizer3D_isLowDetailTexture) {
-            var23 = var5 - Rasterizer3D_clipMidX;
-            var9 += var23 * (var12 >> 3);
-            var10 += (var13 >> 3) * var23;
-            var11 += var23 * (var14 >> 3);
-            var22 = var11 >> 12;
-            if(var22 != 0) {
-               var18 = var9 / var22;
-               var19 = var10 / var22;
-               if(var18 < 0) {
-                  var18 = 0;
-               } else if(var18 > 4032) {
-                  var18 = 4032;
+         int var24;
+         if (Rasterizer3D_isLowDetailTexture) {
+            var24 = var5 - Rasterizer3D_clipMidX;
+            var9 += var24 * (var12 >> 3);
+            var10 += (var13 >> 3) * var24;
+            var11 += var24 * (var14 >> 3);
+            var23 = var11 >> 12;
+            if (var23 != 0) {
+               var19 = var9 / var23;
+               var20 = var10 / var23;
+               if (var19 < 0) {
+                  var19 = 0;
+               } else if (var19 > 4032) {
+                  var19 = 4032;
                }
             } else {
-               var18 = 0;
                var19 = 0;
+               var20 = 0;
             }
 
             var9 += var12;
             var10 += var13;
             var11 += var14;
-            var22 = var11 >> 12;
-            if(var22 != 0) {
-               var20 = var9 / var22;
-               var21 = var10 / var22;
-               if(var20 < 0) {
-                  var20 = 0;
-               } else if(var20 > 4032) {
-                  var20 = 4032;
+            var23 = var11 >> 12;
+            if (var23 != 0) {
+               var21 = var9 / var23;
+               var22 = var10 / var23;
+               if (var21 < 0) {
+                  var21 = 0;
+               } else if (var21 > 4032) {
+                  var21 = 4032;
                }
             } else {
-               var20 = 0;
                var21 = 0;
+               var22 = 0;
             }
 
-            var2 = (var18 << 20) + var19;
-            var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20);
-            var17 >>= 3;
+            var2 = (var19 << 20) + var20;
+            var18 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 20);
+            var15 >>= 3;
             var8 <<= 3;
-            var15 = var7 >> 8;
-            if(__et_f) {
-               if(var17 > 0) {
+            var16 = var7 >> 8;
+            if (field740) {
+               if (var15 > 0) {
                   do {
                      var3 = var1[(var2 >>> 26) + (var2 & 4032)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var18;
                      var3 = var1[(var2 >>> 26) + (var2 & 4032)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var18;
                      var3 = var1[(var2 >>> 26) + (var2 & 4032)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var18;
                      var3 = var1[(var2 >>> 26) + (var2 & 4032)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var18;
                      var3 = var1[(var2 >>> 26) + (var2 & 4032)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var18;
                      var3 = var1[(var2 >>> 26) + (var2 & 4032)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var18;
                      var3 = var1[(var2 >>> 26) + (var2 & 4032)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var18;
                      var3 = var1[(var2 >>> 26) + (var2 & 4032)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var10000 = var16 + var2;
-                     var18 = var20;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var10000 = var18 + var2;
                      var19 = var21;
+                     var20 = var22;
                      var9 += var12;
                      var10 += var13;
                      var11 += var14;
-                     var22 = var11 >> 12;
-                     if(var22 != 0) {
-                        var20 = var9 / var22;
-                        var21 = var10 / var22;
-                        if(var20 < 0) {
-                           var20 = 0;
-                        } else if(var20 > 4032) {
-                           var20 = 4032;
+                     var23 = var11 >> 12;
+                     if (var23 != 0) {
+                        var21 = var9 / var23;
+                        var22 = var10 / var23;
+                        if (var21 < 0) {
+                           var21 = 0;
+                        } else if (var21 > 4032) {
+                           var21 = 4032;
                         }
                      } else {
-                        var20 = 0;
                         var21 = 0;
+                        var22 = 0;
                      }
 
-                     var2 = (var18 << 20) + var19;
-                     var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20);
+                     var2 = (var19 << 20) + var20;
+                     var18 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 20);
                      var7 += var8;
-                     var15 = var7 >> 8;
-                     --var17;
-                  } while(var17 > 0);
+                     var16 = var7 >> 8;
+                     --var15;
+                  } while(var15 > 0);
                }
 
-               var17 = var6 - var5 & 7;
-               if(var17 > 0) {
+               var15 = var6 - var5 & 7;
+               if (var15 > 0) {
                   do {
                      var3 = var1[(var2 >>> 26) + (var2 & 4032)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
-                     --var17;
-                  } while(var17 > 0);
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var18;
+                     --var15;
+                  } while(var15 > 0);
                }
             } else {
-               if(var17 > 0) {
+               if (var15 > 0) {
                   do {
-                     if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var18;
+                     if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var18;
+                     if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var18;
+                     if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var18;
+                     if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var18;
+                     if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var18;
+                     if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var18;
+                     if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var10000 = var16 + var2;
-                     var18 = var20;
+                     var10000 = var18 + var2;
                      var19 = var21;
+                     var20 = var22;
                      var9 += var12;
                      var10 += var13;
                      var11 += var14;
-                     var22 = var11 >> 12;
-                     if(var22 != 0) {
-                        var20 = var9 / var22;
-                        var21 = var10 / var22;
-                        if(var20 < 0) {
-                           var20 = 0;
-                        } else if(var20 > 4032) {
-                           var20 = 4032;
+                     var23 = var11 >> 12;
+                     if (var23 != 0) {
+                        var21 = var9 / var23;
+                        var22 = var10 / var23;
+                        if (var21 < 0) {
+                           var21 = 0;
+                        } else if (var21 > 4032) {
+                           var21 = 4032;
                         }
                      } else {
-                        var20 = 0;
                         var21 = 0;
+                        var22 = 0;
                      }
 
-                     var2 = (var18 << 20) + var19;
-                     var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 20);
+                     var2 = (var19 << 20) + var20;
+                     var18 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 20);
                      var7 += var8;
-                     var15 = var7 >> 8;
-                     --var17;
-                  } while(var17 > 0);
+                     var16 = var7 >> 8;
+                     --var15;
+                  } while(var15 > 0);
                }
 
-               var17 = var6 - var5 & 7;
-               if(var17 > 0) {
+               var15 = var6 - var5 & 7;
+               if (var15 > 0) {
                   do {
-                     if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     --var17;
-                  } while(var17 > 0);
+                     var2 += var18;
+                     --var15;
+                  } while(var15 > 0);
                }
             }
          } else {
-            var23 = var5 - Rasterizer3D_clipMidX;
-            var9 += var23 * (var12 >> 3);
-            var10 += (var13 >> 3) * var23;
-            var11 += var23 * (var14 >> 3);
-            var22 = var11 >> 14;
-            if(var22 != 0) {
-               var18 = var9 / var22;
-               var19 = var10 / var22;
-               if(var18 < 0) {
-                  var18 = 0;
-               } else if(var18 > 16256) {
-                  var18 = 16256;
+            var24 = var5 - Rasterizer3D_clipMidX;
+            var9 += var24 * (var12 >> 3);
+            var10 += (var13 >> 3) * var24;
+            var11 += var24 * (var14 >> 3);
+            var23 = var11 >> 14;
+            if (var23 != 0) {
+               var19 = var9 / var23;
+               var20 = var10 / var23;
+               if (var19 < 0) {
+                  var19 = 0;
+               } else if (var19 > 16256) {
+                  var19 = 16256;
                }
             } else {
-               var18 = 0;
                var19 = 0;
+               var20 = 0;
             }
 
             var9 += var12;
             var10 += var13;
             var11 += var14;
-            var22 = var11 >> 14;
-            if(var22 != 0) {
-               var20 = var9 / var22;
-               var21 = var10 / var22;
-               if(var20 < 0) {
-                  var20 = 0;
-               } else if(var20 > 16256) {
-                  var20 = 16256;
+            var23 = var11 >> 14;
+            if (var23 != 0) {
+               var21 = var9 / var23;
+               var22 = var10 / var23;
+               if (var21 < 0) {
+                  var21 = 0;
+               } else if (var21 > 16256) {
+                  var21 = 16256;
                }
             } else {
-               var20 = 0;
                var21 = 0;
+               var22 = 0;
             }
 
-            var2 = (var18 << 18) + var19;
-            var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18);
-            var17 >>= 3;
+            var2 = (var19 << 18) + var20;
+            var18 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 18);
+            var15 >>= 3;
             var8 <<= 3;
-            var15 = var7 >> 8;
-            if(__et_f) {
-               if(var17 > 0) {
+            var16 = var7 >> 8;
+            if (field740) {
+               if (var15 > 0) {
                   do {
                      var3 = var1[(var2 & 16256) + (var2 >>> 25)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var18;
                      var3 = var1[(var2 & 16256) + (var2 >>> 25)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var18;
                      var3 = var1[(var2 & 16256) + (var2 >>> 25)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var18;
                      var3 = var1[(var2 & 16256) + (var2 >>> 25)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var18;
                      var3 = var1[(var2 & 16256) + (var2 >>> 25)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var18;
                      var3 = var1[(var2 & 16256) + (var2 >>> 25)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var18;
                      var3 = var1[(var2 & 16256) + (var2 >>> 25)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var18;
                      var3 = var1[(var2 & 16256) + (var2 >>> 25)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var10000 = var16 + var2;
-                     var18 = var20;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var10000 = var18 + var2;
                      var19 = var21;
+                     var20 = var22;
                      var9 += var12;
                      var10 += var13;
                      var11 += var14;
-                     var22 = var11 >> 14;
-                     if(var22 != 0) {
-                        var20 = var9 / var22;
-                        var21 = var10 / var22;
-                        if(var20 < 0) {
-                           var20 = 0;
-                        } else if(var20 > 16256) {
-                           var20 = 16256;
+                     var23 = var11 >> 14;
+                     if (var23 != 0) {
+                        var21 = var9 / var23;
+                        var22 = var10 / var23;
+                        if (var21 < 0) {
+                           var21 = 0;
+                        } else if (var21 > 16256) {
+                           var21 = 16256;
                         }
                      } else {
-                        var20 = 0;
                         var21 = 0;
+                        var22 = 0;
                      }
 
-                     var2 = (var18 << 18) + var19;
-                     var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18);
+                     var2 = (var19 << 18) + var20;
+                     var18 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 18);
                      var7 += var8;
-                     var15 = var7 >> 8;
-                     --var17;
-                  } while(var17 > 0);
+                     var16 = var7 >> 8;
+                     --var15;
+                  } while(var15 > 0);
                }
 
-               var17 = var6 - var5 & 7;
-               if(var17 > 0) {
+               var15 = var6 - var5 & 7;
+               if (var15 > 0) {
                   do {
                      var3 = var1[(var2 & 16256) + (var2 >>> 25)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
-                     --var17;
-                  } while(var17 > 0);
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var18;
+                     --var15;
+                  } while(var15 > 0);
                }
             } else {
-               if(var17 > 0) {
+               if (var15 > 0) {
                   do {
-                     if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var18;
+                     if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var18;
+                     if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var18;
+                     if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var18;
+                     if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var18;
+                     if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var18;
+                     if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var18;
+                     if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var10000 = var16 + var2;
-                     var18 = var20;
+                     var10000 = var18 + var2;
                      var19 = var21;
+                     var20 = var22;
                      var9 += var12;
                      var10 += var13;
                      var11 += var14;
-                     var22 = var11 >> 14;
-                     if(var22 != 0) {
-                        var20 = var9 / var22;
-                        var21 = var10 / var22;
-                        if(var20 < 0) {
-                           var20 = 0;
-                        } else if(var20 > 16256) {
-                           var20 = 16256;
+                     var23 = var11 >> 14;
+                     if (var23 != 0) {
+                        var21 = var9 / var23;
+                        var22 = var10 / var23;
+                        if (var21 < 0) {
+                           var21 = 0;
+                        } else if (var21 > 16256) {
+                           var21 = 16256;
                         }
                      } else {
-                        var20 = 0;
                         var21 = 0;
+                        var22 = 0;
                      }
 
-                     var2 = (var18 << 18) + var19;
-                     var16 = (var21 - var19 >> 3) + (var20 - var18 >> 3 << 18);
+                     var2 = (var19 << 18) + var20;
+                     var18 = (var22 - var20 >> 3) + (var21 - var19 >> 3 << 18);
                      var7 += var8;
-                     var15 = var7 >> 8;
-                     --var17;
-                  } while(var17 > 0);
+                     var16 = var7 >> 8;
+                     --var15;
+                  } while(var15 > 0);
                }
 
-               var17 = var6 - var5 & 7;
-               if(var17 > 0) {
+               var15 = var6 - var5 & 7;
+               if (var15 > 0) {
                   do {
-                     if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     --var17;
-                  } while(var17 > 0);
+                     var2 += var18;
+                     --var15;
+                  } while(var15 > 0);
                }
             }
          }
-
       }
+
    }
 
    @ObfuscatedName("t")
    static final void method3012(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.load(var18);
       int var20;
-      if(var19 == null) {
-         var20 = Rasterizer3D_textureLoader.__w_213(var18);
+      if (var19 == null) {
+         var20 = Rasterizer3D_textureLoader.getAverageTextureRGB(var18);
          method3037(var0, var1, var2, var3, var4, var5, method3040(var20, var6), method3040(var20, var7), method3040(var20, var8));
       } else {
          Rasterizer3D_isLowDetailTexture = Rasterizer3D_textureLoader.isLowDetail(var18);
-         __et_f = Rasterizer3D_textureLoader.__o_214(var18);
+         field740 = Rasterizer3D_textureLoader.vmethod325(var18);
          var20 = var4 - var3;
          int var21 = var1 - var0;
          int var22 = var5 - var3;
@@ -2480,22 +2452,22 @@ public class Rasterizer3D extends Rasterizer2D {
          int var24 = var7 - var6;
          int var25 = var8 - var6;
          int var26 = 0;
-         if(var0 != var1) {
+         if (var0 != var1) {
             var26 = (var4 - var3 << 14) / (var1 - var0);
          }
 
          int var27 = 0;
-         if(var2 != var1) {
+         if (var2 != var1) {
             var27 = (var5 - var4 << 14) / (var2 - var1);
          }
 
          int var28 = 0;
-         if(var0 != var2) {
+         if (var0 != var2) {
             var28 = (var3 - var5 << 14) / (var0 - var2);
          }
 
          int var29 = var20 * var23 - var22 * var21;
-         if(var29 != 0) {
+         if (var29 != 0) {
             int var30 = (var24 * var23 - var25 * var21 << 9) / var29;
             int var31 = (var25 * var20 - var24 * var22 << 9) / var29;
             var10 = var9 - var10;
@@ -2514,20 +2486,20 @@ public class Rasterizer3D extends Rasterizer2D {
             int var39 = (int)(((long)(var16 * var14 - var13 * var17) << 14) / (long)Rasterizer3D_zoom);
             int var40 = (int)(((long)(var17 * var10 - var11 * var16) << 14) / (long)Rasterizer3D_zoom);
             int var41;
-            if(var0 <= var1 && var0 <= var2) {
-               if(var0 < Rasterizer3D_clipHeight) {
-                  if(var1 > Rasterizer3D_clipHeight) {
+            if (var0 <= var1 && var0 <= var2) {
+               if (var0 < Rasterizer3D_clipHeight) {
+                  if (var1 > Rasterizer3D_clipHeight) {
                      var1 = Rasterizer3D_clipHeight;
                   }
 
-                  if(var2 > Rasterizer3D_clipHeight) {
+                  if (var2 > Rasterizer3D_clipHeight) {
                      var2 = Rasterizer3D_clipHeight;
                   }
 
                   var6 = var30 + ((var6 << 9) - var3 * var30);
-                  if(var1 < var2) {
+                  if (var1 < var2) {
                      var5 = var3 <<= 14;
-                     if(var0 < 0) {
+                     if (var0 < 0) {
                         var5 -= var0 * var28;
                         var3 -= var0 * var26;
                         var6 -= var0 * var31;
@@ -2535,7 +2507,7 @@ public class Rasterizer3D extends Rasterizer2D {
                      }
 
                      var4 <<= 14;
-                     if(var1 < 0) {
+                     if (var1 < 0) {
                         var4 -= var27 * var1;
                         var1 = 0;
                      }
@@ -2544,17 +2516,17 @@ public class Rasterizer3D extends Rasterizer2D {
                      var32 += var34 * var41;
                      var35 += var37 * var41;
                      var38 += var40 * var41;
-                     if(var0 != var1 && var28 < var26 || var0 == var1 && var28 > var27) {
+                     if (var0 != var1 && var28 < var26 || var0 == var1 && var28 > var27) {
                         var2 -= var1;
                         var1 -= var0;
                         var0 = Rasterizer3D_rowOffsets[var0];
 
-                        while(true) {
+                        while (true) {
                            --var1;
-                           if(var1 < 0) {
-                              while(true) {
+                           if (var1 < 0) {
+                              while (true) {
                                  --var2;
-                                 if(var2 < 0) {
+                                 if (var2 < 0) {
                                     return;
                                  }
 
@@ -2578,33 +2550,112 @@ public class Rasterizer3D extends Rasterizer2D {
                            var35 += var37;
                            var38 += var40;
                         }
-                     } else {
-                        var2 -= var1;
-                        var1 -= var0;
-                        var0 = Rasterizer3D_rowOffsets[var0];
+                     }
 
-                        while(true) {
-                           --var1;
-                           if(var1 < 0) {
-                              while(true) {
-                                 --var2;
-                                 if(var2 < 0) {
-                                    return;
-                                 }
+                     var2 -= var1;
+                     var1 -= var0;
+                     var0 = Rasterizer3D_rowOffsets[var0];
 
-                                 Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
-                                 var5 += var28;
-                                 var4 += var27;
-                                 var6 += var31;
-                                 var0 += Rasterizer2D.Rasterizer2D_width;
-                                 var32 += var34;
-                                 var35 += var37;
-                                 var38 += var40;
+                     while (true) {
+                        --var1;
+                        if (var1 < 0) {
+                           while (true) {
+                              --var2;
+                              if (var2 < 0) {
+                                 return;
                               }
+
+                              Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
+                              var5 += var28;
+                              var4 += var27;
+                              var6 += var31;
+                              var0 += Rasterizer2D.Rasterizer2D_width;
+                              var32 += var34;
+                              var35 += var37;
+                              var38 += var40;
+                           }
+                        }
+
+                        Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
+                        var5 += var28;
+                        var3 += var26;
+                        var6 += var31;
+                        var0 += Rasterizer2D.Rasterizer2D_width;
+                        var32 += var34;
+                        var35 += var37;
+                        var38 += var40;
+                     }
+                  }
+
+                  var4 = var3 <<= 14;
+                  if (var0 < 0) {
+                     var4 -= var0 * var28;
+                     var3 -= var0 * var26;
+                     var6 -= var0 * var31;
+                     var0 = 0;
+                  }
+
+                  var5 <<= 14;
+                  if (var2 < 0) {
+                     var5 -= var27 * var2;
+                     var2 = 0;
+                  }
+
+                  var41 = var0 - Rasterizer3D_clipMidY;
+                  var32 += var34 * var41;
+                  var35 += var37 * var41;
+                  var38 += var40 * var41;
+                  if (var0 != var2 && var28 < var26 || var0 == var2 && var27 > var26) {
+                     var1 -= var2;
+                     var2 -= var0;
+                     var0 = Rasterizer3D_rowOffsets[var0];
+
+                     while (true) {
+                        --var2;
+                        if (var2 < 0) {
+                           while (true) {
+                              --var1;
+                              if (var1 < 0) {
+                                 return;
+                              }
+
+                              Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
+                              var5 += var27;
+                              var3 += var26;
+                              var6 += var31;
+                              var0 += Rasterizer2D.Rasterizer2D_width;
+                              var32 += var34;
+                              var35 += var37;
+                              var38 += var40;
+                           }
+                        }
+
+                        Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
+                        var4 += var28;
+                        var3 += var26;
+                        var6 += var31;
+                        var0 += Rasterizer2D.Rasterizer2D_width;
+                        var32 += var34;
+                        var35 += var37;
+                        var38 += var40;
+                     }
+                  }
+
+                  var1 -= var2;
+                  var2 -= var0;
+                  var0 = Rasterizer3D_rowOffsets[var0];
+
+                  while (true) {
+                     --var2;
+                     if (var2 < 0) {
+                        while (true) {
+                           --var1;
+                           if (var1 < 0) {
+                              return;
                            }
 
                            Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
-                           var5 += var28;
+                           var5 += var27;
                            var3 += var26;
                            var6 += var31;
                            var0 += Rasterizer2D.Rasterizer2D_width;
@@ -2613,110 +2664,31 @@ public class Rasterizer3D extends Rasterizer2D {
                            var38 += var40;
                         }
                      }
-                  } else {
-                     var4 = var3 <<= 14;
-                     if(var0 < 0) {
-                        var4 -= var0 * var28;
-                        var3 -= var0 * var26;
-                        var6 -= var0 * var31;
-                        var0 = 0;
-                     }
 
-                     var5 <<= 14;
-                     if(var2 < 0) {
-                        var5 -= var27 * var2;
-                        var2 = 0;
-                     }
-
-                     var41 = var0 - Rasterizer3D_clipMidY;
-                     var32 += var34 * var41;
-                     var35 += var37 * var41;
-                     var38 += var40 * var41;
-                     if((var0 == var2 || var28 >= var26) && (var0 != var2 || var27 <= var26)) {
-                        var1 -= var2;
-                        var2 -= var0;
-                        var0 = Rasterizer3D_rowOffsets[var0];
-
-                        while(true) {
-                           --var2;
-                           if(var2 < 0) {
-                              while(true) {
-                                 --var1;
-                                 if(var1 < 0) {
-                                    return;
-                                 }
-
-                                 Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
-                                 var5 += var27;
-                                 var3 += var26;
-                                 var6 += var31;
-                                 var0 += Rasterizer2D.Rasterizer2D_width;
-                                 var32 += var34;
-                                 var35 += var37;
-                                 var38 += var40;
-                              }
-                           }
-
-                           Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
-                           var4 += var28;
-                           var3 += var26;
-                           var6 += var31;
-                           var0 += Rasterizer2D.Rasterizer2D_width;
-                           var32 += var34;
-                           var35 += var37;
-                           var38 += var40;
-                        }
-                     } else {
-                        var1 -= var2;
-                        var2 -= var0;
-                        var0 = Rasterizer3D_rowOffsets[var0];
-
-                        while(true) {
-                           --var2;
-                           if(var2 < 0) {
-                              while(true) {
-                                 --var1;
-                                 if(var1 < 0) {
-                                    return;
-                                 }
-
-                                 Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
-                                 var5 += var27;
-                                 var3 += var26;
-                                 var6 += var31;
-                                 var0 += Rasterizer2D.Rasterizer2D_width;
-                                 var32 += var34;
-                                 var35 += var37;
-                                 var38 += var40;
-                              }
-                           }
-
-                           Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
-                           var4 += var28;
-                           var3 += var26;
-                           var6 += var31;
-                           var0 += Rasterizer2D.Rasterizer2D_width;
-                           var32 += var34;
-                           var35 += var37;
-                           var38 += var40;
-                        }
-                     }
+                     Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39);
+                     var4 += var28;
+                     var3 += var26;
+                     var6 += var31;
+                     var0 += Rasterizer2D.Rasterizer2D_width;
+                     var32 += var34;
+                     var35 += var37;
+                     var38 += var40;
                   }
                }
-            } else if(var1 <= var2) {
-               if(var1 < Rasterizer3D_clipHeight) {
-                  if(var2 > Rasterizer3D_clipHeight) {
+            } else if (var1 <= var2) {
+               if (var1 < Rasterizer3D_clipHeight) {
+                  if (var2 > Rasterizer3D_clipHeight) {
                      var2 = Rasterizer3D_clipHeight;
                   }
 
-                  if(var0 > Rasterizer3D_clipHeight) {
+                  if (var0 > Rasterizer3D_clipHeight) {
                      var0 = Rasterizer3D_clipHeight;
                   }
 
                   var7 = var30 + ((var7 << 9) - var30 * var4);
-                  if(var2 < var0) {
+                  if (var2 < var0) {
                      var3 = var4 <<= 14;
-                     if(var1 < 0) {
+                     if (var1 < 0) {
                         var3 -= var26 * var1;
                         var4 -= var27 * var1;
                         var7 -= var31 * var1;
@@ -2724,7 +2696,7 @@ public class Rasterizer3D extends Rasterizer2D {
                      }
 
                      var5 <<= 14;
-                     if(var2 < 0) {
+                     if (var2 < 0) {
                         var5 -= var28 * var2;
                         var2 = 0;
                      }
@@ -2733,17 +2705,17 @@ public class Rasterizer3D extends Rasterizer2D {
                      var32 += var34 * var41;
                      var35 += var37 * var41;
                      var38 += var40 * var41;
-                     if(var2 != var1 && var26 < var27 || var2 == var1 && var26 > var28) {
+                     if (var2 != var1 && var26 < var27 || var2 == var1 && var26 > var28) {
                         var0 -= var2;
                         var2 -= var1;
                         var1 = Rasterizer3D_rowOffsets[var1];
 
-                        while(true) {
+                        while (true) {
                            --var2;
-                           if(var2 < 0) {
-                              while(true) {
+                           if (var2 < 0) {
+                              while (true) {
                                  --var0;
-                                 if(var0 < 0) {
+                                 if (var0 < 0) {
                                     return;
                                  }
 
@@ -2767,33 +2739,112 @@ public class Rasterizer3D extends Rasterizer2D {
                            var35 += var37;
                            var38 += var40;
                         }
-                     } else {
-                        var0 -= var2;
-                        var2 -= var1;
-                        var1 = Rasterizer3D_rowOffsets[var1];
+                     }
 
-                        while(true) {
-                           --var2;
-                           if(var2 < 0) {
-                              while(true) {
-                                 --var0;
-                                 if(var0 < 0) {
-                                    return;
-                                 }
+                     var0 -= var2;
+                     var2 -= var1;
+                     var1 = Rasterizer3D_rowOffsets[var1];
 
-                                 Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
-                                 var3 += var26;
-                                 var5 += var28;
-                                 var7 += var31;
-                                 var1 += Rasterizer2D.Rasterizer2D_width;
-                                 var32 += var34;
-                                 var35 += var37;
-                                 var38 += var40;
+                     while (true) {
+                        --var2;
+                        if (var2 < 0) {
+                           while (true) {
+                              --var0;
+                              if (var0 < 0) {
+                                 return;
                               }
+
+                              Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
+                              var3 += var26;
+                              var5 += var28;
+                              var7 += var31;
+                              var1 += Rasterizer2D.Rasterizer2D_width;
+                              var32 += var34;
+                              var35 += var37;
+                              var38 += var40;
+                           }
+                        }
+
+                        Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
+                        var3 += var26;
+                        var4 += var27;
+                        var7 += var31;
+                        var1 += Rasterizer2D.Rasterizer2D_width;
+                        var32 += var34;
+                        var35 += var37;
+                        var38 += var40;
+                     }
+                  }
+
+                  var5 = var4 <<= 14;
+                  if (var1 < 0) {
+                     var5 -= var26 * var1;
+                     var4 -= var27 * var1;
+                     var7 -= var31 * var1;
+                     var1 = 0;
+                  }
+
+                  var3 <<= 14;
+                  if (var0 < 0) {
+                     var3 -= var0 * var28;
+                     var0 = 0;
+                  }
+
+                  var41 = var1 - Rasterizer3D_clipMidY;
+                  var32 += var34 * var41;
+                  var35 += var37 * var41;
+                  var38 += var40 * var41;
+                  if (var26 < var27) {
+                     var2 -= var0;
+                     var0 -= var1;
+                     var1 = Rasterizer3D_rowOffsets[var1];
+
+                     while (true) {
+                        --var0;
+                        if (var0 < 0) {
+                           while (true) {
+                              --var2;
+                              if (var2 < 0) {
+                                 return;
+                              }
+
+                              Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
+                              var3 += var28;
+                              var4 += var27;
+                              var7 += var31;
+                              var1 += Rasterizer2D.Rasterizer2D_width;
+                              var32 += var34;
+                              var35 += var37;
+                              var38 += var40;
+                           }
+                        }
+
+                        Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
+                        var5 += var26;
+                        var4 += var27;
+                        var7 += var31;
+                        var1 += Rasterizer2D.Rasterizer2D_width;
+                        var32 += var34;
+                        var35 += var37;
+                        var38 += var40;
+                     }
+                  }
+
+                  var2 -= var0;
+                  var0 -= var1;
+                  var1 = Rasterizer3D_rowOffsets[var1];
+
+                  while (true) {
+                     --var0;
+                     if (var0 < 0) {
+                        while (true) {
+                           --var2;
+                           if (var2 < 0) {
+                              return;
                            }
 
                            Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
-                           var3 += var26;
+                           var3 += var28;
                            var4 += var27;
                            var7 += var31;
                            var1 += Rasterizer2D.Rasterizer2D_width;
@@ -2802,109 +2853,30 @@ public class Rasterizer3D extends Rasterizer2D {
                            var38 += var40;
                         }
                      }
-                  } else {
-                     var5 = var4 <<= 14;
-                     if(var1 < 0) {
-                        var5 -= var26 * var1;
-                        var4 -= var27 * var1;
-                        var7 -= var31 * var1;
-                        var1 = 0;
-                     }
 
-                     var3 <<= 14;
-                     if(var0 < 0) {
-                        var3 -= var0 * var28;
-                        var0 = 0;
-                     }
-
-                     var41 = var1 - Rasterizer3D_clipMidY;
-                     var32 += var34 * var41;
-                     var35 += var37 * var41;
-                     var38 += var40 * var41;
-                     if(var26 < var27) {
-                        var2 -= var0;
-                        var0 -= var1;
-                        var1 = Rasterizer3D_rowOffsets[var1];
-
-                        while(true) {
-                           --var0;
-                           if(var0 < 0) {
-                              while(true) {
-                                 --var2;
-                                 if(var2 < 0) {
-                                    return;
-                                 }
-
-                                 Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
-                                 var3 += var28;
-                                 var4 += var27;
-                                 var7 += var31;
-                                 var1 += Rasterizer2D.Rasterizer2D_width;
-                                 var32 += var34;
-                                 var35 += var37;
-                                 var38 += var40;
-                              }
-                           }
-
-                           Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
-                           var5 += var26;
-                           var4 += var27;
-                           var7 += var31;
-                           var1 += Rasterizer2D.Rasterizer2D_width;
-                           var32 += var34;
-                           var35 += var37;
-                           var38 += var40;
-                        }
-                     } else {
-                        var2 -= var0;
-                        var0 -= var1;
-                        var1 = Rasterizer3D_rowOffsets[var1];
-
-                        while(true) {
-                           --var0;
-                           if(var0 < 0) {
-                              while(true) {
-                                 --var2;
-                                 if(var2 < 0) {
-                                    return;
-                                 }
-
-                                 Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
-                                 var3 += var28;
-                                 var4 += var27;
-                                 var7 += var31;
-                                 var1 += Rasterizer2D.Rasterizer2D_width;
-                                 var32 += var34;
-                                 var35 += var37;
-                                 var38 += var40;
-                              }
-                           }
-
-                           Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
-                           var5 += var26;
-                           var4 += var27;
-                           var7 += var31;
-                           var1 += Rasterizer2D.Rasterizer2D_width;
-                           var32 += var34;
-                           var35 += var37;
-                           var38 += var40;
-                        }
-                     }
+                     Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39);
+                     var5 += var26;
+                     var4 += var27;
+                     var7 += var31;
+                     var1 += Rasterizer2D.Rasterizer2D_width;
+                     var32 += var34;
+                     var35 += var37;
+                     var38 += var40;
                   }
                }
-            } else if(var2 < Rasterizer3D_clipHeight) {
-               if(var0 > Rasterizer3D_clipHeight) {
+            } else if (var2 < Rasterizer3D_clipHeight) {
+               if (var0 > Rasterizer3D_clipHeight) {
                   var0 = Rasterizer3D_clipHeight;
                }
 
-               if(var1 > Rasterizer3D_clipHeight) {
+               if (var1 > Rasterizer3D_clipHeight) {
                   var1 = Rasterizer3D_clipHeight;
                }
 
                var8 = (var8 << 9) - var5 * var30 + var30;
-               if(var0 < var1) {
+               if (var0 < var1) {
                   var4 = var5 <<= 14;
-                  if(var2 < 0) {
+                  if (var2 < 0) {
                      var4 -= var27 * var2;
                      var5 -= var28 * var2;
                      var8 -= var31 * var2;
@@ -2912,7 +2884,7 @@ public class Rasterizer3D extends Rasterizer2D {
                   }
 
                   var3 <<= 14;
-                  if(var0 < 0) {
+                  if (var0 < 0) {
                      var3 -= var0 * var26;
                      var0 = 0;
                   }
@@ -2921,17 +2893,17 @@ public class Rasterizer3D extends Rasterizer2D {
                   var32 += var34 * var41;
                   var35 += var37 * var41;
                   var38 += var40 * var41;
-                  if(var27 < var28) {
+                  if (var27 < var28) {
                      var1 -= var0;
                      var0 -= var2;
                      var2 = Rasterizer3D_rowOffsets[var2];
 
-                     while(true) {
+                     while (true) {
                         --var0;
-                        if(var0 < 0) {
-                           while(true) {
+                        if (var0 < 0) {
+                           while (true) {
                               --var1;
-                              if(var1 < 0) {
+                              if (var1 < 0) {
                                  return;
                               }
 
@@ -2955,33 +2927,112 @@ public class Rasterizer3D extends Rasterizer2D {
                         var35 += var37;
                         var38 += var40;
                      }
-                  } else {
-                     var1 -= var0;
-                     var0 -= var2;
-                     var2 = Rasterizer3D_rowOffsets[var2];
+                  }
 
-                     while(true) {
-                        --var0;
-                        if(var0 < 0) {
-                           while(true) {
-                              --var1;
-                              if(var1 < 0) {
-                                 return;
-                              }
+                  var1 -= var0;
+                  var0 -= var2;
+                  var2 = Rasterizer3D_rowOffsets[var2];
 
-                              Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
-                              var4 += var27;
-                              var3 += var26;
-                              var8 += var31;
-                              var2 += Rasterizer2D.Rasterizer2D_width;
-                              var32 += var34;
-                              var35 += var37;
-                              var38 += var40;
+                  while (true) {
+                     --var0;
+                     if (var0 < 0) {
+                        while (true) {
+                           --var1;
+                           if (var1 < 0) {
+                              return;
                            }
+
+                           Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
+                           var4 += var27;
+                           var3 += var26;
+                           var8 += var31;
+                           var2 += Rasterizer2D.Rasterizer2D_width;
+                           var32 += var34;
+                           var35 += var37;
+                           var38 += var40;
+                        }
+                     }
+
+                     Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
+                     var4 += var27;
+                     var5 += var28;
+                     var8 += var31;
+                     var2 += Rasterizer2D.Rasterizer2D_width;
+                     var32 += var34;
+                     var35 += var37;
+                     var38 += var40;
+                  }
+               }
+
+               var3 = var5 <<= 14;
+               if (var2 < 0) {
+                  var3 -= var27 * var2;
+                  var5 -= var28 * var2;
+                  var8 -= var31 * var2;
+                  var2 = 0;
+               }
+
+               var4 <<= 14;
+               if (var1 < 0) {
+                  var4 -= var26 * var1;
+                  var1 = 0;
+               }
+
+               var41 = var2 - Rasterizer3D_clipMidY;
+               var32 += var34 * var41;
+               var35 += var37 * var41;
+               var38 += var40 * var41;
+               if (var27 < var28) {
+                  var0 -= var1;
+                  var1 -= var2;
+                  var2 = Rasterizer3D_rowOffsets[var2];
+
+                  while (true) {
+                     --var1;
+                     if (var1 < 0) {
+                        while (true) {
+                           --var0;
+                           if (var0 < 0) {
+                              return;
+                           }
+
+                           Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
+                           var4 += var26;
+                           var5 += var28;
+                           var8 += var31;
+                           var2 += Rasterizer2D.Rasterizer2D_width;
+                           var32 += var34;
+                           var35 += var37;
+                           var38 += var40;
+                        }
+                     }
+
+                     Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
+                     var3 += var27;
+                     var5 += var28;
+                     var8 += var31;
+                     var2 += Rasterizer2D.Rasterizer2D_width;
+                     var32 += var34;
+                     var35 += var37;
+                     var38 += var40;
+                  }
+               }
+
+               var0 -= var1;
+               var1 -= var2;
+               var2 = Rasterizer3D_rowOffsets[var2];
+
+               while (true) {
+                  --var1;
+                  if (var1 < 0) {
+                     while (true) {
+                        --var0;
+                        if (var0 < 0) {
+                           return;
                         }
 
                         Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
-                        var4 += var27;
+                        var4 += var26;
                         var5 += var28;
                         var8 += var31;
                         var2 += Rasterizer2D.Rasterizer2D_width;
@@ -2990,132 +3041,54 @@ public class Rasterizer3D extends Rasterizer2D {
                         var38 += var40;
                      }
                   }
-               } else {
-                  var3 = var5 <<= 14;
-                  if(var2 < 0) {
-                     var3 -= var27 * var2;
-                     var5 -= var28 * var2;
-                     var8 -= var31 * var2;
-                     var2 = 0;
-                  }
 
-                  var4 <<= 14;
-                  if(var1 < 0) {
-                     var4 -= var26 * var1;
-                     var1 = 0;
-                  }
-
-                  var41 = var2 - Rasterizer3D_clipMidY;
-                  var32 += var34 * var41;
-                  var35 += var37 * var41;
-                  var38 += var40 * var41;
-                  if(var27 < var28) {
-                     var0 -= var1;
-                     var1 -= var2;
-                     var2 = Rasterizer3D_rowOffsets[var2];
-
-                     while(true) {
-                        --var1;
-                        if(var1 < 0) {
-                           while(true) {
-                              --var0;
-                              if(var0 < 0) {
-                                 return;
-                              }
-
-                              Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
-                              var4 += var26;
-                              var5 += var28;
-                              var8 += var31;
-                              var2 += Rasterizer2D.Rasterizer2D_width;
-                              var32 += var34;
-                              var35 += var37;
-                              var38 += var40;
-                           }
-                        }
-
-                        Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
-                        var3 += var27;
-                        var5 += var28;
-                        var8 += var31;
-                        var2 += Rasterizer2D.Rasterizer2D_width;
-                        var32 += var34;
-                        var35 += var37;
-                        var38 += var40;
-                     }
-                  } else {
-                     var0 -= var1;
-                     var1 -= var2;
-                     var2 = Rasterizer3D_rowOffsets[var2];
-
-                     while(true) {
-                        --var1;
-                        if(var1 < 0) {
-                           while(true) {
-                              --var0;
-                              if(var0 < 0) {
-                                 return;
-                              }
-
-                              Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
-                              var4 += var26;
-                              var5 += var28;
-                              var8 += var31;
-                              var2 += Rasterizer2D.Rasterizer2D_width;
-                              var32 += var34;
-                              var35 += var37;
-                              var38 += var40;
-                           }
-                        }
-
-                        Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
-                        var3 += var27;
-                        var5 += var28;
-                        var8 += var31;
-                        var2 += Rasterizer2D.Rasterizer2D_width;
-                        var32 += var34;
-                        var35 += var37;
-                        var38 += var40;
-                     }
-                  }
+                  Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39);
+                  var3 += var27;
+                  var5 += var28;
+                  var8 += var31;
+                  var2 += Rasterizer2D.Rasterizer2D_width;
+                  var32 += var34;
+                  var35 += var37;
+                  var38 += var40;
                }
             }
          }
       }
+
    }
 
    @ObfuscatedName("y")
    @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(__et_m) {
-         if(var6 > Rasterizer3D_clipWidth) {
+      if (field739) {
+         if (var6 > Rasterizer3D_clipWidth) {
             var6 = Rasterizer3D_clipWidth;
          }
 
-         if(var5 < 0) {
+         if (var5 < 0) {
             var5 = 0;
          }
       }
 
-      if(var5 < var6) {
+      if (var5 < var6) {
          var4 += var5;
          var7 += var5 * var8;
-         int var17 = var6 - var5;
-         int var15;
+         int var15 = var6 - var5;
          int var16;
+         int var17;
          int var18;
          int var19;
          int var20;
          int var21;
          int var22;
          int var23;
-         if(Rasterizer3D_isLowDetailTexture) {
+         if (Rasterizer3D_isLowDetailTexture) {
             var23 = var5 - Rasterizer3D_clipMidX;
             var9 += var23 * var12;
             var10 += var13 * var23;
             var11 += var23 * var14;
             var22 = var11 >> 12;
-            if(var22 != 0) {
+            if (var22 != 0) {
                var18 = var9 / var22;
                var19 = var10 / var22;
             } else {
@@ -3123,11 +3096,11 @@ public class Rasterizer3D extends Rasterizer2D {
                var19 = 0;
             }
 
-            var9 += var17 * var12;
-            var10 += var13 * var17;
-            var11 += var17 * var14;
+            var9 += var15 * var12;
+            var10 += var13 * var15;
+            var11 += var15 * var14;
             var22 = var11 >> 12;
-            if(var22 != 0) {
+            if (var22 != 0) {
                var20 = var9 / var22;
                var21 = var10 / var22;
             } else {
@@ -3136,120 +3109,120 @@ public class Rasterizer3D extends Rasterizer2D {
             }
 
             var2 = (var18 << 20) + var19;
-            var16 = (var21 - var19) / var17 + ((var20 - var18) / var17 << 20);
-            var17 >>= 3;
+            var17 = (var21 - var19) / var15 + ((var20 - var18) / var15 << 20);
+            var15 >>= 3;
             var8 <<= 3;
-            var15 = var7 >> 8;
-            if(__et_f) {
-               if(var17 > 0) {
+            var16 = var7 >> 8;
+            if (field740) {
+               if (var15 > 0) {
                   do {
                      var3 = var1[(var2 >>> 26) + (var2 & 4032)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var3 = var1[(var2 >>> 26) + (var2 & 4032)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var3 = var1[(var2 >>> 26) + (var2 & 4032)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var3 = var1[(var2 >>> 26) + (var2 & 4032)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var3 = var1[(var2 >>> 26) + (var2 & 4032)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var3 = var1[(var2 >>> 26) + (var2 & 4032)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var3 = var1[(var2 >>> 26) + (var2 & 4032)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var3 = var1[(var2 >>> 26) + (var2 & 4032)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var7 += var8;
-                     var15 = var7 >> 8;
-                     --var17;
-                  } while(var17 > 0);
+                     var16 = var7 >> 8;
+                     --var15;
+                  } while(var15 > 0);
                }
 
-               var17 = var6 - var5 & 7;
-               if(var17 > 0) {
+               var15 = var6 - var5 & 7;
+               if (var15 > 0) {
                   do {
                      var3 = var1[(var2 >>> 26) + (var2 & 4032)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
-                     --var17;
-                  } while(var17 > 0);
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
+                     --var15;
+                  } while(var15 > 0);
                }
             } else {
-               if(var17 > 0) {
+               if (var15 > 0) {
                   do {
-                     if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var17;
+                     if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var17;
+                     if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var17;
+                     if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var17;
+                     if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var17;
+                     if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var17;
+                     if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var17;
+                     if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
+                     var2 += var17;
                      var7 += var8;
-                     var15 = var7 >> 8;
-                     --var17;
-                  } while(var17 > 0);
+                     var16 = var7 >> 8;
+                     --var15;
+                  } while(var15 > 0);
                }
 
-               var17 = var6 - var5 & 7;
-               if(var17 > 0) {
+               var15 = var6 - var5 & 7;
+               if (var15 > 0) {
                   do {
-                     if((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     if ((var3 = var1[(var2 >>> 26) + (var2 & 4032)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     --var17;
-                  } while(var17 > 0);
+                     var2 += var17;
+                     --var15;
+                  } while(var15 > 0);
                }
             }
          } else {
@@ -3258,7 +3231,7 @@ public class Rasterizer3D extends Rasterizer2D {
             var10 += var13 * var23;
             var11 += var23 * var14;
             var22 = var11 >> 14;
-            if(var22 != 0) {
+            if (var22 != 0) {
                var18 = var9 / var22;
                var19 = var10 / var22;
             } else {
@@ -3266,11 +3239,11 @@ public class Rasterizer3D extends Rasterizer2D {
                var19 = 0;
             }
 
-            var9 += var17 * var12;
-            var10 += var13 * var17;
-            var11 += var17 * var14;
+            var9 += var15 * var12;
+            var10 += var13 * var15;
+            var11 += var15 * var14;
             var22 = var11 >> 14;
-            if(var22 != 0) {
+            if (var22 != 0) {
                var20 = var9 / var22;
                var21 = var10 / var22;
             } else {
@@ -3279,133 +3252,133 @@ public class Rasterizer3D extends Rasterizer2D {
             }
 
             var2 = (var18 << 18) + var19;
-            var16 = (var21 - var19) / var17 + ((var20 - var18) / var17 << 18);
-            var17 >>= 3;
+            var17 = (var21 - var19) / var15 + ((var20 - var18) / var15 << 18);
+            var15 >>= 3;
             var8 <<= 3;
-            var15 = var7 >> 8;
-            if(__et_f) {
-               if(var17 > 0) {
+            var16 = var7 >> 8;
+            if (field740) {
+               if (var15 > 0) {
                   do {
                      var3 = var1[(var2 & 16256) + (var2 >>> 25)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var3 = var1[(var2 & 16256) + (var2 >>> 25)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var3 = var1[(var2 & 16256) + (var2 >>> 25)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var3 = var1[(var2 & 16256) + (var2 >>> 25)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var3 = var1[(var2 & 16256) + (var2 >>> 25)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var3 = var1[(var2 & 16256) + (var2 >>> 25)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var3 = var1[(var2 & 16256) + (var2 >>> 25)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var3 = var1[(var2 & 16256) + (var2 >>> 25)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
                      var7 += var8;
-                     var15 = var7 >> 8;
-                     --var17;
-                  } while(var17 > 0);
+                     var16 = var7 >> 8;
+                     --var15;
+                  } while(var15 > 0);
                }
 
-               var17 = var6 - var5 & 7;
-               if(var17 > 0) {
+               var15 = var6 - var5 & 7;
+               if (var15 > 0) {
                   do {
                      var3 = var1[(var2 & 16256) + (var2 >>> 25)];
-                     var0[var4++] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
-                     var2 += var16;
-                     --var17;
-                  } while(var17 > 0);
+                     var0[var4++] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
+                     var2 += var17;
+                     --var15;
+                  } while(var15 > 0);
                }
             } else {
-               if(var17 > 0) {
+               if (var15 > 0) {
                   do {
-                     if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var17;
+                     if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var17;
+                     if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var17;
+                     if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var17;
+                     if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var17;
+                     if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var17;
+                     if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     var2 += var17;
+                     if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
+                     var2 += var17;
                      var7 += var8;
-                     var15 = var7 >> 8;
-                     --var17;
-                  } while(var17 > 0);
+                     var16 = var7 >> 8;
+                     --var15;
+                  } while(var15 > 0);
                }
 
-               var17 = var6 - var5 & 7;
-               if(var17 > 0) {
+               var15 = var6 - var5 & 7;
+               if (var15 > 0) {
                   do {
-                     if((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
-                        var0[var4] = (var15 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var15 & -16711936) >> 8;
+                     if ((var3 = var1[(var2 & 16256) + (var2 >>> 25)]) != 0) {
+                        var0[var4] = (var16 * (var3 & 65280) & 16711680) + ((var3 & 16711935) * var16 & -16711936) >> 8;
                      }
 
                      ++var4;
-                     var2 += var16;
-                     --var17;
-                  } while(var17 > 0);
+                     var2 += var17;
+                     --var15;
+                  } while(var15 > 0);
                }
             }
          }
-
       }
+
    }
 
    @ObfuscatedName("h")
    static final int method3040(int var0, int var1) {
       var1 = (var0 & 127) * var1 >> 7;
-      if(var1 < 2) {
+      if (var1 < 2) {
          var1 = 2;
-      } else if(var1 > 126) {
+      } else if (var1 > 126) {
          var1 = 126;
       }
 
@@ -3445,4 +3418,34 @@ public class Rasterizer3D extends Rasterizer2D {
    static final int rot2(int var0, int var1, int var2, int var3) {
       return var2 * var1 - var3 * var0 >> 16;
    }
+
+   static {
+      field739 = false;
+      field740 = false;
+      Rasterizer3D_isLowDetailTexture = false;
+      field741 = true;
+      Rasterizer3D_alpha = 0;
+      Rasterizer3D_zoom = 512;
+      Rasterizer3D_rowOffsets = new int[1024];
+      Rasterizer3D_colorPalette = new int[65536];
+      field742 = new int[512];
+      field743 = new int[2048];
+      Rasterizer3D_sine = new int[2048];
+      Rasterizer3D_cosine = new int[2048];
+
+      int var0;
+      for (var0 = 1; var0 < 512; ++var0) {
+         field742[var0] = 32768 / var0;
+      }
+
+      for (var0 = 1; var0 < 2048; ++var0) {
+         field743[var0] = 65536 / var0;
+      }
+
+      for (var0 = 0; var0 < 2048; ++var0) {
+         Rasterizer3D_sine[var0] = (int)(65536.0D * Math.sin((double)var0 * 0.0030679615D));
+         Rasterizer3D_cosine[var0] = (int)(65536.0D * Math.cos((double)var0 * 0.0030679615D));
+      }
+
+   }
 }
diff --git a/runescape-client/src/main/java/RawPcmStream.java b/runescape-client/src/main/java/RawPcmStream.java
index 2bc138ada2..54a3b4136d 100644
--- a/runescape-client/src/main/java/RawPcmStream.java
+++ b/runescape-client/src/main/java/RawPcmStream.java
@@ -7,19 +7,19 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("RawPcmStream")
 public class RawPcmStream extends PcmStream {
    @ObfuscatedName("m")
-   int __m;
+   int field744;
    @ObfuscatedName("f")
-   int __f;
+   int field745;
    @ObfuscatedName("q")
-   int __q;
+   int field746;
    @ObfuscatedName("o")
-   int __o;
+   int field747;
    @ObfuscatedName("u")
-   int __u;
+   int field748;
    @ObfuscatedName("g")
-   int __g;
+   int field749;
    @ObfuscatedName("l")
-   int __l;
+   int field750;
    @ObfuscatedName("e")
    @Export("numLoops")
    int numLoops;
@@ -30,15 +30,15 @@ public class RawPcmStream extends PcmStream {
    @Export("end")
    int end;
    @ObfuscatedName("k")
-   boolean __k;
+   boolean field751;
    @ObfuscatedName("n")
-   int __n;
+   int field752;
    @ObfuscatedName("i")
-   int __i;
+   int field753;
    @ObfuscatedName("a")
-   int __a;
+   int field754;
    @ObfuscatedName("z")
-   int __z;
+   int field755;
 
    @ObfuscatedSignature(
       signature = "(Lcx;III)V"
@@ -47,12 +47,12 @@ public class RawPcmStream extends PcmStream {
       super.sound = var1;
       this.start = var1.start;
       this.end = var1.end;
-      this.__k = var1.__o;
-      this.__f = var2;
-      this.__q = var3;
-      this.__o = var4;
-      this.__m = 0;
-      this.__o_180();
+      this.field751 = var1.field756;
+      this.field745 = var2;
+      this.field746 = var3;
+      this.field747 = var4;
+      this.field744 = 0;
+      this.method261();
    }
 
    @ObfuscatedSignature(
@@ -62,19 +62,19 @@ public class RawPcmStream extends PcmStream {
       super.sound = var1;
       this.start = var1.start;
       this.end = var1.end;
-      this.__k = var1.__o;
-      this.__f = var2;
-      this.__q = var3;
-      this.__o = 8192;
-      this.__m = 0;
-      this.__o_180();
+      this.field751 = var1.field756;
+      this.field745 = var2;
+      this.field746 = var3;
+      this.field747 = 8192;
+      this.field744 = 0;
+      this.method261();
    }
 
    @ObfuscatedName("o")
-   void __o_180() {
-      this.__u = this.__q;
-      this.__g = method2603(this.__q, this.__o);
-      this.__l = method2494(this.__q, this.__o);
+   void method261() {
+      this.field748 = this.field746;
+      this.field749 = method2603(this.field746, this.field747);
+      this.field750 = method2494(this.field746, this.field747);
    }
 
    @ObfuscatedName("u")
@@ -96,189 +96,192 @@ public class RawPcmStream extends PcmStream {
    }
 
    @ObfuscatedName("l")
-   protected int __l_171() {
-      return this.__q == 0 && this.__n == 0?0:1;
+   protected int vmethod262() {
+      return this.field746 == 0 && this.field752 == 0 ? 0 : 1;
    }
 
    @ObfuscatedName("e")
-   public synchronized void __e_172(int[] var1, int var2, int var3) {
-      if(this.__q == 0 && this.__n == 0) {
-         this.__d_173(var3);
+   @Export("fill")
+   public synchronized void fill(int[] var1, int var2, int var3) {
+      if (this.field746 == 0 && this.field752 == 0) {
+         this.skip(var3);
       } else {
          RawSound var4 = (RawSound)super.sound;
          int var5 = this.start << 8;
          int var6 = this.end << 8;
          int var7 = var4.samples.length << 8;
          int var8 = var6 - var5;
-         if(var8 <= 0) {
+         if (var8 <= 0) {
             this.numLoops = 0;
          }
 
          int var9 = var2;
          var3 += var2;
-         if(this.__m < 0) {
-            if(this.__f <= 0) {
-               this.__b_189();
+         if (this.field744 < 0) {
+            if (this.field745 <= 0) {
+               this.method272();
                this.remove();
                return;
             }
 
-            this.__m = 0;
+            this.field744 = 0;
          }
 
-         if(this.__m >= var7) {
-            if(this.__f >= 0) {
-               this.__b_189();
+         if (this.field744 >= var7) {
+            if (this.field745 >= 0) {
+               this.method272();
                this.remove();
                return;
             }
 
-            this.__m = var7 - 1;
+            this.field744 = var7 - 1;
          }
 
-         if(this.numLoops < 0) {
-            if(this.__k) {
-               if(this.__f < 0) {
-                  var9 = this.__ap_203(var1, var2, var5, var3, var4.samples[this.start]);
-                  if(this.__m >= var5) {
+         if (this.numLoops < 0) {
+            if (this.field751) {
+               if (this.field745 < 0) {
+                  var9 = this.method281(var1, var2, var5, var3, var4.samples[this.start]);
+                  if (this.field744 >= var5) {
                      return;
                   }
 
-                  this.__m = var5 + var5 - 1 - this.__m;
-                  this.__f = -this.__f;
+                  this.field744 = var5 + var5 - 1 - this.field744;
+                  this.field745 = -this.field745;
                }
 
-               while(true) {
-                  var9 = this.__ad_202(var1, var9, var6, var3, var4.samples[this.end - 1]);
-                  if(this.__m < var6) {
+               while (true) {
+                  var9 = this.method280(var1, var9, var6, var3, var4.samples[this.end - 1]);
+                  if (this.field744 < var6) {
                      return;
                   }
 
-                  this.__m = var6 + var6 - 1 - this.__m;
-                  this.__f = -this.__f;
-                  var9 = this.__ap_203(var1, var9, var5, var3, var4.samples[this.start]);
-                  if(this.__m >= var5) {
+                  this.field744 = var6 + var6 - 1 - this.field744;
+                  this.field745 = -this.field745;
+                  var9 = this.method281(var1, var9, var5, var3, var4.samples[this.start]);
+                  if (this.field744 >= var5) {
                      return;
                   }
 
-                  this.__m = var5 + var5 - 1 - this.__m;
-                  this.__f = -this.__f;
-               }
-            } else if(this.__f < 0) {
-               while(true) {
-                  var9 = this.__ap_203(var1, var9, var5, var3, var4.samples[this.end - 1]);
-                  if(this.__m >= var5) {
-                     return;
-                  }
-
-                  this.__m = var6 - 1 - (var6 - 1 - this.__m) % var8;
-               }
-            } else {
-               while(true) {
-                  var9 = this.__ad_202(var1, var9, var6, var3, var4.samples[this.start]);
-                  if(this.__m < var6) {
-                     return;
-                  }
-
-                  this.__m = var5 + (this.__m - var5) % var8;
+                  this.field744 = var5 + var5 - 1 - this.field744;
+                  this.field745 = -this.field745;
                }
             }
-         } else {
-            if(this.numLoops > 0) {
-               if(this.__k) {
-                  label140: {
-                     if(this.__f < 0) {
-                        var9 = this.__ap_203(var1, var2, var5, var3, var4.samples[this.start]);
-                        if(this.__m >= var5) {
-                           return;
-                        }
 
-                        this.__m = var5 + var5 - 1 - this.__m;
-                        this.__f = -this.__f;
-                        if(--this.numLoops == 0) {
-                           break label140;
-                        }
+            if (this.field745 < 0) {
+               while (true) {
+                  var9 = this.method281(var1, var9, var5, var3, var4.samples[this.end - 1]);
+                  if (this.field744 >= var5) {
+                     return;
+                  }
+
+                  this.field744 = var6 - 1 - (var6 - 1 - this.field744) % var8;
+               }
+            }
+
+            while (true) {
+               var9 = this.method280(var1, var9, var6, var3, var4.samples[this.start]);
+               if (this.field744 < var6) {
+                  return;
+               }
+
+               this.field744 = var5 + (this.field744 - var5) % var8;
+            }
+         }
+
+         if (this.numLoops > 0) {
+            if (this.field751) {
+               label118: {
+                  if (this.field745 < 0) {
+                     var9 = this.method281(var1, var2, var5, var3, var4.samples[this.start]);
+                     if (this.field744 >= var5) {
+                        return;
                      }
 
-                     do {
-                        var9 = this.__ad_202(var1, var9, var6, var3, var4.samples[this.end - 1]);
-                        if(this.__m < var6) {
-                           return;
-                        }
+                     this.field744 = var5 + var5 - 1 - this.field744;
+                     this.field745 = -this.field745;
+                     if (--this.numLoops == 0) {
+                        break label118;
+                     }
+                  }
 
-                        this.__m = var6 + var6 - 1 - this.__m;
-                        this.__f = -this.__f;
-                        if(--this.numLoops == 0) {
-                           break;
-                        }
+                  do {
+                     var9 = this.method280(var1, var9, var6, var3, var4.samples[this.end - 1]);
+                     if (this.field744 < var6) {
+                        return;
+                     }
 
-                        var9 = this.__ap_203(var1, var9, var5, var3, var4.samples[this.start]);
-                        if(this.__m >= var5) {
-                           return;
-                        }
+                     this.field744 = var6 + var6 - 1 - this.field744;
+                     this.field745 = -this.field745;
+                     if (--this.numLoops == 0) {
+                        break;
+                     }
 
-                        this.__m = var5 + var5 - 1 - this.__m;
-                        this.__f = -this.__f;
-                     } while(--this.numLoops != 0);
+                     var9 = this.method281(var1, var9, var5, var3, var4.samples[this.start]);
+                     if (this.field744 >= var5) {
+                        return;
+                     }
+
+                     this.field744 = var5 + var5 - 1 - this.field744;
+                     this.field745 = -this.field745;
+                  } while(--this.numLoops != 0);
+               }
+            } else {
+               int var10;
+               if (this.field745 < 0) {
+                  while (true) {
+                     var9 = this.method281(var1, var9, var5, var3, var4.samples[this.end - 1]);
+                     if (this.field744 >= var5) {
+                        return;
+                     }
+
+                     var10 = (var6 - 1 - this.field744) / var8;
+                     if (var10 >= this.numLoops) {
+                        this.field744 += var8 * this.numLoops;
+                        this.numLoops = 0;
+                        break;
+                     }
+
+                     this.field744 += var8 * var10;
+                     this.numLoops -= var10;
                   }
                } else {
-                  int var10;
-                  if(this.__f < 0) {
-                     while(true) {
-                        var9 = this.__ap_203(var1, var9, var5, var3, var4.samples[this.end - 1]);
-                        if(this.__m >= var5) {
-                           return;
-                        }
-
-                        var10 = (var6 - 1 - this.__m) / var8;
-                        if(var10 >= this.numLoops) {
-                           this.__m += var8 * this.numLoops;
-                           this.numLoops = 0;
-                           break;
-                        }
-
-                        this.__m += var8 * var10;
-                        this.numLoops -= var10;
+                  while (true) {
+                     var9 = this.method280(var1, var9, var6, var3, var4.samples[this.start]);
+                     if (this.field744 < var6) {
+                        return;
                      }
-                  } else {
-                     while(true) {
-                        var9 = this.__ad_202(var1, var9, var6, var3, var4.samples[this.start]);
-                        if(this.__m < var6) {
-                           return;
-                        }
 
-                        var10 = (this.__m - var5) / var8;
-                        if(var10 >= this.numLoops) {
-                           this.__m -= var8 * this.numLoops;
-                           this.numLoops = 0;
-                           break;
-                        }
-
-                        this.__m -= var8 * var10;
-                        this.numLoops -= var10;
+                     var10 = (this.field744 - var5) / var8;
+                     if (var10 >= this.numLoops) {
+                        this.field744 -= var8 * this.numLoops;
+                        this.numLoops = 0;
+                        break;
                      }
+
+                     this.field744 -= var8 * var10;
+                     this.numLoops -= var10;
                   }
                }
             }
+         }
 
-            if(this.__f < 0) {
-               this.__ap_203(var1, var9, 0, var3, 0);
-               if(this.__m < 0) {
-                  this.__m = -1;
-                  this.__b_189();
-                  this.remove();
-               }
-            } else {
-               this.__ad_202(var1, var9, var7, var3, 0);
-               if(this.__m >= var7) {
-                  this.__m = var7;
-                  this.__b_189();
-                  this.remove();
-               }
+         if (this.field745 < 0) {
+            this.method281(var1, var9, 0, var3, 0);
+            if (this.field744 < 0) {
+               this.field744 = -1;
+               this.method272();
+               this.remove();
+            }
+         } else {
+            this.method280(var1, var9, var7, var3, 0);
+            if (this.field744 >= var7) {
+               this.field744 = var7;
+               this.method272();
+               this.remove();
             }
-
          }
       }
+
    }
 
    @ObfuscatedName("x")
@@ -288,25 +291,26 @@ public class RawPcmStream extends PcmStream {
    }
 
    @ObfuscatedName("d")
-   public synchronized void __d_173(int var1) {
-      if(this.__n > 0) {
-         if(var1 >= this.__n) {
-            if(this.__q == Integer.MIN_VALUE) {
-               this.__q = 0;
-               this.__l = 0;
-               this.__g = 0;
-               this.__u = 0;
+   @Export("skip")
+   public synchronized void skip(int var1) {
+      if (this.field752 > 0) {
+         if (var1 >= this.field752) {
+            if (this.field746 == Integer.MIN_VALUE) {
+               this.field746 = 0;
+               this.field750 = 0;
+               this.field749 = 0;
+               this.field748 = 0;
                this.remove();
-               var1 = this.__n;
+               var1 = this.field752;
             }
 
-            this.__n = 0;
-            this.__o_180();
+            this.field752 = 0;
+            this.method261();
          } else {
-            this.__u += this.__i * var1;
-            this.__g += this.__a * var1;
-            this.__l += this.__z * var1;
-            this.__n -= var1;
+            this.field748 += this.field753 * var1;
+            this.field749 += this.field754 * var1;
+            this.field750 += this.field755 * var1;
+            this.field752 -= var1;
          }
       }
 
@@ -315,193 +319,191 @@ public class RawPcmStream extends PcmStream {
       int var4 = this.end << 8;
       int var5 = var2.samples.length << 8;
       int var6 = var4 - var3;
-      if(var6 <= 0) {
+      if (var6 <= 0) {
          this.numLoops = 0;
       }
 
-      if(this.__m < 0) {
-         if(this.__f <= 0) {
-            this.__b_189();
+      if (this.field744 < 0) {
+         if (this.field745 <= 0) {
+            this.method272();
             this.remove();
             return;
          }
 
-         this.__m = 0;
+         this.field744 = 0;
       }
 
-      if(this.__m >= var5) {
-         if(this.__f >= 0) {
-            this.__b_189();
+      if (this.field744 >= var5) {
+         if (this.field745 >= 0) {
+            this.method272();
             this.remove();
             return;
          }
 
-         this.__m = var5 - 1;
+         this.field744 = var5 - 1;
       }
 
-      this.__m += this.__f * var1;
-      if(this.numLoops < 0) {
-         if(!this.__k) {
-            if(this.__f < 0) {
-               if(this.__m >= var3) {
+      this.field744 += this.field745 * var1;
+      if (this.numLoops < 0) {
+         if (!this.field751) {
+            if (this.field745 < 0) {
+               if (this.field744 >= var3) {
                   return;
                }
 
-               this.__m = var4 - 1 - (var4 - 1 - this.__m) % var6;
+               this.field744 = var4 - 1 - (var4 - 1 - this.field744) % var6;
             } else {
-               if(this.__m < var4) {
+               if (this.field744 < var4) {
                   return;
                }
 
-               this.__m = var3 + (this.__m - var3) % var6;
+               this.field744 = var3 + (this.field744 - var3) % var6;
             }
-
          } else {
-            if(this.__f < 0) {
-               if(this.__m >= var3) {
+            if (this.field745 < 0) {
+               if (this.field744 >= var3) {
                   return;
                }
 
-               this.__m = var3 + var3 - 1 - this.__m;
-               this.__f = -this.__f;
+               this.field744 = var3 + var3 - 1 - this.field744;
+               this.field745 = -this.field745;
             }
 
-            while(this.__m >= var4) {
-               this.__m = var4 + var4 - 1 - this.__m;
-               this.__f = -this.__f;
-               if(this.__m >= var3) {
+            while (this.field744 >= var4) {
+               this.field744 = var4 + var4 - 1 - this.field744;
+               this.field745 = -this.field745;
+               if (this.field744 >= var3) {
                   return;
                }
 
-               this.__m = var3 + var3 - 1 - this.__m;
-               this.__f = -this.__f;
+               this.field744 = var3 + var3 - 1 - this.field744;
+               this.field745 = -this.field745;
             }
-
          }
       } else {
-         if(this.numLoops > 0) {
-            if(this.__k) {
-               label123: {
-                  if(this.__f < 0) {
-                     if(this.__m >= var3) {
+         if (this.numLoops > 0) {
+            if (this.field751) {
+               label113: {
+                  if (this.field745 < 0) {
+                     if (this.field744 >= var3) {
                         return;
                      }
 
-                     this.__m = var3 + var3 - 1 - this.__m;
-                     this.__f = -this.__f;
-                     if(--this.numLoops == 0) {
-                        break label123;
+                     this.field744 = var3 + var3 - 1 - this.field744;
+                     this.field745 = -this.field745;
+                     if (--this.numLoops == 0) {
+                        break label113;
                      }
                   }
 
                   do {
-                     if(this.__m < var4) {
+                     if (this.field744 < var4) {
                         return;
                      }
 
-                     this.__m = var4 + var4 - 1 - this.__m;
-                     this.__f = -this.__f;
-                     if(--this.numLoops == 0) {
+                     this.field744 = var4 + var4 - 1 - this.field744;
+                     this.field745 = -this.field745;
+                     if (--this.numLoops == 0) {
                         break;
                      }
 
-                     if(this.__m >= var3) {
+                     if (this.field744 >= var3) {
                         return;
                      }
 
-                     this.__m = var3 + var3 - 1 - this.__m;
-                     this.__f = -this.__f;
+                     this.field744 = var3 + var3 - 1 - this.field744;
+                     this.field745 = -this.field745;
                   } while(--this.numLoops != 0);
                }
             } else {
                int var7;
-               if(this.__f < 0) {
-                  if(this.__m >= var3) {
+               if (this.field745 < 0) {
+                  if (this.field744 >= var3) {
                      return;
                   }
 
-                  var7 = (var4 - 1 - this.__m) / var6;
-                  if(var7 < this.numLoops) {
-                     this.__m += var6 * var7;
+                  var7 = (var4 - 1 - this.field744) / var6;
+                  if (var7 < this.numLoops) {
+                     this.field744 += var6 * var7;
                      this.numLoops -= var7;
                      return;
                   }
 
-                  this.__m += var6 * this.numLoops;
+                  this.field744 += var6 * this.numLoops;
                   this.numLoops = 0;
                } else {
-                  if(this.__m < var4) {
+                  if (this.field744 < var4) {
                      return;
                   }
 
-                  var7 = (this.__m - var3) / var6;
-                  if(var7 < this.numLoops) {
-                     this.__m -= var6 * var7;
+                  var7 = (this.field744 - var3) / var6;
+                  if (var7 < this.numLoops) {
+                     this.field744 -= var6 * var7;
                      this.numLoops -= var7;
                      return;
                   }
 
-                  this.__m -= var6 * this.numLoops;
+                  this.field744 -= var6 * this.numLoops;
                   this.numLoops = 0;
                }
             }
          }
 
-         if(this.__f < 0) {
-            if(this.__m < 0) {
-               this.__m = -1;
-               this.__b_189();
+         if (this.field745 < 0) {
+            if (this.field744 < 0) {
+               this.field744 = -1;
+               this.method272();
                this.remove();
             }
-         } else if(this.__m >= var5) {
-            this.__m = var5;
-            this.__b_189();
+         } else if (this.field744 >= var5) {
+            this.field744 = var5;
+            this.method272();
             this.remove();
          }
-
       }
+
    }
 
    @ObfuscatedName("a")
-   public synchronized void __a_182(int var1) {
-      this.__j_184(var1 << 6, this.__t_186());
+   public synchronized void method265(int var1) {
+      this.method267(var1 << 6, this.method269());
    }
 
    @ObfuscatedName("z")
-   synchronized void __z_183(int var1) {
-      this.__j_184(var1, this.__t_186());
+   synchronized void method266(int var1) {
+      this.method267(var1, this.method269());
    }
 
    @ObfuscatedName("j")
-   synchronized void __j_184(int var1, int var2) {
-      this.__q = var1;
-      this.__o = var2;
-      this.__n = 0;
-      this.__o_180();
+   synchronized void method267(int var1, int var2) {
+      this.field746 = var1;
+      this.field747 = var2;
+      this.field752 = 0;
+      this.method261();
    }
 
    @ObfuscatedName("s")
-   public synchronized int __s_185() {
-      return this.__q == Integer.MIN_VALUE?0:this.__q;
+   public synchronized int method268() {
+      return this.field746 == Integer.MIN_VALUE ? 0 : this.field746;
    }
 
    @ObfuscatedName("t")
-   public synchronized int __t_186() {
-      return this.__o < 0?-1:this.__o;
+   public synchronized int method269() {
+      return this.field747 < 0 ? -1 : this.field747;
    }
 
    @ObfuscatedName("y")
-   public synchronized void __y_187(int var1) {
+   public synchronized void method270(int var1) {
       int var2 = ((RawSound)super.sound).samples.length << 8;
-      if(var1 < -1) {
+      if (var1 < -1) {
          var1 = -1;
       }
 
-      if(var1 > var2) {
+      if (var1 > var2) {
          var1 = var2;
       }
 
-      this.__m = var1;
+      this.field744 = var1;
    }
 
    @ObfuscatedName("h")
@@ -509,319 +511,321 @@ public class RawPcmStream extends PcmStream {
       signature = "(Z)V",
       garbageValue = "1"
    )
-   public synchronized void __h_188() {
-      this.__f = (this.__f ^ this.__f >> 31) + (this.__f >>> 31);
-      this.__f = -this.__f;
+   public synchronized void method271() {
+      this.field745 = (this.field745 ^ this.field745 >> 31) + (this.field745 >>> 31);
+      this.field745 = -this.field745;
    }
 
    @ObfuscatedName("b")
-   void __b_189() {
-      if(this.__n != 0) {
-         if(this.__q == Integer.MIN_VALUE) {
-            this.__q = 0;
+   void method272() {
+      if (this.field752 != 0) {
+         if (this.field746 == Integer.MIN_VALUE) {
+            this.field746 = 0;
          }
 
-         this.__n = 0;
-         this.__o_180();
+         this.field752 = 0;
+         this.method261();
       }
 
    }
 
    @ObfuscatedName("c")
-   public synchronized void __c_190(int var1, int var2) {
-      this.__p_191(var1, var2, this.__t_186());
+   public synchronized void method273(int var1, int var2) {
+      this.method274(var1, var2, this.method269());
    }
 
    @ObfuscatedName("p")
-   public synchronized void __p_191(int var1, int var2, int var3) {
-      if(var1 == 0) {
-         this.__j_184(var2, var3);
+   public synchronized void method274(int var1, int var2, int var3) {
+      if (var1 == 0) {
+         this.method267(var2, var3);
       } else {
          int var4 = method2603(var2, var3);
          int var5 = method2494(var2, var3);
-         if(var4 == this.__g && var5 == this.__l) {
-            this.__n = 0;
+         if (var4 == this.field749 && var5 == this.field750) {
+            this.field752 = 0;
          } else {
-            int var6 = var2 - this.__u;
-            if(this.__u - var2 > var6) {
-               var6 = this.__u - var2;
+            int var6 = var2 - this.field748;
+            if (this.field748 - var2 > var6) {
+               var6 = this.field748 - var2;
             }
 
-            if(var4 - this.__g > var6) {
-               var6 = var4 - this.__g;
+            if (var4 - this.field749 > var6) {
+               var6 = var4 - this.field749;
             }
 
-            if(this.__g - var4 > var6) {
-               var6 = this.__g - var4;
+            if (this.field749 - var4 > var6) {
+               var6 = this.field749 - var4;
             }
 
-            if(var5 - this.__l > var6) {
-               var6 = var5 - this.__l;
+            if (var5 - this.field750 > var6) {
+               var6 = var5 - this.field750;
             }
 
-            if(this.__l - var5 > var6) {
-               var6 = this.__l - var5;
+            if (this.field750 - var5 > var6) {
+               var6 = this.field750 - var5;
             }
 
-            if(var1 > var6) {
+            if (var1 > var6) {
                var1 = var6;
             }
 
-            this.__n = var1;
-            this.__q = var2;
-            this.__o = var3;
-            this.__i = (var2 - this.__u) / var1;
-            this.__a = (var4 - this.__g) / var1;
-            this.__z = (var5 - this.__l) / var1;
+            this.field752 = var1;
+            this.field746 = var2;
+            this.field747 = var3;
+            this.field753 = (var2 - this.field748) / var1;
+            this.field754 = (var4 - this.field749) / var1;
+            this.field755 = (var5 - this.field750) / var1;
          }
       }
+
    }
 
    @ObfuscatedName("v")
-   public synchronized void __v_192(int var1) {
-      if(var1 == 0) {
-         this.__z_183(0);
+   public synchronized void method275(int var1) {
+      if (var1 == 0) {
+         this.method266(0);
          this.remove();
-      } else if(this.__g == 0 && this.__l == 0) {
-         this.__n = 0;
-         this.__q = 0;
-         this.__u = 0;
+      } else if (this.field749 == 0 && this.field750 == 0) {
+         this.field752 = 0;
+         this.field746 = 0;
+         this.field748 = 0;
          this.remove();
       } else {
-         int var2 = -this.__u;
-         if(this.__u > var2) {
-            var2 = this.__u;
+         int var2 = -this.field748;
+         if (this.field748 > var2) {
+            var2 = this.field748;
          }
 
-         if(-this.__g > var2) {
-            var2 = -this.__g;
+         if (-this.field749 > var2) {
+            var2 = -this.field749;
          }
 
-         if(this.__g > var2) {
-            var2 = this.__g;
+         if (this.field749 > var2) {
+            var2 = this.field749;
          }
 
-         if(-this.__l > var2) {
-            var2 = -this.__l;
+         if (-this.field750 > var2) {
+            var2 = -this.field750;
          }
 
-         if(this.__l > var2) {
-            var2 = this.__l;
+         if (this.field750 > var2) {
+            var2 = this.field750;
          }
 
-         if(var1 > var2) {
+         if (var1 > var2) {
             var1 = var2;
          }
 
-         this.__n = var1;
-         this.__q = Integer.MIN_VALUE;
-         this.__i = -this.__u / var1;
-         this.__a = -this.__g / var1;
-         this.__z = -this.__l / var1;
+         this.field752 = var1;
+         this.field746 = Integer.MIN_VALUE;
+         this.field753 = -this.field748 / var1;
+         this.field754 = -this.field749 / var1;
+         this.field755 = -this.field750 / var1;
       }
+
    }
 
    @ObfuscatedName("ah")
-   public synchronized void __ah_193(int var1) {
-      if(this.__f < 0) {
-         this.__f = -var1;
+   public synchronized void method276(int var1) {
+      if (this.field745 < 0) {
+         this.field745 = -var1;
       } else {
-         this.__f = var1;
+         this.field745 = var1;
       }
 
    }
 
    @ObfuscatedName("ab")
-   public synchronized int __ab_194() {
-      return this.__f < 0?-this.__f:this.__f;
+   public synchronized int method277() {
+      return this.field745 < 0 ? -this.field745 : this.field745;
    }
 
    @ObfuscatedName("ae")
-   public boolean __ae_195() {
-      return this.__m < 0 || this.__m >= ((RawSound)super.sound).samples.length << 8;
+   public boolean method278() {
+      return this.field744 < 0 || this.field744 >= ((RawSound)super.sound).samples.length << 8;
    }
 
    @ObfuscatedName("at")
-   public boolean __at_196() {
-      return this.__n != 0;
+   public boolean method279() {
+      return this.field752 != 0;
    }
 
    @ObfuscatedName("ad")
-   int __ad_202(int[] var1, int var2, int var3, int var4, int var5) {
-      while(true) {
-         if(this.__n > 0) {
-            int var6 = var2 + this.__n;
-            if(var6 > var4) {
+   int method280(int[] var1, int var2, int var3, int var4, int var5) {
+      while (true) {
+         if (this.field752 > 0) {
+            int var6 = var2 + this.field752;
+            if (var6 > var4) {
                var6 = var4;
             }
 
-            this.__n += var2;
-            if(this.__f == 256 && (this.__m & 255) == 0) {
-               if(PcmPlayer.isStereo) {
-                  var2 = method2533(0, ((RawSound)super.sound).samples, var1, this.__m, var2, this.__g, this.__l, this.__a, this.__z, 0, var6, var3, this);
+            this.field752 += var2;
+            if (this.field745 == 256 && (this.field744 & 255) == 0) {
+               if (PcmPlayer.isStereo) {
+                  var2 = method2533(0, ((RawSound)super.sound).samples, var1, this.field744, var2, this.field749, this.field750, this.field754, this.field755, 0, var6, var3, this);
                } else {
-                  var2 = method2532(((RawSound)super.sound).samples, var1, this.__m, var2, this.__u, this.__i, 0, var6, var3, this);
+                  var2 = method2532(((RawSound)super.sound).samples, var1, this.field744, var2, this.field748, this.field753, 0, var6, var3, this);
                }
-            } else if(PcmPlayer.isStereo) {
-               var2 = method2504(0, 0, ((RawSound)super.sound).samples, var1, this.__m, var2, this.__g, this.__l, this.__a, this.__z, 0, var6, var3, this, this.__f, var5);
+            } else if (PcmPlayer.isStereo) {
+               var2 = method2504(0, 0, ((RawSound)super.sound).samples, var1, this.field744, var2, this.field749, this.field750, this.field754, this.field755, 0, var6, var3, this, this.field745, var5);
             } else {
-               var2 = method2536(0, 0, ((RawSound)super.sound).samples, var1, this.__m, var2, this.__u, this.__i, 0, var6, var3, this, this.__f, var5);
+               var2 = method2536(0, 0, ((RawSound)super.sound).samples, var1, this.field744, var2, this.field748, this.field753, 0, var6, var3, this, this.field745, var5);
             }
 
-            this.__n -= var2;
-            if(this.__n != 0) {
+            this.field752 -= var2;
+            if (this.field752 != 0) {
                return var2;
             }
 
-            if(!this.__au_204()) {
+            if (!this.method283()) {
                continue;
             }
 
             return var4;
          }
 
-         if(this.__f == 256 && (this.__m & 255) == 0) {
-            if(PcmPlayer.isStereo) {
-               return method2525(0, ((RawSound)super.sound).samples, var1, this.__m, var2, this.__g, this.__l, 0, var4, var3, this);
+         if (this.field745 == 256 && (this.field744 & 255) == 0) {
+            if (PcmPlayer.isStereo) {
+               return method2525(0, ((RawSound)super.sound).samples, var1, this.field744, var2, this.field749, this.field750, 0, var4, var3, this);
             }
 
-            return method2563(((RawSound)super.sound).samples, var1, this.__m, var2, this.__u, 0, var4, var3, this);
+            return method2563(((RawSound)super.sound).samples, var1, this.field744, var2, this.field748, 0, var4, var3, this);
          }
 
-         if(PcmPlayer.isStereo) {
-            return method2529(0, 0, ((RawSound)super.sound).samples, var1, this.__m, var2, this.__g, this.__l, 0, var4, var3, this, this.__f, var5);
+         if (PcmPlayer.isStereo) {
+            return method2529(0, 0, ((RawSound)super.sound).samples, var1, this.field744, var2, this.field749, this.field750, 0, var4, var3, this, this.field745, var5);
          }
 
-         return method2528(0, 0, ((RawSound)super.sound).samples, var1, this.__m, var2, this.__u, 0, var4, var3, this, this.__f, var5);
+         return method2528(0, 0, ((RawSound)super.sound).samples, var1, this.field744, var2, this.field748, 0, var4, var3, this, this.field745, var5);
       }
    }
 
    @ObfuscatedName("ap")
-   int __ap_203(int[] var1, int var2, int var3, int var4, int var5) {
-      while(true) {
-         if(this.__n > 0) {
-            int var6 = var2 + this.__n;
-            if(var6 > var4) {
+   int method281(int[] var1, int var2, int var3, int var4, int var5) {
+      while (true) {
+         if (this.field752 > 0) {
+            int var6 = var2 + this.field752;
+            if (var6 > var4) {
                var6 = var4;
             }
 
-            this.__n += var2;
-            if(this.__f == -256 && (this.__m & 255) == 0) {
-               if(PcmPlayer.isStereo) {
-                  var2 = method2547(0, ((RawSound)super.sound).samples, var1, this.__m, var2, this.__g, this.__l, this.__a, this.__z, 0, var6, var3, this);
+            this.field752 += var2;
+            if (this.field745 == -256 && (this.field744 & 255) == 0) {
+               if (PcmPlayer.isStereo) {
+                  var2 = method2547(0, ((RawSound)super.sound).samples, var1, this.field744, var2, this.field749, this.field750, this.field754, this.field755, 0, var6, var3, this);
                } else {
-                  var2 = method2534(((RawSound)super.sound).samples, var1, this.__m, var2, this.__u, this.__i, 0, var6, var3, this);
+                  var2 = method2534(((RawSound)super.sound).samples, var1, this.field744, var2, this.field748, this.field753, 0, var6, var3, this);
                }
-            } else if(PcmPlayer.isStereo) {
-               var2 = method2624(0, 0, ((RawSound)super.sound).samples, var1, this.__m, var2, this.__g, this.__l, this.__a, this.__z, 0, var6, var3, this, this.__f, var5);
+            } else if (PcmPlayer.isStereo) {
+               var2 = method2624(0, 0, ((RawSound)super.sound).samples, var1, this.field744, var2, this.field749, this.field750, this.field754, this.field755, 0, var6, var3, this, this.field745, var5);
             } else {
-               var2 = method2538(0, 0, ((RawSound)super.sound).samples, var1, this.__m, var2, this.__u, this.__i, 0, var6, var3, this, this.__f, var5);
+               var2 = method2538(0, 0, ((RawSound)super.sound).samples, var1, this.field744, var2, this.field748, this.field753, 0, var6, var3, this, this.field745, var5);
             }
 
-            this.__n -= var2;
-            if(this.__n != 0) {
+            this.field752 -= var2;
+            if (this.field752 != 0) {
                return var2;
             }
 
-            if(!this.__au_204()) {
+            if (!this.method283()) {
                continue;
             }
 
             return var4;
          }
 
-         if(this.__f == -256 && (this.__m & 255) == 0) {
-            if(PcmPlayer.isStereo) {
-               return method2496(0, ((RawSound)super.sound).samples, var1, this.__m, var2, this.__g, this.__l, 0, var4, var3, this);
+         if (this.field745 == -256 && (this.field744 & 255) == 0) {
+            if (PcmPlayer.isStereo) {
+               return method2496(0, ((RawSound)super.sound).samples, var1, this.field744, var2, this.field749, this.field750, 0, var4, var3, this);
             }
 
-            return method2636(((RawSound)super.sound).samples, var1, this.__m, var2, this.__u, 0, var4, var3, this);
+            return method2636(((RawSound)super.sound).samples, var1, this.field744, var2, this.field748, 0, var4, var3, this);
          }
 
-         if(PcmPlayer.isStereo) {
-            return method2531(0, 0, ((RawSound)super.sound).samples, var1, this.__m, var2, this.__g, this.__l, 0, var4, var3, this, this.__f, var5);
+         if (PcmPlayer.isStereo) {
+            return method2531(0, 0, ((RawSound)super.sound).samples, var1, this.field744, var2, this.field749, this.field750, 0, var4, var3, this, this.field745, var5);
          }
 
-         return method2509(0, 0, ((RawSound)super.sound).samples, var1, this.__m, var2, this.__u, 0, var4, var3, this, this.__f, var5);
+         return method2509(0, 0, ((RawSound)super.sound).samples, var1, this.field744, var2, this.field748, 0, var4, var3, this, this.field745, var5);
       }
    }
 
    @ObfuscatedName("az")
-   int __az_179() {
-      int var1 = this.__u * 3 >> 6;
+   int vmethod282() {
+      int var1 = this.field748 * 3 >> 6;
       var1 = (var1 ^ var1 >> 31) + (var1 >>> 31);
-      if(this.numLoops == 0) {
-         var1 -= var1 * this.__m / (((RawSound)super.sound).samples.length << 8);
-      } else if(this.numLoops >= 0) {
+      if (this.numLoops == 0) {
+         var1 -= var1 * this.field744 / (((RawSound)super.sound).samples.length << 8);
+      } else if (this.numLoops >= 0) {
          var1 -= var1 * this.start / ((RawSound)super.sound).samples.length;
       }
 
-      return var1 > 255?255:var1;
+      return var1 > 255 ? 255 : var1;
    }
 
    @ObfuscatedName("au")
-   boolean __au_204() {
-      int var1 = this.__q;
+   boolean method283() {
+      int var1 = this.field746;
       int var2;
       int var3;
-      if(var1 == Integer.MIN_VALUE) {
+      if (var1 == Integer.MIN_VALUE) {
          var3 = 0;
          var2 = 0;
          var1 = 0;
       } else {
-         var2 = method2603(var1, this.__o);
-         var3 = method2494(var1, this.__o);
+         var2 = method2603(var1, this.field747);
+         var3 = method2494(var1, this.field747);
       }
 
-      if(var1 == this.__u && var2 == this.__g && var3 == this.__l) {
-         if(this.__q == Integer.MIN_VALUE) {
-            this.__q = 0;
-            this.__l = 0;
-            this.__g = 0;
-            this.__u = 0;
+      if (var1 == this.field748 && var2 == this.field749 && var3 == this.field750) {
+         if (this.field746 == Integer.MIN_VALUE) {
+            this.field746 = 0;
+            this.field750 = 0;
+            this.field749 = 0;
+            this.field748 = 0;
             this.remove();
             return true;
          } else {
-            this.__o_180();
+            this.method261();
             return false;
          }
       } else {
-         if(this.__u < var1) {
-            this.__i = 1;
-            this.__n = var1 - this.__u;
-         } else if(this.__u > var1) {
-            this.__i = -1;
-            this.__n = this.__u - var1;
+         if (this.field748 < var1) {
+            this.field753 = 1;
+            this.field752 = var1 - this.field748;
+         } else if (this.field748 > var1) {
+            this.field753 = -1;
+            this.field752 = this.field748 - var1;
          } else {
-            this.__i = 0;
+            this.field753 = 0;
          }
 
-         if(this.__g < var2) {
-            this.__a = 1;
-            if(this.__n == 0 || this.__n > var2 - this.__g) {
-               this.__n = var2 - this.__g;
+         if (this.field749 < var2) {
+            this.field754 = 1;
+            if (this.field752 == 0 || this.field752 > var2 - this.field749) {
+               this.field752 = var2 - this.field749;
             }
-         } else if(this.__g > var2) {
-            this.__a = -1;
-            if(this.__n == 0 || this.__n > this.__g - var2) {
-               this.__n = this.__g - var2;
+         } else if (this.field749 > var2) {
+            this.field754 = -1;
+            if (this.field752 == 0 || this.field752 > this.field749 - var2) {
+               this.field752 = this.field749 - var2;
             }
          } else {
-            this.__a = 0;
+            this.field754 = 0;
          }
 
-         if(this.__l < var3) {
-            this.__z = 1;
-            if(this.__n == 0 || this.__n > var3 - this.__l) {
-               this.__n = var3 - this.__l;
+         if (this.field750 < var3) {
+            this.field755 = 1;
+            if (this.field752 == 0 || this.field752 > var3 - this.field750) {
+               this.field752 = var3 - this.field750;
             }
-         } else if(this.__l > var3) {
-            this.__z = -1;
-            if(this.__n == 0 || this.__n > this.__l - var3) {
-               this.__n = this.__l - var3;
+         } else if (this.field750 > var3) {
+            this.field755 = -1;
+            if (this.field752 == 0 || this.field752 > this.field750 - var3) {
+               this.field752 = this.field750 - var3;
             }
          } else {
-            this.__z = 0;
+            this.field755 = 0;
          }
 
          return false;
@@ -830,12 +834,12 @@ public class RawPcmStream extends PcmStream {
 
    @ObfuscatedName("m")
    static int method2603(int var0, int var1) {
-      return var1 < 0?var0:(int)((double)var0 * Math.sqrt((double)(16384 - var1) * 1.220703125E-4D) + 0.5D);
+      return var1 < 0 ? var0 : (int)((double)var0 * Math.sqrt((double)(16384 - var1) * 1.220703125E-4D) + 0.5D);
    }
 
    @ObfuscatedName("f")
    static int method2494(int var0, int var1) {
-      return var1 < 0?-var0:(int)((double)var0 * Math.sqrt((double)var1 * 1.220703125E-4D) + 0.5D);
+      return var1 < 0 ? -var0 : (int)((double)var0 * Math.sqrt((double)var1 * 1.220703125E-4D) + 0.5D);
    }
 
    @ObfuscatedName("q")
@@ -844,7 +848,7 @@ public class RawPcmStream extends PcmStream {
    )
    @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)(class309.PcmPlayer_sampleRate * 100)), var2 << 6):null;
+      return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, (int)((long)var0.sampleRate * 256L * (long)var1 / (long)(class309.PcmPlayer_sampleRate * 100)), var2 << 6) : null;
    }
 
    @ObfuscatedName("w")
@@ -852,7 +856,7 @@ public class RawPcmStream extends PcmStream {
       signature = "(Lcx;III)Lds;"
    )
    public static RawPcmStream method2524(RawSound var0, int var1, int var2, int var3) {
-      return var0.samples != null && var0.samples.length != 0?new RawPcmStream(var0, var1, var2, var3):null;
+      return var0.samples != null && var0.samples.length != 0 ? new RawPcmStream(var0, var1, var2, var3) : null;
    }
 
    @ObfuscatedName("ao")
@@ -863,26 +867,26 @@ public class RawPcmStream extends PcmStream {
       var2 >>= 8;
       var7 >>= 8;
       var4 <<= 2;
-      if((var5 = var3 + var7 - var2) > var6) {
+      if ((var5 = var3 + var7 - var2) > var6) {
          var5 = var6;
       }
 
-      int var10001;
-      for(var5 -= 3; var3 < var5; var1[var10001] += var0[var2++] * var4) {
-         var10001 = var3++;
-         var1[var10001] += var0[var2++] * var4;
-         var10001 = var3++;
-         var1[var10001] += var0[var2++] * var4;
-         var10001 = var3++;
-         var1[var10001] += var0[var2++] * var4;
-         var10001 = var3++;
+      int var9;
+      for (var5 -= 3; var3 < var5; var1[var9] += var0[var2++] * var4) {
+         var9 = var3++;
+         var1[var9] += var0[var2++] * var4;
+         var9 = var3++;
+         var1[var9] += var0[var2++] * var4;
+         var9 = var3++;
+         var1[var9] += var0[var2++] * var4;
+         var9 = var3++;
       }
 
-      for(var5 += 3; var3 < var5; var1[var10001] += var0[var2++] * var4) {
-         var10001 = var3++;
+      for (var5 += 3; var3 < var5; var1[var9] += var0[var2++] * var4) {
+         var9 = var3++;
       }
 
-      var8.__m = var2 << 8;
+      var8.field744 = var2 << 8;
       return var3;
    }
 
@@ -895,45 +899,45 @@ public class RawPcmStream extends PcmStream {
       var9 >>= 8;
       var5 <<= 2;
       var6 <<= 2;
-      if((var7 = var4 + var9 - var3) > var8) {
+      if ((var7 = var4 + var9 - var3) > var8) {
          var7 = var8;
       }
 
       var4 <<= 1;
       var7 <<= 1;
 
-      int var10001;
-      byte var11;
-      for(var7 -= 6; var4 < var7; var2[var10001] += var11 * var6) {
-         var11 = var1[var3++];
-         var10001 = var4++;
-         var2[var10001] += var11 * var5;
-         var10001 = var4++;
-         var2[var10001] += var11 * var6;
-         var11 = var1[var3++];
-         var10001 = var4++;
-         var2[var10001] += var11 * var5;
-         var10001 = var4++;
-         var2[var10001] += var11 * var6;
-         var11 = var1[var3++];
-         var10001 = var4++;
-         var2[var10001] += var11 * var5;
-         var10001 = var4++;
-         var2[var10001] += var11 * var6;
-         var11 = var1[var3++];
-         var10001 = var4++;
-         var2[var10001] += var11 * var5;
-         var10001 = var4++;
+      int var11;
+      byte var12;
+      for (var7 -= 6; var4 < var7; var2[var11] += var12 * var6) {
+         var12 = var1[var3++];
+         var11 = var4++;
+         var2[var11] += var12 * var5;
+         var11 = var4++;
+         var2[var11] += var12 * var6;
+         var12 = var1[var3++];
+         var11 = var4++;
+         var2[var11] += var12 * var5;
+         var11 = var4++;
+         var2[var11] += var12 * var6;
+         var12 = var1[var3++];
+         var11 = var4++;
+         var2[var11] += var12 * var5;
+         var11 = var4++;
+         var2[var11] += var12 * var6;
+         var12 = var1[var3++];
+         var11 = var4++;
+         var2[var11] += var12 * var5;
+         var11 = var4++;
       }
 
-      for(var7 += 6; var4 < var7; var2[var10001] += var11 * var6) {
-         var11 = var1[var3++];
-         var10001 = var4++;
-         var2[var10001] += var11 * var5;
-         var10001 = var4++;
+      for (var7 += 6; var4 < var7; var2[var11] += var12 * var6) {
+         var12 = var1[var3++];
+         var11 = var4++;
+         var2[var11] += var12 * var5;
+         var11 = var4++;
       }
 
-      var10.__m = var3 << 8;
+      var10.field744 = var3 << 8;
       return var4 >> 1;
    }
 
@@ -945,26 +949,26 @@ public class RawPcmStream extends PcmStream {
       var2 >>= 8;
       var7 >>= 8;
       var4 <<= 2;
-      if((var5 = var3 + var2 - (var7 - 1)) > var6) {
+      if ((var5 = var3 + var2 - (var7 - 1)) > var6) {
          var5 = var6;
       }
 
-      int var10001;
-      for(var5 -= 3; var3 < var5; var1[var10001] += var0[var2--] * var4) {
-         var10001 = var3++;
-         var1[var10001] += var0[var2--] * var4;
-         var10001 = var3++;
-         var1[var10001] += var0[var2--] * var4;
-         var10001 = var3++;
-         var1[var10001] += var0[var2--] * var4;
-         var10001 = var3++;
+      int var9;
+      for (var5 -= 3; var3 < var5; var1[var9] += var0[var2--] * var4) {
+         var9 = var3++;
+         var1[var9] += var0[var2--] * var4;
+         var9 = var3++;
+         var1[var9] += var0[var2--] * var4;
+         var9 = var3++;
+         var1[var9] += var0[var2--] * var4;
+         var9 = var3++;
       }
 
-      for(var5 += 3; var3 < var5; var1[var10001] += var0[var2--] * var4) {
-         var10001 = var3++;
+      for (var5 += 3; var3 < var5; var1[var9] += var0[var2--] * var4) {
+         var9 = var3++;
       }
 
-      var8.__m = var2 << 8;
+      var8.field744 = var2 << 8;
       return var3;
    }
 
@@ -977,45 +981,45 @@ public class RawPcmStream extends PcmStream {
       var9 >>= 8;
       var5 <<= 2;
       var6 <<= 2;
-      if((var7 = var3 + var4 - (var9 - 1)) > var8) {
+      if ((var7 = var3 + var4 - (var9 - 1)) > var8) {
          var7 = var8;
       }
 
       var4 <<= 1;
       var7 <<= 1;
 
-      int var10001;
-      byte var11;
-      for(var7 -= 6; var4 < var7; var2[var10001] += var11 * var6) {
-         var11 = var1[var3--];
-         var10001 = var4++;
-         var2[var10001] += var11 * var5;
-         var10001 = var4++;
-         var2[var10001] += var11 * var6;
-         var11 = var1[var3--];
-         var10001 = var4++;
-         var2[var10001] += var11 * var5;
-         var10001 = var4++;
-         var2[var10001] += var11 * var6;
-         var11 = var1[var3--];
-         var10001 = var4++;
-         var2[var10001] += var11 * var5;
-         var10001 = var4++;
-         var2[var10001] += var11 * var6;
-         var11 = var1[var3--];
-         var10001 = var4++;
-         var2[var10001] += var11 * var5;
-         var10001 = var4++;
+      int var11;
+      byte var12;
+      for (var7 -= 6; var4 < var7; var2[var11] += var12 * var6) {
+         var12 = var1[var3--];
+         var11 = var4++;
+         var2[var11] += var12 * var5;
+         var11 = var4++;
+         var2[var11] += var12 * var6;
+         var12 = var1[var3--];
+         var11 = var4++;
+         var2[var11] += var12 * var5;
+         var11 = var4++;
+         var2[var11] += var12 * var6;
+         var12 = var1[var3--];
+         var11 = var4++;
+         var2[var11] += var12 * var5;
+         var11 = var4++;
+         var2[var11] += var12 * var6;
+         var12 = var1[var3--];
+         var11 = var4++;
+         var2[var11] += var12 * var5;
+         var11 = var4++;
       }
 
-      for(var7 += 6; var4 < var7; var2[var10001] += var11 * var6) {
-         var11 = var1[var3--];
-         var10001 = var4++;
-         var2[var10001] += var11 * var5;
-         var10001 = var4++;
+      for (var7 += 6; var4 < var7; var2[var11] += var12 * var6) {
+         var12 = var1[var3--];
+         var11 = var4++;
+         var2[var11] += var12 * var5;
+         var11 = var4++;
       }
 
-      var10.__m = var3 << 8;
+      var10.field744 = var3 << 8;
       return var4 >> 1;
    }
 
@@ -1024,31 +1028,31 @@ public class RawPcmStream extends PcmStream {
       signature = "(II[B[IIIIIIILds;II)I"
    )
    static int method2528(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) {
+      if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4) - 257) / var11) > var8) {
          var7 = var8;
       }
 
       byte var13;
-      int var10001;
-      while(var5 < var7) {
+      int var14;
+      while (var5 < var7) {
          var1 = var4 >> 8;
          var13 = var2[var1];
-         var10001 = var5++;
-         var3[var10001] += ((var13 << 8) + (var2[var1 + 1] - var13) * (var4 & 255)) * var6 >> 6;
+         var14 = var5++;
+         var3[var14] += ((var13 << 8) + (var2[var1 + 1] - var13) * (var4 & 255)) * var6 >> 6;
          var4 += var11;
       }
 
-      if(var11 == 0 || (var7 = var5 + (var11 + (var9 - var4) - 1) / var11) > var8) {
+      if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4) - 1) / var11) > var8) {
          var7 = var8;
       }
 
-      for(var1 = var12; var5 < var7; var4 += var11) {
+      for (var1 = var12; var5 < var7; var4 += var11) {
          var13 = var2[var4 >> 8];
-         var10001 = var5++;
-         var3[var10001] += ((var13 << 8) + (var1 - var13) * (var4 & 255)) * var6 >> 6;
+         var14 = var5++;
+         var3[var14] += ((var13 << 8) + (var1 - var13) * (var4 & 255)) * var6 >> 6;
       }
 
-      var10.__m = var4;
+      var10.field744 = var4;
       return var5;
    }
 
@@ -1057,40 +1061,40 @@ public class RawPcmStream extends PcmStream {
       signature = "(II[B[IIIIIIIILds;II)I"
    )
    static int method2529(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) {
+      if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) {
          var8 = var9;
       }
 
       var5 <<= 1;
 
       byte var14;
-      int var10001;
-      for(var8 <<= 1; var5 < var8; var4 += var12) {
+      int var15;
+      for (var8 <<= 1; var5 < var8; var4 += var12) {
          var1 = var4 >> 8;
          var14 = var2[var1];
          var0 = (var14 << 8) + (var4 & 255) * (var2[var1 + 1] - var14);
-         var10001 = var5++;
-         var3[var10001] += var0 * var6 >> 6;
-         var10001 = var5++;
-         var3[var10001] += var0 * var7 >> 6;
+         var15 = var5++;
+         var3[var15] += var0 * var6 >> 6;
+         var15 = var5++;
+         var3[var15] += var0 * var7 >> 6;
       }
 
-      if(var12 == 0 || (var8 = (var5 >> 1) + (var10 - var4 + var12 - 1) / var12) > var9) {
+      if (var12 == 0 || (var8 = (var5 >> 1) + (var10 - var4 + var12 - 1) / var12) > var9) {
          var8 = var9;
       }
 
       var8 <<= 1;
 
-      for(var1 = var13; var5 < var8; var4 += var12) {
+      for (var1 = var13; var5 < var8; var4 += var12) {
          var14 = var2[var4 >> 8];
          var0 = (var14 << 8) + (var1 - var14) * (var4 & 255);
-         var10001 = var5++;
-         var3[var10001] += var0 * var6 >> 6;
-         var10001 = var5++;
-         var3[var10001] += var0 * var7 >> 6;
+         var15 = var5++;
+         var3[var15] += var0 * var6 >> 6;
+         var15 = var5++;
+         var3[var15] += var0 * var7 >> 6;
       }
 
-      var11.__m = var4;
+      var11.field744 = var4;
       return var5 >> 1;
    }
 
@@ -1099,31 +1103,31 @@ public class RawPcmStream extends PcmStream {
       signature = "(II[B[IIIIIIILds;II)I"
    )
    static int method2509(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) {
+      if (var11 == 0 || (var7 = var5 + (var11 + (var9 + 256 - var4)) / var11) > var8) {
          var7 = var8;
       }
 
-      int var10001;
-      while(var5 < var7) {
+      int var13;
+      while (var5 < var7) {
          var1 = var4 >> 8;
-         byte var13 = var2[var1 - 1];
-         var10001 = var5++;
-         var3[var10001] += ((var13 << 8) + (var2[var1] - var13) * (var4 & 255)) * var6 >> 6;
+         byte var14 = var2[var1 - 1];
+         var13 = var5++;
+         var3[var13] += ((var14 << 8) + (var2[var1] - var14) * (var4 & 255)) * var6 >> 6;
          var4 += var11;
       }
 
-      if(var11 == 0 || (var7 = var5 + (var11 + (var9 - var4)) / var11) > var8) {
+      if (var11 == 0 || (var7 = var5 + (var11 + (var9 - var4)) / var11) > var8) {
          var7 = var8;
       }
 
       var0 = var12;
 
-      for(var1 = var11; var5 < var7; var4 += var1) {
-         var10001 = var5++;
-         var3[var10001] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6;
+      for (var1 = var11; var5 < var7; var4 += var1) {
+         var13 = var5++;
+         var3[var13] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6;
       }
 
-      var10.__m = var4;
+      var10.field744 = var4;
       return var5;
    }
 
@@ -1132,38 +1136,38 @@ public class RawPcmStream extends PcmStream {
       signature = "(II[B[IIIIIIIILds;II)I"
    )
    static int method2531(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) {
+      if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) {
          var8 = var9;
       }
 
       var5 <<= 1;
 
-      int var10001;
-      for(var8 <<= 1; var5 < var8; var4 += var12) {
+      int var14;
+      for (var8 <<= 1; var5 < var8; var4 += var12) {
          var1 = var4 >> 8;
-         byte var14 = var2[var1 - 1];
-         var0 = (var2[var1] - var14) * (var4 & 255) + (var14 << 8);
-         var10001 = var5++;
-         var3[var10001] += var0 * var6 >> 6;
-         var10001 = var5++;
-         var3[var10001] += var0 * var7 >> 6;
+         byte var15 = var2[var1 - 1];
+         var0 = (var2[var1] - var15) * (var4 & 255) + (var15 << 8);
+         var14 = var5++;
+         var3[var14] += var0 * var6 >> 6;
+         var14 = var5++;
+         var3[var14] += var0 * var7 >> 6;
       }
 
-      if(var12 == 0 || (var8 = (var5 >> 1) + (var10 - var4 + var12) / var12) > var9) {
+      if (var12 == 0 || (var8 = (var5 >> 1) + (var10 - var4 + var12) / var12) > var9) {
          var8 = var9;
       }
 
       var8 <<= 1;
 
-      for(var1 = var13; var5 < var8; var4 += var12) {
+      for (var1 = var13; var5 < var8; var4 += var12) {
          var0 = (var1 << 8) + (var4 & 255) * (var2[var4 >> 8] - var1);
-         var10001 = var5++;
-         var3[var10001] += var0 * var6 >> 6;
-         var10001 = var5++;
-         var3[var10001] += var0 * var7 >> 6;
+         var14 = var5++;
+         var3[var14] += var0 * var6 >> 6;
+         var14 = var5++;
+         var3[var14] += var0 * var7 >> 6;
       }
 
-      var11.__m = var4;
+      var11.field744 = var4;
       return var5 >> 1;
    }
 
@@ -1176,35 +1180,35 @@ public class RawPcmStream extends PcmStream {
       var8 >>= 8;
       var4 <<= 2;
       var5 <<= 2;
-      if((var6 = var3 + var8 - var2) > var7) {
+      if ((var6 = var3 + var8 - var2) > var7) {
          var6 = var7;
       }
 
-      var9.__g += var9.__a * (var6 - var3);
-      var9.__l += var9.__z * (var6 - var3);
+      var9.field749 += var9.field754 * (var6 - var3);
+      var9.field750 += var9.field755 * (var6 - var3);
 
-      int var10001;
-      for(var6 -= 3; var3 < var6; var4 += var5) {
-         var10001 = var3++;
-         var1[var10001] += var0[var2++] * var4;
+      int var10;
+      for (var6 -= 3; var3 < var6; var4 += var5) {
+         var10 = var3++;
+         var1[var10] += var0[var2++] * var4;
          var4 += var5;
-         var10001 = var3++;
-         var1[var10001] += var0[var2++] * var4;
+         var10 = var3++;
+         var1[var10] += var0[var2++] * var4;
          var4 += var5;
-         var10001 = var3++;
-         var1[var10001] += var0[var2++] * var4;
+         var10 = var3++;
+         var1[var10] += var0[var2++] * var4;
          var4 += var5;
-         var10001 = var3++;
-         var1[var10001] += var0[var2++] * var4;
+         var10 = var3++;
+         var1[var10] += var0[var2++] * var4;
       }
 
-      for(var6 += 3; var3 < var6; var4 += var5) {
-         var10001 = var3++;
-         var1[var10001] += var0[var2++] * var4;
+      for (var6 += 3; var3 < var6; var4 += var5) {
+         var10 = var3++;
+         var1[var10] += var0[var2++] * var4;
       }
 
-      var9.__u = var4 >> 2;
-      var9.__m = var2 << 8;
+      var9.field748 = var4 >> 2;
+      var9.field744 = var2 << 8;
       return var3;
    }
 
@@ -1219,58 +1223,58 @@ public class RawPcmStream extends PcmStream {
       var6 <<= 2;
       var7 <<= 2;
       var8 <<= 2;
-      if((var9 = var11 + var4 - var3) > var10) {
+      if ((var9 = var11 + var4 - var3) > var10) {
          var9 = var10;
       }
 
-      var12.__u += var12.__i * (var9 - var4);
+      var12.field748 += var12.field753 * (var9 - var4);
       var4 <<= 1;
       var9 <<= 1;
 
       byte var13;
-      int var10001;
-      for(var9 -= 6; var4 < var9; var6 += var8) {
+      int var14;
+      for (var9 -= 6; var4 < var9; var6 += var8) {
          var13 = var1[var3++];
-         var10001 = var4++;
-         var2[var10001] += var13 * var5;
+         var14 = var4++;
+         var2[var14] += var13 * var5;
          var5 += var7;
-         var10001 = var4++;
-         var2[var10001] += var13 * var6;
+         var14 = var4++;
+         var2[var14] += var13 * var6;
          var6 += var8;
          var13 = var1[var3++];
-         var10001 = var4++;
-         var2[var10001] += var13 * var5;
+         var14 = var4++;
+         var2[var14] += var13 * var5;
          var5 += var7;
-         var10001 = var4++;
-         var2[var10001] += var13 * var6;
+         var14 = var4++;
+         var2[var14] += var13 * var6;
          var6 += var8;
          var13 = var1[var3++];
-         var10001 = var4++;
-         var2[var10001] += var13 * var5;
+         var14 = var4++;
+         var2[var14] += var13 * var5;
          var5 += var7;
-         var10001 = var4++;
-         var2[var10001] += var13 * var6;
+         var14 = var4++;
+         var2[var14] += var13 * var6;
          var6 += var8;
          var13 = var1[var3++];
-         var10001 = var4++;
-         var2[var10001] += var13 * var5;
+         var14 = var4++;
+         var2[var14] += var13 * var5;
          var5 += var7;
-         var10001 = var4++;
-         var2[var10001] += var13 * var6;
+         var14 = var4++;
+         var2[var14] += var13 * var6;
       }
 
-      for(var9 += 6; var4 < var9; var6 += var8) {
+      for (var9 += 6; var4 < var9; var6 += var8) {
          var13 = var1[var3++];
-         var10001 = var4++;
-         var2[var10001] += var13 * var5;
+         var14 = var4++;
+         var2[var14] += var13 * var5;
          var5 += var7;
-         var10001 = var4++;
-         var2[var10001] += var13 * var6;
+         var14 = var4++;
+         var2[var14] += var13 * var6;
       }
 
-      var12.__g = var5 >> 2;
-      var12.__l = var6 >> 2;
-      var12.__m = var3 << 8;
+      var12.field749 = var5 >> 2;
+      var12.field750 = var6 >> 2;
+      var12.field744 = var3 << 8;
       return var4 >> 1;
    }
 
@@ -1283,35 +1287,35 @@ public class RawPcmStream extends PcmStream {
       var8 >>= 8;
       var4 <<= 2;
       var5 <<= 2;
-      if((var6 = var3 + var2 - (var8 - 1)) > var7) {
+      if ((var6 = var3 + var2 - (var8 - 1)) > var7) {
          var6 = var7;
       }
 
-      var9.__g += var9.__a * (var6 - var3);
-      var9.__l += var9.__z * (var6 - var3);
+      var9.field749 += var9.field754 * (var6 - var3);
+      var9.field750 += var9.field755 * (var6 - var3);
 
-      int var10001;
-      for(var6 -= 3; var3 < var6; var4 += var5) {
-         var10001 = var3++;
-         var1[var10001] += var0[var2--] * var4;
+      int var10;
+      for (var6 -= 3; var3 < var6; var4 += var5) {
+         var10 = var3++;
+         var1[var10] += var0[var2--] * var4;
          var4 += var5;
-         var10001 = var3++;
-         var1[var10001] += var0[var2--] * var4;
+         var10 = var3++;
+         var1[var10] += var0[var2--] * var4;
          var4 += var5;
-         var10001 = var3++;
-         var1[var10001] += var0[var2--] * var4;
+         var10 = var3++;
+         var1[var10] += var0[var2--] * var4;
          var4 += var5;
-         var10001 = var3++;
-         var1[var10001] += var0[var2--] * var4;
+         var10 = var3++;
+         var1[var10] += var0[var2--] * var4;
       }
 
-      for(var6 += 3; var3 < var6; var4 += var5) {
-         var10001 = var3++;
-         var1[var10001] += var0[var2--] * var4;
+      for (var6 += 3; var3 < var6; var4 += var5) {
+         var10 = var3++;
+         var1[var10] += var0[var2--] * var4;
       }
 
-      var9.__u = var4 >> 2;
-      var9.__m = var2 << 8;
+      var9.field748 = var4 >> 2;
+      var9.field744 = var2 << 8;
       return var3;
    }
 
@@ -1326,58 +1330,58 @@ public class RawPcmStream extends PcmStream {
       var6 <<= 2;
       var7 <<= 2;
       var8 <<= 2;
-      if((var9 = var3 + var4 - (var11 - 1)) > var10) {
+      if ((var9 = var3 + var4 - (var11 - 1)) > var10) {
          var9 = var10;
       }
 
-      var12.__u += var12.__i * (var9 - var4);
+      var12.field748 += var12.field753 * (var9 - var4);
       var4 <<= 1;
       var9 <<= 1;
 
       byte var13;
-      int var10001;
-      for(var9 -= 6; var4 < var9; var6 += var8) {
+      int var14;
+      for (var9 -= 6; var4 < var9; var6 += var8) {
          var13 = var1[var3--];
-         var10001 = var4++;
-         var2[var10001] += var13 * var5;
+         var14 = var4++;
+         var2[var14] += var13 * var5;
          var5 += var7;
-         var10001 = var4++;
-         var2[var10001] += var13 * var6;
+         var14 = var4++;
+         var2[var14] += var13 * var6;
          var6 += var8;
          var13 = var1[var3--];
-         var10001 = var4++;
-         var2[var10001] += var13 * var5;
+         var14 = var4++;
+         var2[var14] += var13 * var5;
          var5 += var7;
-         var10001 = var4++;
-         var2[var10001] += var13 * var6;
+         var14 = var4++;
+         var2[var14] += var13 * var6;
          var6 += var8;
          var13 = var1[var3--];
-         var10001 = var4++;
-         var2[var10001] += var13 * var5;
+         var14 = var4++;
+         var2[var14] += var13 * var5;
          var5 += var7;
-         var10001 = var4++;
-         var2[var10001] += var13 * var6;
+         var14 = var4++;
+         var2[var14] += var13 * var6;
          var6 += var8;
          var13 = var1[var3--];
-         var10001 = var4++;
-         var2[var10001] += var13 * var5;
+         var14 = var4++;
+         var2[var14] += var13 * var5;
          var5 += var7;
-         var10001 = var4++;
-         var2[var10001] += var13 * var6;
+         var14 = var4++;
+         var2[var14] += var13 * var6;
       }
 
-      for(var9 += 6; var4 < var9; var6 += var8) {
+      for (var9 += 6; var4 < var9; var6 += var8) {
          var13 = var1[var3--];
-         var10001 = var4++;
-         var2[var10001] += var13 * var5;
+         var14 = var4++;
+         var2[var14] += var13 * var5;
          var5 += var7;
-         var10001 = var4++;
-         var2[var10001] += var13 * var6;
+         var14 = var4++;
+         var2[var14] += var13 * var6;
       }
 
-      var12.__g = var5 >> 2;
-      var12.__l = var6 >> 2;
-      var12.__m = var3 << 8;
+      var12.field749 = var5 >> 2;
+      var12.field750 = var6 >> 2;
+      var12.field744 = var3 << 8;
       return var4 >> 1;
    }
 
@@ -1386,38 +1390,38 @@ public class RawPcmStream extends PcmStream {
       signature = "(II[B[IIIIIIIILds;II)I"
    )
    static int method2536(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.__g -= var11.__a * var5;
-      var11.__l -= var11.__z * var5;
-      if(var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) {
+      var11.field749 -= var11.field754 * var5;
+      var11.field750 -= var11.field755 * var5;
+      if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 257) / var12) > var9) {
          var8 = var9;
       }
 
       byte var14;
-      int var10001;
-      while(var5 < var8) {
+      int var15;
+      while (var5 < var8) {
          var1 = var4 >> 8;
          var14 = var2[var1];
-         var10001 = var5++;
-         var3[var10001] += ((var14 << 8) + (var2[var1 + 1] - var14) * (var4 & 255)) * var6 >> 6;
+         var15 = var5++;
+         var3[var15] += ((var14 << 8) + (var2[var1 + 1] - var14) * (var4 & 255)) * var6 >> 6;
          var6 += var7;
          var4 += var12;
       }
 
-      if(var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 1) / var12) > var9) {
+      if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12 - 1) / var12) > var9) {
          var8 = var9;
       }
 
-      for(var1 = var13; var5 < var8; var4 += var12) {
+      for (var1 = var13; var5 < var8; var4 += var12) {
          var14 = var2[var4 >> 8];
-         var10001 = var5++;
-         var3[var10001] += ((var14 << 8) + (var1 - var14) * (var4 & 255)) * var6 >> 6;
+         var15 = var5++;
+         var3[var15] += ((var14 << 8) + (var1 - var14) * (var4 & 255)) * var6 >> 6;
          var6 += var7;
       }
 
-      var11.__g += var11.__a * var5;
-      var11.__l += var11.__z * var5;
-      var11.__u = var6;
-      var11.__m = var4;
+      var11.field749 += var11.field754 * var5;
+      var11.field750 += var11.field755 * var5;
+      var11.field748 = var6;
+      var11.field744 = var4;
       return var5;
    }
 
@@ -1426,49 +1430,49 @@ public class RawPcmStream extends PcmStream {
       signature = "(II[B[IIIIIIIIIILds;II)I"
    )
    static int method2504(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.__u -= var5 * var13.__i;
-      if(var14 == 0 || (var10 = var5 + (var12 - var4 + var14 - 257) / var14) > var11) {
+      var13.field748 -= var5 * var13.field753;
+      if (var14 == 0 || (var10 = var5 + (var12 - var4 + var14 - 257) / var14) > var11) {
          var10 = var11;
       }
 
       var5 <<= 1;
 
       byte var16;
-      int var10001;
-      for(var10 <<= 1; var5 < var10; var4 += var14) {
+      int var17;
+      for (var10 <<= 1; var5 < var10; var4 += var14) {
          var1 = var4 >> 8;
          var16 = var2[var1];
          var0 = (var16 << 8) + (var4 & 255) * (var2[var1 + 1] - var16);
-         var10001 = var5++;
-         var3[var10001] += var0 * var6 >> 6;
+         var17 = var5++;
+         var3[var17] += var0 * var6 >> 6;
          var6 += var8;
-         var10001 = var5++;
-         var3[var10001] += var0 * var7 >> 6;
+         var17 = var5++;
+         var3[var17] += var0 * var7 >> 6;
          var7 += var9;
       }
 
-      if(var14 == 0 || (var10 = (var5 >> 1) + (var12 - var4 + var14 - 1) / var14) > var11) {
+      if (var14 == 0 || (var10 = (var5 >> 1) + (var12 - var4 + var14 - 1) / var14) > var11) {
          var10 = var11;
       }
 
       var10 <<= 1;
 
-      for(var1 = var15; var5 < var10; var4 += var14) {
+      for (var1 = var15; var5 < var10; var4 += var14) {
          var16 = var2[var4 >> 8];
          var0 = (var16 << 8) + (var1 - var16) * (var4 & 255);
-         var10001 = var5++;
-         var3[var10001] += var0 * var6 >> 6;
+         var17 = var5++;
+         var3[var17] += var0 * var6 >> 6;
          var6 += var8;
-         var10001 = var5++;
-         var3[var10001] += var0 * var7 >> 6;
+         var17 = var5++;
+         var3[var17] += var0 * var7 >> 6;
          var7 += var9;
       }
 
       var5 >>= 1;
-      var13.__u += var13.__i * var5;
-      var13.__g = var6;
-      var13.__l = var7;
-      var13.__m = var4;
+      var13.field748 += var13.field753 * var5;
+      var13.field749 = var6;
+      var13.field750 = var7;
+      var13.field744 = var4;
       return var5;
    }
 
@@ -1477,38 +1481,38 @@ public class RawPcmStream extends PcmStream {
       signature = "(II[B[IIIIIIIILds;II)I"
    )
    static int method2538(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.__g -= var11.__a * var5;
-      var11.__l -= var11.__z * var5;
-      if(var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) {
+      var11.field749 -= var11.field754 * var5;
+      var11.field750 -= var11.field755 * var5;
+      if (var12 == 0 || (var8 = var5 + (var10 + 256 - var4 + var12) / var12) > var9) {
          var8 = var9;
       }
 
-      int var10001;
-      while(var5 < var8) {
+      int var14;
+      while (var5 < var8) {
          var1 = var4 >> 8;
-         byte var14 = var2[var1 - 1];
-         var10001 = var5++;
-         var3[var10001] += ((var14 << 8) + (var2[var1] - var14) * (var4 & 255)) * var6 >> 6;
+         byte var15 = var2[var1 - 1];
+         var14 = var5++;
+         var3[var14] += ((var15 << 8) + (var2[var1] - var15) * (var4 & 255)) * var6 >> 6;
          var6 += var7;
          var4 += var12;
       }
 
-      if(var12 == 0 || (var8 = var5 + (var10 - var4 + var12) / var12) > var9) {
+      if (var12 == 0 || (var8 = var5 + (var10 - var4 + var12) / var12) > var9) {
          var8 = var9;
       }
 
       var0 = var13;
 
-      for(var1 = var12; var5 < var8; var4 += var1) {
-         var10001 = var5++;
-         var3[var10001] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6;
+      for (var1 = var12; var5 < var8; var4 += var1) {
+         var14 = var5++;
+         var3[var14] += ((var0 << 8) + (var2[var4 >> 8] - var0) * (var4 & 255)) * var6 >> 6;
          var6 += var7;
       }
 
-      var11.__g += var11.__a * var5;
-      var11.__l += var11.__z * var5;
-      var11.__u = var6;
-      var11.__m = var4;
+      var11.field749 += var11.field754 * var5;
+      var11.field750 += var11.field755 * var5;
+      var11.field748 = var6;
+      var11.field744 = var4;
       return var5;
    }
 
@@ -1517,47 +1521,47 @@ public class RawPcmStream extends PcmStream {
       signature = "(II[B[IIIIIIIIIILds;II)I"
    )
    static int method2624(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.__u -= var5 * var13.__i;
-      if(var14 == 0 || (var10 = var5 + (var12 + 256 - var4 + var14) / var14) > var11) {
+      var13.field748 -= var5 * var13.field753;
+      if (var14 == 0 || (var10 = var5 + (var12 + 256 - var4 + var14) / var14) > var11) {
          var10 = var11;
       }
 
       var5 <<= 1;
 
-      int var10001;
-      for(var10 <<= 1; var5 < var10; var4 += var14) {
+      int var16;
+      for (var10 <<= 1; var5 < var10; var4 += var14) {
          var1 = var4 >> 8;
-         byte var16 = var2[var1 - 1];
-         var0 = (var2[var1] - var16) * (var4 & 255) + (var16 << 8);
-         var10001 = var5++;
-         var3[var10001] += var0 * var6 >> 6;
+         byte var17 = var2[var1 - 1];
+         var0 = (var2[var1] - var17) * (var4 & 255) + (var17 << 8);
+         var16 = var5++;
+         var3[var16] += var0 * var6 >> 6;
          var6 += var8;
-         var10001 = var5++;
-         var3[var10001] += var0 * var7 >> 6;
+         var16 = var5++;
+         var3[var16] += var0 * var7 >> 6;
          var7 += var9;
       }
 
-      if(var14 == 0 || (var10 = (var5 >> 1) + (var12 - var4 + var14) / var14) > var11) {
+      if (var14 == 0 || (var10 = (var5 >> 1) + (var12 - var4 + var14) / var14) > var11) {
          var10 = var11;
       }
 
       var10 <<= 1;
 
-      for(var1 = var15; var5 < var10; var4 += var14) {
+      for (var1 = var15; var5 < var10; var4 += var14) {
          var0 = (var1 << 8) + (var4 & 255) * (var2[var4 >> 8] - var1);
-         var10001 = var5++;
-         var3[var10001] += var0 * var6 >> 6;
+         var16 = var5++;
+         var3[var16] += var0 * var6 >> 6;
          var6 += var8;
-         var10001 = var5++;
-         var3[var10001] += var0 * var7 >> 6;
+         var16 = var5++;
+         var3[var16] += var0 * var7 >> 6;
          var7 += var9;
       }
 
       var5 >>= 1;
-      var13.__u += var13.__i * var5;
-      var13.__g = var6;
-      var13.__l = var7;
-      var13.__m = var4;
+      var13.field748 += var13.field753 * var5;
+      var13.field749 = var6;
+      var13.field750 = var7;
+      var13.field744 = var4;
       return var5;
    }
 }
diff --git a/runescape-client/src/main/java/RawSound.java b/runescape-client/src/main/java/RawSound.java
index e746b0a448..90de54156c 100644
--- a/runescape-client/src/main/java/RawSound.java
+++ b/runescape-client/src/main/java/RawSound.java
@@ -19,7 +19,7 @@ public class RawSound extends AbstractSound {
    @Export("end")
    int end;
    @ObfuscatedName("o")
-   public boolean __o;
+   public boolean field756;
 
    RawSound(int var1, byte[] var2, int var3, int var4) {
       this.sampleRate = var1;
@@ -33,7 +33,7 @@ public class RawSound extends AbstractSound {
       this.samples = var2;
       this.start = var3;
       this.end = var4;
-      this.__o = var5;
+      this.field756 = var5;
    }
 
    @ObfuscatedName("m")
@@ -41,15 +41,15 @@ public class RawSound extends AbstractSound {
       signature = "(Ldp;)Lcx;"
    )
    @Export("resample")
-   public RawSound resample(Decimator var1) {
-      this.samples = var1.resample(this.samples);
-      this.sampleRate = var1.scaleRate(this.sampleRate);
-      if(this.start == this.end) {
-         this.start = this.end = var1.scalePosition(this.start);
+   public RawSound resample(Decimator decimator) {
+      this.samples = decimator.resample(this.samples);
+      this.sampleRate = decimator.scaleRate(this.sampleRate);
+      if (this.start == this.end) {
+         this.start = this.end = decimator.scalePosition(this.start);
       } else {
-         this.start = var1.scalePosition(this.start);
-         this.end = var1.scalePosition(this.end);
-         if(this.start == this.end) {
+         this.start = decimator.scalePosition(this.start);
+         this.end = decimator.scalePosition(this.end);
+         if (this.start == this.end) {
             --this.start;
          }
       }
diff --git a/runescape-client/src/main/java/RectangleMode.java b/runescape-client/src/main/java/RectangleMode.java
index 006557d5f8..06257b72d3 100644
--- a/runescape-client/src/main/java/RectangleMode.java
+++ b/runescape-client/src/main/java/RectangleMode.java
@@ -11,17 +11,21 @@ public enum RectangleMode implements Enumerated {
    @ObfuscatedSignature(
       signature = "Llj;"
    )
-   __lj_m(0, 0),
+   @Export("SOLID")
+   SOLID(0, 0),
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Llj;"
    )
-   __lj_f(1, 1),
+   @Export("GRADIENT_COLOR")
+   GRADIENT_COLOR(1, 1),
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Llj;"
    )
-   __lj_q(2, 2);
+   @Export("GRADIENT_ALPHA")
+   GRADIENT_ALPHA(2, 2);
+
    @ObfuscatedName("d")
    @Export("musicTrackBoolean")
    public static boolean musicTrackBoolean;
@@ -29,18 +33,18 @@ public enum RectangleMode implements Enumerated {
    @ObfuscatedGetter(
       intValue = -1391612747
    )
-   @Export("id")
-   public final int id;
+   @Export("value")
+   public final int value;
    @ObfuscatedName("o")
    @ObfuscatedGetter(
       intValue = -1204297807
    )
-   @Export("id2")
-   final int id2;
+   @Export("id")
+   final int id;
 
-   RectangleMode(int var3, int var4) {
-      this.id = var3;
-      this.id2 = var4;
+   private RectangleMode(int var3, int var4) {
+      this.value = var3;
+      this.id = var4;
    }
 
    @ObfuscatedName("f")
@@ -50,7 +54,7 @@ public enum RectangleMode implements Enumerated {
    )
    @Export("rsOrdinal")
    public int rsOrdinal() {
-      return this.id2;
+      return this.id;
    }
 
    @ObfuscatedName("m")
@@ -58,9 +62,10 @@ public enum RectangleMode implements Enumerated {
       signature = "(Lir;Lir;ZB)V",
       garbageValue = "1"
    )
-   public static void method6028(AbstractIndexCache var0, AbstractIndexCache var1, boolean var2) {
-      ObjectDefinition.ObjectDefinition_indexCache = var0;
-      ObjectDefinition.__jr_q = var1;
-      ObjectDefinition.ObjectDefinition_isLowDetail = var2;
+   @Export("setObjectDefinitionArchives")
+   public static void setObjectDefinitionArchives(AbstractArchive var0, AbstractArchive var1, boolean isLowDetail) {
+      ObjectDefinition.ObjectDefinition_archive = var0;
+      ObjectDefinition.field640 = var1;
+      ObjectDefinition.ObjectDefinition_isLowDetail = isLowDetail;
    }
 }
diff --git a/runescape-client/src/main/java/RouteStrategy.java b/runescape-client/src/main/java/RouteStrategy.java
index 47bf872c16..040ead2a47 100644
--- a/runescape-client/src/main/java/RouteStrategy.java
+++ b/runescape-client/src/main/java/RouteStrategy.java
@@ -1,11 +1,12 @@
 import net.runelite.mapping.Export;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("fe")
-public abstract class RouteStrategy
-{
+@Implements("RouteStrategy")
+public abstract class RouteStrategy {
    @ObfuscatedName("l")
    @ObfuscatedGetter(
       intValue = -1237576843
@@ -13,7 +14,7 @@ public abstract class RouteStrategy
    @Export("Interpreter_intStackSize")
    static int Interpreter_intStackSize;
    @ObfuscatedName("e")
-   static byte[][][] __fe_e;
+   static byte[][][] field760;
    @ObfuscatedName("m")
    @ObfuscatedGetter(
       intValue = 123677543
@@ -53,15 +54,15 @@ public abstract class RouteStrategy
    )
    public static int method3642(int var0, int var1) {
       int var2;
-      for(var2 = 1; var1 > 1; var1 >>= 1) {
-         if((var1 & 1) != 0) {
+      for (var2 = 1; var1 > 1; var1 >>= 1) {
+         if ((var1 & 1) != 0) {
             var2 = var0 * var2;
          }
 
          var0 *= var0;
       }
 
-      if(var1 == 1) {
+      if (var1 == 1) {
          return var0 * var2;
       } else {
          return var2;
@@ -74,9 +75,9 @@ public abstract class RouteStrategy
       garbageValue = "-602741260"
    )
    @Export("loadSpriteFlat")
-   static boolean loadSpriteFlat(AbstractIndexCache var0, int var1) {
-      byte[] var2 = var0.takeRecordFlat(var1);
-      if(var2 == null) {
+   static boolean loadSpriteFlat(AbstractArchive var0, int var1) {
+      byte[] var2 = var0.takeFileFlat(var1);
+      if (var2 == null) {
          return false;
       } else {
          DevicePcmPlayerProvider.decodeSprite(var2);
diff --git a/runescape-client/src/main/java/RunException.java b/runescape-client/src/main/java/RunException.java
index 75df0eac82..628262c29a 100644
--- a/runescape-client/src/main/java/RunException.java
+++ b/runescape-client/src/main/java/RunException.java
@@ -24,7 +24,7 @@ public class RunException extends RuntimeException {
    @ObfuscatedGetter(
       intValue = 121013503
    )
-   public static int __fx_w;
+   public static int field761;
    @ObfuscatedName("o")
    @Export("string")
    String string;
@@ -52,15 +52,14 @@ public class RunException extends RuntimeException {
       garbageValue = "-2146928006"
    )
    public static void method3431() {
-      Object var0 = IndexStoreActionHandler.IndexStoreActionHandler_lock;
-      synchronized(IndexStoreActionHandler.IndexStoreActionHandler_lock) {
-         if(IndexStoreActionHandler.__iv_q != 0) {
-            IndexStoreActionHandler.__iv_q = 1;
+      Object var0 = ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock;
+      synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) {
+         if (ArchiveDiskActionHandler.field412 != 0) {
+            ArchiveDiskActionHandler.field412 = 1;
 
             try {
-               IndexStoreActionHandler.IndexStoreActionHandler_lock.wait();
-            } catch (InterruptedException var3) {
-               ;
+               ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock.wait();
+            } catch (InterruptedException var4) {
             }
          }
 
diff --git a/runescape-client/src/main/java/Scene.java b/runescape-client/src/main/java/Scene.java
index 85a75d1337..10abbdb8a5 100644
--- a/runescape-client/src/main/java/Scene.java
+++ b/runescape-client/src/main/java/Scene.java
@@ -61,8 +61,8 @@ public class Scene {
    @ObfuscatedSignature(
       signature = "[Leh;"
    )
-   @Export("Scene_gameObjects")
-   static GameObject[] Scene_gameObjects;
+   @Export("gameObjects")
+   static GameObject[] gameObjects;
    @ObfuscatedName("ac")
    @Export("checkClick")
    static boolean checkClick;
@@ -112,19 +112,19 @@ public class Scene {
    @Export("Scene_tilesDeque")
    static NodeDeque Scene_tilesDeque;
    @ObfuscatedName("au")
-   static final int[] __em_au;
+   static final int[] field762;
    @ObfuscatedName("ao")
-   static final int[] __em_ao;
+   static final int[] field763;
    @ObfuscatedName("aa")
-   static final int[] __em_aa;
+   static final int[] field764;
    @ObfuscatedName("ax")
-   static final int[] __em_ax;
+   static final int[] field765;
    @ObfuscatedName("af")
-   static final int[] __em_af;
+   static final int[] field766;
    @ObfuscatedName("ai")
-   static final int[] __em_ai;
+   static final int[] field767;
    @ObfuscatedName("ba")
-   static final int[] __em_ba;
+   static final int[] field768;
    @ObfuscatedName("bc")
    @Export("visibilityMap")
    static boolean[][][][] visibilityMap;
@@ -168,8 +168,8 @@ public class Scene {
    @Export("tiles")
    Tile[][][] tiles;
    @ObfuscatedName("g")
-   @Export("Scene_minPlane")
-   int Scene_minPlane;
+   @Export("minPlane")
+   int minPlane;
    @ObfuscatedName("l")
    @Export("tempGameObjectsCount")
    int tempGameObjectsCount;
@@ -180,51 +180,23 @@ public class Scene {
    @Export("tempGameObjects")
    GameObject[] tempGameObjects;
    @ObfuscatedName("x")
-   int[][][] __x;
+   int[][][] field769;
    @ObfuscatedName("bk")
-   int[][] __bk;
+   int[][] field770;
    @ObfuscatedName("bd")
-   int[][] __bd;
-
-   static {
-      Scene_isLowDetail = true;
-      tileUpdateCount = 0;
-      Scene_plane = 0;
-      Scene_gameObjects = new GameObject[100];
-      checkClick = false;
-      Scene_selectedPlane = 0;
-      Scene_selectedScreenX = 0;
-      Scene_selectedScreenY = 0;
-      Scene_selectedX = -1;
-      Scene_selectedY = -1;
-      viewportWalking = false;
-      Scene_planesCount = 4;
-      Scene_planeOccluderCounts = new int[Scene_planesCount];
-      Scene_planeOccluders = new Occluder[Scene_planesCount][500];
-      Scene_currentOccludersCount = 0;
-      Scene_currentOccluders = new Occluder[500];
-      Scene_tilesDeque = new NodeDeque();
-      __em_au = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76};
-      __em_ao = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160};
-      __em_aa = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19};
-      __em_ax = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0};
-      __em_af = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4};
-      __em_ai = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0};
-      __em_ba = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8};
-      visibilityMap = new boolean[8][32][51][51];
-   }
+   int[][] field771;
 
    public Scene(int var1, int var2, int var3, int[][][] var4) {
-      this.Scene_minPlane = 0;
+      this.minPlane = 0;
       this.tempGameObjectsCount = 0;
       this.tempGameObjects = new GameObject[5000];
-      this.__bk = new int[][]{{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1}, {1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0}, {0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1}, {0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0}, {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0}, {1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1}, {1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0}, {0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1}, {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1}};
-      this.__bd = new int[][]{{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}, {12, 8, 4, 0, 13, 9, 5, 1, 14, 10, 6, 2, 15, 11, 7, 3}, {15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0}, {3, 7, 11, 15, 2, 6, 10, 14, 1, 5, 9, 13, 0, 4, 8, 12}};
+      this.field770 = new int[][]{{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1}, {1, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0}, {0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 1}, {0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1}, {1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0}, {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0}, {1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1}, {1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0}, {0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1}, {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1}};
+      this.field771 = new int[][]{{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}, {12, 8, 4, 0, 13, 9, 5, 1, 14, 10, 6, 2, 15, 11, 7, 3}, {15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0}, {3, 7, 11, 15, 2, 6, 10, 14, 1, 5, 9, 13, 0, 4, 8, 12}};
       this.planes = var1;
       this.xSize = var2;
       this.ySize = var3;
       this.tiles = new Tile[var1][var2][var3];
-      this.__x = new int[var1][var2 + 1][var3 + 1];
+      this.field769 = new int[var1][var2 + 1][var3 + 1];
       this.tileHeights = var4;
       this.clear();
    }
@@ -234,43 +206,43 @@ public class Scene {
    public void clear() {
       int var1;
       int var2;
-      for(var1 = 0; var1 < this.planes; ++var1) {
-         for(var2 = 0; var2 < this.xSize; ++var2) {
-            for(int var3 = 0; var3 < this.ySize; ++var3) {
+      for (var1 = 0; var1 < this.planes; ++var1) {
+         for (var2 = 0; var2 < this.xSize; ++var2) {
+            for (int var3 = 0; var3 < this.ySize; ++var3) {
                this.tiles[var1][var2][var3] = null;
             }
          }
       }
 
-      for(var1 = 0; var1 < Scene_planesCount; ++var1) {
-         for(var2 = 0; var2 < Scene_planeOccluderCounts[var1]; ++var2) {
+      for (var1 = 0; var1 < Scene_planesCount; ++var1) {
+         for (var2 = 0; var2 < Scene_planeOccluderCounts[var1]; ++var2) {
             Scene_planeOccluders[var1][var2] = null;
          }
 
          Scene_planeOccluderCounts[var1] = 0;
       }
 
-      for(var1 = 0; var1 < this.tempGameObjectsCount; ++var1) {
+      for (var1 = 0; var1 < this.tempGameObjectsCount; ++var1) {
          this.tempGameObjects[var1] = null;
       }
 
       this.tempGameObjectsCount = 0;
 
-      for(var1 = 0; var1 < Scene_gameObjects.length; ++var1) {
-         Scene_gameObjects[var1] = null;
+      for (var1 = 0; var1 < gameObjects.length; ++var1) {
+         gameObjects[var1] = null;
       }
 
    }
 
    @ObfuscatedName("f")
    @Export("init")
-   public void init(int var1) {
-      this.Scene_minPlane = var1;
+   public void init(int minPlane) {
+      this.minPlane = minPlane;
 
-      for(int var2 = 0; var2 < this.xSize; ++var2) {
-         for(int var3 = 0; var3 < this.ySize; ++var3) {
-            if(this.tiles[var1][var2][var3] == null) {
-               this.tiles[var1][var2][var3] = new Tile(var1, var2, var3);
+      for (int var2 = 0; var2 < this.xSize; ++var2) {
+         for (int var3 = 0; var3 < this.ySize; ++var3) {
+            if (this.tiles[minPlane][var2][var3] == null) {
+               this.tiles[minPlane][var2][var3] = new Tile(minPlane, var2, var3);
             }
          }
       }
@@ -279,41 +251,42 @@ public class Scene {
 
    @ObfuscatedName("q")
    @Export("setLinkBelow")
-   public void setLinkBelow(int var1, int var2) {
-      Tile var3 = this.tiles[0][var1][var2];
+   public void setLinkBelow(int x, int y) {
+      Tile var3 = this.tiles[0][x][y];
 
-      for(int var4 = 0; var4 < 3; ++var4) {
-         Tile var5 = this.tiles[var4][var1][var2] = this.tiles[var4 + 1][var1][var2];
-         if(var5 != null) {
+      for (int var4 = 0; var4 < 3; ++var4) {
+         Tile var5 = this.tiles[var4][x][y] = this.tiles[var4 + 1][x][y];
+         if (var5 != null) {
             --var5.plane;
 
-            for(int var6 = 0; var6 < var5.gameObjectsCount; ++var6) {
+            for (int var6 = 0; var6 < var5.gameObjectsCount; ++var6) {
                GameObject var7 = var5.gameObjects[var6];
-               long var9 = var7.tag;
-               int var11 = (int)(var9 >>> 14 & 3L);
-               boolean var8 = var11 == 2;
-               if(var8 && var7.startX == var1 && var2 == var7.startY) {
+               long var8 = var7.tag;
+               int var10 = (int)(var8 >>> 14 & 3L);
+               boolean var11 = var10 == 2;
+               if (var11 && var7.startX == x && y == var7.startY) {
                   --var7.plane;
                }
             }
          }
       }
 
-      if(this.tiles[0][var1][var2] == null) {
-         this.tiles[0][var1][var2] = new Tile(0, var1, var2);
+      if (this.tiles[0][x][y] == null) {
+         this.tiles[0][x][y] = new Tile(0, x, y);
       }
 
-      this.tiles[0][var1][var2].linkedBelowTile = var3;
-      this.tiles[3][var1][var2] = null;
+      this.tiles[0][x][y].linkedBelowTile = var3;
+      this.tiles[3][x][y] = null;
    }
 
    @ObfuscatedName("o")
    @Export("setTileMinPlane")
-   public void setTileMinPlane(int var1, int var2, int var3, int var4) {
-      Tile var5 = this.tiles[var1][var2][var3];
-      if(var5 != null) {
-         this.tiles[var1][var2][var3].minPlane = var4;
+   public void setTileMinPlane(int plane, int x, int y, int minPlane) {
+      Tile var5 = this.tiles[plane][x][y];
+      if (var5 != null) {
+         this.tiles[plane][x][y].minPlane = minPlane;
       }
+
    }
 
    @ObfuscatedName("u")
@@ -321,21 +294,21 @@ public class Scene {
    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) {
       TilePaint var21;
       int var22;
-      if(var4 == 0) {
+      if (var4 == 0) {
          var21 = new TilePaint(var11, var12, var13, var14, -1, var19, false);
 
-         for(var22 = var1; var22 >= 0; --var22) {
-            if(this.tiles[var22][var2][var3] == null) {
+         for (var22 = var1; var22 >= 0; --var22) {
+            if (this.tiles[var22][var2][var3] == null) {
                this.tiles[var22][var2][var3] = new Tile(var22, var2, var3);
             }
          }
 
          this.tiles[var1][var2][var3].paint = var21;
-      } else if(var4 != 1) {
+      } else if (var4 != 1) {
          TileModel var23 = new TileModel(var4, var5, var6, var2, var3, var7, var8, var9, var10, var11, var12, var13, var14, var15, var16, var17, var18, var19, var20);
 
-         for(var22 = var1; var22 >= 0; --var22) {
-            if(this.tiles[var22][var2][var3] == null) {
+         for (var22 = var1; var22 >= 0; --var22) {
+            if (this.tiles[var22][var2][var3] == null) {
                this.tiles[var22][var2][var3] = new Tile(var22, var2, var3);
             }
          }
@@ -344,14 +317,15 @@ public class Scene {
       } else {
          var21 = new TilePaint(var15, var16, var17, var18, var6, var20, var8 == var7 && var7 == var9 && var10 == var7);
 
-         for(var22 = var1; var22 >= 0; --var22) {
-            if(this.tiles[var22][var2][var3] == null) {
+         for (var22 = var1; var22 >= 0; --var22) {
+            if (this.tiles[var22][var2][var3] == null) {
                this.tiles[var22][var2][var3] = new Tile(var22, var2, var3);
             }
          }
 
          this.tiles[var1][var2][var3].paint = var21;
       }
+
    }
 
    @ObfuscatedName("g")
@@ -359,21 +333,22 @@ public class Scene {
       signature = "(IIIILex;JI)V"
    )
    @Export("newFloorDecoration")
-   public void newFloorDecoration(int var1, int var2, int var3, int var4, Entity var5, long var6, int var8) {
-      if(var5 != null) {
+   public void newFloorDecoration(int plane, int x, int y, int tileHeight, Entity entity, long tag, int flags) {
+      if (entity != null) {
          FloorDecoration var9 = new FloorDecoration();
-         var9.entity = var5;
-         var9.x = var2 * 128 + 64;
-         var9.y = var3 * 128 + 64;
-         var9.tileHeight = var4;
-         var9.tag = var6;
-         var9.flags = var8;
-         if(this.tiles[var1][var2][var3] == null) {
-            this.tiles[var1][var2][var3] = new Tile(var1, var2, var3);
+         var9.entity = entity;
+         var9.x = x * 128 + 64;
+         var9.y = y * 128 + 64;
+         var9.tileHeight = tileHeight;
+         var9.tag = tag;
+         var9.flags = flags;
+         if (this.tiles[plane][x][y] == null) {
+            this.tiles[plane][x][y] = new Tile(plane, x, y);
          }
 
-         this.tiles[var1][var2][var3].floorDecoration = var9;
+         this.tiles[plane][x][y].floorDecoration = var9;
       }
+
    }
 
    @ObfuscatedName("l")
@@ -381,23 +356,23 @@ public class Scene {
       signature = "(IIIILex;JLex;Lex;)V"
    )
    @Export("newGroundItemPile")
-   public void newGroundItemPile(int var1, int var2, int var3, int var4, Entity var5, long var6, Entity var8, Entity var9) {
+   public void newGroundItemPile(int plane, int x, int y, int tileHeight, Entity first, long tag, Entity second, Entity third) {
       GroundItemPile var10 = new GroundItemPile();
-      var10.first = var5;
-      var10.x = var2 * 128 + 64;
-      var10.y = var3 * 128 + 64;
-      var10.tileHeight = var4;
-      var10.tag = var6;
-      var10.second = var8;
-      var10.third = var9;
+      var10.first = first;
+      var10.x = x * 128 + 64;
+      var10.y = y * 128 + 64;
+      var10.tileHeight = tileHeight;
+      var10.tag = tag;
+      var10.second = second;
+      var10.third = third;
       int var11 = 0;
-      Tile var12 = this.tiles[var1][var2][var3];
-      if(var12 != null) {
-         for(int var13 = 0; var13 < var12.gameObjectsCount; ++var13) {
-            if((var12.gameObjects[var13].flags & 256) == 256 && var12.gameObjects[var13].entity instanceof Model) {
+      Tile var12 = this.tiles[plane][x][y];
+      if (var12 != null) {
+         for (int var13 = 0; var13 < var12.gameObjectsCount; ++var13) {
+            if ((var12.gameObjects[var13].flags & 256) == 256 && var12.gameObjects[var13].entity instanceof Model) {
                Model var14 = (Model)var12.gameObjects[var13].entity;
                var14.calculateBoundsCylinder();
-               if(var14.height > var11) {
+               if (var14.height > var11) {
                   var11 = var14.height;
                }
             }
@@ -405,11 +380,11 @@ public class Scene {
       }
 
       var10.height = var11;
-      if(this.tiles[var1][var2][var3] == null) {
-         this.tiles[var1][var2][var3] = new Tile(var1, var2, var3);
+      if (this.tiles[plane][x][y] == null) {
+         this.tiles[plane][x][y] = new Tile(plane, x, y);
       }
 
-      this.tiles[var1][var2][var3].groundItemPile = var10;
+      this.tiles[plane][x][y].groundItemPile = var10;
    }
 
    @ObfuscatedName("e")
@@ -417,27 +392,28 @@ public class Scene {
       signature = "(IIIILex;Lex;IIJI)V"
    )
    @Export("newBoundaryObject")
-   public void newBoundaryObject(int var1, int var2, int var3, int var4, Entity var5, Entity var6, int var7, int var8, long var9, int var11) {
-      if(var5 != null || var6 != null) {
+   public void newBoundaryObject(int plane, int x, int y, int tileHeight, Entity entity1, Entity entity2, int orientationA, int orientationB, long tag, int flags) {
+      if (entity1 != null || entity2 != null) {
          BoundaryObject var12 = new BoundaryObject();
-         var12.tag = var9;
-         var12.flags = var11;
-         var12.x = var2 * 128 + 64;
-         var12.y = var3 * 128 + 64;
-         var12.tileHeight = var4;
-         var12.entity1 = var5;
-         var12.entity2 = var6;
-         var12.orientationA = var7;
-         var12.orientationB = var8;
+         var12.tag = tag;
+         var12.flags = flags;
+         var12.x = x * 128 + 64;
+         var12.y = y * 128 + 64;
+         var12.tileHeight = tileHeight;
+         var12.entity1 = entity1;
+         var12.entity2 = entity2;
+         var12.orientationA = orientationA;
+         var12.orientationB = orientationB;
 
-         for(int var13 = var1; var13 >= 0; --var13) {
-            if(this.tiles[var13][var2][var3] == null) {
-               this.tiles[var13][var2][var3] = new Tile(var13, var2, var3);
+         for (int var13 = plane; var13 >= 0; --var13) {
+            if (this.tiles[var13][x][y] == null) {
+               this.tiles[var13][x][y] = new Tile(var13, x, y);
             }
          }
 
-         this.tiles[var1][var2][var3].boundaryObject = var12;
+         this.tiles[plane][x][y].boundaryObject = var12;
       }
+
    }
 
    @ObfuscatedName("x")
@@ -445,37 +421,38 @@ public class Scene {
       signature = "(IIIILex;Lex;IIIIJI)V"
    )
    @Export("newWallDecoration")
-   public void newWallDecoration(int var1, int var2, int var3, int var4, Entity var5, Entity var6, int var7, int var8, int var9, int var10, long var11, int var13) {
-      if(var5 != null) {
+   public void newWallDecoration(int plane, int x, int y, int tileHeight, Entity entity1, Entity entity2, int orientation, int int7, int xOffset, int yOffset, long tag, int flags) {
+      if (entity1 != null) {
          WallDecoration var14 = new WallDecoration();
-         var14.tag = var11;
-         var14.flags = var13;
-         var14.x = var2 * 128 + 64;
-         var14.y = var3 * 128 + 64;
-         var14.tileHeight = var4;
-         var14.entity1 = var5;
-         var14.entity2 = var6;
-         var14.orientation = var7;
-         var14.orientation2 = var8;
-         var14.xOffset = var9;
-         var14.yOffset = var10;
+         var14.tag = tag;
+         var14.flags = flags;
+         var14.x = x * 128 + 64;
+         var14.y = y * 128 + 64;
+         var14.tileHeight = tileHeight;
+         var14.entity1 = entity1;
+         var14.entity2 = entity2;
+         var14.orientation = orientation;
+         var14.orientation2 = int7;
+         var14.xOffset = xOffset;
+         var14.yOffset = yOffset;
 
-         for(int var15 = var1; var15 >= 0; --var15) {
-            if(this.tiles[var15][var2][var3] == null) {
-               this.tiles[var15][var2][var3] = new Tile(var15, var2, var3);
+         for (int var15 = plane; var15 >= 0; --var15) {
+            if (this.tiles[var15][x][y] == null) {
+               this.tiles[var15][x][y] = new Tile(var15, x, y);
             }
          }
 
-         this.tiles[var1][var2][var3].wallDecoration = var14;
+         this.tiles[plane][x][y].wallDecoration = var14;
       }
+
    }
 
    @ObfuscatedName("d")
    @ObfuscatedSignature(
       signature = "(IIIIIILex;IJI)Z"
    )
-   public boolean __d_238(int var1, int var2, int var3, int var4, int var5, int var6, Entity var7, int var8, long var9, int var11) {
-      if(var7 == null) {
+   public boolean method284(int var1, int var2, int var3, int var4, int var5, int var6, Entity var7, int var8, long var9, int var11) {
+      if (var7 == null) {
          return true;
       } else {
          int var12 = var5 * 64 + var2 * 128;
@@ -488,28 +465,28 @@ public class Scene {
    @ObfuscatedSignature(
       signature = "(IIIIILex;IJZ)Z"
    )
-   public boolean __a_239(int var1, int var2, int var3, int var4, int var5, Entity var6, int var7, long var8, boolean var10) {
-      if(var6 == null) {
+   public boolean method285(int var1, int var2, int var3, int var4, int var5, Entity var6, int var7, long var8, boolean var10) {
+      if (var6 == null) {
          return true;
       } else {
          int var11 = var2 - var5;
          int var12 = var3 - var5;
          int var13 = var5 + var2;
          int var14 = var3 + var5;
-         if(var10) {
-            if(var7 > 640 && var7 < 1408) {
+         if (var10) {
+            if (var7 > 640 && var7 < 1408) {
                var14 += 128;
             }
 
-            if(var7 > 1152 && var7 < 1920) {
+            if (var7 > 1152 && var7 < 1920) {
                var13 += 128;
             }
 
-            if(var7 > 1664 || var7 < 384) {
+            if (var7 > 1664 || var7 < 384) {
                var12 -= 128;
             }
 
-            if(var7 > 128 && var7 < 896) {
+            if (var7 > 128 && var7 < 896) {
                var11 -= 128;
             }
          }
@@ -526,8 +503,8 @@ public class Scene {
    @ObfuscatedSignature(
       signature = "(IIIIILex;IJIIII)Z"
    )
-   public boolean __z_240(int var1, int var2, int var3, int var4, int var5, Entity 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);
+   public boolean method286(int var1, int var2, int var3, int var4, int var5, Entity 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);
    }
 
    @ObfuscatedName("j")
@@ -535,70 +512,70 @@ public class Scene {
       signature = "(IIIIIIIILex;IZJI)Z"
    )
    @Export("newGameObject")
-   boolean newGameObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, Entity var9, int var10, boolean var11, long var12, int var14) {
-      int var16;
-      for(int var15 = var2; var15 < var2 + var4; ++var15) {
-         for(var16 = var3; var16 < var3 + var5; ++var16) {
-            if(var15 < 0 || var16 < 0 || var15 >= this.xSize || var16 >= this.ySize) {
+   boolean newGameObject(int plane, int startX, int startY, int sizeX, int sizeY, int centerX, int centerY, int height, Entity entity, int orientation, boolean isTemp, long tag, int flags) {
+      int var15;
+      for (int var16 = startX; var16 < startX + sizeX; ++var16) {
+         for (var15 = startY; var15 < startY + sizeY; ++var15) {
+            if (var16 < 0 || var15 < 0 || var16 >= this.xSize || var15 >= this.ySize) {
                return false;
             }
 
-            Tile var17 = this.tiles[var1][var15][var16];
-            if(var17 != null && var17.gameObjectsCount >= 5) {
+            Tile var17 = this.tiles[plane][var16][var15];
+            if (var17 != null && var17.gameObjectsCount >= 5) {
                return false;
             }
          }
       }
 
-      GameObject var21 = new GameObject();
-      var21.tag = var12;
-      var21.flags = var14;
-      var21.plane = var1;
-      var21.centerX = var6;
-      var21.centerY = var7;
-      var21.height = var8;
-      var21.entity = var9;
-      var21.orientation = var10;
-      var21.startX = var2;
-      var21.startY = var3;
-      var21.endX = var2 + var4 - 1;
-      var21.endY = var3 + var5 - 1;
+      GameObject var20 = new GameObject();
+      var20.tag = tag;
+      var20.flags = flags;
+      var20.plane = plane;
+      var20.centerX = centerX;
+      var20.centerY = centerY;
+      var20.height = height;
+      var20.entity = entity;
+      var20.orientation = orientation;
+      var20.startX = startX;
+      var20.startY = startY;
+      var20.endX = startX + sizeX - 1;
+      var20.endY = startY + sizeY - 1;
 
-      for(var16 = var2; var16 < var2 + var4; ++var16) {
-         for(int var22 = var3; var22 < var3 + var5; ++var22) {
+      for (var15 = startX; var15 < startX + sizeX; ++var15) {
+         for (int var21 = startY; var21 < startY + sizeY; ++var21) {
             int var18 = 0;
-            if(var16 > var2) {
+            if (var15 > startX) {
                ++var18;
             }
 
-            if(var16 < var2 + var4 - 1) {
+            if (var15 < startX + sizeX - 1) {
                var18 += 4;
             }
 
-            if(var22 > var3) {
+            if (var21 > startY) {
                var18 += 8;
             }
 
-            if(var22 < var3 + var5 - 1) {
+            if (var21 < startY + sizeY - 1) {
                var18 += 2;
             }
 
-            for(int var19 = var1; var19 >= 0; --var19) {
-               if(this.tiles[var19][var16][var22] == null) {
-                  this.tiles[var19][var16][var22] = new Tile(var19, var16, var22);
+            for (int var19 = plane; var19 >= 0; --var19) {
+               if (this.tiles[var19][var15][var21] == null) {
+                  this.tiles[var19][var15][var21] = new Tile(var19, var15, var21);
                }
             }
 
-            Tile var23 = this.tiles[var1][var16][var22];
-            var23.gameObjects[var23.gameObjectsCount] = var21;
-            var23.gameObjectEdgeMasks[var23.gameObjectsCount] = var18;
-            var23.gameObjectsEdgeMask |= var18;
-            ++var23.gameObjectsCount;
+            Tile var22 = this.tiles[plane][var15][var21];
+            var22.gameObjects[var22.gameObjectsCount] = var20;
+            var22.gameObjectEdgeMasks[var22.gameObjectsCount] = var18;
+            var22.gameObjectsEdgeMask |= var18;
+            ++var22.gameObjectsCount;
          }
       }
 
-      if(var11) {
-         this.tempGameObjects[this.tempGameObjectsCount++] = var21;
+      if (isTemp) {
+         this.tempGameObjects[this.tempGameObjectsCount++] = var20;
       }
 
       return true;
@@ -607,7 +584,7 @@ public class Scene {
    @ObfuscatedName("s")
    @Export("clearTempGameObjects")
    public void clearTempGameObjects() {
-      for(int var1 = 0; var1 < this.tempGameObjectsCount; ++var1) {
+      for (int var1 = 0; var1 < this.tempGameObjectsCount; ++var1) {
          GameObject var2 = this.tempGameObjects[var1];
          this.removeGameObject(var2);
          this.tempGameObjects[var1] = null;
@@ -621,17 +598,17 @@ public class Scene {
       signature = "(Leh;)V"
    )
    @Export("removeGameObject")
-   void removeGameObject(GameObject var1) {
-      for(int var2 = var1.startX; var2 <= var1.endX; ++var2) {
-         for(int var3 = var1.startY; var3 <= var1.endY; ++var3) {
-            Tile var4 = this.tiles[var1.plane][var2][var3];
-            if(var4 != null) {
+   void removeGameObject(GameObject gameObject) {
+      for (int var2 = gameObject.startX; var2 <= gameObject.endX; ++var2) {
+         for (int var3 = gameObject.startY; var3 <= gameObject.endY; ++var3) {
+            Tile var4 = this.tiles[gameObject.plane][var2][var3];
+            if (var4 != null) {
                int var5;
-               for(var5 = 0; var5 < var4.gameObjectsCount; ++var5) {
-                  if(var4.gameObjects[var5] == var1) {
+               for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) {
+                  if (var4.gameObjects[var5] == gameObject) {
                      --var4.gameObjectsCount;
 
-                     for(int var6 = var5; var6 < var4.gameObjectsCount; ++var6) {
+                     for (int var6 = var5; var6 < var4.gameObjectsCount; ++var6) {
                         var4.gameObjects[var6] = var4.gameObjects[var6 + 1];
                         var4.gameObjectEdgeMasks[var6] = var4.gameObjectEdgeMasks[var6 + 1];
                      }
@@ -643,7 +620,7 @@ public class Scene {
 
                var4.gameObjectsEdgeMask = 0;
 
-               for(var5 = 0; var5 < var4.gameObjectsCount; ++var5) {
+               for (var5 = 0; var5 < var4.gameObjectsCount; ++var5) {
                   var4.gameObjectsEdgeMask |= var4.gameObjectEdgeMasks[var5];
                }
             }
@@ -653,69 +630,74 @@ public class Scene {
    }
 
    @ObfuscatedName("y")
-   public void __y_241(int var1, int var2, int var3, int var4) {
+   public void method287(int var1, int var2, int var3, int var4) {
       Tile var5 = this.tiles[var1][var2][var3];
-      if(var5 != null) {
+      if (var5 != null) {
          WallDecoration var6 = var5.wallDecoration;
-         if(var6 != null) {
+         if (var6 != null) {
             var6.xOffset = var4 * var6.xOffset / 16;
             var6.yOffset = var4 * var6.yOffset / 16;
          }
       }
+
    }
 
    @ObfuscatedName("h")
    @Export("removeBoundaryObject")
-   public void removeBoundaryObject(int var1, int var2, int var3) {
-      Tile var4 = this.tiles[var1][var2][var3];
-      if(var4 != null) {
+   public void removeBoundaryObject(int plane, int x, int y) {
+      Tile var4 = this.tiles[plane][x][y];
+      if (var4 != null) {
          var4.boundaryObject = null;
       }
+
    }
 
    @ObfuscatedName("b")
    @Export("removeWallDecoration")
-   public void removeWallDecoration(int var1, int var2, int var3) {
-      Tile var4 = this.tiles[var1][var2][var3];
-      if(var4 != null) {
+   public void removeWallDecoration(int plane, int x, int y) {
+      Tile var4 = this.tiles[plane][x][y];
+      if (var4 != null) {
          var4.wallDecoration = null;
       }
+
    }
 
    @ObfuscatedName("c")
-   public void __c_242(int var1, int var2, int var3) {
+   public void method288(int var1, int var2, int var3) {
       Tile var4 = this.tiles[var1][var2][var3];
-      if(var4 != null) {
-         for(int var5 = 0; var5 < var4.gameObjectsCount; ++var5) {
+      if (var4 != null) {
+         for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) {
             GameObject var6 = var4.gameObjects[var5];
-            long var8 = var6.tag;
-            int var10 = (int)(var8 >>> 14 & 3L);
-            boolean var7 = var10 == 2;
-            if(var7 && var2 == var6.startX && var3 == var6.startY) {
+            long var7 = var6.tag;
+            int var9 = (int)(var7 >>> 14 & 3L);
+            boolean var10 = var9 == 2;
+            if (var10 && var2 == var6.startX && var3 == var6.startY) {
                this.removeGameObject(var6);
                return;
             }
          }
-
       }
+
    }
 
    @ObfuscatedName("p")
    @Export("removeFloorDecoration")
-   public void removeFloorDecoration(int var1, int var2, int var3) {
-      Tile var4 = this.tiles[var1][var2][var3];
-      if(var4 != null) {
+   public void removeFloorDecoration(int plane, int x, int y) {
+      Tile var4 = this.tiles[plane][x][y];
+      if (var4 != null) {
          var4.floorDecoration = null;
       }
+
    }
 
    @ObfuscatedName("v")
    @Export("removeGroundItemPile")
-   public void removeGroundItemPile(int var1, int var2, int var3) {
-      Tile var4 = this.tiles[var1][var2][var3];
-      if(var4 != null) {
+   public void removeGroundItemPile(int plane, int x, int y) {
+      Tile var4 = this.tiles[plane][x][y];
+      if (var4 != null) {
          var4.groundItemPile = null;
       }
+
    }
 
    @ObfuscatedName("ag")
@@ -723,9 +705,9 @@ public class Scene {
       signature = "(III)Lej;"
    )
    @Export("getBoundaryObject")
-   public BoundaryObject getBoundaryObject(int var1, int var2, int var3) {
-      Tile var4 = this.tiles[var1][var2][var3];
-      return var4 == null?null:var4.boundaryObject;
+   public BoundaryObject getBoundaryObject(int plane, int x, int y) {
+      Tile var4 = this.tiles[plane][x][y];
+      return var4 == null ? null : var4.boundaryObject;
    }
 
    @ObfuscatedName("aq")
@@ -733,26 +715,26 @@ public class Scene {
       signature = "(III)Leq;"
    )
    @Export("getWallDecoration")
-   public WallDecoration getWallDecoration(int var1, int var2, int var3) {
-      Tile var4 = this.tiles[var1][var2][var3];
-      return var4 == null?null:var4.wallDecoration;
+   public WallDecoration getWallDecoration(int plane, int x, int y) {
+      Tile var4 = this.tiles[plane][x][y];
+      return var4 == null ? null : var4.wallDecoration;
    }
 
    @ObfuscatedName("aj")
    @ObfuscatedSignature(
       signature = "(III)Leh;"
    )
-   public GameObject __aj_243(int var1, int var2, int var3) {
+   public GameObject method289(int var1, int var2, int var3) {
       Tile var4 = this.tiles[var1][var2][var3];
-      if(var4 == null) {
+      if (var4 == null) {
          return null;
       } else {
-         for(int var5 = 0; var5 < var4.gameObjectsCount; ++var5) {
+         for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) {
             GameObject var6 = var4.gameObjects[var5];
-            long var8 = var6.tag;
-            int var10 = (int)(var8 >>> 14 & 3L);
-            boolean var7 = var10 == 2;
-            if(var7 && var2 == var6.startX && var3 == var6.startY) {
+            long var7 = var6.tag;
+            int var9 = (int)(var7 >>> 14 & 3L);
+            boolean var10 = var9 == 2;
+            if (var10 && var2 == var6.startX && var3 == var6.startY) {
                return var6;
             }
          }
@@ -766,35 +748,38 @@ public class Scene {
       signature = "(III)Ldo;"
    )
    @Export("getFloorDecoration")
-   public FloorDecoration getFloorDecoration(int var1, int var2, int var3) {
-      Tile var4 = this.tiles[var1][var2][var3];
-      return var4 != null && var4.floorDecoration != null?var4.floorDecoration:null;
+   public FloorDecoration getFloorDecoration(int plane, int x, int y) {
+      Tile var4 = this.tiles[plane][x][y];
+      return var4 != null && var4.floorDecoration != null ? var4.floorDecoration : null;
    }
 
    @ObfuscatedName("ar")
-   public long __ar_244(int var1, int var2, int var3) {
-      Tile var4 = this.tiles[var1][var2][var3];
-      return var4 != null && var4.boundaryObject != null?var4.boundaryObject.tag:0L;
+   @Export("getBoundaryObjectTag")
+   public long getBoundaryObjectTag(int plane, int x, int y) {
+      Tile var4 = this.tiles[plane][x][y];
+      return var4 != null && var4.boundaryObject != null ? var4.boundaryObject.tag : 0L;
    }
 
    @ObfuscatedName("ac")
-   public long __ac_245(int var1, int var2, int var3) {
-      Tile var4 = this.tiles[var1][var2][var3];
-      return var4 != null && var4.wallDecoration != null?var4.wallDecoration.tag:0L;
+   @Export("getWallDecorationTag")
+   public long getWallDecorationTag(int plane, int x, int y) {
+      Tile var4 = this.tiles[plane][x][y];
+      return var4 != null && var4.wallDecoration != null ? var4.wallDecoration.tag : 0L;
    }
 
    @ObfuscatedName("ay")
-   public long __ay_246(int var1, int var2, int var3) {
-      Tile var4 = this.tiles[var1][var2][var3];
-      if(var4 == null) {
+   @Export("getGameObjectTag")
+   public long getGameObjectTag(int plane, int x, int y) {
+      Tile var4 = this.tiles[plane][x][y];
+      if (var4 == null) {
          return 0L;
       } else {
-         for(int var5 = 0; var5 < var4.gameObjectsCount; ++var5) {
+         for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) {
             GameObject var6 = var4.gameObjects[var5];
-            long var8 = var6.tag;
-            int var10 = (int)(var8 >>> 14 & 3L);
-            boolean var7 = var10 == 2;
-            if(var7 && var2 == var6.startX && var3 == var6.startY) {
+            long var7 = var6.tag;
+            int var9 = (int)(var7 >>> 14 & 3L);
+            boolean var10 = var9 == 2;
+            if (var10 && x == var6.startX && y == var6.startY) {
                return var6.tag;
             }
          }
@@ -805,26 +790,26 @@ public class Scene {
 
    @ObfuscatedName("ah")
    @Export("getFloorDecorationTag")
-   public long getFloorDecorationTag(int var1, int var2, int var3) {
-      Tile var4 = this.tiles[var1][var2][var3];
-      return var4 != null && var4.floorDecoration != null?var4.floorDecoration.tag:0L;
+   public long getFloorDecorationTag(int plane, int x, int y) {
+      Tile var4 = this.tiles[plane][x][y];
+      return var4 != null && var4.floorDecoration != null ? var4.floorDecoration.tag : 0L;
    }
 
    @ObfuscatedName("ak")
    @Export("getObjectFlags")
-   public int getObjectFlags(int var1, int var2, int var3, long var4) {
-      Tile var6 = this.tiles[var1][var2][var3];
-      if(var6 == null) {
+   public int getObjectFlags(int plane, int x, int y, long tag) {
+      Tile var6 = this.tiles[plane][x][y];
+      if (var6 == null) {
          return -1;
-      } else if(var6.boundaryObject != null && var6.boundaryObject.tag == var4) {
+      } else if (var6.boundaryObject != null && var6.boundaryObject.tag == tag) {
          return var6.boundaryObject.flags & 255;
-      } else if(var6.wallDecoration != null && var6.wallDecoration.tag == var4) {
+      } else if (var6.wallDecoration != null && var6.wallDecoration.tag == tag) {
          return var6.wallDecoration.flags & 255;
-      } else if(var6.floorDecoration != null && var6.floorDecoration.tag == var4) {
+      } else if (var6.floorDecoration != null && var6.floorDecoration.tag == tag) {
          return var6.floorDecoration.flags & 255;
       } else {
-         for(int var7 = 0; var7 < var6.gameObjectsCount; ++var7) {
-            if(var6.gameObjects[var7].tag == var4) {
+         for (int var7 = 0; var7 < var6.gameObjectsCount; ++var7) {
+            if (var6.gameObjects[var7].tag == tag) {
                return var6.gameObjects[var7].flags & 255;
             }
          }
@@ -834,41 +819,41 @@ public class Scene {
    }
 
    @ObfuscatedName("aw")
-   public void __aw_247(int var1, int var2, int var3) {
-      for(int var4 = 0; var4 < this.planes; ++var4) {
-         for(int var5 = 0; var5 < this.xSize; ++var5) {
-            for(int var6 = 0; var6 < this.ySize; ++var6) {
+   public void method293(int var1, int var2, int var3) {
+      for (int var4 = 0; var4 < this.planes; ++var4) {
+         for (int var5 = 0; var5 < this.xSize; ++var5) {
+            for (int var6 = 0; var6 < this.ySize; ++var6) {
                Tile var7 = this.tiles[var4][var5][var6];
-               if(var7 != null) {
+               if (var7 != null) {
                   BoundaryObject var8 = var7.boundaryObject;
-                  ModelData var10;
-                  if(var8 != null && var8.entity1 instanceof ModelData) {
-                     ModelData var9 = (ModelData)var8.entity1;
-                     this.__ab_249(var9, var4, var5, var6, 1, 1);
-                     if(var8.entity2 instanceof ModelData) {
-                        var10 = (ModelData)var8.entity2;
-                        this.__ab_249(var10, var4, var5, var6, 1, 1);
-                        ModelData.method2800(var9, var10, 0, 0, 0, false);
-                        var8.entity2 = var10.toModel(var10.__aq, var10.__aj, var1, var2, var3);
+                  ModelData var9;
+                  if (var8 != null && var8.entity1 instanceof ModelData) {
+                     ModelData var10 = (ModelData)var8.entity1;
+                     this.method295(var10, var4, var5, var6, 1, 1);
+                     if (var8.entity2 instanceof ModelData) {
+                        var9 = (ModelData)var8.entity2;
+                        this.method295(var9, var4, var5, var6, 1, 1);
+                        ModelData.method2800(var10, var9, 0, 0, 0, false);
+                        var8.entity2 = var9.toModel(var9.field559, var9.field560, var1, var2, var3);
                      }
 
-                     var8.entity1 = var9.toModel(var9.__aq, var9.__aj, var1, var2, var3);
+                     var8.entity1 = var10.toModel(var10.field559, var10.field560, var1, var2, var3);
                   }
 
-                  for(int var12 = 0; var12 < var7.gameObjectsCount; ++var12) {
-                     GameObject var14 = var7.gameObjects[var12];
-                     if(var14 != null && var14.entity instanceof ModelData) {
-                        ModelData var11 = (ModelData)var14.entity;
-                        this.__ab_249(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1);
-                        var14.entity = var11.toModel(var11.__aq, var11.__aj, var1, var2, var3);
+                  for (int var13 = 0; var13 < var7.gameObjectsCount; ++var13) {
+                     GameObject var11 = var7.gameObjects[var13];
+                     if (var11 != null && var11.entity instanceof ModelData) {
+                        ModelData var12 = (ModelData)var11.entity;
+                        this.method295(var12, var4, var5, var6, var11.endX - var11.startX + 1, var11.endY - var11.startY + 1);
+                        var11.entity = var12.toModel(var12.field559, var12.field560, var1, var2, var3);
                      }
                   }
 
-                  FloorDecoration var13 = var7.floorDecoration;
-                  if(var13 != null && var13.entity instanceof ModelData) {
-                     var10 = (ModelData)var13.entity;
-                     this.__al_248(var10, var4, var5, var6);
-                     var13.entity = var10.toModel(var10.__aq, var10.__aj, var1, var2, var3);
+                  FloorDecoration var14 = var7.floorDecoration;
+                  if (var14 != null && var14.entity instanceof ModelData) {
+                     var9 = (ModelData)var14.entity;
+                     this.method294(var9, var4, var5, var6);
+                     var14.entity = var9.toModel(var9.field559, var9.field560, var1, var2, var3);
                   }
                }
             }
@@ -881,36 +866,36 @@ public class Scene {
    @ObfuscatedSignature(
       signature = "(Ldw;III)V"
    )
-   void __al_248(ModelData var1, int var2, int var3, int var4) {
+   void method294(ModelData var1, int var2, int var3, int var4) {
       Tile var5;
       ModelData var6;
-      if(var3 < this.xSize) {
+      if (var3 < this.xSize) {
          var5 = this.tiles[var2][var3 + 1][var4];
-         if(var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) {
+         if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) {
             var6 = (ModelData)var5.floorDecoration.entity;
             ModelData.method2800(var1, var6, 128, 0, 0, true);
          }
       }
 
-      if(var4 < this.xSize) {
+      if (var4 < this.xSize) {
          var5 = this.tiles[var2][var3][var4 + 1];
-         if(var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) {
+         if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) {
             var6 = (ModelData)var5.floorDecoration.entity;
             ModelData.method2800(var1, var6, 0, 0, 128, true);
          }
       }
 
-      if(var3 < this.xSize && var4 < this.ySize) {
+      if (var3 < this.xSize && var4 < this.ySize) {
          var5 = this.tiles[var2][var3 + 1][var4 + 1];
-         if(var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) {
+         if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) {
             var6 = (ModelData)var5.floorDecoration.entity;
             ModelData.method2800(var1, var6, 128, 0, 128, true);
          }
       }
 
-      if(var3 < this.xSize && var4 > 0) {
+      if (var3 < this.xSize && var4 > 0) {
          var5 = this.tiles[var2][var3 + 1][var4 - 1];
-         if(var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) {
+         if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) {
             var6 = (ModelData)var5.floorDecoration.entity;
             ModelData.method2800(var1, var6, 128, 0, -128, true);
          }
@@ -922,39 +907,39 @@ public class Scene {
    @ObfuscatedSignature(
       signature = "(Ldw;IIIII)V"
    )
-   void __ab_249(ModelData var1, int var2, int var3, int var4, int var5, int var6) {
+   void method295(ModelData var1, int var2, int var3, int var4, int var5, int var6) {
       boolean var7 = true;
       int var8 = var3;
       int var9 = var3 + var5;
       int var10 = var4 - 1;
       int var11 = var4 + var6;
 
-      for(int var12 = var2; var12 <= var2 + 1; ++var12) {
-         if(var12 != this.planes) {
-            for(int var13 = var8; var13 <= var9; ++var13) {
-               if(var13 >= 0 && var13 < this.xSize) {
-                  for(int var14 = var10; var14 <= var11; ++var14) {
-                     if(var14 >= 0 && var14 < this.ySize && (!var7 || var13 >= var9 || var14 >= var11 || var14 < var4 && var3 != var13)) {
+      for (int var12 = var2; var12 <= var2 + 1; ++var12) {
+         if (var12 != this.planes) {
+            for (int var13 = var8; var13 <= var9; ++var13) {
+               if (var13 >= 0 && var13 < this.xSize) {
+                  for (int var14 = var10; var14 <= var11; ++var14) {
+                     if (var14 >= 0 && var14 < this.ySize && (!var7 || var13 >= var9 || var14 >= var11 || var14 < var4 && var3 != var13)) {
                         Tile var15 = this.tiles[var12][var13][var14];
-                        if(var15 != null) {
+                        if (var15 != null) {
                            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;
                            BoundaryObject var17 = var15.boundaryObject;
-                           if(var17 != null) {
+                           if (var17 != null) {
                               ModelData var18;
-                              if(var17.entity1 instanceof ModelData) {
+                              if (var17.entity1 instanceof ModelData) {
                                  var18 = (ModelData)var17.entity1;
                                  ModelData.method2800(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7);
                               }
 
-                              if(var17.entity2 instanceof ModelData) {
+                              if (var17.entity2 instanceof ModelData) {
                                  var18 = (ModelData)var17.entity2;
                                  ModelData.method2800(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7);
                               }
                            }
 
-                           for(int var23 = 0; var23 < var15.gameObjectsCount; ++var23) {
+                           for (int var23 = 0; var23 < var15.gameObjectsCount; ++var23) {
                               GameObject var19 = var15.gameObjects[var23];
-                              if(var19 != null && var19.entity instanceof ModelData) {
+                              if (var19 != null && var19.entity instanceof ModelData) {
                                  ModelData var20 = (ModelData)var19.entity;
                                  int var21 = var19.endX - var19.startX + 1;
                                  int var22 = var19.endY - var19.startY + 1;
@@ -976,138 +961,138 @@ public class Scene {
 
    @ObfuscatedName("ae")
    @Export("drawTileMinimap")
-   public void drawTileMinimap(int[] var1, int var2, int var3, int var4, int var5, int var6) {
-      Tile var7 = this.tiles[var4][var5][var6];
-      if(var7 != null) {
+   public void drawTileMinimap(int[] pixels, int index, int width, int plane, int x, int y) {
+      Tile var7 = this.tiles[plane][x][y];
+      if (var7 != null) {
          TilePaint var8 = var7.paint;
-         int var10;
-         if(var8 != null) {
-            int var9 = var8.rgb;
-            if(var9 != 0) {
-               for(var10 = 0; var10 < 4; ++var10) {
-                  var1[var2] = var9;
-                  var1[var2 + 1] = var9;
-                  var1[var2 + 2] = var9;
-                  var1[var2 + 3] = var9;
-                  var2 += var3;
+         int var9;
+         if (var8 != null) {
+            int var10 = var8.rgb;
+            if (var10 != 0) {
+               for (var9 = 0; var9 < 4; ++var9) {
+                  pixels[index] = var10;
+                  pixels[index + 1] = var10;
+                  pixels[index + 2] = var10;
+                  pixels[index + 3] = var10;
+                  index += width;
                }
-
             }
          } else {
             TileModel var18 = var7.model;
-            if(var18 != null) {
-               var10 = var18.shape;
+            if (var18 != null) {
+               var9 = var18.shape;
                int var11 = var18.rotation;
                int var12 = var18.underlayRgb;
                int var13 = var18.overlayRgb;
-               int[] var14 = this.__bk[var10];
-               int[] var15 = this.__bd[var11];
+               int[] var14 = this.field770[var9];
+               int[] var15 = this.field771[var11];
                int var16 = 0;
                int var17;
-               if(var12 != 0) {
-                  for(var17 = 0; var17 < 4; ++var17) {
-                     var1[var2] = var14[var15[var16++]] == 0?var12:var13;
-                     var1[var2 + 1] = var14[var15[var16++]] == 0?var12:var13;
-                     var1[var2 + 2] = var14[var15[var16++]] == 0?var12:var13;
-                     var1[var2 + 3] = var14[var15[var16++]] == 0?var12:var13;
-                     var2 += var3;
+               if (var12 != 0) {
+                  for (var17 = 0; var17 < 4; ++var17) {
+                     pixels[index] = var14[var15[var16++]] == 0 ? var12 : var13;
+                     pixels[index + 1] = var14[var15[var16++]] == 0 ? var12 : var13;
+                     pixels[index + 2] = var14[var15[var16++]] == 0 ? var12 : var13;
+                     pixels[index + 3] = var14[var15[var16++]] == 0 ? var12 : var13;
+                     index += width;
                   }
                } else {
-                  for(var17 = 0; var17 < 4; ++var17) {
-                     if(var14[var15[var16++]] != 0) {
-                        var1[var2] = var13;
+                  for (var17 = 0; var17 < 4; ++var17) {
+                     if (var14[var15[var16++]] != 0) {
+                        pixels[index] = var13;
                      }
 
-                     if(var14[var15[var16++]] != 0) {
-                        var1[var2 + 1] = var13;
+                     if (var14[var15[var16++]] != 0) {
+                        pixels[index + 1] = var13;
                      }
 
-                     if(var14[var15[var16++]] != 0) {
-                        var1[var2 + 2] = var13;
+                     if (var14[var15[var16++]] != 0) {
+                        pixels[index + 2] = var13;
                      }
 
-                     if(var14[var15[var16++]] != 0) {
-                        var1[var2 + 3] = var13;
+                     if (var14[var15[var16++]] != 0) {
+                        pixels[index + 3] = var13;
                      }
 
-                     var2 += var3;
+                     index += width;
                   }
                }
-
             }
          }
       }
+
    }
 
    @ObfuscatedName("ap")
    @Export("menuOpen")
-   public void menuOpen(int var1, int var2, int var3, boolean var4) {
-      if(!method3187() || var4) {
+   public void menuOpen(int plane, int screenX, int screenY, boolean var4) {
+      if (!method3187() || var4) {
          checkClick = true;
          viewportWalking = var4;
-         Scene_selectedPlane = var1;
-         Scene_selectedScreenX = var2;
-         Scene_selectedScreenY = var3;
+         Scene_selectedPlane = plane;
+         Scene_selectedScreenX = screenX;
+         Scene_selectedScreenY = screenY;
          Scene_selectedX = -1;
          Scene_selectedY = -1;
       }
+
    }
 
    @ObfuscatedName("as")
-   public void __as_250() {
+   public void method296() {
       viewportWalking = true;
    }
 
    @ObfuscatedName("az")
    @Export("draw")
-   public void draw(int var1, int var2, int var3, int var4, int var5, int var6) {
-      if(var1 < 0) {
-         var1 = 0;
-      } else if(var1 >= this.xSize * 128) {
-         var1 = this.xSize * 128 - 1;
+   public void draw(int x, int y, int var3, int pitch, int yaw, int plane) {
+      if (x < 0) {
+         x = 0;
+      } else if (x >= this.xSize * 128) {
+         x = this.xSize * 128 - 1;
       }
 
-      if(var3 < 0) {
+      if (var3 < 0) {
          var3 = 0;
-      } else if(var3 >= this.ySize * 128) {
+      } else if (var3 >= this.ySize * 128) {
          var3 = this.ySize * 128 - 1;
       }
 
-      if(var4 < 128) {
-         var4 = 128;
-      } else if(var4 > 383) {
-         var4 = 383;
+      if (pitch < 128) {
+         pitch = 128;
+      } else if (pitch > 383) {
+         pitch = 383;
       }
 
       ++Scene_drawnCount;
-      Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var4];
-      Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var4];
-      Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var5];
-      Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[var5];
-      visibleTiles = visibilityMap[(var4 - 128) / 32][var5 / 64];
-      Scene_cameraX = var1;
-      Scene_cameraY = var2;
+      Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[pitch];
+      Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[pitch];
+      Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[yaw];
+      Scene_cameraYawCosine = Rasterizer3D.Rasterizer3D_cosine[yaw];
+      visibleTiles = visibilityMap[(pitch - 128) / 32][yaw / 64];
+      Scene_cameraX = x;
+      Scene_cameraY = y;
       Scene_cameraZ = var3;
-      Scene_cameraXTile = var1 / 128;
+      Scene_cameraXTile = x / 128;
       Scene_cameraYTile = var3 / 128;
-      Scene_plane = var6;
+      Scene_plane = plane;
       Scene_cameraXTileMin = Scene_cameraXTile - 25;
-      if(Scene_cameraXTileMin < 0) {
+      if (Scene_cameraXTileMin < 0) {
          Scene_cameraXTileMin = 0;
       }
 
       Scene_cameraYTileMin = Scene_cameraYTile - 25;
-      if(Scene_cameraYTileMin < 0) {
+      if (Scene_cameraYTileMin < 0) {
          Scene_cameraYTileMin = 0;
       }
 
       Scene_cameraXTileMax = Scene_cameraXTile + 25;
-      if(Scene_cameraXTileMax > this.xSize) {
+      if (Scene_cameraXTileMax > this.xSize) {
          Scene_cameraXTileMax = this.xSize;
       }
 
       Scene_cameraYTileMax = Scene_cameraYTile + 25;
-      if(Scene_cameraYTileMax > this.ySize) {
+      if (Scene_cameraYTileMax > this.ySize) {
          Scene_cameraYTileMax = this.ySize;
       }
 
@@ -1118,21 +1103,21 @@ public class Scene {
       Tile[][] var8;
       int var9;
       int var10;
-      for(var7 = this.Scene_minPlane; var7 < this.planes; ++var7) {
+      for (var7 = this.minPlane; var7 < this.planes; ++var7) {
          var8 = this.tiles[var7];
 
-         for(var9 = Scene_cameraXTileMin; var9 < Scene_cameraXTileMax; ++var9) {
-            for(var10 = Scene_cameraYTileMin; var10 < Scene_cameraYTileMax; ++var10) {
+         for (var9 = Scene_cameraXTileMin; var9 < Scene_cameraXTileMax; ++var9) {
+            for (var10 = Scene_cameraYTileMin; var10 < Scene_cameraYTileMax; ++var10) {
                Tile var11 = var8[var9][var10];
-               if(var11 != null) {
-                  if(var11.minPlane > var6 || !visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] && this.tileHeights[var7][var9][var10] - var2 < 2000) {
+               if (var11 != null) {
+                  if (var11.minPlane > plane || !visibleTiles[var9 - Scene_cameraXTile + 25][var10 - Scene_cameraYTile + 25] && this.tileHeights[var7][var9][var10] - y < 2000) {
                      var11.drawPrimary = false;
                      var11.drawSecondary = false;
                      var11.drawGameObjectEdges = 0;
                   } else {
                      var11.drawPrimary = true;
                      var11.drawSecondary = true;
-                     if(var11.gameObjectsCount > 0) {
+                     if (var11.gameObjectsCount > 0) {
                         var11.drawGameObjects = true;
                      } else {
                         var11.drawGameObjects = false;
@@ -1146,53 +1131,53 @@ public class Scene {
       }
 
       int var12;
-      int var13;
+      Tile var13;
       int var14;
-      Tile var15;
+      int var15;
       int var16;
-      for(var7 = this.Scene_minPlane; var7 < this.planes; ++var7) {
+      for (var7 = this.minPlane; var7 < this.planes; ++var7) {
          var8 = this.tiles[var7];
 
-         for(var9 = -25; var9 <= 0; ++var9) {
+         for (var9 = -25; var9 <= 0; ++var9) {
             var10 = var9 + Scene_cameraXTile;
-            var16 = Scene_cameraXTile - var9;
-            if(var10 >= Scene_cameraXTileMin || var16 < Scene_cameraXTileMax) {
-               for(var12 = -25; var12 <= 0; ++var12) {
-                  var13 = var12 + Scene_cameraYTile;
-                  var14 = Scene_cameraYTile - var12;
-                  if(var10 >= Scene_cameraXTileMin) {
-                     if(var13 >= Scene_cameraYTileMin) {
-                        var15 = var8[var10][var13];
-                        if(var15 != null && var15.drawPrimary) {
-                           this.drawTile(var15, true);
+            var14 = Scene_cameraXTile - var9;
+            if (var10 >= Scene_cameraXTileMin || var14 < Scene_cameraXTileMax) {
+               for (var15 = -25; var15 <= 0; ++var15) {
+                  var16 = var15 + Scene_cameraYTile;
+                  var12 = Scene_cameraYTile - var15;
+                  if (var10 >= Scene_cameraXTileMin) {
+                     if (var16 >= Scene_cameraYTileMin) {
+                        var13 = var8[var10][var16];
+                        if (var13 != null && var13.drawPrimary) {
+                           this.drawTile(var13, true);
                         }
                      }
 
-                     if(var14 < Scene_cameraYTileMax) {
-                        var15 = var8[var10][var14];
-                        if(var15 != null && var15.drawPrimary) {
-                           this.drawTile(var15, true);
+                     if (var12 < Scene_cameraYTileMax) {
+                        var13 = var8[var10][var12];
+                        if (var13 != null && var13.drawPrimary) {
+                           this.drawTile(var13, true);
                         }
                      }
                   }
 
-                  if(var16 < Scene_cameraXTileMax) {
-                     if(var13 >= Scene_cameraYTileMin) {
-                        var15 = var8[var16][var13];
-                        if(var15 != null && var15.drawPrimary) {
-                           this.drawTile(var15, true);
+                  if (var14 < Scene_cameraXTileMax) {
+                     if (var16 >= Scene_cameraYTileMin) {
+                        var13 = var8[var14][var16];
+                        if (var13 != null && var13.drawPrimary) {
+                           this.drawTile(var13, true);
                         }
                      }
 
-                     if(var14 < Scene_cameraYTileMax) {
-                        var15 = var8[var16][var14];
-                        if(var15 != null && var15.drawPrimary) {
-                           this.drawTile(var15, true);
+                     if (var12 < Scene_cameraYTileMax) {
+                        var13 = var8[var14][var12];
+                        if (var13 != null && var13.drawPrimary) {
+                           this.drawTile(var13, true);
                         }
                      }
                   }
 
-                  if(tileUpdateCount == 0) {
+                  if (tileUpdateCount == 0) {
                      checkClick = false;
                      return;
                   }
@@ -1201,49 +1186,49 @@ public class Scene {
          }
       }
 
-      for(var7 = this.Scene_minPlane; var7 < this.planes; ++var7) {
+      for (var7 = this.minPlane; var7 < this.planes; ++var7) {
          var8 = this.tiles[var7];
 
-         for(var9 = -25; var9 <= 0; ++var9) {
+         for (var9 = -25; var9 <= 0; ++var9) {
             var10 = var9 + Scene_cameraXTile;
-            var16 = Scene_cameraXTile - var9;
-            if(var10 >= Scene_cameraXTileMin || var16 < Scene_cameraXTileMax) {
-               for(var12 = -25; var12 <= 0; ++var12) {
-                  var13 = var12 + Scene_cameraYTile;
-                  var14 = Scene_cameraYTile - var12;
-                  if(var10 >= Scene_cameraXTileMin) {
-                     if(var13 >= Scene_cameraYTileMin) {
-                        var15 = var8[var10][var13];
-                        if(var15 != null && var15.drawPrimary) {
-                           this.drawTile(var15, false);
+            var14 = Scene_cameraXTile - var9;
+            if (var10 >= Scene_cameraXTileMin || var14 < Scene_cameraXTileMax) {
+               for (var15 = -25; var15 <= 0; ++var15) {
+                  var16 = var15 + Scene_cameraYTile;
+                  var12 = Scene_cameraYTile - var15;
+                  if (var10 >= Scene_cameraXTileMin) {
+                     if (var16 >= Scene_cameraYTileMin) {
+                        var13 = var8[var10][var16];
+                        if (var13 != null && var13.drawPrimary) {
+                           this.drawTile(var13, false);
                         }
                      }
 
-                     if(var14 < Scene_cameraYTileMax) {
-                        var15 = var8[var10][var14];
-                        if(var15 != null && var15.drawPrimary) {
-                           this.drawTile(var15, false);
+                     if (var12 < Scene_cameraYTileMax) {
+                        var13 = var8[var10][var12];
+                        if (var13 != null && var13.drawPrimary) {
+                           this.drawTile(var13, false);
                         }
                      }
                   }
 
-                  if(var16 < Scene_cameraXTileMax) {
-                     if(var13 >= Scene_cameraYTileMin) {
-                        var15 = var8[var16][var13];
-                        if(var15 != null && var15.drawPrimary) {
-                           this.drawTile(var15, false);
+                  if (var14 < Scene_cameraXTileMax) {
+                     if (var16 >= Scene_cameraYTileMin) {
+                        var13 = var8[var14][var16];
+                        if (var13 != null && var13.drawPrimary) {
+                           this.drawTile(var13, false);
                         }
                      }
 
-                     if(var14 < Scene_cameraYTileMax) {
-                        var15 = var8[var16][var14];
-                        if(var15 != null && var15.drawPrimary) {
-                           this.drawTile(var15, false);
+                     if (var12 < Scene_cameraYTileMax) {
+                        var13 = var8[var14][var12];
+                        if (var13 != null && var13.drawPrimary) {
+                           this.drawTile(var13, false);
                         }
                      }
                   }
 
-                  if(tileUpdateCount == 0) {
+                  if (tileUpdateCount == 0) {
                      checkClick = false;
                      return;
                   }
@@ -1260,10 +1245,10 @@ public class Scene {
       signature = "(Ldj;Z)V"
    )
    @Export("drawTile")
-   void drawTile(Tile var1, boolean var2) {
-      Scene_tilesDeque.addFirst(var1);
+   void drawTile(Tile tile, boolean var2) {
+      Scene_tilesDeque.addFirst(tile);
 
-      while(true) {
+      while (true) {
          Tile var3;
          int var4;
          int var5;
@@ -1271,30 +1256,30 @@ public class Scene {
          int var7;
          Tile[][] var8;
          Tile var9;
+         int var10;
          int var11;
+         int var12;
+         int var13;
          int var14;
          int var15;
-         int var16;
-         int var24;
-         int var25;
          do {
             do {
                do {
                   do {
                      do {
                         do {
-                           while(true) {
-                              BoundaryObject var10;
-                              GameObject var12;
-                              int var17;
+                           while (true) {
+                              BoundaryObject var16;
+                              GameObject var17;
                               int var18;
+                              int var19;
                               boolean var20;
                               int var21;
-                              Tile var36;
-                              while(true) {
+                              Tile var22;
+                              while (true) {
                                  do {
                                     var3 = (Tile)Scene_tilesDeque.removeLast();
-                                    if(var3 == null) {
+                                    if (var3 == null) {
                                        return;
                                     }
                                  } while(!var3.drawSecondary);
@@ -1304,42 +1289,42 @@ public class Scene {
                                  var6 = var3.plane;
                                  var7 = var3.originalPlane;
                                  var8 = this.tiles[var6];
-                                 if(!var3.drawPrimary) {
+                                 if (!var3.drawPrimary) {
                                     break;
                                  }
 
-                                 if(var2) {
-                                    if(var6 > 0) {
+                                 if (var2) {
+                                    if (var6 > 0) {
                                        var9 = this.tiles[var6 - 1][var4][var5];
-                                       if(var9 != null && var9.drawSecondary) {
+                                       if (var9 != null && var9.drawSecondary) {
                                           continue;
                                        }
                                     }
 
-                                    if(var4 <= Scene_cameraXTile && var4 > Scene_cameraXTileMin) {
+                                    if (var4 <= Scene_cameraXTile && var4 > Scene_cameraXTileMin) {
                                        var9 = var8[var4 - 1][var5];
-                                       if(var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 1) == 0)) {
+                                       if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 1) == 0)) {
                                           continue;
                                        }
                                     }
 
-                                    if(var4 >= Scene_cameraXTile && var4 < Scene_cameraXTileMax - 1) {
+                                    if (var4 >= Scene_cameraXTile && var4 < Scene_cameraXTileMax - 1) {
                                        var9 = var8[var4 + 1][var5];
-                                       if(var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 4) == 0)) {
+                                       if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 4) == 0)) {
                                           continue;
                                        }
                                     }
 
-                                    if(var5 <= Scene_cameraYTile && var5 > Scene_cameraYTileMin) {
+                                    if (var5 <= Scene_cameraYTile && var5 > Scene_cameraYTileMin) {
                                        var9 = var8[var4][var5 - 1];
-                                       if(var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 8) == 0)) {
+                                       if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 8) == 0)) {
                                           continue;
                                        }
                                     }
 
-                                    if(var5 >= Scene_cameraYTile && var5 < Scene_cameraYTileMax - 1) {
+                                    if (var5 >= Scene_cameraYTile && var5 < Scene_cameraYTileMax - 1) {
                                        var9 = var8[var4][var5 + 1];
-                                       if(var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 2) == 0)) {
+                                       if (var9 != null && var9.drawSecondary && (var9.drawPrimary || (var3.gameObjectsEdgeMask & 2) == 0)) {
                                           continue;
                                        }
                                     }
@@ -1348,311 +1333,312 @@ public class Scene {
                                  }
 
                                  var3.drawPrimary = false;
-                                 if(var3.linkedBelowTile != null) {
+                                 if (var3.linkedBelowTile != null) {
                                     var9 = var3.linkedBelowTile;
-                                    if(var9.paint != null) {
-                                       if(!this.__ba_253(0, var4, var5)) {
+                                    if (var9.paint != null) {
+                                       if (!this.method297(0, var4, var5)) {
                                           this.drawTileUnderlay(var9.paint, 0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5);
                                        }
-                                    } else if(var9.model != null && !this.__ba_253(0, var4, var5)) {
+                                    } else if (var9.model != null && !this.method297(0, var4, var5)) {
                                        this.drawTileOverlay(var9.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5);
                                     }
 
-                                    var10 = var9.boundaryObject;
-                                    if(var10 != null) {
-                                       var10.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x - Scene_cameraX, var10.tileHeight - Scene_cameraY, var10.y - Scene_cameraZ, var10.tag);
+                                    var16 = var9.boundaryObject;
+                                    if (var16 != null) {
+                                       var16.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var16.x - Scene_cameraX, var16.tileHeight - Scene_cameraY, var16.y - Scene_cameraZ, var16.tag);
                                     }
 
-                                    for(var11 = 0; var11 < var9.gameObjectsCount; ++var11) {
-                                       var12 = var9.gameObjects[var11];
-                                       if(var12 != null) {
-                                          var12.entity.renderDraw(var12.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var12.centerX - Scene_cameraX, var12.height - Scene_cameraY, var12.centerY - Scene_cameraZ, var12.tag);
+                                    for (var10 = 0; var10 < var9.gameObjectsCount; ++var10) {
+                                       var17 = var9.gameObjects[var10];
+                                       if (var17 != null) {
+                                          var17.entity.draw(var17.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var17.centerX - Scene_cameraX, var17.height - Scene_cameraY, var17.centerY - Scene_cameraZ, var17.tag);
                                        }
                                     }
                                  }
 
                                  var20 = false;
-                                 if(var3.paint != null) {
-                                    if(!this.__ba_253(var7, var4, var5)) {
+                                 if (var3.paint != null) {
+                                    if (!this.method297(var7, var4, var5)) {
                                        var20 = true;
-                                       if(var3.paint.neColor != 12345678 || checkClick && var6 <= Scene_selectedPlane) {
+                                       if (var3.paint.neColor != 12345678 || checkClick && var6 <= Scene_selectedPlane) {
                                           this.drawTileUnderlay(var3.paint, var7, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5);
                                        }
                                     }
-                                 } else if(var3.model != null && !this.__ba_253(var7, var4, var5)) {
+                                 } else if (var3.model != null && !this.method297(var7, var4, var5)) {
                                     var20 = true;
                                     this.drawTileOverlay(var3.model, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var4, var5);
                                  }
 
                                  var21 = 0;
-                                 var11 = 0;
-                                 BoundaryObject var31 = var3.boundaryObject;
-                                 WallDecoration var13 = var3.wallDecoration;
-                                 if(var31 != null || var13 != null) {
-                                    if(var4 == Scene_cameraXTile) {
+                                 var10 = 0;
+                                 BoundaryObject var23 = var3.boundaryObject;
+                                 WallDecoration var24 = var3.wallDecoration;
+                                 if (var23 != null || var24 != null) {
+                                    if (var4 == Scene_cameraXTile) {
                                        ++var21;
-                                    } else if(Scene_cameraXTile < var4) {
+                                    } else if (Scene_cameraXTile < var4) {
                                        var21 += 2;
                                     }
 
-                                    if(var5 == Scene_cameraYTile) {
+                                    if (var5 == Scene_cameraYTile) {
                                        var21 += 3;
-                                    } else if(Scene_cameraYTile > var5) {
+                                    } else if (Scene_cameraYTile > var5) {
                                        var21 += 6;
                                     }
 
-                                    var11 = __em_au[var21];
-                                    var3.__b = __em_aa[var21];
+                                    var10 = field762[var21];
+                                    var3.field899 = field764[var21];
                                  }
 
-                                 if(var31 != null) {
-                                    if((var31.orientationA & __em_ao[var21]) != 0) {
-                                       if(var31.orientationA == 16) {
+                                 if (var23 != null) {
+                                    if ((var23.orientationA & field763[var21]) != 0) {
+                                       if (var23.orientationA == 16) {
                                           var3.drawGameObjectEdges = 3;
-                                          var3.__y = __em_ax[var21];
-                                          var3.__h = 3 - var3.__y;
-                                       } else if(var31.orientationA == 32) {
+                                          var3.field897 = field765[var21];
+                                          var3.field898 = 3 - var3.field897;
+                                       } else if (var23.orientationA == 32) {
                                           var3.drawGameObjectEdges = 6;
-                                          var3.__y = __em_af[var21];
-                                          var3.__h = 6 - var3.__y;
-                                       } else if(var31.orientationA == 64) {
+                                          var3.field897 = field766[var21];
+                                          var3.field898 = 6 - var3.field897;
+                                       } else if (var23.orientationA == 64) {
                                           var3.drawGameObjectEdges = 12;
-                                          var3.__y = __em_ai[var21];
-                                          var3.__h = 12 - var3.__y;
+                                          var3.field897 = field767[var21];
+                                          var3.field898 = 12 - var3.field897;
                                        } else {
                                           var3.drawGameObjectEdges = 9;
-                                          var3.__y = __em_ba[var21];
-                                          var3.__h = 9 - var3.__y;
+                                          var3.field897 = field768[var21];
+                                          var3.field898 = 9 - var3.field897;
                                        }
                                     } else {
                                        var3.drawGameObjectEdges = 0;
                                     }
 
-                                    if((var31.orientationA & var11) != 0 && !this.__bb_254(var7, var4, var5, var31.orientationA)) {
-                                       var31.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag);
+                                    if ((var23.orientationA & var10) != 0 && !this.method298(var7, var4, var5, var23.orientationA)) {
+                                       var23.entity1.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((var31.orientationB & var11) != 0 && !this.__bb_254(var7, var4, var5, var31.orientationB)) {
-                                       var31.entity2.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag);
+                                    if ((var23.orientationB & var10) != 0 && !this.method298(var7, var4, var5, var23.orientationB)) {
+                                       var23.entity2.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(var13 != null && !this.__bs_255(var7, var4, var5, var13.entity1.height)) {
-                                    if((var13.orientation & var11) != 0) {
-                                       var13.entity1.renderDraw(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);
-                                    } else if(var13.orientation == 256) {
-                                       var14 = var13.x - Scene_cameraX;
-                                       var15 = var13.tileHeight - Scene_cameraY;
-                                       var16 = var13.y - Scene_cameraZ;
-                                       var17 = var13.orientation2;
-                                       if(var17 != 1 && var17 != 2) {
-                                          var18 = var14;
+                                 if (var24 != null && !this.method299(var7, var4, var5, var24.entity1.height)) {
+                                    if ((var24.orientation & var10) != 0) {
+                                       var24.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var24.x - Scene_cameraX + var24.xOffset, var24.tileHeight - Scene_cameraY, var24.y - Scene_cameraZ + var24.yOffset, var24.tag);
+                                    } else if (var24.orientation == 256) {
+                                       var11 = var24.x - Scene_cameraX;
+                                       var12 = var24.tileHeight - Scene_cameraY;
+                                       var13 = var24.y - Scene_cameraZ;
+                                       var18 = var24.orientation2;
+                                       if (var18 != 1 && var18 != 2) {
+                                          var19 = var11;
                                        } else {
-                                          var18 = -var14;
+                                          var19 = -var11;
                                        }
 
-                                       int var19;
-                                       if(var17 != 2 && var17 != 3) {
-                                          var19 = var16;
+                                       int var25;
+                                       if (var18 != 2 && var18 != 3) {
+                                          var25 = var13;
                                        } else {
-                                          var19 = -var16;
+                                          var25 = -var13;
                                        }
 
-                                       if(var19 < var18) {
-                                          var13.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14 + var13.xOffset, var15, var16 + var13.yOffset, var13.tag);
-                                       } else if(var13.entity2 != null) {
-                                          var13.entity2.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14, var15, var16, var13.tag);
+                                       if (var25 < var19) {
+                                          var24.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11 + var24.xOffset, var12, var13 + var24.yOffset, var24.tag);
+                                       } else if (var24.entity2 != null) {
+                                          var24.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11, var12, var13, var24.tag);
                                        }
                                     }
                                  }
 
-                                 if(var20) {
-                                    FloorDecoration var22 = var3.floorDecoration;
-                                    if(var22 != null) {
-                                       var22.entity.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var22.x - Scene_cameraX, var22.tileHeight - Scene_cameraY, var22.y - Scene_cameraZ, var22.tag);
+                                 if (var20) {
+                                    FloorDecoration var34 = var3.floorDecoration;
+                                    if (var34 != null) {
+                                       var34.entity.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var34.x - Scene_cameraX, var34.tileHeight - Scene_cameraY, var34.y - Scene_cameraZ, var34.tag);
                                     }
 
-                                    GroundItemPile var23 = var3.groundItemPile;
-                                    if(var23 != null && var23.height == 0) {
-                                       if(var23.second != null) {
-                                          var23.second.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag);
+                                    GroundItemPile var26 = var3.groundItemPile;
+                                    if (var26 != null && var26.height == 0) {
+                                       if (var26.second != null) {
+                                          var26.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var26.x - Scene_cameraX, var26.tileHeight - Scene_cameraY, var26.y - Scene_cameraZ, var26.tag);
                                        }
 
-                                       if(var23.third != null) {
-                                          var23.third.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag);
+                                       if (var26.third != null) {
+                                          var26.third.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var26.x - Scene_cameraX, var26.tileHeight - Scene_cameraY, var26.y - Scene_cameraZ, var26.tag);
                                        }
 
-                                       if(var23.first != null) {
-                                          var23.first.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var23.x - Scene_cameraX, var23.tileHeight - Scene_cameraY, var23.y - Scene_cameraZ, var23.tag);
+                                       if (var26.first != null) {
+                                          var26.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var26.x - Scene_cameraX, var26.tileHeight - Scene_cameraY, var26.y - Scene_cameraZ, var26.tag);
                                        }
                                     }
                                  }
 
-                                 var14 = var3.gameObjectsEdgeMask;
-                                 if(var14 != 0) {
-                                    if(var4 < Scene_cameraXTile && (var14 & 4) != 0) {
-                                       var36 = var8[var4 + 1][var5];
-                                       if(var36 != null && var36.drawSecondary) {
-                                          Scene_tilesDeque.addFirst(var36);
+                                 var11 = var3.gameObjectsEdgeMask;
+                                 if (var11 != 0) {
+                                    if (var4 < Scene_cameraXTile && (var11 & 4) != 0) {
+                                       var22 = var8[var4 + 1][var5];
+                                       if (var22 != null && var22.drawSecondary) {
+                                          Scene_tilesDeque.addFirst(var22);
                                        }
                                     }
 
-                                    if(var5 < Scene_cameraYTile && (var14 & 2) != 0) {
-                                       var36 = var8[var4][var5 + 1];
-                                       if(var36 != null && var36.drawSecondary) {
-                                          Scene_tilesDeque.addFirst(var36);
+                                    if (var5 < Scene_cameraYTile && (var11 & 2) != 0) {
+                                       var22 = var8[var4][var5 + 1];
+                                       if (var22 != null && var22.drawSecondary) {
+                                          Scene_tilesDeque.addFirst(var22);
                                        }
                                     }
 
-                                    if(var4 > Scene_cameraXTile && (var14 & 1) != 0) {
-                                       var36 = var8[var4 - 1][var5];
-                                       if(var36 != null && var36.drawSecondary) {
-                                          Scene_tilesDeque.addFirst(var36);
+                                    if (var4 > Scene_cameraXTile && (var11 & 1) != 0) {
+                                       var22 = var8[var4 - 1][var5];
+                                       if (var22 != null && var22.drawSecondary) {
+                                          Scene_tilesDeque.addFirst(var22);
                                        }
                                     }
 
-                                    if(var5 > Scene_cameraYTile && (var14 & 8) != 0) {
-                                       var36 = var8[var4][var5 - 1];
-                                       if(var36 != null && var36.drawSecondary) {
-                                          Scene_tilesDeque.addFirst(var36);
+                                    if (var5 > Scene_cameraYTile && (var11 & 8) != 0) {
+                                       var22 = var8[var4][var5 - 1];
+                                       if (var22 != null && var22.drawSecondary) {
+                                          Scene_tilesDeque.addFirst(var22);
                                        }
                                     }
                                  }
                                  break;
                               }
 
-                              if(var3.drawGameObjectEdges != 0) {
+                              if (var3.drawGameObjectEdges != 0) {
                                  var20 = true;
 
-                                 for(var21 = 0; var21 < var3.gameObjectsCount; ++var21) {
-                                    if(var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.__y) {
+                                 for (var21 = 0; var21 < var3.gameObjectsCount; ++var21) {
+                                    if (var3.gameObjects[var21].lastDrawn != Scene_drawnCount && (var3.gameObjectEdgeMasks[var21] & var3.drawGameObjectEdges) == var3.field897) {
                                        var20 = false;
                                        break;
                                     }
                                  }
 
-                                 if(var20) {
-                                    var10 = var3.boundaryObject;
-                                    if(!this.__bb_254(var7, var4, var5, var10.orientationA)) {
-                                       var10.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x - Scene_cameraX, var10.tileHeight - Scene_cameraY, var10.y - Scene_cameraZ, var10.tag);
+                                 if (var20) {
+                                    var16 = var3.boundaryObject;
+                                    if (!this.method298(var7, var4, var5, var16.orientationA)) {
+                                       var16.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var16.x - Scene_cameraX, var16.tileHeight - Scene_cameraY, var16.y - Scene_cameraZ, var16.tag);
                                     }
 
                                     var3.drawGameObjectEdges = 0;
                                  }
                               }
 
-                              if(!var3.drawGameObjects) {
+                              if (!var3.drawGameObjects) {
                                  break;
                               }
 
                               try {
-                                 int var34 = var3.gameObjectsCount;
+                                 int var32 = var3.gameObjectsCount;
                                  var3.drawGameObjects = false;
                                  var21 = 0;
 
-                                 label563:
-                                 for(var11 = 0; var11 < var34; ++var11) {
-                                    var12 = var3.gameObjects[var11];
-                                    if(var12.lastDrawn != Scene_drawnCount) {
-                                       for(var24 = var12.startX; var24 <= var12.endX; ++var24) {
-                                          for(var14 = var12.startY; var14 <= var12.endY; ++var14) {
-                                             var36 = var8[var24][var14];
-                                             if(var36.drawPrimary) {
+                                 label562:
+                                 for (var10 = 0; var10 < var32; ++var10) {
+                                    var17 = var3.gameObjects[var10];
+                                    if (var17.lastDrawn != Scene_drawnCount) {
+                                       for (var14 = var17.startX; var14 <= var17.endX; ++var14) {
+                                          for (var11 = var17.startY; var11 <= var17.endY; ++var11) {
+                                             var22 = var8[var14][var11];
+                                             if (var22.drawPrimary) {
                                                 var3.drawGameObjects = true;
-                                                continue label563;
+                                                continue label562;
                                              }
 
-                                             if(var36.drawGameObjectEdges != 0) {
-                                                var16 = 0;
-                                                if(var24 > var12.startX) {
-                                                   ++var16;
+                                             if (var22.drawGameObjectEdges != 0) {
+                                                var13 = 0;
+                                                if (var14 > var17.startX) {
+                                                   ++var13;
                                                 }
 
-                                                if(var24 < var12.endX) {
-                                                   var16 += 4;
+                                                if (var14 < var17.endX) {
+                                                   var13 += 4;
                                                 }
 
-                                                if(var14 > var12.startY) {
-                                                   var16 += 8;
+                                                if (var11 > var17.startY) {
+                                                   var13 += 8;
                                                 }
 
-                                                if(var14 < var12.endY) {
-                                                   var16 += 2;
+                                                if (var11 < var17.endY) {
+                                                   var13 += 2;
                                                 }
 
-                                                if((var16 & var36.drawGameObjectEdges) == var3.__h) {
+                                                if ((var13 & var22.drawGameObjectEdges) == var3.field898) {
                                                    var3.drawGameObjects = true;
-                                                   continue label563;
+                                                   continue label562;
                                                 }
                                              }
                                           }
                                        }
 
-                                       Scene_gameObjects[var21++] = var12;
-                                       var24 = Scene_cameraXTile - var12.startX;
-                                       var14 = var12.endX - Scene_cameraXTile;
-                                       if(var14 > var24) {
-                                          var24 = var14;
+                                       gameObjects[var21++] = var17;
+                                       var14 = Scene_cameraXTile - var17.startX;
+                                       var11 = var17.endX - Scene_cameraXTile;
+                                       if (var11 > var14) {
+                                          var14 = var11;
                                        }
 
-                                       var15 = Scene_cameraYTile - var12.startY;
-                                       var16 = var12.endY - Scene_cameraYTile;
-                                       if(var16 > var15) {
-                                          var12.__d = var24 + var16;
+                                       var12 = Scene_cameraYTile - var17.startY;
+                                       var13 = var17.endY - Scene_cameraYTile;
+                                       if (var13 > var12) {
+                                          var17.field360 = var14 + var13;
                                        } else {
-                                          var12.__d = var24 + var15;
+                                          var17.field360 = var14 + var12;
                                        }
                                     }
                                  }
 
-                                 while(var21 > 0) {
-                                    var11 = -50;
-                                    var25 = -1;
+                                 while (var21 > 0) {
+                                    var10 = -50;
+                                    var15 = -1;
 
-                                    for(var24 = 0; var24 < var21; ++var24) {
-                                       GameObject var35 = Scene_gameObjects[var24];
-                                       if(var35.lastDrawn != Scene_drawnCount) {
-                                          if(var35.__d > var11) {
-                                             var11 = var35.__d;
-                                             var25 = var24;
-                                          } else if(var11 == var35.__d) {
-                                             var15 = var35.centerX - Scene_cameraX;
-                                             var16 = var35.centerY - Scene_cameraZ;
-                                             var17 = Scene_gameObjects[var25].centerX - Scene_cameraX;
-                                             var18 = Scene_gameObjects[var25].centerY - Scene_cameraZ;
-                                             if(var15 * var15 + var16 * var16 > var17 * var17 + var18 * var18) {
-                                                var25 = var24;
+                                    GameObject var33;
+                                    for (var14 = 0; var14 < var21; ++var14) {
+                                       var33 = gameObjects[var14];
+                                       if (var33.lastDrawn != Scene_drawnCount) {
+                                          if (var33.field360 > var10) {
+                                             var10 = var33.field360;
+                                             var15 = var14;
+                                          } else if (var10 == var33.field360) {
+                                             var12 = var33.centerX - Scene_cameraX;
+                                             var13 = var33.centerY - Scene_cameraZ;
+                                             var18 = gameObjects[var15].centerX - Scene_cameraX;
+                                             var19 = gameObjects[var15].centerY - Scene_cameraZ;
+                                             if (var12 * var12 + var13 * var13 > var18 * var18 + var19 * var19) {
+                                                var15 = var14;
                                              }
                                           }
                                        }
                                     }
 
-                                    if(var25 == -1) {
+                                    if (var15 == -1) {
                                        break;
                                     }
 
-                                    GameObject var33 = Scene_gameObjects[var25];
+                                    var33 = gameObjects[var15];
                                     var33.lastDrawn = Scene_drawnCount;
-                                    if(!this.__bq_256(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.entity.height)) {
-                                       var33.entity.renderDraw(var33.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var33.centerX - Scene_cameraX, var33.height - Scene_cameraY, var33.centerY - Scene_cameraZ, var33.tag);
+                                    if (!this.method300(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.entity.height)) {
+                                       var33.entity.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);
                                     }
 
-                                    for(var14 = var33.startX; var14 <= var33.endX; ++var14) {
-                                       for(var15 = var33.startY; var15 <= var33.endY; ++var15) {
-                                          Tile var26 = var8[var14][var15];
-                                          if(var26.drawGameObjectEdges != 0) {
-                                             Scene_tilesDeque.addFirst(var26);
-                                          } else if((var14 != var4 || var15 != var5) && var26.drawSecondary) {
-                                             Scene_tilesDeque.addFirst(var26);
+                                    for (var11 = var33.startX; var11 <= var33.endX; ++var11) {
+                                       for (var12 = var33.startY; var12 <= var33.endY; ++var12) {
+                                          Tile var35 = var8[var11][var12];
+                                          if (var35.drawGameObjectEdges != 0) {
+                                             Scene_tilesDeque.addFirst(var35);
+                                          } else if ((var11 != var4 || var12 != var5) && var35.drawSecondary) {
+                                             Scene_tilesDeque.addFirst(var35);
                                           }
                                        }
                                     }
                                  }
 
-                                 if(!var3.drawGameObjects) {
+                                 if (!var3.drawGameObjects) {
                                     break;
                                  }
-                              } catch (Exception var28) {
+                              } catch (Exception var27) {
                                  var3.drawGameObjects = false;
                                  break;
                               }
@@ -1660,28 +1646,28 @@ public class Scene {
                         } while(!var3.drawSecondary);
                      } while(var3.drawGameObjectEdges != 0);
 
-                     if(var4 > Scene_cameraXTile || var4 <= Scene_cameraXTileMin) {
+                     if (var4 > Scene_cameraXTile || var4 <= Scene_cameraXTileMin) {
                         break;
                      }
 
                      var9 = var8[var4 - 1][var5];
                   } while(var9 != null && var9.drawSecondary);
 
-                  if(var4 < Scene_cameraXTile || var4 >= Scene_cameraXTileMax - 1) {
+                  if (var4 < Scene_cameraXTile || var4 >= Scene_cameraXTileMax - 1) {
                      break;
                   }
 
                   var9 = var8[var4 + 1][var5];
                } while(var9 != null && var9.drawSecondary);
 
-               if(var5 > Scene_cameraYTile || var5 <= Scene_cameraYTileMin) {
+               if (var5 > Scene_cameraYTile || var5 <= Scene_cameraYTileMin) {
                   break;
                }
 
                var9 = var8[var4][var5 - 1];
             } while(var9 != null && var9.drawSecondary);
 
-            if(var5 < Scene_cameraYTile || var5 >= Scene_cameraYTileMax - 1) {
+            if (var5 < Scene_cameraYTile || var5 >= Scene_cameraYTileMax - 1) {
                break;
             }
 
@@ -1690,95 +1676,95 @@ public class Scene {
 
          var3.drawSecondary = false;
          --tileUpdateCount;
-         GroundItemPile var32 = var3.groundItemPile;
-         if(var32 != null && var32.height != 0) {
-            if(var32.second != null) {
-               var32.second.renderDraw(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);
+         GroundItemPile var28 = var3.groundItemPile;
+         if (var28 != null && var28.height != 0) {
+            if (var28.second != null) {
+               var28.second.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var28.x - Scene_cameraX, var28.tileHeight - Scene_cameraY - var28.height, var28.y - Scene_cameraZ, var28.tag);
             }
 
-            if(var32.third != null) {
-               var32.third.renderDraw(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 (var28.third != null) {
+               var28.third.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var28.x - Scene_cameraX, var28.tileHeight - Scene_cameraY - var28.height, var28.y - Scene_cameraZ, var28.tag);
             }
 
-            if(var32.first != null) {
-               var32.first.renderDraw(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 (var28.first != null) {
+               var28.first.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var28.x - Scene_cameraX, var28.tileHeight - Scene_cameraY - var28.height, var28.y - Scene_cameraZ, var28.tag);
             }
          }
 
-         if(var3.__b != 0) {
+         if (var3.field899 != 0) {
             WallDecoration var29 = var3.wallDecoration;
-            if(var29 != null && !this.__bs_255(var7, var4, var5, var29.entity1.height)) {
-               if((var29.orientation & var3.__b) != 0) {
-                  var29.entity1.renderDraw(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);
-               } else if(var29.orientation == 256) {
-                  var11 = var29.x - Scene_cameraX;
-                  var25 = var29.tileHeight - Scene_cameraY;
-                  var24 = var29.y - Scene_cameraZ;
-                  var14 = var29.orientation2;
-                  if(var14 != 1 && var14 != 2) {
-                     var15 = var11;
+            if (var29 != null && !this.method299(var7, var4, var5, var29.entity1.height)) {
+               if ((var29.orientation & var3.field899) != 0) {
+                  var29.entity1.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);
+               } else if (var29.orientation == 256) {
+                  var10 = var29.x - Scene_cameraX;
+                  var15 = var29.tileHeight - Scene_cameraY;
+                  var14 = var29.y - Scene_cameraZ;
+                  var11 = var29.orientation2;
+                  if (var11 != 1 && var11 != 2) {
+                     var12 = var10;
                   } else {
-                     var15 = -var11;
+                     var12 = -var10;
                   }
 
-                  if(var14 != 2 && var14 != 3) {
-                     var16 = var24;
+                  if (var11 != 2 && var11 != 3) {
+                     var13 = var14;
                   } else {
-                     var16 = -var24;
+                     var13 = -var14;
                   }
 
-                  if(var16 >= var15) {
-                     var29.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11 + var29.xOffset, var25, var24 + var29.yOffset, var29.tag);
-                  } else if(var29.entity2 != null) {
-                     var29.entity2.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11, var25, var24, var29.tag);
+                  if (var13 >= var12) {
+                     var29.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10 + var29.xOffset, var15, var14 + var29.yOffset, var29.tag);
+                  } else if (var29.entity2 != null) {
+                     var29.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10, var15, var14, var29.tag);
                   }
                }
             }
 
-            BoundaryObject var27 = var3.boundaryObject;
-            if(var27 != null) {
-               if((var27.orientationB & var3.__b) != 0 && !this.__bb_254(var7, var4, var5, var27.orientationB)) {
-                  var27.entity2.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x - Scene_cameraX, var27.tileHeight - Scene_cameraY, var27.y - Scene_cameraZ, var27.tag);
+            BoundaryObject var31 = var3.boundaryObject;
+            if (var31 != null) {
+               if ((var31.orientationB & var3.field899) != 0 && !this.method298(var7, var4, var5, var31.orientationB)) {
+                  var31.entity2.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((var27.orientationA & var3.__b) != 0 && !this.__bb_254(var7, var4, var5, var27.orientationA)) {
-                  var27.entity1.renderDraw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x - Scene_cameraX, var27.tileHeight - Scene_cameraY, var27.y - Scene_cameraZ, var27.tag);
+               if ((var31.orientationA & var3.field899) != 0 && !this.method298(var7, var4, var5, var31.orientationA)) {
+                  var31.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag);
                }
             }
          }
 
          Tile var30;
-         if(var6 < this.planes - 1) {
+         if (var6 < this.planes - 1) {
             var30 = this.tiles[var6 + 1][var4][var5];
-            if(var30 != null && var30.drawSecondary) {
+            if (var30 != null && var30.drawSecondary) {
                Scene_tilesDeque.addFirst(var30);
             }
          }
 
-         if(var4 < Scene_cameraXTile) {
+         if (var4 < Scene_cameraXTile) {
             var30 = var8[var4 + 1][var5];
-            if(var30 != null && var30.drawSecondary) {
+            if (var30 != null && var30.drawSecondary) {
                Scene_tilesDeque.addFirst(var30);
             }
          }
 
-         if(var5 < Scene_cameraYTile) {
+         if (var5 < Scene_cameraYTile) {
             var30 = var8[var4][var5 + 1];
-            if(var30 != null && var30.drawSecondary) {
+            if (var30 != null && var30.drawSecondary) {
                Scene_tilesDeque.addFirst(var30);
             }
          }
 
-         if(var4 > Scene_cameraXTile) {
+         if (var4 > Scene_cameraXTile) {
             var30 = var8[var4 - 1][var5];
-            if(var30 != null && var30.drawSecondary) {
+            if (var30 != null && var30.drawSecondary) {
                Scene_tilesDeque.addFirst(var30);
             }
          }
 
-         if(var5 > Scene_cameraYTile) {
+         if (var5 > Scene_cameraYTile) {
             var30 = var8[var4][var5 - 1];
-            if(var30 != null && var30.drawSecondary) {
+            if (var30 != null && var30.drawSecondary) {
                Scene_tilesDeque.addFirst(var30);
             }
          }
@@ -1809,27 +1795,27 @@ public class Scene {
       var21 = var17 * var4 - var3 * var12 >> 16;
       var12 = var3 * var17 + var12 * var4 >> 16;
       var17 = var21;
-      if(var12 >= 50) {
+      if (var12 >= 50) {
          var21 = var14 * var6 + var5 * var11 >> 16;
          var11 = var11 * var6 - var5 * var14 >> 16;
          var14 = var21;
          var21 = var18 * var4 - var3 * var11 >> 16;
          var11 = var3 * var18 + var11 * var4 >> 16;
          var18 = var21;
-         if(var11 >= 50) {
+         if (var11 >= 50) {
             var21 = var13 * var6 + var5 * var16 >> 16;
             var16 = var16 * var6 - var5 * var13 >> 16;
             var13 = var21;
             var21 = var19 * var4 - var3 * var16 >> 16;
             var16 = var3 * var19 + var16 * var4 >> 16;
             var19 = var21;
-            if(var16 >= 50) {
+            if (var16 >= 50) {
                var21 = var9 * var6 + var5 * var15 >> 16;
                var15 = var15 * var6 - var5 * var9 >> 16;
                var9 = var21;
                var21 = var20 * var4 - var3 * var15 >> 16;
                var15 = var3 * var20 + var15 * var4 >> 16;
-               if(var15 >= 50) {
+               if (var15 >= 50) {
                   int var22 = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX;
                   int var23 = var17 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY;
                   int var24 = var14 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidX;
@@ -1840,60 +1826,60 @@ public class Scene {
                   int var29 = var21 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidY;
                   Rasterizer3D.Rasterizer3D_alpha = 0;
                   int var30;
-                  if((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) {
-                     Rasterizer3D.__et_m = false;
-                     if(var26 < 0 || var28 < 0 || var24 < 0 || var26 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth) {
-                        Rasterizer3D.__et_m = true;
+                  if ((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) {
+                     Rasterizer3D.field739 = false;
+                     if (var26 < 0 || var28 < 0 || var24 < 0 || var26 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth) {
+                        Rasterizer3D.field739 = true;
                      }
 
-                     if(checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) {
+                     if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) {
                         Scene_selectedX = var7;
                         Scene_selectedY = var8;
                      }
 
-                     if(var1.texture == -1) {
-                        if(var1.neColor != 12345678) {
+                     if (var1.texture == -1) {
+                        if (var1.neColor != 12345678) {
                            Rasterizer3D.method3037(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor);
                         }
-                     } else if(!Scene_isLowDetail) {
-                        if(var1.isFlat) {
+                     } else if (!Scene_isLowDetail) {
+                        if (var1.isFlat) {
                            Rasterizer3D.method3012(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.method3012(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var13, var9, var14, var19, var21, var18, var16, var15, var11, var1.texture);
                         }
                      } else {
-                        var30 = Rasterizer3D.Rasterizer3D_textureLoader.__w_213(var1.texture);
+                        var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture);
                         Rasterizer3D.method3037(var27, var29, var25, var26, var28, var24, method3108(var30, var1.neColor), method3108(var30, var1.nwColor), method3108(var30, var1.seColor));
                      }
                   }
 
-                  if((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) {
-                     Rasterizer3D.__et_m = false;
-                     if(var22 < 0 || var24 < 0 || var28 < 0 || var22 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth) {
-                        Rasterizer3D.__et_m = true;
+                  if ((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) {
+                     Rasterizer3D.field739 = false;
+                     if (var22 < 0 || var24 < 0 || var28 < 0 || var22 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth) {
+                        Rasterizer3D.field739 = true;
                      }
 
-                     if(checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) {
+                     if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) {
                         Scene_selectedX = var7;
                         Scene_selectedY = var8;
                      }
 
-                     if(var1.texture == -1) {
-                        if(var1.swColor != 12345678) {
+                     if (var1.texture == -1) {
+                        if (var1.swColor != 12345678) {
                            Rasterizer3D.method3037(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor);
                         }
-                     } else if(!Scene_isLowDetail) {
+                     } else if (!Scene_isLowDetail) {
                         Rasterizer3D.method3012(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture);
                      } else {
-                        var30 = Rasterizer3D.Rasterizer3D_textureLoader.__w_213(var1.texture);
+                        var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture);
                         Rasterizer3D.method3037(var23, var25, var29, var22, var24, var28, method3108(var30, var1.swColor), method3108(var30, var1.seColor), method3108(var30, var1.nwColor));
                      }
                   }
-
                }
             }
          }
       }
+
    }
 
    @ObfuscatedName("aa")
@@ -1909,7 +1895,7 @@ public class Scene {
       int var11;
       int var12;
       int var13;
-      for(var9 = 0; var9 < var8; ++var9) {
+      for (var9 = 0; var9 < var8; ++var9) {
          var10 = var1.vertexX[var9] - Scene_cameraX;
          var11 = var1.vertexY[var9] - Scene_cameraY;
          var12 = var1.vertexZ[var9] - Scene_cameraZ;
@@ -1918,56 +1904,56 @@ public class Scene {
          var10 = var13;
          var13 = var3 * var11 - var12 * var2 >> 16;
          var12 = var11 * var2 + var3 * var12 >> 16;
-         if(var12 < 50) {
+         if (var12 < 50) {
             return;
          }
 
-         if(var1.triangleTextureId != null) {
-            TileModel.__dv_s[var9] = var10;
-            TileModel.__dv_t[var9] = var13;
-            TileModel.__dv_y[var9] = var12;
+         if (var1.triangleTextureId != null) {
+            TileModel.field902[var9] = var10;
+            TileModel.field903[var9] = var13;
+            TileModel.field904[var9] = var12;
          }
 
-         TileModel.__dv_z[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX;
-         TileModel.__dv_j[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY;
+         TileModel.field900[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX;
+         TileModel.field901[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY;
       }
 
       Rasterizer3D.Rasterizer3D_alpha = 0;
       var8 = var1.faceX.length;
 
-      for(var9 = 0; var9 < var8; ++var9) {
+      for (var9 = 0; var9 < var8; ++var9) {
          var10 = var1.faceX[var9];
          var11 = var1.faceY[var9];
          var12 = var1.faceZ[var9];
-         var13 = TileModel.__dv_z[var10];
-         int var14 = TileModel.__dv_z[var11];
-         int var15 = TileModel.__dv_z[var12];
-         int var16 = TileModel.__dv_j[var10];
-         int var17 = TileModel.__dv_j[var11];
-         int var18 = TileModel.__dv_j[var12];
-         if((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) {
-            Rasterizer3D.__et_m = false;
-            if(var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) {
-               Rasterizer3D.__et_m = true;
+         var13 = TileModel.field900[var10];
+         int var14 = TileModel.field900[var11];
+         int var15 = TileModel.field900[var12];
+         int var16 = TileModel.field901[var10];
+         int var17 = TileModel.field901[var11];
+         int var18 = TileModel.field901[var12];
+         if ((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) {
+            Rasterizer3D.field739 = false;
+            if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) {
+               Rasterizer3D.field739 = true;
             }
 
-            if(checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var16, var17, var18, var13, var14, var15)) {
+            if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var16, var17, var18, var13, var14, var15)) {
                Scene_selectedX = var6;
                Scene_selectedY = var7;
             }
 
-            if(var1.triangleTextureId != null && var1.triangleTextureId[var9] != -1) {
-               if(!Scene_isLowDetail) {
-                  if(var1.isFlat) {
-                     Rasterizer3D.method3012(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.__dv_s[0], TileModel.__dv_s[1], TileModel.__dv_s[3], TileModel.__dv_t[0], TileModel.__dv_t[1], TileModel.__dv_t[3], TileModel.__dv_y[0], TileModel.__dv_y[1], TileModel.__dv_y[3], var1.triangleTextureId[var9]);
+            if (var1.triangleTextureId != null && var1.triangleTextureId[var9] != -1) {
+               if (!Scene_isLowDetail) {
+                  if (var1.isFlat) {
+                     Rasterizer3D.method3012(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.field902[0], TileModel.field902[1], TileModel.field902[3], TileModel.field903[0], TileModel.field903[1], TileModel.field903[3], TileModel.field904[0], TileModel.field904[1], TileModel.field904[3], var1.triangleTextureId[var9]);
                   } else {
-                     Rasterizer3D.method3012(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.__dv_s[var10], TileModel.__dv_s[var11], TileModel.__dv_s[var12], TileModel.__dv_t[var10], TileModel.__dv_t[var11], TileModel.__dv_t[var12], TileModel.__dv_y[var10], TileModel.__dv_y[var11], TileModel.__dv_y[var12], var1.triangleTextureId[var9]);
+                     Rasterizer3D.method3012(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.field902[var10], TileModel.field902[var11], TileModel.field902[var12], TileModel.field903[var10], TileModel.field903[var11], TileModel.field903[var12], TileModel.field904[var10], TileModel.field904[var11], TileModel.field904[var12], var1.triangleTextureId[var9]);
                   }
                } else {
-                  int var19 = Rasterizer3D.Rasterizer3D_textureLoader.__w_213(var1.triangleTextureId[var9]);
+                  int var19 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]);
                   Rasterizer3D.method3037(var16, var17, var18, var13, var14, var15, method3108(var19, var1.triangleColorA[var9]), method3108(var19, var1.triangleColorB[var9]), method3108(var19, var1.triangleColorC[var9]));
                }
-            } else if(var1.triangleColorA[var9] != 12345678) {
+            } else if (var1.triangleColorA[var9] != 12345678) {
                Rasterizer3D.method3037(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]);
             }
          }
@@ -1982,139 +1968,139 @@ public class Scene {
       Occluder[] var2 = Scene_planeOccluders[Scene_plane];
       Scene_currentOccludersCount = 0;
 
-      for(int var3 = 0; var3 < var1; ++var3) {
+      for (int var3 = 0; var3 < var1; ++var3) {
          Occluder var4 = var2[var3];
          int var5;
          int var6;
          int var7;
-         int var9;
-         boolean var13;
-         if(var4.type == 1) {
+         int var8;
+         boolean var9;
+         if (var4.type == 1) {
             var5 = var4.minTileX - Scene_cameraXTile + 25;
-            if(var5 >= 0 && var5 <= 50) {
+            if (var5 >= 0 && var5 <= 50) {
                var6 = var4.minTileY - Scene_cameraYTile + 25;
-               if(var6 < 0) {
+               if (var6 < 0) {
                   var6 = 0;
                }
 
                var7 = var4.maxTileY - Scene_cameraYTile + 25;
-               if(var7 > 50) {
+               if (var7 > 50) {
                   var7 = 50;
                }
 
-               var13 = false;
+               var9 = false;
 
-               while(var6 <= var7) {
-                  if(visibleTiles[var5][var6++]) {
-                     var13 = true;
+               while (var6 <= var7) {
+                  if (visibleTiles[var5][var6++]) {
+                     var9 = true;
                      break;
                   }
                }
 
-               if(var13) {
-                  var9 = Scene_cameraX - var4.minX;
-                  if(var9 > 32) {
-                     var4.__k = 1;
+               if (var9) {
+                  var8 = Scene_cameraX - var4.minX;
+                  if (var8 > 32) {
+                     var4.field656 = 1;
                   } else {
-                     if(var9 >= -32) {
+                     if (var8 >= -32) {
                         continue;
                      }
 
-                     var4.__k = 2;
-                     var9 = -var9;
+                     var4.field656 = 2;
+                     var8 = -var8;
                   }
 
-                  var4.__a = (var4.minZ - Scene_cameraZ << 8) / var9;
-                  var4.__z = (var4.maxZ - Scene_cameraZ << 8) / var9;
-                  var4.__j = (var4.minY - Scene_cameraY << 8) / var9;
-                  var4.__s = (var4.maxY - Scene_cameraY << 8) / var9;
+                  var4.field659 = (var4.minZ - Scene_cameraZ << 8) / var8;
+                  var4.field660 = (var4.maxZ - Scene_cameraZ << 8) / var8;
+                  var4.field661 = (var4.minY - Scene_cameraY << 8) / var8;
+                  var4.field662 = (var4.maxY - Scene_cameraY << 8) / var8;
                   Scene_currentOccluders[Scene_currentOccludersCount++] = var4;
                }
             }
-         } else if(var4.type == 2) {
+         } else if (var4.type == 2) {
             var5 = var4.minTileY - Scene_cameraYTile + 25;
-            if(var5 >= 0 && var5 <= 50) {
+            if (var5 >= 0 && var5 <= 50) {
                var6 = var4.minTileX - Scene_cameraXTile + 25;
-               if(var6 < 0) {
+               if (var6 < 0) {
                   var6 = 0;
                }
 
                var7 = var4.maxTileX - Scene_cameraXTile + 25;
-               if(var7 > 50) {
+               if (var7 > 50) {
                   var7 = 50;
                }
 
-               var13 = false;
+               var9 = false;
 
-               while(var6 <= var7) {
-                  if(visibleTiles[var6++][var5]) {
-                     var13 = true;
+               while (var6 <= var7) {
+                  if (visibleTiles[var6++][var5]) {
+                     var9 = true;
                      break;
                   }
                }
 
-               if(var13) {
-                  var9 = Scene_cameraZ - var4.minZ;
-                  if(var9 > 32) {
-                     var4.__k = 3;
+               if (var9) {
+                  var8 = Scene_cameraZ - var4.minZ;
+                  if (var8 > 32) {
+                     var4.field656 = 3;
                   } else {
-                     if(var9 >= -32) {
+                     if (var8 >= -32) {
                         continue;
                      }
 
-                     var4.__k = 4;
-                     var9 = -var9;
+                     var4.field656 = 4;
+                     var8 = -var8;
                   }
 
-                  var4.__n = (var4.minX - Scene_cameraX << 8) / var9;
-                  var4.__i = (var4.maxX - Scene_cameraX << 8) / var9;
-                  var4.__j = (var4.minY - Scene_cameraY << 8) / var9;
-                  var4.__s = (var4.maxY - Scene_cameraY << 8) / var9;
+                  var4.field657 = (var4.minX - Scene_cameraX << 8) / var8;
+                  var4.field658 = (var4.maxX - Scene_cameraX << 8) / var8;
+                  var4.field661 = (var4.minY - Scene_cameraY << 8) / var8;
+                  var4.field662 = (var4.maxY - Scene_cameraY << 8) / var8;
                   Scene_currentOccluders[Scene_currentOccludersCount++] = var4;
                }
             }
-         } else if(var4.type == 4) {
+         } else if (var4.type == 4) {
             var5 = var4.minY - Scene_cameraY;
-            if(var5 > 128) {
+            if (var5 > 128) {
                var6 = var4.minTileY - Scene_cameraYTile + 25;
-               if(var6 < 0) {
+               if (var6 < 0) {
                   var6 = 0;
                }
 
                var7 = var4.maxTileY - Scene_cameraYTile + 25;
-               if(var7 > 50) {
+               if (var7 > 50) {
                   var7 = 50;
                }
 
-               if(var6 <= var7) {
-                  int var8 = var4.minTileX - Scene_cameraXTile + 25;
-                  if(var8 < 0) {
-                     var8 = 0;
+               if (var6 <= var7) {
+                  int var10 = var4.minTileX - Scene_cameraXTile + 25;
+                  if (var10 < 0) {
+                     var10 = 0;
                   }
 
-                  var9 = var4.maxTileX - Scene_cameraXTile + 25;
-                  if(var9 > 50) {
-                     var9 = 50;
+                  var8 = var4.maxTileX - Scene_cameraXTile + 25;
+                  if (var8 > 50) {
+                     var8 = 50;
                   }
 
-                  boolean var10 = false;
+                  boolean var11 = false;
 
-                  label144:
-                  for(int var11 = var8; var11 <= var9; ++var11) {
-                     for(int var12 = var6; var12 <= var7; ++var12) {
-                        if(visibleTiles[var11][var12]) {
-                           var10 = true;
-                           break label144;
+                  label140:
+                  for (int var12 = var10; var12 <= var8; ++var12) {
+                     for (int var13 = var6; var13 <= var7; ++var13) {
+                        if (visibleTiles[var12][var13]) {
+                           var11 = true;
+                           break label140;
                         }
                      }
                   }
 
-                  if(var10) {
-                     var4.__k = 5;
-                     var4.__n = (var4.minX - Scene_cameraX << 8) / var5;
-                     var4.__i = (var4.maxX - Scene_cameraX << 8) / var5;
-                     var4.__a = (var4.minZ - Scene_cameraZ << 8) / var5;
-                     var4.__z = (var4.maxZ - Scene_cameraZ << 8) / var5;
+                  if (var11) {
+                     var4.field656 = 5;
+                     var4.field657 = (var4.minX - Scene_cameraX << 8) / var5;
+                     var4.field658 = (var4.maxX - Scene_cameraX << 8) / var5;
+                     var4.field659 = (var4.minZ - Scene_cameraZ << 8) / var5;
+                     var4.field660 = (var4.maxZ - Scene_cameraZ << 8) / var5;
                      Scene_currentOccluders[Scene_currentOccludersCount++] = var4;
                   }
                }
@@ -2125,28 +2111,28 @@ public class Scene {
    }
 
    @ObfuscatedName("ba")
-   boolean __ba_253(int var1, int var2, int var3) {
-      int var4 = this.__x[var1][var2][var3];
-      if(var4 == -Scene_drawnCount) {
+   boolean method297(int var1, int var2, int var3) {
+      int var4 = this.field769[var1][var2][var3];
+      if (var4 == -Scene_drawnCount) {
          return false;
-      } else if(var4 == Scene_drawnCount) {
+      } else if (var4 == Scene_drawnCount) {
          return true;
       } else {
          int var5 = var2 << 7;
          int var6 = var3 << 7;
-         if(this.__bn_257(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.__bn_257(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.__bn_257(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.__bn_257(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) {
-            this.__x[var1][var2][var3] = Scene_drawnCount;
+         if (this.method301(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method301(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method301(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method301(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) {
+            this.field769[var1][var2][var3] = Scene_drawnCount;
             return true;
          } else {
-            this.__x[var1][var2][var3] = -Scene_drawnCount;
+            this.field769[var1][var2][var3] = -Scene_drawnCount;
             return false;
          }
       }
    }
 
    @ObfuscatedName("bb")
-   boolean __bb_254(int var1, int var2, int var3, int var4) {
-      if(!this.__ba_253(var1, var2, var3)) {
+   boolean method298(int var1, int var2, int var3, int var4) {
+      if (!this.method297(var1, var2, var3)) {
          return false;
       } else {
          int var5 = var2 << 7;
@@ -2155,129 +2141,129 @@ public class Scene {
          int var8 = var7 - 120;
          int var9 = var7 - 230;
          int var10 = var7 - 238;
-         if(var4 < 16) {
-            if(var4 == 1) {
-               if(var5 > Scene_cameraX) {
-                  if(!this.__bn_257(var5, var7, var6)) {
+         if (var4 < 16) {
+            if (var4 == 1) {
+               if (var5 > Scene_cameraX) {
+                  if (!this.method301(var5, var7, var6)) {
                      return false;
                   }
 
-                  if(!this.__bn_257(var5, var7, var6 + 128)) {
+                  if (!this.method301(var5, var7, var6 + 128)) {
                      return false;
                   }
                }
 
-               if(var1 > 0) {
-                  if(!this.__bn_257(var5, var8, var6)) {
+               if (var1 > 0) {
+                  if (!this.method301(var5, var8, var6)) {
                      return false;
                   }
 
-                  if(!this.__bn_257(var5, var8, var6 + 128)) {
+                  if (!this.method301(var5, var8, var6 + 128)) {
                      return false;
                   }
                }
 
-               if(!this.__bn_257(var5, var9, var6)) {
+               if (!this.method301(var5, var9, var6)) {
                   return false;
                }
 
-               if(!this.__bn_257(var5, var9, var6 + 128)) {
+               if (!this.method301(var5, var9, var6 + 128)) {
                   return false;
                }
 
                return true;
             }
 
-            if(var4 == 2) {
-               if(var6 < Scene_cameraZ) {
-                  if(!this.__bn_257(var5, var7, var6 + 128)) {
+            if (var4 == 2) {
+               if (var6 < Scene_cameraZ) {
+                  if (!this.method301(var5, var7, var6 + 128)) {
                      return false;
                   }
 
-                  if(!this.__bn_257(var5 + 128, var7, var6 + 128)) {
+                  if (!this.method301(var5 + 128, var7, var6 + 128)) {
                      return false;
                   }
                }
 
-               if(var1 > 0) {
-                  if(!this.__bn_257(var5, var8, var6 + 128)) {
+               if (var1 > 0) {
+                  if (!this.method301(var5, var8, var6 + 128)) {
                      return false;
                   }
 
-                  if(!this.__bn_257(var5 + 128, var8, var6 + 128)) {
+                  if (!this.method301(var5 + 128, var8, var6 + 128)) {
                      return false;
                   }
                }
 
-               if(!this.__bn_257(var5, var9, var6 + 128)) {
+               if (!this.method301(var5, var9, var6 + 128)) {
                   return false;
                }
 
-               if(!this.__bn_257(var5 + 128, var9, var6 + 128)) {
+               if (!this.method301(var5 + 128, var9, var6 + 128)) {
                   return false;
                }
 
                return true;
             }
 
-            if(var4 == 4) {
-               if(var5 < Scene_cameraX) {
-                  if(!this.__bn_257(var5 + 128, var7, var6)) {
+            if (var4 == 4) {
+               if (var5 < Scene_cameraX) {
+                  if (!this.method301(var5 + 128, var7, var6)) {
                      return false;
                   }
 
-                  if(!this.__bn_257(var5 + 128, var7, var6 + 128)) {
+                  if (!this.method301(var5 + 128, var7, var6 + 128)) {
                      return false;
                   }
                }
 
-               if(var1 > 0) {
-                  if(!this.__bn_257(var5 + 128, var8, var6)) {
+               if (var1 > 0) {
+                  if (!this.method301(var5 + 128, var8, var6)) {
                      return false;
                   }
 
-                  if(!this.__bn_257(var5 + 128, var8, var6 + 128)) {
+                  if (!this.method301(var5 + 128, var8, var6 + 128)) {
                      return false;
                   }
                }
 
-               if(!this.__bn_257(var5 + 128, var9, var6)) {
+               if (!this.method301(var5 + 128, var9, var6)) {
                   return false;
                }
 
-               if(!this.__bn_257(var5 + 128, var9, var6 + 128)) {
+               if (!this.method301(var5 + 128, var9, var6 + 128)) {
                   return false;
                }
 
                return true;
             }
 
-            if(var4 == 8) {
-               if(var6 > Scene_cameraZ) {
-                  if(!this.__bn_257(var5, var7, var6)) {
+            if (var4 == 8) {
+               if (var6 > Scene_cameraZ) {
+                  if (!this.method301(var5, var7, var6)) {
                      return false;
                   }
 
-                  if(!this.__bn_257(var5 + 128, var7, var6)) {
+                  if (!this.method301(var5 + 128, var7, var6)) {
                      return false;
                   }
                }
 
-               if(var1 > 0) {
-                  if(!this.__bn_257(var5, var8, var6)) {
+               if (var1 > 0) {
+                  if (!this.method301(var5, var8, var6)) {
                      return false;
                   }
 
-                  if(!this.__bn_257(var5 + 128, var8, var6)) {
+                  if (!this.method301(var5 + 128, var8, var6)) {
                      return false;
                   }
                }
 
-               if(!this.__bn_257(var5, var9, var6)) {
+               if (!this.method301(var5, var9, var6)) {
                   return false;
                }
 
-               if(!this.__bn_257(var5 + 128, var9, var6)) {
+               if (!this.method301(var5 + 128, var9, var6)) {
                   return false;
                }
 
@@ -2285,37 +2271,37 @@ public class Scene {
             }
          }
 
-         return !this.__bn_257(var5 + 64, var10, var6 + 64)?false:(var4 == 16?this.__bn_257(var5, var9, var6 + 128):(var4 == 32?this.__bn_257(var5 + 128, var9, var6 + 128):(var4 == 64?this.__bn_257(var5 + 128, var9, var6):(var4 == 128?this.__bn_257(var5, var9, var6):true))));
+         return !this.method301(var5 + 64, var10, var6 + 64) ? false : (var4 == 16 ? this.method301(var5, var9, var6 + 128) : (var4 == 32 ? this.method301(var5 + 128, var9, var6 + 128) : (var4 == 64 ? this.method301(var5 + 128, var9, var6) : (var4 == 128 ? this.method301(var5, var9, var6) : true))));
       }
    }
 
    @ObfuscatedName("bs")
-   boolean __bs_255(int var1, int var2, int var3, int var4) {
-      if(!this.__ba_253(var1, var2, var3)) {
+   boolean method299(int var1, int var2, int var3, int var4) {
+      if (!this.method297(var1, var2, var3)) {
          return false;
       } else {
          int var5 = var2 << 7;
          int var6 = var3 << 7;
-         return this.__bn_257(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.__bn_257(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.__bn_257(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.__bn_257(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1);
+         return this.method301(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method301(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method301(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method301(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1);
       }
    }
 
    @ObfuscatedName("bq")
-   boolean __bq_256(int var1, int var2, int var3, int var4, int var5, int var6) {
+   boolean method300(int var1, int var2, int var3, int var4, int var5, int var6) {
       int var7;
       int var8;
-      if(var3 == var2 && var5 == var4) {
-         if(!this.__ba_253(var1, var2, var4)) {
+      if (var3 == var2 && var5 == var4) {
+         if (!this.method297(var1, var2, var4)) {
             return false;
          } else {
             var7 = var2 << 7;
             var8 = var4 << 7;
-            return this.__bn_257(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.__bn_257(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.__bn_257(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.__bn_257(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1);
+            return this.method301(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method301(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method301(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method301(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1);
          }
       } else {
-         for(var7 = var2; var7 <= var3; ++var7) {
-            for(var8 = var4; var8 <= var5; ++var8) {
-               if(this.__x[var1][var7][var8] == -Scene_drawnCount) {
+         for (var7 = var2; var7 <= var3; ++var7) {
+            for (var8 = var4; var8 <= var5; ++var8) {
+               if (this.field769[var1][var7][var8] == -Scene_drawnCount) {
                   return false;
                }
             }
@@ -2324,17 +2310,17 @@ public class Scene {
          var7 = (var2 << 7) + 1;
          var8 = (var4 << 7) + 2;
          int var9 = this.tileHeights[var1][var2][var4] - var6;
-         if(!this.__bn_257(var7, var9, var8)) {
+         if (!this.method301(var7, var9, var8)) {
             return false;
          } else {
             int var10 = (var3 << 7) - 1;
-            if(!this.__bn_257(var10, var9, var8)) {
+            if (!this.method301(var10, var9, var8)) {
                return false;
             } else {
                int var11 = (var5 << 7) - 1;
-               if(!this.__bn_257(var7, var9, var11)) {
+               if (!this.method301(var7, var9, var11)) {
                   return false;
-               } else if(!this.__bn_257(var10, var9, var11)) {
+               } else if (!this.method301(var10, var9, var11)) {
                   return false;
                } else {
                   return true;
@@ -2345,66 +2331,66 @@ public class Scene {
    }
 
    @ObfuscatedName("bn")
-   boolean __bn_257(int var1, int var2, int var3) {
-      for(int var4 = 0; var4 < Scene_currentOccludersCount; ++var4) {
+   boolean method301(int var1, int var2, int var3) {
+      for (int var4 = 0; var4 < Scene_currentOccludersCount; ++var4) {
          Occluder var5 = Scene_currentOccluders[var4];
          int var6;
          int var7;
          int var8;
          int var9;
          int var10;
-         if(var5.__k == 1) {
+         if (var5.field656 == 1) {
             var6 = var5.minX - var1;
-            if(var6 > 0) {
-               var7 = (var6 * var5.__a >> 8) + var5.minZ;
-               var8 = (var6 * var5.__z >> 8) + var5.maxZ;
-               var9 = (var6 * var5.__j >> 8) + var5.minY;
-               var10 = (var6 * var5.__s >> 8) + var5.maxY;
-               if(var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) {
+            if (var6 > 0) {
+               var7 = (var6 * var5.field659 >> 8) + var5.minZ;
+               var8 = (var6 * var5.field660 >> 8) + var5.maxZ;
+               var9 = (var6 * var5.field661 >> 8) + var5.minY;
+               var10 = (var6 * var5.field662 >> 8) + var5.maxY;
+               if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) {
                   return true;
                }
             }
-         } else if(var5.__k == 2) {
+         } else if (var5.field656 == 2) {
             var6 = var1 - var5.minX;
-            if(var6 > 0) {
-               var7 = (var6 * var5.__a >> 8) + var5.minZ;
-               var8 = (var6 * var5.__z >> 8) + var5.maxZ;
-               var9 = (var6 * var5.__j >> 8) + var5.minY;
-               var10 = (var6 * var5.__s >> 8) + var5.maxY;
-               if(var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) {
+            if (var6 > 0) {
+               var7 = (var6 * var5.field659 >> 8) + var5.minZ;
+               var8 = (var6 * var5.field660 >> 8) + var5.maxZ;
+               var9 = (var6 * var5.field661 >> 8) + var5.minY;
+               var10 = (var6 * var5.field662 >> 8) + var5.maxY;
+               if (var3 >= var7 && var3 <= var8 && var2 >= var9 && var2 <= var10) {
                   return true;
                }
             }
-         } else if(var5.__k == 3) {
+         } else if (var5.field656 == 3) {
             var6 = var5.minZ - var3;
-            if(var6 > 0) {
-               var7 = (var6 * var5.__n >> 8) + var5.minX;
-               var8 = (var6 * var5.__i >> 8) + var5.maxX;
-               var9 = (var6 * var5.__j >> 8) + var5.minY;
-               var10 = (var6 * var5.__s >> 8) + var5.maxY;
-               if(var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) {
+            if (var6 > 0) {
+               var7 = (var6 * var5.field657 >> 8) + var5.minX;
+               var8 = (var6 * var5.field658 >> 8) + var5.maxX;
+               var9 = (var6 * var5.field661 >> 8) + var5.minY;
+               var10 = (var6 * var5.field662 >> 8) + var5.maxY;
+               if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) {
                   return true;
                }
             }
-         } else if(var5.__k == 4) {
+         } else if (var5.field656 == 4) {
             var6 = var3 - var5.minZ;
-            if(var6 > 0) {
-               var7 = (var6 * var5.__n >> 8) + var5.minX;
-               var8 = (var6 * var5.__i >> 8) + var5.maxX;
-               var9 = (var6 * var5.__j >> 8) + var5.minY;
-               var10 = (var6 * var5.__s >> 8) + var5.maxY;
-               if(var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) {
+            if (var6 > 0) {
+               var7 = (var6 * var5.field657 >> 8) + var5.minX;
+               var8 = (var6 * var5.field658 >> 8) + var5.maxX;
+               var9 = (var6 * var5.field661 >> 8) + var5.minY;
+               var10 = (var6 * var5.field662 >> 8) + var5.maxY;
+               if (var1 >= var7 && var1 <= var8 && var2 >= var9 && var2 <= var10) {
                   return true;
                }
             }
-         } else if(var5.__k == 5) {
+         } else if (var5.field656 == 5) {
             var6 = var2 - var5.minY;
-            if(var6 > 0) {
-               var7 = (var6 * var5.__n >> 8) + var5.minX;
-               var8 = (var6 * var5.__i >> 8) + var5.maxX;
-               var9 = (var6 * var5.__a >> 8) + var5.minZ;
-               var10 = (var6 * var5.__z >> 8) + var5.maxZ;
-               if(var1 >= var7 && var1 <= var8 && var3 >= var9 && var3 <= var10) {
+            if (var6 > 0) {
+               var7 = (var6 * var5.field657 >> 8) + var5.minX;
+               var8 = (var6 * var5.field658 >> 8) + var5.maxX;
+               var9 = (var6 * var5.field659 >> 8) + var5.minZ;
+               var10 = (var6 * var5.field660 >> 8) + var5.maxZ;
+               if (var1 >= var7 && var1 <= var8 && var3 >= var9 && var3 <= var10) {
                   return true;
                }
             }
@@ -2434,23 +2420,23 @@ public class Scene {
 
    @ObfuscatedName("at")
    @Export("Scene_buildVisiblityMap")
-   public static void Scene_buildVisiblityMap(int[] var0, int var1, int var2, int var3, int var4) {
+   public static void Scene_buildVisiblityMap(int[] var0, int var1, int var2, int viewportWidth, int viewportHeight) {
       Scene_viewportXMin = 0;
       Scene_viewportYMin = 0;
-      Scene_viewportXMax = var3;
-      Scene_viewportYMax = var4;
-      Scene_viewportXCenter = var3 / 2;
-      Scene_viewportYCenter = var4 / 2;
+      Scene_viewportXMax = viewportWidth;
+      Scene_viewportYMax = viewportHeight;
+      Scene_viewportXCenter = viewportWidth / 2;
+      Scene_viewportYCenter = viewportHeight / 2;
       boolean[][][][] var5 = new boolean[var0.length][32][53][53];
 
       int var6;
       int var7;
       int var8;
       int var9;
+      int var10;
       int var11;
-      int var12;
-      for(var6 = 128; var6 <= 383; var6 += 32) {
-         for(var7 = 0; var7 < 2048; var7 += 64) {
+      for (var6 = 128; var6 <= 383; var6 += 32) {
+         for (var7 = 0; var7 < 2048; var7 += 64) {
             Scene_cameraPitchSine = Rasterizer3D.Rasterizer3D_sine[var6];
             Scene_cameraPitchCosine = Rasterizer3D.Rasterizer3D_cosine[var6];
             Scene_cameraYawSine = Rasterizer3D.Rasterizer3D_sine[var7];
@@ -2458,50 +2444,50 @@ public class Scene {
             var8 = (var6 - 128) / 32;
             var9 = var7 / 64;
 
-            for(int var10 = -26; var10 < 26; ++var10) {
-               for(var11 = -26; var11 < 26; ++var11) {
-                  var12 = var10 * 128;
-                  int var13 = var11 * 128;
+            for (int var12 = -26; var12 < 26; ++var12) {
+               for (var10 = -26; var10 < 26; ++var10) {
+                  var11 = var12 * 128;
+                  int var13 = var10 * 128;
                   boolean var14 = false;
 
-                  for(int var15 = -var1; var15 <= var2; var15 += 128) {
-                     if(method3100(var12, var0[var8] + var15, var13)) {
+                  for (int var15 = -var1; var15 <= var2; var15 += 128) {
+                     if (method3100(var11, var0[var8] + var15, var13)) {
                         var14 = true;
                         break;
                      }
                   }
 
-                  var5[var8][var9][var10 + 1 + 25][var11 + 1 + 25] = var14;
+                  var5[var8][var9][var12 + 1 + 25][var10 + 1 + 25] = var14;
                }
             }
          }
       }
 
-      for(var6 = 0; var6 < 8; ++var6) {
-         for(var7 = 0; var7 < 32; ++var7) {
-            for(var8 = -25; var8 < 25; ++var8) {
-               for(var9 = -25; var9 < 25; ++var9) {
+      for (var6 = 0; var6 < 8; ++var6) {
+         for (var7 = 0; var7 < 32; ++var7) {
+            for (var8 = -25; var8 < 25; ++var8) {
+               for (var9 = -25; var9 < 25; ++var9) {
                   boolean var16 = false;
 
                   label76:
-                  for(var11 = -1; var11 <= 1; ++var11) {
-                     for(var12 = -1; var12 <= 1; ++var12) {
-                        if(var5[var6][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) {
+                  for (var10 = -1; var10 <= 1; ++var10) {
+                     for (var11 = -1; var11 <= 1; ++var11) {
+                        if (var5[var6][var7][var8 + var10 + 1 + 25][var9 + var11 + 1 + 25]) {
                            var16 = true;
                            break label76;
                         }
 
-                        if(var5[var6][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) {
+                        if (var5[var6][(var7 + 1) % 31][var8 + var10 + 1 + 25][var9 + var11 + 1 + 25]) {
                            var16 = true;
                            break label76;
                         }
 
-                        if(var5[var6 + 1][var7][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) {
+                        if (var5[var6 + 1][var7][var8 + var10 + 1 + 25][var9 + var11 + 1 + 25]) {
                            var16 = true;
                            break label76;
                         }
 
-                        if(var5[var6 + 1][(var7 + 1) % 31][var8 + var11 + 1 + 25][var9 + var12 + 1 + 25]) {
+                        if (var5[var6 + 1][(var7 + 1) % 31][var8 + var10 + 1 + 25][var9 + var11 + 1 + 25]) {
                            var16 = true;
                            break label76;
                         }
@@ -2522,7 +2508,7 @@ public class Scene {
       int var4 = var2 * Scene_cameraYawCosine - var0 * Scene_cameraYawSine >> 16;
       int var5 = var4 * Scene_cameraPitchCosine + Scene_cameraPitchSine * var1 >> 16;
       int var6 = Scene_cameraPitchCosine * var1 - var4 * Scene_cameraPitchSine >> 16;
-      if(var5 >= 50 && var5 <= 3500) {
+      if (var5 >= 50 && var5 <= 3500) {
          int var7 = var3 * 128 / var5 + Scene_viewportXCenter;
          int var8 = var6 * 128 / var5 + Scene_viewportYCenter;
          return var7 >= Scene_viewportXMin && var7 <= Scene_viewportXMax && var8 >= Scene_viewportYMin && var8 <= Scene_viewportYMax;
@@ -2545,9 +2531,9 @@ public class Scene {
    @ObfuscatedName("ax")
    static final int method3108(int var0, int var1) {
       var1 = (var0 & 127) * var1 >> 7;
-      if(var1 < 2) {
+      if (var1 < 2) {
          var1 = 2;
-      } else if(var1 > 126) {
+      } else if (var1 > 126) {
          var1 = 126;
       }
 
@@ -2557,19 +2543,47 @@ public class Scene {
    @Export("containsBounds")
    @ObfuscatedName("af")
    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) {
+      if (var1 < var2 && var1 < var3 && var1 < var4) {
          return false;
-      } else if(var1 > var2 && var1 > var3 && var1 > var4) {
+      } else if (var1 > var2 && var1 > var3 && var1 > var4) {
          return false;
-      } else if(var0 < var5 && var0 < var6 && var0 < var7) {
+      } else if (var0 < var5 && var0 < var6 && var0 < var7) {
          return false;
-      } else if(var0 > var5 && var0 > var6 && var0 > var7) {
+      } else if (var0 > var5 && var0 > var6 && var0 > var7) {
          return false;
       } else {
          int var8 = (var1 - var2) * (var6 - var5) - (var0 - var5) * (var3 - var2);
          int var9 = (var7 - var6) * (var1 - var3) - (var0 - var6) * (var4 - var3);
          int var10 = (var5 - var7) * (var1 - var4) - (var2 - var4) * (var0 - var7);
-         return var8 == 0?(var9 != 0?(var9 < 0?var10 <= 0:var10 >= 0):true):(var8 < 0?var9 <= 0 && var10 <= 0:var9 >= 0 && var10 >= 0);
+         return var8 == 0 ? (var9 != 0 ? (var9 < 0 ? var10 <= 0 : var10 >= 0) : true) : (var8 < 0 ? var9 <= 0 && var10 <= 0 : var9 >= 0 && var10 >= 0);
       }
    }
+
+   static {
+      Scene_isLowDetail = true;
+      tileUpdateCount = 0;
+      Scene_plane = 0;
+      gameObjects = new GameObject[100];
+      checkClick = false;
+      Scene_selectedPlane = 0;
+      Scene_selectedScreenX = 0;
+      Scene_selectedScreenY = 0;
+      Scene_selectedX = -1;
+      Scene_selectedY = -1;
+      viewportWalking = false;
+      Scene_planesCount = 4;
+      Scene_planeOccluderCounts = new int[Scene_planesCount];
+      Scene_planeOccluders = new Occluder[Scene_planesCount][500];
+      Scene_currentOccludersCount = 0;
+      Scene_currentOccluders = new Occluder[500];
+      Scene_tilesDeque = new NodeDeque();
+      field762 = new int[]{19, 55, 38, 155, 255, 110, 137, 205, 76};
+      field763 = new int[]{160, 192, 80, 96, 0, 144, 80, 48, 160};
+      field764 = new int[]{76, 8, 137, 4, 0, 1, 38, 2, 19};
+      field765 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0};
+      field766 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4};
+      field767 = new int[]{0, 4, 4, 8, 0, 0, 8, 0, 0};
+      field768 = new int[]{1, 1, 0, 0, 0, 8, 0, 0, 8};
+      visibilityMap = new boolean[8][32][51][51];
+   }
 }
diff --git a/runescape-client/src/main/java/Script.java b/runescape-client/src/main/java/Script.java
index 585a8793b2..83c0f47574 100644
--- a/runescape-client/src/main/java/Script.java
+++ b/runescape-client/src/main/java/Script.java
@@ -53,16 +53,12 @@ public class Script extends DualNode {
    @Export("switches")
    IterableNodeHashTable[] switches;
 
-   static {
-      Script_cached = new EvictingDualNodeHashTable(128);
-   }
-
    @ObfuscatedName("o")
    @ObfuscatedSignature(
       signature = "(II)[Llh;",
       garbageValue = "-729647116"
    )
-   IterableNodeHashTable[] __o_164(int var1) {
+   IterableNodeHashTable[] method302(int var1) {
       return new IterableNodeHashTable[var1];
    }
 
@@ -73,9 +69,10 @@ public class Script extends DualNode {
    )
    static void method2216(int var0) {
       ItemContainer var1 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
-      if(var1 != null) {
+      if (var1 != null) {
          var1.remove();
       }
+
    }
 
    @ObfuscatedName("e")
@@ -115,23 +112,26 @@ public class Script extends DualNode {
       garbageValue = "-1584807244"
    )
    static void method2201(SequenceDefinition var0, int var1, int var2, int var3) {
-      if(Client.soundEffectCount < 50 && Client.__client_qc != 0) {
-         if(var0.__e != null && var1 < var0.__e.length) {
-            int var4 = var0.__e[var1];
-            if(var4 != 0) {
-               int var5 = var4 >> 8;
-               int var6 = var4 >> 4 & 7;
-               int var7 = var4 & 15;
-               Client.soundEffectIds[Client.soundEffectCount] = var5;
-               Client.queuedSoundEffectLoops[Client.soundEffectCount] = var6;
-               Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0;
-               Client.soundEffects[Client.soundEffectCount] = null;
-               int var8 = (var2 - 64) / 128;
-               int var9 = (var3 - 64) / 128;
-               Client.soundLocations[Client.soundEffectCount] = var7 + (var9 << 8) + (var8 << 16);
-               ++Client.soundEffectCount;
-            }
+      if (Client.soundEffectCount < 50 && Client.field115 != 0 && var0.field776 != null && var1 < var0.field776.length) {
+         int var4 = var0.field776[var1];
+         if (var4 != 0) {
+            int var5 = var4 >> 8;
+            int var6 = var4 >> 4 & 7;
+            int var7 = var4 & 15;
+            Client.soundEffectIds[Client.soundEffectCount] = var5;
+            Client.queuedSoundEffectLoops[Client.soundEffectCount] = var6;
+            Client.queuedSoundEffectDelays[Client.soundEffectCount] = 0;
+            Client.soundEffects[Client.soundEffectCount] = null;
+            int var8 = (var2 - 64) / 128;
+            int var9 = (var3 - 64) / 128;
+            Client.soundLocations[Client.soundEffectCount] = var7 + (var9 << 8) + (var8 << 16);
+            ++Client.soundEffectCount;
          }
       }
+
+   }
+
+   static {
+      Script_cached = new EvictingDualNodeHashTable(128);
    }
 }
diff --git a/runescape-client/src/main/java/ScriptEvent.java b/runescape-client/src/main/java/ScriptEvent.java
index a772be2e8d..0753934907 100644
--- a/runescape-client/src/main/java/ScriptEvent.java
+++ b/runescape-client/src/main/java/ScriptEvent.java
@@ -3,6 +3,7 @@ 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("by")
 @Implements("ScriptEvent")
@@ -74,7 +75,7 @@ public class ScriptEvent extends Node {
    @ObfuscatedGetter(
       intValue = -2138736593
    )
-   int __d;
+   int field772;
    @ObfuscatedName("k")
    @ObfuscatedGetter(
       intValue = -161292529
@@ -92,8 +93,8 @@ public class ScriptEvent extends Node {
       garbageValue = "723852511"
    )
    @Export("setArgs")
-   public void setArgs(Object[] var1) {
-      this.args0 = var1;
+   public void setArgs(Object[] args) {
+      this.args0 = args;
    }
 
    @ObfuscatedName("f")
@@ -102,8 +103,8 @@ public class ScriptEvent extends Node {
       garbageValue = "-110"
    )
    @Export("setType")
-   public void setType(int var1) {
-      this.type0 = var1;
+   public void setType(int type) {
+      this.type0 = type;
    }
 
    @ObfuscatedName("j")
@@ -112,51 +113,51 @@ public class ScriptEvent extends Node {
       garbageValue = "0"
    )
    static int method1185(int var0, Script var1, boolean var2) {
-      Widget var3 = var2?WorldMapIcon1.__t_i:class12.__n_n;
-      if(var0 == 1600) {
+      Widget var3 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111;
+      if (var0 == ScriptOpcodes.CC_GETSCROLLX) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollX;
          return 1;
-      } else if(var0 == 1601) {
+      } else if (var0 == ScriptOpcodes.CC_GETSCROLLY) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollY;
          return 1;
-      } else if(var0 == 1602) {
+      } else if (var0 == ScriptOpcodes.CC_GETTEXT) {
          Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.text;
          return 1;
-      } else if(var0 == 1603) {
+      } else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollWidth;
          return 1;
-      } else if(var0 == 1604) {
+      } else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.scrollHeight;
          return 1;
-      } else if(var0 == 1605) {
+      } else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelZoom;
          return 1;
-      } else if(var0 == 1606) {
+      } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelAngleX;
          return 1;
-      } else if(var0 == 1607) {
+      } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelAngleZ;
          return 1;
-      } else if(var0 == 1608) {
+      } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelAngleY;
          return 1;
-      } else if(var0 == 1609) {
+      } else if (var0 == ScriptOpcodes.CC_GETTRANS) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.transparency;
          return 1;
-      } else if(var0 == 1610) {
-         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.__af;
+      } else if (var0 == 1610) {
+         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.field960;
          return 1;
-      } else if(var0 == 1611) {
+      } else if (var0 == ScriptOpcodes.CC_GETCOLOUR) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.color;
          return 1;
-      } else if(var0 == 1612) {
+      } else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.color2;
          return 1;
-      } else if(var0 == 1613) {
+      } else if (var0 == 1613) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.rectangleMode.rsOrdinal();
          return 1;
-      } else if(var0 == 1614) {
-         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.__bv?1:0;
+      } else if (var0 == 1614) {
+         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0;
          return 1;
       } else {
          return 2;
@@ -169,119 +170,119 @@ public class ScriptEvent extends Node {
       garbageValue = "1256509027"
    )
    static int method1187(int var0, Script var1, boolean var2) {
-      if(var0 == 3300) {
+      if (var0 == ScriptOpcodes.CLIENTCLOCK) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.cycle;
          return 1;
       } else {
          int var3;
          int var4;
-         if(var0 == 3301) {
+         if (var0 == ScriptOpcodes.INV_GETOBJ) {
             RouteStrategy.Interpreter_intStackSize -= 2;
             var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
             var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class83.method2027(var3, var4);
             return 1;
-         } else if(var0 == 3302) {
+         } else if (var0 == ScriptOpcodes.INV_GETNUM) {
             RouteStrategy.Interpreter_intStackSize -= 2;
             var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
             var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapLabel.method442(var3, var4);
             return 1;
-         } else if(var0 == 3303) {
+         } else if (var0 == ScriptOpcodes.INV_TOTAL) {
             RouteStrategy.Interpreter_intStackSize -= 2;
             var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
             var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class1.method18(var3, var4);
             return 1;
-         } else if(var0 == 3304) {
+         } else if (var0 == ScriptOpcodes.INV_SIZE) {
             var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-            Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class231.method4523(var3).size;
+            Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapDecorationType.getInvDefinition(var3).size;
             return 1;
-         } else if(var0 == 3305) {
+         } else if (var0 == ScriptOpcodes.STAT) {
             var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.currentLevels[var3];
             return 1;
-         } else if(var0 == 3306) {
+         } else if (var0 == ScriptOpcodes.STAT_BASE) {
             var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.levels[var3];
             return 1;
-         } else if(var0 == 3307) {
+         } else if (var0 == ScriptOpcodes.STAT_XP) {
             var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.experience[var3];
             return 1;
          } else {
             int var5;
-            if(var0 == 3308) {
+            if (var0 == ScriptOpcodes.COORD) {
                var3 = SoundSystem.plane;
                var4 = (Canvas.localPlayer.x >> 7) + class50.baseX;
                var5 = (Canvas.localPlayer.y >> 7) + GraphicsObject.baseY;
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28);
                return 1;
-            } else if(var0 == 3309) {
+            } else if (var0 == ScriptOpcodes.COORDX) {
                var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 >> 14 & 16383;
                return 1;
-            } else if(var0 == 3310) {
+            } else if (var0 == ScriptOpcodes.COORDZ) {
                var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 >> 28;
                return 1;
-            } else if(var0 == 3311) {
+            } else if (var0 == ScriptOpcodes.COORDY) {
                var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 & 16383;
                return 1;
-            } else if(var0 == 3312) {
-               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.isMembersWorld?1:0;
+            } else if (var0 == ScriptOpcodes.MAP_MEMBERS) {
+               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0;
                return 1;
-            } else if(var0 == 3313) {
+            } else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) {
                RouteStrategy.Interpreter_intStackSize -= 2;
                var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] + 32768;
                var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class83.method2027(var3, var4);
                return 1;
-            } else if(var0 == 3314) {
+            } else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) {
                RouteStrategy.Interpreter_intStackSize -= 2;
                var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] + 32768;
                var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapLabel.method442(var3, var4);
                return 1;
-            } else if(var0 == 3315) {
+            } else if (var0 == ScriptOpcodes.INVOTHER_TOTAL) {
                RouteStrategy.Interpreter_intStackSize -= 2;
                var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] + 32768;
                var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class1.method18(var3, var4);
                return 1;
-            } else if(var0 == 3316) {
-               if(Client.rights >= 2) {
-                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.rights;
+            } else if (var0 == ScriptOpcodes.STAFFMODLEVEL) {
+               if (Client.staffModLevel >= 2) {
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.staffModLevel;
                } else {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
                }
 
                return 1;
-            } else if(var0 == 3317) {
+            } else if (var0 == ScriptOpcodes.REBOOTTIMER) {
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.rebootTimer;
                return 1;
-            } else if(var0 == 3318) {
+            } else if (var0 == ScriptOpcodes.MAP_WORLD) {
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.worldId;
                return 1;
-            } else if(var0 == 3321) {
+            } else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) {
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.runEnergy;
                return 1;
-            } else if(var0 == 3322) {
+            } else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) {
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.weight;
                return 1;
-            } else if(var0 == 3323) {
-               if(Client.__client_mn) {
+            } else if (var0 == ScriptOpcodes.PLAYERMOD) {
+               if (Client.playerMod) {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1;
                } else {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
                }
 
                return 1;
-            } else if(var0 == 3324) {
+            } else if (var0 == ScriptOpcodes.WORLDFLAGS) {
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.worldProperties;
                return 1;
-            } else if(var0 == 3325) {
+            } else if (var0 == ScriptOpcodes.MOVECOORD) {
                RouteStrategy.Interpreter_intStackSize -= 4;
                var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
                var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
@@ -307,12 +308,12 @@ public class ScriptEvent extends Node {
    static void method1183(int var0, int var1) {
       int[] var2 = new int[9];
 
-      for(int var3 = 0; var3 < var2.length; ++var3) {
+      for (int var3 = 0; var3 < var2.length; ++var3) {
          int var4 = var3 * 32 + 15 + 128;
          int var5 = var4 * 3 + 600;
-         int var7 = Rasterizer3D.Rasterizer3D_sine[var4];
-         int var6 = method1176(var5, var1);
-         var2[var3] = var6 * var7 >> 16;
+         int var6 = Rasterizer3D.Rasterizer3D_sine[var4];
+         int var7 = method1176(var5, var1);
+         var2[var3] = var7 * var6 >> 16;
       }
 
       Scene.Scene_buildVisiblityMap(var2, 500, 800, var0 * 334 / var1, 334);
@@ -325,13 +326,13 @@ public class ScriptEvent extends Node {
    )
    static int method1176(int var0, int var1) {
       int var2 = var1 - 334;
-      if(var2 < 0) {
+      if (var2 < 0) {
          var2 = 0;
-      } else if(var2 > 100) {
+      } else if (var2 > 100) {
          var2 = 100;
       }
 
-      int var3 = (Client.__client_rb - Client.__client_re) * var2 / 100 + Client.__client_re;
+      int var3 = (Client.field149 - Client.field150) * var2 / 100 + Client.field150;
       return var0 * var3 / 256;
    }
 
@@ -341,9 +342,9 @@ public class ScriptEvent extends Node {
       garbageValue = "35"
    )
    static final void method1179() {
-      for(class68 var0 = (class68)Client.__client_kh.last(); var0 != null; var0 = (class68)Client.__client_kh.previous()) {
-         if(var0.field910 == -1) {
-            var0.field909 = 0;
+      for (PendingSpawn var0 = (PendingSpawn)Client.pendingSpawns.last(); var0 != null; var0 = (PendingSpawn)Client.pendingSpawns.previous()) {
+         if (var0.hitpoints == -1) {
+            var0.delay = 0;
             class13.method165(var0);
          } else {
             var0.remove();
diff --git a/runescape-client/src/main/java/ScriptFrame.java b/runescape-client/src/main/java/ScriptFrame.java
index c31e812dc4..dae5cef950 100644
--- a/runescape-client/src/main/java/ScriptFrame.java
+++ b/runescape-client/src/main/java/ScriptFrame.java
@@ -36,12 +36,12 @@ public class ScriptFrame {
       garbageValue = "-1726705535"
    )
    @Export("findEnumerated")
-   public static Enumerated findEnumerated(Enumerated[] var0, int var1) {
-      Enumerated[] var2 = var0;
+   public static Enumerated findEnumerated(Enumerated[] values, int ordinal) {
+      Enumerated[] var2 = values;
 
-      for(int var3 = 0; var3 < var2.length; ++var3) {
+      for (int var3 = 0; var3 < var2.length; ++var3) {
          Enumerated var4 = var2[var3];
-         if(var1 == var4.rsOrdinal()) {
+         if (ordinal == var4.rsOrdinal()) {
             return var4;
          }
       }
@@ -55,12 +55,12 @@ public class ScriptFrame {
       garbageValue = "-423549686"
    )
    static void method1138() {
-      if(ClientParameter.field3645 != null) {
-         Client.__client_ss = Client.cycle;
+      if (ClientParameter.field3645 != null) {
+         Client.field104 = Client.cycle;
          ClientParameter.field3645.method4719();
 
-         for(int var0 = 0; var0 < Client.players.length; ++var0) {
-            if(Client.players[var0] != null) {
+         for (int var0 = 0; var0 < Client.players.length; ++var0) {
+            if (Client.players[var0] != null) {
                ClientParameter.field3645.method4738((Client.players[var0].x >> 7) + class50.baseX, (Client.players[var0].y >> 7) + GraphicsObject.baseY);
             }
          }
diff --git a/runescape-client/src/main/java/SecureRandomCallable.java b/runescape-client/src/main/java/SecureRandomCallable.java
index fcfe23f2ec..4a855b6eb9 100644
--- a/runescape-client/src/main/java/SecureRandomCallable.java
+++ b/runescape-client/src/main/java/SecureRandomCallable.java
@@ -23,7 +23,7 @@ public class SecureRandomCallable implements Callable {
       garbageValue = "64"
    )
    static class27 method1145(byte[] var0) {
-      return var0 == null?new class27():new class27(class27.convertJpgToSprite(var0).pixels);
+      return var0 == null ? new class27() : new class27(class27.convertJpgToSprite(var0).pixels);
    }
 
    @ObfuscatedName("m")
@@ -33,13 +33,13 @@ public class SecureRandomCallable implements Callable {
    )
    public static VarpDefinition method1140(int var0) {
       VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0);
-      if(var1 != null) {
+      if (var1 != null) {
          return var1;
       } else {
-         byte[] var2 = VarpDefinition.__ix_m.takeRecord(16, var0);
+         byte[] var2 = VarpDefinition.field943.takeFile(16, var0);
          var1 = new VarpDefinition();
-         if(var2 != null) {
-            var1.read(new Buffer(var2));
+         if (var2 != null) {
+            var1.decode(new Buffer(var2));
          }
 
          VarpDefinition.VarpDefinition_cached.put(var1, (long)var0);
@@ -52,25 +52,25 @@ public class SecureRandomCallable implements Callable {
       signature = "(IIII)Lbx;",
       garbageValue = "329127611"
    )
-   static final WidgetGroupParent method1143(int var0, int var1, int var2) {
-      WidgetGroupParent var3 = new WidgetGroupParent();
+   static final InterfaceParent method1143(int var0, int var1, int var2) {
+      InterfaceParent var3 = new InterfaceParent();
       var3.group = var1;
       var3.type = var2;
-      Client.widgetGroupParents.put(var3, (long)var0);
+      Client.interfaceParents.put(var3, (long)var0);
       DevicePcmPlayerProvider.method845(var1);
       Widget var4 = Huffman.getWidget(var0);
-      class22.method295(var4);
-      if(Client.__client_mo != null) {
-         class22.method295(Client.__client_mo);
-         Client.__client_mo = null;
+      WorldMapRectangle.method295(var4);
+      if (Client.field127 != null) {
+         WorldMapRectangle.method295(Client.field127);
+         Client.field127 = null;
       }
 
       int var5;
       int var6;
-      for(var5 = 0; var5 < Client.menuOptionsCount; ++var5) {
-         if(WorldMapManager.isWidgetMenuOpcode(Client.menuOpcodes[var5])) {
-            if(var5 < Client.menuOptionsCount - 1) {
-               for(var6 = var5; var6 < Client.menuOptionsCount - 1; ++var6) {
+      for (var5 = 0; var5 < Client.menuOptionsCount; ++var5) {
+         if (WorldMapManager.isWidgetMenuOpcode(Client.menuOpcodes[var5])) {
+            if (var5 < Client.menuOptionsCount - 1) {
+               for (var6 = var5; var6 < Client.menuOptionsCount - 1; ++var6) {
                   Client.menuActions[var6] = Client.menuActions[var6 + 1];
                   Client.menuTargetNames[var6] = Client.menuTargetNames[var6 + 1];
                   Client.menuOpcodes[var6] = Client.menuOpcodes[var6 + 1];
@@ -86,24 +86,24 @@ public class SecureRandomCallable implements Callable {
          }
       }
 
-      var5 = class214.menuWidth / 2 + class25.menuX;
+      var5 = class214.menuWidth / 2 + WorldMapDecoration.menuX;
       var6 = GameShell.menuY;
       int var7 = class2.fontBold12.stringWidth("Choose Option");
 
       int var8;
-      for(var8 = 0; var8 < Client.menuOptionsCount; ++var8) {
+      for (var8 = 0; var8 < Client.menuOptionsCount; ++var8) {
          Font var9 = class2.fontBold12;
          String var10;
-         if(var8 < 0) {
+         if (var8 < 0) {
             var10 = "";
-         } else if(Client.menuTargetNames[var8].length() > 0) {
+         } else if (Client.menuTargetNames[var8].length() > 0) {
             var10 = Client.menuActions[var8] + " " + Client.menuTargetNames[var8];
          } else {
             var10 = Client.menuActions[var8];
          }
 
          int var11 = var9.stringWidth(var10);
-         if(var11 > var7) {
+         if (var11 > var7) {
             var7 = var11;
          }
       }
@@ -111,31 +111,31 @@ public class SecureRandomCallable implements Callable {
       var7 += 8;
       var8 = Client.menuOptionsCount * 15 + 22;
       int var12 = var5 - var7 / 2;
-      if(var12 + var7 > SoundCache.canvasWidth) {
+      if (var12 + var7 > SoundCache.canvasWidth) {
          var12 = SoundCache.canvasWidth - var7;
       }
 
-      if(var12 < 0) {
+      if (var12 < 0) {
          var12 = 0;
       }
 
       int var13 = var6;
-      if(var8 + var6 > Huffman.canvasHeight) {
+      if (var8 + var6 > Huffman.canvasHeight) {
          var13 = Huffman.canvasHeight - var8;
       }
 
-      if(var13 < 0) {
+      if (var13 < 0) {
          var13 = 0;
       }
 
-      class25.menuX = var12;
+      WorldMapDecoration.menuX = var12;
       GameShell.menuY = var13;
       class214.menuWidth = var7;
       AbstractWorldMapIcon.menuHeight = Client.menuOptionsCount * 15 + 22;
-      class39.revalidateWidgetScroll(Widget.widgets[var0 >> 16], var4, false);
-      WorldMapSection3.runWidgetOnLoadListener(var1);
-      if(Client.rootWidgetGroup != -1) {
-         GrandExchangeEvents.method74(Client.rootWidgetGroup, 1);
+      class39.revalidateWidgetScroll(Widget.interfaceComponents[var0 >> 16], var4, false);
+      WorldMapSection1.runWidgetOnLoadListener(var1);
+      if (Client.rootInterface != -1) {
+         GrandExchangeEvents.method74(Client.rootInterface, 1);
       }
 
       return var3;
diff --git a/runescape-client/src/main/java/SecureRandomFuture.java b/runescape-client/src/main/java/SecureRandomFuture.java
index d9cf7aab24..ee7a481b1e 100644
--- a/runescape-client/src/main/java/SecureRandomFuture.java
+++ b/runescape-client/src/main/java/SecureRandomFuture.java
@@ -21,8 +21,8 @@ public class SecureRandomFuture {
    @ObfuscatedSignature(
       signature = "Lit;"
    )
-   @Export("indexCache5")
-   static IndexCache indexCache5;
+   @Export("archive5")
+   static Archive archive5;
    @ObfuscatedName("jn")
    @ObfuscatedSignature(
       signature = "Ldl;"
@@ -84,7 +84,7 @@ public class SecureRandomFuture {
    static void method2104() {
       Iterator var0 = Messages.Messages_hashTable.iterator();
 
-      while(var0.hasNext()) {
+      while (var0.hasNext()) {
          Message var1 = (Message)var0.next();
          var1.clearIsFromIgnored();
       }
diff --git a/runescape-client/src/main/java/SequenceDefinition.java b/runescape-client/src/main/java/SequenceDefinition.java
index 0223305001..3db6636931 100644
--- a/runescape-client/src/main/java/SequenceDefinition.java
+++ b/runescape-client/src/main/java/SequenceDefinition.java
@@ -11,18 +11,18 @@ public class SequenceDefinition extends DualNode {
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   @Export("SequenceDefinition_indexCache")
-   public static AbstractIndexCache SequenceDefinition_indexCache;
+   @Export("SequenceDefinition_archive")
+   public static AbstractArchive SequenceDefinition_archive;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   public static AbstractIndexCache __jh_f;
+   public static AbstractArchive field773;
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   public static AbstractIndexCache __jh_q;
+   public static AbstractArchive field774;
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "Ler;"
@@ -33,7 +33,7 @@ public class SequenceDefinition extends DualNode {
    @ObfuscatedSignature(
       signature = "Ler;"
    )
-   public static EvictingDualNodeHashTable __jh_o;
+   public static EvictingDualNodeHashTable field775;
    @ObfuscatedName("u")
    @Export("frameIds")
    public int[] frameIds;
@@ -44,7 +44,7 @@ public class SequenceDefinition extends DualNode {
    @Export("frameLengths")
    public int[] frameLengths;
    @ObfuscatedName("e")
-   public int[] __e;
+   public int[] field776;
    @ObfuscatedName("x")
    @ObfuscatedGetter(
       intValue = -736885973
@@ -52,14 +52,14 @@ public class SequenceDefinition extends DualNode {
    @Export("frameCount")
    public int frameCount;
    @ObfuscatedName("d")
-   int[] __d;
+   int[] field777;
    @ObfuscatedName("k")
-   public boolean __k;
+   public boolean field778;
    @ObfuscatedName("n")
    @ObfuscatedGetter(
       intValue = 1309695045
    )
-   public int __n;
+   public int field779;
    @ObfuscatedName("i")
    @ObfuscatedGetter(
       intValue = -1308226131
@@ -76,38 +76,33 @@ public class SequenceDefinition extends DualNode {
    @ObfuscatedGetter(
       intValue = -28345361
    )
-   public int __z;
+   public int field780;
    @ObfuscatedName("j")
    @ObfuscatedGetter(
       intValue = 1339014215
    )
-   public int __j;
+   public int field781;
    @ObfuscatedName("s")
    @ObfuscatedGetter(
       intValue = 2012242069
    )
-   public int __s;
+   public int field782;
    @ObfuscatedName("t")
    @ObfuscatedGetter(
       intValue = 1147391369
    )
-   public int __t;
-
-   static {
-      SequenceDefinition_cached = new EvictingDualNodeHashTable(64);
-      __jh_o = new EvictingDualNodeHashTable(100);
-   }
+   public int field783;
 
    SequenceDefinition() {
       this.frameCount = -1;
-      this.__k = false;
-      this.__n = 5;
+      this.field778 = false;
+      this.field779 = 5;
       this.shield = -1;
       this.weapon = -1;
-      this.__z = 99;
-      this.__j = -1;
-      this.__s = -1;
-      this.__t = 2;
+      this.field780 = 99;
+      this.field781 = -1;
+      this.field782 = -1;
+      this.field783 = 2;
    }
 
    @ObfuscatedName("f")
@@ -115,15 +110,15 @@ public class SequenceDefinition extends DualNode {
       signature = "(Lgr;S)V",
       garbageValue = "259"
    )
-   @Export("read")
-   void read(Buffer var1) {
-      while(true) {
+   @Export("decode")
+   void decode(Buffer var1) {
+      while (true) {
          int var2 = var1.readUnsignedByte();
-         if(var2 == 0) {
+         if (var2 == 0) {
             return;
          }
 
-         this.readNext(var1, var2);
+         this.decodeNext(var1, var2);
       }
    }
 
@@ -132,71 +127,74 @@ public class SequenceDefinition extends DualNode {
       signature = "(Lgr;II)V",
       garbageValue = "154075720"
    )
-   @Export("readNext")
-   void readNext(Buffer var1, int var2) {
-      int var3;
+   @Export("decodeNext")
+   void decodeNext(Buffer var1, int var2) {
+      int[] var3;
       int var4;
-      if(var2 == 1) {
-         var3 = var1.__ag_302();
-         this.frameLengths = new int[var3];
+      int var5;
+      if (var2 == 1) {
+         var4 = var1.readUnsignedShort();
+         this.frameLengths = new int[var4];
 
-         for(var4 = 0; var4 < var3; ++var4) {
-            this.frameLengths[var4] = var1.__ag_302();
+         for (var5 = 0; var5 < var4; ++var5) {
+            this.frameLengths[var5] = var1.readUnsignedShort();
          }
 
-         this.frameIds = new int[var3];
+         this.frameIds = new int[var4];
 
-         for(var4 = 0; var4 < var3; ++var4) {
-            this.frameIds[var4] = var1.__ag_302();
+         for (var5 = 0; var5 < var4; ++var5) {
+            this.frameIds[var5] = var1.readUnsignedShort();
          }
 
-         for(var4 = 0; var4 < var3; ++var4) {
-            this.frameIds[var4] += var1.__ag_302() << 16;
+         for (var5 = 0; var5 < var4; ++var5) {
+            var3 = this.frameIds;
+            var3[var5] += var1.readUnsignedShort() << 16;
          }
-      } else if(var2 == 2) {
-         this.frameCount = var1.__ag_302();
-      } else if(var2 == 3) {
-         var3 = var1.readUnsignedByte();
-         this.__d = new int[var3 + 1];
+      } else if (var2 == 2) {
+         this.frameCount = var1.readUnsignedShort();
+      } else if (var2 == 3) {
+         var4 = var1.readUnsignedByte();
+         this.field777 = new int[var4 + 1];
 
-         for(var4 = 0; var4 < var3; ++var4) {
-            this.__d[var4] = var1.readUnsignedByte();
+         for (var5 = 0; var5 < var4; ++var5) {
+            this.field777[var5] = var1.readUnsignedByte();
          }
 
-         this.__d[var3] = 9999999;
-      } else if(var2 == 4) {
-         this.__k = true;
-      } else if(var2 == 5) {
-         this.__n = var1.readUnsignedByte();
-      } else if(var2 == 6) {
-         this.shield = var1.__ag_302();
-      } else if(var2 == 7) {
-         this.weapon = var1.__ag_302();
-      } else if(var2 == 8) {
-         this.__z = var1.readUnsignedByte();
-      } else if(var2 == 9) {
-         this.__j = var1.readUnsignedByte();
-      } else if(var2 == 10) {
-         this.__s = var1.readUnsignedByte();
-      } else if(var2 == 11) {
-         this.__t = var1.readUnsignedByte();
-      } else if(var2 == 12) {
-         var3 = var1.readUnsignedByte();
-         this.frameIds2 = new int[var3];
+         this.field777[var4] = 9999999;
+      } else if (var2 == 4) {
+         this.field778 = true;
+      } else if (var2 == 5) {
+         this.field779 = var1.readUnsignedByte();
+      } else if (var2 == 6) {
+         this.shield = var1.readUnsignedShort();
+      } else if (var2 == 7) {
+         this.weapon = var1.readUnsignedShort();
+      } else if (var2 == 8) {
+         this.field780 = var1.readUnsignedByte();
+      } else if (var2 == 9) {
+         this.field781 = var1.readUnsignedByte();
+      } else if (var2 == 10) {
+         this.field782 = var1.readUnsignedByte();
+      } else if (var2 == 11) {
+         this.field783 = var1.readUnsignedByte();
+      } else if (var2 == 12) {
+         var4 = var1.readUnsignedByte();
+         this.frameIds2 = new int[var4];
 
-         for(var4 = 0; var4 < var3; ++var4) {
-            this.frameIds2[var4] = var1.__ag_302();
+         for (var5 = 0; var5 < var4; ++var5) {
+            this.frameIds2[var5] = var1.readUnsignedShort();
          }
 
-         for(var4 = 0; var4 < var3; ++var4) {
-            this.frameIds2[var4] += var1.__ag_302() << 16;
+         for (var5 = 0; var5 < var4; ++var5) {
+            var3 = this.frameIds2;
+            var3[var5] += var1.readUnsignedShort() << 16;
          }
-      } else if(var2 == 13) {
-         var3 = var1.readUnsignedByte();
-         this.__e = new int[var3];
+      } else if (var2 == 13) {
+         var4 = var1.readUnsignedByte();
+         this.field776 = new int[var4];
 
-         for(var4 = 0; var4 < var3; ++var4) {
-            this.__e[var4] = var1.readMedium();
+         for (var5 = 0; var5 < var4; ++var5) {
+            this.field776[var5] = var1.readMedium();
          }
       }
 
@@ -207,21 +205,21 @@ public class SequenceDefinition extends DualNode {
       signature = "(B)V",
       garbageValue = "1"
    )
-   @Export("init")
-   void init() {
-      if(this.__j == -1) {
-         if(this.__d != null) {
-            this.__j = 2;
+   @Export("postDecode")
+   void postDecode() {
+      if (this.field781 == -1) {
+         if (this.field777 != null) {
+            this.field781 = 2;
          } else {
-            this.__j = 0;
+            this.field781 = 0;
          }
       }
 
-      if(this.__s == -1) {
-         if(this.__d != null) {
-            this.__s = 2;
+      if (this.field782 == -1) {
+         if (this.field777 != null) {
+            this.field782 = 2;
          } else {
-            this.__s = 0;
+            this.field782 = 0;
          }
       }
 
@@ -233,15 +231,15 @@ public class SequenceDefinition extends DualNode {
       garbageValue = "128527714"
    )
    @Export("animateSequence")
-   public Model animateSequence(Model var1, int var2) {
-      var2 = this.frameIds[var2];
-      Frames var3 = ItemContainer.getFrames(var2 >> 16);
-      var2 &= 65535;
-      if(var3 == null) {
-         return var1.toSharedSequenceModel(true);
+   public Model animateSequence(Model model, int frame) {
+      frame = this.frameIds[frame];
+      Frames var3 = ItemContainer.getFrames(frame >> 16);
+      frame &= 65535;
+      if (var3 == null) {
+         return model.toSharedSequenceModel(true);
       } else {
-         Model var4 = var1.toSharedSequenceModel(!var3.hasAlphaTransform(var2));
-         var4.animate(var3, var2);
+         Model var4 = model.toSharedSequenceModel(!var3.hasAlphaTransform(frame));
+         var4.animate(var3, frame);
          return var4;
       }
    }
@@ -252,29 +250,29 @@ public class SequenceDefinition extends DualNode {
       garbageValue = "-65"
    )
    @Export("animateObject")
-   Model animateObject(Model var1, int var2, int var3) {
-      var2 = this.frameIds[var2];
-      Frames var4 = ItemContainer.getFrames(var2 >> 16);
-      var2 &= 65535;
-      if(var4 == null) {
-         return var1.toSharedSequenceModel(true);
+   Model animateObject(Model model, int frame, int orientation) {
+      frame = this.frameIds[frame];
+      Frames var4 = ItemContainer.getFrames(frame >> 16);
+      frame &= 65535;
+      if (var4 == null) {
+         return model.toSharedSequenceModel(true);
       } else {
-         Model var5 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var2));
-         var3 &= 3;
-         if(var3 == 1) {
+         Model var5 = model.toSharedSequenceModel(!var4.hasAlphaTransform(frame));
+         orientation &= 3;
+         if (orientation == 1) {
             var5.rotateY270Ccw();
-         } else if(var3 == 2) {
+         } else if (orientation == 2) {
             var5.rotateY180();
-         } else if(var3 == 3) {
+         } else if (orientation == 3) {
             var5.rotateY90Ccw();
          }
 
-         var5.animate(var4, var2);
-         if(var3 == 1) {
+         var5.animate(var4, frame);
+         if (orientation == 1) {
             var5.rotateY90Ccw();
-         } else if(var3 == 2) {
+         } else if (orientation == 2) {
             var5.rotateY180();
-         } else if(var3 == 3) {
+         } else if (orientation == 3) {
             var5.rotateY270Ccw();
          }
 
@@ -288,15 +286,15 @@ public class SequenceDefinition extends DualNode {
       garbageValue = "-1692496767"
    )
    @Export("animateSpotAnimation")
-   Model animateSpotAnimation(Model var1, int var2) {
-      var2 = this.frameIds[var2];
-      Frames var3 = ItemContainer.getFrames(var2 >> 16);
-      var2 &= 65535;
-      if(var3 == null) {
-         return var1.toSharedSpotAnimationModel(true);
+   Model animateSpotAnimation(Model model, int frame) {
+      frame = this.frameIds[frame];
+      Frames var3 = ItemContainer.getFrames(frame >> 16);
+      frame &= 65535;
+      if (var3 == null) {
+         return model.toSharedSpotAnimationModel(true);
       } else {
-         Model var4 = var1.toSharedSpotAnimationModel(!var3.hasAlphaTransform(var2));
-         var4.animate(var3, var2);
+         Model var4 = model.toSharedSpotAnimationModel(!var3.hasAlphaTransform(frame));
+         var4.animate(var3, frame);
          return var4;
       }
    }
@@ -307,24 +305,24 @@ public class SequenceDefinition extends DualNode {
       garbageValue = "-386360993"
    )
    @Export("animateSequence2")
-   public Model animateSequence2(Model var1, int var2, SequenceDefinition var3, int var4) {
-      var2 = this.frameIds[var2];
-      Frames var5 = ItemContainer.getFrames(var2 >> 16);
-      var2 &= 65535;
-      if(var5 == null) {
-         return var3.animateSequence(var1, var4);
+   public Model animateSequence2(Model model, int frame, SequenceDefinition sequence, int sequenceFrame) {
+      frame = this.frameIds[frame];
+      Frames var5 = ItemContainer.getFrames(frame >> 16);
+      frame &= 65535;
+      if (var5 == null) {
+         return sequence.animateSequence(model, sequenceFrame);
       } else {
-         var4 = var3.frameIds[var4];
-         Frames var6 = ItemContainer.getFrames(var4 >> 16);
-         var4 &= 65535;
+         sequenceFrame = sequence.frameIds[sequenceFrame];
+         Frames var6 = ItemContainer.getFrames(sequenceFrame >> 16);
+         sequenceFrame &= 65535;
          Model var7;
-         if(var6 == null) {
-            var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2));
-            var7.animate(var5, var2);
+         if (var6 == null) {
+            var7 = model.toSharedSequenceModel(!var5.hasAlphaTransform(frame));
+            var7.animate(var5, frame);
             return var7;
          } else {
-            var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2) & !var6.hasAlphaTransform(var4));
-            var7.animate2(var5, var2, var6, var4, this.__d);
+            var7 = model.toSharedSequenceModel(!var5.hasAlphaTransform(frame) & !var6.hasAlphaTransform(sequenceFrame));
+            var7.animate2(var5, frame, var6, sequenceFrame, this.field777);
             return var7;
          }
       }
@@ -336,32 +334,37 @@ public class SequenceDefinition extends DualNode {
       garbageValue = "-15433768"
    )
    @Export("animateWidget")
-   public Model animateWidget(Model var1, int var2) {
-      int var3 = this.frameIds[var2];
+   public Model animateWidget(Model model, int frame) {
+      int var3 = this.frameIds[frame];
       Frames var4 = ItemContainer.getFrames(var3 >> 16);
       var3 &= 65535;
-      if(var4 == null) {
-         return var1.toSharedSequenceModel(true);
+      if (var4 == null) {
+         return model.toSharedSequenceModel(true);
       } else {
          Frames var5 = null;
          int var6 = 0;
-         if(this.frameIds2 != null && var2 < this.frameIds2.length) {
-            var6 = this.frameIds2[var2];
+         if (this.frameIds2 != null && frame < this.frameIds2.length) {
+            var6 = this.frameIds2[frame];
             var5 = ItemContainer.getFrames(var6 >> 16);
             var6 &= 65535;
          }
 
          Model var7;
-         if(var5 != null && var6 != 65535) {
-            var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3) & !var5.hasAlphaTransform(var6));
+         if (var5 != null && var6 != 65535) {
+            var7 = model.toSharedSequenceModel(!var4.hasAlphaTransform(var3) & !var5.hasAlphaTransform(var6));
             var7.animate(var4, var3);
             var7.animate(var5, var6);
             return var7;
          } else {
-            var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3));
+            var7 = model.toSharedSequenceModel(!var4.hasAlphaTransform(var3));
             var7.animate(var4, var3);
             return var7;
          }
       }
    }
+
+   static {
+      SequenceDefinition_cached = new EvictingDualNodeHashTable(64);
+      field775 = new EvictingDualNodeHashTable(100);
+   }
 }
diff --git a/runescape-client/src/main/java/ServerBuild.java b/runescape-client/src/main/java/ServerBuild.java
index cf133ba7c4..4723592ad8 100644
--- a/runescape-client/src/main/java/ServerBuild.java
+++ b/runescape-client/src/main/java/ServerBuild.java
@@ -11,22 +11,22 @@ public class ServerBuild {
    @ObfuscatedSignature(
       signature = "Liy;"
    )
-   public static final ServerBuild __iy_m;
+   public static final ServerBuild field784;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Liy;"
    )
-   public static final ServerBuild __iy_f;
+   public static final ServerBuild field785;
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Liy;"
    )
-   public static final ServerBuild __iy_q;
+   public static final ServerBuild field786;
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "Liy;"
    )
-   public static final ServerBuild __iy_w;
+   public static final ServerBuild field787;
    @ObfuscatedName("bx")
    @Export("worldsUrl")
    static String worldsUrl;
@@ -34,7 +34,7 @@ public class ServerBuild {
    @ObfuscatedGetter(
       intValue = -365366303
    )
-   static int __iy_lo;
+   static int field788;
    @ObfuscatedName("o")
    @Export("name")
    public final String name;
@@ -45,15 +45,15 @@ public class ServerBuild {
    @Export("id")
    public final int id;
 
-   static {
-      __iy_m = new ServerBuild("LIVE", 0);
-      __iy_f = new ServerBuild("BUILDLIVE", 3);
-      __iy_q = new ServerBuild("RC", 1);
-      __iy_w = new ServerBuild("WIP", 2);
-   }
-
    ServerBuild(String var1, int var2) {
       this.name = var1;
       this.id = var2;
    }
+
+   static {
+      field784 = new ServerBuild("LIVE", 0);
+      field785 = new ServerBuild("BUILDLIVE", 3);
+      field786 = new ServerBuild("RC", 1);
+      field787 = new ServerBuild("WIP", 2);
+   }
 }
diff --git a/runescape-client/src/main/java/ServerPacket.java b/runescape-client/src/main/java/ServerPacket.java
index c0df9ef55c..f5779b1c83 100644
--- a/runescape-client/src/main/java/ServerPacket.java
+++ b/runescape-client/src/main/java/ServerPacket.java
@@ -11,427 +11,427 @@ public class ServerPacket {
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_m;
+   public static final ServerPacket field789;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_f;
+   public static final ServerPacket field790;
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_q;
+   public static final ServerPacket field791;
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_w;
+   public static final ServerPacket field792;
    @ObfuscatedName("o")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_o;
+   public static final ServerPacket field793;
    @ObfuscatedName("u")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_u;
+   public static final ServerPacket field794;
    @ObfuscatedName("g")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_g;
+   public static final ServerPacket field795;
    @ObfuscatedName("l")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_l;
+   public static final ServerPacket field796;
    @ObfuscatedName("e")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_e;
+   public static final ServerPacket field797;
    @ObfuscatedName("x")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_x;
+   public static final ServerPacket field798;
    @ObfuscatedName("d")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_d;
+   public static final ServerPacket field799;
    @ObfuscatedName("k")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_k;
+   public static final ServerPacket field800;
    @ObfuscatedName("n")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_n;
+   public static final ServerPacket field801;
    @ObfuscatedName("i")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_i;
+   public static final ServerPacket field802;
    @ObfuscatedName("a")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_a;
+   public static final ServerPacket field803;
    @ObfuscatedName("z")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_z;
+   public static final ServerPacket field804;
    @ObfuscatedName("j")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_j;
+   public static final ServerPacket field805;
    @ObfuscatedName("s")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_s;
+   public static final ServerPacket field806;
    @ObfuscatedName("t")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_t;
+   public static final ServerPacket field807;
    @ObfuscatedName("y")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_y;
+   public static final ServerPacket field808;
    @ObfuscatedName("h")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_h;
+   public static final ServerPacket field809;
    @ObfuscatedName("b")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_b;
+   public static final ServerPacket field810;
    @ObfuscatedName("c")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_c;
+   public static final ServerPacket field811;
    @ObfuscatedName("r")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_r;
+   public static final ServerPacket field812;
    @ObfuscatedName("p")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_p;
+   public static final ServerPacket field813;
    @ObfuscatedName("v")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_v;
+   public static final ServerPacket field814;
    @ObfuscatedName("ag")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_ag;
+   public static final ServerPacket field815;
    @ObfuscatedName("aq")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_aq;
+   public static final ServerPacket field816;
    @ObfuscatedName("aj")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_aj;
+   public static final ServerPacket field817;
    @ObfuscatedName("av")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_av;
+   public static final ServerPacket field818;
    @ObfuscatedName("ar")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_ar;
+   public static final ServerPacket field819;
    @ObfuscatedName("ac")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_ac;
+   public static final ServerPacket field820;
    @ObfuscatedName("ay")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_ay;
+   public static final ServerPacket field821;
    @ObfuscatedName("ah")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_ah;
+   public static final ServerPacket field822;
    @ObfuscatedName("ak")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_ak;
+   public static final ServerPacket field823;
    @ObfuscatedName("aw")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_aw;
+   public static final ServerPacket field824;
    @ObfuscatedName("al")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_al;
+   public static final ServerPacket field825;
    @ObfuscatedName("ab")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_ab;
+   public static final ServerPacket field826;
    @ObfuscatedName("ae")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_ae;
+   public static final ServerPacket field827;
    @ObfuscatedName("at")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_at;
+   public static final ServerPacket field828;
    @ObfuscatedName("ad")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_ad;
+   public static final ServerPacket field829;
    @ObfuscatedName("ap")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_ap;
+   public static final ServerPacket field830;
    @ObfuscatedName("as")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_as;
+   public static final ServerPacket field831;
    @ObfuscatedName("am")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_am;
+   public static final ServerPacket field832;
    @ObfuscatedName("an")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_an;
+   public static final ServerPacket field833;
    @ObfuscatedName("az")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_az;
+   public static final ServerPacket field834;
    @ObfuscatedName("au")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_au;
+   public static final ServerPacket field835;
    @ObfuscatedName("ao")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_ao;
+   public static final ServerPacket field836;
    @ObfuscatedName("aa")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_aa;
+   public static final ServerPacket field837;
    @ObfuscatedName("ax")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_ax;
+   public static final ServerPacket field838;
    @ObfuscatedName("af")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_af;
+   public static final ServerPacket field839;
    @ObfuscatedName("ai")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_ai;
+   public static final ServerPacket field840;
    @ObfuscatedName("ba")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_ba;
+   public static final ServerPacket field841;
    @ObfuscatedName("bb")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_bb;
+   public static final ServerPacket field842;
    @ObfuscatedName("bs")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_bs;
+   public static final ServerPacket field843;
    @ObfuscatedName("bq")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_bq;
+   public static final ServerPacket field844;
    @ObfuscatedName("bn")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_bn;
+   public static final ServerPacket field845;
    @ObfuscatedName("bk")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_bk;
+   public static final ServerPacket field846;
    @ObfuscatedName("bd")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_bd;
+   public static final ServerPacket field847;
    @ObfuscatedName("bc")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_bc;
+   public static final ServerPacket field848;
    @ObfuscatedName("bo")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_bo;
+   public static final ServerPacket field849;
    @ObfuscatedName("bx")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_bx;
+   public static final ServerPacket field850;
    @ObfuscatedName("by")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_by;
+   public static final ServerPacket field851;
    @ObfuscatedName("bu")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_bu;
+   public static final ServerPacket field852;
    @ObfuscatedName("bm")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_bm;
+   public static final ServerPacket field853;
    @ObfuscatedName("bl")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_bl;
+   public static final ServerPacket field854;
    @ObfuscatedName("br")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_br;
+   public static final ServerPacket field855;
    @ObfuscatedName("bj")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_bj;
+   public static final ServerPacket field856;
    @ObfuscatedName("bi")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_bi;
+   public static final ServerPacket field857;
    @ObfuscatedName("bz")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_bz;
+   public static final ServerPacket field858;
    @ObfuscatedName("bg")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_bg;
+   public static final ServerPacket field859;
    @ObfuscatedName("bt")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_bt;
+   public static final ServerPacket field860;
    @ObfuscatedName("bp")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_bp;
+   public static final ServerPacket field861;
    @ObfuscatedName("bf")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_bf;
+   public static final ServerPacket field862;
    @ObfuscatedName("bh")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_bh;
+   public static final ServerPacket field863;
    @ObfuscatedName("be")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_be;
+   public static final ServerPacket field864;
    @ObfuscatedName("bv")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_bv;
+   public static final ServerPacket field865;
    @ObfuscatedName("bw")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_bw;
+   public static final ServerPacket field866;
    @ObfuscatedName("cr")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_cr;
+   public static final ServerPacket field867;
    @ObfuscatedName("cv")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_cv;
+   public static final ServerPacket field868;
    @ObfuscatedName("ce")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_ce;
+   public static final ServerPacket field869;
    @ObfuscatedName("cy")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_cy;
+   public static final ServerPacket field870;
    @ObfuscatedName("cs")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_cs;
+   public static final ServerPacket field871;
    @ObfuscatedName("cm")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_cm;
+   public static final ServerPacket field872;
    @ObfuscatedName("cj")
    @ObfuscatedSignature(
       signature = "Lge;"
    )
-   public static final ServerPacket __ge_cj;
+   public static final ServerPacket field873;
    @ObfuscatedName("ix")
    @ObfuscatedGetter(
       intValue = -1645409107
@@ -451,94 +451,6 @@ public class ServerPacket {
    @Export("length")
    public final int length;
 
-   static {
-      __ge_m = new ServerPacket(0, -2);
-      __ge_f = new ServerPacket(1, 0);
-      __ge_q = new ServerPacket(2, 0);
-      __ge_w = new ServerPacket(3, -1);
-      __ge_o = new ServerPacket(4, 6);
-      __ge_u = new ServerPacket(5, 4);
-      __ge_g = new ServerPacket(6, 4);
-      __ge_l = new ServerPacket(7, 4);
-      __ge_e = new ServerPacket(8, 6);
-      __ge_x = new ServerPacket(9, 4);
-      __ge_d = new ServerPacket(10, -2);
-      __ge_k = new ServerPacket(11, 15);
-      __ge_n = new ServerPacket(12, 5);
-      __ge_i = new ServerPacket(13, 2);
-      __ge_a = new ServerPacket(14, 3);
-      __ge_z = new ServerPacket(15, 7);
-      __ge_j = new ServerPacket(16, 1);
-      __ge_s = new ServerPacket(17, -2);
-      __ge_t = new ServerPacket(18, -2);
-      __ge_y = new ServerPacket(19, -2);
-      __ge_h = new ServerPacket(20, 10);
-      __ge_b = new ServerPacket(21, 5);
-      __ge_c = new ServerPacket(22, 6);
-      __ge_r = new ServerPacket(23, 2);
-      __ge_p = new ServerPacket(24, 6);
-      __ge_v = new ServerPacket(25, 2);
-      __ge_ag = new ServerPacket(26, 5);
-      __ge_aq = new ServerPacket(27, -2);
-      __ge_aj = new ServerPacket(28, 0);
-      __ge_av = new ServerPacket(29, 0);
-      __ge_ar = new ServerPacket(30, 4);
-      __ge_ac = new ServerPacket(31, 6);
-      __ge_ay = new ServerPacket(32, -2);
-      __ge_ah = new ServerPacket(33, -2);
-      __ge_ak = new ServerPacket(34, 1);
-      __ge_aw = new ServerPacket(35, 6);
-      __ge_al = new ServerPacket(36, 6);
-      __ge_ab = new ServerPacket(37, -1);
-      __ge_ae = new ServerPacket(38, -2);
-      __ge_at = new ServerPacket(39, 4);
-      __ge_ad = new ServerPacket(40, 5);
-      __ge_ap = new ServerPacket(41, 8);
-      __ge_as = new ServerPacket(42, 14);
-      __ge_am = new ServerPacket(43, -2);
-      __ge_an = new ServerPacket(44, -2);
-      __ge_az = new ServerPacket(45, -1);
-      __ge_au = new ServerPacket(46, 2);
-      __ge_ao = new ServerPacket(47, -1);
-      __ge_aa = new ServerPacket(48, 12);
-      __ge_ax = new ServerPacket(49, 4);
-      __ge_af = new ServerPacket(50, 10);
-      __ge_ai = new ServerPacket(51, -2);
-      __ge_ba = new ServerPacket(52, 0);
-      __ge_bb = new ServerPacket(53, -2);
-      __ge_bs = new ServerPacket(54, -1);
-      __ge_bq = new ServerPacket(55, 20);
-      __ge_bn = new ServerPacket(56, -2);
-      __ge_bk = new ServerPacket(57, 28);
-      __ge_bd = new ServerPacket(58, -2);
-      __ge_bc = new ServerPacket(59, 8);
-      __ge_bo = new ServerPacket(60, 1);
-      __ge_bx = new ServerPacket(61, 6);
-      __ge_by = new ServerPacket(62, -2);
-      __ge_bu = new ServerPacket(63, 3);
-      __ge_bm = new ServerPacket(64, 2);
-      __ge_bl = new ServerPacket(65, 5);
-      __ge_br = new ServerPacket(66, -1);
-      __ge_bj = new ServerPacket(67, 2);
-      __ge_bi = new ServerPacket(68, 1);
-      __ge_bz = new ServerPacket(69, 8);
-      __ge_bg = new ServerPacket(70, -2);
-      __ge_bt = new ServerPacket(71, 2);
-      __ge_bp = new ServerPacket(72, 2);
-      __ge_bf = new ServerPacket(73, 0);
-      __ge_bh = new ServerPacket(74, 1);
-      __ge_be = new ServerPacket(75, 6);
-      __ge_bv = new ServerPacket(76, 6);
-      __ge_bw = new ServerPacket(77, 7);
-      __ge_cr = new ServerPacket(78, 0);
-      __ge_cv = new ServerPacket(79, -2);
-      __ge_ce = new ServerPacket(80, 2);
-      __ge_cy = new ServerPacket(81, -2);
-      __ge_cs = new ServerPacket(82, 8);
-      __ge_cm = new ServerPacket(83, 6);
-      __ge_cj = new ServerPacket(84, 2);
-   }
-
    ServerPacket(int var1, int var2) {
       this.id = var1;
       this.length = var2;
@@ -565,7 +477,7 @@ public class ServerPacket {
       VarbitDefinition.indexedSpriteWidths = null;
       SecureRandomCallable.indexedSpriteHeights = null;
       class328.indexedSpritePalette = null;
-      class328.spritePixels = null;
+      class328.spritePixels = ((byte[][])null);
       return var0;
    }
 
@@ -578,18 +490,18 @@ public class ServerPacket {
       Buffer var10 = new Buffer(var0);
       int var11 = -1;
 
-      while(true) {
-         int var12 = var10.__at_308();
-         if(var12 == 0) {
+      while (true) {
+         int var12 = var10.method49();
+         if (var12 == 0) {
             return;
          }
 
          var11 += var12;
          int var13 = 0;
 
-         while(true) {
-            int var14 = var10.__ae_307();
-            if(var14 == 0) {
+         while (true) {
+            int var14 = var10.readUShortSmart();
+            if (var14 == 0) {
                break;
             }
 
@@ -600,48 +512,136 @@ public class ServerPacket {
             int var18 = var10.readUnsignedByte();
             int var19 = var18 >> 2;
             int var20 = var18 & 3;
-            if(var17 == var4 && var16 >= var5 && var16 < var5 + 8 && var15 >= var6 && var15 < var6 + 8) {
+            if (var17 == var4 && var16 >= var5 && var16 < var5 + 8 && var15 >= var6 && var15 < var6 + 8) {
                ObjectDefinition var21 = class50.getObjectDefinition(var11);
-               int var24 = var16 & 7;
-               int var25 = var15 & 7;
-               int var27 = var21.sizeX;
-               int var28 = var21.sizeY;
-               int var29;
-               if((var20 & 1) == 1) {
-                  var29 = var27;
-                  var27 = var28;
-                  var28 = var29;
+               int var22 = var16 & 7;
+               int var23 = var15 & 7;
+               int var24 = var21.sizeX;
+               int var25 = var21.sizeY;
+               int var26;
+               if ((var20 & 1) == 1) {
+                  var26 = var24;
+                  var24 = var25;
+                  var25 = var26;
                }
 
-               int var26 = var7 & 3;
-               int var23;
-               if(var26 == 0) {
-                  var23 = var24;
-               } else if(var26 == 1) {
-                  var23 = var25;
-               } else if(var26 == 2) {
-                  var23 = 7 - var24 - (var27 - 1);
+               int var27 = var7 & 3;
+               int var28;
+               if (var27 == 0) {
+                  var28 = var22;
+               } else if (var27 == 1) {
+                  var28 = var23;
+               } else if (var27 == 2) {
+                  var28 = 7 - var22 - (var24 - 1);
                } else {
-                  var23 = 7 - var25 - (var28 - 1);
+                  var28 = 7 - var23 - (var25 - 1);
                }
 
-               var29 = var2 + var23;
-               int var30 = var3 + class171.method3496(var16 & 7, var15 & 7, var7, var21.sizeX, var21.sizeY, var20);
-               if(var29 > 0 && var30 > 0 && var29 < 103 && var30 < 103) {
-                  int var31 = var1;
-                  if((Tiles.Tiles_renderFlags[1][var29][var30] & 2) == 2) {
-                     var31 = var1 - 1;
+               var26 = var2 + var28;
+               int var29 = var3 + class171.method3496(var16 & 7, var15 & 7, var7, var21.sizeX, var21.sizeY, var20);
+               if (var26 > 0 && var29 > 0 && var26 < 103 && var29 < 103) {
+                  int var30 = var1;
+                  if ((Tiles.Tiles_renderFlags[1][var26][var29] & 2) == 2) {
+                     var30 = var1 - 1;
                   }
 
-                  CollisionMap var32 = null;
-                  if(var31 >= 0) {
-                     var32 = var9[var31];
+                  CollisionMap var31 = null;
+                  if (var30 >= 0) {
+                     var31 = var9[var30];
                   }
 
-                  class227.method4446(var1, var29, var30, var11, var20 + var7 & 3, var19, var8, var32);
+                  class227.method4446(var1, var26, var29, var11, var20 + var7 & 3, var19, var8, var31);
                }
             }
          }
       }
    }
+
+   static {
+      field789 = new ServerPacket(0, -2);
+      field790 = new ServerPacket(1, 0);
+      field791 = new ServerPacket(2, 0);
+      field792 = new ServerPacket(3, -1);
+      field793 = new ServerPacket(4, 6);
+      field794 = new ServerPacket(5, 4);
+      field795 = new ServerPacket(6, 4);
+      field796 = new ServerPacket(7, 4);
+      field797 = new ServerPacket(8, 6);
+      field798 = new ServerPacket(9, 4);
+      field799 = new ServerPacket(10, -2);
+      field800 = new ServerPacket(11, 15);
+      field801 = new ServerPacket(12, 5);
+      field802 = new ServerPacket(13, 2);
+      field803 = new ServerPacket(14, 3);
+      field804 = new ServerPacket(15, 7);
+      field805 = new ServerPacket(16, 1);
+      field806 = new ServerPacket(17, -2);
+      field807 = new ServerPacket(18, -2);
+      field808 = new ServerPacket(19, -2);
+      field809 = new ServerPacket(20, 10);
+      field810 = new ServerPacket(21, 5);
+      field811 = new ServerPacket(22, 6);
+      field812 = new ServerPacket(23, 2);
+      field813 = new ServerPacket(24, 6);
+      field814 = new ServerPacket(25, 2);
+      field815 = new ServerPacket(26, 5);
+      field816 = new ServerPacket(27, -2);
+      field817 = new ServerPacket(28, 0);
+      field818 = new ServerPacket(29, 0);
+      field819 = new ServerPacket(30, 4);
+      field820 = new ServerPacket(31, 6);
+      field821 = new ServerPacket(32, -2);
+      field822 = new ServerPacket(33, -2);
+      field823 = new ServerPacket(34, 1);
+      field824 = new ServerPacket(35, 6);
+      field825 = new ServerPacket(36, 6);
+      field826 = new ServerPacket(37, -1);
+      field827 = new ServerPacket(38, -2);
+      field828 = new ServerPacket(39, 4);
+      field829 = new ServerPacket(40, 5);
+      field830 = new ServerPacket(41, 8);
+      field831 = new ServerPacket(42, 14);
+      field832 = new ServerPacket(43, -2);
+      field833 = new ServerPacket(44, -2);
+      field834 = new ServerPacket(45, -1);
+      field835 = new ServerPacket(46, 2);
+      field836 = new ServerPacket(47, -1);
+      field837 = new ServerPacket(48, 12);
+      field838 = new ServerPacket(49, 4);
+      field839 = new ServerPacket(50, 10);
+      field840 = new ServerPacket(51, -2);
+      field841 = new ServerPacket(52, 0);
+      field842 = new ServerPacket(53, -2);
+      field843 = new ServerPacket(54, -1);
+      field844 = new ServerPacket(55, 20);
+      field845 = new ServerPacket(56, -2);
+      field846 = new ServerPacket(57, 28);
+      field847 = new ServerPacket(58, -2);
+      field848 = new ServerPacket(59, 8);
+      field849 = new ServerPacket(60, 1);
+      field850 = new ServerPacket(61, 6);
+      field851 = new ServerPacket(62, -2);
+      field852 = new ServerPacket(63, 3);
+      field853 = new ServerPacket(64, 2);
+      field854 = new ServerPacket(65, 5);
+      field855 = new ServerPacket(66, -1);
+      field856 = new ServerPacket(67, 2);
+      field857 = new ServerPacket(68, 1);
+      field858 = new ServerPacket(69, 8);
+      field859 = new ServerPacket(70, -2);
+      field860 = new ServerPacket(71, 2);
+      field861 = new ServerPacket(72, 2);
+      field862 = new ServerPacket(73, 0);
+      field863 = new ServerPacket(74, 1);
+      field864 = new ServerPacket(75, 6);
+      field865 = new ServerPacket(76, 6);
+      field866 = new ServerPacket(77, 7);
+      field867 = new ServerPacket(78, 0);
+      field868 = new ServerPacket(79, -2);
+      field869 = new ServerPacket(80, 2);
+      field870 = new ServerPacket(81, -2);
+      field871 = new ServerPacket(82, 8);
+      field872 = new ServerPacket(83, 6);
+      field873 = new ServerPacket(84, 2);
+   }
 }
diff --git a/runescape-client/src/main/java/Skeleton.java b/runescape-client/src/main/java/Skeleton.java
index 5fc72906be..b13a804770 100644
--- a/runescape-client/src/main/java/Skeleton.java
+++ b/runescape-client/src/main/java/Skeleton.java
@@ -11,13 +11,13 @@ public class Skeleton extends Node {
    @ObfuscatedGetter(
       intValue = 2096389021
    )
-   static int __ek_x;
+   static int field874;
    @ObfuscatedName("dc")
    @ObfuscatedSignature(
       signature = "Lit;"
    )
-   @Export("indexCache1")
-   static IndexCache indexCache1;
+   @Export("archive1")
+   static Archive archive1;
    @ObfuscatedName("m")
    @ObfuscatedGetter(
       intValue = -1634889691
@@ -45,16 +45,16 @@ public class Skeleton extends Node {
       this.labels = new int[this.count][];
 
       int var4;
-      for(var4 = 0; var4 < this.count; ++var4) {
+      for (var4 = 0; var4 < this.count; ++var4) {
          this.transformTypes[var4] = var3.readUnsignedByte();
       }
 
-      for(var4 = 0; var4 < this.count; ++var4) {
+      for (var4 = 0; var4 < this.count; ++var4) {
          this.labels[var4] = new int[var3.readUnsignedByte()];
       }
 
-      for(var4 = 0; var4 < this.count; ++var4) {
-         for(int var5 = 0; var5 < this.labels[var4].length; ++var5) {
+      for (var4 = 0; var4 < this.count; ++var4) {
+         for (int var5 = 0; var5 < this.labels[var4].length; ++var5) {
             this.labels[var4][var5] = var3.readUnsignedByte();
          }
       }
@@ -68,24 +68,24 @@ public class Skeleton extends Node {
    )
    static final void method3062(PacketBuffer var0, int var1) {
       int var2 = var0.index;
-      Players.__cq_n = 0;
+      Players.field736 = 0;
       int var3 = 0;
       var0.importIndex();
 
       int var4;
       int var5;
       int var6;
-      for(var4 = 0; var4 < Players.Players_count; ++var4) {
+      for (var4 = 0; var4 < Players.Players_count; ++var4) {
          var5 = Players.Players_indices[var4];
-         if((Players.__cq_q[var5] & 1) == 0) {
-            if(var3 > 0) {
+         if ((Players.field731[var5] & 1) == 0) {
+            if (var3 > 0) {
                --var3;
-               Players.__cq_q[var5] = (byte)(Players.__cq_q[var5] | 2);
+               Players.field731[var5] = (byte)(Players.field731[var5] | 2);
             } else {
                var6 = var0.readBits(1);
-               if(var6 == 0) {
+               if (var6 == 0) {
                   var3 = GrandExchangeOffer.method105(var0);
-                  Players.__cq_q[var5] = (byte)(Players.__cq_q[var5] | 2);
+                  Players.field731[var5] = (byte)(Players.field731[var5] | 2);
                } else {
                   class210.method4101(var0, var5);
                }
@@ -94,22 +94,22 @@ public class Skeleton extends Node {
       }
 
       var0.exportIndex();
-      if(var3 != 0) {
+      if (var3 != 0) {
          throw new RuntimeException();
       } else {
          var0.importIndex();
 
-         for(var4 = 0; var4 < Players.Players_count; ++var4) {
+         for (var4 = 0; var4 < Players.Players_count; ++var4) {
             var5 = Players.Players_indices[var4];
-            if((Players.__cq_q[var5] & 1) != 0) {
-               if(var3 > 0) {
+            if ((Players.field731[var5] & 1) != 0) {
+               if (var3 > 0) {
                   --var3;
-                  Players.__cq_q[var5] = (byte)(Players.__cq_q[var5] | 2);
+                  Players.field731[var5] = (byte)(Players.field731[var5] | 2);
                } else {
                   var6 = var0.readBits(1);
-                  if(var6 == 0) {
+                  if (var6 == 0) {
                      var3 = GrandExchangeOffer.method105(var0);
-                     Players.__cq_q[var5] = (byte)(Players.__cq_q[var5] | 2);
+                     Players.field731[var5] = (byte)(Players.field731[var5] | 2);
                   } else {
                      class210.method4101(var0, var5);
                   }
@@ -118,72 +118,72 @@ public class Skeleton extends Node {
          }
 
          var0.exportIndex();
-         if(var3 != 0) {
+         if (var3 != 0) {
             throw new RuntimeException();
          } else {
             var0.importIndex();
 
-            for(var4 = 0; var4 < Players.__cq_l; ++var4) {
-               var5 = Players.__cq_e[var4];
-               if((Players.__cq_q[var5] & 1) != 0) {
-                  if(var3 > 0) {
+            for (var4 = 0; var4 < Players.field734; ++var4) {
+               var5 = Players.field735[var4];
+               if ((Players.field731[var5] & 1) != 0) {
+                  if (var3 > 0) {
                      --var3;
-                     Players.__cq_q[var5] = (byte)(Players.__cq_q[var5] | 2);
+                     Players.field731[var5] = (byte)(Players.field731[var5] | 2);
                   } else {
                      var6 = var0.readBits(1);
-                     if(var6 == 0) {
+                     if (var6 == 0) {
                         var3 = GrandExchangeOffer.method105(var0);
-                        Players.__cq_q[var5] = (byte)(Players.__cq_q[var5] | 2);
-                     } else if(class236.updateExternalPlayer(var0, var5)) {
-                        Players.__cq_q[var5] = (byte)(Players.__cq_q[var5] | 2);
+                        Players.field731[var5] = (byte)(Players.field731[var5] | 2);
+                     } else if (class236.updateExternalPlayer(var0, var5)) {
+                        Players.field731[var5] = (byte)(Players.field731[var5] | 2);
                      }
                   }
                }
             }
 
             var0.exportIndex();
-            if(var3 != 0) {
+            if (var3 != 0) {
                throw new RuntimeException();
             } else {
                var0.importIndex();
 
-               for(var4 = 0; var4 < Players.__cq_l; ++var4) {
-                  var5 = Players.__cq_e[var4];
-                  if((Players.__cq_q[var5] & 1) == 0) {
-                     if(var3 > 0) {
+               for (var4 = 0; var4 < Players.field734; ++var4) {
+                  var5 = Players.field735[var4];
+                  if ((Players.field731[var5] & 1) == 0) {
+                     if (var3 > 0) {
                         --var3;
-                        Players.__cq_q[var5] = (byte)(Players.__cq_q[var5] | 2);
+                        Players.field731[var5] = (byte)(Players.field731[var5] | 2);
                      } else {
                         var6 = var0.readBits(1);
-                        if(var6 == 0) {
+                        if (var6 == 0) {
                            var3 = GrandExchangeOffer.method105(var0);
-                           Players.__cq_q[var5] = (byte)(Players.__cq_q[var5] | 2);
-                        } else if(class236.updateExternalPlayer(var0, var5)) {
-                           Players.__cq_q[var5] = (byte)(Players.__cq_q[var5] | 2);
+                           Players.field731[var5] = (byte)(Players.field731[var5] | 2);
+                        } else if (class236.updateExternalPlayer(var0, var5)) {
+                           Players.field731[var5] = (byte)(Players.field731[var5] | 2);
                         }
                      }
                   }
                }
 
                var0.exportIndex();
-               if(var3 != 0) {
+               if (var3 != 0) {
                   throw new RuntimeException();
                } else {
                   Players.Players_count = 0;
-                  Players.__cq_l = 0;
+                  Players.field734 = 0;
 
-                  for(var4 = 1; var4 < 2048; ++var4) {
-                     Players.__cq_q[var4] = (byte)(Players.__cq_q[var4] >> 1);
+                  for (var4 = 1; var4 < 2048; ++var4) {
+                     Players.field731[var4] = (byte)(Players.field731[var4] >> 1);
                      Player var7 = Client.players[var4];
-                     if(var7 != null) {
+                     if (var7 != null) {
                         Players.Players_indices[++Players.Players_count - 1] = var4;
                      } else {
-                        Players.__cq_e[++Players.__cq_l - 1] = var4;
+                        Players.field735[++Players.field734 - 1] = var4;
                      }
                   }
 
                   class21.method293(var0);
-                  if(var0.index - var2 != var1) {
+                  if (var0.index - var2 != var1) {
                      throw new RuntimeException(var0.index - var2 + " " + var1);
                   }
                }
diff --git a/runescape-client/src/main/java/Skills.java b/runescape-client/src/main/java/Skills.java
index ae1e7c6b0a..b5309806fc 100644
--- a/runescape-client/src/main/java/Skills.java
+++ b/runescape-client/src/main/java/Skills.java
@@ -13,21 +13,7 @@ public class Skills {
    @Export("Skills_experienceTable")
    public static int[] Skills_experienceTable;
    @ObfuscatedName("ef")
-   static int[] __hc_ef;
-
-   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};
-      Skills_experienceTable = new int[99];
-      int var0 = 0;
-
-      for(int var1 = 0; var1 < 99; ++var1) {
-         int var2 = var1 + 1;
-         int var3 = (int)((double)var2 + 300.0D * Math.pow(2.0D, (double)var2 / 7.0D));
-         var0 += var3;
-         Skills_experienceTable[var1] = var0 / 4;
-      }
-
-   }
+   static int[] field875;
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
@@ -37,49 +23,49 @@ public class Skills {
    @Export("getItemDefinition")
    public static ItemDefinition getItemDefinition(int var0) {
       ItemDefinition var1 = (ItemDefinition)ItemDefinition.ItemDefinition_cached.get((long)var0);
-      if(var1 != null) {
+      if (var1 != null) {
          return var1;
       } else {
-         byte[] var2 = ItemDefinition.ItemDefinition_indexCache.takeRecord(10, var0);
+         byte[] var2 = ItemDefinition.ItemDefinition_archive.takeFile(10, var0);
          var1 = new ItemDefinition();
          var1.id = var0;
-         if(var2 != null) {
-            var1.read(new Buffer(var2));
+         if (var2 != null) {
+            var1.decode(new Buffer(var2));
          }
 
          var1.post();
-         if(var1.noteTemplate != -1) {
-            var1.__o_426(getItemDefinition(var1.noteTemplate), getItemDefinition(var1.note));
+         if (var1.noteTemplate != -1) {
+            var1.genCert(getItemDefinition(var1.noteTemplate), getItemDefinition(var1.note));
          }
 
-         if(var1.notedId != -1) {
-            var1.__u_427(getItemDefinition(var1.notedId), getItemDefinition(var1.unnotedId));
+         if (var1.notedId != -1) {
+            var1.genBought(getItemDefinition(var1.notedId), getItemDefinition(var1.unnotedId));
          }
 
-         if(var1.placeholderTemplate != -1) {
-            var1.__g_428(getItemDefinition(var1.placeholderTemplate), getItemDefinition(var1.placeholder));
+         if (var1.placeholderTemplate != -1) {
+            var1.genPlaceholder(getItemDefinition(var1.placeholderTemplate), getItemDefinition(var1.placeholder));
          }
 
-         if(!class30.inMembersWorld && var1.isMembersOnly) {
+         if (!class30.inMembersWorld && var1.isMembersOnly) {
             var1.name = "Members object";
             var1.isTradable = false;
             var1.groundActions = null;
             var1.inventoryActions = null;
-            var1.shiftClickIndex0 = -1;
-            var1.int1 = 0;
-            if(var1.params != null) {
+            var1.shiftClickIndex = -1;
+            var1.team = 0;
+            if (var1.params != null) {
                boolean var3 = false;
 
-               for(Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) {
-                  ParamKeyDefinition var5 = class229.getParamKeyDefinition((int)var4.key);
-                  if(var5.isMembersOnly) {
+               for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) {
+                  ParamDefinition var5 = class229.getParamDefinition((int)var4.key);
+                  if (var5.autoDisable) {
                      var4.remove();
                   } else {
                      var3 = true;
                   }
                }
 
-               if(!var3) {
+               if (!var3) {
                   var1.params = null;
                }
             }
@@ -89,4 +75,18 @@ public class Skills {
          return var1;
       }
    }
+
+   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};
+      Skills_experienceTable = new int[99];
+      int var0 = 0;
+
+      for (int var1 = 0; var1 < 99; ++var1) {
+         int var2 = var1 + 1;
+         int var3 = (int)((double)var2 + 300.0D * Math.pow(2.0D, (double)var2 / 7.0D));
+         var0 += var3;
+         Skills_experienceTable[var1] = var0 / 4;
+      }
+
+   }
 }
diff --git a/runescape-client/src/main/java/SoundCache.java b/runescape-client/src/main/java/SoundCache.java
index 11816e754e..0ba06677af 100644
--- a/runescape-client/src/main/java/SoundCache.java
+++ b/runescape-client/src/main/java/SoundCache.java
@@ -18,13 +18,13 @@ public class SoundCache {
       signature = "Lir;"
    )
    @Export("soundEffectIndex")
-   AbstractIndexCache soundEffectIndex;
+   AbstractArchive soundEffectIndex;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Lir;"
    )
    @Export("musicSampleIndex")
-   AbstractIndexCache musicSampleIndex;
+   AbstractArchive musicSampleIndex;
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Lld;"
@@ -41,7 +41,7 @@ public class SoundCache {
    @ObfuscatedSignature(
       signature = "(Lir;Lir;)V"
    )
-   public SoundCache(AbstractIndexCache var1, AbstractIndexCache var2) {
+   public SoundCache(AbstractArchive var1, AbstractArchive var2) {
       this.musicSamples = new NodeHashTable(256);
       this.rawSounds = new NodeHashTable(256);
       this.soundEffectIndex = var1;
@@ -59,18 +59,18 @@ public class SoundCache {
       var4 |= var1 << 16;
       long var5 = (long)var4;
       RawSound var7 = (RawSound)this.rawSounds.get(var5);
-      if(var7 != null) {
+      if (var7 != null) {
          return var7;
-      } else if(var3 != null && var3[0] <= 0) {
+      } else if (var3 != null && var3[0] <= 0) {
          return null;
       } else {
          SoundEffect var8 = SoundEffect.readSoundEffect(this.soundEffectIndex, var1, var2);
-         if(var8 == null) {
+         if (var8 == null) {
             return null;
          } else {
             var7 = var8.toRawSound();
             this.rawSounds.put(var7, var5);
-            if(var3 != null) {
+            if (var3 != null) {
                var3[0] -= var7.samples.length;
             }
 
@@ -90,15 +90,15 @@ public class SoundCache {
       var4 |= var1 << 16;
       long var5 = (long)var4 ^ 4294967296L;
       RawSound var7 = (RawSound)this.rawSounds.get(var5);
-      if(var7 != null) {
+      if (var7 != null) {
          return var7;
-      } else if(var3 != null && var3[0] <= 0) {
+      } else if (var3 != null && var3[0] <= 0) {
          return null;
       } else {
          MusicSample var8 = (MusicSample)this.musicSamples.get(var5);
-         if(var8 == null) {
+         if (var8 == null) {
             var8 = MusicSample.readMusicSample(this.musicSampleIndex, var1, var2);
-            if(var8 == null) {
+            if (var8 == null) {
                return null;
             }
 
@@ -106,7 +106,7 @@ public class SoundCache {
          }
 
          var7 = var8.toRawSound(var3);
-         if(var7 == null) {
+         if (var7 == null) {
             return null;
          } else {
             var8.remove();
@@ -123,9 +123,9 @@ public class SoundCache {
    )
    @Export("getSoundEffect")
    public RawSound getSoundEffect(int var1, int[] var2) {
-      if(this.soundEffectIndex.__t_397() == 1) {
+      if (this.soundEffectIndex.getGroupCount() == 1) {
          return this.getSoundEffect0(0, var1, var2);
-      } else if(this.soundEffectIndex.__s_396(var1) == 1) {
+      } else if (this.soundEffectIndex.getGroupFileCount(var1) == 1) {
          return this.getSoundEffect0(var1, 0, var2);
       } else {
          throw new RuntimeException();
@@ -139,9 +139,9 @@ public class SoundCache {
    )
    @Export("getMusicSample")
    public RawSound getMusicSample(int var1, int[] var2) {
-      if(this.musicSampleIndex.__t_397() == 1) {
+      if (this.musicSampleIndex.getGroupCount() == 1) {
          return this.getMusicSample0(0, var1, var2);
-      } else if(this.musicSampleIndex.__s_396(var1) == 1) {
+      } else if (this.musicSampleIndex.getGroupFileCount(var1) == 1) {
          return this.getMusicSample0(var1, 0, var2);
       } else {
          throw new RuntimeException();
@@ -154,69 +154,71 @@ public class SoundCache {
       garbageValue = "-1706770105"
    )
    @Export("encodeStringCp1252")
-   public static int encodeStringCp1252(CharSequence var0, int var1, int var2, byte[] var3, int var4) {
-      int var5 = var2 - var1;
+   public static int encodeStringCp1252(CharSequence src, int srcStart, int srcEnd, byte[] dst, int dstStart) {
+      int var5 = srcEnd - srcStart;
 
-      for(int var6 = 0; var6 < var5; ++var6) {
-         char var7 = var0.charAt(var6 + var1);
-         if(var7 > 0 && var7 < 128 || var7 >= 160 && var7 <= 255) {
-            var3[var6 + var4] = (byte)var7;
-         } else if(var7 == 8364) {
-            var3[var6 + var4] = -128;
-         } else if(var7 == 8218) {
-            var3[var6 + var4] = -126;
-         } else if(var7 == 402) {
-            var3[var6 + var4] = -125;
-         } else if(var7 == 8222) {
-            var3[var6 + var4] = -124;
-         } else if(var7 == 8230) {
-            var3[var6 + var4] = -123;
-         } else if(var7 == 8224) {
-            var3[var6 + var4] = -122;
-         } else if(var7 == 8225) {
-            var3[var6 + var4] = -121;
-         } else if(var7 == 710) {
-            var3[var6 + var4] = -120;
-         } else if(var7 == 8240) {
-            var3[var6 + var4] = -119;
-         } else if(var7 == 352) {
-            var3[var6 + var4] = -118;
-         } else if(var7 == 8249) {
-            var3[var6 + var4] = -117;
-         } else if(var7 == 338) {
-            var3[var6 + var4] = -116;
-         } else if(var7 == 381) {
-            var3[var6 + var4] = -114;
-         } else if(var7 == 8216) {
-            var3[var6 + var4] = -111;
-         } else if(var7 == 8217) {
-            var3[var6 + var4] = -110;
-         } else if(var7 == 8220) {
-            var3[var6 + var4] = -109;
-         } else if(var7 == 8221) {
-            var3[var6 + var4] = -108;
-         } else if(var7 == 8226) {
-            var3[var6 + var4] = -107;
-         } else if(var7 == 8211) {
-            var3[var6 + var4] = -106;
-         } else if(var7 == 8212) {
-            var3[var6 + var4] = -105;
-         } else if(var7 == 732) {
-            var3[var6 + var4] = -104;
-         } else if(var7 == 8482) {
-            var3[var6 + var4] = -103;
-         } else if(var7 == 353) {
-            var3[var6 + var4] = -102;
-         } else if(var7 == 8250) {
-            var3[var6 + var4] = -101;
-         } else if(var7 == 339) {
-            var3[var6 + var4] = -100;
-         } else if(var7 == 382) {
-            var3[var6 + var4] = -98;
-         } else if(var7 == 376) {
-            var3[var6 + var4] = -97;
+      for (int var6 = 0; var6 < var5; ++var6) {
+         char var7 = src.charAt(var6 + srcStart);
+         if ((var7 <= 0 || var7 >= 128) && (var7 < 160 || var7 > 255)) {
+            if (var7 == 8364) {
+               dst[var6 + dstStart] = -128;
+            } else if (var7 == 8218) {
+               dst[var6 + dstStart] = -126;
+            } else if (var7 == 402) {
+               dst[var6 + dstStart] = -125;
+            } else if (var7 == 8222) {
+               dst[var6 + dstStart] = -124;
+            } else if (var7 == 8230) {
+               dst[var6 + dstStart] = -123;
+            } else if (var7 == 8224) {
+               dst[var6 + dstStart] = -122;
+            } else if (var7 == 8225) {
+               dst[var6 + dstStart] = -121;
+            } else if (var7 == 710) {
+               dst[var6 + dstStart] = -120;
+            } else if (var7 == 8240) {
+               dst[var6 + dstStart] = -119;
+            } else if (var7 == 352) {
+               dst[var6 + dstStart] = -118;
+            } else if (var7 == 8249) {
+               dst[var6 + dstStart] = -117;
+            } else if (var7 == 338) {
+               dst[var6 + dstStart] = -116;
+            } else if (var7 == 381) {
+               dst[var6 + dstStart] = -114;
+            } else if (var7 == 8216) {
+               dst[var6 + dstStart] = -111;
+            } else if (var7 == 8217) {
+               dst[var6 + dstStart] = -110;
+            } else if (var7 == 8220) {
+               dst[var6 + dstStart] = -109;
+            } else if (var7 == 8221) {
+               dst[var6 + dstStart] = -108;
+            } else if (var7 == 8226) {
+               dst[var6 + dstStart] = -107;
+            } else if (var7 == 8211) {
+               dst[var6 + dstStart] = -106;
+            } else if (var7 == 8212) {
+               dst[var6 + dstStart] = -105;
+            } else if (var7 == 732) {
+               dst[var6 + dstStart] = -104;
+            } else if (var7 == 8482) {
+               dst[var6 + dstStart] = -103;
+            } else if (var7 == 353) {
+               dst[var6 + dstStart] = -102;
+            } else if (var7 == 8250) {
+               dst[var6 + dstStart] = -101;
+            } else if (var7 == 339) {
+               dst[var6 + dstStart] = -100;
+            } else if (var7 == 382) {
+               dst[var6 + dstStart] = -98;
+            } else if (var7 == 376) {
+               dst[var6 + dstStart] = -97;
+            } else {
+               dst[var6 + dstStart] = 63;
+            }
          } else {
-            var3[var6 + var4] = 63;
+            dst[var6 + dstStart] = (byte)var7;
          }
       }
 
diff --git a/runescape-client/src/main/java/SoundEffect.java b/runescape-client/src/main/java/SoundEffect.java
index f443c3306f..cbac1dcd68 100644
--- a/runescape-client/src/main/java/SoundEffect.java
+++ b/runescape-client/src/main/java/SoundEffect.java
@@ -25,17 +25,17 @@ public class SoundEffect {
    SoundEffect(Buffer var1) {
       this.instruments = new Instrument[10];
 
-      for(int var2 = 0; var2 < 10; ++var2) {
+      for (int var2 = 0; var2 < 10; ++var2) {
          int var3 = var1.readUnsignedByte();
-         if(var3 != 0) {
+         if (var3 != 0) {
             --var1.index;
             this.instruments[var2] = new Instrument();
             this.instruments[var2].decode(var1);
          }
       }
 
-      this.start = var1.__ag_302();
-      this.end = var1.__ag_302();
+      this.start = var1.readUnsignedShort();
+      this.end = var1.readUnsignedShort();
    }
 
    @ObfuscatedName("f")
@@ -49,28 +49,30 @@ public class SoundEffect {
    }
 
    @ObfuscatedName("q")
-   public final int __q_174() {
+   @Export("calculateDelay")
+   public final int calculateDelay() {
       int var1 = 9999999;
 
       int var2;
-      for(var2 = 0; var2 < 10; ++var2) {
-         if(this.instruments[var2] != null && this.instruments[var2].offset / 20 < var1) {
+      for (var2 = 0; var2 < 10; ++var2) {
+         if (this.instruments[var2] != null && this.instruments[var2].offset / 20 < var1) {
             var1 = this.instruments[var2].offset / 20;
          }
       }
 
-      if(this.start < this.end && this.start / 20 < var1) {
+      if (this.start < this.end && this.start / 20 < var1) {
          var1 = this.start / 20;
       }
 
-      if(var1 != 9999999 && var1 != 0) {
-         for(var2 = 0; var2 < 10; ++var2) {
-            if(this.instruments[var2] != null) {
-               this.instruments[var2].offset -= var1 * 20;
+      if (var1 != 9999999 && var1 != 0) {
+         for (var2 = 0; var2 < 10; ++var2) {
+            if (this.instruments[var2] != null) {
+               Instrument var3 = this.instruments[var2];
+               var3.offset -= var1 * 20;
             }
          }
 
-         if(this.start < this.end) {
+         if (this.start < this.end) {
             this.start -= var1 * 20;
             this.end -= var1 * 20;
          }
@@ -87,27 +89,27 @@ public class SoundEffect {
       int var1 = 0;
 
       int var2;
-      for(var2 = 0; var2 < 10; ++var2) {
-         if(this.instruments[var2] != null && this.instruments[var2].duration + this.instruments[var2].offset > var1) {
+      for (var2 = 0; var2 < 10; ++var2) {
+         if (this.instruments[var2] != null && this.instruments[var2].duration + this.instruments[var2].offset > var1) {
             var1 = this.instruments[var2].duration + this.instruments[var2].offset;
          }
       }
 
-      if(var1 == 0) {
+      if (var1 == 0) {
          return new byte[0];
       } else {
          var2 = var1 * 22050 / 1000;
          byte[] var3 = new byte[var2];
 
-         for(int var4 = 0; var4 < 10; ++var4) {
-            if(this.instruments[var4] != null) {
+         for (int var4 = 0; var4 < 10; ++var4) {
+            if (this.instruments[var4] != null) {
                int var5 = this.instruments[var4].duration * 22050 / 1000;
                int var6 = this.instruments[var4].offset * 22050 / 1000;
                int[] var7 = this.instruments[var4].synthesize(var5, this.instruments[var4].duration);
 
-               for(int var8 = 0; var8 < var5; ++var8) {
+               for (int var8 = 0; var8 < var5; ++var8) {
                   int var9 = (var7[var8] >> 8) + var3[var8 + var6];
-                  if((var9 + 128 & -256) != 0) {
+                  if ((var9 + 128 & -256) != 0) {
                      var9 = var9 >> 31 ^ 127;
                   }
 
@@ -125,8 +127,8 @@ public class SoundEffect {
       signature = "(Lir;II)Lci;"
    )
    @Export("readSoundEffect")
-   public static SoundEffect readSoundEffect(AbstractIndexCache var0, int var1, int var2) {
-      byte[] var3 = var0.takeRecord(var1, var2);
-      return var3 == null?null:new SoundEffect(new Buffer(var3));
+   public static SoundEffect readSoundEffect(AbstractArchive var0, int var1, int var2) {
+      byte[] var3 = var0.takeFile(var1, var2);
+      return var3 == null ? null : new SoundEffect(new Buffer(var3));
    }
 }
diff --git a/runescape-client/src/main/java/SoundEnvelope.java b/runescape-client/src/main/java/SoundEnvelope.java
index 633080a2f0..114aa68414 100644
--- a/runescape-client/src/main/java/SoundEnvelope.java
+++ b/runescape-client/src/main/java/SoundEnvelope.java
@@ -55,11 +55,11 @@ public class SoundEnvelope {
       signature = "(Lgr;)V"
    )
    @Export("decode")
-   final void decode(Buffer var1) {
-      this.form = var1.readUnsignedByte();
-      this.start = var1.readInt();
-      this.end = var1.readInt();
-      this.decodeSegments(var1);
+   final void decode(Buffer buffer) {
+      this.form = buffer.readUnsignedByte();
+      this.start = buffer.readInt();
+      this.end = buffer.readInt();
+      this.decodeSegments(buffer);
    }
 
    @ObfuscatedName("f")
@@ -67,14 +67,14 @@ public class SoundEnvelope {
       signature = "(Lgr;)V"
    )
    @Export("decodeSegments")
-   final void decodeSegments(Buffer var1) {
-      this.segments = var1.readUnsignedByte();
+   final void decodeSegments(Buffer buffer) {
+      this.segments = buffer.readUnsignedByte();
       this.durations = new int[this.segments];
       this.phases = new int[this.segments];
 
-      for(int var2 = 0; var2 < this.segments; ++var2) {
-         this.durations[var2] = var1.__ag_302();
-         this.phases[var2] = var1.__ag_302();
+      for (int var2 = 0; var2 < this.segments; ++var2) {
+         this.durations[var2] = buffer.readUnsignedShort();
+         this.phases[var2] = buffer.readUnsignedShort();
       }
 
    }
@@ -92,14 +92,14 @@ public class SoundEnvelope {
    @ObfuscatedName("w")
    @Export("doStep")
    final int doStep(int var1) {
-      if(this.max >= this.ticks) {
+      if (this.max >= this.ticks) {
          this.amplitude = this.phases[this.phaseIndex++] << 15;
-         if(this.phaseIndex >= this.segments) {
+         if (this.phaseIndex >= this.segments) {
             this.phaseIndex = this.segments - 1;
          }
 
          this.ticks = (int)((double)this.durations[this.phaseIndex] / 65536.0D * (double)var1);
-         if(this.ticks > this.max) {
+         if (this.ticks > this.max) {
             this.step = ((this.phases[this.phaseIndex] << 15) - this.amplitude) / (this.ticks - this.max);
          }
       }
diff --git a/runescape-client/src/main/java/SoundSystem.java b/runescape-client/src/main/java/SoundSystem.java
index 798f86746b..38b8eeb3f6 100644
--- a/runescape-client/src/main/java/SoundSystem.java
+++ b/runescape-client/src/main/java/SoundSystem.java
@@ -24,18 +24,16 @@ public class SoundSystem implements Runnable {
       this.players = new PcmPlayer[2];
    }
 
-   @Export("run")
-   @ObfuscatedName("run")
    public void run() {
       try {
-         for(int var1 = 0; var1 < 2; ++var1) {
+         for (int var1 = 0; var1 < 2; ++var1) {
             PcmPlayer var2 = this.players[var1];
-            if(var2 != null) {
+            if (var2 != null) {
                var2.run();
             }
          }
-      } catch (Exception var4) {
-         NpcDefinition.sendStackTrace((String)null, var4);
+      } catch (Exception var3) {
+         NPCDefinition.sendStackTrace((String)null, var3);
       }
 
    }
@@ -47,11 +45,11 @@ public class SoundSystem implements Runnable {
    )
    static Script method2451(int var0) {
       Script var1 = (Script)Script.Script_cached.get((long)var0);
-      if(var1 != null) {
+      if (var1 != null) {
          return var1;
       } else {
-         byte[] var2 = Formatting.indexCache12.takeRecord(var0, 0);
-         if(var2 == null) {
+         byte[] var2 = Formatting.archive12.takeFile(var0, 0);
+         if (var2 == null) {
             return null;
          } else {
             var1 = Occluder.newScript(var2);
@@ -67,6 +65,6 @@ public class SoundSystem implements Runnable {
       garbageValue = "20"
    )
    static void method2456() {
-      WorldMapRegion.__av_o.clear();
+      WorldMapRegion.field1051.clear();
    }
 }
diff --git a/runescape-client/src/main/java/SpotAnimationDefinition.java b/runescape-client/src/main/java/SpotAnimationDefinition.java
index 84807ce61c..3d7668daf8 100644
--- a/runescape-client/src/main/java/SpotAnimationDefinition.java
+++ b/runescape-client/src/main/java/SpotAnimationDefinition.java
@@ -11,14 +11,14 @@ public class SpotAnimationDefinition extends DualNode {
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   @Export("SpotAnimationDefinition_indexCache")
-   public static AbstractIndexCache SpotAnimationDefinition_indexCache;
+   @Export("SpotAnimationDefinition_archive")
+   public static AbstractArchive SpotAnimationDefinition_archive;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   @Export("SpotAnimationDefinition_modelIndexCache")
-   public static AbstractIndexCache SpotAnimationDefinition_modelIndexCache;
+   @Export("SpotAnimationDefinition_modelArchive")
+   public static AbstractArchive SpotAnimationDefinition_modelArchive;
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Ler;"
@@ -83,25 +83,20 @@ public class SpotAnimationDefinition extends DualNode {
    @ObfuscatedGetter(
       intValue = -20619847
    )
-   int __a;
+   int field876;
    @ObfuscatedName("z")
    @ObfuscatedGetter(
       intValue = 1866148625
    )
-   int __z;
-
-   static {
-      SpotAnimationDefinition_cached = new EvictingDualNodeHashTable(64);
-      SpotAnimationDefinition_cachedModels = new EvictingDualNodeHashTable(30);
-   }
+   int field877;
 
    SpotAnimationDefinition() {
       this.sequence = -1;
       this.widthScale = 128;
       this.heightScale = 128;
       this.orientation = 0;
-      this.__a = 0;
-      this.__z = 0;
+      this.field876 = 0;
+      this.field877 = 0;
    }
 
    @ObfuscatedName("f")
@@ -109,15 +104,15 @@ public class SpotAnimationDefinition extends DualNode {
       signature = "(Lgr;I)V",
       garbageValue = "906815828"
    )
-   @Export("read")
-   void read(Buffer var1) {
-      while(true) {
-         int var2 = var1.readUnsignedByte();
-         if(var2 == 0) {
+   @Export("decode")
+   void decode(Buffer buffer) {
+      while (true) {
+         int var2 = buffer.readUnsignedByte();
+         if (var2 == 0) {
             return;
          }
 
-         this.readNext(var1, var2);
+         this.decodeNext(buffer, var2);
       }
    }
 
@@ -126,42 +121,42 @@ public class SpotAnimationDefinition extends DualNode {
       signature = "(Lgr;II)V",
       garbageValue = "2099681848"
    )
-   @Export("readNext")
-   void readNext(Buffer var1, int var2) {
-      if(var2 == 1) {
-         this.archive = var1.__ag_302();
-      } else if(var2 == 2) {
-         this.sequence = var1.__ag_302();
-      } else if(var2 == 4) {
-         this.widthScale = var1.__ag_302();
-      } else if(var2 == 5) {
-         this.heightScale = var1.__ag_302();
-      } else if(var2 == 6) {
-         this.orientation = var1.__ag_302();
-      } else if(var2 == 7) {
-         this.__a = var1.readUnsignedByte();
-      } else if(var2 == 8) {
-         this.__z = var1.readUnsignedByte();
+   @Export("decodeNext")
+   void decodeNext(Buffer buffer, int var2) {
+      if (var2 == 1) {
+         this.archive = buffer.readUnsignedShort();
+      } else if (var2 == 2) {
+         this.sequence = buffer.readUnsignedShort();
+      } else if (var2 == 4) {
+         this.widthScale = buffer.readUnsignedShort();
+      } else if (var2 == 5) {
+         this.heightScale = buffer.readUnsignedShort();
+      } else if (var2 == 6) {
+         this.orientation = buffer.readUnsignedShort();
+      } else if (var2 == 7) {
+         this.field876 = buffer.readUnsignedByte();
+      } else if (var2 == 8) {
+         this.field877 = buffer.readUnsignedByte();
       } else {
          int var3;
          int var4;
-         if(var2 == 40) {
-            var3 = var1.readUnsignedByte();
+         if (var2 == 40) {
+            var3 = buffer.readUnsignedByte();
             this.recolorFrom = new short[var3];
             this.recolorTo = new short[var3];
 
-            for(var4 = 0; var4 < var3; ++var4) {
-               this.recolorFrom[var4] = (short)var1.__ag_302();
-               this.recolorTo[var4] = (short)var1.__ag_302();
+            for (var4 = 0; var4 < var3; ++var4) {
+               this.recolorFrom[var4] = (short)buffer.readUnsignedShort();
+               this.recolorTo[var4] = (short)buffer.readUnsignedShort();
             }
-         } else if(var2 == 41) {
-            var3 = var1.readUnsignedByte();
+         } else if (var2 == 41) {
+            var3 = buffer.readUnsignedByte();
             this.retextureFrom = new short[var3];
             this.retextureTo = new short[var3];
 
-            for(var4 = 0; var4 < var3; ++var4) {
-               this.retextureFrom[var4] = (short)var1.__ag_302();
-               this.retextureTo[var4] = (short)var1.__ag_302();
+            for (var4 = 0; var4 < var3; ++var4) {
+               this.retextureFrom[var4] = (short)buffer.readUnsignedShort();
+               this.retextureTo[var4] = (short)buffer.readUnsignedShort();
             }
          }
       }
@@ -176,51 +171,51 @@ public class SpotAnimationDefinition extends DualNode {
    @Export("getModel")
    public final Model getModel(int var1) {
       Model var2 = (Model)SpotAnimationDefinition_cachedModels.get((long)this.id);
-      if(var2 == null) {
-         ModelData var3 = ModelData.method2788(SpotAnimationDefinition_modelIndexCache, this.archive, 0);
-         if(var3 == null) {
+      if (var2 == null) {
+         ModelData var3 = ModelData.method2788(SpotAnimationDefinition_modelArchive, this.archive, 0);
+         if (var3 == null) {
             return null;
          }
 
          int var4;
-         if(this.recolorFrom != null) {
-            for(var4 = 0; var4 < this.recolorFrom.length; ++var4) {
+         if (this.recolorFrom != null) {
+            for (var4 = 0; var4 < this.recolorFrom.length; ++var4) {
                var3.recolor(this.recolorFrom[var4], this.recolorTo[var4]);
             }
          }
 
-         if(this.retextureFrom != null) {
-            for(var4 = 0; var4 < this.retextureFrom.length; ++var4) {
+         if (this.retextureFrom != null) {
+            for (var4 = 0; var4 < this.retextureFrom.length; ++var4) {
                var3.retexture(this.retextureFrom[var4], this.retextureTo[var4]);
             }
          }
 
-         var2 = var3.toModel(this.__a + 64, this.__z + 850, -30, -50, -30);
+         var2 = var3.toModel(this.field876 + 64, this.field877 + 850, -30, -50, -30);
          SpotAnimationDefinition_cachedModels.put(var2, (long)this.id);
       }
 
       Model var5;
-      if(this.sequence != -1 && var1 != -1) {
+      if (this.sequence != -1 && var1 != -1) {
          var5 = WorldMapAreaData.getSequenceDefinition(this.sequence).animateSpotAnimation(var2, var1);
       } else {
          var5 = var2.toSharedSpotAnimationModel(true);
       }
 
-      if(this.widthScale != 128 || this.heightScale != 128) {
+      if (this.widthScale != 128 || this.heightScale != 128) {
          var5.scale(this.widthScale, this.heightScale, this.widthScale);
       }
 
-      if(this.orientation != 0) {
-         if(this.orientation == 90) {
+      if (this.orientation != 0) {
+         if (this.orientation == 90) {
             var5.rotateY90Ccw();
          }
 
-         if(this.orientation == 180) {
+         if (this.orientation == 180) {
             var5.rotateY90Ccw();
             var5.rotateY90Ccw();
          }
 
-         if(this.orientation == 270) {
+         if (this.orientation == 270) {
             var5.rotateY90Ccw();
             var5.rotateY90Ccw();
             var5.rotateY90Ccw();
@@ -235,7 +230,13 @@ public class SpotAnimationDefinition extends DualNode {
       signature = "(B)I",
       garbageValue = "95"
    )
-   static int method4822() {
-      return Client.isResizable?2:1;
+   @Export("getWindowedMode")
+   static int getWindowedMode() {
+      return Client.isResizable ? 2 : 1;
+   }
+
+   static {
+      SpotAnimationDefinition_cached = new EvictingDualNodeHashTable(64);
+      SpotAnimationDefinition_cachedModels = new EvictingDualNodeHashTable(30);
    }
 }
diff --git a/runescape-client/src/main/java/Sprite.java b/runescape-client/src/main/java/Sprite.java
index d56f907f4a..7de90a652c 100644
--- a/runescape-client/src/main/java/Sprite.java
+++ b/runescape-client/src/main/java/Sprite.java
@@ -55,8 +55,8 @@ public final class Sprite extends Rasterizer2D {
       var1.yOffset = this.width - this.subWidth - this.yOffset;
       var1.xOffset = this.xOffset;
 
-      for(int var2 = 0; var2 < this.subHeight; ++var2) {
-         for(int var3 = 0; var3 < this.subWidth; ++var3) {
+      for (int var2 = 0; var2 < this.subHeight; ++var2) {
+         for (int var3 = 0; var3 < this.subWidth; ++var3) {
             var1.pixels[var3 + var2 * this.subWidth] = this.pixels[var2 * this.subWidth + this.subWidth - 1 - var3];
          }
       }
@@ -72,8 +72,8 @@ public final class Sprite extends Rasterizer2D {
    public Sprite copyNormalized() {
       Sprite var1 = new Sprite(this.width, this.height);
 
-      for(int var2 = 0; var2 < this.subHeight; ++var2) {
-         for(int var3 = 0; var3 < this.subWidth; ++var3) {
+      for (int var2 = 0; var2 < this.subHeight; ++var2) {
+         for (int var3 = 0; var3 < this.subWidth; ++var3) {
             var1.pixels[var3 + (var2 + this.xOffset) * this.width + this.yOffset] = this.pixels[var3 + var2 * this.subWidth];
          }
       }
@@ -90,11 +90,11 @@ public final class Sprite extends Rasterizer2D {
    @ObfuscatedName("w")
    @Export("normalize")
    public void normalize() {
-      if(this.subWidth != this.width || this.subHeight != this.height) {
+      if (this.subWidth != this.width || this.subHeight != this.height) {
          int[] var1 = new int[this.width * this.height];
 
-         for(int var2 = 0; var2 < this.subHeight; ++var2) {
-            for(int var3 = 0; var3 < this.subWidth; ++var3) {
+         for (int var2 = 0; var2 < this.subHeight; ++var2) {
+            for (int var3 = 0; var3 < this.subWidth; ++var3) {
                var1[var3 + (var2 + this.xOffset) * this.width + this.yOffset] = this.pixels[var3 + var2 * this.subWidth];
             }
          }
@@ -105,28 +105,29 @@ public final class Sprite extends Rasterizer2D {
          this.yOffset = 0;
          this.xOffset = 0;
       }
+
    }
 
    @ObfuscatedName("o")
-   public void __o_499(int var1) {
-      if(this.subWidth != this.width || this.subHeight != this.height) {
+   public void method304(int var1) {
+      if (this.subWidth != this.width || this.subHeight != this.height) {
          int var2 = var1;
-         if(var1 > this.yOffset) {
+         if (var1 > this.yOffset) {
             var2 = this.yOffset;
          }
 
          int var3 = var1;
-         if(var1 + this.yOffset + this.subWidth > this.width) {
+         if (var1 + this.yOffset + this.subWidth > this.width) {
             var3 = this.width - this.yOffset - this.subWidth;
          }
 
          int var4 = var1;
-         if(var1 > this.xOffset) {
+         if (var1 > this.xOffset) {
             var4 = this.xOffset;
          }
 
          int var5 = var1;
-         if(var1 + this.xOffset + this.subHeight > this.height) {
+         if (var1 + this.xOffset + this.subHeight > this.height) {
             var5 = this.height - this.xOffset - this.subHeight;
          }
 
@@ -134,8 +135,8 @@ public final class Sprite extends Rasterizer2D {
          int var7 = var4 + var5 + this.subHeight;
          int[] var8 = new int[var6 * var7];
 
-         for(int var9 = 0; var9 < this.subHeight; ++var9) {
-            for(int var10 = 0; var10 < this.subWidth; ++var10) {
+         for (int var9 = 0; var9 < this.subHeight; ++var9) {
+            for (int var10 = 0; var10 < this.subWidth; ++var10) {
                var8[var6 * (var9 + var4) + var10 + var2] = this.pixels[var10 + var9 * this.subWidth];
             }
          }
@@ -146,15 +147,16 @@ public final class Sprite extends Rasterizer2D {
          this.yOffset -= var2;
          this.xOffset -= var4;
       }
+
    }
 
    @ObfuscatedName("u")
-   public void __u_500() {
+   public void method305() {
       int[] var1 = new int[this.subWidth * this.subHeight];
       int var2 = 0;
 
-      for(int var3 = 0; var3 < this.subHeight; ++var3) {
-         for(int var4 = this.subWidth - 1; var4 >= 0; --var4) {
+      for (int var3 = 0; var3 < this.subHeight; ++var3) {
+         for (int var4 = this.subWidth - 1; var4 >= 0; --var4) {
             var1[var2++] = this.pixels[var4 + var3 * this.subWidth];
          }
       }
@@ -164,12 +166,12 @@ public final class Sprite extends Rasterizer2D {
    }
 
    @ObfuscatedName("g")
-   public void __g_501() {
+   public void method306() {
       int[] var1 = new int[this.subWidth * this.subHeight];
       int var2 = 0;
 
-      for(int var3 = this.subHeight - 1; var3 >= 0; --var3) {
-         for(int var4 = 0; var4 < this.subWidth; ++var4) {
+      for (int var3 = this.subHeight - 1; var3 >= 0; --var3) {
+         for (int var4 = 0; var4 < this.subWidth; ++var4) {
             var1[var2++] = this.pixels[var4 + var3 * this.subWidth];
          }
       }
@@ -179,22 +181,23 @@ public final class Sprite extends Rasterizer2D {
    }
 
    @ObfuscatedName("l")
-   public void __l_502(int var1) {
+   @Export("outline")
+   public void outline(int color) {
       int[] var2 = new int[this.subWidth * this.subHeight];
       int var3 = 0;
 
-      for(int var4 = 0; var4 < this.subHeight; ++var4) {
-         for(int var5 = 0; var5 < this.subWidth; ++var5) {
+      for (int var4 = 0; var4 < this.subHeight; ++var4) {
+         for (int var5 = 0; var5 < this.subWidth; ++var5) {
             int var6 = this.pixels[var3];
-            if(var6 == 0) {
-               if(var5 > 0 && this.pixels[var3 - 1] != 0) {
-                  var6 = var1;
-               } else if(var4 > 0 && this.pixels[var3 - this.subWidth] != 0) {
-                  var6 = var1;
-               } else if(var5 < this.subWidth - 1 && this.pixels[var3 + 1] != 0) {
-                  var6 = var1;
-               } else if(var4 < this.subHeight - 1 && this.pixels[var3 + this.subWidth] != 0) {
-                  var6 = var1;
+            if (var6 == 0) {
+               if (var5 > 0 && this.pixels[var3 - 1] != 0) {
+                  var6 = color;
+               } else if (var4 > 0 && this.pixels[var3 - this.subWidth] != 0) {
+                  var6 = color;
+               } else if (var5 < this.subWidth - 1 && this.pixels[var3 + 1] != 0) {
+                  var6 = color;
+               } else if (var4 < this.subHeight - 1 && this.pixels[var3 + this.subWidth] != 0) {
+                  var6 = color;
                }
             }
 
@@ -206,13 +209,14 @@ public final class Sprite extends Rasterizer2D {
    }
 
    @ObfuscatedName("e")
-   public void __e_503(int var1) {
-      for(int var2 = this.subHeight - 1; var2 > 0; --var2) {
+   @Export("shadow")
+   public void shadow(int color) {
+      for (int var2 = this.subHeight - 1; var2 > 0; --var2) {
          int var3 = var2 * this.subWidth;
 
-         for(int var4 = this.subWidth - 1; var4 > 0; --var4) {
-            if(this.pixels[var4 + var3] == 0 && this.pixels[var4 + var3 - 1 - this.subWidth] != 0) {
-               this.pixels[var4 + var3] = var1;
+         for (int var4 = this.subWidth - 1; var4 > 0; --var4) {
+            if (this.pixels[var4 + var3] == 0 && this.pixels[var4 + var3 - 1 - this.subWidth] != 0) {
+               this.pixels[var4 + var3] = color;
             }
          }
       }
@@ -231,7 +235,7 @@ public final class Sprite extends Rasterizer2D {
       int var7 = Rasterizer2D.Rasterizer2D_width - var6;
       int var8 = 0;
       int var9;
-      if(var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
+      if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
          var9 = Rasterizer2D.Rasterizer2D_yClipStart - var2;
          var5 -= var9;
          var2 = Rasterizer2D.Rasterizer2D_yClipStart;
@@ -239,11 +243,11 @@ public final class Sprite extends Rasterizer2D {
          var3 += var9 * Rasterizer2D.Rasterizer2D_width;
       }
 
-      if(var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) {
+      if (var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) {
          var5 -= var5 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd;
       }
 
-      if(var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
+      if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
          var9 = Rasterizer2D.Rasterizer2D_xClipStart - var1;
          var6 -= var9;
          var1 = Rasterizer2D.Rasterizer2D_xClipStart;
@@ -253,16 +257,17 @@ public final class Sprite extends Rasterizer2D {
          var7 += var9;
       }
 
-      if(var6 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
+      if (var6 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
          var9 = var6 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd;
          var6 -= var9;
          var8 += var9;
          var7 += var9;
       }
 
-      if(var6 > 0 && var5 > 0) {
+      if (var6 > 0 && var5 > 0) {
          Sprite_something(Rasterizer2D.Rasterizer2D_pixels, this.pixels, var4, var3, var6, var5, var7, var8);
       }
+
    }
 
    @ObfuscatedName("a")
@@ -277,7 +282,7 @@ public final class Sprite extends Rasterizer2D {
       int var7 = Rasterizer2D.Rasterizer2D_width - var6;
       int var8 = 0;
       int var9;
-      if(var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
+      if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
          var9 = Rasterizer2D.Rasterizer2D_yClipStart - var2;
          var5 -= var9;
          var2 = Rasterizer2D.Rasterizer2D_yClipStart;
@@ -285,11 +290,11 @@ public final class Sprite extends Rasterizer2D {
          var3 += var9 * Rasterizer2D.Rasterizer2D_width;
       }
 
-      if(var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) {
+      if (var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) {
          var5 -= var5 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd;
       }
 
-      if(var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
+      if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
          var9 = Rasterizer2D.Rasterizer2D_xClipStart - var1;
          var6 -= var9;
          var1 = Rasterizer2D.Rasterizer2D_xClipStart;
@@ -299,21 +304,22 @@ public final class Sprite extends Rasterizer2D {
          var7 += var9;
       }
 
-      if(var6 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
+      if (var6 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
          var9 = var6 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd;
          var6 -= var9;
          var8 += var9;
          var7 += var9;
       }
 
-      if(var6 > 0 && var5 > 0) {
+      if (var6 > 0 && var5 > 0) {
          Sprite_andAnotherOne(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var4, var3, var6, var5, var7, var8);
       }
+
    }
 
    @ObfuscatedName("j")
-   public void __j_506(int var1, int var2, int var3, int var4) {
-      if(var3 > 0 && var4 > 0) {
+   public void method309(int var1, int var2, int var3, int var4) {
+      if (var3 > 0 && var4 > 0) {
          int var5 = this.subWidth;
          int var6 = this.subHeight;
          int var7 = 0;
@@ -323,47 +329,47 @@ public final class Sprite extends Rasterizer2D {
          int var11 = (var9 << 16) / var3;
          int var12 = (var10 << 16) / var4;
          int var13;
-         if(this.yOffset > 0) {
+         if (this.yOffset > 0) {
             var13 = (var11 + (this.yOffset << 16) - 1) / var11;
             var1 += var13;
             var7 += var13 * var11 - (this.yOffset << 16);
          }
 
-         if(this.xOffset > 0) {
+         if (this.xOffset > 0) {
             var13 = (var12 + (this.xOffset << 16) - 1) / var12;
             var2 += var13;
             var8 += var13 * var12 - (this.xOffset << 16);
          }
 
-         if(var5 < var9) {
+         if (var5 < var9) {
             var3 = (var11 + ((var5 << 16) - var7) - 1) / var11;
          }
 
-         if(var6 < var10) {
+         if (var6 < var10) {
             var4 = (var12 + ((var6 << 16) - var8) - 1) / var12;
          }
 
          var13 = var1 + var2 * Rasterizer2D.Rasterizer2D_width;
          int var14 = Rasterizer2D.Rasterizer2D_width - var3;
-         if(var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) {
+         if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) {
             var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd;
          }
 
          int var15;
-         if(var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
+         if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
             var15 = Rasterizer2D.Rasterizer2D_yClipStart - var2;
             var4 -= var15;
             var13 += var15 * Rasterizer2D.Rasterizer2D_width;
             var8 += var12 * var15;
          }
 
-         if(var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
+         if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
             var15 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd;
             var3 -= var15;
             var14 += var15;
          }
 
-         if(var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
+         if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
             var15 = Rasterizer2D.Rasterizer2D_xClipStart - var1;
             var3 -= var15;
             var13 += var15;
@@ -373,12 +379,13 @@ public final class Sprite extends Rasterizer2D {
 
          Sprite_somethingElse(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var7, var8, var13, var14, var3, var4, var11, var12, var5);
       }
+
    }
 
    @ObfuscatedName("t")
    @Export("drawAtTransOverlay")
    public void drawAtTransOverlay(int var1, int var2, int var3, int var4) {
-      if(var3 == 256) {
+      if (var3 == 256) {
          this.drawAt2(var1, var2);
       } else {
          var1 += this.yOffset;
@@ -390,7 +397,7 @@ public final class Sprite extends Rasterizer2D {
          int var9 = Rasterizer2D.Rasterizer2D_width - var8;
          int var10 = 0;
          int var11;
-         if(var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
+         if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
             var11 = Rasterizer2D.Rasterizer2D_yClipStart - var2;
             var7 -= var11;
             var2 = Rasterizer2D.Rasterizer2D_yClipStart;
@@ -398,11 +405,11 @@ public final class Sprite extends Rasterizer2D {
             var5 += var11 * Rasterizer2D.Rasterizer2D_width;
          }
 
-         if(var7 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) {
+         if (var7 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) {
             var7 -= var7 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd;
          }
 
-         if(var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
+         if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
             var11 = Rasterizer2D.Rasterizer2D_xClipStart - var1;
             var8 -= var11;
             var1 = Rasterizer2D.Rasterizer2D_xClipStart;
@@ -412,21 +419,22 @@ public final class Sprite extends Rasterizer2D {
             var9 += var11;
          }
 
-         if(var8 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
+         if (var8 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
             var11 = var8 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd;
             var8 -= var11;
             var10 += var11;
             var9 += var11;
          }
 
-         if(var8 > 0 && var7 > 0) {
+         if (var8 > 0 && var7 > 0) {
             Sprite_anotherOne(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var6, var5, var8, var7, var9, var10, var3, var4);
          }
       }
+
    }
 
    @ObfuscatedName("h")
-   public void __h_508(int var1, int var2, int var3) {
+   public void method310(int var1, int var2, int var3) {
       var1 += this.yOffset;
       var2 += this.xOffset;
       int var4 = var1 + var2 * Rasterizer2D.Rasterizer2D_width;
@@ -436,7 +444,7 @@ public final class Sprite extends Rasterizer2D {
       int var8 = Rasterizer2D.Rasterizer2D_width - var7;
       int var9 = 0;
       int var10;
-      if(var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
+      if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
          var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2;
          var6 -= var10;
          var2 = Rasterizer2D.Rasterizer2D_yClipStart;
@@ -444,11 +452,11 @@ public final class Sprite extends Rasterizer2D {
          var4 += var10 * Rasterizer2D.Rasterizer2D_width;
       }
 
-      if(var6 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) {
+      if (var6 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) {
          var6 -= var6 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd;
       }
 
-      if(var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
+      if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
          var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1;
          var7 -= var10;
          var1 = Rasterizer2D.Rasterizer2D_xClipStart;
@@ -458,21 +466,22 @@ public final class Sprite extends Rasterizer2D {
          var8 += var10;
       }
 
-      if(var7 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
+      if (var7 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
          var10 = var7 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd;
          var7 -= var10;
          var9 += var10;
          var8 += var10;
       }
 
-      if(var7 > 0 && var6 > 0) {
+      if (var7 > 0 && var6 > 0) {
          Sprite_alpha1(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var5, var4, var7, var6, var8, var9, var3);
       }
+
    }
 
    @ObfuscatedName("c")
-   public void __c_509(int var1, int var2, int var3, int var4, int var5) {
-      if(var3 > 0 && var4 > 0) {
+   public void method311(int var1, int var2, int var3, int var4, int var5) {
+      if (var3 > 0 && var4 > 0) {
          int var6 = this.subWidth;
          int var7 = this.subHeight;
          int var8 = 0;
@@ -482,47 +491,47 @@ public final class Sprite extends Rasterizer2D {
          int var12 = (var10 << 16) / var3;
          int var13 = (var11 << 16) / var4;
          int var14;
-         if(this.yOffset > 0) {
+         if (this.yOffset > 0) {
             var14 = (var12 + (this.yOffset << 16) - 1) / var12;
             var1 += var14;
             var8 += var14 * var12 - (this.yOffset << 16);
          }
 
-         if(this.xOffset > 0) {
+         if (this.xOffset > 0) {
             var14 = (var13 + (this.xOffset << 16) - 1) / var13;
             var2 += var14;
             var9 += var14 * var13 - (this.xOffset << 16);
          }
 
-         if(var6 < var10) {
+         if (var6 < var10) {
             var3 = (var12 + ((var6 << 16) - var8) - 1) / var12;
          }
 
-         if(var7 < var11) {
+         if (var7 < var11) {
             var4 = (var13 + ((var7 << 16) - var9) - 1) / var13;
          }
 
          var14 = var1 + var2 * Rasterizer2D.Rasterizer2D_width;
          int var15 = Rasterizer2D.Rasterizer2D_width - var3;
-         if(var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) {
+         if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) {
             var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd;
          }
 
          int var16;
-         if(var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
+         if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
             var16 = Rasterizer2D.Rasterizer2D_yClipStart - var2;
             var4 -= var16;
             var14 += var16 * Rasterizer2D.Rasterizer2D_width;
             var9 += var13 * var16;
          }
 
-         if(var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
+         if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
             var16 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd;
             var3 -= var16;
             var15 += var16;
          }
 
-         if(var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
+         if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
             var16 = Rasterizer2D.Rasterizer2D_xClipStart - var1;
             var3 -= var16;
             var14 += var16;
@@ -532,10 +541,11 @@ public final class Sprite extends Rasterizer2D {
 
          Sprite_alpha2(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var8, var9, var14, var15, var3, var4, var12, var13, var6, var5);
       }
+
    }
 
    @ObfuscatedName("v")
-   public void __v_510(int var1, int var2, int var3) {
+   public void method312(int var1, int var2, int var3) {
       var1 += this.yOffset;
       var2 += this.xOffset;
       int var4 = var1 + var2 * Rasterizer2D.Rasterizer2D_width;
@@ -545,7 +555,7 @@ public final class Sprite extends Rasterizer2D {
       int var8 = Rasterizer2D.Rasterizer2D_width - var7;
       int var9 = 0;
       int var10;
-      if(var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
+      if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
          var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2;
          var6 -= var10;
          var2 = Rasterizer2D.Rasterizer2D_yClipStart;
@@ -553,11 +563,11 @@ public final class Sprite extends Rasterizer2D {
          var4 += var10 * Rasterizer2D.Rasterizer2D_width;
       }
 
-      if(var6 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) {
+      if (var6 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) {
          var6 -= var6 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd;
       }
 
-      if(var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
+      if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
          var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1;
          var7 -= var10;
          var1 = Rasterizer2D.Rasterizer2D_xClipStart;
@@ -567,26 +577,26 @@ public final class Sprite extends Rasterizer2D {
          var8 += var10;
       }
 
-      if(var7 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
+      if (var7 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
          var10 = var7 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd;
          var7 -= var10;
          var9 += var10;
          var8 += var10;
       }
 
-      if(var7 > 0 && var6 > 0) {
-         if(var3 == 256) {
+      if (var7 > 0 && var6 > 0) {
+         if (var3 == 256) {
             method6074(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9);
          } else {
             method6075(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3);
          }
-
       }
+
    }
 
    @ObfuscatedName("aj")
-   public void __aj_511(int var1, int var2, int var3, int var4, int var5) {
-      if(var3 > 0 && var4 > 0) {
+   public void method313(int var1, int var2, int var3, int var4, int var5) {
+      if (var3 > 0 && var4 > 0) {
          int var6 = this.subWidth;
          int var7 = this.subHeight;
          int var8 = 0;
@@ -596,47 +606,47 @@ public final class Sprite extends Rasterizer2D {
          int var12 = (var10 << 16) / var3;
          int var13 = (var11 << 16) / var4;
          int var14;
-         if(this.yOffset > 0) {
+         if (this.yOffset > 0) {
             var14 = (var12 + (this.yOffset << 16) - 1) / var12;
             var1 += var14;
             var8 += var14 * var12 - (this.yOffset << 16);
          }
 
-         if(this.xOffset > 0) {
+         if (this.xOffset > 0) {
             var14 = (var13 + (this.xOffset << 16) - 1) / var13;
             var2 += var14;
             var9 += var14 * var13 - (this.xOffset << 16);
          }
 
-         if(var6 < var10) {
+         if (var6 < var10) {
             var3 = (var12 + ((var6 << 16) - var8) - 1) / var12;
          }
 
-         if(var7 < var11) {
+         if (var7 < var11) {
             var4 = (var13 + ((var7 << 16) - var9) - 1) / var13;
          }
 
          var14 = var1 + var2 * Rasterizer2D.Rasterizer2D_width;
          int var15 = Rasterizer2D.Rasterizer2D_width - var3;
-         if(var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) {
+         if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) {
             var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd;
          }
 
          int var16;
-         if(var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
+         if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
             var16 = Rasterizer2D.Rasterizer2D_yClipStart - var2;
             var4 -= var16;
             var14 += var16 * Rasterizer2D.Rasterizer2D_width;
             var9 += var13 * var16;
          }
 
-         if(var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
+         if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
             var16 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd;
             var3 -= var16;
             var15 += var16;
          }
 
-         if(var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
+         if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
             var16 = Rasterizer2D.Rasterizer2D_xClipStart - var1;
             var3 -= var16;
             var14 += var16;
@@ -644,65 +654,65 @@ public final class Sprite extends Rasterizer2D {
             var15 += var16;
          }
 
-         if(var5 == 256) {
+         if (var5 == 256) {
             method6144(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6);
          } else {
             method6078(0, 0, 0, var8, this.pixels, Rasterizer2D.Rasterizer2D_pixels, 0, 0, -var4, var9, var14, var15, var3, var12, var13, var6, var5);
          }
-
       }
+
    }
 
    @ObfuscatedName("ac")
-   public void __ac_512(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7, int[] var8) {
-      int var9 = var2 < 0?-var2:0;
-      int var10 = var2 + this.subHeight <= var6?this.subHeight:var6 - var2;
-      int var11 = var1 < 0?-var1:0;
-      int var10000;
-      if(this.subWidth + var1 <= var5) {
-         var10000 = this.subWidth;
+   public void method314(int var1, int var2, int var3, int var4, int var5, int var6, int[] var7, int[] var8) {
+      int var9 = var2 < 0 ? -var2 : 0;
+      int var10 = var2 + this.subHeight <= var6 ? this.subHeight : var6 - var2;
+      int var11 = var1 < 0 ? -var1 : 0;
+      int var12;
+      if (this.subWidth + var1 <= var5) {
+         var12 = this.subWidth;
       } else {
-         var10000 = var5 - var1;
+         int var10000 = var5 - var1;
       }
 
-      int var13 = var3 + var11 + (var9 + var2 + var4) * Rasterizer2D.Rasterizer2D_width + var1;
-      int var14 = var9 + var2;
+      var12 = var3 + var11 + (var9 + var2 + var4) * Rasterizer2D.Rasterizer2D_width + var1;
+      int var13 = var9 + var2;
+
+      for (int var14 = var9; var14 < var10; ++var14) {
+         int var15 = var7[var13];
+         int var16 = var8[var13++];
+         int var17 = var12;
+         int var18;
+         if (var1 < var15) {
+            var18 = var15 - var1;
+            var17 = var12 + (var18 - var11);
+         } else {
+            var18 = var11;
+         }
 
-      for(int var15 = var9; var15 < var10; ++var15) {
-         int var16 = var7[var14];
-         int var17 = var8[var14++];
-         int var18 = var13;
          int var19;
-         if(var1 < var16) {
-            var19 = var16 - var1;
-            var18 = var13 + (var19 - var11);
+         if (this.subWidth + var1 <= var15 + var16) {
+            var19 = this.subWidth;
          } else {
-            var19 = var11;
+            var19 = var15 + var16 - var1;
          }
 
-         int var12;
-         if(this.subWidth + var1 <= var16 + var17) {
-            var12 = this.subWidth;
-         } else {
-            var12 = var16 + var17 - var1;
-         }
-
-         for(int var20 = var19; var20 < var12; ++var20) {
-            int var21 = this.pixels[var20 + var15 * this.subWidth];
-            if(var21 != 0) {
-               Rasterizer2D.Rasterizer2D_pixels[var18++] = var21;
+         for (int var20 = var18; var20 < var19; ++var20) {
+            int var21 = this.pixels[var20 + var14 * this.subWidth];
+            if (var21 != 0) {
+               Rasterizer2D.Rasterizer2D_pixels[var17++] = var21;
             } else {
-               ++var18;
+               ++var17;
             }
          }
 
-         var13 += Rasterizer2D.Rasterizer2D_width;
+         var12 += Rasterizer2D.Rasterizer2D_width;
       }
 
    }
 
    @ObfuscatedName("ay")
-   public void __ay_513(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int[] var9, int[] var10) {
+   public void method315(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int[] var9, int[] var10) {
       try {
          int var11 = -var3 / 2;
          int var12 = -var4 / 2;
@@ -714,13 +724,13 @@ public final class Sprite extends Rasterizer2D {
          int var16 = var12 * var14 - var11 * var13 + (var6 << 16);
          int var17 = var1 + var2 * Rasterizer2D.Rasterizer2D_width;
 
-         for(var2 = 0; var2 < var4; ++var2) {
+         for (var2 = 0; var2 < var4; ++var2) {
             int var18 = var9[var2];
             int var19 = var17 + var18;
             int var20 = var15 + var14 * var18;
             int var21 = var16 - var13 * var18;
 
-            for(var1 = -var10[var2]; var1 < 0; ++var1) {
+            for (var1 = -var10[var2]; var1 < 0; ++var1) {
                Rasterizer2D.Rasterizer2D_pixels[var19++] = this.pixels[this.subWidth * (var21 >> 16) + (var20 >> 16)];
                var20 += var14;
                var21 -= var13;
@@ -730,14 +740,13 @@ public final class Sprite extends Rasterizer2D {
             var16 += var14;
             var17 += Rasterizer2D.Rasterizer2D_width;
          }
-      } catch (Exception var23) {
-         ;
+      } catch (Exception var22) {
       }
 
    }
 
    @ObfuscatedName("ah")
-   public void __ah_514(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) {
+   public void method316(int var1, int var2, int var3, int var4, int var5, int var6, double var7, int var9) {
       try {
          int var10 = -var3 / 2;
          int var11 = -var4 / 2;
@@ -749,14 +758,14 @@ public final class Sprite extends Rasterizer2D {
          int var15 = var11 * var13 - var10 * var12 + (var6 << 16);
          int var16 = var1 + var2 * Rasterizer2D.Rasterizer2D_width;
 
-         for(var2 = 0; var2 < var4; ++var2) {
+         for (var2 = 0; var2 < var4; ++var2) {
             int var17 = var16;
             int var18 = var14;
             int var19 = var15;
 
-            for(var1 = -var3; var1 < 0; ++var1) {
+            for (var1 = -var3; var1 < 0; ++var1) {
                int var20 = this.pixels[this.subWidth * (var19 >> 16) + (var18 >> 16)];
-               if(var20 != 0) {
+               if (var20 != 0) {
                   Rasterizer2D.Rasterizer2D_pixels[var17++] = var20;
                } else {
                   ++var17;
@@ -770,20 +779,19 @@ public final class Sprite extends Rasterizer2D {
             var15 += var13;
             var16 += Rasterizer2D.Rasterizer2D_width;
          }
-      } catch (Exception var22) {
-         ;
+      } catch (Exception var21) {
       }
 
    }
 
    @ObfuscatedName("ak")
-   public void __ak_515(int var1, int var2, int var3, int var4) {
-      this.__aw_516(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4);
+   public void method317(int var1, int var2, int var3, int var4) {
+      this.method318(this.width << 3, this.height << 3, var1 << 4, var2 << 4, var3, var4);
    }
 
    @ObfuscatedName("aw")
-   void __aw_516(int var1, int var2, int var3, int var4, int var5, int var6) {
-      if(var6 != 0) {
+   void method318(int var1, int var2, int var3, int var4, int var5, int var6) {
+      if (var6 != 0) {
          var1 -= this.yOffset << 4;
          var2 -= this.xOffset << 4;
          double var7 = (double)(var5 & 65535) * 9.587379924285257E-5D;
@@ -799,7 +807,7 @@ public final class Sprite extends Rasterizer2D {
          int var18 = ((this.subHeight << 4) - var2) * var10 + var9 * -((this.subWidth << 4) - var1);
          int var19;
          int var20;
-         if(var11 < var13) {
+         if (var11 < var13) {
             var19 = var11;
             var20 = var13;
          } else {
@@ -807,25 +815,25 @@ public final class Sprite extends Rasterizer2D {
             var20 = var11;
          }
 
-         if(var15 < var19) {
+         if (var15 < var19) {
             var19 = var15;
          }
 
-         if(var17 < var19) {
+         if (var17 < var19) {
             var19 = var17;
          }
 
-         if(var15 > var20) {
+         if (var15 > var20) {
             var20 = var15;
          }
 
-         if(var17 > var20) {
+         if (var17 > var20) {
             var20 = var17;
          }
 
          int var21;
          int var22;
-         if(var12 < var14) {
+         if (var12 < var14) {
             var21 = var12;
             var22 = var14;
          } else {
@@ -833,19 +841,19 @@ public final class Sprite extends Rasterizer2D {
             var22 = var12;
          }
 
-         if(var16 < var21) {
+         if (var16 < var21) {
             var21 = var16;
          }
 
-         if(var18 < var21) {
+         if (var18 < var21) {
             var21 = var18;
          }
 
-         if(var16 > var22) {
+         if (var16 > var22) {
             var22 = var16;
          }
 
-         if(var18 > var22) {
+         if (var18 > var22) {
             var22 = var18;
          }
 
@@ -861,26 +869,26 @@ public final class Sprite extends Rasterizer2D {
          var20 = var20 + 15 >> 4;
          var21 >>= 4;
          var22 = var22 + 15 >> 4;
-         if(var19 < Rasterizer2D.Rasterizer2D_xClipStart) {
+         if (var19 < Rasterizer2D.Rasterizer2D_xClipStart) {
             var19 = Rasterizer2D.Rasterizer2D_xClipStart;
          }
 
-         if(var20 > Rasterizer2D.Rasterizer2D_xClipEnd) {
+         if (var20 > Rasterizer2D.Rasterizer2D_xClipEnd) {
             var20 = Rasterizer2D.Rasterizer2D_xClipEnd;
          }
 
-         if(var21 < Rasterizer2D.Rasterizer2D_yClipStart) {
+         if (var21 < Rasterizer2D.Rasterizer2D_yClipStart) {
             var21 = Rasterizer2D.Rasterizer2D_yClipStart;
          }
 
-         if(var22 > Rasterizer2D.Rasterizer2D_yClipEnd) {
+         if (var22 > Rasterizer2D.Rasterizer2D_yClipEnd) {
             var22 = Rasterizer2D.Rasterizer2D_yClipEnd;
          }
 
          var20 = var19 - var20;
-         if(var20 < 0) {
+         if (var20 < 0) {
             var22 = var21 - var22;
-            if(var22 < 0) {
+            if (var22 < 0) {
                int var23 = var19 + var21 * Rasterizer2D.Rasterizer2D_width;
                double var24 = 1.6777216E7D / (double)var6;
                int var26 = (int)Math.floor(Math.sin(var7) * var24 + 0.5D);
@@ -896,17 +904,17 @@ public final class Sprite extends Rasterizer2D {
                int var36;
                int var37;
                int var38;
-               if(var27 == 0) {
-                  if(var26 == 0) {
-                     for(var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) {
+               if (var27 == 0) {
+                  if (var26 == 0) {
+                     for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) {
                         var34 = var23;
                         var35 = var30;
                         var36 = var31;
                         var37 = var20;
-                        if(var30 >= 0 && var31 >= 0 && var30 - (this.subWidth << 12) < 0 && var31 - (this.subHeight << 12) < 0) {
-                           for(; var37 < 0; ++var37) {
+                        if (var30 >= 0 && var31 >= 0 && var30 - (this.subWidth << 12) < 0 && var31 - (this.subHeight << 12) < 0) {
+                           for (; var37 < 0; ++var37) {
                               var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth];
-                              if(var38 != 0) {
+                              if (var38 != 0) {
                                  Rasterizer2D.Rasterizer2D_pixels[var34++] = var38;
                               } else {
                                  ++var34;
@@ -916,27 +924,27 @@ public final class Sprite extends Rasterizer2D {
 
                         ++var33;
                      }
-                  } else if(var26 < 0) {
-                     for(var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) {
+                  } else if (var26 < 0) {
+                     for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) {
                         var34 = var23;
                         var35 = var30;
                         var36 = (var28 * var26 >> 4) + var31;
                         var37 = var20;
-                        if(var30 >= 0 && var30 - (this.subWidth << 12) < 0) {
-                           if((var32 = var36 - (this.subHeight << 12)) >= 0) {
+                        if (var30 >= 0 && var30 - (this.subWidth << 12) < 0) {
+                           if ((var32 = var36 - (this.subHeight << 12)) >= 0) {
                               var32 = (var26 - var32) / var26;
                               var37 = var20 + var32;
                               var36 += var26 * var32;
                               var34 = var23 + var32;
                            }
 
-                           if((var32 = (var36 - var26) / var26) > var37) {
+                           if ((var32 = (var36 - var26) / var26) > var37) {
                               var37 = var32;
                            }
 
-                           while(var37 < 0) {
+                           while (var37 < 0) {
                               var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth];
-                              if(var38 != 0) {
+                              if (var38 != 0) {
                                  Rasterizer2D.Rasterizer2D_pixels[var34++] = var38;
                               } else {
                                  ++var34;
@@ -951,26 +959,26 @@ public final class Sprite extends Rasterizer2D {
                         var30 -= var26;
                      }
                   } else {
-                     for(var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) {
+                     for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) {
                         var34 = var23;
                         var35 = var30;
                         var36 = (var28 * var26 >> 4) + var31;
                         var37 = var20;
-                        if(var30 >= 0 && var30 - (this.subWidth << 12) < 0) {
-                           if(var36 < 0) {
+                        if (var30 >= 0 && var30 - (this.subWidth << 12) < 0) {
+                           if (var36 < 0) {
                               var32 = (var26 - 1 - var36) / var26;
                               var37 = var20 + var32;
                               var36 += var26 * var32;
                               var34 = var23 + var32;
                            }
 
-                           if((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) {
+                           if ((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) {
                               var37 = var32;
                            }
 
-                           while(var37 < 0) {
+                           while (var37 < 0) {
                               var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth];
-                              if(var38 != 0) {
+                              if (var38 != 0) {
                                  Rasterizer2D.Rasterizer2D_pixels[var34++] = var38;
                               } else {
                                  ++var34;
@@ -985,28 +993,28 @@ public final class Sprite extends Rasterizer2D {
                         var30 -= var26;
                      }
                   }
-               } else if(var27 < 0) {
-                  if(var26 == 0) {
-                     for(var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) {
+               } else if (var27 < 0) {
+                  if (var26 == 0) {
+                     for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) {
                         var34 = var23;
                         var35 = (var28 * var27 >> 4) + var30;
                         var36 = var31;
                         var37 = var20;
-                        if(var31 >= 0 && var31 - (this.subHeight << 12) < 0) {
-                           if((var32 = var35 - (this.subWidth << 12)) >= 0) {
+                        if (var31 >= 0 && var31 - (this.subHeight << 12) < 0) {
+                           if ((var32 = var35 - (this.subWidth << 12)) >= 0) {
                               var32 = (var27 - var32) / var27;
                               var37 = var20 + var32;
                               var35 += var27 * var32;
                               var34 = var23 + var32;
                            }
 
-                           if((var32 = (var35 - var27) / var27) > var37) {
+                           if ((var32 = (var35 - var27) / var27) > var37) {
                               var37 = var32;
                            }
 
-                           while(var37 < 0) {
+                           while (var37 < 0) {
                               var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth];
-                              if(var38 != 0) {
+                              if (var38 != 0) {
                                  Rasterizer2D.Rasterizer2D_pixels[var34++] = var38;
                               } else {
                                  ++var34;
@@ -1020,13 +1028,13 @@ public final class Sprite extends Rasterizer2D {
                         ++var33;
                         var31 += var27;
                      }
-                  } else if(var26 < 0) {
-                     for(var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) {
+                  } else if (var26 < 0) {
+                     for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) {
                         var34 = var23;
                         var35 = (var28 * var27 >> 4) + var30;
                         var36 = (var28 * var26 >> 4) + var31;
                         var37 = var20;
-                        if((var32 = var35 - (this.subWidth << 12)) >= 0) {
+                        if ((var32 = var35 - (this.subWidth << 12)) >= 0) {
                            var32 = (var27 - var32) / var27;
                            var37 = var20 + var32;
                            var35 += var27 * var32;
@@ -1034,11 +1042,11 @@ public final class Sprite extends Rasterizer2D {
                            var34 = var23 + var32;
                         }
 
-                        if((var32 = (var35 - var27) / var27) > var37) {
+                        if ((var32 = (var35 - var27) / var27) > var37) {
                            var37 = var32;
                         }
 
-                        if((var32 = var36 - (this.subHeight << 12)) >= 0) {
+                        if ((var32 = var36 - (this.subHeight << 12)) >= 0) {
                            var32 = (var26 - var32) / var26;
                            var37 += var32;
                            var35 += var27 * var32;
@@ -1046,13 +1054,13 @@ public final class Sprite extends Rasterizer2D {
                            var34 += var32;
                         }
 
-                        if((var32 = (var36 - var26) / var26) > var37) {
+                        if ((var32 = (var36 - var26) / var26) > var37) {
                            var37 = var32;
                         }
 
-                        while(var37 < 0) {
+                        while (var37 < 0) {
                            var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth];
-                           if(var38 != 0) {
+                           if (var38 != 0) {
                               Rasterizer2D.Rasterizer2D_pixels[var34++] = var38;
                            } else {
                               ++var34;
@@ -1068,12 +1076,12 @@ public final class Sprite extends Rasterizer2D {
                         var31 += var27;
                      }
                   } else {
-                     for(var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) {
+                     for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) {
                         var34 = var23;
                         var35 = (var28 * var27 >> 4) + var30;
                         var36 = (var28 * var26 >> 4) + var31;
                         var37 = var20;
-                        if((var32 = var35 - (this.subWidth << 12)) >= 0) {
+                        if ((var32 = var35 - (this.subWidth << 12)) >= 0) {
                            var32 = (var27 - var32) / var27;
                            var37 = var20 + var32;
                            var35 += var27 * var32;
@@ -1081,11 +1089,11 @@ public final class Sprite extends Rasterizer2D {
                            var34 = var23 + var32;
                         }
 
-                        if((var32 = (var35 - var27) / var27) > var37) {
+                        if ((var32 = (var35 - var27) / var27) > var37) {
                            var37 = var32;
                         }
 
-                        if(var36 < 0) {
+                        if (var36 < 0) {
                            var32 = (var26 - 1 - var36) / var26;
                            var37 += var32;
                            var35 += var27 * var32;
@@ -1093,13 +1101,13 @@ public final class Sprite extends Rasterizer2D {
                            var34 += var32;
                         }
 
-                        if((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) {
+                        if ((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) {
                            var37 = var32;
                         }
 
-                        while(var37 < 0) {
+                        while (var37 < 0) {
                            var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth];
-                           if(var38 != 0) {
+                           if (var38 != 0) {
                               Rasterizer2D.Rasterizer2D_pixels[var34++] = var38;
                            } else {
                               ++var34;
@@ -1115,27 +1123,27 @@ public final class Sprite extends Rasterizer2D {
                         var31 += var27;
                      }
                   }
-               } else if(var26 == 0) {
-                  for(var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) {
+               } else if (var26 == 0) {
+                  for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) {
                      var34 = var23;
                      var35 = (var28 * var27 >> 4) + var30;
                      var36 = var31;
                      var37 = var20;
-                     if(var31 >= 0 && var31 - (this.subHeight << 12) < 0) {
-                        if(var35 < 0) {
+                     if (var31 >= 0 && var31 - (this.subHeight << 12) < 0) {
+                        if (var35 < 0) {
                            var32 = (var27 - 1 - var35) / var27;
                            var37 = var20 + var32;
                            var35 += var27 * var32;
                            var34 = var23 + var32;
                         }
 
-                        if((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) {
+                        if ((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) {
                            var37 = var32;
                         }
 
-                        while(var37 < 0) {
+                        while (var37 < 0) {
                            var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth];
-                           if(var38 != 0) {
+                           if (var38 != 0) {
                               Rasterizer2D.Rasterizer2D_pixels[var34++] = var38;
                            } else {
                               ++var34;
@@ -1149,13 +1157,13 @@ public final class Sprite extends Rasterizer2D {
                      ++var33;
                      var31 += var27;
                   }
-               } else if(var26 < 0) {
-                  for(var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) {
+               } else if (var26 < 0) {
+                  for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) {
                      var34 = var23;
                      var35 = (var28 * var27 >> 4) + var30;
                      var36 = (var28 * var26 >> 4) + var31;
                      var37 = var20;
-                     if(var35 < 0) {
+                     if (var35 < 0) {
                         var32 = (var27 - 1 - var35) / var27;
                         var37 = var20 + var32;
                         var35 += var27 * var32;
@@ -1163,11 +1171,11 @@ public final class Sprite extends Rasterizer2D {
                         var34 = var23 + var32;
                      }
 
-                     if((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) {
+                     if ((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) {
                         var37 = var32;
                      }
 
-                     if((var32 = var36 - (this.subHeight << 12)) >= 0) {
+                     if ((var32 = var36 - (this.subHeight << 12)) >= 0) {
                         var32 = (var26 - var32) / var26;
                         var37 += var32;
                         var35 += var27 * var32;
@@ -1175,13 +1183,13 @@ public final class Sprite extends Rasterizer2D {
                         var34 += var32;
                      }
 
-                     if((var32 = (var36 - var26) / var26) > var37) {
+                     if ((var32 = (var36 - var26) / var26) > var37) {
                         var37 = var32;
                      }
 
-                     while(var37 < 0) {
+                     while (var37 < 0) {
                         var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth];
-                        if(var38 != 0) {
+                        if (var38 != 0) {
                            Rasterizer2D.Rasterizer2D_pixels[var34++] = var38;
                         } else {
                            ++var34;
@@ -1197,12 +1205,12 @@ public final class Sprite extends Rasterizer2D {
                      var31 += var27;
                   }
                } else {
-                  for(var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) {
+                  for (var33 = var22; var33 < 0; var23 += Rasterizer2D.Rasterizer2D_width) {
                      var34 = var23;
                      var35 = (var28 * var27 >> 4) + var30;
                      var36 = (var28 * var26 >> 4) + var31;
                      var37 = var20;
-                     if(var35 < 0) {
+                     if (var35 < 0) {
                         var32 = (var27 - 1 - var35) / var27;
                         var37 = var20 + var32;
                         var35 += var27 * var32;
@@ -1210,11 +1218,11 @@ public final class Sprite extends Rasterizer2D {
                         var34 = var23 + var32;
                      }
 
-                     if((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) {
+                     if ((var32 = (var35 + 1 - (this.subWidth << 12) - var27) / var27) > var37) {
                         var37 = var32;
                      }
 
-                     if(var36 < 0) {
+                     if (var36 < 0) {
                         var32 = (var26 - 1 - var36) / var26;
                         var37 += var32;
                         var35 += var27 * var32;
@@ -1222,13 +1230,13 @@ public final class Sprite extends Rasterizer2D {
                         var34 += var32;
                      }
 
-                     if((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) {
+                     if ((var32 = (var36 + 1 - (this.subHeight << 12) - var26) / var26) > var37) {
                         var37 = var32;
                      }
 
-                     while(var37 < 0) {
+                     while (var37 < 0) {
                         var38 = this.pixels[(var35 >> 12) + (var36 >> 12) * this.subWidth];
-                        if(var38 != 0) {
+                        if (var38 != 0) {
                            Rasterizer2D.Rasterizer2D_pixels[var34++] = var38;
                         } else {
                            ++var34;
@@ -1244,41 +1252,41 @@ public final class Sprite extends Rasterizer2D {
                      var31 += var27;
                   }
                }
-
             }
          }
       }
+
    }
 
    @ObfuscatedName("al")
-   public void __al_517(int var1, int var2, int var3, int var4) {
-      if(var3 <= this.width && var4 <= this.height) {
+   public void method319(int var1, int var2, int var3, int var4) {
+      if (var3 <= this.width && var4 <= this.height) {
          int var5 = var3 * this.yOffset / this.width + var1;
          int var6 = (var3 * (this.yOffset + this.subWidth) + this.width - 1) / this.width + var1;
          int var7 = var2 + var4 * this.xOffset / this.height;
          int var8 = var2 + (this.height + (this.xOffset + this.subHeight) * var4 - 1) / this.height;
-         if(var5 < Rasterizer2D.Rasterizer2D_xClipStart) {
+         if (var5 < Rasterizer2D.Rasterizer2D_xClipStart) {
             var5 = Rasterizer2D.Rasterizer2D_xClipStart;
          }
 
-         if(var6 > Rasterizer2D.Rasterizer2D_xClipEnd) {
+         if (var6 > Rasterizer2D.Rasterizer2D_xClipEnd) {
             var6 = Rasterizer2D.Rasterizer2D_xClipEnd;
          }
 
-         if(var7 < Rasterizer2D.Rasterizer2D_yClipStart) {
+         if (var7 < Rasterizer2D.Rasterizer2D_yClipStart) {
             var7 = Rasterizer2D.Rasterizer2D_yClipStart;
          }
 
-         if(var8 > Rasterizer2D.Rasterizer2D_yClipEnd) {
+         if (var8 > Rasterizer2D.Rasterizer2D_yClipEnd) {
             var8 = Rasterizer2D.Rasterizer2D_yClipEnd;
          }
 
-         if(var5 < var6 && var7 < var8) {
+         if (var5 < var6 && var7 < var8) {
             int var9 = var5 + var7 * Rasterizer2D.Rasterizer2D_width;
             int var10 = Rasterizer2D.Rasterizer2D_width - (var6 - var5);
-            if(var9 < Rasterizer2D.Rasterizer2D_pixels.length) {
-               for(int var11 = var7; var11 < var8; ++var11) {
-                  for(int var12 = var5; var12 < var6; ++var12) {
+            if (var9 < Rasterizer2D.Rasterizer2D_pixels.length) {
+               for (int var11 = var7; var11 < var8; ++var11) {
+                  for (int var12 = var5; var12 < var6; ++var12) {
                      int var13 = var12 - var1 << 4;
                      int var14 = var11 - var2 << 4;
                      int var15 = var13 * this.width / var3 - (this.yOffset << 4);
@@ -1286,20 +1294,20 @@ public final class Sprite extends Rasterizer2D {
                      int var17 = var14 * this.height / var4 - (this.xOffset << 4);
                      int var18 = (var14 + 16) * this.height / var4 - (this.xOffset << 4);
                      int var19 = (var16 - var15) * (var18 - var17) >> 1;
-                     if(var19 != 0) {
-                        if(var15 < 0) {
+                     if (var19 != 0) {
+                        if (var15 < 0) {
                            var15 = 0;
                         }
 
-                        if(var16 >= this.subWidth << 4) {
+                        if (var16 >= this.subWidth << 4) {
                            var16 = this.subWidth << 4;
                         }
 
-                        if(var17 < 0) {
+                        if (var17 < 0) {
                            var17 = 0;
                         }
 
-                        if(var18 >= this.subHeight << 4) {
+                        if (var18 >= this.subHeight << 4) {
                            var18 = this.subHeight << 4;
                         }
 
@@ -1319,23 +1327,23 @@ public final class Sprite extends Rasterizer2D {
                         int var27 = 0;
 
                         int var28;
-                        for(var28 = var17; var28 <= var18; ++var28) {
+                        for (var28 = var17; var28 <= var18; ++var28) {
                            int var29 = 16;
-                           if(var28 == var17) {
+                           if (var28 == var17) {
                               var29 = var22;
                            }
 
-                           if(var28 == var18) {
+                           if (var28 == var18) {
                               var29 = var23;
                            }
 
-                           for(int var30 = var15; var30 <= var16; ++var30) {
+                           for (int var30 = var15; var30 <= var16; ++var30) {
                               int var31 = this.pixels[var30 + var28 * this.subWidth];
-                              if(var31 != 0) {
+                              if (var31 != 0) {
                                  int var32;
-                                 if(var30 == var15) {
+                                 if (var30 == var15) {
                                     var32 = var29 * var20;
-                                 } else if(var30 == var16) {
+                                 } else if (var30 == var16) {
                                     var32 = var29 * var21;
                                  } else {
                                     var32 = var29 << 4;
@@ -1349,9 +1357,9 @@ public final class Sprite extends Rasterizer2D {
                            }
                         }
 
-                        if(var27 >= var19) {
+                        if (var27 >= var19) {
                            var28 = var26 / var27 + (var24 / var27 << 16) + (var25 / var27 << 8);
-                           if(var28 == 0) {
+                           if (var28 == 0) {
                               var28 = 1;
                            }
 
@@ -1364,9 +1372,9 @@ public final class Sprite extends Rasterizer2D {
 
                   var9 += var10;
                }
-
             }
          }
+
       } else {
          throw new IllegalArgumentException();
       }
@@ -1375,16 +1383,15 @@ public final class Sprite extends Rasterizer2D {
    @ObfuscatedName("d")
    @Export("Sprite_something")
    static void Sprite_something(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7) {
-      for(int var8 = -var5; var8 < 0; ++var8) {
+      for (int var8 = -var5; var8 < 0; ++var8) {
          int var9;
-         for(var9 = var3 + var4 - 3; var3 < var9; var0[var3++] = var1[var2++]) {
+         for (var9 = var3 + var4 - 3; var3 < var9; var0[var3++] = var1[var2++]) {
             var0[var3++] = var1[var2++];
             var0[var3++] = var1[var2++];
             var0[var3++] = var1[var2++];
          }
 
-         for(var9 += 3; var3 < var9; var0[var3++] = var1[var2++]) {
-            ;
+         for (var9 += 3; var3 < var9; var0[var3++] = var1[var2++]) {
          }
 
          var3 += var6;
@@ -1399,41 +1406,41 @@ public final class Sprite extends Rasterizer2D {
       int var9 = -(var5 >> 2);
       var5 = -(var5 & 3);
 
-      for(int var10 = -var6; var10 < 0; ++var10) {
+      for (int var10 = -var6; var10 < 0; ++var10) {
          int var11;
-         for(var11 = var9; var11 < 0; ++var11) {
+         for (var11 = var9; var11 < 0; ++var11) {
             var2 = var1[var3++];
-            if(var2 != 0) {
+            if (var2 != 0) {
                var0[var4++] = var2;
             } else {
                ++var4;
             }
 
             var2 = var1[var3++];
-            if(var2 != 0) {
+            if (var2 != 0) {
                var0[var4++] = var2;
             } else {
                ++var4;
             }
 
             var2 = var1[var3++];
-            if(var2 != 0) {
+            if (var2 != 0) {
                var0[var4++] = var2;
             } else {
                ++var4;
             }
 
             var2 = var1[var3++];
-            if(var2 != 0) {
+            if (var2 != 0) {
                var0[var4++] = var2;
             } else {
                ++var4;
             }
          }
 
-         for(var11 = var5; var11 < 0; ++var11) {
+         for (var11 = var5; var11 < 0; ++var11) {
             var2 = var1[var3++];
-            if(var2 != 0) {
+            if (var2 != 0) {
                var0[var4++] = var2;
             } else {
                ++var4;
@@ -1451,12 +1458,12 @@ public final class Sprite extends Rasterizer2D {
    static void Sprite_somethingElse(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;
 
-      for(int var13 = -var8; var13 < 0; ++var13) {
+      for (int var13 = -var8; var13 < 0; ++var13) {
          int var14 = var11 * (var4 >> 16);
 
-         for(int var15 = -var7; var15 < 0; ++var15) {
+         for (int var15 = -var7; var15 < 0; ++var15) {
             var2 = var1[(var3 >> 16) + var14];
-            if(var2 != 0) {
+            if (var2 != 0) {
                var0[var5++] = var2;
             } else {
                ++var5;
@@ -1480,10 +1487,10 @@ public final class Sprite extends Rasterizer2D {
       int var13 = (var10 & 65280) * var11 & 16711680;
       var10 = (var12 | var13) >>> 8;
 
-      for(int var14 = -var6; var14 < 0; ++var14) {
-         for(int var15 = -var5; var15 < 0; ++var15) {
+      for (int var14 = -var6; var14 < 0; ++var14) {
+         for (int var15 = -var5; var15 < 0; ++var15) {
             var2 = var1[var3++];
-            if(var2 != 0) {
+            if (var2 != 0) {
                var12 = var9 * (var2 & 16711935) & -16711936;
                var13 = (var2 & 65280) * var9 & 16711680;
                var0[var4++] = var10 + ((var12 | var13) >>> 8);
@@ -1503,10 +1510,10 @@ public final class Sprite extends Rasterizer2D {
    static void Sprite_alpha1(int[] var0, int[] var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9) {
       int var10 = 256 - var9;
 
-      for(int var11 = -var6; var11 < 0; ++var11) {
-         for(int var12 = -var5; var12 < 0; ++var12) {
+      for (int var11 = -var6; var11 < 0; ++var11) {
+         for (int var12 = -var5; var12 < 0; ++var12) {
             var2 = var1[var3++];
-            if(var2 != 0) {
+            if (var2 != 0) {
                int var13 = var0[var4];
                var0[var4++] = ((var13 & 16711935) * var10 + var9 * (var2 & 16711935) & -16711936) + ((var2 & 65280) * var9 + var10 * (var13 & 65280) & 16711680) >> 8;
             } else {
@@ -1526,12 +1533,12 @@ public final class Sprite extends Rasterizer2D {
       int var13 = 256 - var12;
       int var14 = var3;
 
-      for(int var15 = -var8; var15 < 0; ++var15) {
+      for (int var15 = -var8; var15 < 0; ++var15) {
          int var16 = var11 * (var4 >> 16);
 
-         for(int var17 = -var7; var17 < 0; ++var17) {
+         for (int var17 = -var7; var17 < 0; ++var17) {
             var2 = var1[(var3 >> 16) + var16];
-            if(var2 != 0) {
+            if (var2 != 0) {
                int var18 = var0[var5];
                var0[var5++] = ((var2 & 65280) * var12 + var13 * (var18 & 65280) & 16711680) + ((var18 & 16711935) * var13 + var12 * (var2 & 16711935) & -16711936) >> 8;
             } else {
@@ -1550,10 +1557,10 @@ public final class Sprite extends Rasterizer2D {
 
    @ObfuscatedName("ag")
    static void method6074(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) {
-         for(var6 = -var9; var6 < 0; ++var6) {
+      for (var8 = -var10; var8 < 0; ++var8) {
+         for (var6 = -var9; var6 < 0; ++var6) {
             var0 = var4[var5++];
-            if(var0 != 0) {
+            if (var0 != 0) {
                var1 = var3[var7];
                var2 = var0 + var1;
                var0 = (var0 & 16711935) + (var1 & 16711935);
@@ -1572,10 +1579,10 @@ public final class Sprite extends Rasterizer2D {
 
    @ObfuscatedName("aq")
    static void method6075(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) {
-         for(var6 = -var9; var6 < 0; ++var6) {
+      for (var8 = -var10; var8 < 0; ++var8) {
+         for (var6 = -var9; var6 < 0; ++var6) {
             var0 = var4[var5++];
-            if(var0 != 0) {
+            if (var0 != 0) {
                var1 = var13 * (var0 & 16711935);
                var0 = (var1 & -16711936) + (var13 * var0 - var1 & 16711680) >>> 8;
                var1 = var3[var7];
@@ -1596,12 +1603,12 @@ public final class Sprite extends Rasterizer2D {
 
    @ObfuscatedName("av")
    static void method6144(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) {
+      for (int var16 = var3; var8 < 0; ++var8) {
          var7 = var15 * (var9 >> 16);
 
-         for(var6 = -var12; var6 < 0; ++var6) {
+         for (var6 = -var12; var6 < 0; ++var6) {
             var0 = var4[(var3 >> 16) + var7];
-            if(var0 != 0) {
+            if (var0 != 0) {
                var1 = var5[var10];
                var2 = var0 + var1;
                var0 = (var0 & 16711935) + (var1 & 16711935);
@@ -1623,12 +1630,12 @@ public final class Sprite extends Rasterizer2D {
 
    @ObfuscatedName("ar")
    static void method6078(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) {
+      for (int var17 = var3; var8 < 0; ++var8) {
          var7 = var15 * (var9 >> 16);
 
-         for(var6 = -var12; var6 < 0; ++var6) {
+         for (var6 = -var12; var6 < 0; ++var6) {
             var0 = var4[(var3 >> 16) + var7];
-            if(var0 != 0) {
+            if (var0 != 0) {
                var1 = (var0 & 16711935) * var16;
                var0 = (var1 & -16711936) + (var0 * var16 - var1 & 16711680) >>> 8;
                var1 = var5[var10];
diff --git a/runescape-client/src/main/java/SpriteMask.java b/runescape-client/src/main/java/SpriteMask.java
index abcc91283c..c248aeaada 100644
--- a/runescape-client/src/main/java/SpriteMask.java
+++ b/runescape-client/src/main/java/SpriteMask.java
@@ -39,10 +39,10 @@ public class SpriteMask extends DualNode {
       garbageValue = "781236044"
    )
    @Export("contains")
-   public boolean contains(int var1, int var2) {
-      if(var2 >= 0 && var2 < this.xStarts.length) {
-         int var3 = this.xStarts[var2];
-         if(var1 >= var3 && var1 <= var3 + this.xWidths[var2]) {
+   public boolean contains(int x, int y) {
+      if (y >= 0 && y < this.xStarts.length) {
+         int var3 = this.xStarts[y];
+         if (x >= var3 && x <= var3 + this.xWidths[y]) {
             return true;
          }
       }
@@ -56,13 +56,13 @@ public class SpriteMask extends DualNode {
       garbageValue = "-1301156444"
    )
    static void method4390() {
-      for(ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) {
-         if(var0.stream1 != null) {
+      for (ObjectSound var0 = (ObjectSound)ObjectSound.objectSounds.last(); var0 != null; var0 = (ObjectSound)ObjectSound.objectSounds.previous()) {
+         if (var0.stream1 != null) {
             TaskHandler.pcmStreamMixer.removeSubStream(var0.stream1);
             var0.stream1 = null;
          }
 
-         if(var0.stream2 != null) {
+         if (var0.stream2 != null) {
             TaskHandler.pcmStreamMixer.removeSubStream(var0.stream2);
             var0.stream2 = null;
          }
@@ -87,7 +87,7 @@ public class SpriteMask extends DualNode {
    )
    static int method4391(int var0) {
       Message var1 = (Message)Messages.Messages_hashTable.get((long)var0);
-      return var1 == null?-1:(var1.nextDual == Messages.Messages_queue.sentinel?-1:((Message)var1.nextDual).count);
+      return var1 == null ? -1 : (var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count);
    }
 
    @ObfuscatedName("x")
@@ -96,9 +96,9 @@ public class SpriteMask extends DualNode {
       garbageValue = "1"
    )
    @Export("loadSprite")
-   public static boolean loadSprite(AbstractIndexCache var0, int var1, int var2) {
-      byte[] var3 = var0.takeRecord(var1, var2);
-      if(var3 == null) {
+   public static boolean loadSprite(AbstractArchive var0, int var1, int var2) {
+      byte[] var3 = var0.takeFile(var1, var2);
+      if (var3 == null) {
          return false;
       } else {
          DevicePcmPlayerProvider.decodeSprite(var3);
diff --git a/runescape-client/src/main/java/Strings.java b/runescape-client/src/main/java/Strings.java
index a0c5f48aac..4e4ca80681 100644
--- a/runescape-client/src/main/java/Strings.java
+++ b/runescape-client/src/main/java/Strings.java
@@ -7,23 +7,15 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("Strings")
 public class Strings {
    @ObfuscatedName("bq")
-   public static String __id_bq;
+   public static String field880;
    @ObfuscatedName("cp")
-   public static String __id_cp;
+   public static String field881;
    @ObfuscatedName("jr")
-   public static String __id_jr;
+   public static String field882;
    @ObfuscatedName("jv")
-   public static String __id_jv;
+   public static String field883;
    @ObfuscatedName("ju")
-   public static String __id_ju;
-
-   static {
-      __id_bq = "Please visit the support page for assistance.";
-      __id_cp = "Please visit the support page for assistance.";
-      __id_jr = "";
-      __id_jv = "Page has opened in a new window.";
-      __id_ju = "(Please check your popup blocker.)";
-   }
+   public static String field884;
 
    @ObfuscatedName("ay")
    @ObfuscatedSignature(
@@ -35,26 +27,34 @@ public class Strings {
       Buffer var1 = new Buffer(var0);
       int var2 = var1.readUnsignedByte();
       int var3 = var1.readInt();
-      if(var3 < 0 || AbstractIndexCache.__ir_s != 0 && var3 > AbstractIndexCache.__ir_s) {
+      if (var3 < 0 || AbstractArchive.field1 != 0 && var3 > AbstractArchive.field1) {
          throw new RuntimeException();
-      } else if(var2 == 0) {
-         byte[] var4 = new byte[var3];
-         var1.__al_305(var4, 0, var3);
-         return var4;
+      } else if (var2 == 0) {
+         byte[] var6 = new byte[var3];
+         var1.readBytes(var6, 0, var3);
+         return var6;
       } else {
-         int var6 = var1.readInt();
-         if(var6 < 0 || AbstractIndexCache.__ir_s != 0 && var6 > AbstractIndexCache.__ir_s) {
+         int var4 = var1.readInt();
+         if (var4 < 0 || AbstractArchive.field1 != 0 && var4 > AbstractArchive.field1) {
             throw new RuntimeException();
          } else {
-            byte[] var5 = new byte[var6];
-            if(var2 == 1) {
-               Bzip2Decompressor.Bzip2Decompressor_decompress(var5, var6, var0, var3, 9);
+            byte[] var5 = new byte[var4];
+            if (var2 == 1) {
+               Bzip2Decompressor.Bzip2Decompressor_decompress(var5, var4, var0, var3, 9);
             } else {
-               AbstractIndexCache.gzipDecompressor.decompress(var1, var5);
+               AbstractArchive.gzipDecompressor.decompress(var1, var5);
             }
 
             return var5;
          }
       }
    }
+
+   static {
+      field880 = "Please visit the support page for assistance.";
+      field881 = "Please visit the support page for assistance.";
+      field882 = "";
+      field883 = "Page has opened in a new window.";
+      field884 = "(Please check your popup blocker.)";
+   }
 }
diff --git a/runescape-client/src/main/java/StructDefinition.java b/runescape-client/src/main/java/StructDefinition.java
index 898e0a5a9c..a9578d1220 100644
--- a/runescape-client/src/main/java/StructDefinition.java
+++ b/runescape-client/src/main/java/StructDefinition.java
@@ -2,6 +2,7 @@ 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("jq")
 @Implements("StructDefinition")
@@ -10,12 +11,14 @@ public class StructDefinition extends DualNode {
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   public static AbstractIndexCache __jq_m;
+   @Export("StructDefinition_archive")
+   public static AbstractArchive StructDefinition_archive;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Ler;"
    )
-   public static EvictingDualNodeHashTable __jq_f;
+   @Export("StructDefinition_cached")
+   public static EvictingDualNodeHashTable StructDefinition_cached;
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Llh;"
@@ -23,17 +26,13 @@ public class StructDefinition extends DualNode {
    @Export("params")
    IterableNodeHashTable params;
 
-   static {
-      __jq_f = new EvictingDualNodeHashTable(64);
-   }
-
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "(B)V",
       garbageValue = "-16"
    )
-   @Export("init")
-   void init() {
+   @Export("postDecode")
+   void postDecode() {
    }
 
    @ObfuscatedName("q")
@@ -41,15 +40,15 @@ public class StructDefinition extends DualNode {
       signature = "(Lgr;I)V",
       garbageValue = "853330780"
    )
-   @Export("read")
-   void read(Buffer var1) {
-      while(true) {
+   @Export("decode")
+   void decode(Buffer var1) {
+      while (true) {
          int var2 = var1.readUnsignedByte();
-         if(var2 == 0) {
+         if (var2 == 0) {
             return;
          }
 
-         this.readNext(var1, var2);
+         this.decodeNext(var1, var2);
       }
    }
 
@@ -58,10 +57,10 @@ public class StructDefinition extends DualNode {
       signature = "(Lgr;II)V",
       garbageValue = "-2035893488"
    )
-   @Export("readNext")
-   void readNext(Buffer var1, int var2) {
-      if(var2 == 249) {
-         this.params = AbstractIndexCache.readStringIntParameters(var1, this.params);
+   @Export("decodeNext")
+   void decodeNext(Buffer var1, int var2) {
+      if (var2 == 249) {
+         this.params = AbstractArchive.readStringIntParameters(var1, this.params);
       }
 
    }
@@ -73,20 +72,20 @@ public class StructDefinition extends DualNode {
    )
    @Export("getIntParam")
    public int getIntParam(int var1, int var2) {
-      IterableNodeHashTable var4 = this.params;
-      int var3;
-      if(var4 == null) {
-         var3 = var2;
+      IterableNodeHashTable var3 = this.params;
+      int var4;
+      if (var3 == null) {
+         var4 = var2;
       } else {
-         IntegerNode var5 = (IntegerNode)var4.get((long)var1);
-         if(var5 == null) {
-            var3 = var2;
+         IntegerNode var5 = (IntegerNode)var3.get((long)var1);
+         if (var5 == null) {
+            var4 = var2;
          } else {
-            var3 = var5.integer;
+            var4 = var5.integer;
          }
       }
 
-      return var3;
+      return var4;
    }
 
    @ObfuscatedName("u")
@@ -105,181 +104,181 @@ public class StructDefinition extends DualNode {
       garbageValue = "2127224103"
    )
    static int method4952(int var0, Script var1, boolean var2) {
-      int var4 = -1;
-      Widget var3;
-      if(var0 >= 2000) {
+      int var3 = -1;
+      Widget var4;
+      if (var0 >= 2000) {
          var0 -= 1000;
-         var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-         var3 = Huffman.getWidget(var4);
+         var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+         var4 = Huffman.getWidget(var3);
       } else {
-         var3 = var2?WorldMapIcon1.__t_i:class12.__n_n;
+         var4 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111;
       }
 
-      if(var0 == 1100) {
+      if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) {
          RouteStrategy.Interpreter_intStackSize -= 2;
-         var3.scrollX = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-         if(var3.scrollX > var3.scrollWidth - var3.width) {
-            var3.scrollX = var3.scrollWidth - var3.width;
+         var4.scrollX = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
+         if (var4.scrollX > var4.scrollWidth - var4.width) {
+            var4.scrollX = var4.scrollWidth - var4.width;
          }
 
-         if(var3.scrollX < 0) {
-            var3.scrollX = 0;
+         if (var4.scrollX < 0) {
+            var4.scrollX = 0;
          }
 
-         var3.scrollY = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-         if(var3.scrollY > var3.scrollHeight - var3.height) {
-            var3.scrollY = var3.scrollHeight - var3.height;
+         var4.scrollY = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
+         if (var4.scrollY > var4.scrollHeight - var4.height) {
+            var4.scrollY = var4.scrollHeight - var4.height;
          }
 
-         if(var3.scrollY < 0) {
-            var3.scrollY = 0;
+         if (var4.scrollY < 0) {
+            var4.scrollY = 0;
          }
 
-         class22.method295(var3);
+         WorldMapRectangle.method295(var4);
          return 1;
-      } else if(var0 == 1101) {
-         var3.color = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-         class22.method295(var3);
+      } else if (var0 == ScriptOpcodes.CC_SETCOLOUR) {
+         var4.color = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+         WorldMapRectangle.method295(var4);
          return 1;
-      } else if(var0 == 1102) {
-         var3.fill = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-         class22.method295(var3);
+      } else if (var0 == ScriptOpcodes.CC_SETFILL) {
+         var4.fill = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+         WorldMapRectangle.method295(var4);
          return 1;
-      } else if(var0 == 1103) {
-         var3.transparency = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-         class22.method295(var3);
+      } else if (var0 == ScriptOpcodes.CC_SETTRANS) {
+         var4.transparency = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+         WorldMapRectangle.method295(var4);
          return 1;
-      } else if(var0 == 1104) {
-         var3.lineWid = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-         class22.method295(var3);
+      } else if (var0 == ScriptOpcodes.CC_SETLINEWID) {
+         var4.lineWid = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+         WorldMapRectangle.method295(var4);
          return 1;
-      } else if(var0 == 1105) {
-         var3.spriteId2 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-         class22.method295(var3);
+      } else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) {
+         var4.spriteId2 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+         WorldMapRectangle.method295(var4);
          return 1;
-      } else if(var0 == 1106) {
-         var3.spriteAngle = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-         class22.method295(var3);
+      } else if (var0 == ScriptOpcodes.CC_SET2DANGLE) {
+         var4.spriteAngle = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+         WorldMapRectangle.method295(var4);
          return 1;
-      } else if(var0 == 1107) {
-         var3.spriteTiling = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-         class22.method295(var3);
+      } else if (var0 == ScriptOpcodes.CC_SETTILING) {
+         var4.spriteTiling = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+         WorldMapRectangle.method295(var4);
          return 1;
-      } else if(var0 == 1108) {
-         var3.modelType = 1;
-         var3.modelId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-         class22.method295(var3);
+      } else if (var0 == ScriptOpcodes.CC_SETMODEL) {
+         var4.modelType = 1;
+         var4.modelId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+         WorldMapRectangle.method295(var4);
          return 1;
-      } else if(var0 == 1109) {
+      } else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) {
          RouteStrategy.Interpreter_intStackSize -= 6;
-         var3.modelOffsetX = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-         var3.modelOffsetY = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-         var3.modelAngleX = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
-         var3.modelAngleY = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3];
-         var3.modelAngleZ = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 4];
-         var3.modelZoom = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 5];
-         class22.method295(var3);
+         var4.modelOffsetX = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
+         var4.modelOffsetY = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
+         var4.modelAngleX = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
+         var4.modelAngleY = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3];
+         var4.modelAngleZ = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 4];
+         var4.modelZoom = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 5];
+         WorldMapRectangle.method295(var4);
          return 1;
       } else {
-         int var8;
-         if(var0 == 1110) {
-            var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-            if(var8 != var3.sequenceId) {
-               var3.sequenceId = var8;
-               var3.modelFrame = 0;
-               var3.modelFrameCycle = 0;
-               class22.method295(var3);
+         int var5;
+         if (var0 == ScriptOpcodes.CC_SETMODELANIM) {
+            var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+            if (var5 != var4.sequenceId) {
+               var4.sequenceId = var5;
+               var4.modelFrame = 0;
+               var4.modelFrameCycle = 0;
+               WorldMapRectangle.method295(var4);
             }
 
             return 1;
-         } else if(var0 == 1111) {
-            var3.modelOrthog = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-            class22.method295(var3);
+         } else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) {
+            var4.modelOrthog = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+            WorldMapRectangle.method295(var4);
             return 1;
-         } else if(var0 == 1112) {
-            String var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-            if(!var7.equals(var3.text)) {
-               var3.text = var7;
-               class22.method295(var3);
+         } else if (var0 == ScriptOpcodes.CC_SETTEXT) {
+            String var8 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+            if (!var8.equals(var4.text)) {
+               var4.text = var8;
+               WorldMapRectangle.method295(var4);
             }
 
             return 1;
-         } else if(var0 == 1113) {
-            var3.fontId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-            class22.method295(var3);
+         } else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) {
+            var4.fontId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+            WorldMapRectangle.method295(var4);
             return 1;
-         } else if(var0 == 1114) {
+         } else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) {
             RouteStrategy.Interpreter_intStackSize -= 3;
-            var3.textXAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-            var3.textYAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-            var3.textLineHeight = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
-            class22.method295(var3);
+            var4.textXAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
+            var4.textYAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
+            var4.textLineHeight = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
+            WorldMapRectangle.method295(var4);
             return 1;
-         } else if(var0 == 1115) {
-            var3.textShadowed = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-            class22.method295(var3);
+         } else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) {
+            var4.textShadowed = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+            WorldMapRectangle.method295(var4);
             return 1;
-         } else if(var0 == 1116) {
-            var3.outline = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-            class22.method295(var3);
+         } else if (var0 == ScriptOpcodes.CC_SETOUTLINE) {
+            var4.outline = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+            WorldMapRectangle.method295(var4);
             return 1;
-         } else if(var0 == 1117) {
-            var3.spriteShadow = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-            class22.method295(var3);
+         } else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) {
+            var4.spriteShadow = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+            WorldMapRectangle.method295(var4);
             return 1;
-         } else if(var0 == 1118) {
-            var3.spriteFlipV = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-            class22.method295(var3);
+         } else if (var0 == ScriptOpcodes.CC_SETVFLIP) {
+            var4.spriteFlipV = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+            WorldMapRectangle.method295(var4);
             return 1;
-         } else if(var0 == 1119) {
-            var3.spriteFlipH = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-            class22.method295(var3);
+         } else if (var0 == ScriptOpcodes.CC_SETHFLIP) {
+            var4.spriteFlipH = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+            WorldMapRectangle.method295(var4);
             return 1;
-         } else if(var0 == 1120) {
+         } else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) {
             RouteStrategy.Interpreter_intStackSize -= 2;
-            var3.scrollWidth = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-            var3.scrollHeight = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-            class22.method295(var3);
-            if(var4 != -1 && var3.type == 0) {
-               class39.revalidateWidgetScroll(Widget.widgets[var4 >> 16], var3, false);
+            var4.scrollWidth = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
+            var4.scrollHeight = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
+            WorldMapRectangle.method295(var4);
+            if (var3 != -1 && var4.type == 0) {
+               class39.revalidateWidgetScroll(Widget.interfaceComponents[var3 >> 16], var4, false);
             }
 
             return 1;
-         } else if(var0 == 1121) {
-            TilePaint.method3060(var3.id, var3.childIndex);
-            Client.__client_mo = var3;
-            class22.method295(var3);
+         } else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) {
+            TilePaint.method3060(var4.id, var4.childIndex);
+            Client.field127 = var4;
+            WorldMapRectangle.method295(var4);
             return 1;
-         } else if(var0 == 1122) {
-            var3.spriteId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-            class22.method295(var3);
+         } else if (var0 == 1122) {
+            var4.spriteId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+            WorldMapRectangle.method295(var4);
             return 1;
-         } else if(var0 == 1123) {
-            var3.color2 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-            class22.method295(var3);
+         } else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) {
+            var4.color2 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+            WorldMapRectangle.method295(var4);
             return 1;
-         } else if(var0 == 1124) {
-            var3.__af = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-            class22.method295(var3);
+         } else if (var0 == 1124) {
+            var4.field960 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+            WorldMapRectangle.method295(var4);
             return 1;
-         } else if(var0 == 1125) {
-            var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-            RectangleMode var6 = (RectangleMode)ScriptFrame.findEnumerated(class311.method5822(), var8);
-            if(var6 != null) {
-               var3.rectangleMode = var6;
-               class22.method295(var3);
+         } else if (var0 == 1125) {
+            var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+            RectangleMode var7 = (RectangleMode)ScriptFrame.findEnumerated(DefaultsGroup.method5822(), var5);
+            if (var7 != null) {
+               var4.rectangleMode = var7;
+               WorldMapRectangle.method295(var4);
             }
 
             return 1;
          } else {
-            boolean var5;
-            if(var0 == 1126) {
-               var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-               var3.__ba = var5;
+            boolean var6;
+            if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) {
+               var6 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+               var4.field961 = var6;
                return 1;
-            } else if(var0 == 1127) {
-               var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-               var3.__bv = var5;
+            } else if (var0 == 1127) {
+               var6 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+               var4.modelTransparency = var6;
                return 1;
             } else {
                return 2;
@@ -287,4 +286,8 @@ public class StructDefinition extends DualNode {
          }
       }
    }
+
+   static {
+      StructDefinition_cached = new EvictingDualNodeHashTable(64);
+   }
 }
diff --git a/runescape-client/src/main/java/StudioGame.java b/runescape-client/src/main/java/StudioGame.java
index 4e175febd8..87f2f9d2b5 100644
--- a/runescape-client/src/main/java/StudioGame.java
+++ b/runescape-client/src/main/java/StudioGame.java
@@ -11,33 +11,33 @@ public enum StudioGame implements Enumerated {
    @ObfuscatedSignature(
       signature = "Lis;"
    )
-   __is_m("runescape", "RuneScape", 0),
+   field887("runescape", "RuneScape", 0),
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Lis;"
    )
-   __is_f("stellardawn", "Stellar Dawn", 1),
+   field888("stellardawn", "Stellar Dawn", 1),
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Lis;"
    )
-   __is_q("game3", "Game 3", 2),
+   field889("game3", "Game 3", 2),
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "Lis;"
    )
-  __is_w("game4", "Game 4", 3),
+   field890("game4", "Game 4", 3),
    @ObfuscatedName("o")
    @ObfuscatedSignature(
       signature = "Lis;"
    )
-   __is_o("game5", "Game 5", 4),
+   field891("game5", "Game 5", 4),
    @ObfuscatedName("u")
    @ObfuscatedSignature(
       signature = "Lis;"
    )
-   __is_u("oldscape", "RuneScape 2007", 5);
-   
+   field892("oldscape", "RuneScape 2007", 5);
+
    @ObfuscatedName("g")
    @Export("name")
    public final String name;
@@ -47,8 +47,8 @@ public enum StudioGame implements Enumerated {
    )
    @Export("id")
    final int id;
-   
-   StudioGame(String var3, String var4, int var5) {
+
+   private StudioGame(String var3, String var4, int var5) {
       this.name = var3;
       this.id = var5;
    }
@@ -68,19 +68,19 @@ public enum StudioGame implements Enumerated {
       signature = "(II)Lih;",
       garbageValue = "-2058685786"
    )
-   public static UnderlayDefinition method4550(int var0) {
-      UnderlayDefinition var1 = (UnderlayDefinition)UnderlayDefinition.UnderlayDefinition_cached.get((long)var0);
-      if(var1 != null) {
+   public static FloorUnderlayDefinition method4550(int var0) {
+      FloorUnderlayDefinition var1 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var0);
+      if (var1 != null) {
          return var1;
       } else {
-         byte[] var2 = UnderlayDefinition.UnderlayDefinition_indexCache.takeRecord(1, var0);
-         var1 = new UnderlayDefinition();
-         if(var2 != null) {
-            var1.read(new Buffer(var2), var0);
+         byte[] var2 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var0);
+         var1 = new FloorUnderlayDefinition();
+         if (var2 != null) {
+            var1.decode(new Buffer(var2), var0);
          }
 
-         var1.init();
-         UnderlayDefinition.UnderlayDefinition_cached.put(var1, (long)var0);
+         var1.postDecode();
+         FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var1, (long)var0);
          return var1;
       }
    }
diff --git a/runescape-client/src/main/java/TaskHandler.java b/runescape-client/src/main/java/TaskHandler.java
index 0ab109ab03..ebebc5f6dd 100644
--- a/runescape-client/src/main/java/TaskHandler.java
+++ b/runescape-client/src/main/java/TaskHandler.java
@@ -52,7 +52,6 @@ public class TaskHandler implements Runnable {
          javaVendor = System.getProperty("java.vendor");
          javaVersion = System.getProperty("java.version");
       } catch (Exception var2) {
-         ;
       }
 
       this.isClosed = false;
@@ -77,7 +76,6 @@ public class TaskHandler implements Runnable {
       try {
          this.thread.join();
       } catch (InterruptedException var3) {
-         ;
       }
 
    }
@@ -94,7 +92,7 @@ public class TaskHandler implements Runnable {
       var5.intArgument = var2;
       var5.objectArgument = var4;
       synchronized(this) {
-         if(this.task0 != null) {
+         if (this.task0 != null) {
             this.task0.next = var5;
             this.task0 = var5;
          } else {
@@ -126,21 +124,19 @@ public class TaskHandler implements Runnable {
       return this.newTask(2, var2, 0, var1);
    }
 
-   @Export("run")
-   @ObfuscatedName("run")
    public final void run() {
-      while(true) {
+      while (true) {
          Task var1;
          synchronized(this) {
-            while(true) {
-               if(this.isClosed) {
+            while (true) {
+               if (this.isClosed) {
                   return;
                }
 
-               if(this.current != null) {
+               if (this.current != null) {
                   var1 = this.current;
                   this.current = this.current.next;
-                  if(this.current == null) {
+                  if (this.current == null) {
                      this.task0 = null;
                   }
                   break;
@@ -148,30 +144,29 @@ public class TaskHandler implements Runnable {
 
                try {
                   this.wait();
-               } catch (InterruptedException var8) {
-                  ;
+               } catch (InterruptedException var7) {
                }
             }
          }
 
          try {
-            int var5 = var1.type;
-            if(var5 == 1) {
+            int var2 = var1.type;
+            if (var2 == 1) {
                var1.result = new Socket(InetAddress.getByName((String)var1.objectArgument), var1.intArgument);
-            } else if(var5 == 2) {
+            } else if (var2 == 2) {
                Thread var3 = new Thread((Runnable)var1.objectArgument);
                var3.setDaemon(true);
                var3.start();
                var3.setPriority(var1.intArgument);
                var1.result = var3;
-            } else if(var5 == 4) {
+            } else if (var2 == 4) {
                var1.result = new DataInputStream(((URL)var1.objectArgument).openStream());
             }
 
             var1.status = 1;
-         } catch (ThreadDeath var6) {
-            throw var6;
-         } catch (Throwable var7) {
+         } catch (ThreadDeath var5) {
+            throw var5;
+         } catch (Throwable var6) {
             var1.status = 2;
          }
       }
diff --git a/runescape-client/src/main/java/Texture.java b/runescape-client/src/main/java/Texture.java
index b17f92e690..6d1f37c646 100644
--- a/runescape-client/src/main/java/Texture.java
+++ b/runescape-client/src/main/java/Texture.java
@@ -10,19 +10,19 @@ public class Texture extends Node {
    @Export("Texture_animatedPixels")
    static int[] Texture_animatedPixels;
    @ObfuscatedName("o")
-   @Export("int1")
-   int int1;
+   @Export("averageRGB")
+   int averageRGB;
    @ObfuscatedName("u")
-   boolean __u;
+   boolean field893;
    @ObfuscatedName("g")
    @Export("records")
    int[] records;
    @ObfuscatedName("l")
-   int[] __l;
+   int[] field894;
    @ObfuscatedName("e")
-   int[] __e;
+   int[] field895;
    @ObfuscatedName("x")
-   int[] __x;
+   int[] field896;
    @ObfuscatedName("d")
    @Export("animationDirection")
    int animationDirection;
@@ -41,37 +41,37 @@ public class Texture extends Node {
    )
    Texture(Buffer var1) {
       this.isLoaded = false;
-      this.int1 = var1.__ag_302();
-      this.__u = var1.readUnsignedByte() == 1;
+      this.averageRGB = var1.readUnsignedShort();
+      this.field893 = var1.readUnsignedByte() == 1;
       int var2 = var1.readUnsignedByte();
-      if(var2 >= 1 && var2 <= 4) {
+      if (var2 >= 1 && var2 <= 4) {
          this.records = new int[var2];
 
          int var3;
-         for(var3 = 0; var3 < var2; ++var3) {
-            this.records[var3] = var1.__ag_302();
+         for (var3 = 0; var3 < var2; ++var3) {
+            this.records[var3] = var1.readUnsignedShort();
          }
 
-         if(var2 > 1) {
-            this.__l = new int[var2 - 1];
+         if (var2 > 1) {
+            this.field894 = new int[var2 - 1];
 
-            for(var3 = 0; var3 < var2 - 1; ++var3) {
-               this.__l[var3] = var1.readUnsignedByte();
+            for (var3 = 0; var3 < var2 - 1; ++var3) {
+               this.field894[var3] = var1.readUnsignedByte();
             }
          }
 
-         if(var2 > 1) {
-            this.__e = new int[var2 - 1];
+         if (var2 > 1) {
+            this.field895 = new int[var2 - 1];
 
-            for(var3 = 0; var3 < var2 - 1; ++var3) {
-               this.__e[var3] = var1.readUnsignedByte();
+            for (var3 = 0; var3 < var2 - 1; ++var3) {
+               this.field895[var3] = var1.readUnsignedByte();
             }
          }
 
-         this.__x = new int[var2];
+         this.field896 = new int[var2];
 
-         for(var3 = 0; var3 < var2; ++var3) {
-            this.__x[var3] = var1.readInt();
+         for (var3 = 0; var3 < var2; ++var3) {
+            this.field896[var3] = var1.readInt();
          }
 
          this.animationDirection = var1.readUnsignedByte();
@@ -86,10 +86,10 @@ public class Texture extends Node {
    @ObfuscatedSignature(
       signature = "(DILir;)Z"
    )
-   boolean __m_230(double var1, int var3, AbstractIndexCache var4) {
+   boolean method320(double var1, int var3, AbstractArchive var4) {
       int var5;
-      for(var5 = 0; var5 < this.records.length; ++var5) {
-         if(var4.getRecordFlat(this.records[var5]) == null) {
+      for (var5 = 0; var5 < this.records.length; ++var5) {
+         if (var4.getFileFlat(this.records[var5]) == null) {
             return false;
          }
       }
@@ -97,85 +97,80 @@ public class Texture extends Node {
       var5 = var3 * var3;
       this.pixels = new int[var5];
 
-      for(int var6 = 0; var6 < this.records.length; ++var6) {
+      for (int var6 = 0; var6 < this.records.length; ++var6) {
          IndexedSprite var7 = class83.method2028(var4, this.records[var6]);
          var7.normalize();
          byte[] var8 = var7.pixels;
          int[] var9 = var7.palette;
-         int var10 = this.__x[var6];
-         if((var10 & -16777216) == 16777216) {
-            ;
+         int var10 = this.field896[var6];
+         if ((var10 & -16777216) == 16777216) {
          }
 
-         if((var10 & -16777216) == 33554432) {
-            ;
+         if ((var10 & -16777216) == 33554432) {
          }
 
          int var11;
          int var12;
          int var13;
          int var14;
-         if((var10 & -16777216) == 50331648) {
+         if ((var10 & -16777216) == 50331648) {
             var11 = var10 & 16711935;
             var12 = var10 >> 8 & 255;
 
-            for(var13 = 0; var13 < var9.length; ++var13) {
+            for (var13 = 0; var13 < var9.length; ++var13) {
                var14 = var9[var13];
-               if(var14 >> 8 == (var14 & 65535)) {
+               if (var14 >> 8 == (var14 & 65535)) {
                   var14 &= 255;
                   var9[var13] = var11 * var14 >> 8 & 16711935 | var12 * var14 & 65280;
                }
             }
          }
 
-         for(var11 = 0; var11 < var9.length; ++var11) {
+         for (var11 = 0; var11 < var9.length; ++var11) {
             var9[var11] = Rasterizer3D.Rasterizer3D_brighten(var9[var11], var1);
          }
 
-         if(var6 == 0) {
+         if (var6 == 0) {
             var11 = 0;
          } else {
-            var11 = this.__l[var6 - 1];
+            var11 = this.field894[var6 - 1];
          }
 
-         if(var11 == 0) {
-            if(var3 == var7.subWidth) {
-               for(var12 = 0; var12 < var5; ++var12) {
+         if (var11 == 0) {
+            if (var3 == var7.subWidth) {
+               for (var12 = 0; var12 < var5; ++var12) {
                   this.pixels[var12] = var9[var8[var12] & 255];
                }
-            } else if(var7.subWidth == 64 && var3 == 128) {
+            } else if (var7.subWidth == 64 && var3 == 128) {
                var12 = 0;
 
-               for(var13 = 0; var13 < var3; ++var13) {
-                  for(var14 = 0; var14 < var3; ++var14) {
+               for (var13 = 0; var13 < var3; ++var13) {
+                  for (var14 = 0; var14 < var3; ++var14) {
                      this.pixels[var12++] = var9[var8[(var13 >> 1 << 6) + (var14 >> 1)] & 255];
                   }
                }
             } else {
-               if(var7.subWidth != 128 || var3 != 64) {
+               if (var7.subWidth != 128 || var3 != 64) {
                   throw new RuntimeException();
                }
 
                var12 = 0;
 
-               for(var13 = 0; var13 < var3; ++var13) {
-                  for(var14 = 0; var14 < var3; ++var14) {
+               for (var13 = 0; var13 < var3; ++var13) {
+                  for (var14 = 0; var14 < var3; ++var14) {
                      this.pixels[var12++] = var9[var8[(var14 << 1) + (var13 << 1 << 7)] & 255];
                   }
                }
             }
          }
 
-         if(var11 == 1) {
-            ;
+         if (var11 == 1) {
          }
 
-         if(var11 == 2) {
-            ;
+         if (var11 == 2) {
          }
 
-         if(var11 == 3) {
-            ;
+         if (var11 == 3) {
          }
       }
 
@@ -189,22 +184,22 @@ public class Texture extends Node {
    }
 
    @ObfuscatedName("q")
-   @Export("Texture_animate")
-   void Texture_animate(int var1) {
-      if(this.pixels != null) {
+   @Export("animate")
+   void animate(int var1) {
+      if (this.pixels != null) {
          short var2;
          int var3;
          int var4;
          int var5;
          int var6;
          int var7;
-         int[] var10;
-         if(this.animationDirection == 1 || this.animationDirection == 3) {
-            if(Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) {
+         int[] var8;
+         if (this.animationDirection == 1 || this.animationDirection == 3) {
+            if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) {
                Texture_animatedPixels = new int[this.pixels.length];
             }
 
-            if(this.pixels.length == 4096) {
+            if (this.pixels.length == 4096) {
                var2 = 64;
             } else {
                var2 = 128;
@@ -213,26 +208,26 @@ public class Texture extends Node {
             var3 = this.pixels.length;
             var4 = var2 * this.animationSpeed * var1;
             var5 = var3 - 1;
-            if(this.animationDirection == 1) {
+            if (this.animationDirection == 1) {
                var4 = -var4;
             }
 
-            for(var6 = 0; var6 < var3; ++var6) {
+            for (var6 = 0; var6 < var3; ++var6) {
                var7 = var6 + var4 & var5;
                Texture_animatedPixels[var6] = this.pixels[var7];
             }
 
-            var10 = this.pixels;
+            var8 = this.pixels;
             this.pixels = Texture_animatedPixels;
-            Texture_animatedPixels = var10;
+            Texture_animatedPixels = var8;
          }
 
-         if(this.animationDirection == 2 || this.animationDirection == 4) {
-            if(Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) {
+         if (this.animationDirection == 2 || this.animationDirection == 4) {
+            if (Texture_animatedPixels == null || Texture_animatedPixels.length < this.pixels.length) {
                Texture_animatedPixels = new int[this.pixels.length];
             }
 
-            if(this.pixels.length == 4096) {
+            if (this.pixels.length == 4096) {
                var2 = 64;
             } else {
                var2 = 128;
@@ -241,23 +236,23 @@ public class Texture extends Node {
             var3 = this.pixels.length;
             var4 = this.animationSpeed * var1;
             var5 = var2 - 1;
-            if(this.animationDirection == 2) {
+            if (this.animationDirection == 2) {
                var4 = -var4;
             }
 
-            for(var6 = 0; var6 < var3; var6 += var2) {
-               for(var7 = 0; var7 < var2; ++var7) {
-                  int var8 = var6 + var7;
-                  int var9 = var6 + (var7 + var4 & var5);
-                  Texture_animatedPixels[var8] = this.pixels[var9];
+            for (var6 = 0; var6 < var3; var6 += var2) {
+               for (var7 = 0; var7 < var2; ++var7) {
+                  int var9 = var6 + var7;
+                  int var10 = var6 + (var7 + var4 & var5);
+                  Texture_animatedPixels[var9] = this.pixels[var10];
                }
             }
 
-            var10 = this.pixels;
+            var8 = this.pixels;
             this.pixels = Texture_animatedPixels;
-            Texture_animatedPixels = var10;
+            Texture_animatedPixels = var8;
          }
-
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/TextureLoader.java b/runescape-client/src/main/java/TextureLoader.java
index 7656d33409..a6d1e7110f 100644
--- a/runescape-client/src/main/java/TextureLoader.java
+++ b/runescape-client/src/main/java/TextureLoader.java
@@ -19,14 +19,15 @@ public interface TextureLoader {
       signature = "(II)I",
       garbageValue = "-1641984961"
    )
-   int __w_213(int var1);
+   @Export("getAverageTextureRGB")
+   int getAverageTextureRGB(int var1);
 
    @ObfuscatedName("o")
    @ObfuscatedSignature(
       signature = "(IB)Z",
       garbageValue = "14"
    )
-   boolean __o_214(int var1);
+   boolean vmethod325(int var1);
 
    @ObfuscatedName("u")
    @ObfuscatedSignature(
diff --git a/runescape-client/src/main/java/TextureProvider.java b/runescape-client/src/main/java/TextureProvider.java
index da771e9d17..c572412dd1 100644
--- a/runescape-client/src/main/java/TextureProvider.java
+++ b/runescape-client/src/main/java/TextureProvider.java
@@ -3,6 +3,7 @@ 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("dl")
 @Implements("TextureProvider")
@@ -50,28 +51,28 @@ public class TextureProvider implements TextureLoader {
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   @Export("indexCache")
-   AbstractIndexCache indexCache;
+   @Export("archive")
+   AbstractArchive archive;
 
    @ObfuscatedSignature(
       signature = "(Lir;Lir;IDI)V"
    )
-   public TextureProvider(AbstractIndexCache var1, AbstractIndexCache var2, int var3, double var4, int var6) {
+   public TextureProvider(AbstractArchive var1, AbstractArchive var2, int var3, double var4, int var6) {
       this.deque = new NodeDeque();
       this.remaining = 0;
       this.brightness0 = 1.0D;
       this.textureSize = 128;
-      this.indexCache = var2;
+      this.archive = var2;
       this.capacity = var3;
       this.remaining = this.capacity;
       this.brightness0 = var4;
       this.textureSize = var6;
-      int[] var7 = var1.__j_395(0);
+      int[] var7 = var1.method3(0);
       int var8 = var7.length;
-      this.textures = new Texture[var1.__s_396(0)];
+      this.textures = new Texture[var1.getGroupFileCount(0)];
 
-      for(int var9 = 0; var9 < var8; ++var9) {
-         Buffer var10 = new Buffer(var1.takeRecord(0, var7[var9]));
+      for (int var9 = 0; var9 < var8; ++var9) {
+         Buffer var10 = new Buffer(var1.takeFile(0, var7[var9]));
          this.textures[var7[var9]] = new Texture(var10);
       }
 
@@ -82,27 +83,27 @@ public class TextureProvider implements TextureLoader {
       signature = "(I)I",
       garbageValue = "-1996487053"
    )
-   public int __m_212() {
+   public int method323() {
       int var1 = 0;
       int var2 = 0;
       Texture[] var3 = this.textures;
 
-      for(int var4 = 0; var4 < var3.length; ++var4) {
+      for (int var4 = 0; var4 < var3.length; ++var4) {
          Texture var5 = var3[var4];
-         if(var5 != null && var5.records != null) {
+         if (var5 != null && var5.records != null) {
             var1 += var5.records.length;
             int[] var6 = var5.records;
 
-            for(int var7 = 0; var7 < var6.length; ++var7) {
+            for (int var7 = 0; var7 < var6.length; ++var7) {
                int var8 = var6[var7];
-               if(this.indexCache.__u_393(var8)) {
+               if (this.archive.method1(var8)) {
                   ++var2;
                }
             }
          }
       }
 
-      if(var1 == 0) {
+      if (var1 == 0) {
          return 0;
       } else {
          return var2 * 100 / var1;
@@ -111,8 +112,8 @@ public class TextureProvider implements TextureLoader {
 
    @ObfuscatedName("f")
    @Export("setBrightness")
-   public void setBrightness(double var1) {
-      this.brightness0 = var1;
+   public void setBrightness(double brightness) {
+      this.brightness0 = brightness;
       this.clear();
    }
 
@@ -124,16 +125,16 @@ public class TextureProvider implements TextureLoader {
    @Export("load")
    public int[] load(int var1) {
       Texture var2 = this.textures[var1];
-      if(var2 != null) {
-         if(var2.pixels != null) {
+      if (var2 != null) {
+         if (var2.pixels != null) {
             this.deque.addLast(var2);
             var2.isLoaded = true;
             return var2.pixels;
          }
 
-         boolean var3 = var2.__m_230(this.brightness0, this.textureSize, this.indexCache);
-         if(var3) {
-            if(this.remaining == 0) {
+         boolean var3 = var2.method320(this.brightness0, this.textureSize, this.archive);
+         if (var3) {
+            if (this.remaining == 0) {
                Texture var4 = (Texture)this.deque.removeFirst();
                var4.reset();
             } else {
@@ -154,8 +155,9 @@ public class TextureProvider implements TextureLoader {
       signature = "(II)I",
       garbageValue = "-1641984961"
    )
-   public int __w_213(int var1) {
-      return this.textures[var1] != null?this.textures[var1].int1:0;
+   @Export("getAverageTextureRGB")
+   public int getAverageTextureRGB(int var1) {
+      return this.textures[var1] != null ? this.textures[var1].averageRGB : 0;
    }
 
    @ObfuscatedName("o")
@@ -163,8 +165,8 @@ public class TextureProvider implements TextureLoader {
       signature = "(IB)Z",
       garbageValue = "14"
    )
-   public boolean __o_214(int var1) {
-      return this.textures[var1].__u;
+   public boolean vmethod325(int var1) {
+      return this.textures[var1].field893;
    }
 
    @ObfuscatedName("u")
@@ -184,8 +186,8 @@ public class TextureProvider implements TextureLoader {
    )
    @Export("clear")
    public void clear() {
-      for(int var1 = 0; var1 < this.textures.length; ++var1) {
-         if(this.textures[var1] != null) {
+      for (int var1 = 0; var1 < this.textures.length; ++var1) {
+         if (this.textures[var1] != null) {
             this.textures[var1].reset();
          }
       }
@@ -201,10 +203,10 @@ public class TextureProvider implements TextureLoader {
    )
    @Export("animate")
    public void animate(int var1) {
-      for(int var2 = 0; var2 < this.textures.length; ++var2) {
+      for (int var2 = 0; var2 < this.textures.length; ++var2) {
          Texture var3 = this.textures[var2];
-         if(var3 != null && var3.animationDirection != 0 && var3.isLoaded) {
-            var3.Texture_animate(var1);
+         if (var3 != null && var3.animationDirection != 0 && var3.isLoaded) {
+            var3.animate(var1);
             var3.isLoaded = false;
          }
       }
@@ -220,7 +222,7 @@ public class TextureProvider implements TextureLoader {
       int var2 = var0.index;
       byte[] var3 = class230.method4516(var1);
       var0.writeSmartByteShort(var3.length);
-      var0.index += class303.huffman.__m_293(var3, 0, var3.length, var0.array, var0.index);
+      var0.index += class303.huffman.compress(var3, 0, var3.length, var0.array, var0.index);
       return var0.index - var2;
    }
 
@@ -230,20 +232,20 @@ public class TextureProvider implements TextureLoader {
       garbageValue = "-8"
    )
    @Export("byteArrayFromObject")
-   public static byte[] byteArrayFromObject(Object var0, boolean var1) {
-      if(var0 == null) {
+   public static byte[] byteArrayFromObject(Object var0, boolean copyArray) {
+      if (var0 == null) {
          return null;
-      } else if(var0 instanceof byte[]) {
-         byte[] var6 = (byte[])((byte[])var0);
-         if(var1) {
-            int var4 = var6.length;
-            byte[] var5 = new byte[var4];
-            System.arraycopy(var6, 0, var5, 0, var4);
-            return var5;
+      } else if (var0 instanceof byte[]) {
+         byte[] var5 = ((byte[])var0);
+         if (copyArray) {
+            int var3 = var5.length;
+            byte[] var4 = new byte[var3];
+            System.arraycopy(var5, 0, var4, 0, var3);
+            return var4;
          } else {
-            return var6;
+            return var5;
          }
-      } else if(var0 instanceof AbstractByteArrayCopier) {
+      } else if (var0 instanceof AbstractByteArrayCopier) {
          AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0;
          return var2.get();
       } else {
@@ -261,10 +263,10 @@ public class TextureProvider implements TextureLoader {
       Buffer var4 = new Buffer(var0);
       int var5 = -1;
 
-      label69:
-      while(true) {
-         int var6 = var4.__at_308();
-         if(var6 == 0) {
+      label56:
+      while (true) {
+         int var6 = var4.method49();
+         if (var6 == 0) {
             return var3;
          }
 
@@ -272,25 +274,25 @@ public class TextureProvider implements TextureLoader {
          int var7 = 0;
          boolean var8 = false;
 
-         while(true) {
-            int var9;
-            while(!var8) {
-               var9 = var4.__ae_307();
-               if(var9 == 0) {
-                  continue label69;
+         while (true) {
+            int var13;
+            while (!var8) {
+               var13 = var4.readUShortSmart();
+               if (var13 == 0) {
+                  continue label56;
                }
 
-               var7 += var9 - 1;
-               int var10 = var7 & 63;
-               int var11 = var7 >> 6 & 63;
-               int var12 = var4.readUnsignedByte() >> 2;
-               int var13 = var11 + var1;
-               int var14 = var10 + var2;
-               if(var13 > 0 && var14 > 0 && var13 < 103 && var14 < 103) {
-                  ObjectDefinition var15 = class50.getObjectDefinition(var5);
-                  if(var12 != 22 || !Client.isLowDetail || var15.int1 != 0 || var15.interactType == 1 || var15.boolean2) {
-                     if(!var15.__g_422()) {
-                        ++Client.__client_fk;
+               var7 += var13 - 1;
+               int var14 = var7 & 63;
+               int var15 = var7 >> 6 & 63;
+               int var9 = var4.readUnsignedByte() >> 2;
+               int var11 = var15 + var1;
+               int var12 = var14 + var2;
+               if (var11 > 0 && var12 > 0 && var11 < 103 && var12 < 103) {
+                  ObjectDefinition var10 = class50.getObjectDefinition(var5);
+                  if (var9 != 22 || !Client.isLowDetail || var10.int1 != 0 || var10.interactType == 1 || var10.boolean2) {
+                     if (!var10.method231()) {
+                        ++Client.field179;
                         var3 = false;
                      }
 
@@ -299,8 +301,8 @@ public class TextureProvider implements TextureLoader {
                }
             }
 
-            var9 = var4.__ae_307();
-            if(var9 == 0) {
+            var13 = var4.readUShortSmart();
+            if (var13 == 0) {
                break;
             }
 
@@ -317,93 +319,93 @@ public class TextureProvider implements TextureLoader {
    static int method2752(int var0, Script var1, boolean var2) {
       int var3;
       int var4;
-      if(var0 == 4000) {
+      if (var0 == ScriptOpcodes.ADD) {
          RouteStrategy.Interpreter_intStackSize -= 2;
          var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
          var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 + var4;
          return 1;
-      } else if(var0 == 4001) {
+      } else if (var0 == ScriptOpcodes.SUB) {
          RouteStrategy.Interpreter_intStackSize -= 2;
          var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
          var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 - var4;
          return 1;
-      } else if(var0 == 4002) {
+      } else if (var0 == ScriptOpcodes.MULTIPLY) {
          RouteStrategy.Interpreter_intStackSize -= 2;
          var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
          var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4 * var3;
          return 1;
-      } else if(var0 == 4003) {
+      } else if (var0 == ScriptOpcodes.DIV) {
          RouteStrategy.Interpreter_intStackSize -= 2;
          var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
          var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 / var4;
          return 1;
-      } else if(var0 == 4004) {
+      } else if (var0 == ScriptOpcodes.RANDOM) {
          var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3);
          return 1;
-      } else if(var0 == 4005) {
+      } else if (var0 == ScriptOpcodes.RANDOMINC) {
          var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1));
          return 1;
-      } else if(var0 == 4006) {
+      } else if (var0 == ScriptOpcodes.INTERPOLATE) {
          RouteStrategy.Interpreter_intStackSize -= 5;
          var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
          var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-         int var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
+         int var11 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
          int var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3];
-         int var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 4];
-         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 + (var7 - var5) * (var4 - var3) / (var6 - var5);
+         int var12 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 4];
+         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 + (var12 - var11) * (var4 - var3) / (var6 - var11);
          return 1;
-      } else if(var0 == 4007) {
+      } else if (var0 == ScriptOpcodes.ADDPERCENT) {
          RouteStrategy.Interpreter_intStackSize -= 2;
          var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
          var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 + var3 * var4 / 100;
          return 1;
-      } else if(var0 == 4008) {
+      } else if (var0 == ScriptOpcodes.SETBIT) {
          RouteStrategy.Interpreter_intStackSize -= 2;
          var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
          var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 | 1 << var4;
          return 1;
-      } else if(var0 == 4009) {
+      } else if (var0 == ScriptOpcodes.CLEARBIT) {
          RouteStrategy.Interpreter_intStackSize -= 2;
          var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
          var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4);
          return 1;
-      } else if(var0 == 4010) {
+      } else if (var0 == ScriptOpcodes.TESTBIT) {
          RouteStrategy.Interpreter_intStackSize -= 2;
          var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
          var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0?1:0;
+         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0;
          return 1;
-      } else if(var0 == 4011) {
+      } else if (var0 == ScriptOpcodes.MOD) {
          RouteStrategy.Interpreter_intStackSize -= 2;
          var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
          var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 % var4;
          return 1;
-      } else if(var0 == 4012) {
+      } else if (var0 == ScriptOpcodes.POW) {
          RouteStrategy.Interpreter_intStackSize -= 2;
          var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
          var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-         if(var3 == 0) {
+         if (var3 == 0) {
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
          } else {
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, (double)var4);
          }
 
          return 1;
-      } else if(var0 == 4013) {
+      } else if (var0 == ScriptOpcodes.INVPOW) {
          RouteStrategy.Interpreter_intStackSize -= 2;
          var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
          var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-         if(var3 == 0) {
+         if (var3 == 0) {
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
             return 1;
          } else {
@@ -429,24 +431,24 @@ public class TextureProvider implements TextureLoader {
 
             return 1;
          }
-      } else if(var0 == 4014) {
+      } else if (var0 == ScriptOpcodes.AND) {
          RouteStrategy.Interpreter_intStackSize -= 2;
          var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
          var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 & var4;
          return 1;
-      } else if(var0 == 4015) {
+      } else if (var0 == ScriptOpcodes.OR) {
          RouteStrategy.Interpreter_intStackSize -= 2;
          var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
          var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3 | var4;
          return 1;
-      } else if(var0 == 4018) {
+      } else if (var0 == ScriptOpcodes.SCALE) {
          RouteStrategy.Interpreter_intStackSize -= 3;
-         long var9 = (long)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-         long var11 = (long)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-         long var13 = (long)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
-         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (int)(var13 * var9 / var11);
+         long var5 = (long)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
+         long var7 = (long)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
+         long var9 = (long)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
+         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (int)(var9 * var5 / var7);
          return 1;
       } else {
          return 2;
@@ -463,14 +465,14 @@ public class TextureProvider implements TextureLoader {
       FontName.method5641();
       class65.scene.clear();
 
-      for(int var0 = 0; var0 < 4; ++var0) {
+      for (int var0 = 0; var0 < 4; ++var0) {
          Client.collisionMaps[var0].clear();
       }
 
       System.gc();
       AbstractSocket.method3488(2);
-      Client.__client_qy = -1;
-      Client.__client_qq = false;
+      Client.field112 = -1;
+      Client.field107 = false;
       SpriteMask.method4390();
       GameShell.updateGameState(10);
    }
diff --git a/runescape-client/src/main/java/Tile.java b/runescape-client/src/main/java/Tile.java
index 8a2336572e..753d7eb522 100644
--- a/runescape-client/src/main/java/Tile.java
+++ b/runescape-client/src/main/java/Tile.java
@@ -113,17 +113,17 @@ public final class Tile extends Node {
    @ObfuscatedGetter(
       intValue = 1724493981
    )
-   int __y;
+   int field897;
    @ObfuscatedName("h")
    @ObfuscatedGetter(
       intValue = -172066661
    )
-   int __h;
+   int field898;
    @ObfuscatedName("b")
    @ObfuscatedGetter(
       intValue = 2030010491
    )
-   int __b;
+   int field899;
    @ObfuscatedName("c")
    @ObfuscatedSignature(
       signature = "Ldj;"
@@ -146,7 +146,7 @@ public final class Tile extends Node {
       garbageValue = "-1899580455"
    )
    public static void method2867() {
-      UnderlayDefinition.UnderlayDefinition_cached.clear();
+      FloorUnderlayDefinition.FloorUnderlayDefinition_cached.clear();
    }
 
    @ObfuscatedName("is")
@@ -155,132 +155,129 @@ public final class Tile extends Node {
       garbageValue = "117"
    )
    @Export("addNpcToMenu")
-   static final void addNpcToMenu(NpcDefinition var0, int var1, int var2, int var3) {
-      if(Client.menuOptionsCount < 400) {
-         if(var0.transforms != null) {
-            var0 = var0.transform();
+   static final void addNpcToMenu(NPCDefinition npc, int menuArg0, int menuArg1, int menuArg2) {
+      if (Client.menuOptionsCount < 400) {
+         if (npc.transforms != null) {
+            npc = npc.transform();
          }
 
-         if(var0 != null) {
-            if(var0.isInteractable) {
-               if(!var0.isFollower || Client.followerIndex == var1) {
-                  String var4 = var0.name;
-                  int var7;
-                  int var8;
-                  if(var0.combatLevel != 0) {
-                     var7 = var0.combatLevel;
-                     var8 = Canvas.localPlayer.combatLevel;
-                     int var9 = var8 - var7;
-                     String var6;
-                     if(var9 < -9) {
-                        var6 = BufferedFile.colorStartTag(16711680);
-                     } else if(var9 < -6) {
-                        var6 = BufferedFile.colorStartTag(16723968);
-                     } else if(var9 < -3) {
-                        var6 = BufferedFile.colorStartTag(16740352);
-                     } else if(var9 < 0) {
-                        var6 = BufferedFile.colorStartTag(16756736);
-                     } else if(var9 > 9) {
-                        var6 = BufferedFile.colorStartTag(65280);
-                     } else if(var9 > 6) {
-                        var6 = BufferedFile.colorStartTag(4259584);
-                     } else if(var9 > 3) {
-                        var6 = BufferedFile.colorStartTag(8453888);
-                     } else if(var9 > 0) {
-                        var6 = BufferedFile.colorStartTag(12648192);
-                     } else {
-                        var6 = BufferedFile.colorStartTag(16776960);
+         if (npc != null && npc.isInteractable && (!npc.isFollower || Client.followerIndex == menuArg0)) {
+            String var4 = npc.name;
+            int var5;
+            int var6;
+            int var7;
+            if (npc.combatLevel != 0) {
+               var5 = npc.combatLevel;
+               var6 = Canvas.localPlayer.combatLevel;
+               var7 = var6 - var5;
+               String var8;
+               if (var7 < -9) {
+                  var8 = BufferedFile.colorStartTag(16711680);
+               } else if (var7 < -6) {
+                  var8 = BufferedFile.colorStartTag(16723968);
+               } else if (var7 < -3) {
+                  var8 = BufferedFile.colorStartTag(16740352);
+               } else if (var7 < 0) {
+                  var8 = BufferedFile.colorStartTag(16756736);
+               } else if (var7 > 9) {
+                  var8 = BufferedFile.colorStartTag(65280);
+               } else if (var7 > 6) {
+                  var8 = BufferedFile.colorStartTag(4259584);
+               } else if (var7 > 3) {
+                  var8 = BufferedFile.colorStartTag(8453888);
+               } else if (var7 > 0) {
+                  var8 = BufferedFile.colorStartTag(12648192);
+               } else {
+                  var8 = BufferedFile.colorStartTag(16776960);
+               }
+
+               var4 = var4 + var8 + "  (level-" + npc.combatLevel + ")";
+            }
+
+            if (npc.isFollower && Client.followerOpsLowPriority) {
+               Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(16776960) + var4, 1003, menuArg0, menuArg1, menuArg2);
+            }
+
+            if (Client.isItemSelected == 1) {
+               Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " -> " + BufferedFile.colorStartTag(16776960) + var4, 7, menuArg0, menuArg1, menuArg2);
+            } else if (Client.isSpellSelected) {
+               if ((FloorDecoration.selectedSpellFlags & 2) == 2) {
+                  Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + BufferedFile.colorStartTag(16776960) + var4, 8, menuArg0, menuArg1, menuArg2);
+               }
+            } else {
+               var7 = npc.isFollower && Client.followerOpsLowPriority ? 2000 : 0;
+               String[] var10 = npc.actions;
+               if (var10 != null) {
+                  for (var5 = 4; var5 >= 0; --var5) {
+                     if (var10[var5] != null && !var10[var5].equalsIgnoreCase("Attack")) {
+                        var6 = 0;
+                        if (var5 == 0) {
+                           var6 = var7 + 9;
+                        }
+
+                        if (var5 == 1) {
+                           var6 = var7 + 10;
+                        }
+
+                        if (var5 == 2) {
+                           var6 = var7 + 11;
+                        }
+
+                        if (var5 == 3) {
+                           var6 = var7 + 12;
+                        }
+
+                        if (var5 == 4) {
+                           var6 = var7 + 13;
+                        }
+
+                        Tiles.insertMenuItemNoShift(var10[var5], BufferedFile.colorStartTag(16776960) + var4, var6, menuArg0, menuArg1, menuArg2);
                      }
-
-                     var4 = var4 + var6 + " " + " (" + "level-" + var0.combatLevel + ")";
                   }
+               }
 
-                  if(var0.isFollower && Client.followerOpsLowPriority) {
-                     Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(16776960) + var4, 1003, var1, var2, var3);
-                  }
-
-                  if(Client.isItemSelected == 1) {
-                     Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + BufferedFile.colorStartTag(16776960) + var4, 7, var1, var2, var3);
-                  } else if(Client.isSpellSelected) {
-                     if((FloorDecoration.selectedSpellFlags & 2) == 2) {
-                        Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + BufferedFile.colorStartTag(16776960) + var4, 8, var1, var2, var3);
-                     }
-                  } else {
-                     int var10 = var0.isFollower && Client.followerOpsLowPriority?2000:0;
-                     String[] var11 = var0.actions;
-                     if(var11 != null) {
-                        for(var7 = 4; var7 >= 0; --var7) {
-                           if(var11[var7] != null && !var11[var7].equalsIgnoreCase("Attack")) {
-                              var8 = 0;
-                              if(var7 == 0) {
-                                 var8 = var10 + 9;
-                              }
-
-                              if(var7 == 1) {
-                                 var8 = var10 + 10;
-                              }
-
-                              if(var7 == 2) {
-                                 var8 = var10 + 11;
-                              }
-
-                              if(var7 == 3) {
-                                 var8 = var10 + 12;
-                              }
-
-                              if(var7 == 4) {
-                                 var8 = var10 + 13;
-                              }
-
-                              Tiles.insertMenuItemNoShift(var11[var7], BufferedFile.colorStartTag(16776960) + var4, var8, var1, var2, var3);
+               if (var10 != null) {
+                  for (var5 = 4; var5 >= 0; --var5) {
+                     if (var10[var5] != null && var10[var5].equalsIgnoreCase("Attack")) {
+                        short var9 = 0;
+                        if (AttackOption.AttackOption_hidden != Client.npcAttackOption) {
+                           if (AttackOption.AttackOption_alwaysRightClick == Client.npcAttackOption || Client.npcAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && npc.combatLevel > Canvas.localPlayer.combatLevel) {
+                              var9 = 2000;
                            }
+
+                           var6 = 0;
+                           if (var5 == 0) {
+                              var6 = var9 + 9;
+                           }
+
+                           if (var5 == 1) {
+                              var6 = var9 + 10;
+                           }
+
+                           if (var5 == 2) {
+                              var6 = var9 + 11;
+                           }
+
+                           if (var5 == 3) {
+                              var6 = var9 + 12;
+                           }
+
+                           if (var5 == 4) {
+                              var6 = var9 + 13;
+                           }
+
+                           Tiles.insertMenuItemNoShift(var10[var5], BufferedFile.colorStartTag(16776960) + var4, var6, menuArg0, menuArg1, menuArg2);
                         }
                      }
-
-                     if(var11 != null) {
-                        for(var7 = 4; var7 >= 0; --var7) {
-                           if(var11[var7] != null && var11[var7].equalsIgnoreCase("Attack")) {
-                              short var12 = 0;
-                              if(AttackOption.AttackOption_hidden != Client.npcAttackOption) {
-                                 if(AttackOption.AttackOption_alwaysRightClick == Client.npcAttackOption || Client.npcAttackOption == AttackOption.AttackOption_dependsOnCombatLevels && var0.combatLevel > Canvas.localPlayer.combatLevel) {
-                                    var12 = 2000;
-                                 }
-
-                                 var8 = 0;
-                                 if(var7 == 0) {
-                                    var8 = var12 + 9;
-                                 }
-
-                                 if(var7 == 1) {
-                                    var8 = var12 + 10;
-                                 }
-
-                                 if(var7 == 2) {
-                                    var8 = var12 + 11;
-                                 }
-
-                                 if(var7 == 3) {
-                                    var8 = var12 + 12;
-                                 }
-
-                                 if(var7 == 4) {
-                                    var8 = var12 + 13;
-                                 }
-
-                                 Tiles.insertMenuItemNoShift(var11[var7], BufferedFile.colorStartTag(16776960) + var4, var8, var1, var2, var3);
-                              }
-                           }
-                        }
-                     }
-
-                     if(!var0.isFollower || !Client.followerOpsLowPriority) {
-                        Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(16776960) + var4, 1003, var1, var2, var3);
-                     }
                   }
+               }
 
+               if (!npc.isFollower || !Client.followerOpsLowPriority) {
+                  Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(16776960) + var4, 1003, menuArg0, menuArg1, menuArg2);
                }
             }
          }
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/TileModel.java b/runescape-client/src/main/java/TileModel.java
index 43694cdb9b..ba633f0b6b 100644
--- a/runescape-client/src/main/java/TileModel.java
+++ b/runescape-client/src/main/java/TileModel.java
@@ -6,19 +6,19 @@ import net.runelite.mapping.ObfuscatedName;
 @Implements("TileModel")
 public final class TileModel {
    @ObfuscatedName("z")
-   static int[] __dv_z;
+   static int[] field900;
    @ObfuscatedName("j")
-   static int[] __dv_j;
+   static int[] field901;
    @ObfuscatedName("s")
-   static int[] __dv_s;
+   static int[] field902;
    @ObfuscatedName("t")
-   static int[] __dv_t;
+   static int[] field903;
    @ObfuscatedName("y")
-   static int[] __dv_y;
+   static int[] field904;
    @ObfuscatedName("h")
-   static final int[][] __dv_h;
+   static final int[][] field905;
    @ObfuscatedName("b")
-   static final int[][] __dv_b;
+   static final int[][] field906;
    @ObfuscatedName("m")
    @Export("vertexX")
    int[] vertexX;
@@ -65,19 +65,9 @@ public final class TileModel {
    @Export("overlayRgb")
    int overlayRgb;
 
-   static {
-      __dv_z = new int[6];
-      __dv_j = new int[6];
-      __dv_s = new int[6];
-      __dv_t = new int[6];
-      __dv_y = new int[6];
-      __dv_h = 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}};
-      __dv_b = 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}};
-   }
-
    TileModel(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) {
       this.isFlat = true;
-      if(var7 != var6 || var8 != var6 || var9 != var6) {
+      if (var7 != var6 || var8 != var6 || var9 != var6) {
          this.isFlat = false;
       }
 
@@ -89,7 +79,7 @@ public final class TileModel {
       int var21 = var20 / 2;
       int var22 = var20 / 4;
       int var23 = var20 * 3 / 4;
-      int[] var24 = __dv_h[var1];
+      int[] var24 = field905[var1];
       int var25 = var24.length;
       this.vertexX = new int[var25];
       this.vertexY = new int[var25];
@@ -99,210 +89,220 @@ public final class TileModel {
       int var28 = var20 * var4;
       int var29 = var5 * var20;
 
+      int var30;
       int var31;
       int var32;
       int var33;
       int var34;
       int var35;
-      int var36;
-      for(int var30 = 0; var30 < var25; ++var30) {
-         var31 = var24[var30];
-         if((var31 & 1) == 0 && var31 <= 8) {
-            var31 = (var31 - var2 - var2 - 1 & 7) + 1;
+      for (int var36 = 0; var36 < var25; ++var36) {
+         var30 = var24[var36];
+         if ((var30 & 1) == 0 && var30 <= 8) {
+            var30 = (var30 - var2 - var2 - 1 & 7) + 1;
          }
 
-         if(var31 > 8 && var31 <= 12) {
-            var31 = (var31 - 9 - var2 & 3) + 9;
+         if (var30 > 8 && var30 <= 12) {
+            var30 = (var30 - 9 - var2 & 3) + 9;
          }
 
-         if(var31 > 12 && var31 <= 16) {
-            var31 = (var31 - 13 - var2 & 3) + 13;
+         if (var30 > 12 && var30 <= 16) {
+            var30 = (var30 - 13 - var2 & 3) + 13;
          }
 
-         if(var31 == 1) {
-            var32 = var28;
-            var33 = var29;
-            var34 = var6;
-            var35 = var10;
-            var36 = var14;
-         } else if(var31 == 2) {
-            var32 = var28 + var21;
-            var33 = var29;
-            var34 = var7 + var6 >> 1;
-            var35 = var11 + var10 >> 1;
-            var36 = var15 + var14 >> 1;
-         } else if(var31 == 3) {
-            var32 = var28 + var20;
-            var33 = var29;
-            var34 = var7;
-            var35 = var11;
-            var36 = var15;
-         } else if(var31 == 4) {
-            var32 = var28 + var20;
-            var33 = var29 + var21;
-            var34 = var8 + var7 >> 1;
-            var35 = var11 + var12 >> 1;
-            var36 = var15 + var16 >> 1;
-         } else if(var31 == 5) {
-            var32 = var28 + var20;
-            var33 = var29 + var20;
-            var34 = var8;
-            var35 = var12;
-            var36 = var16;
-         } else if(var31 == 6) {
-            var32 = var28 + var21;
-            var33 = var29 + var20;
-            var34 = var8 + var9 >> 1;
-            var35 = var13 + var12 >> 1;
-            var36 = var17 + var16 >> 1;
-         } else if(var31 == 7) {
-            var32 = var28;
-            var33 = var29 + var20;
-            var34 = var9;
-            var35 = var13;
-            var36 = var17;
-         } else if(var31 == 8) {
-            var32 = var28;
-            var33 = var29 + var21;
-            var34 = var9 + var6 >> 1;
-            var35 = var13 + var10 >> 1;
-            var36 = var17 + var14 >> 1;
-         } else if(var31 == 9) {
-            var32 = var28 + var21;
-            var33 = var29 + var22;
-            var34 = var7 + var6 >> 1;
-            var35 = var11 + var10 >> 1;
-            var36 = var15 + var14 >> 1;
-         } else if(var31 == 10) {
-            var32 = var28 + var23;
-            var33 = var29 + var21;
-            var34 = var8 + var7 >> 1;
-            var35 = var11 + var12 >> 1;
-            var36 = var15 + var16 >> 1;
-         } else if(var31 == 11) {
-            var32 = var28 + var21;
-            var33 = var29 + var23;
-            var34 = var8 + var9 >> 1;
-            var35 = var13 + var12 >> 1;
-            var36 = var17 + var16 >> 1;
-         } else if(var31 == 12) {
-            var32 = var28 + var22;
-            var33 = var29 + var21;
-            var34 = var9 + var6 >> 1;
-            var35 = var13 + var10 >> 1;
-            var36 = var17 + var14 >> 1;
-         } else if(var31 == 13) {
-            var32 = var28 + var22;
-            var33 = var29 + var22;
-            var34 = var6;
-            var35 = var10;
-            var36 = var14;
-         } else if(var31 == 14) {
-            var32 = var28 + var23;
-            var33 = var29 + var22;
-            var34 = var7;
-            var35 = var11;
-            var36 = var15;
-         } else if(var31 == 15) {
-            var32 = var28 + var23;
-            var33 = var29 + var23;
-            var34 = var8;
-            var35 = var12;
-            var36 = var16;
+         if (var30 == 1) {
+            var31 = var28;
+            var32 = var29;
+            var33 = var6;
+            var34 = var10;
+            var35 = var14;
+         } else if (var30 == 2) {
+            var31 = var28 + var21;
+            var32 = var29;
+            var33 = var7 + var6 >> 1;
+            var34 = var11 + var10 >> 1;
+            var35 = var15 + var14 >> 1;
+         } else if (var30 == 3) {
+            var31 = var28 + var20;
+            var32 = var29;
+            var33 = var7;
+            var34 = var11;
+            var35 = var15;
+         } else if (var30 == 4) {
+            var31 = var28 + var20;
+            var32 = var29 + var21;
+            var33 = var8 + var7 >> 1;
+            var34 = var11 + var12 >> 1;
+            var35 = var15 + var16 >> 1;
+         } else if (var30 == 5) {
+            var31 = var28 + var20;
+            var32 = var29 + var20;
+            var33 = var8;
+            var34 = var12;
+            var35 = var16;
+         } else if (var30 == 6) {
+            var31 = var28 + var21;
+            var32 = var29 + var20;
+            var33 = var8 + var9 >> 1;
+            var34 = var13 + var12 >> 1;
+            var35 = var17 + var16 >> 1;
+         } else if (var30 == 7) {
+            var31 = var28;
+            var32 = var29 + var20;
+            var33 = var9;
+            var34 = var13;
+            var35 = var17;
+         } else if (var30 == 8) {
+            var31 = var28;
+            var32 = var29 + var21;
+            var33 = var9 + var6 >> 1;
+            var34 = var13 + var10 >> 1;
+            var35 = var17 + var14 >> 1;
+         } else if (var30 == 9) {
+            var31 = var28 + var21;
+            var32 = var29 + var22;
+            var33 = var7 + var6 >> 1;
+            var34 = var11 + var10 >> 1;
+            var35 = var15 + var14 >> 1;
+         } else if (var30 == 10) {
+            var31 = var28 + var23;
+            var32 = var29 + var21;
+            var33 = var8 + var7 >> 1;
+            var34 = var11 + var12 >> 1;
+            var35 = var15 + var16 >> 1;
+         } else if (var30 == 11) {
+            var31 = var28 + var21;
+            var32 = var29 + var23;
+            var33 = var8 + var9 >> 1;
+            var34 = var13 + var12 >> 1;
+            var35 = var17 + var16 >> 1;
+         } else if (var30 == 12) {
+            var31 = var28 + var22;
+            var32 = var29 + var21;
+            var33 = var9 + var6 >> 1;
+            var34 = var13 + var10 >> 1;
+            var35 = var17 + var14 >> 1;
+         } else if (var30 == 13) {
+            var31 = var28 + var22;
+            var32 = var29 + var22;
+            var33 = var6;
+            var34 = var10;
+            var35 = var14;
+         } else if (var30 == 14) {
+            var31 = var28 + var23;
+            var32 = var29 + var22;
+            var33 = var7;
+            var34 = var11;
+            var35 = var15;
+         } else if (var30 == 15) {
+            var31 = var28 + var23;
+            var32 = var29 + var23;
+            var33 = var8;
+            var34 = var12;
+            var35 = var16;
          } else {
-            var32 = var28 + var22;
-            var33 = var29 + var23;
-            var34 = var9;
-            var35 = var13;
-            var36 = var17;
+            var31 = var28 + var22;
+            var32 = var29 + var23;
+            var33 = var9;
+            var34 = var13;
+            var35 = var17;
          }
 
-         this.vertexX[var30] = var32;
-         this.vertexY[var30] = var34;
-         this.vertexZ[var30] = var33;
-         var26[var30] = var35;
-         var27[var30] = var36;
+         this.vertexX[var36] = var31;
+         this.vertexY[var36] = var33;
+         this.vertexZ[var36] = var32;
+         var26[var36] = var34;
+         var27[var36] = var35;
       }
 
-      int[] var38 = __dv_b[var1];
-      var31 = var38.length / 4;
-      this.faceX = new int[var31];
-      this.faceY = new int[var31];
-      this.faceZ = new int[var31];
-      this.triangleColorA = new int[var31];
-      this.triangleColorB = new int[var31];
-      this.triangleColorC = new int[var31];
-      if(var3 != -1) {
-         this.triangleTextureId = new int[var31];
+      int[] var38 = field906[var1];
+      var30 = var38.length / 4;
+      this.faceX = new int[var30];
+      this.faceY = new int[var30];
+      this.faceZ = new int[var30];
+      this.triangleColorA = new int[var30];
+      this.triangleColorB = new int[var30];
+      this.triangleColorC = new int[var30];
+      if (var3 != -1) {
+         this.triangleTextureId = new int[var30];
       }
 
-      var32 = 0;
+      var31 = 0;
 
-      for(var33 = 0; var33 < var31; ++var33) {
-         var34 = var38[var32];
-         var35 = var38[var32 + 1];
-         var36 = var38[var32 + 2];
-         int var37 = var38[var32 + 3];
-         var32 += 4;
-         if(var35 < 4) {
+      for (var32 = 0; var32 < var30; ++var32) {
+         var33 = var38[var31];
+         var34 = var38[var31 + 1];
+         var35 = var38[var31 + 2];
+         int var37 = var38[var31 + 3];
+         var31 += 4;
+         if (var34 < 4) {
+            var34 = var34 - var2 & 3;
+         }
+
+         if (var35 < 4) {
             var35 = var35 - var2 & 3;
          }
 
-         if(var36 < 4) {
-            var36 = var36 - var2 & 3;
-         }
-
-         if(var37 < 4) {
+         if (var37 < 4) {
             var37 = var37 - var2 & 3;
          }
 
-         this.faceX[var33] = var35;
-         this.faceY[var33] = var36;
-         this.faceZ[var33] = var37;
-         if(var34 == 0) {
-            this.triangleColorA[var33] = var26[var35];
-            this.triangleColorB[var33] = var26[var36];
-            this.triangleColorC[var33] = var26[var37];
-            if(this.triangleTextureId != null) {
-               this.triangleTextureId[var33] = -1;
+         this.faceX[var32] = var34;
+         this.faceY[var32] = var35;
+         this.faceZ[var32] = var37;
+         if (var33 == 0) {
+            this.triangleColorA[var32] = var26[var34];
+            this.triangleColorB[var32] = var26[var35];
+            this.triangleColorC[var32] = var26[var37];
+            if (this.triangleTextureId != null) {
+               this.triangleTextureId[var32] = -1;
             }
          } else {
-            this.triangleColorA[var33] = var27[var35];
-            this.triangleColorB[var33] = var27[var36];
-            this.triangleColorC[var33] = var27[var37];
-            if(this.triangleTextureId != null) {
-               this.triangleTextureId[var33] = var3;
+            this.triangleColorA[var32] = var27[var34];
+            this.triangleColorB[var32] = var27[var35];
+            this.triangleColorC[var32] = var27[var37];
+            if (this.triangleTextureId != null) {
+               this.triangleTextureId[var32] = var3;
             }
          }
       }
 
-      var33 = var6;
-      var34 = var7;
-      if(var7 < var6) {
+      var32 = var6;
+      var33 = var7;
+      if (var7 < var6) {
+         var32 = var7;
+      }
+
+      if (var7 > var7) {
          var33 = var7;
       }
 
-      if(var7 > var7) {
-         var34 = var7;
+      if (var8 < var32) {
+         var32 = var8;
       }
 
-      if(var8 < var33) {
+      if (var8 > var33) {
          var33 = var8;
       }
 
-      if(var8 > var34) {
-         var34 = var8;
+      if (var9 < var32) {
+         var32 = var9;
       }
 
-      if(var9 < var33) {
+      if (var9 > var33) {
          var33 = var9;
       }
 
-      if(var9 > var34) {
-         var34 = var9;
-      }
-
+      var32 /= 14;
       var33 /= 14;
-      var34 /= 14;
+   }
+
+   static {
+      field900 = new int[6];
+      field901 = new int[6];
+      field902 = new int[6];
+      field903 = new int[6];
+      field904 = new int[6];
+      field905 = 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}};
+      field906 = 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}};
    }
 }
diff --git a/runescape-client/src/main/java/TilePaint.java b/runescape-client/src/main/java/TilePaint.java
index e63ed8340a..586e34d0eb 100644
--- a/runescape-client/src/main/java/TilePaint.java
+++ b/runescape-client/src/main/java/TilePaint.java
@@ -11,7 +11,7 @@ public final class TilePaint {
    @ObfuscatedSignature(
       signature = "Lla;"
    )
-   static Bounds __eb_ah;
+   static Bounds field907;
    @ObfuscatedName("m")
    @ObfuscatedGetter(
       intValue = 181759449
@@ -68,51 +68,53 @@ public final class TilePaint {
       signature = "(IIB)V",
       garbageValue = "0"
    )
-   static final void method3061(int var0, int var1) {
+   @Export("updateItemPile")
+   static final void updateItemPile(int var0, int var1) {
       NodeDeque var2 = Client.groundItems[SoundSystem.plane][var0][var1];
-      if(var2 == null) {
+      if (var2 == null) {
          class65.scene.removeGroundItemPile(SoundSystem.plane, var0, var1);
       } else {
          long var3 = -99999999L;
          GroundItem var5 = null;
 
          GroundItem var6;
-         for(var6 = (GroundItem)var2.last(); var6 != null; var6 = (GroundItem)var2.previous()) {
+         for (var6 = (GroundItem)var2.last(); var6 != null; var6 = (GroundItem)var2.previous()) {
             ItemDefinition var7 = Skills.getItemDefinition(var6.id);
             long var8 = (long)var7.price;
-            if(var7.isStackable == 1) {
+            if (var7.isStackable == 1) {
                var8 *= (long)(var6.quantity + 1);
             }
 
-            if(var8 > var3) {
+            if (var8 > var3) {
                var3 = var8;
                var5 = var6;
             }
          }
 
-         if(var5 == null) {
+         if (var5 == null) {
             class65.scene.removeGroundItemPile(SoundSystem.plane, var0, var1);
          } else {
             var2.addLast(var5);
-            GroundItem var12 = null;
             GroundItem var11 = null;
+            GroundItem var12 = null;
 
-            for(var6 = (GroundItem)var2.last(); var6 != null; var6 = (GroundItem)var2.previous()) {
-               if(var5.id != var6.id) {
-                  if(var12 == null) {
-                     var12 = var6;
+            for (var6 = (GroundItem)var2.last(); var6 != null; var6 = (GroundItem)var2.previous()) {
+               if (var5.id != var6.id) {
+                  if (var11 == null) {
+                     var11 = var6;
                   }
 
-                  if(var12.id != var6.id && var11 == null) {
-                     var11 = var6;
+                  if (var11.id != var6.id && var12 == null) {
+                     var12 = var6;
                   }
                }
             }
 
-            long var9 = FontName.method5637(var0, var1, 3, false, 0);
-            class65.scene.newGroundItemPile(SoundSystem.plane, var0, var1, class32.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, SoundSystem.plane), var5, var9, var12, var11);
+            long var9 = FontName.calculateTag(var0, var1, 3, false, 0);
+            class65.scene.newGroundItemPile(SoundSystem.plane, var0, var1, class32.getTileHeight(var0 * 128 + 64, var1 * 128 + 64, SoundSystem.plane), var5, var9, var11, var12);
          }
       }
+
    }
 
    @ObfuscatedName("id")
@@ -121,9 +123,9 @@ public final class TilePaint {
       garbageValue = "-2025682764"
    )
    static void method3060(int var0, int var1) {
-      PacketBufferNode var2 = Interpreter.method1915(ClientPacket.__gs_bg, Client.packetWriter.isaacCipher);
+      PacketBufferNode var2 = Interpreter.method1915(ClientPacket.field292, Client.packetWriter.isaacCipher);
       var2.packetBuffer.writeIntLE16(var0);
-      var2.packetBuffer.__bo_322(var1);
-      Client.packetWriter.__q_167(var2);
+      var2.packetBuffer.method63(var1);
+      Client.packetWriter.method241(var2);
    }
 }
diff --git a/runescape-client/src/main/java/Tiles.java b/runescape-client/src/main/java/Tiles.java
index 2c80cd3d1a..a5bba19237 100644
--- a/runescape-client/src/main/java/Tiles.java
+++ b/runescape-client/src/main/java/Tiles.java
@@ -20,47 +20,33 @@ public final class Tiles {
    @Export("Tiles_minPlane")
    static int Tiles_minPlane;
    @ObfuscatedName("w")
-   static byte[][][] __bq_w;
+   static byte[][][] field908;
    @ObfuscatedName("l")
-   static byte[][][] __bq_l;
+   static byte[][][] field909;
    @ObfuscatedName("a")
-   static int[][][] __bq_a;
+   static int[][][] field910;
    @ObfuscatedName("t")
-   static final int[] __bq_t;
+   static final int[] field911;
    @ObfuscatedName("y")
-   static final int[] __bq_y;
+   static final int[] field912;
    @ObfuscatedName("h")
-   static final int[] __bq_h;
+   static final int[] field913;
    @ObfuscatedName("b")
-   static final int[] __bq_b;
+   static final int[] field914;
    @ObfuscatedName("c")
-   static final int[] __bq_c;
+   static final int[] field915;
    @ObfuscatedName("r")
-   static final int[] __bq_r;
+   static final int[] field916;
    @ObfuscatedName("p")
    @ObfuscatedGetter(
       intValue = -2142579405
    )
-   static int __bq_p;
+   static int field917;
    @ObfuscatedName("v")
    @ObfuscatedGetter(
       intValue = 834543729
    )
-   static int __bq_v;
-
-   static {
-      Tiles_heights = new int[4][105][105];
-      Tiles_renderFlags = new byte[4][104][104];
-      Tiles_minPlane = 99;
-      __bq_t = new int[]{1, 2, 4, 8};
-      __bq_y = new int[]{16, 32, 64, 128};
-      __bq_h = new int[]{1, 0, -1, 0};
-      __bq_b = new int[]{0, -1, 0, 1};
-      __bq_c = new int[]{1, -1, -1, 1};
-      __bq_r = new int[]{-1, -1, 1, 1};
-      __bq_p = (int)(Math.random() * 17.0D) - 8;
-      __bq_v = (int)(Math.random() * 33.0D) - 16;
-   }
+   static int field918;
 
    @ObfuscatedName("aq")
    @ObfuscatedSignature(
@@ -68,7 +54,7 @@ public final class Tiles {
       garbageValue = "1832579963"
    )
    public static final void method1097(int var0, boolean var1, int var2) {
-      if(var0 >= 8000 && var0 <= 48000) {
+      if (var0 >= 8000 && var0 <= 48000) {
          class309.PcmPlayer_sampleRate = var0;
          PcmPlayer.isStereo = var1;
          Login.pcmPlayerCount = var2;
@@ -86,4 +72,18 @@ public final class Tiles {
    public static final void insertMenuItemNoShift(String var0, String var1, int var2, int var3, int var4, int var5) {
       class16.insertMenuItem(var0, var1, var2, var3, var4, var5, false);
    }
+
+   static {
+      Tiles_heights = new int[4][105][105];
+      Tiles_renderFlags = new byte[4][104][104];
+      Tiles_minPlane = 99;
+      field911 = new int[]{1, 2, 4, 8};
+      field912 = new int[]{16, 32, 64, 128};
+      field913 = new int[]{1, 0, -1, 0};
+      field914 = new int[]{0, -1, 0, 1};
+      field915 = new int[]{1, -1, -1, 1};
+      field916 = new int[]{-1, -1, 1, 1};
+      field917 = (int)(Math.random() * 17.0D) - 8;
+      field918 = (int)(Math.random() * 33.0D) - 16;
+   }
 }
diff --git a/runescape-client/src/main/java/Timer.java b/runescape-client/src/main/java/Timer.java
index 97088532cc..e1e8b9bb6b 100644
--- a/runescape-client/src/main/java/Timer.java
+++ b/runescape-client/src/main/java/Timer.java
@@ -11,61 +11,61 @@ public class Timer {
    @ObfuscatedGetter(
       longValue = 6181704275746246665L
    )
-   long __m;
+   long field919;
    @ObfuscatedName("f")
    @ObfuscatedGetter(
       longValue = -8166664055136527097L
    )
-   long __f;
+   long field920;
    @ObfuscatedName("q")
-   public boolean __q;
+   public boolean field921;
    @ObfuscatedName("w")
    @ObfuscatedGetter(
       longValue = -6206176920376957899L
    )
-   long __w;
+   long field922;
    @ObfuscatedName("o")
    @ObfuscatedGetter(
       longValue = -5820022560321695785L
    )
-   long __o;
+   long field923;
    @ObfuscatedName("u")
    @ObfuscatedGetter(
       longValue = -7044840680232740733L
    )
-   long __u;
+   long field924;
    @ObfuscatedName("g")
    @ObfuscatedGetter(
       intValue = -500639955
    )
-   int __g;
+   int field925;
    @ObfuscatedName("l")
    @ObfuscatedGetter(
       intValue = 2043109577
    )
-   int __l;
+   int field926;
    @ObfuscatedName("e")
    @ObfuscatedGetter(
       intValue = 978183419
    )
-   int __e;
+   int field927;
    @ObfuscatedName("x")
    @ObfuscatedGetter(
       intValue = 1684916659
    )
-   int __x;
+   int field928;
 
    public Timer() {
-      this.__m = -1L;
-      this.__f = -1L;
-      this.__q = false;
-      this.__w = 0L;
-      this.__o = 0L;
-      this.__u = 0L;
-      this.__g = 0;
-      this.__l = 0;
-      this.__e = 0;
-      this.__x = 0;
+      this.field919 = -1L;
+      this.field920 = -1L;
+      this.field921 = false;
+      this.field922 = 0L;
+      this.field923 = 0L;
+      this.field924 = 0L;
+      this.field925 = 0;
+      this.field926 = 0;
+      this.field927 = 0;
+      this.field928 = 0;
    }
 
    @ObfuscatedName("m")
@@ -73,8 +73,8 @@ public class Timer {
       signature = "(I)V",
       garbageValue = "2027048361"
    )
-   public void __m_453() {
-      this.__m = class203.currentTimeMs();
+   public void method329() {
+      this.field919 = class203.currentTimeMs();
    }
 
    @ObfuscatedName("f")
@@ -82,10 +82,10 @@ public class Timer {
       signature = "(B)V",
       garbageValue = "3"
    )
-   public void __f_454() {
-      if(-1L != this.__m) {
-         this.__o = class203.currentTimeMs() - this.__m;
-         this.__m = -1L;
+   public void method330() {
+      if (-1L != this.field919) {
+         this.field923 = class203.currentTimeMs() - this.field919;
+         this.field919 = -1L;
       }
 
    }
@@ -95,9 +95,9 @@ public class Timer {
       signature = "(II)V",
       garbageValue = "-1162738177"
    )
-   public void __q_455(int var1) {
-      this.__f = class203.currentTimeMs();
-      this.__g = var1;
+   public void method331(int var1) {
+      this.field920 = class203.currentTimeMs();
+      this.field925 = var1;
    }
 
    @ObfuscatedName("w")
@@ -105,14 +105,14 @@ public class Timer {
       signature = "(I)V",
       garbageValue = "-1855026926"
    )
-   public void __w_456() {
-      if(this.__f != -1L) {
-         this.__w = class203.currentTimeMs() - this.__f;
-         this.__f = -1L;
+   public void method332() {
+      if (this.field920 != -1L) {
+         this.field922 = class203.currentTimeMs() - this.field920;
+         this.field920 = -1L;
       }
 
-      ++this.__e;
-      this.__q = true;
+      ++this.field927;
+      this.field921 = true;
    }
 
    @ObfuscatedName("o")
@@ -120,9 +120,9 @@ public class Timer {
       signature = "(S)V",
       garbageValue = "-30171"
    )
-   public void __o_457() {
-      this.__q = false;
-      this.__l = 0;
+   public void method333() {
+      this.field921 = false;
+      this.field926 = 0;
    }
 
    @ObfuscatedName("u")
@@ -130,8 +130,8 @@ public class Timer {
       signature = "(I)V",
       garbageValue = "-812012402"
    )
-   public void __u_458() {
-      this.__w_456();
+   public void method334() {
+      this.method332();
    }
 
    @ObfuscatedName("g")
@@ -140,37 +140,37 @@ public class Timer {
       garbageValue = "805398419"
    )
    @Export("write")
-   public void write(Buffer var1) {
-      long var2 = this.__o;
+   public void write(Buffer buffer) {
+      long var2 = this.field923;
       var2 /= 10L;
-      if(var2 < 0L) {
+      if (var2 < 0L) {
          var2 = 0L;
-      } else if(var2 > 65535L) {
+      } else if (var2 > 65535L) {
          var2 = 65535L;
       }
 
-      var1.writeShort((int)var2);
-      long var4 = this.__w;
+      buffer.writeShort((int)var2);
+      long var4 = this.field922;
       var4 /= 10L;
-      if(var4 < 0L) {
+      if (var4 < 0L) {
          var4 = 0L;
-      } else if(var4 > 65535L) {
+      } else if (var4 > 65535L) {
          var4 = 65535L;
       }
 
-      var1.writeShort((int)var4);
-      long var6 = this.__u;
+      buffer.writeShort((int)var4);
+      long var6 = this.field924;
       var6 /= 10L;
-      if(var6 < 0L) {
+      if (var6 < 0L) {
          var6 = 0L;
-      } else if(var6 > 65535L) {
+      } else if (var6 > 65535L) {
          var6 = 65535L;
       }
 
-      var1.writeShort((int)var6);
-      var1.writeShort(this.__g);
-      var1.writeShort(this.__l);
-      var1.writeShort(this.__e);
-      var1.writeShort(this.__x);
+      buffer.writeShort((int)var6);
+      buffer.writeShort(this.field925);
+      buffer.writeShort(this.field926);
+      buffer.writeShort(this.field927);
+      buffer.writeShort(this.field928);
    }
 }
diff --git a/runescape-client/src/main/java/TotalQuantityComparator.java b/runescape-client/src/main/java/TotalQuantityComparator.java
deleted file mode 100644
index 14da8aef2c..0000000000
--- a/runescape-client/src/main/java/TotalQuantityComparator.java
+++ /dev/null
@@ -1,211 +0,0 @@
-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("e")
-@Implements("TotalQuantityComparator")
-final class TotalQuantityComparator implements Comparator {
-   @ObfuscatedName("m")
-   @ObfuscatedSignature(
-      signature = "(Ll;Ll;I)I",
-      garbageValue = "-573736433"
-   )
-   int __m_5(GrandExchangeEvent var1, GrandExchangeEvent var2) {
-      return var1.grandExchangeOffer.totalQuantity < var2.grandExchangeOffer.totalQuantity?-1:(var2.grandExchangeOffer.totalQuantity == var1.grandExchangeOffer.totalQuantity?0:1);
-   }
-
-   @Export("compare")
-   @ObfuscatedName("compare")
-   public int compare(Object var1, Object var2) {
-      return this.__m_5((GrandExchangeEvent)var1, (GrandExchangeEvent)var2);
-   }
-
-   @ObfuscatedName("equals")
-   public boolean __equals_7(Object var1) {
-      return super.equals(var1);
-   }
-
-   @ObfuscatedName("o")
-   @ObfuscatedSignature(
-      signature = "(Lgr;IIIIIIB)V",
-      garbageValue = "46"
-   )
-   @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) {
-         Tiles.Tiles_renderFlags[var1][var2][var3] = 0;
-
-         while(true) {
-            var7 = var0.readUnsignedByte();
-            if(var7 == 0) {
-               if(var1 == 0) {
-                  int[] var8 = Tiles.Tiles_heights[0][var2];
-                  int var11 = var2 + var4 + 932731;
-                  int var12 = var3 + var5 + 556238;
-                  int var13 = Script.method2204(var11 + 45365, var12 + 91923, 4) - 128 + (Script.method2204(10294 + var11, 37821 + var12, 2) - 128 >> 1) + (Script.method2204(var11, var12, 1) - 128 >> 2);
-                  var13 = (int)((double)var13 * 0.3D) + 35;
-                  if(var13 < 10) {
-                     var13 = 10;
-                  } else if(var13 > 60) {
-                     var13 = 60;
-                  }
-
-                  var8[var3] = -var13 * 8;
-               } else {
-                  Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - 240;
-               }
-               break;
-            }
-
-            if(var7 == 1) {
-               int var14 = var0.readUnsignedByte();
-               if(var14 == 1) {
-                  var14 = 0;
-               }
-
-               if(var1 == 0) {
-                  Tiles.Tiles_heights[0][var2][var3] = -var14 * 8;
-               } else {
-                  Tiles.Tiles_heights[var1][var2][var3] = Tiles.Tiles_heights[var1 - 1][var2][var3] - var14 * 8;
-               }
-               break;
-            }
-
-            if(var7 <= 49) {
-               Fonts.__kz_o[var1][var2][var3] = var0.readByte();
-               class32.__ay_u[var1][var2][var3] = (byte)((var7 - 2) / 4);
-               class307.__kc_g[var1][var2][var3] = (byte)(var7 - 2 + var6 & 3);
-            } else if(var7 <= 81) {
-               Tiles.Tiles_renderFlags[var1][var2][var3] = (byte)(var7 - 49);
-            } else {
-               Tiles.__bq_w[var1][var2][var3] = (byte)(var7 - 81);
-            }
-         }
-      } else {
-         while(true) {
-            var7 = var0.readUnsignedByte();
-            if(var7 == 0) {
-               break;
-            }
-
-            if(var7 == 1) {
-               var0.readUnsignedByte();
-               break;
-            }
-
-            if(var7 <= 49) {
-               var0.readUnsignedByte();
-            }
-         }
-      }
-
-   }
-
-   @ObfuscatedName("an")
-   @ObfuscatedSignature(
-      signature = "(ILhu;ZI)V",
-      garbageValue = "466862614"
-   )
-   static void method96(int var0, TileLocation var1, boolean var2) {
-      WorldMapArea var3 = BufferedFile.worldMap().getMapArea(var0);
-      int var4 = Canvas.localPlayer.plane;
-      int var5 = (Canvas.localPlayer.x >> 7) + class50.baseX;
-      int var6 = (Canvas.localPlayer.y >> 7) + GraphicsObject.baseY;
-      TileLocation var7 = new TileLocation(var4, var5, var6);
-      BufferedFile.worldMap().__h_526(var3, var7, var1, var2);
-   }
-
-   @ObfuscatedName("ik")
-   @ObfuscatedSignature(
-      signature = "(Lbr;IIII)V",
-      garbageValue = "835715563"
-   )
-   @Export("addPlayerToMenu")
-   static final void addPlayerToMenu(Player var0, int var1, int var2, int var3) {
-      if(Canvas.localPlayer != var0) {
-         if(Client.menuOptionsCount < 400) {
-            String var4;
-            int var7;
-            if(var0.skillLevel == 0) {
-               String var5 = var0.actions[0] + var0.username + var0.actions[1];
-               var7 = var0.combatLevel;
-               int var8 = Canvas.localPlayer.combatLevel;
-               int var9 = var8 - var7;
-               String var6;
-               if(var9 < -9) {
-                  var6 = BufferedFile.colorStartTag(16711680);
-               } else if(var9 < -6) {
-                  var6 = BufferedFile.colorStartTag(16723968);
-               } else if(var9 < -3) {
-                  var6 = BufferedFile.colorStartTag(16740352);
-               } else if(var9 < 0) {
-                  var6 = BufferedFile.colorStartTag(16756736);
-               } else if(var9 > 9) {
-                  var6 = BufferedFile.colorStartTag(65280);
-               } else if(var9 > 6) {
-                  var6 = BufferedFile.colorStartTag(4259584);
-               } else if(var9 > 3) {
-                  var6 = BufferedFile.colorStartTag(8453888);
-               } else if(var9 > 0) {
-                  var6 = BufferedFile.colorStartTag(12648192);
-               } else {
-                  var6 = BufferedFile.colorStartTag(16776960);
-               }
-
-               var4 = var5 + var6 + " " + " (" + "level-" + var0.combatLevel + ")" + var0.actions[2];
-            } else {
-               var4 = var0.actions[0] + var0.username + var0.actions[1] + " " + " (" + "skill-" + var0.skillLevel + ")" + var0.actions[2];
-            }
-
-            int var10;
-            if(Client.isItemSelected == 1) {
-               Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + BufferedFile.colorStartTag(16777215) + var4, 14, var1, var2, var3);
-            } else if(Client.isSpellSelected) {
-               if((FloorDecoration.selectedSpellFlags & 8) == 8) {
-                  Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + BufferedFile.colorStartTag(16777215) + var4, 15, var1, var2, var3);
-               }
-            } else {
-               for(var10 = 7; var10 >= 0; --var10) {
-                  if(Client.playerMenuActions[var10] != null) {
-                     short var11 = 0;
-                     if(Client.playerMenuActions[var10].equalsIgnoreCase("Attack")) {
-                        if(AttackOption.AttackOption_hidden == Client.playerAttackOption) {
-                           continue;
-                        }
-
-                        if(AttackOption.AttackOption_alwaysRightClick == Client.playerAttackOption || AttackOption.AttackOption_dependsOnCombatLevels == Client.playerAttackOption && var0.combatLevel > Canvas.localPlayer.combatLevel) {
-                           var11 = 2000;
-                        }
-
-                        if(Canvas.localPlayer.team != 0 && var0.team != 0) {
-                           if(var0.team == Canvas.localPlayer.team) {
-                              var11 = 2000;
-                           } else {
-                              var11 = 0;
-                           }
-                        }
-                     } else if(Client.playerOptionsPriorities[var10]) {
-                        var11 = 2000;
-                     }
-
-                     boolean var12 = false;
-                     var7 = Client.playerMenuOpcodes[var10] + var11;
-                     Tiles.insertMenuItemNoShift(Client.playerMenuActions[var10], BufferedFile.colorStartTag(16777215) + var4, var7, var1, var2, var3);
-                  }
-               }
-            }
-
-            for(var10 = 0; var10 < Client.menuOptionsCount; ++var10) {
-               if(Client.menuOpcodes[var10] == 23) {
-                  Client.menuTargetNames[var10] = BufferedFile.colorStartTag(16777215) + var4;
-                  break;
-               }
-            }
-
-         }
-      }
-   }
-}
diff --git a/runescape-client/src/main/java/TriBool.java b/runescape-client/src/main/java/TriBool.java
index dd0f2233b5..9202703d44 100644
--- a/runescape-client/src/main/java/TriBool.java
+++ b/runescape-client/src/main/java/TriBool.java
@@ -31,21 +31,22 @@ public class TriBool {
    @Export("urlRequester")
    static UrlRequester urlRequester;
 
-   static {
-      TriBool_unknown = new TriBool();
-      TriBool_true = new TriBool();
-      TriBool_false = new TriBool();
-   }
-
    @ObfuscatedName("go")
    @ObfuscatedSignature(
       signature = "(I)V",
       garbageValue = "-1009406649"
    )
-   static void method5560() {
-      if(Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) {
+   @Export("addTargetPlayerToScene")
+   static void addTargetPlayerToScene() {
+      if (Client.combatTargetPlayerIndex >= 0 && Client.players[Client.combatTargetPlayerIndex] != null) {
          WorldMapCacheName.addPlayerToScene(Client.players[Client.combatTargetPlayerIndex], false);
       }
 
    }
+
+   static {
+      TriBool_unknown = new TriBool();
+      TriBool_true = new TriBool();
+      TriBool_false = new TriBool();
+   }
 }
diff --git a/runescape-client/src/main/java/UrlRequest.java b/runescape-client/src/main/java/UrlRequest.java
index c911d6c9be..838bd46cd2 100644
--- a/runescape-client/src/main/java/UrlRequest.java
+++ b/runescape-client/src/main/java/UrlRequest.java
@@ -52,7 +52,8 @@ public class UrlRequest {
       signature = "(CI)Z",
       garbageValue = "-476632347"
    )
-   public static boolean method3271(char var0) {
+   @Export("isCharAlphabetic")
+   public static boolean isCharAlphabetic(char var0) {
       return var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z';
    }
 }
diff --git a/runescape-client/src/main/java/UrlRequester.java b/runescape-client/src/main/java/UrlRequester.java
index f34eb61bc9..4d4eca1bb3 100644
--- a/runescape-client/src/main/java/UrlRequester.java
+++ b/runescape-client/src/main/java/UrlRequester.java
@@ -18,12 +18,12 @@ public class UrlRequester implements Runnable {
    @ObfuscatedGetter(
       intValue = -883931753
    )
-   static int __eo_u;
+   static int field929;
    @ObfuscatedName("ak")
    @ObfuscatedSignature(
       signature = "Lla;"
    )
-   static Bounds __eo_ak;
+   static Bounds field930;
    @ObfuscatedName("m")
    @Export("thread")
    final Thread thread;
@@ -47,8 +47,8 @@ public class UrlRequester implements Runnable {
       garbageValue = "1097505066"
    )
    @Export("request")
-   public UrlRequest request(URL var1) {
-      UrlRequest var2 = new UrlRequest(var1);
+   public UrlRequest request(URL url) {
+      UrlRequest var2 = new UrlRequest(url);
       synchronized(this) {
          this.requests.add(var2);
          this.notify();
@@ -72,24 +72,20 @@ public class UrlRequester implements Runnable {
 
          this.thread.join();
       } catch (InterruptedException var4) {
-         ;
       }
 
    }
 
-   @Export("run")
-   @ObfuscatedName("run")
    public void run() {
-      while(!this.isClosed) {
+      while (!this.isClosed) {
          try {
             UrlRequest var1;
             synchronized(this) {
                var1 = (UrlRequest)this.requests.poll();
-               if(var1 == null) {
+               if (var1 == null) {
                   try {
                      this.wait();
-                  } catch (InterruptedException var13) {
-                     ;
+                  } catch (InterruptedException var12) {
                   }
                   continue;
                }
@@ -104,29 +100,29 @@ public class UrlRequester implements Runnable {
                var3.setReadTimeout(5000);
                var3.setUseCaches(false);
                var3.setRequestProperty("Connection", "close");
-               int var7 = var3.getContentLength();
-               if(var7 >= 0) {
-                  byte[] var5 = new byte[var7];
+               int var4 = var3.getContentLength();
+               if (var4 >= 0) {
+                  byte[] var5 = new byte[var4];
                   var2 = new DataInputStream(var3.getInputStream());
                   var2.readFully(var5);
                   var1.response0 = var5;
                }
 
                var1.isDone0 = true;
-            } catch (IOException var14) {
+            } catch (IOException var13) {
                var1.isDone0 = true;
             } finally {
-               if(var2 != null) {
+               if (var2 != null) {
                   var2.close();
                }
 
-               if(var3 != null && var3 instanceof HttpURLConnection) {
+               if (var3 != null && var3 instanceof HttpURLConnection) {
                   ((HttpURLConnection)var3).disconnect();
                }
 
             }
-         } catch (Exception var17) {
-            NpcDefinition.sendStackTrace((String)null, var17);
+         } catch (Exception var16) {
+            NPCDefinition.sendStackTrace((String)null, var16);
          }
       }
 
@@ -146,17 +142,17 @@ public class UrlRequester implements Runnable {
       int[] var8 = Players.Players_indices;
 
       int var9;
-      for(var9 = 0; var9 < var7 + Client.npcCount; ++var9) {
+      for (var9 = 0; var9 < var7 + Client.npcCount; ++var9) {
          Object var10;
-         if(var9 < var7) {
+         if (var9 < var7) {
             var10 = Client.players[var8[var9]];
-            if(var8[var9] == Client.combatTargetPlayerIndex) {
+            if (var8[var9] == Client.combatTargetPlayerIndex) {
                var4 = true;
                var5 = var9;
                continue;
             }
 
-            if(var10 == Canvas.localPlayer) {
+            if (var10 == Canvas.localPlayer) {
                var6 = var9;
                continue;
             }
@@ -167,26 +163,26 @@ public class UrlRequester implements Runnable {
          class39.drawActor2d((Actor)var10, var9, var0, var1, var2, var3);
       }
 
-      if(Client.renderSelf && var6 != -1) {
+      if (Client.renderSelf && var6 != -1) {
          class39.drawActor2d(Canvas.localPlayer, var6, var0, var1, var2, var3);
       }
 
-      if(var4) {
+      if (var4) {
          class39.drawActor2d(Client.players[Client.combatTargetPlayerIndex], var5, var0, var1, var2, var3);
       }
 
-      for(var9 = 0; var9 < Client.overheadTextCount; ++var9) {
+      for (var9 = 0; var9 < Client.overheadTextCount; ++var9) {
          int var19 = Client.overheadTextXs[var9];
          int var11 = Client.overheadTextYs[var9];
          int var12 = Client.overheadTextXOffsets[var9];
          int var13 = Client.overheadTextAscents[var9];
          boolean var14 = true;
 
-         while(var14) {
+         while (var14) {
             var14 = false;
 
-            for(int var15 = 0; var15 < var9; ++var15) {
-               if(var11 + 2 > Client.overheadTextYs[var15] - Client.overheadTextAscents[var15] && var11 - var13 < Client.overheadTextYs[var15] + 2 && var19 - var12 < Client.overheadTextXOffsets[var15] + Client.overheadTextXs[var15] && var19 + var12 > Client.overheadTextXs[var15] - Client.overheadTextXOffsets[var15] && Client.overheadTextYs[var15] - Client.overheadTextAscents[var15] < var11) {
+            for (int var15 = 0; var15 < var9; ++var15) {
+               if (var11 + 2 > Client.overheadTextYs[var15] - Client.overheadTextAscents[var15] && var11 - var13 < Client.overheadTextYs[var15] + 2 && var19 - var12 < Client.overheadTextXOffsets[var15] + Client.overheadTextXs[var15] && var19 + var12 > Client.overheadTextXs[var15] - Client.overheadTextXOffsets[var15] && Client.overheadTextYs[var15] - Client.overheadTextAscents[var15] < var11) {
                   var11 = Client.overheadTextYs[var15] - Client.overheadTextAscents[var15];
                   var14 = true;
                }
@@ -196,87 +192,87 @@ public class UrlRequester implements Runnable {
          Client.viewportTempX = Client.overheadTextXs[var9];
          Client.viewportTempY = Client.overheadTextYs[var9] = var11;
          String var20 = Client.overheadText[var9];
-         if(Client.chatEffects == 0) {
+         if (Client.chatEffects == 0) {
             int var16 = 16776960;
-            if(Client.overheadTextColors[var9] < 6) {
-               var16 = Client.__client_pv[Client.overheadTextColors[var9]];
+            if (Client.overheadTextColors[var9] < 6) {
+               var16 = Client.field160[Client.overheadTextColors[var9]];
             }
 
-            if(Client.overheadTextColors[var9] == 6) {
-               var16 = Client.viewportDrawCount % 20 < 10?16711680:16776960;
+            if (Client.overheadTextColors[var9] == 6) {
+               var16 = Client.viewportDrawCount % 20 < 10 ? 16711680 : 16776960;
             }
 
-            if(Client.overheadTextColors[var9] == 7) {
-               var16 = Client.viewportDrawCount % 20 < 10?255:'\uffff';
+            if (Client.overheadTextColors[var9] == 7) {
+               var16 = Client.viewportDrawCount % 20 < 10 ? 255 : '\uffff';
             }
 
-            if(Client.overheadTextColors[var9] == 8) {
-               var16 = Client.viewportDrawCount % 20 < 10?'뀀':8454016;
+            if (Client.overheadTextColors[var9] == 8) {
+               var16 = Client.viewportDrawCount % 20 < 10 ? '뀀' : 8454016;
             }
 
             int var17;
-            if(Client.overheadTextColors[var9] == 9) {
+            if (Client.overheadTextColors[var9] == 9) {
                var17 = 150 - Client.overheadTextCyclesRemaining[var9];
-               if(var17 < 50) {
+               if (var17 < 50) {
                   var16 = var17 * 1280 + 16711680;
-               } else if(var17 < 100) {
+               } else if (var17 < 100) {
                   var16 = 16776960 - (var17 - 50) * 327680;
-               } else if(var17 < 150) {
+               } else if (var17 < 150) {
                   var16 = (var17 - 100) * 5 + 65280;
                }
             }
 
-            if(Client.overheadTextColors[var9] == 10) {
+            if (Client.overheadTextColors[var9] == 10) {
                var17 = 150 - Client.overheadTextCyclesRemaining[var9];
-               if(var17 < 50) {
+               if (var17 < 50) {
                   var16 = var17 * 5 + 16711680;
-               } else if(var17 < 100) {
+               } else if (var17 < 100) {
                   var16 = 16711935 - (var17 - 50) * 327680;
-               } else if(var17 < 150) {
+               } else if (var17 < 150) {
                   var16 = (var17 - 100) * 327680 + 255 - (var17 - 100) * 5;
                }
             }
 
-            if(Client.overheadTextColors[var9] == 11) {
+            if (Client.overheadTextColors[var9] == 11) {
                var17 = 150 - Client.overheadTextCyclesRemaining[var9];
-               if(var17 < 50) {
+               if (var17 < 50) {
                   var16 = 16777215 - var17 * 327685;
-               } else if(var17 < 100) {
+               } else if (var17 < 100) {
                   var16 = (var17 - 50) * 327685 + 65280;
-               } else if(var17 < 150) {
+               } else if (var17 < 150) {
                   var16 = 16777215 - (var17 - 100) * 327680;
                }
             }
 
-            if(Client.overheadTextEffects[var9] == 0) {
+            if (Client.overheadTextEffects[var9] == 0) {
                class2.fontBold12.drawCentered(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0);
             }
 
-            if(Client.overheadTextEffects[var9] == 1) {
+            if (Client.overheadTextEffects[var9] == 1) {
                class2.fontBold12.drawCenteredWave(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount);
             }
 
-            if(Client.overheadTextEffects[var9] == 2) {
+            if (Client.overheadTextEffects[var9] == 2) {
                class2.fontBold12.drawCenteredWave2(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount);
             }
 
-            if(Client.overheadTextEffects[var9] == 3) {
+            if (Client.overheadTextEffects[var9] == 3) {
                class2.fontBold12.drawCenteredShake(var20, var0 + Client.viewportTempX, Client.viewportTempY + var1, var16, 0, Client.viewportDrawCount, 150 - Client.overheadTextCyclesRemaining[var9]);
             }
 
-            if(Client.overheadTextEffects[var9] == 4) {
+            if (Client.overheadTextEffects[var9] == 4) {
                var17 = (150 - Client.overheadTextCyclesRemaining[var9]) * (class2.fontBold12.stringWidth(var20) + 100) / 150;
                Rasterizer2D.Rasterizer2D_expandClip(var0 + Client.viewportTempX - 50, var1, var0 + Client.viewportTempX + 50, var3 + var1);
                class2.fontBold12.draw(var20, var0 + Client.viewportTempX + 50 - var17, Client.viewportTempY + var1, var16, 0);
                Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1);
             }
 
-            if(Client.overheadTextEffects[var9] == 5) {
+            if (Client.overheadTextEffects[var9] == 5) {
                var17 = 150 - Client.overheadTextCyclesRemaining[var9];
                int var18 = 0;
-               if(var17 < 25) {
+               if (var17 < 25) {
                   var18 = var17 - 25;
-               } else if(var17 > 125) {
+               } else if (var17 > 125) {
                   var18 = var17 - 125;
                }
 
diff --git a/runescape-client/src/main/java/User.java b/runescape-client/src/main/java/User.java
index 4a1913ceb9..9ce76ff9e5 100644
--- a/runescape-client/src/main/java/User.java
+++ b/runescape-client/src/main/java/User.java
@@ -10,8 +10,8 @@ public class User implements Comparable {
    @ObfuscatedSignature(
       signature = "Lkp;"
    )
-   @Export("username0")
-   Username username0;
+   @Export("username")
+   Username username;
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "Lkp;"
@@ -24,9 +24,9 @@ public class User implements Comparable {
       signature = "(I)Lkp;",
       garbageValue = "1922393088"
    )
-   @Export("username")
-   public Username username() {
-      return this.username0;
+   @Export("getUsername")
+   public Username getUsername() {
+      return this.username;
    }
 
    @ObfuscatedName("v")
@@ -34,9 +34,9 @@ public class User implements Comparable {
       signature = "(B)Ljava/lang/String;",
       garbageValue = "-60"
    )
-   @Export("name")
-   public String name() {
-      return this.username0 == null?"":this.username0.getName();
+   @Export("getName")
+   public String getName() {
+      return this.username == null ? "" : this.username.getName();
    }
 
    @ObfuscatedName("ag")
@@ -44,9 +44,9 @@ public class User implements Comparable {
       signature = "(I)Ljava/lang/String;",
       garbageValue = "1204003359"
    )
-   @Export("previousName")
-   public String previousName() {
-      return this.previousUsername == null?"":this.previousUsername.getName();
+   @Export("getPreviousName")
+   public String getPreviousName() {
+      return this.previousUsername == null ? "" : this.previousUsername.getName();
    }
 
    @ObfuscatedName("aq")
@@ -55,12 +55,12 @@ public class User implements Comparable {
       garbageValue = "1156866388"
    )
    @Export("set")
-   void set(Username var1, Username var2) {
-      if(var1 == null) {
+   void set(Username username, Username previousUsername) {
+      if (username == null) {
          throw new NullPointerException();
       } else {
-         this.username0 = var1;
-         this.previousUsername = var2;
+         this.username = username;
+         this.previousUsername = previousUsername;
       }
    }
 
@@ -69,14 +69,12 @@ public class User implements Comparable {
       signature = "(Ljs;I)I",
       garbageValue = "1627362569"
    )
-   @Export("compareTo0")
-   public int compareTo0(User var1) {
-      return this.username0.compareTo0(var1.username0);
+   @Export("compareToUser")
+   public int compareToUser(User other) {
+      return this.username.compareToTyped(other.username);
    }
 
-   @Export("compareTo")
-   @ObfuscatedName("compareTo")
    public int compareTo(Object var1) {
-      return this.compareTo0((User)var1);
+      return this.compareToUser((User)var1);
    }
 }
diff --git a/runescape-client/src/main/java/UserComparator1.java b/runescape-client/src/main/java/UserComparator1.java
index a289a2a733..39effa29a3 100644
--- a/runescape-client/src/main/java/UserComparator1.java
+++ b/runescape-client/src/main/java/UserComparator1.java
@@ -8,10 +8,11 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("UserComparator1")
 public class UserComparator1 implements Comparator {
    @ObfuscatedName("m")
-   final boolean __m;
+   @Export("reversed")
+   final boolean reversed;
 
    public UserComparator1(boolean var1) {
-      this.__m = var1;
+      this.reversed = var1;
    }
 
    @ObfuscatedName("m")
@@ -19,18 +20,16 @@ public class UserComparator1 implements Comparator {
       signature = "(Ljs;Ljs;B)I",
       garbageValue = "68"
    )
-   int __m_476(User var1, User var2) {
-      return this.__m?var1.compareTo0(var2):var2.compareTo0(var1);
+   @Export("compareUser")
+   int compareUser(User var1, User var2) {
+      return this.reversed ? var1.compareToUser(var2) : var2.compareToUser(var1);
    }
 
-   @Export("compare")
-   @ObfuscatedName("compare")
    public int compare(Object var1, Object var2) {
-      return this.__m_476((User)var1, (User)var2);
+      return this.compareUser((User)var1, (User)var2);
    }
 
-   @ObfuscatedName("equals")
-   public boolean __equals_478(Object var1) {
+   public boolean equals(Object var1) {
       return super.equals(var1);
    }
 }
diff --git a/runescape-client/src/main/java/UserComparator10.java b/runescape-client/src/main/java/UserComparator10.java
index 693298d8ab..d6aee1b8e3 100644
--- a/runescape-client/src/main/java/UserComparator10.java
+++ b/runescape-client/src/main/java/UserComparator10.java
@@ -8,10 +8,11 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("UserComparator10")
 public class UserComparator10 extends AbstractUserComparator {
    @ObfuscatedName("m")
-   final boolean __m;
+   @Export("reversed")
+   final boolean reversed;
 
    public UserComparator10(boolean var1) {
-      this.__m = var1;
+      this.reversed = var1;
    }
 
    @ObfuscatedName("m")
@@ -19,14 +20,13 @@ public class UserComparator10 extends AbstractUserComparator {
       signature = "(Lke;Lke;B)I",
       garbageValue = "-15"
    )
-   int __m_268(Buddy var1, Buddy var2) {
-      return Client.worldId == var1.world0 && var2.world0 == Client.worldId?(this.__m?var1.int2 - var2.int2:var2.int2 - var1.int2):this.__x_461(var1, var2);
+   @Export("compareBuddy")
+   int compareBuddy(Buddy var1, Buddy var2) {
+      return Client.worldId == var1.world && var2.world == Client.worldId ? (this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2) : this.compareUser(var1, var2);
    }
 
-   @Export("compare")
-   @ObfuscatedName("compare")
    public int compare(Object var1, Object var2) {
-      return this.__m_268((Buddy)var1, (Buddy)var2);
+      return this.compareBuddy((Buddy)var1, (Buddy)var2);
    }
 
    @ObfuscatedName("hn")
@@ -36,20 +36,20 @@ public class UserComparator10 extends AbstractUserComparator {
    )
    static final void method3352(boolean var0) {
       class13.playPcmPlayers();
-      ++Client.packetWriter.__d;
-      if(Client.packetWriter.__d >= 50 || var0) {
-         Client.packetWriter.__d = 0;
-         if(!Client.__client_fh && Client.packetWriter.getSocket() != null) {
-            PacketBufferNode var1 = Interpreter.method1915(ClientPacket.__gs_c, Client.packetWriter.isaacCipher);
-            Client.packetWriter.__q_167(var1);
+      ++Client.packetWriter.field675;
+      if (Client.packetWriter.field675 >= 50 || var0) {
+         Client.packetWriter.field675 = 0;
+         if (!Client.field176 && Client.packetWriter.getSocket() != null) {
+            PacketBufferNode var1 = Interpreter.method1915(ClientPacket.field244, Client.packetWriter.isaacCipher);
+            Client.packetWriter.method241(var1);
 
             try {
-               Client.packetWriter.__f_166();
+               Client.packetWriter.method240();
             } catch (IOException var3) {
-               Client.__client_fh = true;
+               Client.field176 = true;
             }
          }
-
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/UserComparator2.java b/runescape-client/src/main/java/UserComparator2.java
index cf58e0cd5c..a7b3995ba0 100644
--- a/runescape-client/src/main/java/UserComparator2.java
+++ b/runescape-client/src/main/java/UserComparator2.java
@@ -8,10 +8,11 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("UserComparator2")
 public class UserComparator2 implements Comparator {
    @ObfuscatedName("m")
-   final boolean __m;
+   @Export("reversed")
+   final boolean reversed;
 
    public UserComparator2(boolean var1) {
-      this.__m = var1;
+      this.reversed = var1;
    }
 
    @ObfuscatedName("m")
@@ -19,18 +20,16 @@ public class UserComparator2 implements Comparator {
       signature = "(Ljs;Ljs;I)I",
       garbageValue = "-2069683911"
    )
-   int __m_479(User var1, User var2) {
-      return this.__m?var1.username().compareTo0(var2.username()):var2.username().compareTo0(var1.username());
+   @Export("compareTyped")
+   int compareTyped(User var1, User var2) {
+      return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername());
    }
 
-   @ObfuscatedName("equals")
-   public boolean __equals_481(Object var1) {
+   public boolean equals(Object var1) {
       return super.equals(var1);
    }
 
-   @Export("compare")
-   @ObfuscatedName("compare")
    public int compare(Object var1, Object var2) {
-      return this.__m_479((User)var1, (User)var2);
+      return this.compareTyped((User)var1, (User)var2);
    }
 }
diff --git a/runescape-client/src/main/java/UserComparator3.java b/runescape-client/src/main/java/UserComparator3.java
index f6e38ee6bf..469ffc770c 100644
--- a/runescape-client/src/main/java/UserComparator3.java
+++ b/runescape-client/src/main/java/UserComparator3.java
@@ -10,8 +10,8 @@ public class UserComparator3 extends AbstractUserComparator {
    @ObfuscatedSignature(
       signature = "Lit;"
    )
-   @Export("indexCache6")
-   static IndexCache indexCache6;
+   @Export("archive6")
+   static Archive archive6;
    @ObfuscatedName("fl")
    @ObfuscatedSignature(
       signature = "Lfm;"
@@ -19,10 +19,11 @@ public class UserComparator3 extends AbstractUserComparator {
    @Export("socketTask")
    static Task socketTask;
    @ObfuscatedName("m")
-   final boolean __m;
+   @Export("reversed")
+   final boolean reversed;
 
    public UserComparator3(boolean var1) {
-      this.__m = var1;
+      this.reversed = var1;
    }
 
    @ObfuscatedName("m")
@@ -30,14 +31,13 @@ public class UserComparator3 extends AbstractUserComparator {
       signature = "(Lke;Lke;I)I",
       garbageValue = "-1157645406"
    )
-   int __m_274(Buddy var1, Buddy var2) {
-      return var2.world0 != var1.world0?(this.__m?var1.world0 - var2.world0:var2.world0 - var1.world0):this.__x_461(var1, var2);
+   @Export("compareBuddy")
+   int compareBuddy(Buddy var1, Buddy var2) {
+      return var2.world != var1.world ? (this.reversed ? var1.world - var2.world : var2.world - var1.world) : this.compareUser(var1, var2);
    }
 
-   @Export("compare")
-   @ObfuscatedName("compare")
    public int compare(Object var1, Object var2) {
-      return this.__m_274((Buddy)var1, (Buddy)var2);
+      return this.compareBuddy((Buddy)var1, (Buddy)var2);
    }
 
    @ObfuscatedName("o")
diff --git a/runescape-client/src/main/java/UserComparator4.java b/runescape-client/src/main/java/UserComparator4.java
index b6b05a509f..f87a66a02a 100644
--- a/runescape-client/src/main/java/UserComparator4.java
+++ b/runescape-client/src/main/java/UserComparator4.java
@@ -4,6 +4,7 @@ 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("ev")
 @Implements("UserComparator4")
@@ -15,10 +16,11 @@ public class UserComparator4 implements Comparator {
    @Export("WorldMapElement_count")
    public static int WorldMapElement_count;
    @ObfuscatedName("m")
-   final boolean __m;
+   @Export("reversed")
+   final boolean reversed;
 
    public UserComparator4(boolean var1) {
-      this.__m = var1;
+      this.reversed = var1;
    }
 
    @ObfuscatedName("m")
@@ -26,19 +28,17 @@ public class UserComparator4 implements Comparator {
       signature = "(Lke;Lke;I)I",
       garbageValue = "950234237"
    )
-   int __m_261(Buddy var1, Buddy var2) {
-      return this.__m?var1.int2 - var2.int2:var2.int2 - var1.int2;
+   @Export("compareBuddy")
+   int compareBuddy(Buddy var1, Buddy var2) {
+      return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2;
    }
 
-   @ObfuscatedName("equals")
-   public boolean __equals_263(Object var1) {
+   public boolean equals(Object var1) {
       return super.equals(var1);
    }
 
-   @Export("compare")
-   @ObfuscatedName("compare")
    public int compare(Object var1, Object var2) {
-      return this.__m_261((Buddy)var1, (Buddy)var2);
+      return this.compareBuddy((Buddy)var1, (Buddy)var2);
    }
 
    @ObfuscatedName("f")
@@ -56,23 +56,23 @@ public class UserComparator4 implements Comparator {
       garbageValue = "-2050984400"
    )
    static int method3335(int var0, Script var1, boolean var2) {
-      if(var0 == 5306) {
-         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = SpotAnimationDefinition.method4822();
+      if (var0 == ScriptOpcodes.GETWINDOWMODE) {
+         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = SpotAnimationDefinition.getWindowedMode();
          return 1;
       } else {
          int var3;
-         if(var0 == 5307) {
+         if (var0 == ScriptOpcodes.SETWINDOWMODE) {
             var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-            if(var3 == 1 || var3 == 2) {
-               GroundItem.method2095(var3);
+            if (var3 == 1 || var3 == 2) {
+               GroundItem.setWindowedMode(var3);
             }
 
             return 1;
-         } else if(var0 == 5308) {
+         } else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) {
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.windowMode;
             return 1;
-         } else if(var0 != 5309) {
-            if(var0 == 5310) {
+         } else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) {
+            if (var0 == 5310) {
                --RouteStrategy.Interpreter_intStackSize;
                return 1;
             } else {
@@ -80,9 +80,9 @@ public class UserComparator4 implements Comparator {
             }
          } else {
             var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-            if(var3 == 1 || var3 == 2) {
+            if (var3 == 1 || var3 == 2) {
                ReflectionCheck.clientPreferences.windowMode = var3;
-               WorldMapSection0.savePreferences();
+               WorldMapSection3.savePreferences();
             }
 
             return 1;
diff --git a/runescape-client/src/main/java/UserComparator5.java b/runescape-client/src/main/java/UserComparator5.java
index 0ee89e85f2..d6631df263 100644
--- a/runescape-client/src/main/java/UserComparator5.java
+++ b/runescape-client/src/main/java/UserComparator5.java
@@ -7,10 +7,11 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("UserComparator5")
 public class UserComparator5 extends AbstractUserComparator {
    @ObfuscatedName("m")
-   final boolean __m;
+   @Export("reversed")
+   final boolean reversed;
 
    public UserComparator5(boolean var1) {
-      this.__m = var1;
+      this.reversed = var1;
    }
 
    @ObfuscatedName("m")
@@ -18,22 +19,21 @@ public class UserComparator5 extends AbstractUserComparator {
       signature = "(Lke;Lke;B)I",
       garbageValue = "-22"
    )
-   int __m_272(Buddy var1, Buddy var2) {
-      if(var1.world0 != 0) {
-         if(var2.world0 == 0) {
-            return this.__m?-1:1;
+   @Export("compareBuddy")
+   int compareBuddy(Buddy var1, Buddy var2) {
+      if (var1.world != 0) {
+         if (var2.world == 0) {
+            return this.reversed ? -1 : 1;
          }
-      } else if(var2.world0 != 0) {
-         return this.__m?1:-1;
+      } else if (var2.world != 0) {
+         return this.reversed ? 1 : -1;
       }
 
-      return this.__x_461(var1, var2);
+      return this.compareUser(var1, var2);
    }
 
-   @Export("compare")
-   @ObfuscatedName("compare")
    public int compare(Object var1, Object var2) {
-      return this.__m_272((Buddy)var1, (Buddy)var2);
+      return this.compareBuddy((Buddy)var1, (Buddy)var2);
    }
 
    @ObfuscatedName("jk")
@@ -44,8 +44,8 @@ public class UserComparator5 extends AbstractUserComparator {
    @Export("worldToMinimap")
    static final void worldToMinimap(int var0, int var1, int var2, int var3, Sprite var4, SpriteMask var5) {
       int var6 = var3 * var3 + var2 * var2;
-      if(var6 > 4225 && var6 < 90000) {
-         int var7 = Client.minimapOrientation & 2047;
+      if (var6 > 4225 && var6 < 90000) {
+         int var7 = Client.camAngleY & 2047;
          int var8 = Rasterizer3D.Rasterizer3D_sine[var7];
          int var9 = Rasterizer3D.Rasterizer3D_cosine[var7];
          int var10 = var3 * var8 + var9 * var2 >> 16;
@@ -55,7 +55,7 @@ public class UserComparator5 extends AbstractUserComparator {
          int var15 = (int)(Math.sin(var12) * (double)var14);
          int var16 = (int)(Math.cos(var12) * (double)var14);
          byte var17 = 20;
-         FaceNormal.__el_gm.__ah_514(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256);
+         FaceNormal.field345.method316(var15 + (var0 + var5.width / 2 - var17 / 2), var5.height / 2 + var1 - var17 / 2 - var16 - 10, var17, var17, 15, 15, var12, 256);
       } else {
          NetFileRequest.method4554(var0, var1, var2, var3, var4, var5);
       }
diff --git a/runescape-client/src/main/java/UserComparator6.java b/runescape-client/src/main/java/UserComparator6.java
index 90761a877b..2ce3abcc8f 100644
--- a/runescape-client/src/main/java/UserComparator6.java
+++ b/runescape-client/src/main/java/UserComparator6.java
@@ -16,12 +16,13 @@ public class UserComparator6 extends AbstractUserComparator {
    @ObfuscatedSignature(
       signature = "Lho;"
    )
-   static Widget __fg_jh;
+   static Widget field937;
    @ObfuscatedName("m")
-   final boolean __m;
+   @Export("reversed")
+   final boolean reversed;
 
    public UserComparator6(boolean var1) {
-      this.__m = var1;
+      this.reversed = var1;
    }
 
    @ObfuscatedName("m")
@@ -29,14 +30,13 @@ public class UserComparator6 extends AbstractUserComparator {
       signature = "(Lke;Lke;I)I",
       garbageValue = "750521759"
    )
-   int __m_276(Buddy var1, Buddy var2) {
-      return var1.world0 != 0 && var2.world0 != 0?(this.__m?var1.username().compareTo0(var2.username()):var2.username().compareTo0(var1.username())):this.__x_461(var1, var2);
+   @Export("compareBuddy")
+   int compareBuddy(Buddy var1, Buddy var2) {
+      return var1.world != 0 && var2.world != 0 ? (this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername())) : this.compareUser(var1, var2);
    }
 
-   @Export("compare")
-   @ObfuscatedName("compare")
    public int compare(Object var1, Object var2) {
-      return this.__m_276((Buddy)var1, (Buddy)var2);
+      return this.compareBuddy((Buddy)var1, (Buddy)var2);
    }
 
    @ObfuscatedName("f")
@@ -45,23 +45,23 @@ public class UserComparator6 extends AbstractUserComparator {
       garbageValue = "-1968376475"
    )
    static final void method3390(int var0, int var1, int var2, int var3) {
-      for(int var4 = var1; var4 <= var3 + var1; ++var4) {
-         for(int var5 = var0; var5 <= var0 + var2; ++var5) {
-            if(var5 >= 0 && var5 < 104 && var4 >= 0 && var4 < 104) {
-               Tiles.__bq_l[0][var5][var4] = 127;
-               if(var0 == var5 && var5 > 0) {
+      for (int var4 = var1; var4 <= var3 + var1; ++var4) {
+         for (int var5 = var0; var5 <= var0 + var2; ++var5) {
+            if (var5 >= 0 && var5 < 104 && var4 >= 0 && var4 < 104) {
+               Tiles.field909[0][var5][var4] = 127;
+               if (var0 == var5 && var5 > 0) {
                   Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 - 1][var4];
                }
 
-               if(var5 == var0 + var2 && var5 < 103) {
+               if (var5 == var0 + var2 && var5 < 103) {
                   Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5 + 1][var4];
                }
 
-               if(var4 == var1 && var4 > 0) {
+               if (var4 == var1 && var4 > 0) {
                   Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 - 1];
                }
 
-               if(var3 + var1 == var4 && var4 < 103) {
+               if (var3 + var1 == var4 && var4 < 103) {
                   Tiles.Tiles_heights[0][var5][var4] = Tiles.Tiles_heights[0][var5][var4 + 1];
                }
             }
diff --git a/runescape-client/src/main/java/UserComparator7.java b/runescape-client/src/main/java/UserComparator7.java
index f5387fbc87..91e28b043d 100644
--- a/runescape-client/src/main/java/UserComparator7.java
+++ b/runescape-client/src/main/java/UserComparator7.java
@@ -10,10 +10,11 @@ import net.runelite.rs.Reflection;
 @Implements("UserComparator7")
 public class UserComparator7 extends AbstractUserComparator {
    @ObfuscatedName("m")
-   final boolean __m;
+   @Export("reversed")
+   final boolean reversed;
 
    public UserComparator7(boolean var1) {
-      this.__m = var1;
+      this.reversed = var1;
    }
 
    @ObfuscatedName("m")
@@ -21,14 +22,13 @@ public class UserComparator7 extends AbstractUserComparator {
       signature = "(Lke;Lke;I)I",
       garbageValue = "-9252550"
    )
-   int __m_270(Buddy var1, Buddy var2) {
-      return var1.world0 != 0 && var2.world0 != 0?(this.__m?var1.int2 - var2.int2:var2.int2 - var1.int2):this.__x_461(var1, var2);
+   @Export("compareBuddy")
+   int compareBuddy(Buddy var1, Buddy var2) {
+      return var1.world != 0 && var2.world != 0 ? (this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2) : this.compareUser(var1, var2);
    }
 
-   @Export("compare")
-   @ObfuscatedName("compare")
    public int compare(Object var1, Object var2) {
-      return this.__m_270((Buddy)var1, (Buddy)var2);
+      return this.compareBuddy((Buddy)var1, (Buddy)var2);
    }
 
    @ObfuscatedName("q")
@@ -47,65 +47,65 @@ public class UserComparator7 extends AbstractUserComparator {
       var2.methods = new Method[var2.size];
       var2.arguments = new byte[var2.size][][];
 
-      for(int var3 = 0; var3 < var2.size; ++var3) {
+      for (int var3 = 0; var3 < var2.size; ++var3) {
          try {
             int var4 = var0.readUnsignedByte();
             String var5;
             String var6;
             int var7;
-            if(var4 != 0 && var4 != 1 && var4 != 2) {
-               if(var4 == 3 || var4 == 4) {
+            if (var4 != 0 && var4 != 1 && var4 != 2) {
+               if (var4 == 3 || var4 == 4) {
                   var5 = var0.readStringCp1252NullTerminated();
                   var6 = var0.readStringCp1252NullTerminated();
                   var7 = var0.readUnsignedByte();
                   String[] var8 = new String[var7];
 
-                  for(int var9 = 0; var9 < var7; ++var9) {
+                  for (int var9 = 0; var9 < var7; ++var9) {
                      var8[var9] = var0.readStringCp1252NullTerminated();
                   }
 
-                  String var20 = var0.readStringCp1252NullTerminated();
+                  String var26 = var0.readStringCp1252NullTerminated();
                   byte[][] var10 = new byte[var7][];
-                  int var12;
-                  if(var4 == 3) {
-                     for(int var11 = 0; var11 < var7; ++var11) {
-                        var12 = var0.readInt();
-                        var10[var11] = new byte[var12];
-                        var0.__al_305(var10[var11], 0, var12);
+                  int var11;
+                  if (var4 == 3) {
+                     for (int var12 = 0; var12 < var7; ++var12) {
+                        var11 = var0.readInt();
+                        var10[var12] = new byte[var11];
+                        var0.readBytes(var10[var12], 0, var11);
                      }
                   }
 
                   var2.operations[var3] = var4;
-                  Class[] var21 = new Class[var7];
+                  Class[] var27 = new Class[var7];
 
-                  for(var12 = 0; var12 < var7; ++var12) {
-                     var21[var12] = VarcInt.loadClassFromDescriptor(var8[var12]);
+                  for (var11 = 0; var11 < var7; ++var11) {
+                     var27[var11] = VarcInt.loadClassFromDescriptor(var8[var11]);
                   }
 
-                  Class var22 = VarcInt.loadClassFromDescriptor(var20);
-                  if(VarcInt.loadClassFromDescriptor(var5).getClassLoader() == null) {
+                  Class var13 = VarcInt.loadClassFromDescriptor(var26);
+                  if (VarcInt.loadClassFromDescriptor(var5).getClassLoader() == null) {
                      throw new SecurityException();
                   }
 
-                  Method[] var13 = VarcInt.loadClassFromDescriptor(var5).getDeclaredMethods();
-                  Method[] var14 = var13;
+                  Method[] var14 = VarcInt.loadClassFromDescriptor(var5).getDeclaredMethods();
+                  Method[] var15 = var14;
 
-                  for(int var15 = 0; var15 < var14.length; ++var15) {
-                     Method var16 = var14[var15];
-                     if(Reflection.getMethodName(var16).equals(var6)) {
-                        Class[] var17 = Reflection.getParameterTypes(var16);
-                        if(var21.length == var17.length) {
-                           boolean var18 = true;
+                  for (int var16 = 0; var16 < var15.length; ++var16) {
+                     Method var17 = var15[var16];
+                     if (Reflection.getMethodName(var17).equals(var6)) {
+                        Class[] var18 = Reflection.getParameterTypes(var17);
+                        if (var27.length == var18.length) {
+                           boolean var19 = true;
 
-                           for(int var19 = 0; var19 < var21.length; ++var19) {
-                              if(var21[var19] != var17[var19]) {
-                                 var18 = false;
+                           for (int var20 = 0; var20 < var27.length; ++var20) {
+                              if (var27[var20] != var18[var20]) {
+                                 var19 = false;
                                  break;
                               }
                            }
 
-                           if(var18 && var22 == var16.getReturnType()) {
-                              var2.methods[var3] = var16;
+                           if (var19 && var13 == var17.getReturnType()) {
+                              var2.methods[var3] = var17;
                            }
                         }
                      }
@@ -117,27 +117,27 @@ public class UserComparator7 extends AbstractUserComparator {
                var5 = var0.readStringCp1252NullTerminated();
                var6 = var0.readStringCp1252NullTerminated();
                var7 = 0;
-               if(var4 == 1) {
+               if (var4 == 1) {
                   var7 = var0.readInt();
                }
 
                var2.operations[var3] = var4;
                var2.intReplaceValues[var3] = var7;
-               if(VarcInt.loadClassFromDescriptor(var5).getClassLoader() == null) {
+               if (VarcInt.loadClassFromDescriptor(var5).getClassLoader() == null) {
                   throw new SecurityException();
                }
 
                var2.fields[var3] = Reflection.findField(VarcInt.loadClassFromDescriptor(var5), var6);
             }
-         } catch (ClassNotFoundException var24) {
+         } catch (ClassNotFoundException var21) {
             var2.creationErrors[var3] = -1;
-         } catch (SecurityException var25) {
+         } catch (SecurityException var22) {
             var2.creationErrors[var3] = -2;
-         } catch (NullPointerException var26) {
+         } catch (NullPointerException var23) {
             var2.creationErrors[var3] = -3;
-         } catch (Exception var27) {
+         } catch (Exception var24) {
             var2.creationErrors[var3] = -4;
-         } catch (Throwable var28) {
+         } catch (Throwable var25) {
             var2.creationErrors[var3] = -5;
          }
       }
@@ -151,11 +151,11 @@ public class UserComparator7 extends AbstractUserComparator {
       garbageValue = "2084569794"
    )
    static final boolean method3364(int var0) {
-      if(var0 < 0) {
+      if (var0 < 0) {
          return false;
       } else {
          int var1 = Client.menuOpcodes[var0];
-         if(var1 >= 2000) {
+         if (var1 >= 2000) {
             var1 -= 2000;
          }
 
diff --git a/runescape-client/src/main/java/UserComparator8.java b/runescape-client/src/main/java/UserComparator8.java
index ae6288a967..f997c45574 100644
--- a/runescape-client/src/main/java/UserComparator8.java
+++ b/runescape-client/src/main/java/UserComparator8.java
@@ -7,10 +7,11 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("UserComparator8")
 public class UserComparator8 extends AbstractUserComparator {
    @ObfuscatedName("m")
-   final boolean __m;
+   @Export("reversed")
+   final boolean reversed;
 
    public UserComparator8(boolean var1) {
-      this.__m = var1;
+      this.reversed = var1;
    }
 
    @ObfuscatedName("m")
@@ -18,22 +19,21 @@ public class UserComparator8 extends AbstractUserComparator {
       signature = "(Lke;Lke;B)I",
       garbageValue = "0"
    )
-   int __m_266(Buddy var1, Buddy var2) {
-      if(Client.worldId == var1.world0) {
-         if(var2.world0 != Client.worldId) {
-            return this.__m?-1:1;
+   @Export("compareBuddy")
+   int compareBuddy(Buddy var1, Buddy var2) {
+      if (Client.worldId == var1.world) {
+         if (var2.world != Client.worldId) {
+            return this.reversed ? -1 : 1;
          }
-      } else if(var2.world0 == Client.worldId) {
-         return this.__m?1:-1;
+      } else if (var2.world == Client.worldId) {
+         return this.reversed ? 1 : -1;
       }
 
-      return this.__x_461(var1, var2);
+      return this.compareUser(var1, var2);
    }
 
-   @Export("compare")
-   @ObfuscatedName("compare")
    public int compare(Object var1, Object var2) {
-      return this.__m_266((Buddy)var1, (Buddy)var2);
+      return this.compareBuddy((Buddy)var1, (Buddy)var2);
    }
 
    @ObfuscatedName("ke")
@@ -42,7 +42,7 @@ public class UserComparator8 extends AbstractUserComparator {
       garbageValue = "1"
    )
    static final void method3349() {
-      Client.__client_nh = Client.cycleCntr;
-      VertexNormal.__dq_pe = true;
+      Client.field129 = Client.cycleCntr;
+      VertexNormal.field945 = true;
    }
 }
diff --git a/runescape-client/src/main/java/UserComparator9.java b/runescape-client/src/main/java/UserComparator9.java
index b44d9086e3..fedabeaa4c 100644
--- a/runescape-client/src/main/java/UserComparator9.java
+++ b/runescape-client/src/main/java/UserComparator9.java
@@ -8,10 +8,11 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("UserComparator9")
 public class UserComparator9 extends AbstractUserComparator {
    @ObfuscatedName("m")
-   final boolean __m;
+   @Export("reversed")
+   final boolean reversed;
 
    public UserComparator9(boolean var1) {
-      this.__m = var1;
+      this.reversed = var1;
    }
 
    @ObfuscatedName("m")
@@ -19,14 +20,13 @@ public class UserComparator9 extends AbstractUserComparator {
       signature = "(Lke;Lke;I)I",
       garbageValue = "1966780392"
    )
-   int __m_264(Buddy var1, Buddy var2) {
-      return Client.worldId == var1.world0 && var2.world0 == Client.worldId?(this.__m?var1.username().compareTo0(var2.username()):var2.username().compareTo0(var1.username())):this.__x_461(var1, var2);
+   @Export("compareBuddy")
+   int compareBuddy(Buddy var1, Buddy var2) {
+      return Client.worldId == var1.world && var2.world == Client.worldId ? (this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername())) : this.compareUser(var1, var2);
    }
 
-   @Export("compare")
-   @ObfuscatedName("compare")
    public int compare(Object var1, Object var2) {
-      return this.__m_264((Buddy)var1, (Buddy)var2);
+      return this.compareBuddy((Buddy)var1, (Buddy)var2);
    }
 
    @ObfuscatedName("m")
@@ -35,24 +35,23 @@ public class UserComparator9 extends AbstractUserComparator {
       garbageValue = "-1"
    )
    public static void method3343(boolean var0) {
-      if(NetCache.NetCache_socket != null) {
+      if (NetCache.NetCache_socket != null) {
          try {
             Buffer var1 = new Buffer(4);
-            var1.writeByte(var0?2:3);
+            var1.writeByte(var0 ? 2 : 3);
             var1.writeMedium(0);
             NetCache.NetCache_socket.write(var1.array, 0, 4);
          } catch (IOException var4) {
             try {
                NetCache.NetCache_socket.close();
             } catch (Exception var3) {
-               ;
             }
 
             ++NetCache.NetCache_ioExceptions;
             NetCache.NetCache_socket = null;
          }
-
       }
+
    }
 
    @ObfuscatedName("l")
@@ -64,7 +63,7 @@ public class UserComparator9 extends AbstractUserComparator {
    public static Sprite[] createSpriteArray() {
       Sprite[] var0 = new Sprite[class328.indexedSpriteCount];
 
-      for(int var1 = 0; var1 < class328.indexedSpriteCount; ++var1) {
+      for (int var1 = 0; var1 < class328.indexedSpriteCount; ++var1) {
          Sprite var2 = var0[var1] = new Sprite();
          var2.width = class328.indexedSpriteWidth;
          var2.height = class328.indexedSpriteHeight;
@@ -76,7 +75,7 @@ public class UserComparator9 extends AbstractUserComparator {
          byte[] var4 = class328.spritePixels[var1];
          var2.pixels = new int[var3];
 
-         for(int var5 = 0; var5 < var3; ++var5) {
+         for (int var5 = 0; var5 < var3; ++var5) {
             var2.pixels[var5] = class328.indexedSpritePalette[var4[var5] & 255];
          }
       }
@@ -86,7 +85,7 @@ public class UserComparator9 extends AbstractUserComparator {
       VarbitDefinition.indexedSpriteWidths = null;
       SecureRandomCallable.indexedSpriteHeights = null;
       class328.indexedSpritePalette = null;
-      class328.spritePixels = null;
+      class328.spritePixels = ((byte[][])null);
       return var0;
    }
 }
diff --git a/runescape-client/src/main/java/UserList.java b/runescape-client/src/main/java/UserList.java
index 85c03c5fcf..1db071698b 100644
--- a/runescape-client/src/main/java/UserList.java
+++ b/runescape-client/src/main/java/UserList.java
@@ -61,7 +61,7 @@ public abstract class UserList {
       garbageValue = "861814350"
    )
    @Export("newTypedArray")
-   abstract User[] newTypedArray(int var1);
+   abstract User[] newTypedArray(int size);
 
    @ObfuscatedName("z")
    @ObfuscatedSignature(
@@ -102,8 +102,8 @@ public abstract class UserList {
       garbageValue = "933434965"
    )
    @Export("contains")
-   public boolean contains(Username var1) {
-      return var1.hasCleanName() && (this.usernamesMap.containsKey(var1) || this.previousUsernamesMap.containsKey(var1));
+   public boolean contains(Username username) {
+      return username.hasCleanName() && (this.usernamesMap.containsKey(username) || this.previousUsernamesMap.containsKey(username));
    }
 
    @ObfuscatedName("y")
@@ -112,9 +112,9 @@ public abstract class UserList {
       garbageValue = "-291023874"
    )
    @Export("getByUsername")
-   public User getByUsername(Username var1) {
-      User var2 = this.getByCurrentUsername(var1);
-      return var2 != null?var2:this.getByPreviousUsername(var1);
+   public User getByUsername(Username username) {
+      User var2 = this.getByCurrentUsername(username);
+      return var2 != null ? var2 : this.getByPreviousUsername(username);
    }
 
    @ObfuscatedName("h")
@@ -123,8 +123,8 @@ public abstract class UserList {
       garbageValue = "-1364698032"
    )
    @Export("getByCurrentUsername")
-   User getByCurrentUsername(Username var1) {
-      return !var1.hasCleanName()?null:(User)this.usernamesMap.get(var1);
+   User getByCurrentUsername(Username username) {
+      return !username.hasCleanName() ? null : (User)this.usernamesMap.get(username);
    }
 
    @ObfuscatedName("b")
@@ -133,8 +133,8 @@ public abstract class UserList {
       garbageValue = "-1976876334"
    )
    @Export("getByPreviousUsername")
-   User getByPreviousUsername(Username var1) {
-      return !var1.hasCleanName()?null:(User)this.previousUsernamesMap.get(var1);
+   User getByPreviousUsername(Username previousUsername) {
+      return !previousUsername.hasCleanName() ? null : (User)this.previousUsernamesMap.get(previousUsername);
    }
 
    @ObfuscatedName("c")
@@ -143,9 +143,9 @@ public abstract class UserList {
       garbageValue = "7857"
    )
    @Export("removeByUsername")
-   public final boolean removeByUsername(Username var1) {
-      User var2 = this.getByCurrentUsername(var1);
-      if(var2 == null) {
+   public final boolean removeByUsername(Username username) {
+      User var2 = this.getByCurrentUsername(username);
+      if (var2 == null) {
          return false;
       } else {
          this.remove(var2);
@@ -159,12 +159,13 @@ public abstract class UserList {
       garbageValue = "-1991960360"
    )
    @Export("remove")
-   final void remove(User var1) {
-      int var2 = this.indexOf(var1);
-      if(var2 != -1) {
+   final void remove(User user) {
+      int var2 = this.indexOf(user);
+      if (var2 != -1) {
          this.arrayRemove(var2);
-         this.mapRemove(var1);
+         this.mapRemove(user);
       }
+
    }
 
    @ObfuscatedName("v")
@@ -173,8 +174,8 @@ public abstract class UserList {
       garbageValue = "-1137431921"
    )
    @Export("addLastNoPreviousUsername")
-   User addLastNoPreviousUsername(Username var1) {
-      return this.addLast(var1, (Username)null);
+   User addLastNoPreviousUsername(Username username) {
+      return this.addLast(username, (Username)null);
    }
 
    @ObfuscatedName("ag")
@@ -183,12 +184,12 @@ public abstract class UserList {
       garbageValue = "1445676158"
    )
    @Export("addLast")
-   User addLast(Username var1, Username var2) {
-      if(this.getByCurrentUsername(var1) != null) {
+   User addLast(Username username, Username previousUsername) {
+      if (this.getByCurrentUsername(username) != null) {
          throw new IllegalStateException();
       } else {
          User var3 = this.newInstance();
-         var3.set(var1, var2);
+         var3.set(username, previousUsername);
          this.arrayAddLast(var3);
          this.mapPut(var3);
          return var3;
@@ -201,11 +202,11 @@ public abstract class UserList {
       garbageValue = "-1676228472"
    )
    @Export("get")
-   public final User get(int var1) {
-      if(var1 >= 0 && var1 < this.size0) {
-         return this.array[var1];
+   public final User get(int index) {
+      if (index >= 0 && index < this.size0) {
+         return this.array[index];
       } else {
-         throw new ArrayIndexOutOfBoundsException(var1);
+         throw new ArrayIndexOutOfBoundsException(index);
       }
    }
 
@@ -216,7 +217,7 @@ public abstract class UserList {
    )
    @Export("sort")
    public final void sort() {
-      if(this.comparator == null) {
+      if (this.comparator == null) {
          Arrays.sort(this.array, 0, this.size0);
       } else {
          Arrays.sort(this.array, 0, this.size0, this.comparator);
@@ -230,10 +231,10 @@ public abstract class UserList {
       garbageValue = "35"
    )
    @Export("changeName")
-   final void changeName(User var1, Username var2, Username var3) {
-      this.mapRemove(var1);
-      var1.set(var2, var3);
-      this.mapPut(var1);
+   final void changeName(User user, Username username, Username previousUsername) {
+      this.mapRemove(user);
+      user.set(username, previousUsername);
+      this.mapPut(user);
    }
 
    @ObfuscatedName("ar")
@@ -242,9 +243,9 @@ public abstract class UserList {
       garbageValue = "-1908653684"
    )
    @Export("indexOf")
-   final int indexOf(User var1) {
-      for(int var2 = 0; var2 < this.size0; ++var2) {
-         if(this.array[var2] == var1) {
+   final int indexOf(User user) {
+      for (int var2 = 0; var2 < this.size0; ++var2) {
+         if (this.array[var2] == user) {
             return var2;
          }
       }
@@ -258,9 +259,9 @@ public abstract class UserList {
       garbageValue = "-20791"
    )
    @Export("mapRemove")
-   final void mapRemove(User var1) {
-      if(var1.previousUsername != null) {
-         this.previousUsernamesMap.remove(var1.previousUsername);
+   final void mapRemove(User user) {
+      if (user.previousUsername != null) {
+         this.previousUsernamesMap.remove(user.previousUsername);
       }
 
    }
@@ -271,8 +272,8 @@ public abstract class UserList {
       garbageValue = "1398315954"
    )
    @Export("arrayAddLast")
-   final void arrayAddLast(User var1) {
-      this.array[++this.size0 - 1] = var1;
+   final void arrayAddLast(User user) {
+      this.array[++this.size0 - 1] = user;
    }
 
    @ObfuscatedName("ah")
@@ -281,11 +282,11 @@ public abstract class UserList {
       garbageValue = "103"
    )
    @Export("mapPut")
-   final void mapPut(User var1) {
-      this.usernamesMap.put(var1.username0, var1);
-      if(var1.previousUsername != null) {
-         User var2 = (User)this.previousUsernamesMap.put(var1.previousUsername, var1);
-         if(var2 != null && var2 != var1) {
+   final void mapPut(User user) {
+      this.usernamesMap.put(user.username, user);
+      if (user.previousUsername != null) {
+         User var2 = (User)this.previousUsernamesMap.put(user.previousUsername, user);
+         if (var2 != null && var2 != user) {
             var2.previousUsername = null;
          }
       }
@@ -298,10 +299,10 @@ public abstract class UserList {
       garbageValue = "-616972929"
    )
    @Export("arrayRemove")
-   final void arrayRemove(int var1) {
+   final void arrayRemove(int index) {
       --this.size0;
-      if(var1 < this.size0) {
-         System.arraycopy(this.array, var1 + 1, this.array, var1, this.size0 - var1);
+      if (index < this.size0) {
+         System.arraycopy(this.array, index + 1, this.array, index, this.size0 - index);
       }
 
    }
@@ -323,10 +324,10 @@ public abstract class UserList {
    )
    @Export("addComparator")
    public final void addComparator(Comparator var1) {
-      if(this.comparator == null) {
+      if (this.comparator == null) {
          this.comparator = var1;
-      } else if(this.comparator instanceof AbstractUserComparator) {
-         ((AbstractUserComparator)this.comparator).__e_460(var1);
+      } else if (this.comparator instanceof AbstractUserComparator) {
+         ((AbstractUserComparator)this.comparator).addComparator(var1);
       }
 
    }
diff --git a/runescape-client/src/main/java/Username.java b/runescape-client/src/main/java/Username.java
index bbcdaf3dee..e9d4e0cf48 100644
--- a/runescape-client/src/main/java/Username.java
+++ b/runescape-client/src/main/java/Username.java
@@ -10,8 +10,8 @@ public class Username implements Comparable {
    @Export("Interpreter_intLocals")
    static int[] Interpreter_intLocals;
    @ObfuscatedName("m")
-   @Export("name0")
-   String name0;
+   @Export("name")
+   String name;
    @ObfuscatedName("f")
    @Export("cleanName")
    String cleanName;
@@ -20,7 +20,7 @@ public class Username implements Comparable {
       signature = "(Ljava/lang/String;Llx;)V"
    )
    public Username(String var1, LoginType var2) {
-      this.name0 = var1;
+      this.name = var1;
       this.cleanName = Message.method1229(var1, var2);
    }
 
@@ -31,7 +31,7 @@ public class Username implements Comparable {
    )
    @Export("getName")
    public String getName() {
-      return this.name0;
+      return this.name;
    }
 
    @ObfuscatedName("f")
@@ -49,42 +49,33 @@ public class Username implements Comparable {
       signature = "(Lkp;B)I",
       garbageValue = "8"
    )
-   @Export("compareTo0")
-   public int compareTo0(Username var1) {
-      return this.cleanName == null?(var1.cleanName == null?0:1):(var1.cleanName == null?-1:this.cleanName.compareTo(var1.cleanName));
+   @Export("compareToTyped")
+   public int compareToTyped(Username other) {
+      return this.cleanName == null ? (other.cleanName == null ? 0 : 1) : (other.cleanName == null ? -1 : this.cleanName.compareTo(other.cleanName));
    }
 
-   @Export("equals")
-   @ObfuscatedName("equals")
    public boolean equals(Object var1) {
-      if(var1 instanceof Username) {
+      if (var1 instanceof Username) {
          Username var2 = (Username)var1;
-		  if (this.cleanName == null)
-		  {
-			  return var2.cleanName == null;
-		  }
-		  else
-		  {
-			  return var2.cleanName != null && (this.__hashCode_467() == var2.__hashCode_467() && this.cleanName.equals(var2.cleanName));
-		  }
+         if (this.cleanName == null) {
+            return var2.cleanName == null;
+         } else {
+            return var2.cleanName != null && this.hashCode() == var2.hashCode() && this.cleanName.equals(var2.cleanName);
+         }
       } else {
          return false;
       }
    }
 
-   @ObfuscatedName("hashCode")
-   public int __hashCode_467() {
-      return this.cleanName == null?0:this.cleanName.hashCode();
+   public int hashCode() {
+      return this.cleanName == null ? 0 : this.cleanName.hashCode();
    }
 
-   @ObfuscatedName("toString")
-   public String __toString_468() {
+   public String toString() {
       return this.getName();
    }
 
-   @Export("compareTo")
-   @ObfuscatedName("compareTo")
    public int compareTo(Object var1) {
-      return this.compareTo0((Username)var1);
+      return this.compareToTyped((Username)var1);
    }
 }
diff --git a/runescape-client/src/main/java/VarbitDefinition.java b/runescape-client/src/main/java/VarbitDefinition.java
index 3734f09ca3..f1b032e4fb 100644
--- a/runescape-client/src/main/java/VarbitDefinition.java
+++ b/runescape-client/src/main/java/VarbitDefinition.java
@@ -11,8 +11,8 @@ public class VarbitDefinition extends DualNode {
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   @Export("VarbitDefinition_indexCache")
-   static AbstractIndexCache VarbitDefinition_indexCache;
+   @Export("VarbitDefinition_archive")
+   static AbstractArchive VarbitDefinition_archive;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Ler;"
@@ -26,39 +26,35 @@ public class VarbitDefinition extends DualNode {
    @ObfuscatedGetter(
       intValue = 1552575189
    )
-   @Export("varp")
-   public int varp;
+   @Export("baseVar")
+   public int baseVar;
    @ObfuscatedName("w")
    @ObfuscatedGetter(
       intValue = -870948181
    )
-   @Export("lowBit")
-   public int lowBit;
+   @Export("startBit")
+   public int startBit;
    @ObfuscatedName("o")
    @ObfuscatedGetter(
       intValue = -1710935305
    )
-   @Export("highBit")
-   public int highBit;
-
-   static {
-      VarbitDefinition_cached = new EvictingDualNodeHashTable(64);
-   }
+   @Export("endBit")
+   public int endBit;
 
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "(Lgr;I)V",
       garbageValue = "-1888757206"
    )
-   @Export("read")
-   void read(Buffer var1) {
-      while(true) {
+   @Export("decode")
+   void decode(Buffer var1) {
+      while (true) {
          int var2 = var1.readUnsignedByte();
-         if(var2 == 0) {
+         if (var2 == 0) {
             return;
          }
 
-         this.readNext(var1, var2);
+         this.decodeNext(var1, var2);
       }
    }
 
@@ -67,12 +63,12 @@ public class VarbitDefinition extends DualNode {
       signature = "(Lgr;IB)V",
       garbageValue = "-76"
    )
-   @Export("readNext")
-   void readNext(Buffer var1, int var2) {
-      if(var2 == 1) {
-         this.varp = var1.__ag_302();
-         this.lowBit = var1.readUnsignedByte();
-         this.highBit = var1.readUnsignedByte();
+   @Export("decodeNext")
+   void decodeNext(Buffer var1, int var2) {
+      if (var2 == 1) {
+         this.baseVar = var1.readUnsignedShort();
+         this.startBit = var1.readUnsignedByte();
+         this.endBit = var1.readUnsignedByte();
       }
 
    }
@@ -84,14 +80,18 @@ public class VarbitDefinition extends DualNode {
    )
    static final boolean method4910(int var0, int var1) {
       ObjectDefinition var2 = class50.getObjectDefinition(var0);
-      if(var1 == 11) {
+      if (var1 == 11) {
          var1 = 10;
       }
 
-      if(var1 >= 5 && var1 <= 8) {
+      if (var1 >= 5 && var1 <= 8) {
          var1 = 4;
       }
 
-      return var2.__u_421(var1);
+      return var2.method230(var1);
+   }
+
+   static {
+      VarbitDefinition_cached = new EvictingDualNodeHashTable(64);
    }
 }
diff --git a/runescape-client/src/main/java/VarcInt.java b/runescape-client/src/main/java/VarcInt.java
index 4734f53ee8..3f88e84cf1 100644
--- a/runescape-client/src/main/java/VarcInt.java
+++ b/runescape-client/src/main/java/VarcInt.java
@@ -11,7 +11,7 @@ public class VarcInt extends DualNode {
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   static AbstractIndexCache __iw_m;
+   static AbstractArchive field942;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Ler;"
@@ -22,10 +22,6 @@ public class VarcInt extends DualNode {
    @Export("persist")
    public boolean persist;
 
-   static {
-      cachedVarcInts = new EvictingDualNodeHashTable(64);
-   }
-
    VarcInt() {
       this.persist = false;
    }
@@ -35,14 +31,14 @@ public class VarcInt extends DualNode {
       signature = "(Lgr;I)V",
       garbageValue = "1023420886"
    )
-   void __q_411(Buffer var1) {
-      while(true) {
+   void method354(Buffer var1) {
+      while (true) {
          int var2 = var1.readUnsignedByte();
-         if(var2 == 0) {
+         if (var2 == 0) {
             return;
          }
 
-         this.__w_412(var1, var2);
+         this.method355(var1, var2);
       }
    }
 
@@ -51,8 +47,8 @@ public class VarcInt extends DualNode {
       signature = "(Lgr;II)V",
       garbageValue = "-202810982"
    )
-   void __w_412(Buffer var1, int var2) {
-      if(var2 == 2) {
+   void method355(Buffer var1, int var2) {
+      if (var2 == 2) {
          this.persist = true;
       }
 
@@ -64,8 +60,8 @@ public class VarcInt extends DualNode {
       garbageValue = "1680587190"
    )
    @Export("loadClassFromDescriptor")
-   static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException {
-      return var0.equals("B")?Byte.TYPE:(var0.equals("I")?Integer.TYPE:(var0.equals("S")?Short.TYPE:(var0.equals("J")?Long.TYPE:(var0.equals("Z")?Boolean.TYPE:(var0.equals("F")?Float.TYPE:(var0.equals("D")?Double.TYPE:(var0.equals("C")?Character.TYPE:(var0.equals("void")?Void.TYPE:Reflection.findClass(var0)))))))));
+   static Class loadClassFromDescriptor(String descriptor) throws ClassNotFoundException {
+      return descriptor.equals("B") ? Byte.TYPE : (descriptor.equals("I") ? Integer.TYPE : (descriptor.equals("S") ? Short.TYPE : (descriptor.equals("J") ? Long.TYPE : (descriptor.equals("Z") ? Boolean.TYPE : (descriptor.equals("F") ? Float.TYPE : (descriptor.equals("D") ? Double.TYPE : (descriptor.equals("C") ? Character.TYPE : (descriptor.equals("void") ? Void.TYPE : Reflection.findClass(descriptor)))))))));
    }
 
    @ObfuscatedName("a")
@@ -77,4 +73,8 @@ public class VarcInt extends DualNode {
    public static boolean isAlphaNumeric(char var0) {
       return var0 >= '0' && var0 <= '9' || var0 >= 'A' && var0 <= 'Z' || var0 >= 'a' && var0 <= 'z';
    }
+
+   static {
+      cachedVarcInts = new EvictingDualNodeHashTable(64);
+   }
 }
diff --git a/runescape-client/src/main/java/Varcs.java b/runescape-client/src/main/java/Varcs.java
index 8efa66c2e2..0b73237f57 100644
--- a/runescape-client/src/main/java/Varcs.java
+++ b/runescape-client/src/main/java/Varcs.java
@@ -33,19 +33,19 @@ public class Varcs {
 
    Varcs() {
       this.unwrittenChanges = false;
-      int var1 = ObjectSound.indexCache2.__s_396(19);
+      int var1 = ObjectSound.archive2.getGroupFileCount(19);
       this.map = new HashMap();
       this.intsPersistence = new boolean[var1];
 
       int var2;
-      for(var2 = 0; var2 < var1; ++var2) {
+      for (var2 = 0; var2 < var1; ++var2) {
          VarcInt var3 = AbstractByteArrayCopier.getVarcInt(var2);
          this.intsPersistence[var2] = var3.persist;
       }
 
       var2 = 0;
-      if(ObjectSound.indexCache2.__df_408(15)) {
-         var2 = ObjectSound.indexCache2.__s_396(15);
+      if (ObjectSound.archive2.method133(15)) {
+         var2 = ObjectSound.archive2.getGroupFileCount(15);
       }
 
       this.strings = new String[var2];
@@ -58,9 +58,9 @@ public class Varcs {
       garbageValue = "920518911"
    )
    @Export("setInt")
-   void setInt(int var1, int var2) {
-      this.map.put(Integer.valueOf(var1), Integer.valueOf(var2));
-      if(this.intsPersistence[var1]) {
+   void setInt(int index, int var2) {
+      this.map.put(index, var2);
+      if (this.intsPersistence[index]) {
          this.unwrittenChanges = true;
       }
 
@@ -72,9 +72,9 @@ public class Varcs {
       garbageValue = "6"
    )
    @Export("getInt")
-   int getInt(int var1) {
-      Object var2 = this.map.get(Integer.valueOf(var1));
-      return var2 instanceof Integer?((Integer)var2).intValue():-1;
+   int getInt(int index) {
+      Object var2 = this.map.get(index);
+      return var2 instanceof Integer ? (Integer)var2 : -1;
    }
 
    @ObfuscatedName("q")
@@ -83,8 +83,8 @@ public class Varcs {
       garbageValue = "12847051"
    )
    @Export("setString")
-   void setString(int var1, String var2) {
-      this.map.put(Integer.valueOf(var1), var2);
+   void setString(int index, String var2) {
+      this.map.put(index, var2);
    }
 
    @ObfuscatedName("w")
@@ -93,9 +93,9 @@ public class Varcs {
       garbageValue = "897961099"
    )
    @Export("getString")
-   String getString(int var1) {
-      Object var2 = this.map.get(Integer.valueOf(var1));
-      return var2 instanceof String?(String)var2:"";
+   String getString(int index) {
+      Object var2 = this.map.get(index);
+      return var2 instanceof String ? (String)var2 : "";
    }
 
    @ObfuscatedName("o")
@@ -104,8 +104,8 @@ public class Varcs {
       garbageValue = "15"
    )
    @Export("setStringOld")
-   void setStringOld(int var1, String var2) {
-      this.strings[var1] = var2;
+   void setStringOld(int index, String var2) {
+      this.strings[index] = var2;
    }
 
    @ObfuscatedName("u")
@@ -114,8 +114,8 @@ public class Varcs {
       garbageValue = "0"
    )
    @Export("getStringOld")
-   String getStringOld(int var1) {
-      return this.strings[var1];
+   String getStringOld(int index) {
+      return this.strings[index];
    }
 
    @ObfuscatedName("g")
@@ -126,13 +126,13 @@ public class Varcs {
    @Export("clearTransient")
    void clearTransient() {
       int var1;
-      for(var1 = 0; var1 < this.intsPersistence.length; ++var1) {
-         if(!this.intsPersistence[var1]) {
-            this.map.remove(Integer.valueOf(var1));
+      for (var1 = 0; var1 < this.intsPersistence.length; ++var1) {
+         if (!this.intsPersistence[var1]) {
+            this.map.remove(var1);
          }
       }
 
-      for(var1 = 0; var1 < this.strings.length; ++var1) {
+      for (var1 = 0; var1 < this.strings.length; ++var1) {
          this.strings[var1] = null;
       }
 
@@ -145,7 +145,7 @@ public class Varcs {
    )
    @Export("getPreferencesFile")
    AccessFile getPreferencesFile(boolean var1) {
-      return LoginPacket.getPreferencesFile("2", class22.studioGame.name, var1);
+      return LoginPacket.getPreferencesFile("2", WorldMapRectangle.studioGame.name, var1);
    }
 
    @ObfuscatedName("e")
@@ -162,98 +162,96 @@ public class Varcs {
          int var3 = 0;
          Iterator var4 = this.map.entrySet().iterator();
 
-         while(var4.hasNext()) {
+         while (var4.hasNext()) {
             Entry var5 = (Entry)var4.next();
-            int var6 = ((Integer)var5.getKey()).intValue();
-            if(this.intsPersistence[var6]) {
+            int var6 = (Integer)var5.getKey();
+            if (this.intsPersistence[var6]) {
                Object var7 = var5.getValue();
                var2 += 3;
-               if(var7 instanceof Integer) {
+               if (var7 instanceof Integer) {
                   var2 += 4;
-               } else if(var7 instanceof String) {
-                  var2 += WorldMapRegion.method550((String)var7);
+               } else if (var7 instanceof String) {
+                  var2 += WorldMapRegion.stringCp1252NullTerminatedByteSize((String)var7);
                }
 
                ++var3;
             }
          }
 
-         Buffer var32 = new Buffer(var2);
-         var32.writeByte(2);
-         var32.writeShort(var3);
-         Iterator var33 = this.map.entrySet().iterator();
+         Buffer var28 = new Buffer(var2);
+         var28.writeByte(2);
+         var28.writeShort(var3);
+         Iterator var29 = this.map.entrySet().iterator();
 
-         label185:
-         while(true) {
-            Entry var20;
-            int var21;
+         label179:
+         while (true) {
+            Entry var8;
+            int var30;
             do {
-               if(!var33.hasNext()) {
-                  var1.write(var32.array, 0, var32.index);
-                  break label185;
+               if (!var29.hasNext()) {
+                  var1.write(var28.array, 0, var28.index);
+                  break label179;
                }
 
-               var20 = (Entry)var33.next();
-               var21 = ((Integer)var20.getKey()).intValue();
-            } while(!this.intsPersistence[var21]);
+               var8 = (Entry)var29.next();
+               var30 = (Integer)var8.getKey();
+            } while(!this.intsPersistence[var30]);
 
-            var32.writeShort(var21);
-            Object var8 = var20.getValue();
-            Class var10 = var8.getClass();
+            var28.writeShort(var30);
+            Object var9 = var8.getValue();
+            Class var10 = var9.getClass();
             class3[] var11 = class3.method34();
-            int var12 = 0;
+            int var13 = 0;
 
-            class3 var9;
-            while(true) {
-               if(var12 >= var11.length) {
-                  var9 = null;
+            class3 var12;
+            while (true) {
+               if (var13 >= var11.length) {
+                  var12 = null;
                   break;
                }
 
-               class3 var13 = var11[var12];
-               if(var10 == var13.field18) {
-                  var9 = var13;
+               class3 var14 = var11[var13];
+               if (var10 == var14.field18) {
+                  var12 = var14;
                   break;
                }
 
-               ++var12;
+               ++var13;
             }
 
-            var32.writeByte(var9.id);
-            Class var34 = var8.getClass();
-            class3[] var15 = class3.method34();
+            var28.writeByte(var12.field1147);
+            Class var31 = var9.getClass();
+            class3[] var32 = class3.method34();
             int var16 = 0;
 
-            class3 var14;
-            while(true) {
-               if(var16 >= var15.length) {
-                  var14 = null;
+            class3 var15;
+            while (true) {
+               if (var16 >= var32.length) {
+                  var15 = null;
                   break;
                }
 
-               class3 var17 = var15[var16];
-               if(var34 == var17.field18) {
-                  var14 = var17;
+               class3 var17 = var32[var16];
+               if (var31 == var17.field18) {
+                  var15 = var17;
                   break;
                }
 
                ++var16;
             }
 
-            if(var14 == null) {
+            if (var15 == null) {
                throw new IllegalArgumentException();
             }
 
-            class0 var22 = var14.field19;
-            var22.vmethod44(var8, var32);
+            class0 var33 = var15.field19;
+            var33.vmethod44(var9, var28);
          }
-      } catch (Exception var30) {
-         ;
+      } catch (Exception var26) {
       } finally {
          try {
             var1.close();
-         } catch (Exception var29) {
-            ;
+         } catch (Exception var25) {
          }
 
       }
@@ -271,85 +269,68 @@ public class Varcs {
    void read() {
       AccessFile var1 = this.getPreferencesFile(false);
 
-      label215: {
-         try {
-            byte[] var2 = new byte[(int)var1.length()];
+      try {
+         byte[] var2 = new byte[(int)var1.length()];
 
-            int var4;
-            for(int var3 = 0; var3 < var2.length; var3 += var4) {
-               var4 = var1.read(var2, var3, var2.length - var3);
-               if(var4 == -1) {
-                  throw new EOFException();
-               }
+         int var3;
+         for (int var4 = 0; var4 < var2.length; var4 += var3) {
+            var3 = var1.read(var2, var4, var2.length - var4);
+            if (var3 == -1) {
+               throw new EOFException();
             }
-
-            Buffer var14 = new Buffer(var2);
-            if(var14.array.length - var14.index >= 1) {
-               int var15 = var14.readUnsignedByte();
-               if(var15 < 0 || var15 > 2) {
-                  return;
-               }
-
-               int var7;
-               int var8;
-               int var9;
-               int var16;
-               if(var15 >= 2) {
-                  var16 = var14.__ag_302();
-                  var7 = 0;
-
-                  while(true) {
-                     if(var7 >= var16) {
-                        break label215;
-                     }
-
-                     var8 = var14.__ag_302();
-                     var9 = var14.readUnsignedByte();
-                     class3 var10 = (class3)ScriptFrame.findEnumerated(class3.method34(), var9);
-                     Object var11 = var10.method31(var14);
-                     if(this.intsPersistence[var8]) {
-                        this.map.put(Integer.valueOf(var8), var11);
-                     }
-
-                     ++var7;
-                  }
-               } else {
-                  var16 = var14.__ag_302();
-
-                  for(var7 = 0; var7 < var16; ++var7) {
-                     var8 = var14.__ag_302();
-                     var9 = var14.readInt();
-                     if(this.intsPersistence[var8]) {
-                        this.map.put(Integer.valueOf(var8), Integer.valueOf(var9));
-                     }
-                  }
-
-                  var7 = var14.__ag_302();
-                  var8 = 0;
-
-                  while(true) {
-                     if(var8 >= var7) {
-                        break label215;
-                     }
-
-                     var14.__ag_302();
-                     var14.readStringCp1252NullTerminated();
-                     ++var8;
-                  }
-               }
-            }
-         } catch (Exception var25) {
-            break label215;
-         } finally {
-            try {
-               var1.close();
-            } catch (Exception var24) {
-               ;
-            }
-
          }
 
-         return;
+         Buffer var24 = new Buffer(var2);
+         if (var24.array.length - var24.index < 1) {
+            return;
+         }
+
+         int var5 = var24.readUnsignedByte();
+         if (var5 < 0 || var5 > 2) {
+            return;
+         }
+
+         int var6;
+         int var7;
+         int var8;
+         int var9;
+         if (var5 >= 2) {
+            var9 = var24.readUnsignedShort();
+
+            for (var6 = 0; var6 < var9; ++var6) {
+               var7 = var24.readUnsignedShort();
+               var8 = var24.readUnsignedByte();
+               class3 var10 = (class3)ScriptFrame.findEnumerated(class3.method34(), var8);
+               Object var11 = var10.method31(var24);
+               if (this.intsPersistence[var7]) {
+                  this.map.put(var7, var11);
+               }
+            }
+         } else {
+            var9 = var24.readUnsignedShort();
+
+            for (var6 = 0; var6 < var9; ++var6) {
+               var7 = var24.readUnsignedShort();
+               var8 = var24.readInt();
+               if (this.intsPersistence[var7]) {
+                  this.map.put(var7, var8);
+               }
+            }
+
+            var6 = var24.readUnsignedShort();
+
+            for (var7 = 0; var7 < var6; ++var7) {
+               var24.readUnsignedShort();
+               var24.readStringCp1252NullTerminated();
+            }
+         }
+      } catch (Exception var22) {
+      } finally {
+         try {
+            var1.close();
+         } catch (Exception var21) {
+         }
+
       }
 
       this.unwrittenChanges = false;
@@ -362,7 +343,7 @@ public class Varcs {
    )
    @Export("tryWrite")
    void tryWrite() {
-      if(this.unwrittenChanges && this.lastWriteTimeMs < class203.currentTimeMs() - 60000L) {
+      if (this.unwrittenChanges && this.lastWriteTimeMs < class203.currentTimeMs() - 60000L) {
          this.write();
       }
 
@@ -383,8 +364,8 @@ public class Varcs {
       signature = "(Lir;I)V",
       garbageValue = "321265868"
    )
-   public static void method2160(AbstractIndexCache var0) {
-      OverlayDefinition.__jf_m = var0;
+   public static void method2160(AbstractArchive var0) {
+      FloorOverlayDefinition.FloorOverlayDefinition_archive = var0;
    }
 
    @ObfuscatedName("q")
@@ -393,13 +374,14 @@ public class Varcs {
       garbageValue = "1119202993"
    )
    static final void method2166(byte[] var0, int var1, int var2, int var3, int var4, CollisionMap[] var5) {
+      int var6;
       int var7;
-      int var8;
-      for(int var6 = 0; var6 < 4; ++var6) {
-         for(var7 = 0; var7 < 64; ++var7) {
-            for(var8 = 0; var8 < 64; ++var8) {
-               if(var7 + var1 > 0 && var7 + var1 < 103 && var8 + var2 > 0 && var8 + var2 < 103) {
-                  var5[var6].flags[var7 + var1][var8 + var2] &= -16777217;
+      for (int var8 = 0; var8 < 4; ++var8) {
+         for (var6 = 0; var6 < 64; ++var6) {
+            for (var7 = 0; var7 < 64; ++var7) {
+               if (var6 + var1 > 0 && var6 + var1 < 103 && var7 + var2 > 0 && var7 + var2 < 103) {
+                  int[] var9 = var5[var8].flags[var6 + var1];
+                  var9[var7 + var2] &= -16777217;
                }
             }
          }
@@ -407,10 +389,10 @@ public class Varcs {
 
       Buffer var10 = new Buffer(var0);
 
-      for(var7 = 0; var7 < 4; ++var7) {
-         for(var8 = 0; var8 < 64; ++var8) {
-            for(int var9 = 0; var9 < 64; ++var9) {
-               TotalQuantityComparator.loadTerrain(var10, var7, var8 + var1, var9 + var2, var3, var4, 0);
+      for (var6 = 0; var6 < 4; ++var6) {
+         for (var7 = 0; var7 < 64; ++var7) {
+            for (int var11 = 0; var11 < 64; ++var11) {
+               GrandExchangeOfferTotalQuantityComparator.loadTerrain(var10, var6, var7 + var1, var11 + var2, var3, var4, 0);
             }
          }
       }
@@ -423,11 +405,11 @@ public class Varcs {
       garbageValue = "1592367053"
    )
    static final void method2168(Widget var0, int var1, int var2, int var3) {
-      if(var0.__cc == null) {
+      if (var0.field968 == null) {
          throw new RuntimeException();
       } else {
-         var0.__cc[var1] = var2;
-         var0.__ci[var1] = var3;
+         var0.field968[var1] = var2;
+         var0.field969[var1] = var3;
       }
    }
 }
diff --git a/runescape-client/src/main/java/VarpDefinition.java b/runescape-client/src/main/java/VarpDefinition.java
index 1fb5900843..93e4af9d40 100644
--- a/runescape-client/src/main/java/VarpDefinition.java
+++ b/runescape-client/src/main/java/VarpDefinition.java
@@ -11,12 +11,12 @@ public class VarpDefinition extends DualNode {
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   public static AbstractIndexCache __ix_m;
+   public static AbstractArchive field943;
    @ObfuscatedName("f")
    @ObfuscatedGetter(
       intValue = 510774535
    )
-   public static int __ix_f;
+   public static int field944;
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Ler;"
@@ -30,10 +30,6 @@ public class VarpDefinition extends DualNode {
    @Export("type")
    public int type;
 
-   static {
-      VarpDefinition_cached = new EvictingDualNodeHashTable(64);
-   }
-
    VarpDefinition() {
       this.type = 0;
    }
@@ -43,15 +39,15 @@ public class VarpDefinition extends DualNode {
       signature = "(Lgr;B)V",
       garbageValue = "-41"
    )
-   @Export("read")
-   void read(Buffer var1) {
-      while(true) {
+   @Export("decode")
+   void decode(Buffer var1) {
+      while (true) {
          int var2 = var1.readUnsignedByte();
-         if(var2 == 0) {
+         if (var2 == 0) {
             return;
          }
 
-         this.readNext(var1, var2);
+         this.decodeNext(var1, var2);
       }
    }
 
@@ -60,11 +56,15 @@ public class VarpDefinition extends DualNode {
       signature = "(Lgr;II)V",
       garbageValue = "-1859920822"
    )
-   @Export("readNext")
-   void readNext(Buffer var1, int var2) {
-      if(var2 == 5) {
-         this.type = var1.__ag_302();
+   @Export("decodeNext")
+   void decodeNext(Buffer var1, int var2) {
+      if (var2 == 5) {
+         this.type = var1.readUnsignedShort();
       }
 
    }
+
+   static {
+      VarpDefinition_cached = new EvictingDualNodeHashTable(64);
+   }
 }
diff --git a/runescape-client/src/main/java/Varps.java b/runescape-client/src/main/java/Varps.java
index 9e064f5004..0778f793cb 100644
--- a/runescape-client/src/main/java/Varps.java
+++ b/runescape-client/src/main/java/Varps.java
@@ -23,26 +23,13 @@ public class Varps {
    @Export("loginBoxCenter")
    static int loginBoxCenter;
 
-   static {
-      Varps_masks = new int[32];
-      int var0 = 2;
-
-      for(int var1 = 0; var1 < 32; ++var1) {
-         Varps_masks[var1] = var0 - 1;
-         var0 += var0;
-      }
-
-      Varps_temp = new int[4000];
-      Varps_main = new int[4000];
-   }
-
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "(Lir;I)V",
       garbageValue = "2111080001"
    )
-   public static void method4393(AbstractIndexCache var0) {
-      UnderlayDefinition.UnderlayDefinition_indexCache = var0;
+   public static void method4393(AbstractArchive var0) {
+      FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var0;
    }
 
    @ObfuscatedName("ki")
@@ -51,11 +38,25 @@ public class Varps {
       garbageValue = "-1714608824"
    )
    static void method4400(Buffer var0) {
-      if(Client.__client_ev != null) {
-         var0.__s_297(Client.__client_ev, 0, Client.__client_ev.length);
+      if (Client.field172 != null) {
+         var0.writeBytes(Client.field172, 0, Client.field172.length);
       } else {
          byte[] var1 = AttackOption.method2032();
-         var0.__s_297(var1, 0, var1.length);
+         var0.writeBytes(var1, 0, var1.length);
       }
+
+   }
+
+   static {
+      Varps_masks = new int[32];
+      int var0 = 2;
+
+      for (int var1 = 0; var1 < 32; ++var1) {
+         Varps_masks[var1] = var0 - 1;
+         var0 += var0;
+      }
+
+      Varps_temp = new int[4000];
+      Varps_main = new int[4000];
    }
 }
diff --git a/runescape-client/src/main/java/VertexNormal.java b/runescape-client/src/main/java/VertexNormal.java
index 05c9b9616c..66ffc6364d 100644
--- a/runescape-client/src/main/java/VertexNormal.java
+++ b/runescape-client/src/main/java/VertexNormal.java
@@ -1,4 +1,3 @@
-import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
@@ -8,32 +7,32 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("VertexNormal")
 public class VertexNormal {
    @ObfuscatedName("pe")
-   static boolean __dq_pe;
+   static boolean field945;
    @ObfuscatedName("rq")
    @ObfuscatedGetter(
       intValue = 1351620693
    )
-   static int __dq_rq;
+   static int field946;
    @ObfuscatedName("m")
    @ObfuscatedGetter(
       intValue = 1414310131
    )
-   int __m;
+   int field947;
    @ObfuscatedName("f")
    @ObfuscatedGetter(
       intValue = -1493845293
    )
-   int __f;
+   int field948;
    @ObfuscatedName("q")
    @ObfuscatedGetter(
       intValue = 1575149515
    )
-   int __q;
+   int field949;
    @ObfuscatedName("w")
    @ObfuscatedGetter(
       intValue = -487323631
    )
-   int __w;
+   int field950;
 
    VertexNormal() {
    }
@@ -42,10 +41,10 @@ public class VertexNormal {
       signature = "(Ldq;)V"
    )
    VertexNormal(VertexNormal var1) {
-      this.__m = var1.__m;
-      this.__f = var1.__f;
-      this.__q = var1.__q;
-      this.__w = var1.__w;
+      this.field947 = var1.field947;
+      this.field948 = var1.field948;
+      this.field949 = var1.field949;
+      this.field950 = var1.field950;
    }
 
    @ObfuscatedName("w")
@@ -54,22 +53,20 @@ public class VertexNormal {
       garbageValue = "-86"
    )
    static synchronized void method2984(byte[] var0) {
-      if(var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < 1000) {
+      if (var0.length == 100 && ByteArrayPool.ByteArrayPool_smallCount < 1000) {
          ByteArrayPool.ByteArrayPool_small[++ByteArrayPool.ByteArrayPool_smallCount - 1] = var0;
-      } else if(var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < 250) {
+      } else if (var0.length == 5000 && ByteArrayPool.ByteArrayPool_mediumCount < 250) {
          ByteArrayPool.ByteArrayPool_medium[++ByteArrayPool.ByteArrayPool_mediumCount - 1] = var0;
-      } else if(var0.length == 30000 && ByteArrayPool.ByteArrayPool_largeCount < 50) {
+      } else if (var0.length == 30000 && ByteArrayPool.ByteArrayPool_largeCount < 50) {
          ByteArrayPool.ByteArrayPool_large[++ByteArrayPool.ByteArrayPool_largeCount - 1] = var0;
-      } else {
-         if(RouteStrategy.__fe_e != null) {
-            for(int var1 = 0; var1 < ByteArrayPool.__gi_g.length; ++var1) {
-               if(var0.length == ByteArrayPool.__gi_g[var1] && WorldMapSection2.__ah_l[var1] < RouteStrategy.__fe_e[var1].length) {
-                  RouteStrategy.__fe_e[var1][WorldMapSection2.__ah_l[var1]++] = var0;
-                  return;
-               }
+      } else if (RouteStrategy.field760 != null) {
+         for (int var1 = 0; var1 < ByteArrayPool.field55.length; ++var1) {
+            if (var0.length == ByteArrayPool.field55[var1] && WorldMapSection0.field1082[var1] < RouteStrategy.field760[var1].length) {
+               RouteStrategy.field760[var1][WorldMapSection0.field1082[var1]++] = var0;
+               return;
             }
          }
-
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/class249.java b/runescape-client/src/main/java/VerticalAlignment.java
similarity index 71%
rename from runescape-client/src/main/java/class249.java
rename to runescape-client/src/main/java/VerticalAlignment.java
index 05f3efda01..c562dc666b 100644
--- a/runescape-client/src/main/java/class249.java
+++ b/runescape-client/src/main/java/VerticalAlignment.java
@@ -1,10 +1,12 @@
 import net.runelite.mapping.Export;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("ip")
-public enum class249 implements Enumerated {
+@Implements("VerticalAlignment")
+public enum VerticalAlignment implements Enumerated {
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "Lip;"
@@ -25,16 +27,18 @@ public enum class249 implements Enumerated {
    @ObfuscatedGetter(
       intValue = 2070321655
    )
-   public final int field3275;
+   @Export("value")
+   public final int value;
    @ObfuscatedName("o")
    @ObfuscatedGetter(
       intValue = 1686539261
    )
-   final int field3276;
+   @Export("id")
+   final int id;
 
-   class249(int var3, int var4) {
-      this.field3275 = var3;
-      this.field3276 = var4;
+   private VerticalAlignment(int var3, int var4) {
+      this.value = var3;
+      this.id = var4;
    }
 
    @ObfuscatedName("f")
@@ -44,6 +48,6 @@ public enum class249 implements Enumerated {
    )
    @Export("rsOrdinal")
    public int rsOrdinal() {
-      return this.field3276;
+      return this.id;
    }
 }
diff --git a/runescape-client/src/main/java/ViewportMouse.java b/runescape-client/src/main/java/ViewportMouse.java
index c1ff7b8b25..ae4ed28680 100644
--- a/runescape-client/src/main/java/ViewportMouse.java
+++ b/runescape-client/src/main/java/ViewportMouse.java
@@ -3,6 +3,7 @@ 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("dm")
 @Implements("ViewportMouse")
@@ -29,22 +30,22 @@ public class ViewportMouse {
    @ObfuscatedGetter(
       intValue = 1135175963
    )
-   static int __dm_u;
+   static int field951;
    @ObfuscatedName("g")
    @ObfuscatedGetter(
       intValue = 262104267
    )
-   static int __dm_g;
+   static int field952;
    @ObfuscatedName("l")
    @ObfuscatedGetter(
       intValue = -2071972829
    )
-   static int __dm_l;
+   static int field953;
    @ObfuscatedName("k")
    @ObfuscatedGetter(
       intValue = -852671813
    )
-   static int __dm_k;
+   static int field954;
    @ObfuscatedName("i")
    @ObfuscatedGetter(
       intValue = -2140977119
@@ -55,15 +56,6 @@ public class ViewportMouse {
    @Export("ViewportMouse_entityTags")
    public static long[] ViewportMouse_entityTags;
 
-   static {
-      ViewportMouse_isInViewport = false;
-      ViewportMouse_x = 0;
-      ViewportMouse_y = 0;
-      ViewportMouse_false0 = false;
-      ViewportMouse_entityCount = 0;
-      ViewportMouse_entityTags = new long[1000];
-   }
-
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "(IB)Lic;",
@@ -71,7 +63,7 @@ public class ViewportMouse {
    )
    @Export("getWorldMapElement")
    public static WorldMapElement getWorldMapElement(int var0) {
-      return var0 >= 0 && var0 < Widget.WorldMapElement_cached.length && Widget.WorldMapElement_cached[var0] != null?Widget.WorldMapElement_cached[var0]:new WorldMapElement(var0);
+      return var0 >= 0 && var0 < Widget.WorldMapElement_cached.length && Widget.WorldMapElement_cached[var0] != null ? Widget.WorldMapElement_cached[var0] : new WorldMapElement(var0);
    }
 
    @ObfuscatedName("h")
@@ -81,22 +73,22 @@ public class ViewportMouse {
    )
    static int method2983(int var0, Script var1, boolean var2) {
       Widget var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
-      if(var0 == 2500) {
+      if (var0 == ScriptOpcodes.IF_GETX) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.x;
          return 1;
-      } else if(var0 == 2501) {
+      } else if (var0 == ScriptOpcodes.IF_GETY) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.y;
          return 1;
-      } else if(var0 == 2502) {
+      } else if (var0 == ScriptOpcodes.IF_GETWIDTH) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.width;
          return 1;
-      } else if(var0 == 2503) {
+      } else if (var0 == ScriptOpcodes.IF_GETHEIGHT) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.height;
          return 1;
-      } else if(var0 == 2504) {
-         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.isHidden?1:0;
+      } else if (var0 == ScriptOpcodes.IF_GETHIDE) {
+         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0;
          return 1;
-      } else if(var0 == 2505) {
+      } else if (var0 == ScriptOpcodes.IF_GETLAYER) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.parentId;
          return 1;
       } else {
@@ -111,40 +103,49 @@ public class ViewportMouse {
    )
    static final boolean method2957(Widget var0) {
       int var1 = var0.contentType;
-      if(var1 == 205) {
-         Client.__client_fd = 250;
+      if (var1 == 205) {
+         Client.field175 = 250;
          return true;
       } else {
          int var2;
          int var3;
-         if(var1 >= 300 && var1 <= 313) {
+         if (var1 >= 300 && var1 <= 313) {
             var2 = (var1 - 300) / 2;
             var3 = var1 & 1;
-            Client.__client_ru.__f_386(var2, var3 == 1);
+            Client.playerAppearance.method257(var2, var3 == 1);
          }
 
-         if(var1 >= 314 && var1 <= 323) {
+         if (var1 >= 314 && var1 <= 323) {
             var2 = (var1 - 314) / 2;
             var3 = var1 & 1;
-            Client.__client_ru.__q_387(var2, var3 == 1);
+            Client.playerAppearance.method258(var2, var3 == 1);
          }
 
-         if(var1 == 324) {
-            Client.__client_ru.__w_388(false);
+         if (var1 == 324) {
+            Client.playerAppearance.method259(false);
          }
 
-         if(var1 == 325) {
-            Client.__client_ru.__w_388(true);
+         if (var1 == 325) {
+            Client.playerAppearance.method259(true);
          }
 
-         if(var1 == 326) {
-            PacketBufferNode var4 = Interpreter.method1915(ClientPacket.__gs_n, Client.packetWriter.isaacCipher);
-            Client.__client_ru.__o_389(var4.packetBuffer);
-            Client.packetWriter.__q_167(var4);
+         if (var1 == 326) {
+            PacketBufferNode var4 = Interpreter.method1915(ClientPacket.field234, Client.packetWriter.isaacCipher);
+            Client.playerAppearance.method260(var4.packetBuffer);
+            Client.packetWriter.method241(var4);
             return true;
          } else {
             return false;
          }
       }
    }
+
+   static {
+      ViewportMouse_isInViewport = false;
+      ViewportMouse_x = 0;
+      ViewportMouse_y = 0;
+      ViewportMouse_false0 = false;
+      ViewportMouse_entityCount = 0;
+      ViewportMouse_entityTags = new long[1000];
+   }
 }
diff --git a/runescape-client/src/main/java/WallDecoration.java b/runescape-client/src/main/java/WallDecoration.java
index b472fef687..66423c855c 100644
--- a/runescape-client/src/main/java/WallDecoration.java
+++ b/runescape-client/src/main/java/WallDecoration.java
@@ -85,14 +85,14 @@ public final class WallDecoration {
       garbageValue = "1120739015"
    )
    public static int method3257(byte[] var0, int var1) {
-      int var3 = -1;
+      int var2 = -1;
 
-      for(int var4 = 0; var4 < var1; ++var4) {
-         var3 = var3 >>> 8 ^ Buffer.__gr_q[(var3 ^ var0[var4]) & 255];
+      for (int var3 = 0; var3 < var1; ++var3) {
+         var2 = var2 >>> 8 ^ Buffer.crc32Table[(var2 ^ var0[var3]) & 255];
       }
 
-      var3 = ~var3;
-      return var3;
+      var2 = ~var2;
+      return var2;
    }
 
    @ObfuscatedName("t")
@@ -101,6 +101,6 @@ public final class WallDecoration {
       garbageValue = "-881894911"
    )
    public static int method3256(int var0) {
-      return var0 > 0?1:(var0 < 0?-1:0);
+      return var0 > 0 ? 1 : (var0 < 0 ? -1 : 0);
    }
 }
diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java
index afda76d29b..69b5dca3b4 100644
--- a/runescape-client/src/main/java/Widget.java
+++ b/runescape-client/src/main/java/Widget.java
@@ -17,22 +17,22 @@ public class Widget extends Node {
    @ObfuscatedSignature(
       signature = "[[Lho;"
    )
-   @Export("widgets")
-   public static Widget[][] widgets;
+   @Export("interfaceComponents")
+   public static Widget[][] interfaceComponents;
    @ObfuscatedName("l")
-   @Export("loadedWidgetGroups")
-   public static boolean[] loadedWidgetGroups;
+   @Export("loadedInterfaces")
+   public static boolean[] loadedInterfaces;
    @ObfuscatedName("e")
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   @Export("Widget_indexCache")
-   public static AbstractIndexCache Widget_indexCache;
+   @Export("Widget_archive")
+   public static AbstractArchive Widget_archive;
    @ObfuscatedName("d")
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   public static AbstractIndexCache __ho_d;
+   public static AbstractArchive field955;
    @ObfuscatedName("n")
    @ObfuscatedSignature(
       signature = "Ler;"
@@ -55,9 +55,9 @@ public class Widget extends Node {
    @ObfuscatedSignature(
       signature = "Ler;"
    )
-   static EvictingDualNodeHashTable __ho_z;
+   static EvictingDualNodeHashTable field956;
    @ObfuscatedName("j")
-   public static boolean __ho_j;
+   public static boolean field957;
    @ObfuscatedName("s")
    @Export("isIf3")
    public boolean isIf3;
@@ -167,12 +167,12 @@ public class Widget extends Node {
    @ObfuscatedGetter(
       intValue = 206556853
    )
-   public int __aw;
+   public int field958;
    @ObfuscatedName("al")
    @ObfuscatedGetter(
       intValue = -1047989223
    )
-   public int __al;
+   public int field959;
    @ObfuscatedName("ab")
    @ObfuscatedGetter(
       intValue = -617209253
@@ -249,7 +249,7 @@ public class Widget extends Node {
    @ObfuscatedGetter(
       intValue = -1853255291
    )
-   public int __af;
+   public int field960;
    @ObfuscatedName("ai")
    @ObfuscatedGetter(
       intValue = -110526699
@@ -257,7 +257,7 @@ public class Widget extends Node {
    @Export("lineWid")
    public int lineWid;
    @ObfuscatedName("ba")
-   public boolean __ba;
+   public boolean field961;
    @ObfuscatedName("bb")
    @ObfuscatedGetter(
       intValue = -1074168553
@@ -373,17 +373,18 @@ public class Widget extends Node {
    @ObfuscatedGetter(
       intValue = -1692331135
    )
-   public int __bf;
+   public int field962;
    @ObfuscatedName("bh")
    @ObfuscatedGetter(
       intValue = 727421593
    )
-   public int __bh;
+   public int field963;
    @ObfuscatedName("be")
    @Export("modelOrthog")
    public boolean modelOrthog;
    @ObfuscatedName("bv")
-   public boolean __bv;
+   @Export("modelTransparency")
+   public boolean modelTransparency;
    @ObfuscatedName("bw")
    @ObfuscatedGetter(
       intValue = -1658511475
@@ -454,15 +455,15 @@ public class Widget extends Node {
    @Export("clickMask")
    public int clickMask;
    @ObfuscatedName("cg")
-   public boolean __cg;
+   public boolean field965;
    @ObfuscatedName("cf")
-   public byte[][] __cf;
+   public byte[][] field966;
    @ObfuscatedName("cp")
-   public byte[][] __cp;
+   public byte[][] field967;
    @ObfuscatedName("cc")
-   public int[] __cc;
+   public int[] field968;
    @ObfuscatedName("ci")
-   public int[] __ci;
+   public int[] field969;
    @ObfuscatedName("de")
    @Export("dataText")
    public String dataText;
@@ -560,27 +561,34 @@ public class Widget extends Node {
    @Export("onScroll")
    public Object[] onScroll;
    @ObfuscatedName("em")
-   public Object[] __em;
+   @Export("onChatTransmit")
+   public Object[] onChatTransmit;
    @ObfuscatedName("ed")
-   @Export("onKeyListener")
-   public Object[] onKeyListener;
+   @Export("onKey")
+   public Object[] onKey;
    @ObfuscatedName("ex")
-   public Object[] __ex;
+   @Export("onFriendTransmit")
+   public Object[] onFriendTransmit;
    @ObfuscatedName("ej")
-   public Object[] __ej;
+   @Export("onClanTransmit")
+   public Object[] onClanTransmit;
    @ObfuscatedName("el")
-   public Object[] __el;
+   @Export("onMiscTransmit")
+   public Object[] onMiscTransmit;
    @ObfuscatedName("en")
-   @Export("onDialogAbortListener")
-   public Object[] onDialogAbortListener;
+   @Export("onDialogAbort")
+   public Object[] onDialogAbort;
    @ObfuscatedName("ei")
-   public Object[] __ei;
+   @Export("onSubChange")
+   public Object[] onSubChange;
    @ObfuscatedName("ee")
-   public Object[] __ee;
+   @Export("onResize")
+   public Object[] onResize;
    @ObfuscatedName("eq")
-   public Object[] __eq;
+   @Export("onStockTransmit")
+   public Object[] onStockTransmit;
    @ObfuscatedName("eh")
-   public Object[] __eh;
+   public Object[] field977;
    @ObfuscatedName("eo")
    @Export("cs1Instructions")
    public int[][] cs1Instructions;
@@ -639,29 +647,29 @@ public class Widget extends Node {
    @Export("children")
    public Widget[] children;
    @ObfuscatedName("fq")
-   public boolean __fq;
+   public boolean field978;
    @ObfuscatedName("fw")
-   public boolean __fw;
+   public boolean field979;
    @ObfuscatedName("fg")
    @ObfuscatedGetter(
       intValue = -1520351537
    )
-   public int __fg;
+   public int field980;
    @ObfuscatedName("fc")
    @ObfuscatedGetter(
       intValue = 209458049
    )
-   public int __fc;
+   public int field981;
    @ObfuscatedName("fl")
    @ObfuscatedGetter(
       intValue = -672198209
    )
-   public int __fl;
+   public int field982;
    @ObfuscatedName("fj")
    @ObfuscatedGetter(
       intValue = 876695207
    )
-   public int __fj;
+   public int field983;
    @ObfuscatedName("fp")
    @ObfuscatedGetter(
       intValue = 365867737
@@ -675,7 +683,7 @@ public class Widget extends Node {
    @Export("cycle")
    public int cycle;
    @ObfuscatedName("fh")
-   public int[] __fh;
+   public int[] field984;
    @ObfuscatedName("fx")
    @Export("noClickThrough")
    public boolean noClickThrough;
@@ -683,15 +691,7 @@ public class Widget extends Node {
    @Export("noScrollThrough")
    public boolean noScrollThrough;
    @ObfuscatedName("fz")
-   public boolean __fz;
-
-   static {
-      widgetSpriteCache = new EvictingDualNodeHashTable(200);
-      Widget_cachedModels = new EvictingDualNodeHashTable(50);
-      Widget_cachedFonts = new EvictingDualNodeHashTable(20);
-      __ho_z = new EvictingDualNodeHashTable(8);
-      __ho_j = false;
-   }
+   public boolean field985;
 
    public Widget() {
       this.isIf3 = false;
@@ -711,8 +711,8 @@ public class Widget extends Node {
       this.y = 0;
       this.width = 0;
       this.height = 0;
-      this.__aw = 1;
-      this.__al = 1;
+      this.field958 = 1;
+      this.field959 = 1;
       this.parentId = -1;
       this.isHidden = false;
       this.scrollX = 0;
@@ -724,11 +724,11 @@ public class Widget extends Node {
       this.mouseOverColor = 0;
       this.mouseOverColor2 = 0;
       this.fill = false;
-      this.rectangleMode = RectangleMode.__lj_m;
+      this.rectangleMode = RectangleMode.SOLID;
       this.transparency = 0;
-      this.__af = 0;
+      this.field960 = 0;
       this.lineWid = 1;
-      this.__ba = false;
+      this.field961 = false;
       this.spriteId2 = -1;
       this.spriteId = -1;
       this.spriteAngle = 0;
@@ -747,10 +747,10 @@ public class Widget extends Node {
       this.modelAngleY = 0;
       this.modelAngleZ = 0;
       this.modelZoom = 100;
-      this.__bf = 0;
-      this.__bh = 0;
+      this.field962 = 0;
+      this.field963 = 0;
       this.modelOrthog = false;
-      this.__bv = false;
+      this.modelTransparency = false;
       this.itemQuantityMode = 2;
       this.fontId = -1;
       this.text = "";
@@ -762,7 +762,7 @@ public class Widget extends Node {
       this.paddingX = 0;
       this.paddingY = 0;
       this.clickMask = 0;
-      this.__cg = false;
+      this.field965 = false;
       this.dataText = "";
       this.parent = null;
       this.dragZoneSize = 0;
@@ -777,17 +777,17 @@ public class Widget extends Node {
       this.itemQuantity = 0;
       this.modelFrame = 0;
       this.modelFrameCycle = 0;
-      this.__fq = false;
-      this.__fw = false;
-      this.__fg = -1;
-      this.__fc = 0;
-      this.__fl = 0;
-      this.__fj = 0;
+      this.field978 = false;
+      this.field979 = false;
+      this.field980 = -1;
+      this.field981 = 0;
+      this.field982 = 0;
+      this.field983 = 0;
       this.rootIndex = -1;
       this.cycle = -1;
       this.noClickThrough = false;
       this.noScrollThrough = false;
-      this.__fz = false;
+      this.field985 = false;
    }
 
    @ObfuscatedName("o")
@@ -796,106 +796,106 @@ public class Widget extends Node {
       garbageValue = "688173225"
    )
    @Export("decodeLegacy")
-   void decodeLegacy(Buffer var1) {
+   void decodeLegacy(Buffer buffer) {
       this.isIf3 = false;
-      this.type = var1.readUnsignedByte();
-      this.buttonType = var1.readUnsignedByte();
-      this.contentType = var1.__ag_302();
-      this.rawX = var1.__aq_303();
-      this.rawY = var1.__aq_303();
-      this.rawWidth = var1.__ag_302();
-      this.rawHeight = var1.__ag_302();
-      this.transparency = var1.readUnsignedByte();
-      this.parentId = var1.__ag_302();
-      if(this.parentId == 65535) {
+      this.type = buffer.readUnsignedByte();
+      this.buttonType = buffer.readUnsignedByte();
+      this.contentType = buffer.readUnsignedShort();
+      this.rawX = buffer.readShort();
+      this.rawY = buffer.readShort();
+      this.rawWidth = buffer.readUnsignedShort();
+      this.rawHeight = buffer.readUnsignedShort();
+      this.transparency = buffer.readUnsignedByte();
+      this.parentId = buffer.readUnsignedShort();
+      if (this.parentId == 65535) {
          this.parentId = -1;
       } else {
          this.parentId += this.id & -65536;
       }
 
-      this.mouseOverRedirect = var1.__ag_302();
-      if(this.mouseOverRedirect == 65535) {
+      this.mouseOverRedirect = buffer.readUnsignedShort();
+      if (this.mouseOverRedirect == 65535) {
          this.mouseOverRedirect = -1;
       }
 
-      int var2 = var1.readUnsignedByte();
+      int var2 = buffer.readUnsignedByte();
       int var3;
-      if(var2 > 0) {
+      if (var2 > 0) {
          this.cs1Comparisons = new int[var2];
          this.cs1ComparisonValues = new int[var2];
 
-         for(var3 = 0; var3 < var2; ++var3) {
-            this.cs1Comparisons[var3] = var1.readUnsignedByte();
-            this.cs1ComparisonValues[var3] = var1.__ag_302();
+         for (var3 = 0; var3 < var2; ++var3) {
+            this.cs1Comparisons[var3] = buffer.readUnsignedByte();
+            this.cs1ComparisonValues[var3] = buffer.readUnsignedShort();
          }
       }
 
-      var3 = var1.readUnsignedByte();
+      var3 = buffer.readUnsignedByte();
       int var4;
       int var5;
       int var6;
-      if(var3 > 0) {
+      if (var3 > 0) {
          this.cs1Instructions = new int[var3][];
 
-         for(var4 = 0; var4 < var3; ++var4) {
-            var5 = var1.__ag_302();
+         for (var4 = 0; var4 < var3; ++var4) {
+            var5 = buffer.readUnsignedShort();
             this.cs1Instructions[var4] = new int[var5];
 
-            for(var6 = 0; var6 < var5; ++var6) {
-               this.cs1Instructions[var4][var6] = var1.__ag_302();
-               if(this.cs1Instructions[var4][var6] == 65535) {
+            for (var6 = 0; var6 < var5; ++var6) {
+               this.cs1Instructions[var4][var6] = buffer.readUnsignedShort();
+               if (this.cs1Instructions[var4][var6] == 65535) {
                   this.cs1Instructions[var4][var6] = -1;
                }
             }
          }
       }
 
-      if(this.type == 0) {
-         this.scrollHeight = var1.__ag_302();
-         this.isHidden = var1.readUnsignedByte() == 1;
+      if (this.type == 0) {
+         this.scrollHeight = buffer.readUnsignedShort();
+         this.isHidden = buffer.readUnsignedByte() == 1;
       }
 
-      if(this.type == 1) {
-         var1.__ag_302();
-         var1.readUnsignedByte();
+      if (this.type == 1) {
+         buffer.readUnsignedShort();
+         buffer.readUnsignedByte();
       }
 
-      if(this.type == 2) {
+      if (this.type == 2) {
          this.itemIds = new int[this.rawHeight * this.rawWidth];
          this.itemQuantities = new int[this.rawWidth * this.rawHeight];
-         var4 = var1.readUnsignedByte();
-         if(var4 == 1) {
+         var4 = buffer.readUnsignedByte();
+         if (var4 == 1) {
             this.clickMask |= 268435456;
          }
 
-         var5 = var1.readUnsignedByte();
-         if(var5 == 1) {
+         var5 = buffer.readUnsignedByte();
+         if (var5 == 1) {
             this.clickMask |= 1073741824;
          }
 
-         var6 = var1.readUnsignedByte();
-         if(var6 == 1) {
+         var6 = buffer.readUnsignedByte();
+         if (var6 == 1) {
             this.clickMask |= Integer.MIN_VALUE;
          }
 
-         int var7 = var1.readUnsignedByte();
-         if(var7 == 1) {
+         int var7 = buffer.readUnsignedByte();
+         if (var7 == 1) {
             this.clickMask |= 536870912;
          }
 
-         this.paddingX = var1.readUnsignedByte();
-         this.paddingY = var1.readUnsignedByte();
+         this.paddingX = buffer.readUnsignedByte();
+         this.paddingY = buffer.readUnsignedByte();
          this.inventoryXOffsets = new int[20];
          this.inventoryYOffsets = new int[20];
          this.inventorySprites = new int[20];
 
          int var8;
-         for(var8 = 0; var8 < 20; ++var8) {
-            int var9 = var1.readUnsignedByte();
-            if(var9 == 1) {
-               this.inventoryXOffsets[var8] = var1.__aq_303();
-               this.inventoryYOffsets[var8] = var1.__aq_303();
-               this.inventorySprites[var8] = var1.readInt();
+         for (var8 = 0; var8 < 20; ++var8) {
+            int var9 = buffer.readUnsignedByte();
+            if (var9 == 1) {
+               this.inventoryXOffsets[var8] = buffer.readShort();
+               this.inventoryYOffsets[var8] = buffer.readShort();
+               this.inventorySprites[var8] = buffer.readInt();
             } else {
                this.inventorySprites[var8] = -1;
             }
@@ -903,145 +903,145 @@ public class Widget extends Node {
 
          this.itemActions = new String[5];
 
-         for(var8 = 0; var8 < 5; ++var8) {
-            String var11 = var1.readStringCp1252NullTerminated();
-            if(var11.length() > 0) {
+         for (var8 = 0; var8 < 5; ++var8) {
+            String var11 = buffer.readStringCp1252NullTerminated();
+            if (var11.length() > 0) {
                this.itemActions[var8] = var11;
                this.clickMask |= 1 << var8 + 23;
             }
          }
       }
 
-      if(this.type == 3) {
-         this.fill = var1.readUnsignedByte() == 1;
+      if (this.type == 3) {
+         this.fill = buffer.readUnsignedByte() == 1;
       }
 
-      if(this.type == 4 || this.type == 1) {
-         this.textXAlignment = var1.readUnsignedByte();
-         this.textYAlignment = var1.readUnsignedByte();
-         this.textLineHeight = var1.readUnsignedByte();
-         this.fontId = var1.__ag_302();
-         if(this.fontId == 65535) {
+      if (this.type == 4 || this.type == 1) {
+         this.textXAlignment = buffer.readUnsignedByte();
+         this.textYAlignment = buffer.readUnsignedByte();
+         this.textLineHeight = buffer.readUnsignedByte();
+         this.fontId = buffer.readUnsignedShort();
+         if (this.fontId == 65535) {
             this.fontId = -1;
          }
 
-         this.textShadowed = var1.readUnsignedByte() == 1;
+         this.textShadowed = buffer.readUnsignedByte() == 1;
       }
 
-      if(this.type == 4) {
-         this.text = var1.readStringCp1252NullTerminated();
-         this.text2 = var1.readStringCp1252NullTerminated();
+      if (this.type == 4) {
+         this.text = buffer.readStringCp1252NullTerminated();
+         this.text2 = buffer.readStringCp1252NullTerminated();
       }
 
-      if(this.type == 1 || this.type == 3 || this.type == 4) {
-         this.color = var1.readInt();
+      if (this.type == 1 || this.type == 3 || this.type == 4) {
+         this.color = buffer.readInt();
       }
 
-      if(this.type == 3 || this.type == 4) {
-         this.color2 = var1.readInt();
-         this.mouseOverColor = var1.readInt();
-         this.mouseOverColor2 = var1.readInt();
+      if (this.type == 3 || this.type == 4) {
+         this.color2 = buffer.readInt();
+         this.mouseOverColor = buffer.readInt();
+         this.mouseOverColor2 = buffer.readInt();
       }
 
-      if(this.type == 5) {
-         this.spriteId2 = var1.readInt();
-         this.spriteId = var1.readInt();
+      if (this.type == 5) {
+         this.spriteId2 = buffer.readInt();
+         this.spriteId = buffer.readInt();
       }
 
-      if(this.type == 6) {
+      if (this.type == 6) {
          this.modelType = 1;
-         this.modelId = var1.__ag_302();
-         if(this.modelId == 65535) {
+         this.modelId = buffer.readUnsignedShort();
+         if (this.modelId == 65535) {
             this.modelId = -1;
          }
 
          this.modelType2 = 1;
-         this.modelId2 = var1.__ag_302();
-         if(this.modelId2 == 65535) {
+         this.modelId2 = buffer.readUnsignedShort();
+         if (this.modelId2 == 65535) {
             this.modelId2 = -1;
          }
 
-         this.sequenceId = var1.__ag_302();
-         if(this.sequenceId == 65535) {
+         this.sequenceId = buffer.readUnsignedShort();
+         if (this.sequenceId == 65535) {
             this.sequenceId = -1;
          }
 
-         this.sequenceId2 = var1.__ag_302();
-         if(this.sequenceId2 == 65535) {
+         this.sequenceId2 = buffer.readUnsignedShort();
+         if (this.sequenceId2 == 65535) {
             this.sequenceId2 = -1;
          }
 
-         this.modelZoom = var1.__ag_302();
-         this.modelAngleX = var1.__ag_302();
-         this.modelAngleY = var1.__ag_302();
+         this.modelZoom = buffer.readUnsignedShort();
+         this.modelAngleX = buffer.readUnsignedShort();
+         this.modelAngleY = buffer.readUnsignedShort();
       }
 
-      if(this.type == 7) {
+      if (this.type == 7) {
          this.itemIds = new int[this.rawHeight * this.rawWidth];
          this.itemQuantities = new int[this.rawWidth * this.rawHeight];
-         this.textXAlignment = var1.readUnsignedByte();
-         this.fontId = var1.__ag_302();
-         if(this.fontId == 65535) {
+         this.textXAlignment = buffer.readUnsignedByte();
+         this.fontId = buffer.readUnsignedShort();
+         if (this.fontId == 65535) {
             this.fontId = -1;
          }
 
-         this.textShadowed = var1.readUnsignedByte() == 1;
-         this.color = var1.readInt();
-         this.paddingX = var1.__aq_303();
-         this.paddingY = var1.__aq_303();
-         var4 = var1.readUnsignedByte();
-         if(var4 == 1) {
+         this.textShadowed = buffer.readUnsignedByte() == 1;
+         this.color = buffer.readInt();
+         this.paddingX = buffer.readShort();
+         this.paddingY = buffer.readShort();
+         var4 = buffer.readUnsignedByte();
+         if (var4 == 1) {
             this.clickMask |= 1073741824;
          }
 
          this.itemActions = new String[5];
 
-         for(var5 = 0; var5 < 5; ++var5) {
-            String var10 = var1.readStringCp1252NullTerminated();
-            if(var10.length() > 0) {
+         for (var5 = 0; var5 < 5; ++var5) {
+            String var10 = buffer.readStringCp1252NullTerminated();
+            if (var10.length() > 0) {
                this.itemActions[var5] = var10;
                this.clickMask |= 1 << var5 + 23;
             }
          }
       }
 
-      if(this.type == 8) {
-         this.text = var1.readStringCp1252NullTerminated();
+      if (this.type == 8) {
+         this.text = buffer.readStringCp1252NullTerminated();
       }
 
-      if(this.buttonType == 2 || this.type == 2) {
-         this.spellActionName = var1.readStringCp1252NullTerminated();
-         this.spellName = var1.readStringCp1252NullTerminated();
-         var4 = var1.__ag_302() & 63;
+      if (this.buttonType == 2 || this.type == 2) {
+         this.spellActionName = buffer.readStringCp1252NullTerminated();
+         this.spellName = buffer.readStringCp1252NullTerminated();
+         var4 = buffer.readUnsignedShort() & 63;
          this.clickMask |= var4 << 11;
       }
 
-      if(this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5 || this.buttonType == 6) {
-         this.buttonText = var1.readStringCp1252NullTerminated();
-         if(this.buttonText.length() == 0) {
-            if(this.buttonType == 1) {
+      if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5 || this.buttonType == 6) {
+         this.buttonText = buffer.readStringCp1252NullTerminated();
+         if (this.buttonText.length() == 0) {
+            if (this.buttonType == 1) {
                this.buttonText = "Ok";
             }
 
-            if(this.buttonType == 4) {
+            if (this.buttonType == 4) {
                this.buttonText = "Select";
             }
 
-            if(this.buttonType == 5) {
+            if (this.buttonType == 5) {
                this.buttonText = "Select";
             }
 
-            if(this.buttonType == 6) {
+            if (this.buttonType == 6) {
                this.buttonText = "Continue";
             }
          }
       }
 
-      if(this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5) {
+      if (this.buttonType == 1 || this.buttonType == 4 || this.buttonType == 5) {
          this.clickMask |= 4194304;
       }
 
-      if(this.buttonType == 6) {
+      if (this.buttonType == 6) {
          this.clickMask |= 1;
       }
 
@@ -1053,140 +1053,140 @@ public class Widget extends Node {
       garbageValue = "-1967445442"
    )
    @Export("decode")
-   void decode(Buffer var1) {
-      var1.readUnsignedByte();
+   void decode(Buffer buffer) {
+      buffer.readUnsignedByte();
       this.isIf3 = true;
-      this.type = var1.readUnsignedByte();
-      this.contentType = var1.__ag_302();
-      this.rawX = var1.__aq_303();
-      this.rawY = var1.__aq_303();
-      this.rawWidth = var1.__ag_302();
-      if(this.type == 9) {
-         this.rawHeight = var1.__aq_303();
+      this.type = buffer.readUnsignedByte();
+      this.contentType = buffer.readUnsignedShort();
+      this.rawX = buffer.readShort();
+      this.rawY = buffer.readShort();
+      this.rawWidth = buffer.readUnsignedShort();
+      if (this.type == 9) {
+         this.rawHeight = buffer.readShort();
       } else {
-         this.rawHeight = var1.__ag_302();
+         this.rawHeight = buffer.readUnsignedShort();
       }
 
-      this.widthAlignment = var1.readByte();
-      this.heightAlignment = var1.readByte();
-      this.xAlignment = var1.readByte();
-      this.yAlignment = var1.readByte();
-      this.parentId = var1.__ag_302();
-      if(this.parentId == 65535) {
+      this.widthAlignment = buffer.readByte();
+      this.heightAlignment = buffer.readByte();
+      this.xAlignment = buffer.readByte();
+      this.yAlignment = buffer.readByte();
+      this.parentId = buffer.readUnsignedShort();
+      if (this.parentId == 65535) {
          this.parentId = -1;
       } else {
          this.parentId += this.id & -65536;
       }
 
-      this.isHidden = var1.readUnsignedByte() == 1;
-      if(this.type == 0) {
-         this.scrollWidth = var1.__ag_302();
-         this.scrollHeight = var1.__ag_302();
-         this.noClickThrough = var1.readUnsignedByte() == 1;
+      this.isHidden = buffer.readUnsignedByte() == 1;
+      if (this.type == 0) {
+         this.scrollWidth = buffer.readUnsignedShort();
+         this.scrollHeight = buffer.readUnsignedShort();
+         this.noClickThrough = buffer.readUnsignedByte() == 1;
       }
 
-      if(this.type == 5) {
-         this.spriteId2 = var1.readInt();
-         this.spriteAngle = var1.__ag_302();
-         this.spriteTiling = var1.readUnsignedByte() == 1;
-         this.transparency = var1.readUnsignedByte();
-         this.outline = var1.readUnsignedByte();
-         this.spriteShadow = var1.readInt();
-         this.spriteFlipV = var1.readUnsignedByte() == 1;
-         this.spriteFlipH = var1.readUnsignedByte() == 1;
+      if (this.type == 5) {
+         this.spriteId2 = buffer.readInt();
+         this.spriteAngle = buffer.readUnsignedShort();
+         this.spriteTiling = buffer.readUnsignedByte() == 1;
+         this.transparency = buffer.readUnsignedByte();
+         this.outline = buffer.readUnsignedByte();
+         this.spriteShadow = buffer.readInt();
+         this.spriteFlipV = buffer.readUnsignedByte() == 1;
+         this.spriteFlipH = buffer.readUnsignedByte() == 1;
       }
 
-      if(this.type == 6) {
+      if (this.type == 6) {
          this.modelType = 1;
-         this.modelId = var1.__ag_302();
-         if(this.modelId == 65535) {
+         this.modelId = buffer.readUnsignedShort();
+         if (this.modelId == 65535) {
             this.modelId = -1;
          }
 
-         this.modelOffsetX = var1.__aq_303();
-         this.modelOffsetY = var1.__aq_303();
-         this.modelAngleX = var1.__ag_302();
-         this.modelAngleY = var1.__ag_302();
-         this.modelAngleZ = var1.__ag_302();
-         this.modelZoom = var1.__ag_302();
-         this.sequenceId = var1.__ag_302();
-         if(this.sequenceId == 65535) {
+         this.modelOffsetX = buffer.readShort();
+         this.modelOffsetY = buffer.readShort();
+         this.modelAngleX = buffer.readUnsignedShort();
+         this.modelAngleY = buffer.readUnsignedShort();
+         this.modelAngleZ = buffer.readUnsignedShort();
+         this.modelZoom = buffer.readUnsignedShort();
+         this.sequenceId = buffer.readUnsignedShort();
+         if (this.sequenceId == 65535) {
             this.sequenceId = -1;
          }
 
-         this.modelOrthog = var1.readUnsignedByte() == 1;
-         var1.__ag_302();
-         if(this.widthAlignment != 0) {
-            this.__bf = var1.__ag_302();
+         this.modelOrthog = buffer.readUnsignedByte() == 1;
+         buffer.readUnsignedShort();
+         if (this.widthAlignment != 0) {
+            this.field962 = buffer.readUnsignedShort();
          }
 
-         if(this.heightAlignment != 0) {
-            var1.__ag_302();
+         if (this.heightAlignment != 0) {
+            buffer.readUnsignedShort();
          }
       }
 
-      if(this.type == 4) {
-         this.fontId = var1.__ag_302();
-         if(this.fontId == 65535) {
+      if (this.type == 4) {
+         this.fontId = buffer.readUnsignedShort();
+         if (this.fontId == 65535) {
             this.fontId = -1;
          }
 
-         this.text = var1.readStringCp1252NullTerminated();
-         this.textLineHeight = var1.readUnsignedByte();
-         this.textXAlignment = var1.readUnsignedByte();
-         this.textYAlignment = var1.readUnsignedByte();
-         this.textShadowed = var1.readUnsignedByte() == 1;
-         this.color = var1.readInt();
+         this.text = buffer.readStringCp1252NullTerminated();
+         this.textLineHeight = buffer.readUnsignedByte();
+         this.textXAlignment = buffer.readUnsignedByte();
+         this.textYAlignment = buffer.readUnsignedByte();
+         this.textShadowed = buffer.readUnsignedByte() == 1;
+         this.color = buffer.readInt();
       }
 
-      if(this.type == 3) {
-         this.color = var1.readInt();
-         this.fill = var1.readUnsignedByte() == 1;
-         this.transparency = var1.readUnsignedByte();
+      if (this.type == 3) {
+         this.color = buffer.readInt();
+         this.fill = buffer.readUnsignedByte() == 1;
+         this.transparency = buffer.readUnsignedByte();
       }
 
-      if(this.type == 9) {
-         this.lineWid = var1.readUnsignedByte();
-         this.color = var1.readInt();
-         this.__ba = var1.readUnsignedByte() == 1;
+      if (this.type == 9) {
+         this.lineWid = buffer.readUnsignedByte();
+         this.color = buffer.readInt();
+         this.field961 = buffer.readUnsignedByte() == 1;
       }
 
-      this.clickMask = var1.readMedium();
-      this.dataText = var1.readStringCp1252NullTerminated();
-      int var2 = var1.readUnsignedByte();
-      if(var2 > 0) {
+      this.clickMask = buffer.readMedium();
+      this.dataText = buffer.readStringCp1252NullTerminated();
+      int var2 = buffer.readUnsignedByte();
+      if (var2 > 0) {
          this.actions = new String[var2];
 
-         for(int var3 = 0; var3 < var2; ++var3) {
-            this.actions[var3] = var1.readStringCp1252NullTerminated();
+         for (int var3 = 0; var3 < var2; ++var3) {
+            this.actions[var3] = buffer.readStringCp1252NullTerminated();
          }
       }
 
-      this.dragZoneSize = var1.readUnsignedByte();
-      this.dragThreshold = var1.readUnsignedByte();
-      this.isScrollBar = var1.readUnsignedByte() == 1;
-      this.spellActionName = var1.readStringCp1252NullTerminated();
-      this.onLoad = this.readListener(var1);
-      this.onMouseOver = this.readListener(var1);
-      this.onMouseLeave = this.readListener(var1);
-      this.onTargetLeave = this.readListener(var1);
-      this.onTargetEnter = this.readListener(var1);
-      this.onVarTransmit = this.readListener(var1);
-      this.onInvTransmit = this.readListener(var1);
-      this.onStatTransmit = this.readListener(var1);
-      this.onTimer = this.readListener(var1);
-      this.onOp = this.readListener(var1);
-      this.onMouseRepeat = this.readListener(var1);
-      this.onClick = this.readListener(var1);
-      this.onClickRepeat = this.readListener(var1);
-      this.onRelease = this.readListener(var1);
-      this.onHold = this.readListener(var1);
-      this.onDrag = this.readListener(var1);
-      this.onDragComplete = this.readListener(var1);
-      this.onScroll = this.readListener(var1);
-      this.varTransmitTriggers = this.readListenerTriggers(var1);
-      this.invTransmitTriggers = this.readListenerTriggers(var1);
-      this.statTransmitTriggers = this.readListenerTriggers(var1);
+      this.dragZoneSize = buffer.readUnsignedByte();
+      this.dragThreshold = buffer.readUnsignedByte();
+      this.isScrollBar = buffer.readUnsignedByte() == 1;
+      this.spellActionName = buffer.readStringCp1252NullTerminated();
+      this.onLoad = this.readListener(buffer);
+      this.onMouseOver = this.readListener(buffer);
+      this.onMouseLeave = this.readListener(buffer);
+      this.onTargetLeave = this.readListener(buffer);
+      this.onTargetEnter = this.readListener(buffer);
+      this.onVarTransmit = this.readListener(buffer);
+      this.onInvTransmit = this.readListener(buffer);
+      this.onStatTransmit = this.readListener(buffer);
+      this.onTimer = this.readListener(buffer);
+      this.onOp = this.readListener(buffer);
+      this.onMouseRepeat = this.readListener(buffer);
+      this.onClick = this.readListener(buffer);
+      this.onClickRepeat = this.readListener(buffer);
+      this.onRelease = this.readListener(buffer);
+      this.onHold = this.readListener(buffer);
+      this.onDrag = this.readListener(buffer);
+      this.onDragComplete = this.readListener(buffer);
+      this.onScroll = this.readListener(buffer);
+      this.varTransmitTriggers = this.readListenerTriggers(buffer);
+      this.invTransmitTriggers = this.readListenerTriggers(buffer);
+      this.statTransmitTriggers = this.readListenerTriggers(buffer);
    }
 
    @ObfuscatedName("g")
@@ -1195,19 +1195,19 @@ public class Widget extends Node {
       garbageValue = "1906438788"
    )
    @Export("readListener")
-   Object[] readListener(Buffer var1) {
-      int var2 = var1.readUnsignedByte();
-      if(var2 == 0) {
+   Object[] readListener(Buffer buffer) {
+      int var2 = buffer.readUnsignedByte();
+      if (var2 == 0) {
          return null;
       } else {
          Object[] var3 = new Object[var2];
 
-         for(int var4 = 0; var4 < var2; ++var4) {
-            int var5 = var1.readUnsignedByte();
-            if(var5 == 0) {
-               var3[var4] = new Integer(var1.readInt());
-            } else if(var5 == 1) {
-               var3[var4] = var1.readStringCp1252NullTerminated();
+         for (int var4 = 0; var4 < var2; ++var4) {
+            int var5 = buffer.readUnsignedByte();
+            if (var5 == 0) {
+               var3[var4] = new Integer(buffer.readInt());
+            } else if (var5 == 1) {
+               var3[var4] = buffer.readStringCp1252NullTerminated();
             }
          }
 
@@ -1222,15 +1222,15 @@ public class Widget extends Node {
       garbageValue = "1"
    )
    @Export("readListenerTriggers")
-   int[] readListenerTriggers(Buffer var1) {
-      int var2 = var1.readUnsignedByte();
-      if(var2 == 0) {
+   int[] readListenerTriggers(Buffer buffer) {
+      int var2 = buffer.readUnsignedByte();
+      if (var2 == 0) {
          return null;
       } else {
          int[] var3 = new int[var2];
 
-         for(int var4 = 0; var4 < var2; ++var4) {
-            var3[var4] = var1.readInt();
+         for (int var4 = 0; var4 < var2; ++var4) {
+            var3[var4] = buffer.readInt();
          }
 
          return var3;
@@ -1243,13 +1243,13 @@ public class Widget extends Node {
       garbageValue = "1403134294"
    )
    @Export("swapItems")
-   public void swapItems(int var1, int var2) {
-      int var3 = this.itemIds[var2];
-      this.itemIds[var2] = this.itemIds[var1];
-      this.itemIds[var1] = var3;
-      var3 = this.itemQuantities[var2];
-      this.itemQuantities[var2] = this.itemQuantities[var1];
-      this.itemQuantities[var1] = var3;
+   public void swapItems(int indexA, int indexB) {
+      int var3 = this.itemIds[indexB];
+      this.itemIds[indexB] = this.itemIds[indexA];
+      this.itemIds[indexA] = var3;
+      var3 = this.itemQuantities[indexB];
+      this.itemQuantities[indexB] = this.itemQuantities[indexA];
+      this.itemQuantities[indexA] = var3;
    }
 
    @ObfuscatedName("x")
@@ -1259,49 +1259,49 @@ public class Widget extends Node {
    )
    @Export("getSprite")
    public Sprite getSprite(boolean var1) {
-      __ho_j = false;
+      field957 = false;
       int var2;
-      if(var1) {
+      if (var1) {
          var2 = this.spriteId;
       } else {
          var2 = this.spriteId2;
       }
 
-      if(var2 == -1) {
+      if (var2 == -1) {
          return null;
       } else {
-         long var3 = ((this.spriteFlipV?1L:0L) << 38) + (long)var2 + ((long)this.outline << 36) + ((this.spriteFlipH?1L:0L) << 39) + ((long)this.spriteShadow << 40);
-         Sprite var5 = (Sprite) widgetSpriteCache.get(var3);
-         if(var5 != null) {
+         long var3 = ((this.spriteFlipV ? 1L : 0L) << 38) + (long)var2 + ((long)this.outline << 36) + ((this.spriteFlipH ? 1L : 0L) << 39) + ((long)this.spriteShadow << 40);
+         Sprite var5 = (Sprite)widgetSpriteCache.get(var3);
+         if (var5 != null) {
             return var5;
          } else {
-            var5 = class322.readSprite(__ho_d, var2, 0);
-            if(var5 == null) {
-               __ho_j = true;
+            var5 = class322.readSprite(field955, var2, 0);
+            if (var5 == null) {
+               field957 = true;
                return null;
             } else {
-               if(this.spriteFlipV) {
-                  var5.__g_501();
+               if (this.spriteFlipV) {
+                  var5.method306();
                }
 
-               if(this.spriteFlipH) {
-                  var5.__u_500();
+               if (this.spriteFlipH) {
+                  var5.method305();
                }
 
-               if(this.outline > 0) {
-                  var5.__o_499(this.outline);
+               if (this.outline > 0) {
+                  var5.method304(this.outline);
                }
 
-               if(this.outline >= 1) {
-                  var5.__l_502(1);
+               if (this.outline >= 1) {
+                  var5.outline(1);
                }
 
-               if(this.outline >= 2) {
-                  var5.__l_502(16777215);
+               if (this.outline >= 2) {
+                  var5.outline(16777215);
                }
 
-               if(this.spriteShadow != 0) {
-                  var5.__e_503(this.spriteShadow);
+               if (this.spriteShadow != 0) {
+                  var5.shadow(this.spriteShadow);
                }
 
                widgetSpriteCache.put(var5, var3);
@@ -1318,19 +1318,19 @@ public class Widget extends Node {
    )
    @Export("getFont")
    public Font getFont() {
-      __ho_j = false;
-      if(this.fontId == -1) {
+      field957 = false;
+      if (this.fontId == -1) {
          return null;
       } else {
          Font var1 = (Font)Widget_cachedFonts.get((long)this.fontId);
-         if(var1 != null) {
+         if (var1 != null) {
             return var1;
          } else {
-            var1 = SpriteIds.method5823(__ho_d, class27.__aq_k, this.fontId, 0);
-            if(var1 != null) {
+            var1 = GraphicsDefaults.method5823(field955, class27.field1143, this.fontId, 0);
+            if (var1 != null) {
                Widget_cachedFonts.put(var1, (long)this.fontId);
             } else {
-               __ho_j = true;
+               field957 = true;
             }
 
             return var1;
@@ -1345,21 +1345,21 @@ public class Widget extends Node {
    )
    @Export("getInventorySprite")
    public Sprite getInventorySprite(int var1) {
-      __ho_j = false;
-      if(var1 >= 0 && var1 < this.inventorySprites.length) {
+      field957 = false;
+      if (var1 >= 0 && var1 < this.inventorySprites.length) {
          int var2 = this.inventorySprites[var1];
-         if(var2 == -1) {
+         if (var2 == -1) {
             return null;
          } else {
-            Sprite var3 = (Sprite) widgetSpriteCache.get((long)var2);
-            if(var3 != null) {
+            Sprite var3 = (Sprite)widgetSpriteCache.get((long)var2);
+            if (var3 != null) {
                return var3;
             } else {
-               var3 = class322.readSprite(__ho_d, var2, 0);
-               if(var3 != null) {
+               var3 = class322.readSprite(field955, var2, 0);
+               if (var3 != null) {
                   widgetSpriteCache.put(var3, (long)var2);
                } else {
-                  __ho_j = true;
+                  field957 = true;
                }
 
                return var3;
@@ -1376,11 +1376,11 @@ public class Widget extends Node {
       garbageValue = "1082545676"
    )
    @Export("getModel")
-   public Model getModel(SequenceDefinition var1, int var2, boolean var3, PlayerAppearance var4) {
-      __ho_j = false;
+   public Model getModel(SequenceDefinition sequence, int frame, boolean var3, PlayerAppearance appearance) {
+      field957 = false;
       int var5;
       int var6;
-      if(var3) {
+      if (var3) {
          var5 = this.modelType2;
          var6 = this.modelId2;
       } else {
@@ -1388,53 +1388,53 @@ public class Widget extends Node {
          var6 = this.modelId;
       }
 
-      if(var5 == 0) {
+      if (var5 == 0) {
          return null;
-      } else if(var5 == 1 && var6 == -1) {
+      } else if (var5 == 1 && var6 == -1) {
          return null;
       } else {
          Model var7 = (Model)Widget_cachedModels.get((long)(var6 + (var5 << 16)));
-         if(var7 == null) {
+         if (var7 == null) {
             ModelData var8;
-            if(var5 == 1) {
-               var8 = ModelData.method2788(BufferedSource.__fh_x, var6, 0);
-               if(var8 == null) {
-                  __ho_j = true;
+            if (var5 == 1) {
+               var8 = ModelData.method2788(BufferedSource.field54, var6, 0);
+               if (var8 == null) {
+                  field957 = true;
                   return null;
                }
 
                var7 = var8.toModel(64, 768, -50, -10, -50);
             }
 
-            if(var5 == 2) {
+            if (var5 == 2) {
                var8 = ObjectDefinition.getNpcDefinition(var6).getModelData();
-               if(var8 == null) {
-                  __ho_j = true;
+               if (var8 == null) {
+                  field957 = true;
                   return null;
                }
 
                var7 = var8.toModel(64, 768, -50, -10, -50);
             }
 
-            if(var5 == 3) {
-               if(var4 == null) {
+            if (var5 == 3) {
+               if (appearance == null) {
                   return null;
                }
 
-               var8 = var4.getModelData();
-               if(var8 == null) {
-                  __ho_j = true;
+               var8 = appearance.getModelData();
+               if (var8 == null) {
+                  field957 = true;
                   return null;
                }
 
                var7 = var8.toModel(64, 768, -50, -10, -50);
             }
 
-            if(var5 == 4) {
+            if (var5 == 4) {
                ItemDefinition var9 = Skills.getItemDefinition(var6);
-               var8 = var9.__l_429(10);
-               if(var8 == null) {
-                  __ho_j = true;
+               var8 = var9.method143(10);
+               if (var8 == null) {
+                  field957 = true;
                   return null;
                }
 
@@ -1444,8 +1444,8 @@ public class Widget extends Node {
             Widget_cachedModels.put(var7, (long)(var6 + (var5 << 16)));
          }
 
-         if(var1 != null) {
-            var7 = var1.animateWidget(var7, var2);
+         if (sequence != null) {
+            var7 = sequence.animateWidget(var7, frame);
          }
 
          return var7;
@@ -1459,41 +1459,41 @@ public class Widget extends Node {
    )
    @Export("getSpriteMask")
    public SpriteMask getSpriteMask(boolean var1) {
-      if(this.spriteId == -1) {
+      if (this.spriteId == -1) {
          var1 = false;
       }
 
-      int var2 = var1?this.spriteId:this.spriteId2;
-      if(var2 == -1) {
+      int var2 = var1 ? this.spriteId : this.spriteId2;
+      if (var2 == -1) {
          return null;
       } else {
-         long var3 = ((long)this.spriteShadow << 40) + ((this.spriteFlipH?1L:0L) << 39) + ((this.spriteFlipV?1L:0L) << 38) + ((long)this.outline << 36) + (long)var2;
-         SpriteMask var5 = (SpriteMask)__ho_z.get(var3);
-         if(var5 != null) {
+         long var3 = ((long)this.spriteShadow << 40) + ((this.spriteFlipH ? 1L : 0L) << 39) + ((this.spriteFlipV ? 1L : 0L) << 38) + ((long)this.outline << 36) + (long)var2;
+         SpriteMask var5 = (SpriteMask)field956.get(var3);
+         if (var5 != null) {
             return var5;
          } else {
             Sprite var6 = this.getSprite(var1);
-            if(var6 == null) {
+            if (var6 == null) {
                return null;
             } else {
                Sprite var7 = var6.copyNormalized();
                int[] var8 = new int[var7.subHeight];
                int[] var9 = new int[var7.subHeight];
 
-               for(int var10 = 0; var10 < var7.subHeight; ++var10) {
+               for (int var10 = 0; var10 < var7.subHeight; ++var10) {
                   int var11 = 0;
                   int var12 = var7.subWidth;
 
                   int var13;
-                  for(var13 = 0; var13 < var7.subWidth; ++var13) {
-                     if(var7.pixels[var13 + var10 * var7.subWidth] == 0) {
+                  for (var13 = 0; var13 < var7.subWidth; ++var13) {
+                     if (var7.pixels[var13 + var10 * var7.subWidth] == 0) {
                         var11 = var13;
                         break;
                      }
                   }
 
-                  for(var13 = var7.subWidth - 1; var13 >= var11; --var13) {
-                     if(var7.pixels[var13 + var10 * var7.subWidth] == 0) {
+                  for (var13 = var7.subWidth - 1; var13 >= var11; --var13) {
+                     if (var7.pixels[var13 + var10 * var7.subWidth] == 0) {
                         var12 = var13 + 1;
                         break;
                      }
@@ -1504,7 +1504,7 @@ public class Widget extends Node {
                }
 
                var5 = new SpriteMask(var7.subWidth, var7.subHeight, var9, var8, var2);
-               __ho_z.put(var5, var3);
+               field956.put(var5, var3);
                return var5;
             }
          }
@@ -1517,11 +1517,11 @@ public class Widget extends Node {
       garbageValue = "-30"
    )
    @Export("setAction")
-   public void setAction(int var1, String var2) {
-      if(this.actions == null || this.actions.length <= var1) {
-         String[] var3 = new String[var1 + 1];
-         if(this.actions != null) {
-            for(int var4 = 0; var4 < this.actions.length; ++var4) {
+   public void setAction(int index, String var2) {
+      if (this.actions == null || this.actions.length <= index) {
+         String[] var3 = new String[index + 1];
+         if (this.actions != null) {
+            for (int var4 = 0; var4 < this.actions.length; ++var4) {
                var3[var4] = this.actions[var4];
             }
          }
@@ -1529,7 +1529,7 @@ public class Widget extends Node {
          this.actions = var3;
       }
 
-      this.actions[var1] = var2;
+      this.actions[index] = var2;
    }
 
    @ObfuscatedName("m")
@@ -1537,27 +1537,35 @@ public class Widget extends Node {
       signature = "(I[BLff;I)V",
       garbageValue = "-1287305716"
    )
-   static void method4499(int var0, byte[] var1, IndexStore var2) {
-      IndexStoreAction var3 = new IndexStoreAction();
+   static void method4499(int var0, byte[] var1, ArchiveDisk var2) {
+      ArchiveDiskAction var3 = new ArchiveDiskAction();
       var3.type = 0;
       var3.key = (long)var0;
       var3.data = var1;
-      var3.indexStore = var2;
-      NodeDeque var4 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue;
-      synchronized(IndexStoreActionHandler.IndexStoreActionHandler_requestQueue) {
-         IndexStoreActionHandler.IndexStoreActionHandler_requestQueue.addFirst(var3);
+      var3.archiveDisk = var2;
+      NodeDeque var4 = ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue;
+      synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) {
+         ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3);
       }
 
-      Object var9 = IndexStoreActionHandler.IndexStoreActionHandler_lock;
-      synchronized(IndexStoreActionHandler.IndexStoreActionHandler_lock) {
-         if(IndexStoreActionHandler.__iv_q == 0) {
-            Frames.IndexStoreActionHandler_thread = new Thread(new IndexStoreActionHandler());
-            Frames.IndexStoreActionHandler_thread.setDaemon(true);
-            Frames.IndexStoreActionHandler_thread.start();
-            Frames.IndexStoreActionHandler_thread.setPriority(5);
+      Object var5 = ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock;
+      synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_lock) {
+         if (ArchiveDiskActionHandler.field412 == 0) {
+            Frames.ArchiveDiskActionHandler_thread = new Thread(new ArchiveDiskActionHandler());
+            Frames.ArchiveDiskActionHandler_thread.setDaemon(true);
+            Frames.ArchiveDiskActionHandler_thread.start();
+            Frames.ArchiveDiskActionHandler_thread.setPriority(5);
          }
 
-         IndexStoreActionHandler.__iv_q = 600;
+         ArchiveDiskActionHandler.field412 = 600;
       }
    }
+
+   static {
+      widgetSpriteCache = new EvictingDualNodeHashTable(200);
+      Widget_cachedModels = new EvictingDualNodeHashTable(50);
+      Widget_cachedFonts = new EvictingDualNodeHashTable(20);
+      field956 = new EvictingDualNodeHashTable(8);
+      field957 = false;
+   }
 }
diff --git a/runescape-client/src/main/java/World.java b/runescape-client/src/main/java/World.java
index 17297fb7e8..75467409f7 100644
--- a/runescape-client/src/main/java/World.java
+++ b/runescape-client/src/main/java/World.java
@@ -17,7 +17,8 @@ public class World {
    @ObfuscatedGetter(
       intValue = 1143875805
    )
-   static int __bt_g;
+   @Export("worldListWorldCount")
+   static int worldListWorldCount;
    @ObfuscatedName("l")
    @Export("sortOption2")
    static int[] sortOption2;
@@ -61,13 +62,6 @@ public class World {
    @Export("index")
    int index;
 
-   static {
-      worldsCount = 0;
-      __bt_g = 0;
-      sortOption2 = new int[]{1, 1, 1, 1};
-      sortOption1 = new int[]{0, 1, 2, 3};
-   }
-
    @ObfuscatedName("e")
    @ObfuscatedSignature(
       signature = "(I)Z",
@@ -83,7 +77,7 @@ public class World {
       signature = "(B)Z",
       garbageValue = "0"
    )
-   boolean __x_145() {
+   boolean method356() {
       return (2 & this.properties) != 0;
    }
 
@@ -102,7 +96,7 @@ public class World {
       signature = "(I)Z",
       garbageValue = "-1662622660"
    )
-   boolean __a_147() {
+   boolean method357() {
       return (8 & this.properties) != 0;
    }
 
@@ -113,7 +107,7 @@ public class World {
    )
    @Export("isDeadman")
    boolean isDeadman() {
-      return (0x20000000 & this.properties) != 0; // 1 << 29
+      return (536870912 & this.properties) != 0;
    }
 
    @ObfuscatedName("j")
@@ -123,7 +117,7 @@ public class World {
    )
    @Export("isBeta")
    boolean isBeta() {
-      return (0x2000000 & this.properties) != 0; // 1 << 25
+      return (33554432 & this.properties) != 0;
    }
 
    @ObfuscatedName("f")
@@ -140,4 +134,11 @@ public class World {
       var0 |= var0 >>> 16;
       return var0 + 1;
    }
+
+   static {
+      worldsCount = 0;
+      worldListWorldCount = 0;
+      sortOption2 = new int[]{1, 1, 1, 1};
+      sortOption1 = new int[]{0, 1, 2, 3};
+   }
 }
diff --git a/runescape-client/src/main/java/WorldMap.java b/runescape-client/src/main/java/WorldMap.java
index 13b495ddb3..2de1441c4f 100644
--- a/runescape-client/src/main/java/WorldMap.java
+++ b/runescape-client/src/main/java/WorldMap.java
@@ -35,17 +35,17 @@ public class WorldMap {
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   AbstractIndexCache __g;
+   AbstractArchive field989;
    @ObfuscatedName("l")
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   AbstractIndexCache __l;
+   AbstractArchive field990;
    @ObfuscatedName("e")
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   AbstractIndexCache __e;
+   AbstractArchive field991;
    @ObfuscatedName("n")
    @ObfuscatedSignature(
       signature = "Lkk;"
@@ -74,13 +74,13 @@ public class WorldMap {
    @ObfuscatedSignature(
       signature = "Lag;"
    )
-   @Export("currentMapArea0")
-   WorldMapArea currentMapArea0;
+   @Export("currentMapArea")
+   WorldMapArea currentMapArea;
    @ObfuscatedName("t")
    @ObfuscatedSignature(
       signature = "Lag;"
    )
-   WorldMapArea __t;
+   WorldMapArea field992;
    @ObfuscatedName("y")
    @ObfuscatedSignature(
       signature = "Lal;"
@@ -92,7 +92,7 @@ public class WorldMap {
       signature = "Lls;"
    )
    @Export("cacheLoader")
-   WorldMapIndexCacheLoader cacheLoader;
+   WorldMapArchiveLoader cacheLoader;
    @ObfuscatedName("b")
    @ObfuscatedGetter(
       intValue = 1711576969
@@ -151,15 +151,15 @@ public class WorldMap {
    @ObfuscatedGetter(
       intValue = -1653084915
    )
-   int __ac;
+   int field993;
    @ObfuscatedName("ay")
    @ObfuscatedGetter(
       intValue = 1664740569
    )
-   int __ay;
+   int field994;
    @ObfuscatedName("ah")
-   @Export("perpetualFlash0")
-   boolean perpetualFlash0;
+   @Export("perpetualFlash")
+   boolean perpetualFlash;
    @ObfuscatedName("ak")
    @Export("flashingElements")
    HashSet flashingElements;
@@ -167,49 +167,49 @@ public class WorldMap {
    @ObfuscatedGetter(
       intValue = -1683910031
    )
-   int __aw;
+   int field995;
    @ObfuscatedName("al")
    @ObfuscatedGetter(
       intValue = 2064651113
    )
-   int __al;
+   int field996;
    @ObfuscatedName("ab")
    @ObfuscatedGetter(
       intValue = -1979665983
    )
-   int __ab;
+   int field997;
    @ObfuscatedName("ae")
    @ObfuscatedGetter(
       intValue = 547126547
    )
-   int __ae;
+   int field998;
    @ObfuscatedName("at")
    @ObfuscatedGetter(
       intValue = -815748997
    )
-   int __at;
+   int field999;
    @ObfuscatedName("ad")
    @ObfuscatedGetter(
       intValue = -988933407
    )
-   int __ad;
+   int field1000;
    @ObfuscatedName("ap")
    @ObfuscatedGetter(
       longValue = -4747643242047040283L
    )
-   long __ap;
+   long field1001;
    @ObfuscatedName("as")
    @ObfuscatedGetter(
       intValue = -969094439
    )
-   int __as;
+   int field1002;
    @ObfuscatedName("am")
    @ObfuscatedGetter(
       intValue = -869889187
    )
-   int __am;
+   int field1003;
    @ObfuscatedName("an")
-   boolean __an;
+   boolean field1004;
    @ObfuscatedName("ao")
    @Export("enabledElements")
    HashSet enabledElements;
@@ -217,9 +217,9 @@ public class WorldMap {
    @Export("enabledCategories")
    HashSet enabledCategories;
    @ObfuscatedName("ax")
-   HashSet __ax;
+   HashSet field1005;
    @ObfuscatedName("af")
-   HashSet __af;
+   HashSet field1006;
    @ObfuscatedName("ai")
    @Export("elementsDisabled")
    boolean elementsDisabled;
@@ -227,22 +227,22 @@ public class WorldMap {
    @ObfuscatedGetter(
       intValue = -237734529
    )
-   int __ba;
+   int field1007;
    @ObfuscatedName("bs")
-   final int[] __bs;
+   final int[] field1008;
    @ObfuscatedName("bq")
-   List __bq;
+   List field1009;
    @ObfuscatedName("bn")
    @Export("iconIterator")
    Iterator iconIterator;
    @ObfuscatedName("bk")
-   HashSet __bk;
+   HashSet field1010;
    @ObfuscatedName("bd")
    @ObfuscatedSignature(
       signature = "Lhu;"
    )
    @Export("mouseCoord")
-   TileLocation mouseCoord;
+   Coord mouseCoord;
    @ObfuscatedName("bc")
    @Export("showCoord")
    public boolean showCoord;
@@ -256,28 +256,22 @@ public class WorldMap {
    @ObfuscatedGetter(
       intValue = 2031417343
    )
-   int __bx;
+   int field1011;
    @ObfuscatedName("by")
    @ObfuscatedGetter(
       intValue = 754899959
    )
-   int __by;
+   int field1012;
    @ObfuscatedName("bu")
    @ObfuscatedGetter(
       intValue = 2064728623
    )
-   int __bu;
+   int field1013;
    @ObfuscatedName("bm")
    @ObfuscatedGetter(
       intValue = -1774424249
    )
-   int __bm;
-
-   static {
-      fontNameVerdana11 = FontName.FontName_verdana11;
-      fontNameVerdana13 = FontName.FontName_verdana13;
-      fontNameVerdana15 = FontName.FontName_verdana15;
-   }
+   int field1014;
 
    public WorldMap() {
       this.worldMapTargetX = -1;
@@ -286,30 +280,30 @@ public class WorldMap {
       this.worldMapDisplayHeight = -1;
       this.worldMapDisplayX = -1;
       this.worldMapDisplayY = -1;
-      this.__ac = 3;
-      this.__ay = 50;
-      this.perpetualFlash0 = false;
+      this.field993 = 3;
+      this.field994 = 50;
+      this.perpetualFlash = false;
       this.flashingElements = null;
-      this.__aw = -1;
-      this.__al = -1;
-      this.__ab = -1;
-      this.__ae = -1;
-      this.__at = -1;
-      this.__ad = -1;
-      this.__an = true;
+      this.field995 = -1;
+      this.field996 = -1;
+      this.field997 = -1;
+      this.field998 = -1;
+      this.field999 = -1;
+      this.field1000 = -1;
+      this.field1004 = true;
       this.enabledElements = new HashSet();
       this.enabledCategories = new HashSet();
-      this.__ax = new HashSet();
-      this.__af = new HashSet();
+      this.field1005 = new HashSet();
+      this.field1006 = new HashSet();
       this.elementsDisabled = false;
-      this.__ba = 0;
-      this.__bs = new int[]{1008, 1009, 1010, 1011, 1012};
-      this.__bk = new HashSet();
+      this.field1007 = 0;
+      this.field1008 = new int[]{1008, 1009, 1010, 1011, 1012};
+      this.field1010 = new HashSet();
       this.mouseCoord = null;
       this.showCoord = false;
-      this.__by = -1;
-      this.__bu = -1;
-      this.__bm = -1;
+      this.field1012 = -1;
+      this.field1013 = -1;
+      this.field1014 = -1;
    }
 
    @ObfuscatedName("m")
@@ -318,33 +312,33 @@ public class WorldMap {
       garbageValue = "1887817097"
    )
    @Export("init")
-   public void init(AbstractIndexCache var1, AbstractIndexCache var2, AbstractIndexCache var3, Font var4, HashMap var5, IndexedSprite[] var6) {
+   public void init(AbstractArchive var1, AbstractArchive var2, AbstractArchive var3, Font var4, HashMap var5, IndexedSprite[] var6) {
       this.mapSceneSprites = var6;
-      this.__g = var1;
-      this.__l = var2;
-      this.__e = var3;
+      this.field989 = var1;
+      this.field990 = var2;
+      this.field991 = var3;
       this.font = var4;
       this.fonts = new HashMap();
       this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_small, var5.get(fontNameVerdana11));
       this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_medium, var5.get(fontNameVerdana13));
       this.fonts.put(WorldMapLabelSize.WorldMapLabelSize_large, var5.get(fontNameVerdana15));
-      this.cacheLoader = new WorldMapIndexCacheLoader(var1);
-      int var7 = this.__g.getArchiveId(WorldMapCacheName.WorldMapCacheName_details.name);
-      int[] var8 = this.__g.__j_395(var7);
+      this.cacheLoader = new WorldMapArchiveLoader(var1);
+      int var7 = this.field989.getGroupId(WorldMapCacheName.WorldMapCacheName_details.name);
+      int[] var8 = this.field989.method3(var7);
       this.mapAreas = new HashMap(var8.length);
 
-      for(int var9 = 0; var9 < var8.length; ++var9) {
-         Buffer var10 = new Buffer(this.__g.takeRecord(var7, var8[var9]));
+      for (int var9 = 0; var9 < var8.length; ++var9) {
+         Buffer var10 = new Buffer(this.field989.takeFile(var7, var8[var9]));
          WorldMapArea var11 = new WorldMapArea();
          var11.read(var10, var8[var9]);
          this.mapAreas.put(var11.archiveName(), var11);
-         if(var11.isMain()) {
+         if (var11.isMain()) {
             this.mainMapArea = var11;
          }
       }
 
       this.setCurrentMapArea(this.mainMapArea);
-      this.__t = null;
+      this.field992 = null;
    }
 
    @ObfuscatedName("f")
@@ -352,8 +346,8 @@ public class WorldMap {
       signature = "(I)V",
       garbageValue = "-1144390092"
    )
-   public void __f_518() {
-      WorldMapRegion.__av_o.demote(5);
+   public void method360() {
+      WorldMapRegion.field1051.demote(5);
    }
 
    @ObfuscatedName("q")
@@ -363,48 +357,49 @@ public class WorldMap {
    )
    @Export("onCycle")
    public void onCycle(int var1, int var2, boolean var3, int var4, int var5, int var6, int var7) {
-      if(this.cacheLoader.isLoaded()) {
+      if (this.cacheLoader.getIsLoaded()) {
          this.smoothZoom();
-         this.__g_521();
-         if(var3) {
+         this.method363();
+         if (var3) {
             int var8 = (int)Math.ceil((double)((float)var6 / this.zoom));
             int var9 = (int)Math.ceil((double)((float)var7 / this.zoom));
-            List var10 = this.worldMapManager.__u_74(this.worldMapX - var8 / 2 - 1, this.worldMapY - var9 / 2 - 1, var8 / 2 + this.worldMapX + 1, var9 / 2 + this.worldMapY + 1, var4, var5, var6, var7, var1, var2);
+            List var10 = this.worldMapManager.method403(this.worldMapX - var8 / 2 - 1, this.worldMapY - var9 / 2 - 1, var8 / 2 + this.worldMapX + 1, var9 / 2 + this.worldMapY + 1, var4, var5, var6, var7, var1, var2);
             HashSet var11 = new HashSet();
 
             Iterator var12;
             AbstractWorldMapIcon var13;
             ScriptEvent var14;
             WorldMapEvent var15;
-            for(var12 = var10.iterator(); var12.hasNext(); AbstractIndexCache.runScript(var14)) {
+            for (var12 = var10.iterator(); var12.hasNext(); AbstractArchive.runScript(var14)) {
                var13 = (AbstractWorldMapIcon)var12.next();
                var11.add(var13);
                var14 = new ScriptEvent();
-               var15 = new WorldMapEvent(var13.__m_15(), var13.coord1, var13.coord2);
-               var14.setArgs(new Object[]{var15, Integer.valueOf(var1), Integer.valueOf(var2)});
-               if(this.__bk.contains(var13)) {
+               var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2);
+               var14.setArgs(new Object[]{var15, var1, var2});
+               if (this.field1010.contains(var13)) {
                   var14.setType(17);
                } else {
                   var14.setType(15);
                }
             }
 
-            var12 = this.__bk.iterator();
+            var12 = this.field1010.iterator();
 
-            while(var12.hasNext()) {
+            while (var12.hasNext()) {
                var13 = (AbstractWorldMapIcon)var12.next();
-               if(!var11.contains(var13)) {
+               if (!var11.contains(var13)) {
                   var14 = new ScriptEvent();
-                  var15 = new WorldMapEvent(var13.__m_15(), var13.coord1, var13.coord2);
-                  var14.setArgs(new Object[]{var15, Integer.valueOf(var1), Integer.valueOf(var2)});
+                  var15 = new WorldMapEvent(var13.getElement(), var13.coord1, var13.coord2);
+                  var14.setArgs(new Object[]{var15, var1, var2});
                   var14.setType(16);
-                  AbstractIndexCache.runScript(var14);
+                  AbstractArchive.runScript(var14);
                }
             }
 
-            this.__bk = var11;
+            this.field1010 = var11;
          }
       }
+
    }
 
    @ObfuscatedName("w")
@@ -412,68 +407,69 @@ public class WorldMap {
       signature = "(IIZZS)V",
       garbageValue = "18431"
    )
-   public void __w_519(int var1, int var2, boolean var3, boolean var4) {
+   public void method361(int var1, int var2, boolean var3, boolean var4) {
       long var5 = class203.currentTimeMs();
-      this.__o_520(var1, var2, var4, var5);
-      if(!this.__x_524() && (var4 || var3)) {
-         if(var4) {
-            this.__at = var1;
-            this.__ad = var2;
-            this.__ab = this.worldMapX;
-            this.__ae = this.worldMapY;
+      this.method362(var1, var2, var4, var5);
+      if (this.method365() || !var4 && !var3) {
+         this.method364();
+      } else {
+         if (var4) {
+            this.field999 = var1;
+            this.field1000 = var2;
+            this.field997 = this.worldMapX;
+            this.field998 = this.worldMapY;
          }
 
-         if(this.__ab != -1) {
-            int var7 = var1 - this.__at;
-            int var8 = var2 - this.__ad;
-            this.setWorldMapPosition(this.__ab - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.__ae, false);
+         if (this.field997 != -1) {
+            int var7 = var1 - this.field999;
+            int var8 = var2 - this.field1000;
+            this.setWorldMapPosition(this.field997 - (int)((float)var7 / this.zoomTarget), (int)((float)var8 / this.zoomTarget) + this.field998, false);
          }
-      } else {
-         this.__e_523();
       }
 
-      if(var4) {
-         this.__ap = var5;
-         this.__as = var1;
-         this.__am = var2;
+      if (var4) {
+         this.field1001 = var5;
+         this.field1002 = var1;
+         this.field1003 = var2;
       }
 
    }
 
    @ObfuscatedName("o")
-   void __o_520(int var1, int var2, boolean var3, long var4) {
-      if(this.currentMapArea0 != null) {
-         int var6 = (int)((float)this.worldMapX + ((float)(var1 - this.worldMapDisplayX) - (float)this.__ap_537() * this.zoom / 2.0F) / this.zoom);
-         int var7 = (int)((float)this.worldMapY - ((float)(var2 - this.worldMapDisplayY) - (float)this.__as_538() * this.zoom / 2.0F) / this.zoom);
-         this.mouseCoord = this.currentMapArea0.coord(var6 + this.currentMapArea0.minX() * 64, var7 + this.currentMapArea0.minY() * 64);
-         if(this.mouseCoord != null && var3) {
+   void method362(int var1, int var2, boolean var3, long var4) {
+      if (this.currentMapArea != null) {
+         int var6 = (int)((float)this.worldMapX + ((float)(var1 - this.worldMapDisplayX) - (float)this.getDisplayWith() * this.zoom / 2.0F) / this.zoom);
+         int var7 = (int)((float)this.worldMapY - ((float)(var2 - this.worldMapDisplayY) - (float)this.getDisplayHeight() * this.zoom / 2.0F) / this.zoom);
+         this.mouseCoord = this.currentMapArea.coord(var6 + this.currentMapArea.minX() * 64, var7 + this.currentMapArea.minY() * 64);
+         if (this.mouseCoord != null && var3) {
+            int var8;
             int var9;
-            int var10;
-            if(FriendSystem.jmodCheck() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) {
-               int var13 = this.mouseCoord.x;
-               var9 = this.mouseCoord.y;
-               var10 = this.mouseCoord.plane;
-               PacketBufferNode var11 = Interpreter.method1915(ClientPacket.__gs_bx, Client.packetWriter.isaacCipher);
-               var11.packetBuffer.writeIntME(0);
-               var11.packetBuffer.writeShortLE(var9);
-               var11.packetBuffer.__ai_315(var10);
-               var11.packetBuffer.writeShort(var13);
-               Client.packetWriter.__q_167(var11);
+            PacketBufferNode var10;
+            if (FriendSystem.jmodCheck() && KeyHandler.KeyHandler_pressedKeys[82] && KeyHandler.KeyHandler_pressedKeys[81]) {
+               int var12 = this.mouseCoord.x;
+               var8 = this.mouseCoord.y;
+               var9 = this.mouseCoord.plane;
+               var10 = Interpreter.method1915(ClientPacket.field283, Client.packetWriter.isaacCipher);
+               var10.packetBuffer.writeIntME(0);
+               var10.packetBuffer.writeShortLE(var8);
+               var10.packetBuffer.method56(var9);
+               var10.packetBuffer.writeShort(var12);
+               Client.packetWriter.method241(var10);
             } else {
-               boolean var8 = true;
-               if(this.__an) {
-                  var9 = var1 - this.__as;
-                  var10 = var2 - this.__am;
-                  if(var4 - this.__ap > 500L || var9 < -25 || var9 > 25 || var10 < -25 || var10 > 25) {
-                     var8 = false;
+               boolean var11 = true;
+               if (this.field1004) {
+                  var8 = var1 - this.field1002;
+                  var9 = var2 - this.field1003;
+                  if (var4 - this.field1001 > 500L || var8 < -25 || var8 > 25 || var9 < -25 || var9 > 25) {
+                     var11 = false;
                   }
                }
 
-               if(var8) {
-                  PacketBufferNode var12 = Interpreter.method1915(ClientPacket.__gs_az, Client.packetWriter.isaacCipher);
-                  var12.packetBuffer.writeIntME(this.mouseCoord.packed());
-                  Client.packetWriter.__q_167(var12);
-                  this.__ap = 0L;
+               if (var11) {
+                  var10 = Interpreter.method1915(ClientPacket.field267, Client.packetWriter.isaacCipher);
+                  var10.packetBuffer.writeIntME(this.mouseCoord.packed());
+                  Client.packetWriter.method241(var10);
+                  this.field1001 = 0L;
                }
             }
          }
@@ -490,18 +486,18 @@ public class WorldMap {
    )
    @Export("smoothZoom")
    void smoothZoom() {
-      if(ClientParameter.field3645 != null) {
+      if (ClientParameter.field3645 != null) {
          this.zoom = this.zoomTarget;
       } else {
-         if(this.zoom < this.zoomTarget) {
+         if (this.zoom < this.zoomTarget) {
             this.zoom = Math.min(this.zoomTarget, this.zoom / 30.0F + this.zoom);
          }
 
-         if(this.zoom > this.zoomTarget) {
+         if (this.zoom > this.zoomTarget) {
             this.zoom = Math.max(this.zoomTarget, this.zoom - this.zoom / 30.0F);
          }
-
       }
+
    }
 
    @ObfuscatedName("g")
@@ -509,25 +505,25 @@ public class WorldMap {
       signature = "(I)V",
       garbageValue = "2075446341"
    )
-   void __g_521() {
-      if(this.__x_524()) {
+   void method363() {
+      if (this.method365()) {
          int var1 = this.worldMapTargetX - this.worldMapX;
          int var2 = this.worldMapTargetY - this.worldMapY;
-         if(var1 != 0) {
+         if (var1 != 0) {
             var1 /= Math.min(8, Math.abs(var1));
          }
 
-         if(var2 != 0) {
+         if (var2 != 0) {
             var2 /= Math.min(8, Math.abs(var2));
          }
 
          this.setWorldMapPosition(var1 + this.worldMapX, var2 + this.worldMapY, true);
-         if(this.worldMapTargetX == this.worldMapX && this.worldMapTargetY == this.worldMapY) {
+         if (this.worldMapTargetX == this.worldMapX && this.worldMapTargetY == this.worldMapY) {
             this.worldMapTargetX = -1;
             this.worldMapTargetY = -1;
          }
-
       }
+
    }
 
    @ObfuscatedName("l")
@@ -540,8 +536,8 @@ public class WorldMap {
       this.worldMapX = var1;
       this.worldMapY = var2;
       class203.currentTimeMs();
-      if(var3) {
-         this.__e_523();
+      if (var3) {
+         this.method364();
       }
 
    }
@@ -551,11 +547,11 @@ public class WorldMap {
       signature = "(B)V",
       garbageValue = "35"
    )
-   final void __e_523() {
-      this.__ad = -1;
-      this.__at = -1;
-      this.__ae = -1;
-      this.__ab = -1;
+   final void method364() {
+      this.field1000 = -1;
+      this.field999 = -1;
+      this.field998 = -1;
+      this.field997 = -1;
    }
 
    @ObfuscatedName("x")
@@ -563,7 +559,7 @@ public class WorldMap {
       signature = "(I)Z",
       garbageValue = "1444745621"
    )
-   boolean __x_524() {
+   boolean method365() {
       return this.worldMapTargetX != -1 && this.worldMapTargetY != -1;
    }
 
@@ -573,17 +569,17 @@ public class WorldMap {
       garbageValue = "1738506455"
    )
    @Export("mapAreaAtCoord")
-   public WorldMapArea mapAreaAtCoord(int var1, int var2, int var3) {
+   public WorldMapArea mapAreaAtCoord(int plane, int x, int y) {
       Iterator var4 = this.mapAreas.values().iterator();
 
       WorldMapArea var5;
       do {
-         if(!var4.hasNext()) {
+         if (!var4.hasNext()) {
             return null;
          }
 
          var5 = (WorldMapArea)var4.next();
-      } while(!var5.containsCoord(var1, var2, var3));
+      } while(!var5.containsCoord(plane, x, y));
 
       return var5;
    }
@@ -593,10 +589,10 @@ public class WorldMap {
       signature = "(IIIZI)V",
       garbageValue = "469045892"
    )
-   public void __a_525(int var1, int var2, int var3, boolean var4) {
+   public void method366(int var1, int var2, int var3, boolean var4) {
       WorldMapArea var5 = this.mapAreaAtCoord(var1, var2, var3);
-      if(var5 == null) {
-         if(!var4) {
+      if (var5 == null) {
+         if (!var4) {
             return;
          }
 
@@ -604,13 +600,13 @@ public class WorldMap {
       }
 
       boolean var6 = false;
-      if(var5 != this.__t || var4) {
-         this.__t = var5;
+      if (var5 != this.field992 || var4) {
+         this.field992 = var5;
          this.setCurrentMapArea(var5);
          var6 = true;
       }
 
-      if(var6 || var4) {
+      if (var6 || var4) {
          this.jump(var1, var2, var3);
       }
 
@@ -624,7 +620,7 @@ public class WorldMap {
    @Export("setCurrentMapAreaId")
    public void setCurrentMapAreaId(int var1) {
       WorldMapArea var2 = this.getMapArea(var1);
-      if(var2 != null) {
+      if (var2 != null) {
          this.setCurrentMapArea(var2);
       }
 
@@ -637,7 +633,7 @@ public class WorldMap {
    )
    @Export("currentMapAreaId")
    public int currentMapAreaId() {
-      return this.currentMapArea0 == null?-1:this.currentMapArea0.id();
+      return this.currentMapArea == null ? -1 : this.currentMapArea.id();
    }
 
    @ObfuscatedName("s")
@@ -647,7 +643,7 @@ public class WorldMap {
    )
    @Export("getCurrentMapArea")
    public WorldMapArea getCurrentMapArea() {
-      return this.currentMapArea0;
+      return this.currentMapArea;
    }
 
    @ObfuscatedName("t")
@@ -656,11 +652,12 @@ public class WorldMap {
       garbageValue = "-44"
    )
    @Export("setCurrentMapArea")
-   void setCurrentMapArea(WorldMapArea var1) {
-      if(this.currentMapArea0 == null || var1 != this.currentMapArea0) {
-         this.initializeWorldMap(var1);
+   void setCurrentMapArea(WorldMapArea mapArea) {
+      if (this.currentMapArea == null || mapArea != this.currentMapArea) {
+         this.initializeWorldMapManager(mapArea);
          this.jump(-1, -1, -1);
       }
+
    }
 
    @ObfuscatedName("y")
@@ -668,11 +665,11 @@ public class WorldMap {
       signature = "(Lag;I)V",
       garbageValue = "-1072205896"
    )
-   @Export("initializeWorldMap")
-   void initializeWorldMap(WorldMapArea var1) {
-      this.currentMapArea0 = var1;
-      this.worldMapManager = new WorldMapManager(this.mapSceneSprites, this.fonts, this.__l, this.__e);
-      this.cacheLoader.reset(this.currentMapArea0.archiveName());
+   @Export("initializeWorldMapManager")
+   void initializeWorldMapManager(WorldMapArea mapArea) {
+      this.currentMapArea = mapArea;
+      this.worldMapManager = new WorldMapManager(this.mapSceneSprites, this.fonts, this.field990, this.field991);
+      this.cacheLoader.reset(this.currentMapArea.archiveName());
    }
 
    @ObfuscatedName("h")
@@ -680,19 +677,19 @@ public class WorldMap {
       signature = "(Lag;Lhu;Lhu;ZI)V",
       garbageValue = "-1430939646"
    )
-   public void __h_526(WorldMapArea var1, TileLocation var2, TileLocation var3, boolean var4) {
-      if(var1 != null) {
-         if(this.currentMapArea0 == null || var1 != this.currentMapArea0) {
-            this.initializeWorldMap(var1);
+   public void method367(WorldMapArea var1, Coord var2, Coord var3, boolean var4) {
+      if (var1 != null) {
+         if (this.currentMapArea == null || var1 != this.currentMapArea) {
+            this.initializeWorldMapManager(var1);
          }
 
-         if(!var4 && this.currentMapArea0.containsCoord(var2.plane, var2.x, var2.y)) {
+         if (!var4 && this.currentMapArea.containsCoord(var2.plane, var2.x, var2.y)) {
             this.jump(var2.plane, var2.x, var2.y);
          } else {
             this.jump(var3.plane, var3.x, var3.y);
          }
-
       }
+
    }
 
    @ObfuscatedName("b")
@@ -701,22 +698,23 @@ public class WorldMap {
       garbageValue = "1094346962"
    )
    @Export("jump")
-   void jump(int var1, int var2, int var3) {
-      if(this.currentMapArea0 != null) {
-         int[] var4 = this.currentMapArea0.position(var1, var2, var3);
-         if(var4 == null) {
-            var4 = this.currentMapArea0.position(this.currentMapArea0.originPlane(), this.currentMapArea0.originX(), this.currentMapArea0.originY());
+   void jump(int plane, int x, int y) {
+      if (this.currentMapArea != null) {
+         int[] var4 = this.currentMapArea.position(plane, x, y);
+         if (var4 == null) {
+            var4 = this.currentMapArea.position(this.currentMapArea.originPlane(), this.currentMapArea.originX(), this.currentMapArea.originY());
          }
 
-         this.setWorldMapPosition(var4[0] - this.currentMapArea0.minX() * 64, var4[1] - this.currentMapArea0.minY() * 64, true);
+         this.setWorldMapPosition(var4[0] - this.currentMapArea.minX() * 64, var4[1] - this.currentMapArea.minY() * 64, true);
          this.worldMapTargetX = -1;
          this.worldMapTargetY = -1;
-         this.zoom = this.__av_529(this.currentMapArea0.zoom());
+         this.zoom = this.method370(this.currentMapArea.zoom());
          this.zoomTarget = this.zoom;
-         this.__bq = null;
+         this.field1009 = null;
          this.iconIterator = null;
          this.worldMapManager.clearIcons();
       }
+
    }
 
    @ObfuscatedName("c")
@@ -725,58 +723,59 @@ public class WorldMap {
       garbageValue = "-288419793"
    )
    @Export("draw")
-   public void draw(int var1, int var2, int var3, int var4, int var5) {
+   public void draw(int x, int y, int width, int height, int cycle) {
       int[] var6 = new int[4];
       Rasterizer2D.Rasterizer2D_getClipArray(var6);
-      Rasterizer2D.Rasterizer2D_setClip(var1, var2, var3 + var1, var2 + var4);
-      Rasterizer2D.Rasterizer2D_fillRectangle(var1, var2, var3, var4, -16777216);
-      int var7 = this.cacheLoader.percentLoaded();
-      if(var7 < 100) {
-         this.drawLoading(var1, var2, var3, var4, var7);
+      Rasterizer2D.Rasterizer2D_setClip(x, y, width + x, y + height);
+      Rasterizer2D.Rasterizer2D_fillRectangle(x, y, width, height, -16777216);
+      int var7 = this.cacheLoader.getPercentLoaded();
+      if (var7 < 100) {
+         this.drawLoading(x, y, width, height, var7);
       } else {
-         if(!this.worldMapManager.isLoaded()) {
-            this.worldMapManager.load(this.__g, this.currentMapArea0.archiveName(), Client.isMembersWorld);
-            if(!this.worldMapManager.isLoaded()) {
+         if (!this.worldMapManager.isLoaded()) {
+            this.worldMapManager.load(this.field989, this.currentMapArea.archiveName(), Client.isMembersWorld);
+            if (!this.worldMapManager.isLoaded()) {
                return;
             }
          }
 
-         if(this.flashingElements != null) {
-            ++this.__al;
-            if(this.__al % this.__ay == 0) {
-               this.__al = 0;
-               ++this.__aw;
+         if (this.flashingElements != null) {
+            ++this.field996;
+            if (this.field996 % this.field994 == 0) {
+               this.field996 = 0;
+               ++this.field995;
             }
 
-            if(this.__aw >= this.__ac && !this.perpetualFlash0) {
+            if (this.field995 >= this.field993 && !this.perpetualFlash) {
                this.flashingElements = null;
             }
          }
 
-         int var8 = (int)Math.ceil((double)((float)var3 / this.zoom));
-         int var9 = (int)Math.ceil((double)((float)var4 / this.zoom));
-         this.worldMapManager.__q_72(this.worldMapX - var8 / 2, this.worldMapY - var9 / 2, var8 / 2 + this.worldMapX, var9 / 2 + this.worldMapY, var1, var2, var3 + var1, var2 + var4);
-         if(!this.elementsDisabled) {
+         int var8 = (int)Math.ceil((double)((float)width / this.zoom));
+         int var9 = (int)Math.ceil((double)((float)height / this.zoom));
+         this.worldMapManager.method401(this.worldMapX - var8 / 2, this.worldMapY - var9 / 2, var8 / 2 + this.worldMapX, var9 / 2 + this.worldMapY, x, y, width + x, y + height);
+         if (!this.elementsDisabled) {
             boolean var10 = false;
-            if(var5 - this.__ba > 100) {
-               this.__ba = var5;
+            if (cycle - this.field1007 > 100) {
+               this.field1007 = cycle;
                var10 = true;
             }
 
-            this.worldMapManager.__w_73(this.worldMapX - var8 / 2, this.worldMapY - var9 / 2, var8 / 2 + this.worldMapX, var9 / 2 + this.worldMapY, var1, var2, var3 + var1, var2 + var4, this.__af, this.flashingElements, this.__al, this.__ay, var10);
+            this.worldMapManager.method402(this.worldMapX - var8 / 2, this.worldMapY - var9 / 2, var8 / 2 + this.worldMapX, var9 / 2 + this.worldMapY, x, y, width + x, y + height, this.field1006, this.flashingElements, this.field996, this.field994, var10);
          }
 
-         this.__v_528(var1, var2, var3, var4, var8, var9);
-         if(FriendSystem.jmodCheck() && this.showCoord && this.mouseCoord != null) {
+         this.method369(x, y, width, height, var8, var9);
+         if (FriendSystem.jmodCheck() && this.showCoord && this.mouseCoord != null) {
             this.font.draw("Coord: " + this.mouseCoord, Rasterizer2D.Rasterizer2D_xClipStart + 10, Rasterizer2D.Rasterizer2D_yClipStart + 20, 16776960, -1);
          }
 
          this.worldMapDisplayWidth = var8;
          this.worldMapDisplayHeight = var9;
-         this.worldMapDisplayX = var1;
-         this.worldMapDisplayY = var2;
+         this.worldMapDisplayX = x;
+         this.worldMapDisplayY = y;
          Rasterizer2D.Rasterizer2D_setClipArray(var6);
       }
+
    }
 
    @ObfuscatedName("p")
@@ -784,8 +783,8 @@ public class WorldMap {
       signature = "(IIIIIII)Z",
       garbageValue = "-1561237851"
    )
-   boolean __p_527(int var1, int var2, int var3, int var4, int var5, int var6) {
-      return this.sprite == null?true:(this.sprite.subWidth == var1 && this.sprite.subHeight == var2?(this.worldMapManager.__z != this.__bx?true:(this.__bm != Client.__client_ss?true:(var3 <= 0 && var4 <= 0?var3 + var1 < var5 || var2 + var4 < var6:true))):true);
+   boolean method368(int var1, int var2, int var3, int var4, int var5, int var6) {
+      return this.sprite == null ? true : (this.sprite.subWidth == var1 && this.sprite.subHeight == var2 ? (this.worldMapManager.field1050 != this.field1011 ? true : (this.field1014 != Client.field104 ? true : (var3 <= 0 && var4 <= 0 ? var3 + var1 < var5 || var2 + var4 < var6 : true))) : true);
    }
 
    @ObfuscatedName("v")
@@ -793,39 +792,39 @@ public class WorldMap {
       signature = "(IIIIIII)V",
       garbageValue = "-2090965249"
    )
-   void __v_528(int var1, int var2, int var3, int var4, int var5, int var6) {
-      if(ClientParameter.field3645 != null) {
-         int var7 = 512 / (this.worldMapManager.__z * 2);
+   void method369(int var1, int var2, int var3, int var4, int var5, int var6) {
+      if (ClientParameter.field3645 != null) {
+         int var7 = 512 / (this.worldMapManager.field1050 * 2);
          int var8 = var3 + 512;
          int var9 = var4 + 512;
          float var10 = 1.0F;
          var8 = (int)((float)var8 / var10);
          var9 = (int)((float)var9 / var10);
-         int var11 = this.__ae_534() - var5 / 2 - var7;
-         int var12 = this.__at_535() - var6 / 2 - var7;
-         int var13 = var1 - (var7 + var11 - this.__by) * this.worldMapManager.__z;
-         int var14 = var2 - this.worldMapManager.__z * (var7 - (var12 - this.__bu));
-         if(this.__p_527(var8, var9, var13, var14, var3, var4)) {
-            if(this.sprite != null && this.sprite.subWidth == var8 && this.sprite.subHeight == var9) {
+         int var11 = this.getDisplayX() - var5 / 2 - var7;
+         int var12 = this.getDisplayY() - var6 / 2 - var7;
+         int var13 = var1 - (var7 + var11 - this.field1012) * this.worldMapManager.field1050;
+         int var14 = var2 - this.worldMapManager.field1050 * (var7 - (var12 - this.field1013));
+         if (this.method368(var8, var9, var13, var14, var3, var4)) {
+            if (this.sprite != null && this.sprite.subWidth == var8 && this.sprite.subHeight == var9) {
                Arrays.fill(this.sprite.pixels, 0);
             } else {
                this.sprite = new Sprite(var8, var9);
             }
 
-            this.__by = this.__ae_534() - var5 / 2 - var7;
-            this.__bu = this.__at_535() - var6 / 2 - var7;
-            this.__bx = this.worldMapManager.__z;
-            ClientParameter.field3645.method4720(this.__by, this.__bu, this.sprite, (float)this.__bx / var10);
-            this.__bm = Client.__client_ss;
-            var13 = var1 - (var11 + var7 - this.__by) * this.worldMapManager.__z;
-            var14 = var2 - this.worldMapManager.__z * (var7 - (var12 - this.__bu));
+            this.field1012 = this.getDisplayX() - var5 / 2 - var7;
+            this.field1013 = this.getDisplayY() - var6 / 2 - var7;
+            this.field1011 = this.worldMapManager.field1050;
+            ClientParameter.field3645.method4720(this.field1012, this.field1013, this.sprite, (float)this.field1011 / var10);
+            this.field1014 = Client.field104;
+            var13 = var1 - (var11 + var7 - this.field1012) * this.worldMapManager.field1050;
+            var14 = var2 - this.worldMapManager.field1050 * (var7 - (var12 - this.field1013));
          }
 
          Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var1, var2, var3, var4, 0, 128);
-         if(1.0F == var10) {
-            this.sprite.__v_510(var13, var14, 192);
+         if (1.0F == var10) {
+            this.sprite.method312(var13, var14, 192);
          } else {
-            this.sprite.__aj_511(var13, var14, (int)(var10 * (float)var8), (int)((float)var9 * var10), 192);
+            this.sprite.method313(var13, var14, (int)(var10 * (float)var8), (int)((float)var9 * var10), 192);
          }
       }
 
@@ -837,17 +836,18 @@ public class WorldMap {
       garbageValue = "-84"
    )
    @Export("drawOverview")
-   public void drawOverview(int var1, int var2, int var3, int var4) {
-      if(this.cacheLoader.isLoaded()) {
-         if(!this.worldMapManager.isLoaded()) {
-            this.worldMapManager.load(this.__g, this.currentMapArea0.archiveName(), Client.isMembersWorld);
-            if(!this.worldMapManager.isLoaded()) {
+   public void drawOverview(int x, int y, int width, int height) {
+      if (this.cacheLoader.getIsLoaded()) {
+         if (!this.worldMapManager.isLoaded()) {
+            this.worldMapManager.load(this.field989, this.currentMapArea.archiveName(), Client.isMembersWorld);
+            if (!this.worldMapManager.isLoaded()) {
                return;
             }
          }
 
-         this.worldMapManager.drawOverview(var1, var2, var3, var4, this.flashingElements, this.__al, this.__ay);
+         this.worldMapManager.drawOverview(x, y, width, height, this.flashingElements, this.field996, this.field994);
       }
+
    }
 
    @ObfuscatedName("aq")
@@ -856,8 +856,8 @@ public class WorldMap {
       garbageValue = "328502073"
    )
    @Export("setZoomLevel")
-   public void setZoomLevel(int var1) {
-      this.zoomTarget = this.__av_529(var1);
+   public void setZoomLevel(int zoom) {
+      this.zoomTarget = this.method370(zoom);
    }
 
    @ObfuscatedName("aj")
@@ -881,8 +881,8 @@ public class WorldMap {
       signature = "(IB)F",
       garbageValue = "56"
    )
-   float __av_529(int var1) {
-      return var1 == 25?1.0F:(var1 == 37?1.5F:(var1 == 50?2.0F:(var1 == 75?3.0F:(var1 == 100?4.0F:8.0F))));
+   float method370(int var1) {
+      return var1 == 25 ? 1.0F : (var1 == 37 ? 1.5F : (var1 == 50 ? 2.0F : (var1 == 75 ? 3.0F : (var1 == 100 ? 4.0F : 8.0F))));
    }
 
    @ObfuscatedName("ar")
@@ -892,7 +892,7 @@ public class WorldMap {
    )
    @Export("getZoomLevel")
    public int getZoomLevel() {
-      return (double)this.zoomTarget == 1.0D?25:((double)this.zoomTarget == 1.5D?37:(2.0D == (double)this.zoomTarget?50:(3.0D == (double)this.zoomTarget?75:(4.0D == (double)this.zoomTarget?100:200))));
+      return (double)this.zoomTarget == 1.0D ? 25 : ((double)this.zoomTarget == 1.5D ? 37 : (2.0D == (double)this.zoomTarget ? 50 : (3.0D == (double)this.zoomTarget ? 75 : (4.0D == (double)this.zoomTarget ? 100 : 200))));
    }
 
    @ObfuscatedName("ac")
@@ -912,7 +912,7 @@ public class WorldMap {
    )
    @Export("isCacheLoaded")
    public boolean isCacheLoaded() {
-      return this.cacheLoader.isLoaded();
+      return this.cacheLoader.getIsLoaded();
    }
 
    @ObfuscatedName("ah")
@@ -926,7 +926,7 @@ public class WorldMap {
 
       WorldMapArea var3;
       do {
-         if(!var2.hasNext()) {
+         if (!var2.hasNext()) {
             return null;
          }
 
@@ -942,11 +942,12 @@ public class WorldMap {
       garbageValue = "1820000123"
    )
    @Export("setWorldMapPositionTarget")
-   public void setWorldMapPositionTarget(int var1, int var2) {
-      if(this.currentMapArea0 != null && this.currentMapArea0.containsPosition(var1, var2)) {
-         this.worldMapTargetX = var1 - this.currentMapArea0.minX() * 64;
-         this.worldMapTargetY = var2 - this.currentMapArea0.minY() * 64;
+   public void setWorldMapPositionTarget(int x, int y) {
+      if (this.currentMapArea != null && this.currentMapArea.containsPosition(x, y)) {
+         this.worldMapTargetX = x - this.currentMapArea.minX() * 64;
+         this.worldMapTargetY = y - this.currentMapArea.minY() * 64;
       }
+
    }
 
    @ObfuscatedName("aw")
@@ -954,12 +955,14 @@ public class WorldMap {
       signature = "(III)V",
       garbageValue = "-2147142500"
    )
-   public void __aw_531(int var1, int var2) {
-      if(this.currentMapArea0 != null) {
-         this.setWorldMapPosition(var1 - this.currentMapArea0.minX() * 64, var2 - this.currentMapArea0.minY() * 64, true);
+   @Export("setWorldMapPositionTargetInstant")
+   public void setWorldMapPositionTargetInstant(int x, int y) {
+      if (this.currentMapArea != null) {
+         this.setWorldMapPosition(x - this.currentMapArea.minX() * 64, y - this.currentMapArea.minY() * 64, true);
          this.worldMapTargetX = -1;
          this.worldMapTargetY = -1;
       }
+
    }
 
    @ObfuscatedName("al")
@@ -967,14 +970,15 @@ public class WorldMap {
       signature = "(IIIB)V",
       garbageValue = "-40"
    )
-   public void __al_532(int var1, int var2, int var3) {
-      if(this.currentMapArea0 != null) {
-         int[] var4 = this.currentMapArea0.position(var1, var2, var3);
-         if(var4 != null) {
+   @Export("jumpToSourceCoord")
+   public void jumpToSourceCoord(int plane, int x, int y) {
+      if (this.currentMapArea != null) {
+         int[] var4 = this.currentMapArea.position(plane, x, y);
+         if (var4 != null) {
             this.setWorldMapPositionTarget(var4[0], var4[1]);
          }
-
       }
+
    }
 
    @ObfuscatedName("ab")
@@ -982,14 +986,15 @@ public class WorldMap {
       signature = "(IIII)V",
       garbageValue = "1808854561"
    )
-   public void __ab_533(int var1, int var2, int var3) {
-      if(this.currentMapArea0 != null) {
-         int[] var4 = this.currentMapArea0.position(var1, var2, var3);
-         if(var4 != null) {
-            this.__aw_531(var4[0], var4[1]);
+   @Export("jumpToSourceCoordInstant")
+   public void jumpToSourceCoordInstant(int plane, int x, int y) {
+      if (this.currentMapArea != null) {
+         int[] var4 = this.currentMapArea.position(plane, x, y);
+         if (var4 != null) {
+            this.setWorldMapPositionTargetInstant(var4[0], var4[1]);
          }
-
       }
+
    }
 
    @ObfuscatedName("ae")
@@ -997,8 +1002,9 @@ public class WorldMap {
       signature = "(I)I",
       garbageValue = "-659556919"
    )
-   public int __ae_534() {
-      return this.currentMapArea0 == null?-1:this.worldMapX + this.currentMapArea0.minX() * 64;
+   @Export("getDisplayX")
+   public int getDisplayX() {
+      return this.currentMapArea == null ? -1 : this.worldMapX + this.currentMapArea.minX() * 64;
    }
 
    @ObfuscatedName("at")
@@ -1006,8 +1012,9 @@ public class WorldMap {
       signature = "(I)I",
       garbageValue = "1893257871"
    )
-   public int __at_535() {
-      return this.currentMapArea0 == null?-1:this.worldMapY + this.currentMapArea0.minY() * 64;
+   @Export("getDisplayY")
+   public int getDisplayY() {
+      return this.currentMapArea == null ? -1 : this.worldMapY + this.currentMapArea.minY() * 64;
    }
 
    @ObfuscatedName("ad")
@@ -1015,8 +1022,9 @@ public class WorldMap {
       signature = "(I)Lhu;",
       garbageValue = "-2005824064"
    )
-   public TileLocation __ad_536() {
-      return this.currentMapArea0 == null?null:this.currentMapArea0.coord(this.__ae_534(), this.__at_535());
+   @Export("getDisplayCoord")
+   public Coord getDisplayCoord() {
+      return this.currentMapArea == null ? null : this.currentMapArea.coord(this.getDisplayX(), this.getDisplayY());
    }
 
    @ObfuscatedName("ap")
@@ -1024,7 +1032,8 @@ public class WorldMap {
       signature = "(I)I",
       garbageValue = "442119278"
    )
-   public int __ap_537() {
+   @Export("getDisplayWith")
+   public int getDisplayWith() {
       return this.worldMapDisplayWidth;
    }
 
@@ -1033,7 +1042,8 @@ public class WorldMap {
       signature = "(I)I",
       garbageValue = "-2065910749"
    )
-   public int __as_538() {
+   @Export("getDisplayHeight")
+   public int getDisplayHeight() {
       return this.worldMapDisplayHeight;
    }
 
@@ -1042,9 +1052,9 @@ public class WorldMap {
       signature = "(II)V",
       garbageValue = "2017050927"
    )
-   public void __am_539(int var1) {
-      if(var1 >= 1) {
-         this.__ac = var1;
+   public void method379(int var1) {
+      if (var1 >= 1) {
+         this.field993 = var1;
       }
 
    }
@@ -1054,8 +1064,8 @@ public class WorldMap {
       signature = "(I)V",
       garbageValue = "-1568631080"
    )
-   public void __an_540() {
-      this.__ac = 3;
+   public void method380() {
+      this.field993 = 3;
    }
 
    @ObfuscatedName("az")
@@ -1063,9 +1073,9 @@ public class WorldMap {
       signature = "(II)V",
       garbageValue = "107295139"
    )
-   public void __az_541(int var1) {
-      if(var1 >= 1) {
-         this.__ay = var1;
+   public void method381(int var1) {
+      if (var1 >= 1) {
+         this.field994 = var1;
       }
 
    }
@@ -1075,8 +1085,8 @@ public class WorldMap {
       signature = "(I)V",
       garbageValue = "2023118274"
    )
-   public void __au_542() {
-      this.__ay = 50;
+   public void method382() {
+      this.field994 = 50;
    }
 
    @ObfuscatedName("ao")
@@ -1084,9 +1094,9 @@ public class WorldMap {
       signature = "(ZI)V",
       garbageValue = "1025207933"
    )
-   @Export("perpetualFlash")
-   public void perpetualFlash(boolean var1) {
-      this.perpetualFlash0 = var1;
+   @Export("setPerpetualFlash")
+   public void setPerpetualFlash(boolean var1) {
+      this.perpetualFlash = var1;
    }
 
    @ObfuscatedName("aa")
@@ -1097,9 +1107,9 @@ public class WorldMap {
    @Export("flashElement")
    public void flashElement(int var1) {
       this.flashingElements = new HashSet();
-      this.flashingElements.add(Integer.valueOf(var1));
-      this.__aw = 0;
-      this.__al = 0;
+      this.flashingElements.add(var1);
+      this.field995 = 0;
+      this.field996 = 0;
    }
 
    @ObfuscatedName("ax")
@@ -1110,12 +1120,12 @@ public class WorldMap {
    @Export("flashCategory")
    public void flashCategory(int var1) {
       this.flashingElements = new HashSet();
-      this.__aw = 0;
-      this.__al = 0;
+      this.field995 = 0;
+      this.field996 = 0;
 
-      for(int var2 = 0; var2 < UserComparator4.WorldMapElement_count; ++var2) {
-         if(ViewportMouse.getWorldMapElement(var2) != null && ViewportMouse.getWorldMapElement(var2).category == var1) {
-            this.flashingElements.add(Integer.valueOf(ViewportMouse.getWorldMapElement(var2).__o));
+      for (int var2 = 0; var2 < UserComparator4.WorldMapElement_count; ++var2) {
+         if (ViewportMouse.getWorldMapElement(var2) != null && ViewportMouse.getWorldMapElement(var2).category == var1) {
+            this.flashingElements.add(ViewportMouse.getWorldMapElement(var2).field1020);
          }
       }
 
@@ -1148,13 +1158,13 @@ public class WorldMap {
    )
    @Export("disableElement")
    public void disableElement(int var1, boolean var2) {
-      if(!var2) {
-         this.enabledElements.add(Integer.valueOf(var1));
+      if (!var2) {
+         this.enabledElements.add(var1);
       } else {
-         this.enabledElements.remove(Integer.valueOf(var1));
+         this.enabledElements.remove(var1);
       }
 
-      this.__bk_543();
+      this.method383();
    }
 
    @ObfuscatedName("bb")
@@ -1164,24 +1174,24 @@ public class WorldMap {
    )
    @Export("disableCategory")
    public void disableCategory(int var1, boolean var2) {
-      if(!var2) {
-         this.enabledCategories.add(Integer.valueOf(var1));
+      if (!var2) {
+         this.enabledCategories.add(var1);
       } else {
-         this.enabledCategories.remove(Integer.valueOf(var1));
+         this.enabledCategories.remove(var1);
       }
 
-      for(int var3 = 0; var3 < UserComparator4.WorldMapElement_count; ++var3) {
-         if(ViewportMouse.getWorldMapElement(var3) != null && ViewportMouse.getWorldMapElement(var3).category == var1) {
-            int var4 = ViewportMouse.getWorldMapElement(var3).__o;
-            if(!var2) {
-               this.__ax.add(Integer.valueOf(var4));
+      for (int var3 = 0; var3 < UserComparator4.WorldMapElement_count; ++var3) {
+         if (ViewportMouse.getWorldMapElement(var3) != null && ViewportMouse.getWorldMapElement(var3).category == var1) {
+            int var4 = ViewportMouse.getWorldMapElement(var3).field1020;
+            if (!var2) {
+               this.field1005.add(var4);
             } else {
-               this.__ax.remove(Integer.valueOf(var4));
+               this.field1005.remove(var4);
             }
          }
       }
 
-      this.__bk_543();
+      this.method383();
    }
 
    @ObfuscatedName("bs")
@@ -1201,7 +1211,7 @@ public class WorldMap {
    )
    @Export("isElementDisabled")
    public boolean isElementDisabled(int var1) {
-      return !this.enabledElements.contains(Integer.valueOf(var1));
+      return !this.enabledElements.contains(var1);
    }
 
    @ObfuscatedName("bn")
@@ -1211,7 +1221,7 @@ public class WorldMap {
    )
    @Export("isCategoryDisabled")
    public boolean isCategoryDisabled(int var1) {
-      return !this.enabledCategories.contains(Integer.valueOf(var1));
+      return !this.enabledCategories.contains(var1);
    }
 
    @ObfuscatedName("bk")
@@ -1219,10 +1229,10 @@ public class WorldMap {
       signature = "(I)V",
       garbageValue = "758731634"
    )
-   void __bk_543() {
-      this.__af.clear();
-      this.__af.addAll(this.enabledElements);
-      this.__af.addAll(this.__ax);
+   void method383() {
+      this.field1006.clear();
+      this.field1006.addAll(this.enabledElements);
+      this.field1006.addAll(this.field1005);
    }
 
    @ObfuscatedName("bd")
@@ -1230,34 +1240,34 @@ public class WorldMap {
       signature = "(IIIIIIB)V",
       garbageValue = "-73"
    )
-   public void __bd_544(int var1, int var2, int var3, int var4, int var5, int var6) {
-      if(this.cacheLoader.isLoaded()) {
+   public void method384(int var1, int var2, int var3, int var4, int var5, int var6) {
+      if (this.cacheLoader.getIsLoaded()) {
          int var7 = (int)Math.ceil((double)((float)var3 / this.zoom));
          int var8 = (int)Math.ceil((double)((float)var4 / this.zoom));
-         List var9 = this.worldMapManager.__u_74(this.worldMapX - var7 / 2 - 1, this.worldMapY - var8 / 2 - 1, var7 / 2 + this.worldMapX + 1, var8 / 2 + this.worldMapY + 1, var1, var2, var3, var4, var5, var6);
-         if(!var9.isEmpty()) {
+         List var9 = this.worldMapManager.method403(this.worldMapX - var7 / 2 - 1, this.worldMapY - var8 / 2 - 1, var7 / 2 + this.worldMapX + 1, var8 / 2 + this.worldMapY + 1, var1, var2, var3, var4, var5, var6);
+         if (!var9.isEmpty()) {
             Iterator var10 = var9.iterator();
 
-            boolean var13;
+            boolean var11;
             do {
-               if(!var10.hasNext()) {
+               if (!var10.hasNext()) {
                   return;
                }
 
-               AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var10.next();
-               WorldMapElement var12 = ViewportMouse.getWorldMapElement(var11.__m_15());
-               var13 = false;
+               AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var10.next();
+               WorldMapElement var13 = ViewportMouse.getWorldMapElement(var12.getElement());
+               var11 = false;
 
-               for(int var14 = this.__bs.length - 1; var14 >= 0; --var14) {
-                  if(var12.strings[var14] != null) {
-                     Tiles.insertMenuItemNoShift(var12.strings[var14], var12.string1, this.__bs[var14], var11.__m_15(), var11.coord1.packed(), var11.coord2.packed());
-                     var13 = true;
+               for (int var14 = this.field1008.length - 1; var14 >= 0; --var14) {
+                  if (var13.strings[var14] != null) {
+                     Tiles.insertMenuItemNoShift(var13.strings[var14], var13.string1, this.field1008[var14], var12.getElement(), var12.coord1.packed(), var12.coord2.packed());
+                     var11 = true;
                   }
                }
-            } while(!var13);
-
+            } while(!var11);
          }
       }
+
    }
 
    @ObfuscatedName("bc")
@@ -1265,26 +1275,26 @@ public class WorldMap {
       signature = "(ILhu;I)Lhu;",
       garbageValue = "333454230"
    )
-   public TileLocation __bc_545(int var1, TileLocation var2) {
-      if(!this.cacheLoader.isLoaded()) {
+   public Coord method385(int var1, Coord var2) {
+      if (!this.cacheLoader.getIsLoaded()) {
          return null;
-      } else if(!this.worldMapManager.isLoaded()) {
+      } else if (!this.worldMapManager.isLoaded()) {
          return null;
-      } else if(!this.currentMapArea0.containsPosition(var2.x, var2.y)) {
+      } else if (!this.currentMapArea.containsPosition(var2.x, var2.y)) {
          return null;
       } else {
          HashMap var3 = this.worldMapManager.buildIcons();
-         List var4 = (List)var3.get(Integer.valueOf(var1));
-         if(var4 != null && !var4.isEmpty()) {
+         List var4 = (List)var3.get(var1);
+         if (var4 != null && !var4.isEmpty()) {
             AbstractWorldMapIcon var5 = null;
             int var6 = -1;
             Iterator var7 = var4.iterator();
 
-            while(true) {
+            while (true) {
                AbstractWorldMapIcon var8;
                int var11;
                do {
-                  if(!var7.hasNext()) {
+                  if (!var7.hasNext()) {
                      return var5.coord2;
                   }
 
@@ -1292,7 +1302,7 @@ public class WorldMap {
                   int var9 = var8.coord2.x - var2.x;
                   int var10 = var8.coord2.y - var2.y;
                   var11 = var10 * var10 + var9 * var9;
-                  if(var11 == 0) {
+                  if (var11 == 0) {
                      return var8.coord2;
                   }
                } while(var11 >= var6 && var5 != null);
@@ -1312,7 +1322,7 @@ public class WorldMap {
       garbageValue = "94"
    )
    @Export("menuAction")
-   public void menuAction(int var1, int var2, TileLocation var3, TileLocation var4) {
+   public void menuAction(int var1, int var2, Coord var3, Coord var4) {
       ScriptEvent var5 = new ScriptEvent();
       WorldMapEvent var6 = new WorldMapEvent(var2, var3, var4);
       var5.setArgs(new Object[]{var6});
@@ -1333,7 +1343,7 @@ public class WorldMap {
          var5.setType(14);
       }
 
-      AbstractIndexCache.runScript(var5);
+      AbstractArchive.runScript(var5);
    }
 
    @ObfuscatedName("bx")
@@ -1343,21 +1353,21 @@ public class WorldMap {
    )
    @Export("iconStart")
    public AbstractWorldMapIcon iconStart() {
-      if(!this.cacheLoader.isLoaded()) {
+      if (!this.cacheLoader.getIsLoaded()) {
          return null;
-      } else if(!this.worldMapManager.isLoaded()) {
+      } else if (!this.worldMapManager.isLoaded()) {
          return null;
       } else {
          HashMap var1 = this.worldMapManager.buildIcons();
-         this.__bq = new LinkedList();
+         this.field1009 = new LinkedList();
          Iterator var2 = var1.values().iterator();
 
-         while(var2.hasNext()) {
+         while (var2.hasNext()) {
             List var3 = (List)var2.next();
-            this.__bq.addAll(var3);
+            this.field1009.addAll(var3);
          }
 
-         this.iconIterator = this.__bq.iterator();
+         this.iconIterator = this.field1009.iterator();
          return this.iconNext();
       }
    }
@@ -1369,19 +1379,25 @@ public class WorldMap {
    )
    @Export("iconNext")
    public AbstractWorldMapIcon iconNext() {
-      if(this.iconIterator == null) {
+      if (this.iconIterator == null) {
          return null;
       } else {
          AbstractWorldMapIcon var1;
          do {
-            if(!this.iconIterator.hasNext()) {
+            if (!this.iconIterator.hasNext()) {
                return null;
             }
 
             var1 = (AbstractWorldMapIcon)this.iconIterator.next();
-         } while(var1.__m_15() == -1);
+         } while(var1.getElement() == -1);
 
          return var1;
       }
    }
+
+   static {
+      fontNameVerdana11 = FontName.FontName_verdana11;
+      fontNameVerdana13 = FontName.FontName_verdana13;
+      fontNameVerdana15 = FontName.FontName_verdana15;
+   }
 }
diff --git a/runescape-client/src/main/java/WorldMapArchiveLoader.java b/runescape-client/src/main/java/WorldMapArchiveLoader.java
new file mode 100644
index 0000000000..0240307fe8
--- /dev/null
+++ b/runescape-client/src/main/java/WorldMapArchiveLoader.java
@@ -0,0 +1,108 @@
+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("ls")
+@Implements("WorldMapArchiveLoader")
+public class WorldMapArchiveLoader {
+   @ObfuscatedName("o")
+   @Export("cacheName")
+   String cacheName;
+   @ObfuscatedName("u")
+   @ObfuscatedSignature(
+      signature = "Lir;"
+   )
+   @Export("archive")
+   AbstractArchive archive;
+   @ObfuscatedName("g")
+   @ObfuscatedGetter(
+      intValue = 624113115
+   )
+   @Export("percentLoaded")
+   int percentLoaded;
+   @ObfuscatedName("l")
+   @Export("isLoaded")
+   boolean isLoaded;
+
+   @ObfuscatedSignature(
+      signature = "(Lir;)V"
+   )
+   WorldMapArchiveLoader(AbstractArchive var1) {
+      this.percentLoaded = 0;
+      this.isLoaded = false;
+      this.archive = var1;
+   }
+
+   @ObfuscatedName("m")
+   @ObfuscatedSignature(
+      signature = "(Ljava/lang/String;I)V",
+      garbageValue = "-1867776989"
+   )
+   @Export("reset")
+   void reset(String cacheName) {
+      if (cacheName != null && !cacheName.isEmpty() && cacheName != this.cacheName) {
+         this.cacheName = cacheName;
+         this.percentLoaded = 0;
+         this.isLoaded = false;
+         this.load();
+      }
+
+   }
+
+   @ObfuscatedName("f")
+   @ObfuscatedSignature(
+      signature = "(I)I",
+      garbageValue = "2019633217"
+   )
+   @Export("load")
+   int load() {
+      if (this.percentLoaded < 33) {
+         if (!this.archive.tryLoadFileByNames(WorldMapCacheName.WorldMapCacheName_compositeMap.name, this.cacheName)) {
+            return this.percentLoaded;
+         }
+
+         this.percentLoaded = 33;
+      }
+
+      if (this.percentLoaded == 33) {
+         if (this.archive.method9(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, this.cacheName) && !this.archive.tryLoadFileByNames(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, this.cacheName)) {
+            return this.percentLoaded;
+         }
+
+         this.percentLoaded = 66;
+      }
+
+      if (this.percentLoaded == 66) {
+         if (!this.archive.tryLoadFileByNames(this.cacheName, WorldMapCacheName.WorldMapCacheName_labels.name)) {
+            return this.percentLoaded;
+         }
+
+         this.percentLoaded = 100;
+         this.isLoaded = true;
+      }
+
+      return this.percentLoaded;
+   }
+
+   @ObfuscatedName("q")
+   @ObfuscatedSignature(
+      signature = "(S)Z",
+      garbageValue = "-16324"
+   )
+   @Export("getIsLoaded")
+   boolean getIsLoaded() {
+      return this.isLoaded;
+   }
+
+   @ObfuscatedName("w")
+   @ObfuscatedSignature(
+      signature = "(I)I",
+      garbageValue = "1342963007"
+   )
+   @Export("getPercentLoaded")
+   int getPercentLoaded() {
+      return this.percentLoaded;
+   }
+}
diff --git a/runescape-client/src/main/java/WorldMapArea.java b/runescape-client/src/main/java/WorldMapArea.java
index 2a3d27d961..03d369df0a 100644
--- a/runescape-client/src/main/java/WorldMapArea.java
+++ b/runescape-client/src/main/java/WorldMapArea.java
@@ -37,7 +37,7 @@ public class WorldMapArea {
    @ObfuscatedGetter(
       intValue = 986239133
    )
-   int __w;
+   int field1015;
    @ObfuscatedName("o")
    @ObfuscatedGetter(
       intValue = 196514055
@@ -49,7 +49,7 @@ public class WorldMapArea {
       signature = "Lhu;"
    )
    @Export("origin0")
-   TileLocation origin0;
+   Coord origin0;
    @ObfuscatedName("g")
    @ObfuscatedGetter(
       intValue = 1238532539
@@ -83,7 +83,7 @@ public class WorldMapArea {
 
    public WorldMapArea() {
       this.id0 = -1;
-      this.__w = -1;
+      this.field1015 = -1;
       this.zoom0 = -1;
       this.origin0 = null;
       this.minX0 = Integer.MAX_VALUE;
@@ -103,15 +103,15 @@ public class WorldMapArea {
       this.id0 = var2;
       this.archiveName0 = var1.readStringCp1252NullTerminated();
       this.name0 = var1.readStringCp1252NullTerminated();
-      this.origin0 = new TileLocation(var1.readInt());
-      this.__w = var1.readInt();
+      this.origin0 = new Coord(var1.readInt());
+      this.field1015 = var1.readInt();
       var1.readUnsignedByte();
       this.isMain0 = var1.readUnsignedByte() == 1;
       this.zoom0 = var1.readUnsignedByte();
       int var3 = var1.readUnsignedByte();
       this.sections = new LinkedList();
 
-      for(int var4 = 0; var4 < var3; ++var4) {
+      for (int var4 = 0; var4 < var3; ++var4) {
          this.sections.add(this.readWorldMapSection(var1));
       }
 
@@ -126,21 +126,21 @@ public class WorldMapArea {
    @Export("readWorldMapSection")
    WorldMapSection readWorldMapSection(Buffer var1) {
       int var2 = var1.readUnsignedByte();
-      WorldMapSectionType[] var3 = new WorldMapSectionType[]{WorldMapSectionType.__h_f, WorldMapSectionType.__h_w, WorldMapSectionType.__h_m, WorldMapSectionType.__h_q};
+      WorldMapSectionType[] var3 = new WorldMapSectionType[]{WorldMapSectionType.WORLDMAPSECTIONTYPE1, WorldMapSectionType.WORLDMAPSECTIONTYPE3, WorldMapSectionType.WORLDMAPSECTIONTYPE0, WorldMapSectionType.WORLDMAPSECTIONTYPE2};
       WorldMapSectionType var4 = (WorldMapSectionType)ScriptFrame.findEnumerated(var3, var2);
       Object var5 = null;
       switch(var4.type) {
       case 0:
-         var5 = new WorldMapSection2();
+         var5 = new WorldMapSection0();
          break;
       case 1:
-         var5 = new WorldMapSection3();
-         break;
-      case 2:
          var5 = new WorldMapSection1();
          break;
+      case 2:
+         var5 = new WorldMapSection2();
+         break;
       case 3:
-         var5 = new WorldMapSection0();
+         var5 = new WorldMapSection3();
          break;
       default:
          throw new IllegalStateException("");
@@ -156,17 +156,17 @@ public class WorldMapArea {
       garbageValue = "1843012457"
    )
    @Export("containsCoord")
-   public boolean containsCoord(int var1, int var2, int var3) {
+   public boolean containsCoord(int plane, int x, int y) {
       Iterator var4 = this.sections.iterator();
 
       WorldMapSection var5;
       do {
-         if(!var4.hasNext()) {
+         if (!var4.hasNext()) {
             return false;
          }
 
          var5 = (WorldMapSection)var4.next();
-      } while(!var5.containsCoord(var1, var2, var3));
+      } while(!var5.containsCoord(plane, x, y));
 
       return true;
    }
@@ -177,21 +177,21 @@ public class WorldMapArea {
       garbageValue = "-693447297"
    )
    @Export("containsPosition")
-   public boolean containsPosition(int var1, int var2) {
-      int var3 = var1 / 64;
-      int var4 = var2 / 64;
-      if(var3 >= this.minX0 && var3 <= this.maxX0) {
-         if(var4 >= this.minY0 && var4 <= this.maxY0) {
+   public boolean containsPosition(int x, int y) {
+      int var3 = x / 64;
+      int var4 = y / 64;
+      if (var3 >= this.minX0 && var3 <= this.maxX0) {
+         if (var4 >= this.minY0 && var4 <= this.maxY0) {
             Iterator var5 = this.sections.iterator();
 
             WorldMapSection var6;
             do {
-               if(!var5.hasNext()) {
+               if (!var5.hasNext()) {
                   return false;
                }
 
                var6 = (WorldMapSection)var5.next();
-            } while(!var6.containsPosition(var1, var2));
+            } while(!var6.containsPosition(x, y));
 
             return true;
          } else {
@@ -208,19 +208,19 @@ public class WorldMapArea {
       garbageValue = "745399916"
    )
    @Export("position")
-   public int[] position(int var1, int var2, int var3) {
+   public int[] position(int plane, int x, int y) {
       Iterator var4 = this.sections.iterator();
 
       WorldMapSection var5;
       do {
-         if(!var4.hasNext()) {
+         if (!var4.hasNext()) {
             return null;
          }
 
          var5 = (WorldMapSection)var4.next();
-      } while(!var5.containsCoord(var1, var2, var3));
+      } while(!var5.containsCoord(plane, x, y));
 
-      return var5.position(var1, var2, var3);
+      return var5.position(plane, x, y);
    }
 
    @ObfuscatedName("u")
@@ -229,19 +229,19 @@ public class WorldMapArea {
       garbageValue = "1509069978"
    )
    @Export("coord")
-   public TileLocation coord(int var1, int var2) {
+   public Coord coord(int x, int y) {
       Iterator var3 = this.sections.iterator();
 
       WorldMapSection var4;
       do {
-         if(!var3.hasNext()) {
+         if (!var3.hasNext()) {
             return null;
          }
 
          var4 = (WorldMapSection)var3.next();
-      } while(!var4.containsPosition(var1, var2));
+      } while(!var4.containsPosition(x, y));
 
-      return var4.coord(var1, var2);
+      return var4.coord(x, y);
    }
 
    @ObfuscatedName("g")
@@ -253,7 +253,7 @@ public class WorldMapArea {
    void setBounds() {
       Iterator var1 = this.sections.iterator();
 
-      while(var1.hasNext()) {
+      while (var1.hasNext()) {
          WorldMapSection var2 = (WorldMapSection)var1.next();
          var2.expandBounds(this);
       }
@@ -305,8 +305,8 @@ public class WorldMapArea {
       signature = "(I)I",
       garbageValue = "-1657905623"
    )
-   int __a_39() {
-      return this.__w;
+   int method386() {
+      return this.field1015;
    }
 
    @ObfuscatedName("z")
@@ -395,8 +395,8 @@ public class WorldMapArea {
       garbageValue = "-1411761003"
    )
    @Export("origin")
-   public TileLocation origin() {
-      return new TileLocation(this.origin0);
+   public Coord origin() {
+      return new Coord(this.origin0);
    }
 
    @ObfuscatedName("m")
@@ -405,12 +405,12 @@ public class WorldMapArea {
       garbageValue = "-1490951132"
    )
    static int method427(int var0, int var1) {
-      if(var0 == -2) {
+      if (var0 == -2) {
          return 12345678;
-      } else if(var0 == -1) {
-         if(var1 < 0) {
+      } else if (var0 == -1) {
+         if (var1 < 0) {
             var1 = 0;
-         } else if(var1 > 127) {
+         } else if (var1 > 127) {
             var1 = 127;
          }
 
@@ -418,9 +418,9 @@ public class WorldMapArea {
          return var1;
       } else {
          var1 = (var0 & 127) * var1 / 128;
-         if(var1 < 2) {
+         if (var1 < 2) {
             var1 = 2;
-         } else if(var1 > 126) {
+         } else if (var1 > 126) {
             var1 = 126;
          }
 
@@ -434,8 +434,8 @@ public class WorldMapArea {
       garbageValue = "-26"
    )
    static void method428() {
-      if(Client.oculusOrbState == 1) {
-         Client.__client_ij = true;
+      if (Client.oculusOrbState == 1) {
+         Client.field199 = true;
       }
 
    }
diff --git a/runescape-client/src/main/java/WorldMapAreaData.java b/runescape-client/src/main/java/WorldMapAreaData.java
index eeacab73f6..2f31fc3b62 100644
--- a/runescape-client/src/main/java/WorldMapAreaData.java
+++ b/runescape-client/src/main/java/WorldMapAreaData.java
@@ -5,56 +5,57 @@ import net.runelite.mapping.Export;
 import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
 @ObfuscatedName("ae")
 @Implements("WorldMapAreaData")
 public class WorldMapAreaData extends WorldMapArea {
    @ObfuscatedName("n")
-   HashSet __n;
+   HashSet field1016;
    @ObfuscatedName("i")
-   HashSet __i;
+   HashSet field1017;
    @ObfuscatedName("a")
-   List __a;
+   List field1018;
 
    @ObfuscatedName("ce")
    @ObfuscatedSignature(
       signature = "(Lgr;Lgr;IZI)V",
       garbageValue = "-1999841505"
    )
-   void __ce_76(Buffer var1, Buffer var2, int var3, boolean var4) {
+   void method387(Buffer var1, Buffer var2, int var3, boolean var4) {
       this.read(var1, var3);
-      int var5 = var2.__ag_302();
-      this.__n = new HashSet(var5);
+      int var5 = var2.readUnsignedShort();
+      this.field1016 = new HashSet(var5);
 
       int var6;
-      for(var6 = 0; var6 < var5; ++var6) {
+      for (var6 = 0; var6 < var5; ++var6) {
          class15 var7 = new class15();
 
          try {
             var7.method173(var2);
-         } catch (IllegalStateException var12) {
-            continue;
-         }
-
-         this.__n.add(var7);
-      }
-
-      var6 = var2.__ag_302();
-      this.__i = new HashSet(var6);
-
-      for(int var10 = 0; var10 < var6; ++var10) {
-         class39 var8 = new class39();
-
-         try {
-            var8.method714(var2);
          } catch (IllegalStateException var11) {
             continue;
          }
 
-         this.__i.add(var8);
+         this.field1016.add(var7);
       }
 
-      this.__cy_77(var2, var4);
+      var6 = var2.readUnsignedShort();
+      this.field1017 = new HashSet(var6);
+
+      for (int var12 = 0; var12 < var6; ++var12) {
+         class39 var8 = new class39();
+
+         try {
+            var8.method714(var2);
+         } catch (IllegalStateException var10) {
+            continue;
+         }
+
+         this.field1017.add(var8);
+      }
+
+      this.method388(var2, var4);
    }
 
    @ObfuscatedName("cy")
@@ -62,16 +63,16 @@ public class WorldMapAreaData extends WorldMapArea {
       signature = "(Lgr;ZB)V",
       garbageValue = "48"
    )
-   void __cy_77(Buffer var1, boolean var2) {
-      this.__a = new LinkedList();
-      int var3 = var1.__ag_302();
+   void method388(Buffer var1, boolean var2) {
+      this.field1018 = new LinkedList();
+      int var3 = var1.readUnsignedShort();
 
-      for(int var4 = 0; var4 < var3; ++var4) {
-         int var5 = var1.__ap_310();
-         TileLocation var6 = new TileLocation(var1.readInt());
+      for (int var4 = 0; var4 < var3; ++var4) {
+         int var5 = var1.method51();
+         Coord var6 = new Coord(var1.readInt());
          boolean var7 = var1.readUnsignedByte() == 1;
-         if(var2 || !var7) {
-            this.__a.add(new WorldMapIcon1((TileLocation)null, var6, var5, (WorldMapLabel)null));
+         if (var2 || !var7) {
+            this.field1018.add(new WorldMapIcon1((Coord)null, var6, var5, (WorldMapLabel)null));
          }
       }
 
@@ -85,16 +86,16 @@ public class WorldMapAreaData extends WorldMapArea {
    @Export("getSequenceDefinition")
    public static SequenceDefinition getSequenceDefinition(int var0) {
       SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0);
-      if(var1 != null) {
+      if (var1 != null) {
          return var1;
       } else {
-         byte[] var2 = SequenceDefinition.SequenceDefinition_indexCache.takeRecord(12, var0);
+         byte[] var2 = SequenceDefinition.SequenceDefinition_archive.takeFile(12, var0);
          var1 = new SequenceDefinition();
-         if(var2 != null) {
-            var1.read(new Buffer(var2));
+         if (var2 != null) {
+            var1.decode(new Buffer(var2));
          }
 
-         var1.init();
+         var1.postDecode();
          SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0);
          return var1;
       }
@@ -106,7 +107,7 @@ public class WorldMapAreaData extends WorldMapArea {
       garbageValue = "-1767097678"
    )
    public static boolean method711(int var0) {
-      return var0 >= class231.field2810.field2820 && var0 <= class231.field2822.field2820;
+      return var0 >= WorldMapDecorationType.field2810.id && var0 <= WorldMapDecorationType.field2822.id;
    }
 
    @ObfuscatedName("u")
@@ -126,19 +127,19 @@ public class WorldMapAreaData extends WorldMapArea {
    static int method710(int var0, Script var1, boolean var2) {
       boolean var3 = true;
       Widget var4;
-      if(var0 >= 2000) {
+      if (var0 >= 2000) {
          var0 -= 1000;
          var4 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
          var3 = false;
       } else {
-         var4 = var2?WorldMapIcon1.__t_i:class12.__n_n;
+         var4 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111;
       }
 
-      int var11;
-      if(var0 == 1300) {
-         var11 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] - 1;
-         if(var11 >= 0 && var11 <= 9) {
-            var4.setAction(var11, Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]);
+      int var5;
+      if (var0 == ScriptOpcodes.CC_SETOP) {
+         var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] - 1;
+         if (var5 >= 0 && var5 <= 9) {
+            var4.setAction(var5, Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]);
             return 1;
          } else {
             --Interpreter.Interpreter_stringStackSize;
@@ -146,106 +147,105 @@ public class WorldMapAreaData extends WorldMapArea {
          }
       } else {
          int var6;
-         if(var0 == 1301) {
+         if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) {
             RouteStrategy.Interpreter_intStackSize -= 2;
-            var11 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
+            var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
             var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-            var4.parent = class204.getWidgetChild(var11, var6);
+            var4.parent = class204.getWidgetChild(var5, var6);
             return 1;
-         } else if(var0 == 1302) {
+         } else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) {
             var4.isScrollBar = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
             return 1;
-         } else if(var0 == 1303) {
+         } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) {
             var4.dragZoneSize = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
             return 1;
-         } else if(var0 == 1304) {
+         } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) {
             var4.dragThreshold = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
             return 1;
-         } else if(var0 == 1305) {
+         } else if (var0 == ScriptOpcodes.CC_SETOPBASE) {
             var4.dataText = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
             return 1;
-         } else if(var0 == 1306) {
+         } else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) {
             var4.spellActionName = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
             return 1;
-         } else if(var0 == 1307) {
+         } else if (var0 == ScriptOpcodes.CC_CLEAROPS) {
             var4.actions = null;
             return 1;
-         } else if(var0 == 1308) {
-            var4.__fz = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+         } else if (var0 == 1308) {
+            var4.field985 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
             return 1;
          } else {
             int var7;
-            byte[] var9;
-            if(var0 != 1350) {
-               byte var5;
-               if(var0 == 1351) {
+            byte[] var8;
+            if (var0 != 1350) {
+               byte var11;
+               if (var0 == 1351) {
                   RouteStrategy.Interpreter_intStackSize -= 2;
-                  var5 = 10;
-                  var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]};
+                  var11 = 10;
+                  var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]};
                   byte[] var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]};
-                  BufferedSink.method3595(var4, var5, var9, var10);
+                  BufferedSink.method3595(var4, var11, var8, var10);
                   return 1;
-               } else if(var0 == 1352) {
+               } else if (var0 == 1352) {
                   RouteStrategy.Interpreter_intStackSize -= 3;
-                  var11 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] - 1;
+                  var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] - 1;
                   var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
                   var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
-                  if(var11 >= 0 && var11 <= 9) {
-                     Varcs.method2168(var4, var11, var6, var7);
+                  if (var5 >= 0 && var5 <= 9) {
+                     Varcs.method2168(var4, var5, var6, var7);
                      return 1;
                   } else {
                      throw new RuntimeException();
                   }
-               } else if(var0 == 1353) {
-                  var5 = 10;
+               } else if (var0 == 1353) {
+                  var11 = 10;
                   var6 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
                   var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                  Varcs.method2168(var4, var5, var6, var7);
+                  Varcs.method2168(var4, var11, var6, var7);
                   return 1;
-               } else if(var0 == 1354) {
+               } else if (var0 == 1354) {
                   --RouteStrategy.Interpreter_intStackSize;
-                  var11 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] - 1;
-                  if(var11 >= 0 && var11 <= 9) {
-                     WorldMapSection3.method345(var4, var11);
+                  var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] - 1;
+                  if (var5 >= 0 && var5 <= 9) {
+                     WorldMapSection1.method345(var4, var5);
                      return 1;
                   } else {
                      throw new RuntimeException();
                   }
-               } else if(var0 == 1355) {
-                  var5 = 10;
-                  WorldMapSection3.method345(var4, var5);
+               } else if (var0 == 1355) {
+                  var11 = 10;
+                  WorldMapSection1.method345(var4, var11);
                   return 1;
                } else {
                   return 2;
                }
             } else {
-               byte[] var8 = null;
-               var9 = null;
-               if(var3) {
+               byte[] var9 = null;
+               var8 = null;
+               if (var3) {
                   RouteStrategy.Interpreter_intStackSize -= 10;
 
-                  for(var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + RouteStrategy.Interpreter_intStackSize] >= 0; var7 += 2) {
-                     ;
+                  for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + RouteStrategy.Interpreter_intStackSize] >= 0; var7 += 2) {
                   }
 
-                  if(var7 > 0) {
-                     var8 = new byte[var7 / 2];
+                  if (var7 > 0) {
                      var9 = new byte[var7 / 2];
+                     var8 = new byte[var7 / 2];
 
-                     for(var7 -= 2; var7 >= 0; var7 -= 2) {
-                        var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + RouteStrategy.Interpreter_intStackSize];
-                        var9[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + RouteStrategy.Interpreter_intStackSize + 1];
+                     for (var7 -= 2; var7 >= 0; var7 -= 2) {
+                        var9[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + RouteStrategy.Interpreter_intStackSize];
+                        var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + RouteStrategy.Interpreter_intStackSize + 1];
                      }
                   }
                } else {
                   RouteStrategy.Interpreter_intStackSize -= 2;
-                  var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]};
-                  var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]};
+                  var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]};
+                  var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]};
                }
 
                var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] - 1;
-               if(var7 >= 0 && var7 <= 9) {
-                  BufferedSink.method3595(var4, var7, var8, var9);
+               if (var7 >= 0 && var7 <= 9) {
+                  BufferedSink.method3595(var4, var7, var9, var8);
                   return 1;
                } else {
                   throw new RuntimeException();
@@ -261,19 +261,19 @@ public class WorldMapAreaData extends WorldMapArea {
       garbageValue = "1705746695"
    )
    static final int method712(int var0, int var1, int var2) {
-      if(var2 > 179) {
+      if (var2 > 179) {
          var1 /= 2;
       }
 
-      if(var2 > 192) {
+      if (var2 > 192) {
          var1 /= 2;
       }
 
-      if(var2 > 217) {
+      if (var2 > 217) {
          var1 /= 2;
       }
 
-      if(var2 > 243) {
+      if (var2 > 243) {
          var1 /= 2;
       }
 
@@ -286,7 +286,8 @@ public class WorldMapAreaData extends WorldMapArea {
       signature = "(ZI)V",
       garbageValue = "-1746120861"
    )
-   static void method705(boolean var0) {
+   @Export("setTapToDrop")
+   static void setTapToDrop(boolean var0) {
       Client.tapToDrop = var0;
    }
 }
diff --git a/runescape-client/src/main/java/WorldMapCacheName.java b/runescape-client/src/main/java/WorldMapCacheName.java
index 705477fe2c..59043310c4 100644
--- a/runescape-client/src/main/java/WorldMapCacheName.java
+++ b/runescape-client/src/main/java/WorldMapCacheName.java
@@ -49,14 +49,6 @@ public class WorldMapCacheName {
    @Export("name")
    public final String name;
 
-   static {
-      WorldMapCacheName_details = new WorldMapCacheName("details");
-      WorldMapCacheName_compositeMap = new WorldMapCacheName("compositemap");
-      WorldMapCacheName_compositeTexture = new WorldMapCacheName("compositetexture");
-      WorldMapCacheName_area = new WorldMapCacheName("area");
-      WorldMapCacheName_labels = new WorldMapCacheName("labels");
-   }
-
    WorldMapCacheName(String var1) {
       this.name = var1;
    }
@@ -67,20 +59,20 @@ public class WorldMapCacheName {
       garbageValue = "-1459849000"
    )
    public static void method633(int[] var0, int[] var1) {
-      if(var0 != null && var1 != null) {
-         ByteArrayPool.__gi_g = var0;
-         WorldMapSection2.__ah_l = new int[var0.length];
-         RouteStrategy.__fe_e = new byte[var0.length][][];
+      if (var0 != null && var1 != null) {
+         ByteArrayPool.field55 = var0;
+         WorldMapSection0.field1082 = new int[var0.length];
+         RouteStrategy.field760 = new byte[var0.length][][];
 
-         for(int var2 = 0; var2 < ByteArrayPool.__gi_g.length; ++var2) {
-            RouteStrategy.__fe_e[var2] = new byte[var1[var2]][];
+         for (int var2 = 0; var2 < ByteArrayPool.field55.length; ++var2) {
+            RouteStrategy.field760[var2] = new byte[var1[var2]][];
          }
-
       } else {
-         ByteArrayPool.__gi_g = null;
-         WorldMapSection2.__ah_l = null;
-         RouteStrategy.__fe_e = null;
+         ByteArrayPool.field55 = null;
+         WorldMapSection0.field1082 = null;
+         RouteStrategy.field760 = ((byte[][][])null);
       }
+
    }
 
    @ObfuscatedName("m")
@@ -88,20 +80,20 @@ public class WorldMapCacheName {
       signature = "(Ljava/lang/String;ZZI)V",
       garbageValue = "1532180466"
    )
-   public static void method635(String var0, boolean var1, boolean var2) {
-      if(var1) {
-         if(Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) {
+   @Export("openURL")
+   public static void openURL(String var0, boolean var1, boolean var2) {
+      if (var1) {
+         if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) {
             try {
                Desktop.getDesktop().browse(new URI(var0));
                return;
             } catch (Exception var4) {
-               ;
             }
          }
 
-         if(class50.__af_f.startsWith("win")) {
+         if (class50.field1160.startsWith("win")) {
             ReflectionCheck.method5920(var0, 0);
-         } else if(class50.__af_f.startsWith("mac")) {
+         } else if (class50.field1160.startsWith("mac")) {
             FaceNormal.method3237(var0, 1, "openjs");
          } else {
             ReflectionCheck.method5920(var0, 2);
@@ -119,27 +111,27 @@ public class WorldMapCacheName {
    )
    public static int method634(int var0) {
       int var1 = 0;
-      if(var0 < 0 || var0 >= 65536) {
+      if (var0 < 0 || var0 >= 65536) {
          var0 >>>= 16;
          var1 += 16;
       }
 
-      if(var0 >= 256) {
+      if (var0 >= 256) {
          var0 >>>= 8;
          var1 += 8;
       }
 
-      if(var0 >= 16) {
+      if (var0 >= 16) {
          var0 >>>= 4;
          var1 += 4;
       }
 
-      if(var0 >= 4) {
+      if (var0 >= 4) {
          var0 >>>= 2;
          var1 += 2;
       }
 
-      if(var0 >= 1) {
+      if (var0 >= 1) {
          var0 >>>= 1;
          ++var1;
       }
@@ -153,37 +145,45 @@ public class WorldMapCacheName {
       garbageValue = "519207109"
    )
    @Export("addPlayerToScene")
-   static void addPlayerToScene(Player var0, boolean var1) {
-      if(var0 != null && var0.isVisible() && !var0.isHidden) {
-         var0.isUnanimated = false;
-         if((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && var0.movementSequence == var0.idleSequence) {
-            var0.isUnanimated = true;
+   static void addPlayerToScene(Player player, boolean var1) {
+      if (player != null && player.isVisible() && !player.isHidden) {
+         player.isUnanimated = false;
+         if ((Client.isLowDetail && Players.Players_count > 50 || Players.Players_count > 200) && var1 && player.movementSequence == player.readySequence) {
+            player.isUnanimated = true;
          }
 
-         int var2 = var0.x >> 7;
-         int var3 = var0.y >> 7;
-         if(var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) {
-            long var4 = FontName.method5637(0, 0, 0, false, var0.index);
-            if(var0.model0 != null && Client.cycle >= var0.animationCycleStart && Client.cycle < var0.animationCycleEnd) {
-               var0.isUnanimated = false;
-               var0.tileHeight = class32.getTileHeight(var0.x, var0.y, SoundSystem.plane);
-               var0.playerCycle = Client.cycle;
-               class65.scene.__z_240(SoundSystem.plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.__ac, var4, var0.__z, var0.__j, var0.__s, var0.__t);
+         int var2 = player.x >> 7;
+         int var3 = player.y >> 7;
+         if (var2 >= 0 && var2 < 104 && var3 >= 0 && var3 < 104) {
+            long var4 = FontName.calculateTag(0, 0, 0, false, player.index);
+            if (player.model0 != null && Client.cycle >= player.animationCycleStart && Client.cycle < player.animationCycleEnd) {
+               player.isUnanimated = false;
+               player.tileHeight = class32.getTileHeight(player.x, player.y, SoundSystem.plane);
+               player.playerCycle = Client.cycle;
+               class65.scene.method286(SoundSystem.plane, player.x, player.y, player.tileHeight, 60, player, player.field9, var4, player.field721, player.field722, player.field723, player.field724);
             } else {
-               if((var0.x & 127) == 64 && (var0.y & 127) == 64) {
-                  if(Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) {
+               if ((player.x & 127) == 64 && (player.y & 127) == 64) {
+                  if (Client.tileLastDrawnActor[var2][var3] == Client.viewportDrawCount) {
                      return;
                   }
 
                   Client.tileLastDrawnActor[var2][var3] = Client.viewportDrawCount;
                }
 
-               var0.tileHeight = class32.getTileHeight(var0.x, var0.y, SoundSystem.plane);
-               var0.playerCycle = Client.cycle;
-               class65.scene.__a_239(SoundSystem.plane, var0.x, var0.y, var0.tileHeight, 60, var0, var0.__ac, var4, var0.__ay);
+               player.tileHeight = class32.getTileHeight(player.x, player.y, SoundSystem.plane);
+               player.playerCycle = Client.cycle;
+               class65.scene.method285(SoundSystem.plane, player.x, player.y, player.tileHeight, 60, player, player.field9, var4, player.field10);
             }
          }
       }
 
    }
+
+   static {
+      WorldMapCacheName_details = new WorldMapCacheName("details");
+      WorldMapCacheName_compositeMap = new WorldMapCacheName("compositemap");
+      WorldMapCacheName_compositeTexture = new WorldMapCacheName("compositetexture");
+      WorldMapCacheName_area = new WorldMapCacheName("area");
+      WorldMapCacheName_labels = new WorldMapCacheName("labels");
+   }
 }
diff --git a/runescape-client/src/main/java/class25.java b/runescape-client/src/main/java/WorldMapDecoration.java
similarity index 63%
rename from runescape-client/src/main/java/class25.java
rename to runescape-client/src/main/java/WorldMapDecoration.java
index 5bd96c6c26..c599c7972a 100644
--- a/runescape-client/src/main/java/class25.java
+++ b/runescape-client/src/main/java/WorldMapDecoration.java
@@ -1,16 +1,18 @@
 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("v")
-public class class25 {
+@Implements("WorldMapDecoration")
+public class WorldMapDecoration {
    @ObfuscatedName("dd")
    @ObfuscatedSignature(
       signature = "Lit;"
    )
-   @Export("indexCache4")
-   static IndexCache indexCache4;
+   @Export("archive4")
+   static Archive archive4;
    @ObfuscatedName("kw")
    @ObfuscatedGetter(
       intValue = -12041645
@@ -21,22 +23,25 @@ public class class25 {
    @ObfuscatedGetter(
       intValue = 916624935
    )
-   final int field199;
+   @Export("objectDefinitionId")
+   final int objectDefinitionId;
    @ObfuscatedName("f")
    @ObfuscatedGetter(
       intValue = 1452888767
    )
-   final int field198;
+   @Export("decoration")
+   final int decoration;
    @ObfuscatedName("q")
    @ObfuscatedGetter(
       intValue = -501025733
    )
-   final int field202;
+   @Export("rotation")
+   final int rotation;
 
-   class25(int var1, int var2, int var3) {
-      this.field199 = var1;
-      this.field198 = var2;
-      this.field202 = var3;
+   WorldMapDecoration(int var1, int var2, int var3) {
+      this.objectDefinitionId = var1;
+      this.decoration = var2;
+      this.rotation = var3;
    }
 
    @ObfuscatedName("j")
@@ -45,21 +50,21 @@ public class class25 {
       garbageValue = "-1540935608"
    )
    static final int method348(int var0, int var1) {
-      if(var0 == -2) {
+      if (var0 == -2) {
          return 12345678;
-      } else if(var0 == -1) {
-         if(var1 < 2) {
+      } else if (var0 == -1) {
+         if (var1 < 2) {
             var1 = 2;
-         } else if(var1 > 126) {
+         } else if (var1 > 126) {
             var1 = 126;
          }
 
          return var1;
       } else {
          var1 = (var0 & 127) * var1 / 128;
-         if(var1 < 2) {
+         if (var1 < 2) {
             var1 = 2;
-         } else if(var1 > 126) {
+         } else if (var1 > 126) {
             var1 = 126;
          }
 
@@ -72,8 +77,9 @@ public class class25 {
       signature = "(I)V",
       garbageValue = "641029128"
    )
-   static void method349() {
-      if(Client.renderSelf) {
+   @Export("addLocalPlayerToScene")
+   static void addLocalPlayerToScene() {
+      if (Client.renderSelf) {
          WorldMapCacheName.addPlayerToScene(Canvas.localPlayer, false);
       }
 
@@ -86,18 +92,18 @@ public class class25 {
    )
    static void method350(int var0, int var1, int var2, int var3) {
       Widget var4 = class204.getWidgetChild(var0, var1);
-      if(var4 != null && var4.onTargetEnter != null) {
+      if (var4 != null && var4.onTargetEnter != null) {
          ScriptEvent var5 = new ScriptEvent();
          var5.widget = var4;
          var5.args0 = var4.onTargetEnter;
-         AbstractIndexCache.runScript(var5);
+         AbstractArchive.runScript(var5);
       }
 
-      Client.__client_mh = var3;
+      Client.field157 = var3;
       Client.isSpellSelected = true;
-      ServerBuild.__iy_lo = var0;
-      Client.__client_lc = var1;
+      ServerBuild.field788 = var0;
+      Client.field220 = var1;
       FloorDecoration.selectedSpellFlags = var2;
-      class22.method295(var4);
+      WorldMapRectangle.method295(var4);
    }
 }
diff --git a/runescape-client/src/main/java/class231.java b/runescape-client/src/main/java/WorldMapDecorationType.java
similarity index 80%
rename from runescape-client/src/main/java/class231.java
rename to runescape-client/src/main/java/WorldMapDecorationType.java
index a448e63e70..88b0771864 100644
--- a/runescape-client/src/main/java/class231.java
+++ b/runescape-client/src/main/java/WorldMapDecorationType.java
@@ -1,10 +1,12 @@
 import net.runelite.mapping.Export;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("hb")
-public enum class231 implements Enumerated {
+@Implements("WorldMapDecorationType")
+public enum WorldMapDecorationType implements Enumerated {
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "Lhb;"
@@ -125,21 +127,22 @@ public enum class231 implements Enumerated {
    @ObfuscatedGetter(
       intValue = -745071109
    )
-   static int __hb_sg;
+   static int field1139;
    @ObfuscatedName("av")
-   static java.awt.Font __hb_av;
+   static java.awt.Font field1140;
    @ObfuscatedName("r")
    @ObfuscatedGetter(
       intValue = 899733687
    )
-   public final int field2820;
+   @Export("id")
+   public final int id;
 
    @ObfuscatedSignature(
       signature = "(II)V",
       garbageValue = "0"
    )
-   class231(int var3, int var4) {
-      this.field2820 = var3;
+   private WorldMapDecorationType(int var3, int var4) {
+      this.id = var3;
    }
 
    @ObfuscatedName("f")
@@ -149,7 +152,7 @@ public enum class231 implements Enumerated {
    )
    @Export("rsOrdinal")
    public int rsOrdinal() {
-      return this.field2820;
+      return this.id;
    }
 
    @ObfuscatedName("m")
@@ -157,18 +160,19 @@ public enum class231 implements Enumerated {
       signature = "(IB)Lib;",
       garbageValue = "1"
    )
-   public static InvDefinition method4523(int var0) {
-      InvDefinition var1 = (InvDefinition)InvDefinition.__ib_f.get((long)var0);
-      if(var1 != null) {
+   @Export("getInvDefinition")
+   public static InvDefinition getInvDefinition(int var0) {
+      InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0);
+      if (var1 != null) {
          return var1;
       } else {
-         byte[] var2 = class4.__o_m.takeRecord(5, var0);
+         byte[] var2 = class4.InvDefinition_archive.takeFile(5, var0);
          var1 = new InvDefinition();
-         if(var2 != null) {
-            var1.read(new Buffer(var2));
+         if (var2 != null) {
+            var1.decode(new Buffer(var2));
          }
 
-         InvDefinition.__ib_f.put(var1, (long)var0);
+         InvDefinition.InvDefinition_cached.put(var1, (long)var0);
          return var1;
       }
    }
@@ -189,8 +193,9 @@ public enum class231 implements Enumerated {
       garbageValue = "1521012895"
    )
    static final void method4517(int var0, int var1, int var2, int var3, int var4, int var5, int var6) {
-      if(GroundItemPile.loadWidgetGroup(var0)) {
-         class238.updateWidgetGroup(Widget.widgets[var0], -1, var1, var2, var3, var4, var5, var6);
+      if (GroundItemPile.loadInterface(var0)) {
+         class238.updateInterface(Widget.interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6);
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/WorldMapElement.java b/runescape-client/src/main/java/WorldMapElement.java
index 04d541e9df..b3f27793bc 100644
--- a/runescape-client/src/main/java/WorldMapElement.java
+++ b/runescape-client/src/main/java/WorldMapElement.java
@@ -11,7 +11,8 @@ public class WorldMapElement extends DualNode {
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   public static AbstractIndexCache __ic_m;
+   @Export("WorldMapElement_archive")
+   public static AbstractArchive WorldMapElement_archive;
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "Ler;"
@@ -22,13 +23,13 @@ public class WorldMapElement extends DualNode {
    @ObfuscatedSignature(
       signature = "Lkz;"
    )
-   @Export("fonts")
-   static Fonts fonts;
+   @Export("WorldMapElement_fonts")
+   static Fonts WorldMapElement_fonts;
    @ObfuscatedName("o")
    @ObfuscatedGetter(
       intValue = -1579051565
    )
-   public final int __o;
+   public final int field1020;
    @ObfuscatedName("u")
    @ObfuscatedGetter(
       intValue = 2012857993
@@ -42,12 +43,13 @@ public class WorldMapElement extends DualNode {
    @Export("sprite2")
    int sprite2;
    @ObfuscatedName("l")
-   public String __l;
+   @Export("name")
+   public String name;
    @ObfuscatedName("e")
    @ObfuscatedGetter(
       intValue = -231067
    )
-   public int __e;
+   public int field1022;
    @ObfuscatedName("x")
    @ObfuscatedGetter(
       intValue = 1184517129
@@ -61,41 +63,43 @@ public class WorldMapElement extends DualNode {
    @Export("string1")
    public String string1;
    @ObfuscatedName("i")
-   int[] __i;
+   int[] field1023;
    @ObfuscatedName("a")
    @ObfuscatedGetter(
       intValue = 1336803515
    )
-   int __a;
+   int field1024;
    @ObfuscatedName("z")
    @ObfuscatedGetter(
       intValue = -1825795359
    )
-   int __z;
+   int field1025;
    @ObfuscatedName("j")
    @ObfuscatedGetter(
       intValue = -1007121521
    )
-   int __j;
+   int field1026;
    @ObfuscatedName("s")
    @ObfuscatedGetter(
       intValue = -1209054101
    )
-   int __s;
+   int field1027;
    @ObfuscatedName("t")
    @ObfuscatedSignature(
       signature = "Lju;"
    )
-   public class266 field3287;
+   @Export("horizontalAlignment")
+   public HorizontalAlignment horizontalAlignment;
    @ObfuscatedName("y")
    @ObfuscatedSignature(
       signature = "Lip;"
    )
-   public class249 field3301;
+   @Export("verticalAlignment")
+   public VerticalAlignment verticalAlignment;
    @ObfuscatedName("h")
-   int[] __h;
+   int[] field1028;
    @ObfuscatedName("b")
-   byte[] __b;
+   byte[] field1029;
    @ObfuscatedName("c")
    @ObfuscatedGetter(
       intValue = -653112729
@@ -103,23 +107,19 @@ public class WorldMapElement extends DualNode {
    @Export("category")
    public int category;
 
-   static {
-      WorldMapElement_cachedSprites = new EvictingDualNodeHashTable(256);
-   }
-
    public WorldMapElement(int var1) {
       this.sprite1 = -1;
       this.sprite2 = -1;
       this.textSize = 0;
       this.strings = new String[5];
-      this.__a = Integer.MAX_VALUE;
-      this.__z = Integer.MAX_VALUE;
-      this.__j = Integer.MIN_VALUE;
-      this.__s = Integer.MIN_VALUE;
-      this.field3287 = class266.field3527;
-      this.field3301 = class249.field3273;
+      this.field1024 = Integer.MAX_VALUE;
+      this.field1025 = Integer.MAX_VALUE;
+      this.field1026 = Integer.MIN_VALUE;
+      this.field1027 = Integer.MIN_VALUE;
+      this.horizontalAlignment = HorizontalAlignment.field3527;
+      this.verticalAlignment = VerticalAlignment.field3273;
       this.category = -1;
-      this.__o = var1;
+      this.field1020 = var1;
    }
 
    @ObfuscatedName("f")
@@ -127,15 +127,15 @@ public class WorldMapElement extends DualNode {
       signature = "(Lgr;B)V",
       garbageValue = "81"
    )
-   @Export("read")
-   public void read(Buffer var1) {
-      while(true) {
-         int var2 = var1.readUnsignedByte();
-         if(var2 == 0) {
+   @Export("decode")
+   public void decode(Buffer buffer) {
+      while (true) {
+         int var2 = buffer.readUnsignedByte();
+         if (var2 == 0) {
             return;
          }
 
-         this.readNext(var1, var2);
+         this.decodeNext(buffer, var2);
       }
    }
 
@@ -144,85 +144,83 @@ public class WorldMapElement extends DualNode {
       signature = "(Lgr;II)V",
       garbageValue = "-1197630144"
    )
-   @Export("readNext")
-   void readNext(Buffer var1, int var2) {
-      if(var2 == 1) {
-         this.sprite1 = var1.__ap_310();
-      } else if(var2 == 2) {
-         this.sprite2 = var1.__ap_310();
-      } else if(var2 == 3) {
-         this.__l = var1.readStringCp1252NullTerminated();
-      } else if(var2 == 4) {
-         this.__e = var1.readMedium();
-      } else if(var2 == 5) {
-         var1.readMedium();
-      } else if(var2 == 6) {
-         this.textSize = var1.readUnsignedByte();
+   @Export("decodeNext")
+   void decodeNext(Buffer buffer, int opcode) {
+      if (opcode == 1) {
+         this.sprite1 = buffer.method51();
+      } else if (opcode == 2) {
+         this.sprite2 = buffer.method51();
+      } else if (opcode == 3) {
+         this.name = buffer.readStringCp1252NullTerminated();
+      } else if (opcode == 4) {
+         this.field1022 = buffer.readMedium();
+      } else if (opcode == 5) {
+         buffer.readMedium();
+      } else if (opcode == 6) {
+         this.textSize = buffer.readUnsignedByte();
       } else {
          int var3;
-         if(var2 == 7) {
-            var3 = var1.readUnsignedByte();
-            if((var3 & 1) == 0) {
-               ;
+         if (opcode == 7) {
+            var3 = buffer.readUnsignedByte();
+            if ((var3 & 1) == 0) {
             }
 
-            if((var3 & 2) == 2) {
-               ;
+            if ((var3 & 2) == 2) {
             }
-         } else if(var2 == 8) {
-            var1.readUnsignedByte();
-         } else if(var2 >= 10 && var2 <= 14) {
-            this.strings[var2 - 10] = var1.readStringCp1252NullTerminated();
-         } else if(var2 == 15) {
-            var3 = var1.readUnsignedByte();
-            this.__i = new int[var3 * 2];
+         } else if (opcode == 8) {
+            buffer.readUnsignedByte();
+         } else if (opcode >= 10 && opcode <= 14) {
+            this.strings[opcode - 10] = buffer.readStringCp1252NullTerminated();
+         } else if (opcode == 15) {
+            var3 = buffer.readUnsignedByte();
+            this.field1023 = new int[var3 * 2];
 
             int var4;
-            for(var4 = 0; var4 < var3 * 2; ++var4) {
-               this.__i[var4] = var1.__aq_303();
+            for (var4 = 0; var4 < var3 * 2; ++var4) {
+               this.field1023[var4] = buffer.readShort();
             }
 
-            var1.readInt();
-            var4 = var1.readUnsignedByte();
-            this.__h = new int[var4];
+            buffer.readInt();
+            var4 = buffer.readUnsignedByte();
+            this.field1028 = new int[var4];
 
             int var5;
-            for(var5 = 0; var5 < this.__h.length; ++var5) {
-               this.__h[var5] = var1.readInt();
+            for (var5 = 0; var5 < this.field1028.length; ++var5) {
+               this.field1028[var5] = buffer.readInt();
             }
 
-            this.__b = new byte[var3];
+            this.field1029 = new byte[var3];
 
-            for(var5 = 0; var5 < var3; ++var5) {
-               this.__b[var5] = var1.readByte();
+            for (var5 = 0; var5 < var3; ++var5) {
+               this.field1029[var5] = buffer.readByte();
             }
-         } else if(var2 != 16) {
-            if(var2 == 17) {
-               this.string1 = var1.readStringCp1252NullTerminated();
-            } else if(var2 == 18) {
-               var1.__ap_310();
-            } else if(var2 == 19) {
-               this.category = var1.__ag_302();
-            } else if(var2 == 21) {
-               var1.readInt();
-            } else if(var2 == 22) {
-               var1.readInt();
-            } else if(var2 == 23) {
-               var1.readUnsignedByte();
-               var1.readUnsignedByte();
-               var1.readUnsignedByte();
-            } else if(var2 == 24) {
-               var1.__aq_303();
-               var1.__aq_303();
-            } else if(var2 == 25) {
-               var1.__ap_310();
-            } else if(var2 == 28) {
-               var1.readUnsignedByte();
-            } else if(var2 == 29) {
-               class266[] var6 = new class266[]{class266.field3527, class266.field3526, class266.field3529};
-               this.field3287 = (class266)ScriptFrame.findEnumerated(var6, var1.readUnsignedByte());
-            } else if(var2 == 30) {
-               this.field3301 = (class249)ScriptFrame.findEnumerated(UnderlayDefinition.method4839(), var1.readUnsignedByte());
+         } else if (opcode != 16) {
+            if (opcode == 17) {
+               this.string1 = buffer.readStringCp1252NullTerminated();
+            } else if (opcode == 18) {
+               buffer.method51();
+            } else if (opcode == 19) {
+               this.category = buffer.readUnsignedShort();
+            } else if (opcode == 21) {
+               buffer.readInt();
+            } else if (opcode == 22) {
+               buffer.readInt();
+            } else if (opcode == 23) {
+               buffer.readUnsignedByte();
+               buffer.readUnsignedByte();
+               buffer.readUnsignedByte();
+            } else if (opcode == 24) {
+               buffer.readShort();
+               buffer.readShort();
+            } else if (opcode == 25) {
+               buffer.method51();
+            } else if (opcode == 28) {
+               buffer.readUnsignedByte();
+            } else if (opcode == 29) {
+               HorizontalAlignment[] var6 = new HorizontalAlignment[]{HorizontalAlignment.field3527, HorizontalAlignment.field3526, HorizontalAlignment.field3529};
+               this.horizontalAlignment = (HorizontalAlignment)ScriptFrame.findEnumerated(var6, buffer.readUnsignedByte());
+            } else if (opcode == 30) {
+               this.verticalAlignment = (VerticalAlignment)ScriptFrame.findEnumerated(FloorUnderlayDefinition.method4839(), buffer.readUnsignedByte());
             }
          }
       }
@@ -234,19 +232,19 @@ public class WorldMapElement extends DualNode {
       signature = "(I)V",
       garbageValue = "1799485224"
    )
-   public void __w_409() {
-      if(this.__i != null) {
-         for(int var1 = 0; var1 < this.__i.length; var1 += 2) {
-            if(this.__i[var1] < this.__a) {
-               this.__a = this.__i[var1];
-            } else if(this.__i[var1] > this.__j) {
-               this.__j = this.__i[var1];
+   public void method389() {
+      if (this.field1023 != null) {
+         for (int var1 = 0; var1 < this.field1023.length; var1 += 2) {
+            if (this.field1023[var1] < this.field1024) {
+               this.field1024 = this.field1023[var1];
+            } else if (this.field1023[var1] > this.field1026) {
+               this.field1026 = this.field1023[var1];
             }
 
-            if(this.__i[var1 + 1] < this.__z) {
-               this.__z = this.__i[var1 + 1];
-            } else if(this.__i[var1 + 1] > this.__s) {
-               this.__s = this.__i[var1 + 1];
+            if (this.field1023[var1 + 1] < this.field1025) {
+               this.field1025 = this.field1023[var1 + 1];
+            } else if (this.field1023[var1 + 1] > this.field1027) {
+               this.field1027 = this.field1023[var1 + 1];
             }
          }
       }
@@ -271,15 +269,15 @@ public class WorldMapElement extends DualNode {
    )
    @Export("getSprite0")
    Sprite getSprite0(int var1) {
-      if(var1 < 0) {
+      if (var1 < 0) {
          return null;
       } else {
          Sprite var2 = (Sprite)WorldMapElement_cachedSprites.get((long)var1);
-         if(var2 != null) {
+         if (var2 != null) {
             return var2;
          } else {
-            var2 = class322.readSprite(__ic_m, var1, 0);
-            if(var2 != null) {
+            var2 = class322.readSprite(WorldMapElement_archive, var1, 0);
+            if (var2 != null) {
                WorldMapElement_cachedSprites.put(var2, (long)var1);
             }
 
@@ -293,8 +291,8 @@ public class WorldMapElement extends DualNode {
       signature = "(I)I",
       garbageValue = "821701099"
    )
-   public int __g_410() {
-      return this.__o;
+   public int method390() {
+      return this.field1020;
    }
 
    @ObfuscatedName("m")
@@ -306,13 +304,17 @@ public class WorldMapElement extends DualNode {
       class310[] var1 = new class310[]{class310.field3805, class310.field3807, class310.field3806};
       class310[] var2 = var1;
 
-      for(int var3 = 0; var3 < var2.length; ++var3) {
+      for (int var3 = 0; var3 < var2.length; ++var3) {
          class310 var4 = var2[var3];
-         if(var0 == var4.field3804) {
+         if (var0 == var4.field3804) {
             return var4;
          }
       }
 
       return null;
    }
+
+   static {
+      WorldMapElement_cachedSprites = new EvictingDualNodeHashTable(256);
+   }
 }
diff --git a/runescape-client/src/main/java/WorldMapEvent.java b/runescape-client/src/main/java/WorldMapEvent.java
index 258935c48c..77adb62209 100644
--- a/runescape-client/src/main/java/WorldMapEvent.java
+++ b/runescape-client/src/main/java/WorldMapEvent.java
@@ -24,18 +24,18 @@ public class WorldMapEvent {
       signature = "Lhu;"
    )
    @Export("coord1")
-   public TileLocation coord1;
+   public Coord coord1;
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Lhu;"
    )
    @Export("coord2")
-   public TileLocation coord2;
+   public Coord coord2;
 
    @ObfuscatedSignature(
       signature = "(ILhu;Lhu;)V"
    )
-   public WorldMapEvent(int var1, TileLocation var2, TileLocation var3) {
+   public WorldMapEvent(int var1, Coord var2, Coord var3) {
       this.mapElement = var1;
       this.coord1 = var2;
       this.coord2 = var3;
@@ -47,7 +47,7 @@ public class WorldMapEvent {
       garbageValue = "-782761258"
    )
    public static int method780(int var0) {
-      return UnitPriceComparator.method134(ViewportMouse.ViewportMouse_entityTags[var0]);
+      return GrandExchangeOfferUnitPriceComparator.method134(ViewportMouse.ViewportMouse_entityTags[var0]);
    }
 
    @ObfuscatedName("iy")
@@ -55,8 +55,9 @@ public class WorldMapEvent {
       signature = "(IIIIB)V",
       garbageValue = "2"
    )
-   static final void method781(int var0, int var1, int var2, int var3) {
-      if(Client.isItemSelected == 0 && !Client.isSpellSelected) {
+   @Export("addSceneMenuOptions")
+   static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) {
+      if (Client.isItemSelected == 0 && !Client.isSpellSelected) {
          Tiles.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3);
       }
 
@@ -64,189 +65,189 @@ public class WorldMapEvent {
       long var6 = -1L;
       int var8 = 0;
 
-      while(true) {
-         int var10 = ViewportMouse.ViewportMouse_entityCount;
-         if(var8 >= var10) {
-            if(-1L != var4) {
-               var8 = UnitPriceComparator.method134(var4);
-               int var9 = (int)(var4 >>> 7 & 127L);
+      while (true) {
+         int var9 = ViewportMouse.ViewportMouse_entityCount;
+         if (var8 >= var9) {
+            if (-1L != var4) {
+               var8 = GrandExchangeOfferUnitPriceComparator.method134(var4);
+               int var29 = (int)(var4 >>> 7 & 127L);
                Player var11 = Client.players[Client.combatTargetPlayerIndex];
-               TotalQuantityComparator.addPlayerToMenu(var11, Client.combatTargetPlayerIndex, var8, var9);
+               GrandExchangeOfferTotalQuantityComparator.addPlayerToMenu(var11, Client.combatTargetPlayerIndex, var8, var29);
             }
 
             return;
          }
 
-         long var26 = ViewportMouse.ViewportMouse_entityTags[var8];
-         if(var6 != var26) {
-            label338: {
-               var6 = var26;
-               int var15 = method780(var8);
-               long var18 = ViewportMouse.ViewportMouse_entityTags[var8];
-               int var17 = (int)(var18 >>> 7 & 127L);
-               var17 = var17;
-               int var28 = GrandExchangeEvent.method80(var8);
-               int var19 = ClientPreferences.method1808(var8);
-               if(var28 == 2 && class65.scene.getObjectFlags(SoundSystem.plane, var15, var17, var26) >= 0) {
-                  ObjectDefinition var20 = class50.getObjectDefinition(var19);
-                  if(var20.transforms != null) {
-                     var20 = var20.transform();
+         long var10 = ViewportMouse.ViewportMouse_entityTags[var8];
+         if (var6 != var10) {
+            label276: {
+               var6 = var10;
+               int var12 = method780(var8);
+               long var13 = ViewportMouse.ViewportMouse_entityTags[var8];
+               int var15 = (int)(var13 >>> 7 & 127L);
+               var15 = var15;
+               int var16 = GrandExchangeEvent.method80(var8);
+               int var17 = ClientPreferences.method1808(var8);
+               if (var16 == 2 && class65.scene.getObjectFlags(SoundSystem.plane, var12, var15, var10) >= 0) {
+                  ObjectDefinition var18 = class50.getObjectDefinition(var17);
+                  if (var18.transforms != null) {
+                     var18 = var18.transform();
                   }
 
-                  if(var20 == null) {
-                     break label338;
+                  if (var18 == null) {
+                     break label276;
                   }
 
-                  if(Client.isItemSelected == 1) {
-                     Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + BufferedFile.colorStartTag(65535) + var20.name, 1, var19, var15, var17);
-                  } else if(Client.isSpellSelected) {
-                     if((FloorDecoration.selectedSpellFlags & 4) == 4) {
-                        Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + BufferedFile.colorStartTag(65535) + var20.name, 2, var19, var15, var17);
+                  if (Client.isItemSelected == 1) {
+                     Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " -> " + BufferedFile.colorStartTag(65535) + var18.name, 1, var17, var12, var15);
+                  } else if (Client.isSpellSelected) {
+                     if ((FloorDecoration.selectedSpellFlags & 4) == 4) {
+                        Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + BufferedFile.colorStartTag(65535) + var18.name, 2, var17, var12, var15);
                      }
                   } else {
-                     String[] var29 = var20.actions;
-                     if(var29 != null) {
-                        for(int var30 = 4; var30 >= 0; --var30) {
-                           if(var29[var30] != null) {
-                              short var23 = 0;
-                              if(var30 == 0) {
-                                 var23 = 3;
+                     String[] var19 = var18.actions;
+                     if (var19 != null) {
+                        for (int var20 = 4; var20 >= 0; --var20) {
+                           if (var19[var20] != null) {
+                              short var21 = 0;
+                              if (var20 == 0) {
+                                 var21 = 3;
                               }
 
-                              if(var30 == 1) {
-                                 var23 = 4;
+                              if (var20 == 1) {
+                                 var21 = 4;
                               }
 
-                              if(var30 == 2) {
-                                 var23 = 5;
+                              if (var20 == 2) {
+                                 var21 = 5;
                               }
 
-                              if(var30 == 3) {
-                                 var23 = 6;
+                              if (var20 == 3) {
+                                 var21 = 6;
                               }
 
-                              if(var30 == 4) {
-                                 var23 = 1001;
+                              if (var20 == 4) {
+                                 var21 = 1001;
                               }
 
-                              Tiles.insertMenuItemNoShift(var29[var30], BufferedFile.colorStartTag(65535) + var20.name, var23, var19, var15, var17);
+                              Tiles.insertMenuItemNoShift(var19[var20], BufferedFile.colorStartTag(65535) + var18.name, var21, var17, var12, var15);
                            }
                         }
                      }
 
-                     Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(65535) + var20.name, 1002, var20.id, var15, var17);
+                     Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(65535) + var18.name, 1002, var18.id, var12, var15);
                   }
                }
 
-               int var21;
-               Npc var22;
-               Player var24;
-               int[] var36;
-               int var38;
-               if(var28 == 1) {
-                  Npc var33 = Client.npcs[var19];
-                  if(var33 == null) {
-                     break label338;
+               int[] var22;
+               int var30;
+               int var31;
+               NPC var32;
+               Player var34;
+               if (var16 == 1) {
+                  NPC var23 = Client.npcs[var17];
+                  if (var23 == null) {
+                     break label276;
                   }
 
-                  if(var33.definition.size == 1 && (var33.x & 127) == 64 && (var33.y & 127) == 64) {
-                     for(var21 = 0; var21 < Client.npcCount; ++var21) {
-                        var22 = Client.npcs[Client.npcIndices[var21]];
-                        if(var22 != null && var33 != var22 && var22.definition.size == 1 && var22.x == var33.x && var22.y == var33.y) {
-                           Tile.addNpcToMenu(var22.definition, Client.npcIndices[var21], var15, var17);
+                  if (var23.definition.size == 1 && (var23.x & 127) == 64 && (var23.y & 127) == 64) {
+                     for (var31 = 0; var31 < Client.npcCount; ++var31) {
+                        var32 = Client.npcs[Client.npcIndices[var31]];
+                        if (var32 != null && var23 != var32 && var32.definition.size == 1 && var32.x == var23.x && var32.y == var23.y) {
+                           Tile.addNpcToMenu(var32.definition, Client.npcIndices[var31], var12, var15);
                         }
                      }
 
-                     var21 = Players.Players_count;
-                     var36 = Players.Players_indices;
+                     var31 = Players.Players_count;
+                     var22 = Players.Players_indices;
 
-                     for(var38 = 0; var38 < var21; ++var38) {
-                        var24 = Client.players[var36[var38]];
-                        if(var24 != null && var24.x == var33.x && var24.y == var33.y) {
-                           TotalQuantityComparator.addPlayerToMenu(var24, var36[var38], var15, var17);
+                     for (var30 = 0; var30 < var31; ++var30) {
+                        var34 = Client.players[var22[var30]];
+                        if (var34 != null && var34.x == var23.x && var34.y == var23.y) {
+                           GrandExchangeOfferTotalQuantityComparator.addPlayerToMenu(var34, var22[var30], var12, var15);
                         }
                      }
                   }
 
-                  Tile.addNpcToMenu(var33.definition, var19, var15, var17);
+                  Tile.addNpcToMenu(var23.definition, var17, var12, var15);
                }
 
-               if(var28 == 0) {
-                  Player var34 = Client.players[var19];
-                  if(var34 == null) {
-                     break label338;
+               if (var16 == 0) {
+                  Player var33 = Client.players[var17];
+                  if (var33 == null) {
+                     break label276;
                   }
 
-                  if((var34.x & 127) == 64 && (var34.y & 127) == 64) {
-                     for(var21 = 0; var21 < Client.npcCount; ++var21) {
-                        var22 = Client.npcs[Client.npcIndices[var21]];
-                        if(var22 != null && var22.definition.size == 1 && var34.x == var22.x && var34.y == var22.y) {
-                           Tile.addNpcToMenu(var22.definition, Client.npcIndices[var21], var15, var17);
+                  if ((var33.x & 127) == 64 && (var33.y & 127) == 64) {
+                     for (var31 = 0; var31 < Client.npcCount; ++var31) {
+                        var32 = Client.npcs[Client.npcIndices[var31]];
+                        if (var32 != null && var32.definition.size == 1 && var33.x == var32.x && var33.y == var32.y) {
+                           Tile.addNpcToMenu(var32.definition, Client.npcIndices[var31], var12, var15);
                         }
                      }
 
-                     var21 = Players.Players_count;
-                     var36 = Players.Players_indices;
+                     var31 = Players.Players_count;
+                     var22 = Players.Players_indices;
 
-                     for(var38 = 0; var38 < var21; ++var38) {
-                        var24 = Client.players[var36[var38]];
-                        if(var24 != null && var24 != var34 && var24.x == var34.x && var24.y == var34.y) {
-                           TotalQuantityComparator.addPlayerToMenu(var24, var36[var38], var15, var17);
+                     for (var30 = 0; var30 < var31; ++var30) {
+                        var34 = Client.players[var22[var30]];
+                        if (var34 != null && var34 != var33 && var34.x == var33.x && var34.y == var33.y) {
+                           GrandExchangeOfferTotalQuantityComparator.addPlayerToMenu(var34, var22[var30], var12, var15);
                         }
                      }
                   }
 
-                  if(var19 != Client.combatTargetPlayerIndex) {
-                     TotalQuantityComparator.addPlayerToMenu(var34, var19, var15, var17);
+                  if (var17 != Client.combatTargetPlayerIndex) {
+                     GrandExchangeOfferTotalQuantityComparator.addPlayerToMenu(var33, var17, var12, var15);
                   } else {
-                     var4 = var26;
+                     var4 = var10;
                   }
                }
 
-               if(var28 == 3) {
-                  NodeDeque var35 = Client.groundItems[SoundSystem.plane][var15][var17];
-                  if(var35 != null) {
-                     for(GroundItem var39 = (GroundItem)var35.first(); var39 != null; var39 = (GroundItem)var35.next()) {
-                        ItemDefinition var37 = Skills.getItemDefinition(var39.id);
-                        if(Client.isItemSelected == 1) {
-                           Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + BufferedFile.colorStartTag(16748608) + var37.name, 16, var39.id, var15, var17);
-                        } else if(Client.isSpellSelected) {
-                           if((FloorDecoration.selectedSpellFlags & 1) == 1) {
-                              Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + BufferedFile.colorStartTag(16748608) + var37.name, 17, var39.id, var15, var17);
+               if (var16 == 3) {
+                  NodeDeque var35 = Client.groundItems[SoundSystem.plane][var12][var15];
+                  if (var35 != null) {
+                     for (GroundItem var24 = (GroundItem)var35.first(); var24 != null; var24 = (GroundItem)var35.next()) {
+                        ItemDefinition var25 = Skills.getItemDefinition(var24.id);
+                        if (Client.isItemSelected == 1) {
+                           Tiles.insertMenuItemNoShift("Use", Client.selectedItemName + " -> " + BufferedFile.colorStartTag(16748608) + var25.name, 16, var24.id, var12, var15);
+                        } else if (Client.isSpellSelected) {
+                           if ((FloorDecoration.selectedSpellFlags & 1) == 1) {
+                              Tiles.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " -> " + BufferedFile.colorStartTag(16748608) + var25.name, 17, var24.id, var12, var15);
                            }
                         } else {
-                           String[] var31 = var37.groundActions;
+                           String[] var26 = var25.groundActions;
 
-                           for(int var32 = 4; var32 >= 0; --var32) {
-                              if(var31 != null && var31[var32] != null) {
-                                 byte var25 = 0;
-                                 if(var32 == 0) {
-                                    var25 = 18;
+                           for (int var27 = 4; var27 >= 0; --var27) {
+                              if (var26 != null && var26[var27] != null) {
+                                 byte var28 = 0;
+                                 if (var27 == 0) {
+                                    var28 = 18;
                                  }
 
-                                 if(var32 == 1) {
-                                    var25 = 19;
+                                 if (var27 == 1) {
+                                    var28 = 19;
                                  }
 
-                                 if(var32 == 2) {
-                                    var25 = 20;
+                                 if (var27 == 2) {
+                                    var28 = 20;
                                  }
 
-                                 if(var32 == 3) {
-                                    var25 = 21;
+                                 if (var27 == 3) {
+                                    var28 = 21;
                                  }
 
-                                 if(var32 == 4) {
-                                    var25 = 22;
+                                 if (var27 == 4) {
+                                    var28 = 22;
                                  }
 
-                                 Tiles.insertMenuItemNoShift(var31[var32], BufferedFile.colorStartTag(16748608) + var37.name, var25, var39.id, var15, var17);
-                              } else if(var32 == 2) {
-                                 Tiles.insertMenuItemNoShift("Take", BufferedFile.colorStartTag(16748608) + var37.name, 20, var39.id, var15, var17);
+                                 Tiles.insertMenuItemNoShift(var26[var27], BufferedFile.colorStartTag(16748608) + var25.name, var28, var24.id, var12, var15);
+                              } else if (var27 == 2) {
+                                 Tiles.insertMenuItemNoShift("Take", BufferedFile.colorStartTag(16748608) + var25.name, 20, var24.id, var12, var15);
                               }
                            }
 
-                           Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(16748608) + var37.name, 1004, var39.id, var15, var17);
+                           Tiles.insertMenuItemNoShift("Examine", BufferedFile.colorStartTag(16748608) + var25.name, 1004, var24.id, var12, var15);
                         }
                      }
                   }
@@ -263,7 +264,8 @@ public class WorldMapEvent {
       signature = "(B)Z",
       garbageValue = "43"
    )
-   static boolean method779() {
+   @Export("isShiftPressed")
+   static boolean isShiftPressed() {
       return Client.tapToDrop || KeyHandler.KeyHandler_pressedKeys[81];
    }
 }
diff --git a/runescape-client/src/main/java/WorldMapIcon1.java b/runescape-client/src/main/java/WorldMapIcon1.java
index 0e1f232744..a8151352b2 100644
--- a/runescape-client/src/main/java/WorldMapIcon1.java
+++ b/runescape-client/src/main/java/WorldMapIcon1.java
@@ -12,13 +12,13 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon {
    @ObfuscatedSignature(
       signature = "Lho;"
    )
-   static Widget __t_i;
+   static Widget field1030;
    @ObfuscatedName("db")
    @ObfuscatedSignature(
       signature = "Lit;"
    )
-   @Export("indexCache3")
-   static IndexCache indexCache3;
+   @Export("archive3")
+   static Archive archive3;
    @ObfuscatedName("ec")
    @Export("secureRandom")
    static SecureRandom secureRandom;
@@ -32,39 +32,40 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon {
    @ObfuscatedGetter(
       intValue = -1722323621
    )
-   final int __m;
+   @Export("element")
+   final int element;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Laj;"
    )
-   @Export("label0")
-   final WorldMapLabel label0;
+   @Export("label")
+   final WorldMapLabel label;
    @ObfuscatedName("q")
    @ObfuscatedGetter(
       intValue = 364253793
    )
-   final int __q;
+   final int field1032;
    @ObfuscatedName("w")
    @ObfuscatedGetter(
       intValue = -362031241
    )
-   final int __w;
+   final int field1033;
 
    @ObfuscatedSignature(
       signature = "(Lhu;Lhu;ILaj;)V"
    )
-   WorldMapIcon1(TileLocation var1, TileLocation var2, int var3, WorldMapLabel var4) {
+   WorldMapIcon1(Coord var1, Coord var2, int var3, WorldMapLabel var4) {
       super(var1, var2);
-      this.__m = var3;
-      this.label0 = var4;
-      WorldMapElement var5 = ViewportMouse.getWorldMapElement(this.__m_15());
+      this.element = var3;
+      this.label = var4;
+      WorldMapElement var5 = ViewportMouse.getWorldMapElement(this.getElement());
       Sprite var6 = var5.getSprite(false);
-      if(var6 != null) {
-         this.__q = var6.subWidth;
-         this.__w = var6.subHeight;
+      if (var6 != null) {
+         this.field1032 = var6.subWidth;
+         this.field1033 = var6.subHeight;
       } else {
-         this.__q = 0;
-         this.__w = 0;
+         this.field1032 = 0;
+         this.field1033 = 0;
       }
 
    }
@@ -74,8 +75,9 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon {
       signature = "(I)I",
       garbageValue = "1990181988"
    )
-   public int __m_15() {
-      return this.__m;
+   @Export("getElement")
+   public int getElement() {
+      return this.element;
    }
 
    @ObfuscatedName("f")
@@ -83,8 +85,9 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon {
       signature = "(I)Laj;",
       garbageValue = "1159446036"
    )
-   WorldMapLabel __f_16() {
-      return this.label0;
+   @Export("getLabel")
+   WorldMapLabel getLabel() {
+      return this.label;
    }
 
    @ObfuscatedName("q")
@@ -92,8 +95,8 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon {
       signature = "(B)I",
       garbageValue = "75"
    )
-   int __q_17() {
-      return this.__q;
+   int vmethod397() {
+      return this.field1032;
    }
 
    @ObfuscatedName("w")
@@ -101,8 +104,8 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon {
       signature = "(I)I",
       garbageValue = "-1558233611"
    )
-   int __w_18() {
-      return this.__w;
+   int vmethod398() {
+      return this.field1033;
    }
 
    @ObfuscatedName("m")
@@ -110,7 +113,8 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon {
       signature = "(ILjava/lang/String;Ljava/lang/String;I)V",
       garbageValue = "-460290173"
    )
-   static void method219(int var0, String var1, String var2) {
+   @Export("addGameMessage")
+   static void addGameMessage(int var0, String var1, String var2) {
       GrandExchangeEvents.addChatMessage(var0, var1, var2, (String)null);
    }
 
@@ -120,57 +124,58 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon {
       garbageValue = "-252304353"
    )
    static final void method212() {
-      for(int var0 = 0; var0 < Client.soundEffectCount; ++var0) {
-         --Client.queuedSoundEffectDelays[var0];
-         if(Client.queuedSoundEffectDelays[var0] >= -10) {
-            SoundEffect var9 = Client.soundEffects[var0];
-            if(var9 == null) {
-               Object var10000 = null;
-               var9 = SoundEffect.readSoundEffect(class25.indexCache4, Client.soundEffectIds[var0], 0);
-               if(var9 == null) {
+      for (int var0 = 0; var0 < Client.soundEffectCount; ++var0) {
+         int var10003 = Client.queuedSoundEffectDelays[var0]--;
+         if (Client.queuedSoundEffectDelays[var0] >= -10) {
+            SoundEffect var11 = Client.soundEffects[var0];
+            if (var11 == null) {
+               Object var3 = null;
+               var11 = SoundEffect.readSoundEffect(WorldMapDecoration.archive4, Client.soundEffectIds[var0], 0);
+               if (var11 == null) {
                   continue;
                }
 
-               Client.queuedSoundEffectDelays[var0] += var9.__q_174();
-               Client.soundEffects[var0] = var9;
+               int[] var4 = Client.queuedSoundEffectDelays;
+               var4[var0] += var11.calculateDelay();
+               Client.soundEffects[var0] = var11;
             }
 
-            if(Client.queuedSoundEffectDelays[var0] < 0) {
-               int var2;
-               if(Client.soundLocations[var0] != 0) {
-                  int var3 = (Client.soundLocations[var0] & 255) * 128;
-                  int var4 = Client.soundLocations[var0] >> 16 & 255;
-                  int var5 = var4 * 128 + 64 - Canvas.localPlayer.x;
-                  if(var5 < 0) {
-                     var5 = -var5;
+            if (Client.queuedSoundEffectDelays[var0] < 0) {
+               int var12;
+               if (Client.soundLocations[var0] != 0) {
+                  int var13 = (Client.soundLocations[var0] & 255) * 128;
+                  int var5 = Client.soundLocations[var0] >> 16 & 255;
+                  int var6 = var5 * 128 + 64 - Canvas.localPlayer.x;
+                  if (var6 < 0) {
+                     var6 = -var6;
                   }
 
-                  int var6 = Client.soundLocations[var0] >> 8 & 255;
-                  int var7 = var6 * 128 + 64 - Canvas.localPlayer.y;
-                  if(var7 < 0) {
-                     var7 = -var7;
+                  int var7 = Client.soundLocations[var0] >> 8 & 255;
+                  int var8 = var7 * 128 + 64 - Canvas.localPlayer.y;
+                  if (var8 < 0) {
+                     var8 = -var8;
                   }
 
-                  int var8 = var5 + var7 - 128;
-                  if(var8 > var3) {
+                  int var9 = var6 + var8 - 128;
+                  if (var9 > var13) {
                      Client.queuedSoundEffectDelays[var0] = -100;
                      continue;
                   }
 
-                  if(var8 < 0) {
-                     var8 = 0;
+                  if (var9 < 0) {
+                     var9 = 0;
                   }
 
-                  var2 = (var3 - var8) * Client.__client_qc / var3;
+                  var12 = (var13 - var9) * Client.field115 / var13;
                } else {
-                  var2 = Client.soundEffectVolume;
+                  var12 = Client.soundEffectVolume;
                }
 
-               if(var2 > 0) {
-                  RawSound var10 = var9.toRawSound().resample(MilliClock.decimator);
-                  RawPcmStream var11 = RawPcmStream.createRawPcmStream(var10, 100, var2);
-                  var11.setNumLoops(Client.queuedSoundEffectLoops[var0] - 1);
-                  TaskHandler.pcmStreamMixer.addSubStream(var11);
+               if (var12 > 0) {
+                  RawSound var14 = var11.toRawSound().resample(MilliClock.decimator);
+                  RawPcmStream var15 = RawPcmStream.createRawPcmStream(var14, 100, var12);
+                  var15.setNumLoops(Client.queuedSoundEffectLoops[var0] - 1);
+                  TaskHandler.pcmStreamMixer.addSubStream(var15);
                }
 
                Client.queuedSoundEffectDelays[var0] = -100;
@@ -178,32 +183,32 @@ public class WorldMapIcon1 extends AbstractWorldMapIcon {
          } else {
             --Client.soundEffectCount;
 
-            for(int var1 = var0; var1 < Client.soundEffectCount; ++var1) {
-               Client.soundEffectIds[var1] = Client.soundEffectIds[var1 + 1];
-               Client.soundEffects[var1] = Client.soundEffects[var1 + 1];
-               Client.queuedSoundEffectLoops[var1] = Client.queuedSoundEffectLoops[var1 + 1];
-               Client.queuedSoundEffectDelays[var1] = Client.queuedSoundEffectDelays[var1 + 1];
-               Client.soundLocations[var1] = Client.soundLocations[var1 + 1];
+            for (int var2 = var0; var2 < Client.soundEffectCount; ++var2) {
+               Client.soundEffectIds[var2] = Client.soundEffectIds[var2 + 1];
+               Client.soundEffects[var2] = Client.soundEffects[var2 + 1];
+               Client.queuedSoundEffectLoops[var2] = Client.queuedSoundEffectLoops[var2 + 1];
+               Client.queuedSoundEffectDelays[var2] = Client.queuedSoundEffectDelays[var2 + 1];
+               Client.soundLocations[var2] = Client.soundLocations[var2 + 1];
             }
 
             --var0;
          }
       }
 
-      if(Client.__client_qq) {
-         boolean var12;
-         if(class214.__hf_o != 0) {
-            var12 = true;
+      if (Client.field107) {
+         boolean var10;
+         if (class214.field1129 != 0) {
+            var10 = true;
          } else {
-            var12 = class214.midiPcmStream.isReady();
+            var10 = class214.midiPcmStream.isReady();
          }
 
-         if(!var12) {
-            if(Client.__client_qf != 0 && Client.__client_qy != -1) {
-               Login.method2076(UserComparator3.indexCache6, Client.__client_qy, 0, Client.__client_qf, false);
+         if (!var10) {
+            if (Client.field128 != 0 && Client.field112 != -1) {
+               Login.method2076(UserComparator3.archive6, Client.field112, 0, Client.field128, false);
             }
 
-            Client.__client_qq = false;
+            Client.field107 = false;
          }
       }
 
diff --git a/runescape-client/src/main/java/WorldMapIcon2.java b/runescape-client/src/main/java/WorldMapIcon2.java
index 4ed41ff111..1f03250147 100644
--- a/runescape-client/src/main/java/WorldMapIcon2.java
+++ b/runescape-client/src/main/java/WorldMapIcon2.java
@@ -13,42 +13,43 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon {
    @ObfuscatedGetter(
       intValue = -985436813
    )
-   final int __m;
+   final int field1034;
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Lav;"
    )
-   final WorldMapRegion __f;
+   final WorldMapRegion field1035;
    @ObfuscatedName("q")
    @ObfuscatedGetter(
       intValue = -25914375
    )
-   int __q;
+   @Export("element")
+   int element;
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "Laj;"
    )
-   @Export("label0")
-   WorldMapLabel label0;
+   @Export("label")
+   WorldMapLabel label;
    @ObfuscatedName("o")
    @ObfuscatedGetter(
       intValue = 927871683
    )
-   int __o;
+   int field1037;
    @ObfuscatedName("u")
    @ObfuscatedGetter(
       intValue = -1431936619
    )
-   int __u;
+   int field1038;
 
    @ObfuscatedSignature(
       signature = "(Lhu;Lhu;ILav;)V"
    )
-   WorldMapIcon2(TileLocation var1, TileLocation var2, int var3, WorldMapRegion var4) {
+   WorldMapIcon2(Coord var1, Coord var2, int var3, WorldMapRegion var4) {
       super(var1, var2);
-      this.__m = var3;
-      this.__f = var4;
-      this.__z_27();
+      this.field1034 = var3;
+      this.field1035 = var4;
+      this.method399();
    }
 
    @ObfuscatedName("m")
@@ -56,8 +57,9 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon {
       signature = "(I)I",
       garbageValue = "1990181988"
    )
-   public int __m_15() {
-      return this.__q;
+   @Export("getElement")
+   public int getElement() {
+      return this.element;
    }
 
    @ObfuscatedName("f")
@@ -65,8 +67,9 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon {
       signature = "(I)Laj;",
       garbageValue = "1159446036"
    )
-   WorldMapLabel __f_16() {
-      return this.label0;
+   @Export("getLabel")
+   WorldMapLabel getLabel() {
+      return this.label;
    }
 
    @ObfuscatedName("q")
@@ -74,8 +77,8 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon {
       signature = "(B)I",
       garbageValue = "75"
    )
-   int __q_17() {
-      return this.__o;
+   int vmethod397() {
+      return this.field1037;
    }
 
    @ObfuscatedName("w")
@@ -83,8 +86,8 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon {
       signature = "(I)I",
       garbageValue = "-1558233611"
    )
-   int __w_18() {
-      return this.__u;
+   int vmethod398() {
+      return this.field1038;
    }
 
    @ObfuscatedName("z")
@@ -92,17 +95,17 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon {
       signature = "(I)V",
       garbageValue = "-806344204"
    )
-   void __z_27() {
-      this.__q = class50.getObjectDefinition(this.__m).transform().mapIconId;
-      this.label0 = this.__f.__ab_56(ViewportMouse.getWorldMapElement(this.__q));
-      WorldMapElement var1 = ViewportMouse.getWorldMapElement(this.__m_15());
+   void method399() {
+      this.element = class50.getObjectDefinition(this.field1034).transform().mapIconId;
+      this.label = this.field1035.createMapLabel(ViewportMouse.getWorldMapElement(this.element));
+      WorldMapElement var1 = ViewportMouse.getWorldMapElement(this.getElement());
       Sprite var2 = var1.getSprite(false);
-      if(var2 != null) {
-         this.__o = var2.subWidth;
-         this.__u = var2.subHeight;
+      if (var2 != null) {
+         this.field1037 = var2.subWidth;
+         this.field1038 = var2.subHeight;
       } else {
-         this.__o = 0;
-         this.__u = 0;
+         this.field1037 = 0;
+         this.field1038 = 0;
       }
 
    }
@@ -112,8 +115,9 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon {
       signature = "(I)[Lgl;",
       garbageValue = "1026409510"
    )
-   static LoginPacket[] method300() {
-      return new LoginPacket[]{LoginPacket.__gl_q, LoginPacket.__gl_w, LoginPacket.__gl_m, LoginPacket.__gl_o, LoginPacket.__gl_f};
+   @Export("LoginPacket_values")
+   static LoginPacket[] LoginPacket_values() {
+      return new LoginPacket[]{LoginPacket.field475, LoginPacket.field476, LoginPacket.field473, LoginPacket.field477, LoginPacket.field474};
    }
 
    @ObfuscatedName("m")
@@ -122,19 +126,19 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon {
       garbageValue = "16723968"
    )
    public static File method315(String var0) {
-      if(!class171.__fo_m) {
+      if (!class171.field1117) {
          throw new RuntimeException("");
       } else {
-         File var1 = (File)class171.__fo_q.get(var0);
-         if(var1 != null) {
+         File var1 = (File)class171.field1119.get(var0);
+         if (var1 != null) {
             return var1;
          } else {
-            File var2 = new File(class171.__fo_f, var0);
+            File var2 = new File(class171.field1118, var0);
             RandomAccessFile var3 = null;
 
             try {
                File var4 = new File(var2.getParent());
-               if(!var4.exists()) {
+               if (!var4.exists()) {
                   throw new RuntimeException("");
                } else {
                   var3 = new RandomAccessFile(var2, "rw");
@@ -143,17 +147,16 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon {
                   var3.write(var5);
                   var3.seek(0L);
                   var3.close();
-                  class171.__fo_q.put(var0, var2);
+                  class171.field1119.put(var0, var2);
                   return var2;
                }
-            } catch (Exception var8) {
+            } catch (Exception var7) {
                try {
-                  if(var3 != null) {
+                  if (var3 != null) {
                      var3.close();
                      var3 = null;
                   }
-               } catch (Exception var7) {
-                  ;
+               } catch (Exception var6) {
                }
 
                throw new RuntimeException();
@@ -171,22 +174,20 @@ public class WorldMapIcon2 extends AbstractWorldMapIcon {
       int var4 = var0.pathX[0];
       int var5 = var0.pathY[0];
       int var6 = var0.transformedSize();
-      if(var4 >= var6 && var4 < 104 - var6 && var5 >= var6 && var5 < 104 - var6) {
-         if(var1 >= var6 && var1 < 104 - var6 && var2 >= var6 && var2 < 104 - var6) {
-            int var9 = var0.transformedSize();
-            Client.field895.approxDestinationX = var1;
-            Client.field895.approxDestinationY = var2;
-            Client.field895.approxDestinationSizeX = 1;
-            Client.field895.approxDestinationSizeY = 1;
-            class65 var10 = Client.field895;
-            int var11 = NetSocket.calculateRoute(var4, var5, var9, var10, Client.collisionMaps[var0.plane], true, Client.__client_tp, Client.__client_th);
-            if(var11 >= 1) {
-               for(int var12 = 0; var12 < var11 - 1; ++var12) {
-                  var0.__a_131(Client.__client_tp[var12], Client.__client_th[var12], var3);
-               }
-
+      if (var4 >= var6 && var4 < 104 - var6 && var5 >= var6 && var5 < 104 - var6 && var1 >= var6 && var1 < 104 - var6 && var2 >= var6 && var2 < 104 - var6) {
+         int var7 = var0.transformedSize();
+         Client.field895.approxDestinationX = var1;
+         Client.field895.approxDestinationY = var2;
+         Client.field895.approxDestinationSizeX = 1;
+         Client.field895.approxDestinationSizeY = 1;
+         class65 var8 = Client.field895;
+         int var9 = NetSocket.calculateRoute(var4, var5, var7, var8, Client.collisionMaps[var0.plane], true, Client.field113, Client.field114);
+         if (var9 >= 1) {
+            for (int var10 = 0; var10 < var9 - 1; ++var10) {
+               var0.method255(Client.field113[var10], Client.field114[var10], var3);
             }
          }
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/WorldMapIndexCacheLoader.java b/runescape-client/src/main/java/WorldMapIndexCacheLoader.java
deleted file mode 100644
index 5333cd9d1b..0000000000
--- a/runescape-client/src/main/java/WorldMapIndexCacheLoader.java
+++ /dev/null
@@ -1,109 +0,0 @@
-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("ls")
-@Implements("WorldMapIndexCacheLoader")
-public class WorldMapIndexCacheLoader {
-   @ObfuscatedName("o")
-   @Export("cacheName")
-   String cacheName;
-   @ObfuscatedName("u")
-   @ObfuscatedSignature(
-      signature = "Lir;"
-   )
-   @Export("indexCache")
-   AbstractIndexCache indexCache;
-   @ObfuscatedName("g")
-   @ObfuscatedGetter(
-      intValue = 624113115
-   )
-   @Export("percentLoaded0")
-   int percentLoaded0;
-   @ObfuscatedName("l")
-   @Export("isLoaded0")
-   boolean isLoaded0;
-
-   @ObfuscatedSignature(
-      signature = "(Lir;)V"
-   )
-   WorldMapIndexCacheLoader(AbstractIndexCache var1) {
-      this.percentLoaded0 = 0;
-      this.isLoaded0 = false;
-      this.indexCache = var1;
-   }
-
-   @ObfuscatedName("m")
-   @ObfuscatedSignature(
-      signature = "(Ljava/lang/String;I)V",
-      garbageValue = "-1867776989"
-   )
-   @Export("reset")
-   void reset(String var1) {
-      if(var1 != null && !var1.isEmpty()) {
-         if(var1 != this.cacheName) {
-            this.cacheName = var1;
-            this.percentLoaded0 = 0;
-            this.isLoaded0 = false;
-            this.load();
-         }
-      }
-   }
-
-   @ObfuscatedName("f")
-   @ObfuscatedSignature(
-      signature = "(I)I",
-      garbageValue = "2019633217"
-   )
-   @Export("load")
-   int load() {
-      if(this.percentLoaded0 < 33) {
-         if(!this.indexCache.tryLoadRecordByNames(WorldMapCacheName.WorldMapCacheName_compositeMap.name, this.cacheName)) {
-            return this.percentLoaded0;
-         }
-
-         this.percentLoaded0 = 33;
-      }
-
-      if(this.percentLoaded0 == 33) {
-         if(this.indexCache.__ag_401(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, this.cacheName) && !this.indexCache.tryLoadRecordByNames(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, this.cacheName)) {
-            return this.percentLoaded0;
-         }
-
-         this.percentLoaded0 = 66;
-      }
-
-      if(this.percentLoaded0 == 66) {
-         if(!this.indexCache.tryLoadRecordByNames(this.cacheName, WorldMapCacheName.WorldMapCacheName_labels.name)) {
-            return this.percentLoaded0;
-         }
-
-         this.percentLoaded0 = 100;
-         this.isLoaded0 = true;
-      }
-
-      return this.percentLoaded0;
-   }
-
-   @ObfuscatedName("q")
-   @ObfuscatedSignature(
-      signature = "(S)Z",
-      garbageValue = "-16324"
-   )
-   @Export("isLoaded")
-   boolean isLoaded() {
-      return this.isLoaded0;
-   }
-
-   @ObfuscatedName("w")
-   @ObfuscatedSignature(
-      signature = "(I)I",
-      garbageValue = "1342963007"
-   )
-   @Export("percentLoaded")
-   int percentLoaded() {
-      return this.percentLoaded0;
-   }
-}
diff --git a/runescape-client/src/main/java/WorldMapLabel.java b/runescape-client/src/main/java/WorldMapLabel.java
index 2aa8c12cc7..dae9994f72 100644
--- a/runescape-client/src/main/java/WorldMapLabel.java
+++ b/runescape-client/src/main/java/WorldMapLabel.java
@@ -21,7 +21,7 @@ public class WorldMapLabel {
    @ObfuscatedGetter(
       intValue = -1536028937
    )
-   public static int __aj_e;
+   public static int field1039;
    @ObfuscatedName("m")
    @Export("text")
    String text;
@@ -61,96 +61,97 @@ public class WorldMapLabel {
    )
    public static void method443(PacketBuffer var0) {
       ReflectionCheck var1 = (ReflectionCheck)class322.reflectionChecks.last();
-      if(var1 != null) {
+      if (var1 != null) {
          int var2 = var0.index;
          var0.writeInt(var1.id);
 
-         for(int var3 = 0; var3 < var1.size; ++var3) {
-            if(var1.creationErrors[var3] != 0) {
+         for (int var3 = 0; var3 < var1.size; ++var3) {
+            if (var1.creationErrors[var3] != 0) {
                var0.writeByte(var1.creationErrors[var3]);
             } else {
                try {
                   int var4 = var1.operations[var3];
                   Field var5;
                   int var6;
-                  if(var4 == 0) {
+                  if (var4 == 0) {
                      var5 = var1.fields[var3];
                      var6 = Reflection.getInt(var5, (Object)null);
                      var0.writeByte(0);
                      var0.writeInt(var6);
-                  } else if(var4 == 1) {
+                  } else if (var4 == 1) {
                      var5 = var1.fields[var3];
                      Reflection.setInt(var5, (Object)null, var1.intReplaceValues[var3]);
                      var0.writeByte(0);
-                  } else if(var4 == 2) {
+                  } else if (var4 == 2) {
                      var5 = var1.fields[var3];
                      var6 = var5.getModifiers();
                      var0.writeByte(0);
                      var0.writeInt(var6);
                   }
 
-                  Method var25;
-                  if(var4 != 3) {
-                     if(var4 == 4) {
-                        var25 = var1.methods[var3];
-                        var6 = var25.getModifiers();
+                  Method var7;
+                  if (var4 != 3) {
+                     if (var4 == 4) {
+                        var7 = var1.methods[var3];
+                        var6 = var7.getModifiers();
                         var0.writeByte(0);
                         var0.writeInt(var6);
                      }
                   } else {
-                     var25 = var1.methods[var3];
-                     byte[][] var10 = var1.arguments[var3];
-                     Object[] var7 = new Object[var10.length];
+                     var7 = var1.methods[var3];
+                     byte[][] var8 = var1.arguments[var3];
+                     Object[] var9 = new Object[var8.length];
 
-                     for(int var8 = 0; var8 < var10.length; ++var8) {
-                        ObjectInputStream var9 = new ObjectInputStream(new ByteArrayInputStream(var10[var8]));
-                        var7[var8] = var9.readObject();
+                     for (int var10 = 0; var10 < var8.length; ++var10) {
+                        ObjectInputStream var11 = new ObjectInputStream(new ByteArrayInputStream(var8[var10]));
+                        var9[var10] = var11.readObject();
                      }
 
-                     Object var11 = Reflection.invoke(var25, (Object)null, var7);
-                     if(var11 == null) {
+                     Object var24 = Reflection.invoke(var7, (Object)null, var9);
+                     if (var24 == null) {
                         var0.writeByte(0);
-                     } else if(var11 instanceof Number) {
+                     } else if (var24 instanceof Number) {
                         var0.writeByte(1);
-                        var0.writeLong(((Number)var11).longValue());
-                     } else if(var11 instanceof String) {
+                        var0.writeLong(((Number)var24).longValue());
+                     } else if (var24 instanceof String) {
                         var0.writeByte(2);
-                        var0.writeStringCp1252NullTerminated((String)var11);
+                        var0.writeStringCp1252NullTerminated((String)var24);
                      } else {
                         var0.writeByte(4);
                      }
                   }
-               } catch (ClassNotFoundException var13) {
+               } catch (ClassNotFoundException var12) {
                   var0.writeByte(-10);
-               } catch (InvalidClassException var14) {
+               } catch (InvalidClassException var13) {
                   var0.writeByte(-11);
-               } catch (StreamCorruptedException var15) {
+               } catch (StreamCorruptedException var14) {
                   var0.writeByte(-12);
-               } catch (OptionalDataException var16) {
+               } catch (OptionalDataException var15) {
                   var0.writeByte(-13);
-               } catch (IllegalAccessException var17) {
+               } catch (IllegalAccessException var16) {
                   var0.writeByte(-14);
-               } catch (IllegalArgumentException var18) {
+               } catch (IllegalArgumentException var17) {
                   var0.writeByte(-15);
-               } catch (InvocationTargetException var19) {
+               } catch (InvocationTargetException var18) {
                   var0.writeByte(-16);
-               } catch (SecurityException var20) {
+               } catch (SecurityException var19) {
                   var0.writeByte(-17);
-               } catch (IOException var21) {
+               } catch (IOException var20) {
                   var0.writeByte(-18);
-               } catch (NullPointerException var22) {
+               } catch (NullPointerException var21) {
                   var0.writeByte(-19);
-               } catch (Exception var23) {
+               } catch (Exception var22) {
                   var0.writeByte(-20);
-               } catch (Throwable var24) {
+               } catch (Throwable var23) {
                   var0.writeByte(-21);
                }
             }
          }
 
-         var0.__aa_312(var2);
+         var0.writeCrc(var2);
          var1.remove();
       }
+
    }
 
    @ObfuscatedName("f")
@@ -160,7 +161,7 @@ public class WorldMapLabel {
    )
    static int method442(int var0, int var1) {
       ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
-      return var2 == null?0:(var1 >= 0 && var1 < var2.quantities.length?var2.quantities[var1]:0);
+      return var2 == null ? 0 : (var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0);
    }
 
    @ObfuscatedName("u")
@@ -172,7 +173,7 @@ public class WorldMapLabel {
    public static IndexedSprite[] createIndexedSpriteArray() {
       IndexedSprite[] var0 = new IndexedSprite[class328.indexedSpriteCount];
 
-      for(int var1 = 0; var1 < class328.indexedSpriteCount; ++var1) {
+      for (int var1 = 0; var1 < class328.indexedSpriteCount; ++var1) {
          IndexedSprite var2 = var0[var1] = new IndexedSprite();
          var2.width = class328.indexedSpriteWidth;
          var2.height = class328.indexedSpriteHeight;
@@ -189,7 +190,7 @@ public class WorldMapLabel {
       VarbitDefinition.indexedSpriteWidths = null;
       SecureRandomCallable.indexedSpriteHeights = null;
       class328.indexedSpritePalette = null;
-      class328.spritePixels = null;
+      class328.spritePixels = ((byte[][])null);
       return var0;
    }
 
@@ -199,23 +200,23 @@ public class WorldMapLabel {
       garbageValue = "1459100828"
    )
    @Export("compareWorlds")
-   static int compareWorlds(World var0, World var1, int var2, boolean var3) {
-      if(var2 == 1) {
+   static int compareWorlds(World var0, World var1, int mode, boolean reversed) {
+      if (mode == 1) {
          int var4 = var0.population;
          int var5 = var1.population;
-         if(!var3) {
-            if(var4 == -1) {
+         if (!reversed) {
+            if (var4 == -1) {
                var4 = 2001;
             }
 
-            if(var5 == -1) {
+            if (var5 == -1) {
                var5 = 2001;
             }
          }
 
          return var4 - var5;
       } else {
-         return var2 == 2?var0.location - var1.location:(var2 == 3?(var0.activity.equals("-")?(var1.activity.equals("-")?0:(var3?-1:1)):(var1.activity.equals("-")?(var3?1:-1):var0.activity.compareTo(var1.activity))):(var2 == 4?(var0.__a_147()?(var1.__a_147()?0:1):(var1.__a_147()?-1:0)):(var2 == 5?(var0.__x_145()?(var1.__x_145()?0:1):(var1.__x_145()?-1:0)):(var2 == 6?(var0.isPvp()?(var1.isPvp()?0:1):(var1.isPvp()?-1:0)):(var2 == 7?(var0.isMembersOnly()?(var1.isMembersOnly()?0:1):(var1.isMembersOnly()?-1:0)):var0.id - var1.id)))));
+         return mode == 2 ? var0.location - var1.location : (mode == 3 ? (var0.activity.equals("-") ? (var1.activity.equals("-") ? 0 : (reversed ? -1 : 1)) : (var1.activity.equals("-") ? (reversed ? 1 : -1) : var0.activity.compareTo(var1.activity))) : (mode == 4 ? (var0.method357() ? (var1.method357() ? 0 : 1) : (var1.method357() ? -1 : 0)) : (mode == 5 ? (var0.method356() ? (var1.method356() ? 0 : 1) : (var1.method356() ? -1 : 0)) : (mode == 6 ? (var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0)) : (mode == 7 ? (var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0)) : var0.id - var1.id)))));
       }
    }
 
@@ -225,8 +226,8 @@ public class WorldMapLabel {
       garbageValue = "60"
    )
    public static void method440() {
-      NpcDefinition.NpcDefinition_cached.clear();
-      NpcDefinition.NpcDefinition_cachedModels.clear();
+      NPCDefinition.NpcDefinition_cached.clear();
+      NPCDefinition.NpcDefinition_cachedModels.clear();
    }
 
    @ObfuscatedName("gx")
@@ -236,11 +237,11 @@ public class WorldMapLabel {
    )
    @Export("worldToScreen")
    static final void worldToScreen(int var0, int var1, int var2) {
-      if(var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) {
+      if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) {
          int var3 = class32.getTileHeight(var0, var1, SoundSystem.plane) - var2;
-         var0 -= WorldMapSection1.cameraX;
+         var0 -= WorldMapSection2.cameraX;
          var3 -= GrandExchangeEvents.cameraY;
-         var1 -= class11.cameraZ;
+         var1 -= GrandExchangeOfferNameComparator.cameraZ;
          int var4 = Rasterizer3D.Rasterizer3D_sine[WorldMapIcon1.cameraPitch];
          int var5 = Rasterizer3D.Rasterizer3D_cosine[WorldMapIcon1.cameraPitch];
          int var6 = Rasterizer3D.Rasterizer3D_sine[MusicPatchNode.cameraYaw];
@@ -250,17 +251,17 @@ public class WorldMapLabel {
          var0 = var8;
          var8 = var3 * var5 - var4 * var1 >> 16;
          var1 = var5 * var1 + var3 * var4 >> 16;
-         if(var1 >= 50) {
+         if (var1 >= 50) {
             Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2;
             Client.viewportTempY = var8 * Client.viewportZoom / var1 + Client.viewportHeight / 2;
          } else {
             Client.viewportTempX = -1;
             Client.viewportTempY = -1;
          }
-
       } else {
          Client.viewportTempX = -1;
          Client.viewportTempY = -1;
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/WorldMapLabelSize.java b/runescape-client/src/main/java/WorldMapLabelSize.java
index 3730917588..f86e3b2de0 100644
--- a/runescape-client/src/main/java/WorldMapLabelSize.java
+++ b/runescape-client/src/main/java/WorldMapLabelSize.java
@@ -35,38 +35,33 @@ public class WorldMapLabelSize {
    @ObfuscatedSignature(
       signature = "Lit;"
    )
-   static IndexCache __s_dq;
+   @Export("archive18")
+   static Archive archive18;
    @ObfuscatedName("fi")
    @ObfuscatedGetter(
       intValue = 1577759565
    )
-   static int __s_fi;
+   static int field1041;
    @ObfuscatedName("w")
    @ObfuscatedGetter(
       intValue = 1252293513
    )
-   final int __w;
+   final int field1042;
    @ObfuscatedName("o")
    @ObfuscatedGetter(
       intValue = 707828941
    )
-   final int __o;
+   final int field1043;
    @ObfuscatedName("u")
    @ObfuscatedGetter(
       intValue = -422937451
    )
-   final int __u;
-
-   static {
-      WorldMapLabelSize_small = new WorldMapLabelSize(0, 0, 4);
-      WorldMapLabelSize_medium = new WorldMapLabelSize(2, 1, 2);
-      WorldMapLabelSize_large = new WorldMapLabelSize(1, 2, 0);
-   }
+   final int field1044;
 
    WorldMapLabelSize(int var1, int var2, int var3) {
-      this.__w = var1;
-      this.__o = var2;
-      this.__u = var3;
+      this.field1042 = var1;
+      this.field1043 = var2;
+      this.field1044 = var3;
    }
 
    @ObfuscatedName("f")
@@ -74,8 +69,8 @@ public class WorldMapLabelSize {
       signature = "(FI)Z",
       garbageValue = "2107231705"
    )
-   boolean __f_14(float var1) {
-      return var1 >= (float)this.__u;
+   boolean method400(float var1) {
+      return var1 >= (float)this.field1044;
    }
 
    @ObfuscatedName("m")
@@ -83,7 +78,8 @@ public class WorldMapLabelSize {
       signature = "(I)[Ls;",
       garbageValue = "1579674051"
    )
-   static WorldMapLabelSize[] method192() {
+   @Export("values")
+   static WorldMapLabelSize[] values() {
       return new WorldMapLabelSize[]{WorldMapLabelSize_small, WorldMapLabelSize_medium, WorldMapLabelSize_large};
    }
 
@@ -92,12 +88,13 @@ public class WorldMapLabelSize {
       signature = "(IB)Ls;",
       garbageValue = "-67"
    )
-   static WorldMapLabelSize method195(int var0) {
-      WorldMapLabelSize[] var1 = method192();
+   @Export("valueOf")
+   static WorldMapLabelSize valueOf(int var0) {
+      WorldMapLabelSize[] var1 = values();
 
-      for(int var2 = 0; var2 < var1.length; ++var2) {
+      for (int var2 = 0; var2 < var1.length; ++var2) {
          WorldMapLabelSize var3 = var1[var2];
-         if(var0 == var3.__o) {
+         if (var0 == var3.field1043) {
             return var3;
          }
       }
@@ -111,19 +108,25 @@ public class WorldMapLabelSize {
       garbageValue = "-187598326"
    )
    static final void method198() {
-      PacketBufferNode var0 = Interpreter.method1915(ClientPacket.__gs_h, Client.packetWriter.isaacCipher);
-      Client.packetWriter.__q_167(var0);
+      PacketBufferNode var0 = Interpreter.method1915(ClientPacket.field242, Client.packetWriter.isaacCipher);
+      Client.packetWriter.method241(var0);
 
-      for(WidgetGroupParent var1 = (WidgetGroupParent)Client.widgetGroupParents.first(); var1 != null; var1 = (WidgetGroupParent)Client.widgetGroupParents.next()) {
-         if(var1.type == 0 || var1.type == 3) {
-            MenuAction.closeWidgetGroup(var1, true);
+      for (InterfaceParent var1 = (InterfaceParent)Client.interfaceParents.first(); var1 != null; var1 = (InterfaceParent)Client.interfaceParents.next()) {
+         if (var1.type == 0 || var1.type == 3) {
+            MenuAction.closeInterface(var1, true);
          }
       }
 
-      if(Client.__client_mo != null) {
-         class22.method295(Client.__client_mo);
-         Client.__client_mo = null;
+      if (Client.field127 != null) {
+         WorldMapRectangle.method295(Client.field127);
+         Client.field127 = null;
       }
 
    }
+
+   static {
+      WorldMapLabelSize_small = new WorldMapLabelSize(0, 0, 4);
+      WorldMapLabelSize_medium = new WorldMapLabelSize(2, 1, 2);
+      WorldMapLabelSize_large = new WorldMapLabelSize(1, 2, 0);
+   }
 }
diff --git a/runescape-client/src/main/java/WorldMapManager.java b/runescape-client/src/main/java/WorldMapManager.java
index 7388645bbb..43ef750c5d 100644
--- a/runescape-client/src/main/java/WorldMapManager.java
+++ b/runescape-client/src/main/java/WorldMapManager.java
@@ -13,8 +13,8 @@ import net.runelite.mapping.ObfuscatedSignature;
 @Implements("WorldMapManager")
 public final class WorldMapManager {
    @ObfuscatedName("m")
-   @Export("isLoaded0")
-   boolean isLoaded0;
+   @Export("loaded")
+   boolean loaded;
    @ObfuscatedName("f")
    @Export("loadStarted")
    boolean loadStarted;
@@ -40,7 +40,7 @@ public final class WorldMapManager {
    @Export("regions")
    WorldMapRegion[][] regions;
    @ObfuscatedName("g")
-   HashMap __g;
+   HashMap field1045;
    @ObfuscatedName("l")
    @ObfuscatedSignature(
       signature = "[Llq;"
@@ -51,12 +51,12 @@ public final class WorldMapManager {
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   final AbstractIndexCache __e;
+   final AbstractArchive field1046;
    @ObfuscatedName("x")
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   final AbstractIndexCache __x;
+   final AbstractArchive field1047;
    @ObfuscatedName("d")
    @Export("fonts")
    final HashMap fonts;
@@ -76,30 +76,30 @@ public final class WorldMapManager {
    @ObfuscatedGetter(
       intValue = 1729323633
    )
-   int __i;
+   int field1048;
    @ObfuscatedName("a")
    @ObfuscatedGetter(
       intValue = -395718741
    )
-   int __a;
+   int field1049;
    @ObfuscatedName("z")
    @ObfuscatedGetter(
       intValue = 1085359673
    )
-   public int __z;
+   public int field1050;
 
    @ObfuscatedSignature(
       signature = "([Llq;Ljava/util/HashMap;Lir;Lir;)V"
    )
-   public WorldMapManager(IndexedSprite[] var1, HashMap var2, AbstractIndexCache var3, AbstractIndexCache var4) {
-      this.isLoaded0 = false;
+   public WorldMapManager(IndexedSprite[] var1, HashMap var2, AbstractArchive var3, AbstractArchive var4) {
+      this.loaded = false;
       this.loadStarted = false;
-      this.__g = new HashMap();
-      this.__z = 0;
+      this.field1045 = new HashMap();
+      this.field1050 = 0;
       this.mapSceneSprites = var1;
       this.fonts = var2;
-      this.__e = var3;
-      this.__x = var4;
+      this.field1046 = var3;
+      this.field1047 = var4;
    }
 
    @ObfuscatedName("m")
@@ -108,22 +108,22 @@ public final class WorldMapManager {
       garbageValue = "32"
    )
    @Export("load")
-   public void load(AbstractIndexCache var1, String var2, boolean var3) {
-      if(!this.loadStarted) {
-         this.isLoaded0 = false;
+   public void load(AbstractArchive archive, String cacheName, boolean isMembersWorld) {
+      if (!this.loadStarted) {
+         this.loaded = false;
          this.loadStarted = true;
          System.nanoTime();
-         int var4 = var1.getArchiveId(WorldMapCacheName.WorldMapCacheName_details.name);
-         int var5 = var1.getRecordId(var4, var2);
-         Buffer var6 = new Buffer(var1.takeRecordByNames(WorldMapCacheName.WorldMapCacheName_details.name, var2));
-         Buffer var7 = new Buffer(var1.takeRecordByNames(WorldMapCacheName.WorldMapCacheName_compositeMap.name, var2));
+         int var4 = archive.getGroupId(WorldMapCacheName.WorldMapCacheName_details.name);
+         int var5 = archive.getFileId(var4, cacheName);
+         Buffer var6 = new Buffer(archive.takeFileByNames(WorldMapCacheName.WorldMapCacheName_details.name, cacheName));
+         Buffer var7 = new Buffer(archive.takeFileByNames(WorldMapCacheName.WorldMapCacheName_compositeMap.name, cacheName));
          System.nanoTime();
          System.nanoTime();
          this.mapAreaData = new WorldMapAreaData();
 
          try {
-            this.mapAreaData.__ce_76(var6, var7, var5, var3);
-         } catch (IllegalStateException var19) {
+            this.mapAreaData.method387(var6, var7, var5, isMembersWorld);
+         } catch (IllegalStateException var16) {
             return;
          }
 
@@ -132,47 +132,49 @@ public final class WorldMapManager {
          this.mapAreaData.originY();
          this.surfaceOffsetX = this.mapAreaData.minX() * 64;
          this.surfaceOffsetY = this.mapAreaData.minY() * 64;
-         this.__i = (this.mapAreaData.maxX() - this.mapAreaData.minX() + 1) * 64;
-         this.__a = (this.mapAreaData.maxY() - this.mapAreaData.minY() + 1) * 64;
-         int var16 = this.mapAreaData.maxX() - this.mapAreaData.minX() + 1;
+         this.field1048 = (this.mapAreaData.maxX() - this.mapAreaData.minX() + 1) * 64;
+         this.field1049 = (this.mapAreaData.maxY() - this.mapAreaData.minY() + 1) * 64;
+         int var8 = this.mapAreaData.maxX() - this.mapAreaData.minX() + 1;
          int var9 = this.mapAreaData.maxY() - this.mapAreaData.minY() + 1;
          System.nanoTime();
          System.nanoTime();
          SoundSystem.method2456();
-         this.regions = new WorldMapRegion[var16][var9];
-         Iterator var10 = this.mapAreaData.__n.iterator();
+         this.regions = new WorldMapRegion[var8][var9];
+         Iterator var10 = this.mapAreaData.field1016.iterator();
 
-         while(var10.hasNext()) {
-            class15 var11 = (class15)var10.next();
-            int var12 = var11.field149;
-            int var13 = var11.field146;
-            int var14 = var12 - this.mapAreaData.minX();
+         int var11;
+         while (var10.hasNext()) {
+            class15 var12 = (class15)var10.next();
+            var11 = var12.field149;
+            int var13 = var12.field146;
+            int var14 = var11 - this.mapAreaData.minX();
             int var15 = var13 - this.mapAreaData.minY();
-            this.regions[var14][var15] = new WorldMapRegion(var12, var13, this.mapAreaData.__a_39(), this.fonts);
-            this.regions[var14][var15].method447(var11, this.mapAreaData.__a);
+            this.regions[var14][var15] = new WorldMapRegion(var11, var13, this.mapAreaData.method386(), this.fonts);
+            this.regions[var14][var15].method447(var12, this.mapAreaData.field1018);
          }
 
-         for(int var17 = 0; var17 < var16; ++var17) {
-            for(int var18 = 0; var18 < var9; ++var18) {
-               if(this.regions[var17][var18] == null) {
-                  this.regions[var17][var18] = new WorldMapRegion(this.mapAreaData.minX() + var17, this.mapAreaData.minY() + var18, this.mapAreaData.__a_39(), this.fonts);
-                  this.regions[var17][var18].__u_41(this.mapAreaData.__i, this.mapAreaData.__a);
+         for (int var17 = 0; var17 < var8; ++var17) {
+            for (var11 = 0; var11 < var9; ++var11) {
+               if (this.regions[var17][var11] == null) {
+                  this.regions[var17][var11] = new WorldMapRegion(this.mapAreaData.minX() + var17, this.mapAreaData.minY() + var11, this.mapAreaData.method386(), this.fonts);
+                  this.regions[var17][var11].method405(this.mapAreaData.field1017, this.mapAreaData.field1018);
                }
             }
          }
 
          System.nanoTime();
          System.nanoTime();
-         if(var1.__ag_401(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, var2)) {
-            byte[] var20 = var1.takeRecordByNames(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, var2);
-            this.overviewSprite = class27.convertJpgToSprite(var20);
+         if (archive.method9(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, cacheName)) {
+            byte[] var18 = archive.takeFileByNames(WorldMapCacheName.WorldMapCacheName_compositeTexture.name, cacheName);
+            this.overviewSprite = class27.convertJpgToSprite(var18);
          }
 
          System.nanoTime();
-         var1.__y_398();
-         var1.__b_400();
-         this.isLoaded0 = true;
+         archive.method6();
+         archive.method8();
+         this.loaded = true;
       }
+
    }
 
    @ObfuscatedName("f")
@@ -190,30 +192,30 @@ public final class WorldMapManager {
       signature = "(IIIIIIIII)V",
       garbageValue = "1619301748"
    )
-   public final void __q_72(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
+   public final void method401(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
       int[] var9 = Rasterizer2D.Rasterizer2D_pixels;
       int var10 = Rasterizer2D.Rasterizer2D_width;
       int var11 = Rasterizer2D.Rasterizer2D_height;
       int[] var12 = new int[4];
       Rasterizer2D.Rasterizer2D_getClipArray(var12);
-      class22 var13 = this.method643(var1, var2, var3, var4);
+      WorldMapRectangle var13 = this.method643(var1, var2, var3, var4);
       float var14 = this.getPixelsPerTile(var7 - var5, var3 - var1);
       int var15 = (int)Math.ceil((double)var14);
-      this.__z = var15;
-      if(!this.__g.containsKey(Integer.valueOf(var15))) {
+      this.field1050 = var15;
+      if (!this.field1045.containsKey(var15)) {
          class40 var16 = new class40(var15);
          var16.method763();
-         this.__g.put(Integer.valueOf(var15), var16);
+         this.field1045.put(var15, var16);
       }
 
-      int var23 = var13.field166 + var13.field169 - 1;
-      int var17 = var13.field167 + var13.field164 - 1;
+      int var23 = var13.worldMapRegionX + var13.worldMapRegionWidth - 1;
+      int var17 = var13.worldMapRegionY + var13.worldMapRegionHeight - 1;
 
       int var18;
       int var19;
-      for(var18 = var13.field166; var18 <= var23; ++var18) {
-         for(var19 = var13.field167; var19 <= var17; ++var19) {
-            this.regions[var18][var19].method455(var15, (class40)this.__g.get(Integer.valueOf(var15)), this.mapSceneSprites, this.__e, this.__x);
+      for (var18 = var13.worldMapRegionX; var18 <= var23; ++var18) {
+         for (var19 = var13.worldMapRegionY; var19 <= var17; ++var19) {
+            this.regions[var18][var19].method455(var15, (class40)this.field1045.get(var15), this.mapSceneSprites, this.field1046, this.field1047);
          }
       }
 
@@ -223,9 +225,9 @@ public final class WorldMapManager {
       var19 = this.surfaceOffsetX + var1;
       int var20 = var2 + this.surfaceOffsetY;
 
-      for(int var21 = var13.field166; var21 < var13.field166 + var13.field169; ++var21) {
-         for(int var22 = var13.field167; var22 < var13.field167 + var13.field164; ++var22) {
-            this.regions[var21][var22].__w_40(var5 + var18 * (this.regions[var21][var22].x * 64 - var19) / 64, var8 - var18 * (this.regions[var21][var22].y * 64 - var20 + 64) / 64, var18);
+      for (int var21 = var13.worldMapRegionX; var21 < var13.worldMapRegionX + var13.worldMapRegionWidth; ++var21) {
+         for (int var22 = var13.worldMapRegionY; var22 < var13.worldMapRegionY + var13.worldMapRegionHeight; ++var22) {
+            this.regions[var21][var22].method404(var5 + var18 * (this.regions[var21][var22].x * 64 - var19) / 64, var8 - var18 * (this.regions[var21][var22].y * 64 - var20 + 64) / 64, var18);
          }
       }
 
@@ -236,8 +238,8 @@ public final class WorldMapManager {
       signature = "(IIIIIIIILjava/util/HashSet;Ljava/util/HashSet;IIZB)V",
       garbageValue = "-71"
    )
-   public final void __w_73(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) {
-      class22 var14 = this.method643(var1, var2, var3, var4);
+   public final void method402(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.method643(var1, var2, var3, var4);
       float var15 = this.getPixelsPerTile(var7 - var5, var3 - var1);
       int var16 = (int)(var15 * 64.0F);
       int var17 = this.surfaceOffsetX + var1;
@@ -245,20 +247,20 @@ public final class WorldMapManager {
 
       int var19;
       int var20;
-      for(var19 = var14.field166; var19 < var14.field169 + var14.field166; ++var19) {
-         for(var20 = var14.field167; var20 < var14.field164 + var14.field167; ++var20) {
-            if(var13) {
-               this.regions[var19][var20].__e_42();
+      for (var19 = var14.worldMapRegionX; var19 < var14.worldMapRegionWidth + var14.worldMapRegionX; ++var19) {
+         for (var20 = var14.worldMapRegionY; var20 < var14.worldMapRegionHeight + var14.worldMapRegionY; ++var20) {
+            if (var13) {
+               this.regions[var19][var20].method406();
             }
 
-            this.regions[var19][var20].__j_46(var5 + var16 * (this.regions[var19][var20].x * 64 - var17) / 64, var8 - var16 * (this.regions[var19][var20].y * 64 - var18 + 64) / 64, var16, var9);
+            this.regions[var19][var20].method410(var5 + var16 * (this.regions[var19][var20].x * 64 - var17) / 64, var8 - var16 * (this.regions[var19][var20].y * 64 - var18 + 64) / 64, var16, var9);
          }
       }
 
-      if(var10 != null && var11 > 0) {
-         for(var19 = var14.field166; var19 < var14.field169 + var14.field166; ++var19) {
-            for(var20 = var14.field167; var20 < var14.field167 + var14.field164; ++var20) {
-               this.regions[var19][var20].__s_47(var10, var11, var12);
+      if (var10 != null && var11 > 0) {
+         for (var19 = var14.worldMapRegionX; var19 < var14.worldMapRegionWidth + var14.worldMapRegionX; ++var19) {
+            for (var20 = var14.worldMapRegionY; var20 < var14.worldMapRegionY + var14.worldMapRegionHeight; ++var20) {
+               this.regions[var19][var20].method411(var10, var11, var12);
             }
          }
       }
@@ -272,37 +274,38 @@ public final class WorldMapManager {
    )
    @Export("drawOverview")
    public void drawOverview(int var1, int var2, int var3, int var4, HashSet var5, int var6, int var7) {
-      if(this.overviewSprite != null) {
-         this.overviewSprite.__j_506(var1, var2, var3, var4);
-         if(var6 > 0 && var6 % var7 < var7 / 2) {
-            if(this.icons == null) {
+      if (this.overviewSprite != null) {
+         this.overviewSprite.method309(var1, var2, var3, var4);
+         if (var6 > 0 && var6 % var7 < var7 / 2) {
+            if (this.icons == null) {
                this.buildIcons0();
             }
 
             Iterator var8 = var5.iterator();
 
-            while(true) {
-               List var10;
+            while (true) {
+               List var9;
                do {
-                  if(!var8.hasNext()) {
+                  if (!var8.hasNext()) {
                      return;
                   }
 
-                  int var9 = ((Integer)var8.next()).intValue();
-                  var10 = (List)this.icons.get(Integer.valueOf(var9));
-               } while(var10 == null);
+                  int var10 = (Integer)var8.next();
+                  var9 = (List)this.icons.get(var10);
+               } while(var9 == null);
 
-               Iterator var11 = var10.iterator();
+               Iterator var14 = var9.iterator();
 
-               while(var11.hasNext()) {
-                  AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var11.next();
-                  int var13 = var3 * (var12.coord2.x - this.surfaceOffsetX) / this.__i;
-                  int var14 = var4 - (var12.coord2.y - this.surfaceOffsetY) * var4 / this.__a;
-                  Rasterizer2D.Rasterizer2D_drawCircleAlpha(var13 + var1, var14 + var2, 2, 16776960, 256);
+               while (var14.hasNext()) {
+                  AbstractWorldMapIcon var11 = (AbstractWorldMapIcon)var14.next();
+                  int var12 = var3 * (var11.coord2.x - this.surfaceOffsetX) / this.field1048;
+                  int var13 = var4 - (var11.coord2.y - this.surfaceOffsetY) * var4 / this.field1049;
+                  Rasterizer2D.Rasterizer2D_drawCircleAlpha(var12 + var1, var13 + var2, 2, 16776960, 256);
                }
             }
          }
       }
+
    }
 
    @ObfuscatedName("u")
@@ -310,21 +313,21 @@ public final class WorldMapManager {
       signature = "(IIIIIIIIIII)Ljava/util/List;",
       garbageValue = "1185703832"
    )
-   public List __u_74(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) {
+   public List method403(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) {
       LinkedList var11 = new LinkedList();
-      if(!this.isLoaded0) {
+      if (!this.loaded) {
          return var11;
       } else {
-         class22 var12 = this.method643(var1, var2, var3, var4);
+         WorldMapRectangle var12 = this.method643(var1, var2, var3, var4);
          float var13 = this.getPixelsPerTile(var7, var3 - var1);
          int var14 = (int)(var13 * 64.0F);
          int var15 = this.surfaceOffsetX + var1;
          int var16 = var2 + this.surfaceOffsetY;
 
-         for(int var17 = var12.field166; var17 < var12.field166 + var12.field169; ++var17) {
-            for(int var18 = var12.field167; var18 < var12.field164 + var12.field167; ++var18) {
-               List var19 = this.regions[var17][var18].__ae_57(var5 + var14 * (this.regions[var17][var18].x * 64 - var15) / 64, var8 + var6 - var14 * (this.regions[var17][var18].y * 64 - var16 + 64) / 64, var14, var9, var10);
-               if(!var19.isEmpty()) {
+         for (int var17 = var12.worldMapRegionX; var17 < var12.worldMapRegionX + var12.worldMapRegionWidth; ++var17) {
+            for (int var18 = var12.worldMapRegionY; var18 < var12.worldMapRegionHeight + var12.worldMapRegionY; ++var18) {
+               List var19 = this.regions[var17][var18].method421(var5 + var14 * (this.regions[var17][var18].x * 64 - var15) / 64, var8 + var6 - var14 * (this.regions[var17][var18].y * 64 - var16 + 64) / 64, var14, var9, var10);
+               if (!var19.isEmpty()) {
                   var11.addAll(var19);
                }
             }
@@ -339,8 +342,8 @@ public final class WorldMapManager {
       signature = "(IIIII)Lc;",
       garbageValue = "-1455088394"
    )
-   class22 method643(int var1, int var2, int var3, int var4) {
-      class22 var5 = new class22(this);
+   WorldMapRectangle method643(int var1, int var2, int var3, int var4) {
+      WorldMapRectangle var5 = new WorldMapRectangle(this);
       int var6 = this.surfaceOffsetX + var1;
       int var7 = var2 + this.surfaceOffsetY;
       int var8 = var3 + this.surfaceOffsetX;
@@ -349,30 +352,30 @@ public final class WorldMapManager {
       int var11 = var7 / 64;
       int var12 = var8 / 64;
       int var13 = var9 / 64;
-      var5.field169 = var12 - var10 + 1;
-      var5.field164 = var13 - var11 + 1;
-      var5.field166 = var10 - this.mapAreaData.minX();
-      var5.field167 = var11 - this.mapAreaData.minY();
-      if(var5.field166 < 0) {
-         var5.field169 += var5.field166;
-         var5.field166 = 0;
+      var5.worldMapRegionWidth = var12 - var10 + 1;
+      var5.worldMapRegionHeight = var13 - var11 + 1;
+      var5.worldMapRegionX = var10 - this.mapAreaData.minX();
+      var5.worldMapRegionY = var11 - this.mapAreaData.minY();
+      if (var5.worldMapRegionX < 0) {
+         var5.worldMapRegionWidth += var5.worldMapRegionX;
+         var5.worldMapRegionX = 0;
       }
 
-      if(var5.field166 > this.regions.length - var5.field169) {
-         var5.field169 = this.regions.length - var5.field166;
+      if (var5.worldMapRegionX > this.regions.length - var5.worldMapRegionWidth) {
+         var5.worldMapRegionWidth = this.regions.length - var5.worldMapRegionX;
       }
 
-      if(var5.field167 < 0) {
-         var5.field164 += var5.field167;
-         var5.field167 = 0;
+      if (var5.worldMapRegionY < 0) {
+         var5.worldMapRegionHeight += var5.worldMapRegionY;
+         var5.worldMapRegionY = 0;
       }
 
-      if(var5.field167 > this.regions[0].length - var5.field164) {
-         var5.field164 = this.regions[0].length - var5.field167;
+      if (var5.worldMapRegionY > this.regions[0].length - var5.worldMapRegionHeight) {
+         var5.worldMapRegionHeight = this.regions[0].length - var5.worldMapRegionY;
       }
 
-      var5.field169 = Math.min(var5.field169, this.regions.length);
-      var5.field164 = Math.min(var5.field164, this.regions[0].length);
+      var5.worldMapRegionWidth = Math.min(var5.worldMapRegionWidth, this.regions.length);
+      var5.worldMapRegionHeight = Math.min(var5.worldMapRegionHeight, this.regions[0].length);
       return var5;
    }
 
@@ -383,7 +386,7 @@ public final class WorldMapManager {
    )
    @Export("isLoaded")
    public boolean isLoaded() {
-      return this.isLoaded0;
+      return this.loaded;
    }
 
    @ObfuscatedName("e")
@@ -404,27 +407,27 @@ public final class WorldMapManager {
    )
    @Export("buildIcons0")
    void buildIcons0() {
-      if(this.icons == null) {
+      if (this.icons == null) {
          this.icons = new HashMap();
       }
 
       this.icons.clear();
 
-      for(int var1 = 0; var1 < this.regions.length; ++var1) {
-         for(int var2 = 0; var2 < this.regions[var1].length; ++var2) {
+      for (int var1 = 0; var1 < this.regions.length; ++var1) {
+         for (int var2 = 0; var2 < this.regions[var1].length; ++var2) {
             List var3 = this.regions[var1][var2].icons();
             Iterator var4 = var3.iterator();
 
-            while(var4.hasNext()) {
+            while (var4.hasNext()) {
                AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next();
-               if(var5.__h_67()) {
-                  int var6 = var5.__m_15();
-                  if(!this.icons.containsKey(Integer.valueOf(var6))) {
+               if (var5.method19()) {
+                  int var6 = var5.getElement();
+                  if (!this.icons.containsKey(var6)) {
                      LinkedList var7 = new LinkedList();
                      var7.add(var5);
-                     this.icons.put(Integer.valueOf(var6), var7);
+                     this.icons.put(var6, var7);
                   } else {
-                     List var8 = (List)this.icons.get(Integer.valueOf(var6));
+                     List var8 = (List)this.icons.get(var6);
                      var8.add(var5);
                   }
                }
@@ -442,13 +445,13 @@ public final class WorldMapManager {
    @Export("getPixelsPerTile")
    float getPixelsPerTile(int var1, int var2) {
       float var3 = (float)var1 / (float)var2;
-      if(var3 > 8.0F) {
+      if (var3 > 8.0F) {
          return 8.0F;
-      } else if(var3 < 1.0F) {
+      } else if (var3 < 1.0F) {
          return 1.0F;
       } else {
          int var4 = Math.round(var3);
-         return Math.abs((float)var4 - var3) < 0.05F?(float)var4:var3;
+         return Math.abs((float)var4 - var3) < 0.05F ? (float)var4 : var3;
       }
    }
 
@@ -458,24 +461,24 @@ public final class WorldMapManager {
       garbageValue = "514181856"
    )
    @Export("itemContainerSetItem")
-   static void itemContainerSetItem(int var0, int var1, int var2, int var3) {
-      ItemContainer var4 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
-      if(var4 == null) {
+   static void itemContainerSetItem(int itemContainerId, int index, int itemId, int itemQuantity) {
+      ItemContainer var4 = (ItemContainer)ItemContainer.itemContainers.get((long)itemContainerId);
+      if (var4 == null) {
          var4 = new ItemContainer();
-         ItemContainer.itemContainers.put(var4, (long)var0);
+         ItemContainer.itemContainers.put(var4, (long)itemContainerId);
       }
 
-      if(var4.ids.length <= var1) {
-         int[] var5 = new int[var1 + 1];
-         int[] var6 = new int[var1 + 1];
+      if (var4.ids.length <= index) {
+         int[] var5 = new int[index + 1];
+         int[] var6 = new int[index + 1];
 
          int var7;
-         for(var7 = 0; var7 < var4.ids.length; ++var7) {
+         for (var7 = 0; var7 < var4.ids.length; ++var7) {
             var5[var7] = var4.ids[var7];
             var6[var7] = var4.quantities[var7];
          }
 
-         for(var7 = var4.ids.length; var7 < var1; ++var7) {
+         for (var7 = var4.ids.length; var7 < index; ++var7) {
             var5[var7] = -1;
             var6[var7] = 0;
          }
@@ -484,8 +487,8 @@ public final class WorldMapManager {
          var4.quantities = var6;
       }
 
-      var4.ids[var1] = var2;
-      var4.quantities[var1] = var3;
+      var4.ids[index] = itemId;
+      var4.quantities[index] = itemQuantity;
    }
 
    @ObfuscatedName("s")
@@ -495,8 +498,8 @@ public final class WorldMapManager {
    )
    public static void method673() {
       ObjectDefinition.ObjectDefinition_cached.clear();
-      ObjectDefinition.__jr_o.clear();
-      ObjectDefinition.__jr_u.clear();
+      ObjectDefinition.field641.clear();
+      ObjectDefinition.field642.clear();
       ObjectDefinition.ObjectDefinition_cachedModels.clear();
    }
 
@@ -516,6 +519,6 @@ public final class WorldMapManager {
       garbageValue = "1341489301"
    )
    static final void method668() {
-      Client.__client_na = Client.cycleCntr;
+      Client.field105 = Client.cycleCntr;
    }
 }
diff --git a/runescape-client/src/main/java/class22.java b/runescape-client/src/main/java/WorldMapRectangle.java
similarity index 61%
rename from runescape-client/src/main/java/class22.java
rename to runescape-client/src/main/java/WorldMapRectangle.java
index abedb5af5a..3276cdc08b 100644
--- a/runescape-client/src/main/java/class22.java
+++ b/runescape-client/src/main/java/WorldMapRectangle.java
@@ -1,10 +1,13 @@
 import net.runelite.mapping.Export;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("c")
-public final class class22 {
+@Implements("WorldMapRectangle")
+public final class WorldMapRectangle
+{
    @ObfuscatedName("z")
    @ObfuscatedSignature(
       signature = "Lgr;"
@@ -21,29 +24,32 @@ public final class class22 {
    @ObfuscatedSignature(
       signature = "Lit;"
    )
-   @Export("indexCache16")
-   static IndexCache indexCache16;
+   @Export("archive17")
+   static Archive archive17;
    @ObfuscatedName("m")
    @ObfuscatedGetter(
       intValue = 1976624405
    )
-   int field169;
+   @Export("worldMapRegionWidth")
+   int worldMapRegionWidth;
    @ObfuscatedName("f")
    @ObfuscatedGetter(
       intValue = -698663527
    )
-   int field164;
+   @Export("worldMapRegionHeight")
+   int worldMapRegionHeight;
    @ObfuscatedName("q")
    @ObfuscatedGetter(
       intValue = 1588021801
    )
-   int field166;
+   @Export("worldMapRegionX")
+   int worldMapRegionX;
    @ObfuscatedName("w")
    @ObfuscatedGetter(
       intValue = 2138505015
    )
-   int field167;
-   // $FF: synthetic field
+   @Export("worldMapRegionY")
+   int worldMapRegionY;
    @ObfuscatedSignature(
       signature = "Lal;"
    )
@@ -52,7 +58,7 @@ public final class class22 {
    @ObfuscatedSignature(
       signature = "(Lal;)V"
    )
-   class22(WorldMapManager var1) {
+   WorldMapRectangle(WorldMapManager var1) {
       this.this$0 = var1;
    }
 
@@ -71,10 +77,10 @@ public final class class22 {
       garbageValue = "61"
    )
    static final void method294(String var0) {
-      StringBuilder var10000 = (new StringBuilder()).append(var0);
-      Object var10001 = null;
-      String var1 = var10000.append(" is already on your ignore list").toString();
-      WorldMapIcon1.method219(30, "", var1);
+      StringBuilder var1 = (new StringBuilder()).append(var0);
+      Object var2 = null;
+      String var3 = var1.append(" is already on your ignore list").toString();
+      WorldMapIcon1.addGameMessage(30, "", var3);
    }
 
    @ObfuscatedName("fw")
@@ -82,14 +88,14 @@ public final class class22 {
       signature = "(IZZZB)Lit;",
       garbageValue = "-15"
    )
-   @Export("newIndexCache")
-   static IndexCache newIndexCache(int var0, boolean var1, boolean var2, boolean var3) {
-      IndexStore var4 = null;
-      if(class168.dat2File != null) {
-         var4 = new IndexStore(var0, class168.dat2File, IndexStoreAction.idxFiles[var0], 1000000);
+   @Export("newArchive")
+   static Archive newArchive(int index, boolean releaseGroups, boolean shallowFiles, boolean var3) {
+      ArchiveDisk var4 = null;
+      if (class168.dat2File != null) {
+         var4 = new ArchiveDisk(index, class168.dat2File, ArchiveDiskAction.idxFiles[index], 1000000);
       }
 
-      return new IndexCache(var4, Fonts.indexStore255, var0, var1, var2, var3);
+      return new Archive(var4, Fonts.masterDisk, index, releaseGroups, shallowFiles, var3);
    }
 
    @ObfuscatedName("jp")
@@ -98,8 +104,8 @@ public final class class22 {
       garbageValue = "1002272291"
    )
    static void method295(Widget var0) {
-      if(var0.cycle == Client.__client_oo) {
-         Client.__client_od[var0.rootIndex] = true;
+      if (var0.cycle == Client.field98) {
+         Client.field100[var0.rootIndex] = true;
       }
 
    }
@@ -111,13 +117,13 @@ public final class class22 {
    )
    static final void method296(Widget var0, int var1, int var2, int var3) {
       SpriteMask var4 = var0.getSpriteMask(false);
-      if(var4 != null) {
-         if(Client.minimapState < 3) {
-            UnitPriceComparator.compass.__ay_513(var1, var2, var4.width, var4.height, 25, 25, Client.minimapOrientation, 256, var4.xStarts, var4.xWidths);
+      if (var4 != null) {
+         if (Client.minimapState < 3) {
+            GrandExchangeOfferUnitPriceComparator.compass.method315(var1, var2, var4.width, var4.height, 25, 25, Client.camAngleY, 256, var4.xStarts, var4.xWidths);
          } else {
             Rasterizer2D.method5948(var1, var2, 0, var4.xStarts, var4.xWidths);
          }
-
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java
index 9df1dc4a80..ba6726efa0 100644
--- a/runescape-client/src/main/java/WorldMapRegion.java
+++ b/runescape-client/src/main/java/WorldMapRegion.java
@@ -17,7 +17,7 @@ public class WorldMapRegion {
    @ObfuscatedSignature(
       signature = "Lec;"
    )
-   public static DemotingHashTable __av_o;
+   public static DemotingHashTable field1051;
    @ObfuscatedName("u")
    @ObfuscatedGetter(
       intValue = -1061363609
@@ -36,17 +36,18 @@ public class WorldMapRegion {
    )
    class15 field239;
    @ObfuscatedName("e")
-   LinkedList __e;
+   LinkedList field1052;
    @ObfuscatedName("x")
    @ObfuscatedGetter(
       intValue = -120515153
    )
-   int __x;
+   int field1053;
    @ObfuscatedName("d")
    @ObfuscatedGetter(
       intValue = 415972873
    )
-   int __d;
+   @Export("pixelsPerTile")
+   int pixelsPerTile;
    @ObfuscatedName("k")
    @Export("iconsList")
    List iconsList;
@@ -57,17 +58,13 @@ public class WorldMapRegion {
    @Export("fonts")
    final HashMap fonts;
 
-   static {
-      __av_o = new DemotingHashTable(37748736, 256);
-   }
-
    WorldMapRegion(int var1, int var2, int var3, HashMap var4) {
       this.x = var1;
       this.y = var2;
-      this.__e = new LinkedList();
+      this.field1052 = new LinkedList();
       this.iconsList = new LinkedList();
       this.iconsMap = new HashMap();
-      this.__x = var3 | -16777216;
+      this.field1053 = var3 | -16777216;
       this.fonts = var4;
    }
 
@@ -76,16 +73,16 @@ public class WorldMapRegion {
       signature = "(IIIB)V",
       garbageValue = "-87"
    )
-   void __w_40(int var1, int var2, int var3) {
-      Sprite var4 = class13.method164(this.x, this.y, this.__d);
-      if(var4 != null) {
-         if(var3 == this.__d * 64) {
+   void method404(int var1, int var2, int var3) {
+      Sprite var4 = class13.method164(this.x, this.y, this.pixelsPerTile);
+      if (var4 != null) {
+         if (var3 == this.pixelsPerTile * 64) {
             var4.drawAt(var1, var2);
          } else {
-            var4.__al_517(var1, var2, var3, var3);
+            var4.method319(var1, var2, var3, var3);
          }
-
       }
+
    }
 
    @ObfuscatedName("o")
@@ -96,7 +93,7 @@ public class WorldMapRegion {
    void method447(class15 var1, List var2) {
       this.iconsMap.clear();
       this.field239 = var1;
-      this.__x_43(var2);
+      this.method407(var2);
    }
 
    @ObfuscatedName("u")
@@ -104,18 +101,18 @@ public class WorldMapRegion {
       signature = "(Ljava/util/HashSet;Ljava/util/List;B)V",
       garbageValue = "-47"
    )
-   void __u_41(HashSet var1, List var2) {
+   void method405(HashSet var1, List var2) {
       this.iconsMap.clear();
       Iterator var3 = var1.iterator();
 
-      while(var3.hasNext()) {
+      while (var3.hasNext()) {
          class39 var4 = (class39)var3.next();
-         if(var4.method256() == this.x && var4.method264() == this.y) {
-            this.__e.add(var4);
+         if (var4.method256() == this.x && var4.method264() == this.y) {
+            this.field1052.add(var4);
          }
       }
 
-      this.__x_43(var2);
+      this.method407(var2);
    }
 
    @ObfuscatedName("g")
@@ -126,42 +123,42 @@ public class WorldMapRegion {
    void method449(int var1, int var2, int var3, int var4, class21 var5) {
       this.iconsMap.clear();
 
-      for(int var6 = var1; var6 < var3 + var1; ++var6) {
-         label75:
-         for(int var7 = var2; var7 < var2 + var4; ++var7) {
-            for(int var8 = 0; var8 < var5.field156; ++var8) {
-               class25[] var9 = var5.field144[var8][var6][var7];
-               if(var9 != null && var9.length != 0) {
-                  class25[] var10 = var9;
+      for (int var6 = var1; var6 < var3 + var1; ++var6) {
+         label66:
+         for (int var7 = var2; var7 < var2 + var4; ++var7) {
+            for (int var8 = 0; var8 < var5.field156; ++var8) {
+               WorldMapDecoration[] var9 = var5.decorations[var8][var6][var7];
+               if (var9 != null && var9.length != 0) {
+                  WorldMapDecoration[] var10 = var9;
 
-                  for(int var11 = 0; var11 < var10.length; ++var11) {
-                     ObjectDefinition var13;
-                     boolean var14;
-                     label66: {
-                        class25 var12 = var10[var11];
-                        var13 = class50.getObjectDefinition(var12.field199);
-                        if(var13.transforms != null) {
-                           int[] var15 = var13.transforms;
+                  for (int var11 = 0; var11 < var10.length; ++var11) {
+                     ObjectDefinition var12;
+                     boolean var13;
+                     label57: {
+                        WorldMapDecoration var14 = var10[var11];
+                        var12 = class50.getObjectDefinition(var14.objectDefinitionId);
+                        if (var12.transforms != null) {
+                           int[] var15 = var12.transforms;
 
-                           for(int var16 = 0; var16 < var15.length; ++var16) {
+                           for (int var16 = 0; var16 < var15.length; ++var16) {
                               int var17 = var15[var16];
                               ObjectDefinition var18 = class50.getObjectDefinition(var17);
-                              if(var18.mapIconId != -1) {
-                                 var14 = true;
-                                 break label66;
+                              if (var18.mapIconId != -1) {
+                                 var13 = true;
+                                 break label57;
                               }
                            }
-                        } else if(var13.mapIconId != -1) {
-                           var14 = true;
-                           break label66;
+                        } else if (var12.mapIconId != -1) {
+                           var13 = true;
+                           break label57;
                         }
 
-                        var14 = false;
+                        var13 = false;
                      }
 
-                     if(var14) {
-                        this.method479(var13, var8, var6, var7, var5);
-                        continue label75;
+                     if (var13) {
+                        this.method479(var12, var8, var6, var7, var5);
+                        continue label66;
                      }
                   }
                }
@@ -177,24 +174,24 @@ public class WorldMapRegion {
       garbageValue = "-896662600"
    )
    void method479(ObjectDefinition var1, int var2, int var3, int var4, class21 var5) {
-      TileLocation var6 = new TileLocation(var2, var3 + this.x * 64, this.y * 64 + var4);
-      TileLocation var7 = null;
-      if(this.field239 != null) {
-         var7 = new TileLocation(this.field239.field148 + var2, var3 + this.field239.field149 * 64, var4 + this.field239.field146 * 64);
+      Coord var6 = new Coord(var2, var3 + this.x * 64, this.y * 64 + var4);
+      Coord var7 = null;
+      if (this.field239 != null) {
+         var7 = new Coord(this.field239.field148 + var2, var3 + this.field239.field149 * 64, var4 + this.field239.field146 * 64);
       } else {
          class39 var8 = (class39)var5;
-         var7 = new TileLocation(var2 + var8.field148, var3 + var8.field149 * 64 + var8.method717() * 8, var4 + var8.field146 * 64 + var8.method718() * 8);
+         var7 = new Coord(var2 + var8.field148, var3 + var8.field149 * 64 + var8.method717() * 8, var4 + var8.field146 * 64 + var8.method718() * 8);
       }
 
       Object var10;
-      if(var1.transforms != null) {
+      if (var1.transforms != null) {
          var10 = new WorldMapIcon2(var7, var6, var1.id, this);
       } else {
          WorldMapElement var9 = ViewportMouse.getWorldMapElement(var1.mapIconId);
-         var10 = new WorldMapIcon1(var7, var6, var9.__o, this.__ab_56(var9));
+         var10 = new WorldMapIcon1(var7, var6, var9.field1020, this.createMapLabel(var9));
       }
 
-      this.iconsMap.put(new TileLocation(0, var3, var4), var10);
+      this.iconsMap.put(new Coord(0, var3, var4), var10);
    }
 
    @ObfuscatedName("e")
@@ -202,13 +199,13 @@ public class WorldMapRegion {
       signature = "(B)V",
       garbageValue = "5"
    )
-   void __e_42() {
+   void method406() {
       Iterator var1 = this.iconsMap.values().iterator();
 
-      while(var1.hasNext()) {
+      while (var1.hasNext()) {
          AbstractWorldMapIcon var2 = (AbstractWorldMapIcon)var1.next();
-         if(var2 instanceof WorldMapIcon2) {
-            ((WorldMapIcon2)var2).__z_27();
+         if (var2 instanceof WorldMapIcon2) {
+            ((WorldMapIcon2)var2).method399();
          }
       }
 
@@ -219,13 +216,13 @@ public class WorldMapRegion {
       signature = "(Ljava/util/List;I)V",
       garbageValue = "128876606"
    )
-   void __x_43(List var1) {
+   void method407(List var1) {
       Iterator var2 = var1.iterator();
 
-      while(var2.hasNext()) {
+      while (var2.hasNext()) {
          WorldMapIcon1 var3 = (WorldMapIcon1)var2.next();
-         if(var3.coord2.x >> 6 == this.x && var3.coord2.y >> 6 == this.y) {
-            WorldMapIcon1 var4 = new WorldMapIcon1(var3.coord2, var3.coord2, var3.__m, this.__al_55(var3.__m));
+         if (var3.coord2.x >> 6 == this.x && var3.coord2.y >> 6 == this.y) {
+            WorldMapIcon1 var4 = new WorldMapIcon1(var3.coord2, var3.coord2, var3.element, this.method419(var3.element));
             this.iconsList.add(var4);
          }
       }
@@ -237,13 +234,13 @@ public class WorldMapRegion {
       signature = "(I)V",
       garbageValue = "1543354181"
    )
-   void __d_44() {
-      if(this.field239 != null) {
+   void method408() {
+      if (this.field239 != null) {
          this.field239.method282();
       } else {
-         Iterator var1 = this.__e.iterator();
+         Iterator var1 = this.field1052.iterator();
 
-         while(var1.hasNext()) {
+         while (var1.hasNext()) {
             class39 var2 = (class39)var1.next();
             var2.method282();
          }
@@ -256,10 +253,10 @@ public class WorldMapRegion {
       signature = "(Lir;B)Z",
       garbageValue = "2"
    )
-   boolean __a_45(AbstractIndexCache var1) {
-      if(this.field239 != null) {
+   boolean method409(AbstractArchive var1) {
+      if (this.field239 != null) {
          this.field239.method263(var1);
-         if(this.field239.method271()) {
+         if (this.field239.method271()) {
             this.method449(0, 0, 64, 64, this.field239);
             return true;
          } else {
@@ -270,15 +267,15 @@ public class WorldMapRegion {
 
          Iterator var3;
          class39 var4;
-         for(var3 = this.__e.iterator(); var3.hasNext(); var2 &= var4.method271()) {
+         for (var3 = this.field1052.iterator(); var3.hasNext(); var2 &= var4.method271()) {
             var4 = (class39)var3.next();
             var4.method263(var1);
          }
 
-         if(var2) {
-            var3 = this.__e.iterator();
+         if (var2) {
+            var3 = this.field1052.iterator();
 
-            while(var3.hasNext()) {
+            while (var3.hasNext()) {
                var4 = (class39)var3.next();
                this.method449(var4.method719() * 8, var4.method720() * 8, 8, 8, var4);
             }
@@ -293,39 +290,38 @@ public class WorldMapRegion {
       signature = "(ILad;[Llq;Lir;Lir;I)V",
       garbageValue = "518389076"
    )
-   void method455(int var1, class40 var2, IndexedSprite[] var3, AbstractIndexCache var4, AbstractIndexCache var5) {
-      this.__d = var1;
-      if(this.field239 != null || !this.__e.isEmpty()) {
-         if(class13.method164(this.x, this.y, var1) == null) {
-            boolean var6 = true;
-            var6 &= this.__a_45(var4);
-            int var8;
-            if(this.field239 != null) {
-               var8 = this.field239.field150;
+   void method455(int var1, class40 var2, IndexedSprite[] var3, AbstractArchive var4, AbstractArchive var5) {
+      this.pixelsPerTile = var1;
+      if ((this.field239 != null || !this.field1052.isEmpty()) && class13.method164(this.x, this.y, var1) == null) {
+         boolean var6 = true;
+         var6 &= this.method409(var4);
+         int var7;
+         if (this.field239 != null) {
+            var7 = this.field239.field150;
+         } else {
+            var7 = ((class21)this.field1052.getFirst()).field150;
+         }
+
+         var6 &= var5.tryLoadGroup(var7);
+         if (var6) {
+            byte[] var8 = var5.takeFileFlat(var7);
+            class27 var9 = SecureRandomCallable.method1145(var8);
+            Sprite var10 = new Sprite(this.pixelsPerTile * 64, this.pixelsPerTile * 64);
+            var10.setRaster();
+            if (this.field239 != null) {
+               this.method546(var2, var3, var9);
             } else {
-               var8 = ((class21)this.__e.getFirst()).field150;
+               this.method459(var2, var3, var9);
             }
 
-            var6 &= var5.tryLoadArchive(var8);
-            if(var6) {
-               byte[] var7 = var5.takeRecordFlat(var8);
-               class27 var9 = SecureRandomCallable.method1145(var7);
-               Sprite var10 = new Sprite(this.__d * 64, this.__d * 64);
-               var10.setRaster();
-               if(this.field239 != null) {
-                  this.method546(var2, var3, var9);
-               } else {
-                  this.method459(var2, var3, var9);
-               }
-
-               int var11 = this.x;
-               int var12 = this.y;
-               int var13 = this.__d;
-               __av_o.put(var10, MouseHandler.method1083(var11, var12, var13), var10.pixels.length * 4);
-               this.__d_44();
-            }
+            int var11 = this.x;
+            int var12 = this.y;
+            int var13 = this.pixelsPerTile;
+            field1051.put(var10, MouseHandler.method1083(var11, var12, var13), var10.pixels.length * 4);
+            this.method408();
          }
       }
+
    }
 
    @ObfuscatedName("j")
@@ -333,13 +329,13 @@ public class WorldMapRegion {
       signature = "(IIILjava/util/HashSet;I)V",
       garbageValue = "893970699"
    )
-   void __j_46(int var1, int var2, int var3, HashSet var4) {
-      if(var4 == null) {
+   void method410(int var1, int var2, int var3, HashSet var4) {
+      if (var4 == null) {
          var4 = new HashSet();
       }
 
-      this.__aq_48(var1, var2, var4, var3);
-      this.__ah_54(var1, var2, var4, var3);
+      this.drawNonLinkMapIcons(var1, var2, var4, var3);
+      this.drawMapLinks(var1, var2, var4, var3);
    }
 
    @ObfuscatedName("s")
@@ -347,21 +343,21 @@ public class WorldMapRegion {
       signature = "(Ljava/util/HashSet;IIB)V",
       garbageValue = "-70"
    )
-   void __s_47(HashSet var1, int var2, int var3) {
+   void method411(HashSet var1, int var2, int var3) {
       Iterator var4 = this.iconsMap.values().iterator();
 
-      while(var4.hasNext()) {
+      while (var4.hasNext()) {
          AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next();
-         if(var5.__h_67()) {
-            int var6 = var5.__m_15();
-            if(var1.contains(Integer.valueOf(var6))) {
+         if (var5.method19()) {
+            int var6 = var5.getElement();
+            if (var1.contains(var6)) {
                WorldMapElement var7 = ViewportMouse.getWorldMapElement(var6);
-               this.__av_50(var7, var5.__e, var5.__x, var2, var3);
+               this.method414(var7, var5.screenX, var5.screenY, var2, var3);
             }
          }
       }
 
-      this.__aj_49(var1, var2, var3);
+      this.method413(var1, var2, var3);
    }
 
    @ObfuscatedName("t")
@@ -372,15 +368,15 @@ public class WorldMapRegion {
    void method546(class40 var1, IndexedSprite[] var2, class27 var3) {
       int var4;
       int var5;
-      for(var4 = 0; var4 < 64; ++var4) {
-         for(var5 = 0; var5 < 64; ++var5) {
+      for (var4 = 0; var4 < 64; ++var4) {
+         for (var5 = 0; var5 < 64; ++var5) {
             this.method461(var4, var5, this.field239, var1, var3);
             this.method462(var4, var5, this.field239, var1);
          }
       }
 
-      for(var4 = 0; var4 < 64; ++var4) {
-         for(var5 = 0; var5 < 64; ++var5) {
+      for (var4 = 0; var4 < 64; ++var4) {
+         for (var5 = 0; var5 < 64; ++var5) {
             this.method460(var4, var5, this.field239, var1, var2);
          }
       }
@@ -393,29 +389,29 @@ public class WorldMapRegion {
       garbageValue = "752069098"
    )
    void method459(class40 var1, IndexedSprite[] var2, class27 var3) {
-      Iterator var4 = this.__e.iterator();
+      Iterator var4 = this.field1052.iterator();
 
       class39 var5;
       int var6;
       int var7;
-      while(var4.hasNext()) {
+      while (var4.hasNext()) {
          var5 = (class39)var4.next();
 
-         for(var6 = var5.method719() * 8; var6 < var5.method719() * 8 + 8; ++var6) {
-            for(var7 = var5.method720() * 8; var7 < var5.method720() * 8 + 8; ++var7) {
+         for (var6 = var5.method719() * 8; var6 < var5.method719() * 8 + 8; ++var6) {
+            for (var7 = var5.method720() * 8; var7 < var5.method720() * 8 + 8; ++var7) {
                this.method461(var6, var7, var5, var1, var3);
                this.method462(var6, var7, var5, var1);
             }
          }
       }
 
-      var4 = this.__e.iterator();
+      var4 = this.field1052.iterator();
 
-      while(var4.hasNext()) {
+      while (var4.hasNext()) {
          var5 = (class39)var4.next();
 
-         for(var6 = var5.method719() * 8; var6 < var5.method719() * 8 + 8; ++var6) {
-            for(var7 = var5.method720() * 8; var7 < var5.method720() * 8 + 8; ++var7) {
+         for (var6 = var5.method719() * 8; var6 < var5.method719() * 8 + 8; ++var6) {
+            for (var7 = var5.method720() * 8; var7 < var5.method720() * 8 + 8; ++var7) {
                this.method460(var6, var7, var5, var1, var2);
             }
          }
@@ -441,103 +437,107 @@ public class WorldMapRegion {
    void method461(int var1, int var2, class21 var3, class40 var4, class27 var5) {
       int var6 = var3.field151[0][var1][var2] - 1;
       int var7 = var3.field145[0][var1][var2] - 1;
-      if(var6 == -1 && var7 == -1) {
-         Rasterizer2D.Rasterizer2D_fillRectangle(this.__d * var1, this.__d * (63 - var2), this.__d, this.__d, this.__x);
+      if (var6 == -1 && var7 == -1) {
+         Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, this.field1053);
       }
 
       int var8 = 16711935;
       int var9;
-      if(var7 != -1) {
-         int var10 = this.__x;
-         OverlayDefinition var12 = (OverlayDefinition)OverlayDefinition.__jf_f.get((long)var7);
-         OverlayDefinition var11;
-         if(var12 != null) {
-            var11 = var12;
+      if (var7 != -1) {
+         int var10 = this.field1053;
+         FloorOverlayDefinition var11 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var7);
+         FloorOverlayDefinition var12;
+         if (var11 != null) {
+            var12 = var11;
          } else {
-            byte[] var13 = OverlayDefinition.__jf_m.takeRecord(4, var7);
-            var12 = new OverlayDefinition();
-            if(var13 != null) {
-               var12.read(new Buffer(var13), var7);
+            byte[] var13 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var7);
+            var11 = new FloorOverlayDefinition();
+            if (var13 != null) {
+               var11.decode(new Buffer(var13), var7);
             }
 
-            var12.init();
-            OverlayDefinition.__jf_f.put(var12, (long)var7);
-            var11 = var12;
+            var11.postDecode();
+            FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var11, (long)var7);
+            var12 = var11;
          }
 
-         if(var11 == null) {
-            var9 = var10;
-         } else if(var11.rgb2 >= 0) {
-            var9 = var11.rgb2 | -16777216;
-         } else if(var11.texture >= 0) {
-            int var21 = WorldMapArea.method427(Rasterizer3D.Rasterizer3D_textureLoader.__w_213(var11.texture), 96);
-            var9 = Rasterizer3D.Rasterizer3D_colorPalette[var21] | -16777216;
-         } else if(var11.rgb == 16711935) {
+         if (var12 == null) {
             var9 = var10;
+         } else if (var12.rgb2 >= 0) {
+            var9 = var12.rgb2 | -16777216;
          } else {
-            int var14 = var11.hue;
-            int var15 = var11.saturation;
-            int var16 = var11.lightness;
-            if(var16 > 179) {
-               var15 /= 2;
-            }
-
-            if(var16 > 192) {
-               var15 /= 2;
-            }
-
-            if(var16 > 217) {
-               var15 /= 2;
-            }
-
-            if(var16 > 243) {
-               var15 /= 2;
-            }
-
-            int var17 = (var15 / 32 << 7) + var16 / 2 + (var14 / 4 << 10);
-            byte var19 = 96;
-            int var18;
-            if(var17 == -2) {
-               var18 = 12345678;
+            int var20;
+            if (var12.texture >= 0) {
+               var20 = WorldMapArea.method427(Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var12.texture), 96);
+               var9 = Rasterizer3D.Rasterizer3D_colorPalette[var20] | -16777216;
+            } else if (var12.rgb == 16711935) {
+               var9 = var10;
             } else {
-               int var22;
-               if(var17 == -1) {
-                  if(var19 < 0) {
-                     var19 = 0;
-                  } else if(var19 > 127) {
-                     var19 = 127;
-                  }
-
-                  var22 = 127 - var19;
-                  var18 = var22;
-               } else {
-                  var22 = var19 * (var17 & 127) / 128;
-                  if(var22 < 2) {
-                     var22 = 2;
-                  } else if(var22 > 126) {
-                     var22 = 126;
-                  }
-
-                  var18 = var22 + (var17 & 65408);
+               var20 = var12.hue;
+               int var14 = var12.saturation;
+               int var15 = var12.lightness;
+               if (var15 > 179) {
+                  var14 /= 2;
                }
-            }
 
-            var9 = Rasterizer3D.Rasterizer3D_colorPalette[var18] | -16777216;
+               if (var15 > 192) {
+                  var14 /= 2;
+               }
+
+               if (var15 > 217) {
+                  var14 /= 2;
+               }
+
+               if (var15 > 243) {
+                  var14 /= 2;
+               }
+
+               int var16 = (var14 / 32 << 7) + var15 / 2 + (var20 / 4 << 10);
+               byte var17 = 96;
+               int var18;
+               if (var16 == -2) {
+                  var18 = 12345678;
+               } else {
+                  int var19;
+                  if (var16 == -1) {
+                     if (var17 < 0) {
+                        var17 = 0;
+                     } else if (var17 > 127) {
+                        var17 = 127;
+                     }
+
+                     var19 = 127 - var17;
+                     var18 = var19;
+                  } else {
+                     var19 = var17 * (var16 & 127) / 128;
+                     if (var19 < 2) {
+                        var19 = 2;
+                     } else if (var19 > 126) {
+                        var19 = 126;
+                     }
+
+                     var18 = var19 + (var16 & 65408);
+                  }
+               }
+
+               var9 = Rasterizer3D.Rasterizer3D_colorPalette[var18] | -16777216;
+            }
          }
 
          var8 = var9;
       }
 
-      if(var7 > -1 && var3.field154[0][var1][var2] == 0) {
-         Rasterizer2D.Rasterizer2D_fillRectangle(this.__d * var1, this.__d * (63 - var2), this.__d, this.__d, var8);
+      if (var7 > -1 && var3.field154[0][var1][var2] == 0) {
+         Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var8);
       } else {
          var9 = this.method541(var1, var2, var3, var5);
-         if(var7 == -1) {
-            Rasterizer2D.Rasterizer2D_fillRectangle(this.__d * var1, this.__d * (63 - var2), this.__d, this.__d, var9);
+         if (var7 == -1) {
+            Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var9);
          } else {
-            var4.method743(this.__d * var1, this.__d * (63 - var2), var9, var8, this.__d, this.__d, var3.field154[0][var1][var2], var3.field155[0][var1][var2]);
+            var4.method743(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), var9, var8, this.pixelsPerTile, this.pixelsPerTile, var3.field154[0][var1][var2], var3.field155[0][var1][var2]);
          }
       }
+
    }
 
    @ObfuscatedName("c")
@@ -546,91 +546,94 @@ public class WorldMapRegion {
       garbageValue = "9"
    )
    void method462(int var1, int var2, class21 var3, class40 var4) {
-      for(int var5 = 1; var5 < var3.field156; ++var5) {
+      for (int var5 = 1; var5 < var3.field156; ++var5) {
          int var6 = var3.field145[var5][var1][var2] - 1;
-         if(var6 > -1) {
-            int var8 = this.__x;
-            OverlayDefinition var10 = (OverlayDefinition)OverlayDefinition.__jf_f.get((long)var6);
-            OverlayDefinition var9;
-            if(var10 != null) {
-               var9 = var10;
+         if (var6 > -1) {
+            int var7 = this.field1053;
+            FloorOverlayDefinition var8 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var6);
+            FloorOverlayDefinition var9;
+            if (var8 != null) {
+               var9 = var8;
             } else {
-               byte[] var11 = OverlayDefinition.__jf_m.takeRecord(4, var6);
-               var10 = new OverlayDefinition();
-               if(var11 != null) {
-                  var10.read(new Buffer(var11), var6);
+               byte[] var10 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var6);
+               var8 = new FloorOverlayDefinition();
+               if (var10 != null) {
+                  var8.decode(new Buffer(var10), var6);
                }
 
-               var10.init();
-               OverlayDefinition.__jf_f.put(var10, (long)var6);
-               var9 = var10;
+               var8.postDecode();
+               FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var8, (long)var6);
+               var9 = var8;
             }
 
-            int var7;
-            if(var9 == null) {
-               var7 = var8;
-            } else if(var9.rgb2 >= 0) {
-               var7 = var9.rgb2 | -16777216;
-            } else if(var9.texture >= 0) {
-               int var20 = WorldMapArea.method427(Rasterizer3D.Rasterizer3D_textureLoader.__w_213(var9.texture), 96);
-               var7 = Rasterizer3D.Rasterizer3D_colorPalette[var20] | -16777216;
-            } else if(var9.rgb == 16711935) {
-               var7 = var8;
+            int var18;
+            if (var9 == null) {
+               var18 = var7;
+            } else if (var9.rgb2 >= 0) {
+               var18 = var9.rgb2 | -16777216;
             } else {
-               int var12 = var9.hue;
-               int var13 = var9.saturation;
-               int var14 = var9.lightness;
-               if(var14 > 179) {
-                  var13 /= 2;
-               }
-
-               if(var14 > 192) {
-                  var13 /= 2;
-               }
-
-               if(var14 > 217) {
-                  var13 /= 2;
-               }
-
-               if(var14 > 243) {
-                  var13 /= 2;
-               }
-
-               int var15 = (var13 / 32 << 7) + var14 / 2 + (var12 / 4 << 10);
-               byte var17 = 96;
-               int var16;
-               if(var15 == -2) {
-                  var16 = 12345678;
+               int var11;
+               if (var9.texture >= 0) {
+                  var11 = WorldMapArea.method427(Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var9.texture), 96);
+                  var18 = Rasterizer3D.Rasterizer3D_colorPalette[var11] | -16777216;
+               } else if (var9.rgb == 16711935) {
+                  var18 = var7;
                } else {
-                  int var21;
-                  if(var15 == -1) {
-                     if(var17 < 0) {
-                        var17 = 0;
-                     } else if(var17 > 127) {
-                        var17 = 127;
-                     }
-
-                     var21 = 127 - var17;
-                     var16 = var21;
-                  } else {
-                     var21 = var17 * (var15 & 127) / 128;
-                     if(var21 < 2) {
-                        var21 = 2;
-                     } else if(var21 > 126) {
-                        var21 = 126;
-                     }
-
-                     var16 = var21 + (var15 & 65408);
+                  var11 = var9.hue;
+                  int var12 = var9.saturation;
+                  int var13 = var9.lightness;
+                  if (var13 > 179) {
+                     var12 /= 2;
                   }
-               }
 
-               var7 = Rasterizer3D.Rasterizer3D_colorPalette[var16] | -16777216;
+                  if (var13 > 192) {
+                     var12 /= 2;
+                  }
+
+                  if (var13 > 217) {
+                     var12 /= 2;
+                  }
+
+                  if (var13 > 243) {
+                     var12 /= 2;
+                  }
+
+                  int var14 = (var12 / 32 << 7) + var13 / 2 + (var11 / 4 << 10);
+                  byte var15 = 96;
+                  int var16;
+                  if (var14 == -2) {
+                     var16 = 12345678;
+                  } else {
+                     int var17;
+                     if (var14 == -1) {
+                        if (var15 < 0) {
+                           var15 = 0;
+                        } else if (var15 > 127) {
+                           var15 = 127;
+                        }
+
+                        var17 = 127 - var15;
+                        var16 = var17;
+                     } else {
+                        var17 = var15 * (var14 & 127) / 128;
+                        if (var17 < 2) {
+                           var17 = 2;
+                        } else if (var17 > 126) {
+                           var17 = 126;
+                        }
+
+                        var16 = var17 + (var14 & 65408);
+                     }
+                  }
+
+                  var18 = Rasterizer3D.Rasterizer3D_colorPalette[var16] | -16777216;
+               }
             }
 
-            if(var3.field154[var5][var1][var2] == 0) {
-               Rasterizer2D.Rasterizer2D_fillRectangle(this.__d * var1, this.__d * (63 - var2), this.__d, this.__d, var7);
+            if (var3.field154[var5][var1][var2] == 0) {
+               Rasterizer2D.Rasterizer2D_fillRectangle(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, this.pixelsPerTile, var18);
             } else {
-               var4.method743(this.__d * var1, this.__d * (63 - var2), 0, var7, this.__d, this.__d, var3.field154[var5][var1][var2], var3.field155[var5][var1][var2]);
+               var4.method743(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 0, var18, this.pixelsPerTile, this.pixelsPerTile, var3.field154[var5][var1][var2], var3.field155[var5][var1][var2]);
             }
          }
       }
@@ -643,7 +646,7 @@ public class WorldMapRegion {
       garbageValue = "1908333009"
    )
    int method541(int var1, int var2, class21 var3, class27 var4) {
-      return var3.field151[0][var1][var2] == 0?this.__x:var4.method430(var1, var2);
+      return var3.field151[0][var1][var2] == 0 ? this.field1053 : var4.method430(var1, var2);
    }
 
    @ObfuscatedName("v")
@@ -652,20 +655,20 @@ public class WorldMapRegion {
       garbageValue = "-26219"
    )
    void method464(int var1, int var2, class21 var3, IndexedSprite[] var4) {
-      for(int var5 = 0; var5 < var3.field156; ++var5) {
-         class25[] var6 = var3.field144[var5][var1][var2];
-         if(var6 != null && var6.length != 0) {
-            class25[] var7 = var6;
+      for (int var5 = 0; var5 < var3.field156; ++var5) {
+         WorldMapDecoration[] var6 = var3.decorations[var5][var1][var2];
+         if (var6 != null && var6.length != 0) {
+            WorldMapDecoration[] var7 = var6;
 
-            for(int var8 = 0; var8 < var7.length; ++var8) {
-               class25 var9 = var7[var8];
-               if(WorldMapAreaData.method711(var9.field198) || class1.method19(var9.field198)) {
-                  ObjectDefinition var10 = class50.getObjectDefinition(var9.field199);
-                  if(var10.mapSceneId != -1) {
-                     if(var10.mapSceneId != 46 && var10.mapSceneId != 52) {
-                        var4[var10.mapSceneId].__o_497(this.__d * var1, this.__d * (63 - var2), this.__d * 2, this.__d * 2);
+            for (int var8 = 0; var8 < var7.length; ++var8) {
+               WorldMapDecoration var9 = var7[var8];
+               if (WorldMapAreaData.method711(var9.decoration) || class1.method19(var9.decoration)) {
+                  ObjectDefinition var10 = class50.getObjectDefinition(var9.objectDefinitionId);
+                  if (var10.mapSceneId != -1) {
+                     if (var10.mapSceneId != 46 && var10.mapSceneId != 52) {
+                        var4[var10.mapSceneId].method135(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2, this.pixelsPerTile * 2);
                      } else {
-                        var4[var10.mapSceneId].__o_497(this.__d * var1, this.__d * (63 - var2), this.__d * 2 + 1, this.__d * 2 + 1);
+                        var4[var10.mapSceneId].method135(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile * 2 + 1, this.pixelsPerTile * 2 + 1);
                      }
                   }
                }
@@ -681,55 +684,55 @@ public class WorldMapRegion {
       garbageValue = "-31"
    )
    void method465(int var1, int var2, class21 var3) {
-      for(int var4 = 0; var4 < var3.field156; ++var4) {
-         class25[] var5 = var3.field144[var4][var1][var2];
-         if(var5 != null && var5.length != 0) {
-            class25[] var6 = var5;
+      for (int var4 = 0; var4 < var3.field156; ++var4) {
+         WorldMapDecoration[] var5 = var3.decorations[var4][var1][var2];
+         if (var5 != null && var5.length != 0) {
+            WorldMapDecoration[] var6 = var5;
 
-            for(int var7 = 0; var7 < var6.length; ++var7) {
-               class25 var8 = var6[var7];
-               int var10 = var8.field198;
-               boolean var9 = var10 >= class231.field2805.field2820 && var10 <= class231.field2804.field2820 || var10 == class231.field2806.field2820;
-               if(var9) {
-                  ObjectDefinition var11 = class50.getObjectDefinition(var8.field199);
-                  int var12 = var11.int1 != 0?-3407872:-3355444;
-                  if(var8.field198 == class231.field2805.field2820) {
-                     this.__ad_58(var1, var2, var8.field202, var12);
+            for (int var7 = 0; var7 < var6.length; ++var7) {
+               WorldMapDecoration var8 = var6[var7];
+               int var9 = var8.decoration;
+               boolean var10 = var9 >= WorldMapDecorationType.field2805.id && var9 <= WorldMapDecorationType.field2804.id || var9 == WorldMapDecorationType.field2806.id;
+               if (var10) {
+                  ObjectDefinition var11 = class50.getObjectDefinition(var8.objectDefinitionId);
+                  int var12 = var11.int1 != 0 ? -3407872 : -3355444;
+                  if (var8.decoration == WorldMapDecorationType.field2805.id) {
+                     this.method422(var1, var2, var8.rotation, var12);
                   }
 
-                  if(var8.field198 == class231.field2813.field2820) {
-                     this.__ad_58(var1, var2, var8.field202, -3355444);
-                     this.__ad_58(var1, var2, var8.field202 + 1, var12);
+                  if (var8.decoration == WorldMapDecorationType.field2813.id) {
+                     this.method422(var1, var2, var8.rotation, -3355444);
+                     this.method422(var1, var2, var8.rotation + 1, var12);
                   }
 
-                  if(var8.field198 == class231.field2804.field2820) {
-                     if(var8.field202 == 0) {
-                        Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.__d * var1, this.__d * (63 - var2), 1, var12);
+                  if (var8.decoration == WorldMapDecorationType.field2804.id) {
+                     if (var8.rotation == 0) {
+                        Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), 1, var12);
                      }
 
-                     if(var8.field202 == 1) {
-                        Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.__d * var1 + this.__d - 1, this.__d * (63 - var2), 1, var12);
+                     if (var8.rotation == 1) {
+                        Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), 1, var12);
                      }
 
-                     if(var8.field202 == 2) {
-                        Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.__d * var1 + this.__d - 1, this.__d * (63 - var2) + this.__d - 1, 1, var12);
+                     if (var8.rotation == 2) {
+                        Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var12);
                      }
 
-                     if(var8.field202 == 3) {
-                        Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.__d * var1, this.__d * (63 - var2) + this.__d - 1, 1, var12);
+                     if (var8.rotation == 3) {
+                        Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, 1, var12);
                      }
                   }
 
-                  if(var8.field198 == class231.field2806.field2820) {
-                     int var13 = var8.field202 % 2;
+                  if (var8.decoration == WorldMapDecorationType.field2806.id) {
+                     int var13 = var8.rotation % 2;
                      int var14;
-                     if(var13 == 0) {
-                        for(var14 = 0; var14 < this.__d; ++var14) {
-                           Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.__d * var1, (64 - var2) * this.__d - 1 - var14, 1, var12);
+                     if (var13 == 0) {
+                        for (var14 = 0; var14 < this.pixelsPerTile; ++var14) {
+                           Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.pixelsPerTile * var1, (64 - var2) * this.pixelsPerTile - 1 - var14, 1, var12);
                         }
                      } else {
-                        for(var14 = 0; var14 < this.__d; ++var14) {
-                           Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.__d * var1, var14 + this.__d * (63 - var2), 1, var12);
+                        for (var14 = 0; var14 < this.pixelsPerTile; ++var14) {
+                           Rasterizer2D.Rasterizer2D_drawHorizontalLine(var14 + this.pixelsPerTile * var1, var14 + this.pixelsPerTile * (63 - var2), 1, var12);
                         }
                      }
                   }
@@ -745,23 +748,24 @@ public class WorldMapRegion {
       signature = "(IILjava/util/HashSet;IB)V",
       garbageValue = "0"
    )
-   void __aq_48(int var1, int var2, HashSet var3, int var4) {
+   @Export("drawNonLinkMapIcons")
+   void drawNonLinkMapIcons(int var1, int var2, HashSet var3, int var4) {
       float var5 = (float)var4 / 64.0F;
       float var6 = var5 / 2.0F;
       Iterator var7 = this.iconsMap.entrySet().iterator();
 
-      while(var7.hasNext()) {
+      while (var7.hasNext()) {
          Entry var8 = (Entry)var7.next();
-         TileLocation var9 = (TileLocation)var8.getKey();
+         Coord var9 = (Coord)var8.getKey();
          int var10 = (int)((float)var1 + var5 * (float)var9.x - var6);
          int var11 = (int)((float)(var2 + var4) - var5 * (float)var9.y - var6);
          AbstractWorldMapIcon var12 = (AbstractWorldMapIcon)var8.getValue();
-         if(var12 != null && var12.__h_67()) {
-            var12.__e = var10;
-            var12.__x = var11;
-            WorldMapElement var13 = ViewportMouse.getWorldMapElement(var12.__m_15());
-            if(!var3.contains(Integer.valueOf(var13.__g_410()))) {
-               this.__ar_51(var12, var10, var11, var5);
+         if (var12 != null && var12.method19()) {
+            var12.screenX = var10;
+            var12.screenY = var11;
+            WorldMapElement var13 = ViewportMouse.getWorldMapElement(var12.getElement());
+            if (!var3.contains(var13.method390())) {
+               this.method415(var12, var10, var11, var5);
             }
          }
       }
@@ -773,15 +777,15 @@ public class WorldMapRegion {
       signature = "(Ljava/util/HashSet;III)V",
       garbageValue = "781854370"
    )
-   void __aj_49(HashSet var1, int var2, int var3) {
+   void method413(HashSet var1, int var2, int var3) {
       Iterator var4 = this.iconsList.iterator();
 
-      while(var4.hasNext()) {
+      while (var4.hasNext()) {
          AbstractWorldMapIcon var5 = (AbstractWorldMapIcon)var4.next();
-         if(var5.__h_67()) {
-            WorldMapElement var6 = ViewportMouse.getWorldMapElement(var5.__m_15());
-            if(var6 != null && var1.contains(Integer.valueOf(var6.__g_410()))) {
-               this.__av_50(var6, var5.__e, var5.__x, var2, var3);
+         if (var5.method19()) {
+            WorldMapElement var6 = ViewportMouse.getWorldMapElement(var5.getElement());
+            if (var6 != null && var1.contains(var6.method390())) {
+               this.method414(var6, var5.screenX, var5.screenY, var2, var3);
             }
          }
       }
@@ -793,16 +797,16 @@ public class WorldMapRegion {
       signature = "(Lic;IIIIB)V",
       garbageValue = "92"
    )
-   void __av_50(WorldMapElement var1, int var2, int var3, int var4, int var5) {
+   void method414(WorldMapElement var1, int x, int y, int var4, int var5) {
       Sprite var6 = var1.getSprite(false);
-      if(var6 != null) {
-         var6.drawAt2(var2 - var6.subWidth / 2, var3 - var6.subHeight / 2);
-         if(var4 % var5 < var5 / 2) {
-            Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 15, 16776960, 128);
-            Rasterizer2D.Rasterizer2D_drawCircleAlpha(var2, var3, 7, 16777215, 256);
+      if (var6 != null) {
+         var6.drawAt2(x - var6.subWidth / 2, y - var6.subHeight / 2);
+         if (var4 % var5 < var5 / 2) {
+            Rasterizer2D.Rasterizer2D_drawCircleAlpha(x, y, 15, 16776960, 128);
+            Rasterizer2D.Rasterizer2D_drawCircleAlpha(x, y, 7, 16777215, 256);
          }
-
       }
+
    }
 
    @ObfuscatedName("ar")
@@ -810,10 +814,10 @@ public class WorldMapRegion {
       signature = "(Lak;IIFI)V",
       garbageValue = "-1283733783"
    )
-   void __ar_51(AbstractWorldMapIcon var1, int var2, int var3, float var4) {
-      WorldMapElement var5 = ViewportMouse.getWorldMapElement(var1.__m_15());
-      this.__ac_52(var5, var2, var3);
-      this.__ay_53(var1, var5, var2, var3, var4);
+   void method415(AbstractWorldMapIcon var1, int var2, int var3, float var4) {
+      WorldMapElement var5 = ViewportMouse.getWorldMapElement(var1.getElement());
+      this.method416(var5, var2, var3);
+      this.method417(var1, var5, var2, var3, var4);
    }
 
    @ObfuscatedName("ac")
@@ -821,11 +825,11 @@ public class WorldMapRegion {
       signature = "(Lic;III)V",
       garbageValue = "423173487"
    )
-   void __ac_52(WorldMapElement var1, int var2, int var3) {
+   void method416(WorldMapElement var1, int var2, int var3) {
       Sprite var4 = var1.getSprite(false);
-      if(var4 != null) {
-         int var5 = this.method473(var4, var1.field3287);
-         int var6 = this.method474(var4, var1.field3301);
+      if (var4 != null) {
+         int var5 = this.method473(var4, var1.horizontalAlignment);
+         int var6 = this.method474(var4, var1.verticalAlignment);
          var4.drawAt2(var5 + var2, var3 + var6);
       }
 
@@ -836,14 +840,13 @@ public class WorldMapRegion {
       signature = "(Lak;Lic;IIFI)V",
       garbageValue = "-1237576843"
    )
-   void __ay_53(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) {
-      WorldMapLabel var6 = var1.__f_16();
-      if(var6 != null) {
-         if(var6.size.__f_14(var5)) {
-            Font var7 = (Font)this.fonts.get(var6.size);
-            var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.__e, 0, 1, 0, var7.ascent / 2);
-         }
+   void method417(AbstractWorldMapIcon var1, WorldMapElement var2, int var3, int var4, float var5) {
+      WorldMapLabel var6 = var1.getLabel();
+      if (var6 != null && var6.size.method400(var5)) {
+         Font var7 = (Font)this.fonts.get(var6.size);
+         var7.drawLines(var6.text, var3 - var6.width / 2, var4, var6.width, var6.height, -16777216 | var2.field1022, 0, 1, 0, var7.ascent / 2);
       }
+
    }
 
    @ObfuscatedName("ah")
@@ -851,19 +854,20 @@ public class WorldMapRegion {
       signature = "(IILjava/util/HashSet;IB)V",
       garbageValue = "-17"
    )
-   void __ah_54(int var1, int var2, HashSet var3, int var4) {
+   @Export("drawMapLinks")
+   void drawMapLinks(int var1, int var2, HashSet var3, int var4) {
       float var5 = (float)var4 / 64.0F;
       Iterator var6 = this.iconsList.iterator();
 
-      while(var6.hasNext()) {
+      while (var6.hasNext()) {
          AbstractWorldMapIcon var7 = (AbstractWorldMapIcon)var6.next();
-         if(var7.__h_67()) {
+         if (var7.method19()) {
             int var8 = var7.coord2.x % 64;
             int var9 = var7.coord2.y % 64;
-            var7.__e = (int)((float)var8 * var5 + (float)var1);
-            var7.__x = (int)(var5 * (float)(63 - var9) + (float)var2);
-            if(!var3.contains(Integer.valueOf(var7.__m_15()))) {
-               this.__ar_51(var7, var7.__e, var7.__x, var5);
+            var7.screenX = (int)((float)var8 * var5 + (float)var1);
+            var7.screenY = (int)(var5 * (float)(63 - var9) + (float)var2);
+            if (!var3.contains(var7.getElement())) {
+               this.method415(var7, var7.screenX, var7.screenY, var5);
             }
          }
       }
@@ -875,8 +879,8 @@ public class WorldMapRegion {
       signature = "(Lln;Lju;I)I",
       garbageValue = "1945325707"
    )
-   int method473(Sprite var1, class266 var2) {
-      switch(var2.field3528) {
+   int method473(Sprite var1, HorizontalAlignment var2) {
+      switch(var2.value) {
       case 0:
          return -var1.subWidth / 2;
       case 2:
@@ -891,8 +895,8 @@ public class WorldMapRegion {
       signature = "(Lln;Lip;I)I",
       garbageValue = "1788772278"
    )
-   int method474(Sprite var1, class249 var2) {
-      switch(var2.field3275) {
+   int method474(Sprite var1, VerticalAlignment var2) {
+      switch(var2.value) {
       case 0:
          return 0;
       case 1:
@@ -907,9 +911,9 @@ public class WorldMapRegion {
       signature = "(II)Laj;",
       garbageValue = "598030754"
    )
-   WorldMapLabel __al_55(int var1) {
+   WorldMapLabel method419(int var1) {
       WorldMapElement var2 = ViewportMouse.getWorldMapElement(var1);
-      return this.__ab_56(var2);
+      return this.createMapLabel(var2);
    }
 
    @ObfuscatedName("ab")
@@ -917,32 +921,33 @@ public class WorldMapRegion {
       signature = "(Lic;B)Laj;",
       garbageValue = "59"
    )
-   WorldMapLabel __ab_56(WorldMapElement var1) {
-      if(var1.__l != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) {
-         WorldMapLabelSize var2 = WorldMapLabelSize.method195(var1.textSize);
-         if(var2 == null) {
+   @Export("createMapLabel")
+   WorldMapLabel createMapLabel(WorldMapElement var1) {
+      if (var1.name != null && this.fonts != null && this.fonts.get(WorldMapLabelSize.WorldMapLabelSize_small) != null) {
+         WorldMapLabelSize var2 = WorldMapLabelSize.valueOf(var1.textSize);
+         if (var2 == null) {
             return null;
          } else {
             Font var3 = (Font)this.fonts.get(var2);
-            if(var3 == null) {
+            if (var3 == null) {
                return null;
             } else {
-               int var4 = var3.lineCount(var1.__l, 1000000);
+               int var4 = var3.lineCount(var1.name, 1000000);
                String[] var5 = new String[var4];
-               var3.breakLines(var1.__l, (int[])null, var5);
+               var3.breakLines(var1.name, (int[])null, var5);
                int var6 = var5.length * var3.ascent / 2;
                int var7 = 0;
                String[] var8 = var5;
 
-               for(int var9 = 0; var9 < var8.length; ++var9) {
+               for (int var9 = 0; var9 < var8.length; ++var9) {
                   String var10 = var8[var9];
                   int var11 = var3.stringWidth(var10);
-                  if(var11 > var7) {
+                  if (var11 > var7) {
                      var7 = var11;
                   }
                }
 
-               return new WorldMapLabel(var1.__l, var7, var6, var2);
+               return new WorldMapLabel(var1.name, var7, var6, var2);
             }
          }
       } else {
@@ -955,25 +960,25 @@ public class WorldMapRegion {
       signature = "(IIIIII)Ljava/util/List;",
       garbageValue = "-1237576843"
    )
-   List __ae_57(int var1, int var2, int var3, int var4, int var5) {
+   List method421(int var1, int var2, int var3, int var4, int var5) {
       LinkedList var6 = new LinkedList();
-      if(var4 >= var1 && var5 >= var2) {
-         if(var4 < var3 + var1 && var5 < var3 + var2) {
+      if (var4 >= var1 && var5 >= var2) {
+         if (var4 < var3 + var1 && var5 < var3 + var2) {
             Iterator var7 = this.iconsMap.values().iterator();
 
             AbstractWorldMapIcon var8;
-            while(var7.hasNext()) {
+            while (var7.hasNext()) {
                var8 = (AbstractWorldMapIcon)var7.next();
-               if(var8.__h_67() && var8.__y_66(var4, var5)) {
+               if (var8.method19() && var8.method18(var4, var5)) {
                   var6.add(var8);
                }
             }
 
             var7 = this.iconsList.iterator();
 
-            while(var7.hasNext()) {
+            while (var7.hasNext()) {
                var8 = (AbstractWorldMapIcon)var7.next();
-               if(var8.__h_67() && var8.__y_66(var4, var5)) {
+               if (var8.method19() && var8.method18(var4, var5)) {
                   var6.add(var8);
                }
             }
@@ -1005,22 +1010,22 @@ public class WorldMapRegion {
       signature = "(IIIII)V",
       garbageValue = "-1516512827"
    )
-   void __ad_58(int var1, int var2, int var3, int var4) {
+   void method422(int var1, int var2, int var3, int var4) {
       var3 %= 4;
-      if(var3 == 0) {
-         Rasterizer2D.Rasterizer2D_drawVerticalLine(this.__d * var1, this.__d * (63 - var2), this.__d, var4);
+      if (var3 == 0) {
+         Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4);
       }
 
-      if(var3 == 1) {
-         Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.__d * var1, this.__d * (63 - var2), this.__d, var4);
+      if (var3 == 1) {
+         Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4);
       }
 
-      if(var3 == 2) {
-         Rasterizer2D.Rasterizer2D_drawVerticalLine(this.__d * var1 + this.__d - 1, this.__d * (63 - var2), this.__d, var4);
+      if (var3 == 2) {
+         Rasterizer2D.Rasterizer2D_drawVerticalLine(this.pixelsPerTile * var1 + this.pixelsPerTile - 1, this.pixelsPerTile * (63 - var2), this.pixelsPerTile, var4);
       }
 
-      if(var3 == 3) {
-         Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.__d * var1, this.__d * (63 - var2) + this.__d - 1, this.__d, var4);
+      if (var3 == 3) {
+         Rasterizer2D.Rasterizer2D_drawHorizontalLine(this.pixelsPerTile * var1, this.pixelsPerTile * (63 - var2) + this.pixelsPerTile - 1, this.pixelsPerTile, var4);
       }
 
    }
@@ -1039,7 +1044,8 @@ public class WorldMapRegion {
       signature = "(Ljava/lang/String;I)I",
       garbageValue = "1877870965"
    )
-   public static int method550(String var0) {
+   @Export("stringCp1252NullTerminatedByteSize")
+   public static int stringCp1252NullTerminatedByteSize(String var0) {
       return var0.length() + 1;
    }
 
@@ -1048,48 +1054,47 @@ public class WorldMapRegion {
       signature = "(Lho;IIS)V",
       garbageValue = "597"
    )
+   // Click minimap?
    static final void method567(Widget var0, int var1, int var2) {
-      if(Client.minimapState == 0 || Client.minimapState == 3) {
-         if(!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) {
-            SpriteMask var3 = var0.getSpriteMask(true);
-            if(var3 == null) {
-               return;
-            }
-
-            int var4 = MouseHandler.MouseHandler_lastPressedX - var1;
-            int var5 = MouseHandler.MouseHandler_lastPressedY - var2;
-            if(var3.contains(var4, var5)) {
-               var4 -= var3.width / 2;
-               var5 -= var3.height / 2;
-               int var6 = Client.minimapOrientation & 2047;
-               int var7 = Rasterizer3D.Rasterizer3D_sine[var6];
-               int var8 = Rasterizer3D.Rasterizer3D_cosine[var6];
-               int var9 = var4 * var8 + var7 * var5 >> 11;
-               int var10 = var5 * var8 - var4 * var7 >> 11;
-               int var11 = var9 + Canvas.localPlayer.x >> 7;
-               int var12 = Canvas.localPlayer.y - var10 >> 7;
-               PacketBufferNode var13 = Interpreter.method1915(ClientPacket.__gs_ba, Client.packetWriter.isaacCipher);
-               var13.packetBuffer.writeByte(18);
-               var13.packetBuffer.__bo_322(var12 + GraphicsObject.baseY);
-               var13.packetBuffer.__bo_322(var11 + class50.baseX);
-               var13.packetBuffer.__af_314(KeyHandler.KeyHandler_pressedKeys[82]?(KeyHandler.KeyHandler_pressedKeys[81]?2:1):0);
-               var13.packetBuffer.writeByte(var4);
-               var13.packetBuffer.writeByte(var5);
-               var13.packetBuffer.writeShort(Client.minimapOrientation);
-               var13.packetBuffer.writeByte(57);
-               var13.packetBuffer.writeByte(0);
-               var13.packetBuffer.writeByte(0);
-               var13.packetBuffer.writeByte(89);
-               var13.packetBuffer.writeShort(Canvas.localPlayer.x);
-               var13.packetBuffer.writeShort(Canvas.localPlayer.y);
-               var13.packetBuffer.writeByte(63);
-               Client.packetWriter.__q_167(var13);
-               Client.destinationX = var11;
-               Client.destinationY = var12;
-            }
+      if ((Client.minimapState == 0 || Client.minimapState == 3) && !Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) {
+         SpriteMask var3 = var0.getSpriteMask(true);
+         if (var3 == null) {
+            return;
          }
 
+         int var4 = MouseHandler.MouseHandler_lastPressedX - var1;
+         int var5 = MouseHandler.MouseHandler_lastPressedY - var2;
+         if (var3.contains(var4, var5)) {
+            var4 -= var3.width / 2;
+            var5 -= var3.height / 2;
+            int var6 = Client.camAngleY & 2047;
+            int var7 = Rasterizer3D.Rasterizer3D_sine[var6];
+            int var8 = Rasterizer3D.Rasterizer3D_cosine[var6];
+            int var9 = var4 * var8 + var7 * var5 >> 11;
+            int var10 = var5 * var8 - var4 * var7 >> 11;
+            int var11 = var9 + Canvas.localPlayer.x >> 7;
+            int var12 = Canvas.localPlayer.y - var10 >> 7;
+            PacketBufferNode var13 = Interpreter.method1915(ClientPacket.field274, Client.packetWriter.isaacCipher);
+            var13.packetBuffer.writeByte(18);
+            var13.packetBuffer.method63(var12 + GraphicsObject.baseY);
+            var13.packetBuffer.method63(var11 + class50.baseX);
+            var13.packetBuffer.method55(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0);
+            var13.packetBuffer.writeByte(var4);
+            var13.packetBuffer.writeByte(var5);
+            var13.packetBuffer.writeShort(Client.camAngleY);
+            var13.packetBuffer.writeByte(57);
+            var13.packetBuffer.writeByte(0);
+            var13.packetBuffer.writeByte(0);
+            var13.packetBuffer.writeByte(89);
+            var13.packetBuffer.writeShort(Canvas.localPlayer.x);
+            var13.packetBuffer.writeShort(Canvas.localPlayer.y);
+            var13.packetBuffer.writeByte(63);
+            Client.packetWriter.method241(var13);
+            Client.destinationX = var11;
+            Client.destinationY = var12;
+         }
       }
+
    }
 
    @ObfuscatedName("ix")
@@ -1099,32 +1104,36 @@ public class WorldMapRegion {
    )
    @Export("notRevalidateWidgetScroll")
    static void notRevalidateWidgetScroll(Widget[] var0, int var1, int var2, int var3, boolean var4) {
-      for(int var5 = 0; var5 < var0.length; ++var5) {
+      for (int var5 = 0; var5 < var0.length; ++var5) {
          Widget var6 = var0[var5];
-         if(var6 != null && var6.parentId == var1) {
-            WorldMapSection3.alignWidgetSize(var6, var2, var3, var4);
-            OverlayDefinition.alignWidgetPosition(var6, var2, var3);
-            if(var6.scrollX > var6.scrollWidth - var6.width) {
+         if (var6 != null && var6.parentId == var1) {
+            WorldMapSection1.alignWidgetSize(var6, var2, var3, var4);
+            FloorOverlayDefinition.alignWidgetPosition(var6, var2, var3);
+            if (var6.scrollX > var6.scrollWidth - var6.width) {
                var6.scrollX = var6.scrollWidth - var6.width;
             }
 
-            if(var6.scrollX < 0) {
+            if (var6.scrollX < 0) {
                var6.scrollX = 0;
             }
 
-            if(var6.scrollY > var6.scrollHeight - var6.height) {
+            if (var6.scrollY > var6.scrollHeight - var6.height) {
                var6.scrollY = var6.scrollHeight - var6.height;
             }
 
-            if(var6.scrollY < 0) {
+            if (var6.scrollY < 0) {
                var6.scrollY = 0;
             }
 
-            if(var6.type == 0) {
+            if (var6.type == 0) {
                class39.revalidateWidgetScroll(var0, var6, var4);
             }
          }
       }
 
    }
+
+   static {
+      field1051 = new DemotingHashTable(37748736, 256);
+   }
 }
diff --git a/runescape-client/src/main/java/WorldMapSection.java b/runescape-client/src/main/java/WorldMapSection.java
index 8765e6c253..3e7942dc74 100644
--- a/runescape-client/src/main/java/WorldMapSection.java
+++ b/runescape-client/src/main/java/WorldMapSection.java
@@ -12,7 +12,7 @@ public interface WorldMapSection {
       garbageValue = "1384899025"
    )
    @Export("expandBounds")
-   void expandBounds(WorldMapArea var1);
+   void expandBounds(WorldMapArea area);
 
    @ObfuscatedName("f")
    @ObfuscatedSignature(
@@ -20,7 +20,7 @@ public interface WorldMapSection {
       garbageValue = "93"
    )
    @Export("containsCoord")
-   boolean containsCoord(int var1, int var2, int var3);
+   boolean containsCoord(int plane, int x, int y);
 
    @ObfuscatedName("q")
    @ObfuscatedSignature(
@@ -28,7 +28,7 @@ public interface WorldMapSection {
       garbageValue = "4"
    )
    @Export("containsPosition")
-   boolean containsPosition(int var1, int var2);
+   boolean containsPosition(int x, int y);
 
    @ObfuscatedName("w")
    @ObfuscatedSignature(
@@ -36,7 +36,7 @@ public interface WorldMapSection {
       garbageValue = "1545934424"
    )
    @Export("position")
-   int[] position(int var1, int var2, int var3);
+   int[] position(int plane, int x, int y);
 
    @ObfuscatedName("o")
    @ObfuscatedSignature(
@@ -44,7 +44,7 @@ public interface WorldMapSection {
       garbageValue = "-1916486802"
    )
    @Export("coord")
-   TileLocation coord(int var1, int var2);
+   Coord coord(int x, int y);
 
    @ObfuscatedName("u")
    @ObfuscatedSignature(
@@ -52,5 +52,5 @@ public interface WorldMapSection {
       garbageValue = "-113"
    )
    @Export("read")
-   void read(Buffer var1);
+   void read(Buffer buffer);
 }
diff --git a/runescape-client/src/main/java/WorldMapSection0.java b/runescape-client/src/main/java/WorldMapSection0.java
index 6f10a54e08..d7f2c11787 100644
--- a/runescape-client/src/main/java/WorldMapSection0.java
+++ b/runescape-client/src/main/java/WorldMapSection0.java
@@ -4,86 +4,48 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("y")
+@ObfuscatedName("ah")
 @Implements("WorldMapSection0")
 public class WorldMapSection0 implements WorldMapSection {
-   @ObfuscatedName("sn")
-   @ObfuscatedGetter(
-      intValue = -1946112139
-   )
-   static int __y_sn;
-   @ObfuscatedName("p")
-   static int[] __y_p;
+   @ObfuscatedName("l")
+   static int[] field1082;
+   @ObfuscatedName("j")
+   @Export("cacheDirectoryLocations")
+   public static String[] cacheDirectoryLocations;
    @ObfuscatedName("m")
    @ObfuscatedGetter(
-      intValue = -2011838881
+      intValue = -1561552223
    )
-   int __m;
+   @Export("minPlane")
+   int minPlane;
    @ObfuscatedName("f")
    @ObfuscatedGetter(
-      intValue = 1299225715
+      intValue = -245382089
    )
-   int __f;
+   @Export("planes")
+   int planes;
    @ObfuscatedName("q")
    @ObfuscatedGetter(
-      intValue = 82600709
+      intValue = -1024859679
    )
-   int __q;
+   @Export("xRegion")
+   int xRegion;
    @ObfuscatedName("w")
    @ObfuscatedGetter(
-      intValue = -477370575
+      intValue = 40495485
    )
-   int __w;
+   @Export("yRegion")
+   int yRegion;
    @ObfuscatedName("o")
    @ObfuscatedGetter(
-      intValue = -671345527
+      intValue = 982234927
    )
-   int __o;
+   int field1087;
    @ObfuscatedName("u")
    @ObfuscatedGetter(
-      intValue = 529427495
+      intValue = -1272330125
    )
-   int __u;
-   @ObfuscatedName("g")
-   @ObfuscatedGetter(
-      intValue = -150870205
-   )
-   int __g;
-   @ObfuscatedName("l")
-   @ObfuscatedGetter(
-      intValue = 1009718107
-   )
-   int __l;
-   @ObfuscatedName("e")
-   @ObfuscatedGetter(
-      intValue = -1022177315
-   )
-   int __e;
-   @ObfuscatedName("x")
-   @ObfuscatedGetter(
-      intValue = -1397517463
-   )
-   int __x;
-   @ObfuscatedName("d")
-   @ObfuscatedGetter(
-      intValue = -799353317
-   )
-   int __d;
-   @ObfuscatedName("k")
-   @ObfuscatedGetter(
-      intValue = -1388959491
-   )
-   int __k;
-   @ObfuscatedName("n")
-   @ObfuscatedGetter(
-      intValue = -1657956317
-   )
-   int __n;
-   @ObfuscatedName("i")
-   @ObfuscatedGetter(
-      intValue = 1345061881
-   )
-   int __i;
+   int field1088;
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
@@ -91,21 +53,21 @@ public class WorldMapSection0 implements WorldMapSection {
       garbageValue = "1384899025"
    )
    @Export("expandBounds")
-   public void expandBounds(WorldMapArea var1) {
-      if(var1.minX0 > this.__o) {
-         var1.minX0 = this.__o;
+   public void expandBounds(WorldMapArea area) {
+      if (area.minX0 > this.field1087) {
+         area.minX0 = this.field1087;
       }
 
-      if(var1.maxX0 < this.__o) {
-         var1.maxX0 = this.__o;
+      if (area.maxX0 < this.field1087) {
+         area.maxX0 = this.field1087;
       }
 
-      if(var1.minY0 > this.__u) {
-         var1.minY0 = this.__u;
+      if (area.minY0 > this.field1088) {
+         area.minY0 = this.field1088;
       }
 
-      if(var1.maxY0 < this.__u) {
-         var1.maxY0 = this.__u;
+      if (area.maxY0 < this.field1088) {
+         area.maxY0 = this.field1088;
       }
 
    }
@@ -116,8 +78,8 @@ public class WorldMapSection0 implements WorldMapSection {
       garbageValue = "93"
    )
    @Export("containsCoord")
-   public boolean containsCoord(int var1, int var2, int var3) {
-      return var1 >= this.__m && var1 < this.__m + this.__f?var2 >= (this.__q << 6) + (this.__g << 3) && var2 <= (this.__q << 6) + (this.__e << 3) + 7 && var3 >= (this.__w << 6) + (this.__l << 3) && var3 <= (this.__w << 6) + (this.__x << 3) + 7:false;
+   public boolean containsCoord(int plane, int x, int y) {
+      return plane >= this.minPlane && plane < this.minPlane + this.planes ? x >> 6 == this.xRegion && y >> 6 == this.yRegion : false;
    }
 
    @ObfuscatedName("q")
@@ -126,8 +88,8 @@ public class WorldMapSection0 implements WorldMapSection {
       garbageValue = "4"
    )
    @Export("containsPosition")
-   public boolean containsPosition(int var1, int var2) {
-      return var1 >= (this.__o << 6) + (this.__d << 3) && var1 <= (this.__o << 6) + (this.__n << 3) + 7 && var2 >= (this.__u << 6) + (this.__k << 3) && var2 <= (this.__u << 6) + (this.__i << 3) + 7;
+   public boolean containsPosition(int x, int y) {
+      return x >> 6 == this.field1087 && y >> 6 == this.field1088;
    }
 
    @ObfuscatedName("w")
@@ -136,11 +98,11 @@ public class WorldMapSection0 implements WorldMapSection {
       garbageValue = "1545934424"
    )
    @Export("position")
-   public int[] position(int var1, int var2, int var3) {
-      if(!this.containsCoord(var1, var2, var3)) {
+   public int[] position(int plane, int x, int y) {
+      if (!this.containsCoord(plane, x, y)) {
          return null;
       } else {
-         int[] var4 = new int[]{this.__o * 64 - this.__q * 64 + var2 + (this.__d * 8 - this.__g * 8), var3 + (this.__u * 64 - this.__w * 64) + (this.__k * 8 - this.__l * 8)};
+         int[] var4 = new int[]{this.field1087 * 64 - this.xRegion * 64 + x, y + (this.field1088 * 64 - this.yRegion * 64)};
          return var4;
       }
    }
@@ -151,13 +113,13 @@ public class WorldMapSection0 implements WorldMapSection {
       garbageValue = "-1916486802"
    )
    @Export("coord")
-   public TileLocation coord(int var1, int var2) {
-      if(!this.containsPosition(var1, var2)) {
+   public Coord coord(int x, int y) {
+      if (!this.containsPosition(x, y)) {
          return null;
       } else {
-         int var3 = this.__q * 64 - this.__o * 64 + (this.__g * 8 - this.__d * 8) + var1;
-         int var4 = this.__w * 64 - this.__u * 64 + var2 + (this.__l * 8 - this.__k * 8);
-         return new TileLocation(this.__m, var3, var4);
+         int var3 = this.xRegion * 64 - this.field1087 * 64 + x;
+         int var4 = this.yRegion * 64 - this.field1088 * 64 + y;
+         return new Coord(this.minPlane, var3, var4);
       }
    }
 
@@ -167,117 +129,189 @@ public class WorldMapSection0 implements WorldMapSection {
       garbageValue = "-113"
    )
    @Export("read")
-   public void read(Buffer var1) {
-      this.__m = var1.readUnsignedByte();
-      this.__f = var1.readUnsignedByte();
-      this.__q = var1.__ag_302();
-      this.__g = var1.readUnsignedByte();
-      this.__e = var1.readUnsignedByte();
-      this.__w = var1.__ag_302();
-      this.__l = var1.readUnsignedByte();
-      this.__x = var1.readUnsignedByte();
-      this.__o = var1.__ag_302();
-      this.__d = var1.readUnsignedByte();
-      this.__n = var1.readUnsignedByte();
-      this.__u = var1.__ag_302();
-      this.__k = var1.readUnsignedByte();
-      this.__i = var1.readUnsignedByte();
-      this.__g_25();
+   public void read(Buffer buffer) {
+      this.minPlane = buffer.readUnsignedByte();
+      this.planes = buffer.readUnsignedByte();
+      this.xRegion = buffer.readUnsignedShort();
+      this.yRegion = buffer.readUnsignedShort();
+      this.field1087 = buffer.readUnsignedShort();
+      this.field1088 = buffer.readUnsignedShort();
+      this.method425();
    }
 
    @ObfuscatedName("g")
    @ObfuscatedSignature(
       signature = "(I)V",
-      garbageValue = "1967186894"
+      garbageValue = "-1602858772"
    )
-   void __g_25() {
+   void method425() {
    }
 
-   @ObfuscatedName("w")
+   @ObfuscatedName("m")
    @ObfuscatedSignature(
-      signature = "(I)V",
-      garbageValue = "-2102591569"
+      signature = "(II)I",
+      garbageValue = "409746497"
    )
-   @Export("savePreferences")
-   static void savePreferences() {
-      AccessFile var0 = null;
+   @Export("getVarbit")
+   public static int getVarbit(int var0) {
+      VarbitDefinition var1 = Occluder.getVarbitDefinition(var0);
+      int var2 = var1.baseVar;
+      int var3 = var1.startBit;
+      int var4 = var1.endBit;
+      int var5 = Varps.Varps_masks[var4 - var3];
+      return Varps.Varps_main[var2] >> var3 & var5;
+   }
 
-      try {
-         var0 = LoginPacket.getPreferencesFile("", class22.studioGame.name, true);
-         Buffer var1 = ReflectionCheck.clientPreferences.toBuffer();
-         var0.write(var1.array, 0, var1.index);
-      } catch (Exception var3) {
-         ;
-      }
+   @ObfuscatedName("f")
+   @ObfuscatedSignature(
+      signature = "(IILfe;Lfy;I)Z",
+      garbageValue = "-2025028346"
+   )
+   static final boolean method593(int var0, int var1, RouteStrategy var2, CollisionMap var3) {
+      int var4 = var0;
+      int var5 = var1;
+      byte var6 = 64;
+      byte var7 = 64;
+      int var8 = var0 - var6;
+      int var9 = var1 - var7;
+      class178.directions[var6][var7] = 99;
+      class178.distances[var6][var7] = 0;
+      byte var10 = 0;
+      int var11 = 0;
+      class178.bufferX[var10] = var0;
+      int var12 = var10 + 1;
+      class178.bufferY[var10] = var1;
+      int[][] var13 = var3.flags;
 
-      try {
-         if(var0 != null) {
-            var0.closeSync(true);
+      while (var12 != var11) {
+         var4 = class178.bufferX[var11];
+         var5 = class178.bufferY[var11];
+         var11 = var11 + 1 & 4095;
+         int var14 = var4 - var8;
+         int var15 = var5 - var9;
+         int var16 = var4 - var3.xInset;
+         int var17 = var5 - var3.yInset;
+         if (var2.vmethod3644(2, var4, var5, var3)) {
+            InterfaceParent.field986 = var4;
+            UrlRequester.field929 = var5;
+            return true;
+         }
+
+         int var18 = class178.distances[var14][var15] + 1;
+         if (var14 > 0 && class178.directions[var14 - 1][var15] == 0 && (var13[var16 - 1][var17] & 19136782) == 0 && (var13[var16 - 1][var17 + 1] & 19136824) == 0) {
+            class178.bufferX[var12] = var4 - 1;
+            class178.bufferY[var12] = var5;
+            var12 = var12 + 1 & 4095;
+            class178.directions[var14 - 1][var15] = 2;
+            class178.distances[var14 - 1][var15] = var18;
+         }
+
+         if (var14 < 126 && class178.directions[var14 + 1][var15] == 0 && (var13[var16 + 2][var17] & 19136899) == 0 && (var13[var16 + 2][var17 + 1] & 19136992) == 0) {
+            class178.bufferX[var12] = var4 + 1;
+            class178.bufferY[var12] = var5;
+            var12 = var12 + 1 & 4095;
+            class178.directions[var14 + 1][var15] = 8;
+            class178.distances[var14 + 1][var15] = var18;
+         }
+
+         if (var15 > 0 && class178.directions[var14][var15 - 1] == 0 && (var13[var16][var17 - 1] & 19136782) == 0 && (var13[var16 + 1][var17 - 1] & 19136899) == 0) {
+            class178.bufferX[var12] = var4;
+            class178.bufferY[var12] = var5 - 1;
+            var12 = var12 + 1 & 4095;
+            class178.directions[var14][var15 - 1] = 1;
+            class178.distances[var14][var15 - 1] = var18;
+         }
+
+         if (var15 < 126 && class178.directions[var14][var15 + 1] == 0 && (var13[var16][var17 + 2] & 19136824) == 0 && (var13[var16 + 1][var17 + 2] & 19136992) == 0) {
+            class178.bufferX[var12] = var4;
+            class178.bufferY[var12] = var5 + 1;
+            var12 = var12 + 1 & 4095;
+            class178.directions[var14][var15 + 1] = 4;
+            class178.distances[var14][var15 + 1] = var18;
+         }
+
+         if (var14 > 0 && var15 > 0 && class178.directions[var14 - 1][var15 - 1] == 0 && (var13[var16 - 1][var17] & 19136830) == 0 && (var13[var16 - 1][var17 - 1] & 19136782) == 0 && (var13[var16][var17 - 1] & 19136911) == 0) {
+            class178.bufferX[var12] = var4 - 1;
+            class178.bufferY[var12] = var5 - 1;
+            var12 = var12 + 1 & 4095;
+            class178.directions[var14 - 1][var15 - 1] = 3;
+            class178.distances[var14 - 1][var15 - 1] = var18;
+         }
+
+         if (var14 < 126 && var15 > 0 && class178.directions[var14 + 1][var15 - 1] == 0 && (var13[var16 + 1][var17 - 1] & 19136911) == 0 && (var13[var16 + 2][var17 - 1] & 19136899) == 0 && (var13[var16 + 2][var17] & 19136995) == 0) {
+            class178.bufferX[var12] = var4 + 1;
+            class178.bufferY[var12] = var5 - 1;
+            var12 = var12 + 1 & 4095;
+            class178.directions[var14 + 1][var15 - 1] = 9;
+            class178.distances[var14 + 1][var15 - 1] = var18;
+         }
+
+         if (var14 > 0 && var15 < 126 && class178.directions[var14 - 1][var15 + 1] == 0 && (var13[var16 - 1][var17 + 1] & 19136830) == 0 && (var13[var16 - 1][var17 + 2] & 19136824) == 0 && (var13[var16][var17 + 2] & 19137016) == 0) {
+            class178.bufferX[var12] = var4 - 1;
+            class178.bufferY[var12] = var5 + 1;
+            var12 = var12 + 1 & 4095;
+            class178.directions[var14 - 1][var15 + 1] = 6;
+            class178.distances[var14 - 1][var15 + 1] = var18;
+         }
+
+         if (var14 < 126 && var15 < 126 && class178.directions[var14 + 1][var15 + 1] == 0 && (var13[var16 + 1][var17 + 2] & 19137016) == 0 && (var13[var16 + 2][var17 + 2] & 19136992) == 0 && (var13[var16 + 2][var17 + 1] & 19136995) == 0) {
+            class178.bufferX[var12] = var4 + 1;
+            class178.bufferY[var12] = var5 + 1;
+            var12 = var12 + 1 & 4095;
+            class178.directions[var14 + 1][var15 + 1] = 12;
+            class178.distances[var14 + 1][var15 + 1] = var18;
          }
-      } catch (Exception var2) {
-         ;
       }
 
+      InterfaceParent.field986 = var4;
+      UrlRequester.field929 = var5;
+      return false;
    }
 
-   @ObfuscatedName("hz")
+   @ObfuscatedName("hc")
    @ObfuscatedSignature(
-      signature = "(II)V",
-      garbageValue = "1886145284"
+      signature = "(ILjava/lang/String;I)V",
+      garbageValue = "-1850233906"
    )
-   static final void method245(int var0) {
-      if(var0 >= 0) {
-         int var1 = Client.menuArguments1[var0];
-         int var2 = Client.menuArguments2[var0];
-         int var3 = Client.menuOpcodes[var0];
-         int var4 = Client.menuArguments0[var0];
-         String var5 = Client.menuActions[var0];
-         String var6 = Client.menuTargetNames[var0];
-         Actor.menuAction(var1, var2, var3, var4, var5, var6, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY);
-      }
-   }
+   static void method583(int var0, String var1) {
+      int var2 = Players.Players_count;
+      int[] var3 = Players.Players_indices;
+      boolean var4 = false;
+      Username var5 = new Username(var1, KeyHandler.loginType);
 
-   @ObfuscatedName("io")
-   @ObfuscatedSignature(
-      signature = "(Lho;IIIIIII)V",
-      garbageValue = "-1723792771"
-   )
-   static final void method246(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) {
-      if(Client.__client_hh) {
-         Client.__client_hd = 32;
-      } else {
-         Client.__client_hd = 0;
-      }
-
-      Client.__client_hh = false;
-      int var7;
-      if(MouseHandler.MouseHandler_currentButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_currentButton == 4) {
-         if(var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) {
-            var0.scrollY -= 4;
-            class22.method295(var0);
-         } else if(var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) {
-            var0.scrollY += 4;
-            class22.method295(var0);
-         } else if(var5 >= var1 - Client.__client_hd && var5 < Client.__client_hd + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) {
-            var7 = var3 * (var3 - 32) / var4;
-            if(var7 < 8) {
-               var7 = 8;
+      for (int var6 = 0; var6 < var2; ++var6) {
+         Player var7 = Client.players[var3[var6]];
+         if (var7 != null && var7 != Canvas.localPlayer && var7.username != null && var7.username.equals(var5)) {
+            PacketBufferNode var8;
+            if (var0 == 1) {
+               var8 = Interpreter.method1915(ClientPacket.field269, Client.packetWriter.isaacCipher);
+               var8.packetBuffer.writeShort(var3[var6]);
+               var8.packetBuffer.method56(0);
+               Client.packetWriter.method241(var8);
+            } else if (var0 == 4) {
+               var8 = Interpreter.method1915(ClientPacket.field249, Client.packetWriter.isaacCipher);
+               var8.packetBuffer.method64(var3[var6]);
+               var8.packetBuffer.method56(0);
+               Client.packetWriter.method241(var8);
+            } else if (var0 == 6) {
+               var8 = Interpreter.method1915(ClientPacket.field315, Client.packetWriter.isaacCipher);
+               var8.packetBuffer.method63(var3[var6]);
+               var8.packetBuffer.method57(0);
+               Client.packetWriter.method241(var8);
+            } else if (var0 == 7) {
+               var8 = Interpreter.method1915(ClientPacket.field297, Client.packetWriter.isaacCipher);
+               var8.packetBuffer.method57(0);
+               var8.packetBuffer.writeShortLE(var3[var6]);
+               Client.packetWriter.method241(var8);
             }
 
-            int var8 = var6 - var2 - 16 - var7 / 2;
-            int var9 = var3 - 32 - var7;
-            var0.scrollY = var8 * (var4 - var3) / var9;
-            class22.method295(var0);
-            Client.__client_hh = true;
+            var4 = true;
+            break;
          }
       }
 
-      if(Client.mouseWheelRotation != 0) {
-         var7 = var0.width;
-         if(var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) {
-            var0.scrollY += Client.mouseWheelRotation * 45;
-            class22.method295(var0);
-         }
+      if (!var4) {
+         WorldMapIcon1.addGameMessage(4, "", "Unable to find " + var1);
       }
 
    }
diff --git a/runescape-client/src/main/java/WorldMapSection1.java b/runescape-client/src/main/java/WorldMapSection1.java
index 8661c099e2..b2ed5c1c6d 100644
--- a/runescape-client/src/main/java/WorldMapSection1.java
+++ b/runescape-client/src/main/java/WorldMapSection1.java
@@ -4,79 +4,73 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("as")
+@ObfuscatedName("p")
 @Implements("WorldMapSection1")
 public class WorldMapSection1 implements WorldMapSection {
-   @ObfuscatedName("c")
-   @Export("userHomeDirectory")
-   public static String userHomeDirectory;
-   @ObfuscatedName("du")
+   @ObfuscatedName("h")
+   @Export("osNameLowerCase")
+   public static String osNameLowerCase;
+   @ObfuscatedName("dr")
    @ObfuscatedSignature(
       signature = "Lit;"
    )
-   @Export("indexCache15")
-   static IndexCache indexCache15;
-   @ObfuscatedName("ey")
+   @Export("archive8")
+   static Archive archive8;
+   @ObfuscatedName("go")
    @ObfuscatedGetter(
-      intValue = -1516124929
+      intValue = -948290091
    )
-   static int __as_ey;
-   @ObfuscatedName("ha")
-   @ObfuscatedGetter(
-      intValue = 1052834531
-   )
-   @Export("cameraX")
-   static int cameraX;
+   static int field1089;
    @ObfuscatedName("m")
    @ObfuscatedGetter(
-      intValue = -1971304641
+      intValue = 1389733201
    )
-   int __m;
+   int field1090;
    @ObfuscatedName("f")
    @ObfuscatedGetter(
-      intValue = 1483447179
+      intValue = -1622972483
    )
-   int __f;
+   int field1091;
    @ObfuscatedName("q")
    @ObfuscatedGetter(
-      intValue = -1875803617
+      intValue = 702057599
    )
-   int __q;
+   int field1092;
    @ObfuscatedName("w")
    @ObfuscatedGetter(
-      intValue = 284566685
+      intValue = -1068088609
    )
-   int __w;
+   int field1093;
    @ObfuscatedName("o")
    @ObfuscatedGetter(
-      intValue = -1513010233
+      intValue = 1257151629
    )
-   int __o;
+   int field1094;
    @ObfuscatedName("u")
    @ObfuscatedGetter(
-      intValue = -1383826035
+      intValue = -1351623663
    )
-   int __u;
+   int field1095;
    @ObfuscatedName("g")
    @ObfuscatedGetter(
-      intValue = 1526007343
+      intValue = 1016557381
    )
-   int __g;
+   int field1096;
    @ObfuscatedName("l")
    @ObfuscatedGetter(
-      intValue = -890169045
+      intValue = 884736611
    )
-   int __l;
+   int field1097;
    @ObfuscatedName("e")
    @ObfuscatedGetter(
-      intValue = -1797724181
+      intValue = 395786901
    )
-   int __e;
+   int field1098;
    @ObfuscatedName("x")
    @ObfuscatedGetter(
-      intValue = 325777555
+      intValue = -627081155
    )
-   int __x;
+   int field1099;
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
@@ -84,21 +78,21 @@ public class WorldMapSection1 implements WorldMapSection {
       garbageValue = "1384899025"
    )
    @Export("expandBounds")
-   public void expandBounds(WorldMapArea var1) {
-      if(var1.minX0 > this.__o) {
-         var1.minX0 = this.__o;
+   public void expandBounds(WorldMapArea area) {
+      if (area.minX0 > this.field1096) {
+         area.minX0 = this.field1096;
       }
 
-      if(var1.maxX0 < this.__o) {
-         var1.maxX0 = this.__o;
+      if (area.maxX0 < this.field1098) {
+         area.maxX0 = this.field1098;
       }
 
-      if(var1.minY0 > this.__u) {
-         var1.minY0 = this.__u;
+      if (area.minY0 > this.field1097) {
+         area.minY0 = this.field1097;
       }
 
-      if(var1.maxY0 < this.__u) {
-         var1.maxY0 = this.__u;
+      if (area.maxY0 < this.field1099) {
+         area.maxY0 = this.field1099;
       }
 
    }
@@ -109,8 +103,8 @@ public class WorldMapSection1 implements WorldMapSection {
       garbageValue = "93"
    )
    @Export("containsCoord")
-   public boolean containsCoord(int var1, int var2, int var3) {
-      return var1 >= this.__m && var1 < this.__m + this.__f?var2 >= (this.__q << 6) + (this.__g << 3) && var2 <= (this.__q << 6) + (this.__g << 3) + 7 && var3 >= (this.__w << 6) + (this.__l << 3) && var3 <= (this.__w << 6) + (this.__l << 3) + 7:false;
+   public boolean containsCoord(int plane, int x, int y) {
+      return plane >= this.field1090 && plane < this.field1090 + this.field1091 ? x >> 6 >= this.field1092 && x >> 6 <= this.field1094 && y >> 6 >= this.field1093 && y >> 6 <= this.field1095 : false;
    }
 
    @ObfuscatedName("q")
@@ -119,8 +113,8 @@ public class WorldMapSection1 implements WorldMapSection {
       garbageValue = "4"
    )
    @Export("containsPosition")
-   public boolean containsPosition(int var1, int var2) {
-      return var1 >= (this.__o << 6) + (this.__e << 3) && var1 <= (this.__o << 6) + (this.__e << 3) + 7 && var2 >= (this.__u << 6) + (this.__x << 3) && var2 <= (this.__u << 6) + (this.__x << 3) + 7;
+   public boolean containsPosition(int x, int y) {
+      return x >> 6 >= this.field1096 && x >> 6 <= this.field1098 && y >> 6 >= this.field1097 && y >> 6 <= this.field1099;
    }
 
    @ObfuscatedName("w")
@@ -129,11 +123,11 @@ public class WorldMapSection1 implements WorldMapSection {
       garbageValue = "1545934424"
    )
    @Export("position")
-   public int[] position(int var1, int var2, int var3) {
-      if(!this.containsCoord(var1, var2, var3)) {
+   public int[] position(int plane, int x, int y) {
+      if (!this.containsCoord(plane, x, y)) {
          return null;
       } else {
-         int[] var4 = new int[]{this.__o * 64 - this.__q * 64 + var2 + (this.__e * 8 - this.__g * 8), var3 + (this.__u * 64 - this.__w * 64) + (this.__x * 8 - this.__l * 8)};
+         int[] var4 = new int[]{this.field1096 * 64 - this.field1092 * 64 + x, y + (this.field1097 * 64 - this.field1093 * 64)};
          return var4;
       }
    }
@@ -144,13 +138,13 @@ public class WorldMapSection1 implements WorldMapSection {
       garbageValue = "-1916486802"
    )
    @Export("coord")
-   public TileLocation coord(int var1, int var2) {
-      if(!this.containsPosition(var1, var2)) {
+   public Coord coord(int x, int y) {
+      if (!this.containsPosition(x, y)) {
          return null;
       } else {
-         int var3 = this.__q * 64 - this.__o * 64 + (this.__g * 8 - this.__e * 8) + var1;
-         int var4 = this.__w * 64 - this.__u * 64 + var2 + (this.__l * 8 - this.__x * 8);
-         return new TileLocation(this.__m, var3, var4);
+         int var3 = this.field1092 * 64 - this.field1096 * 64 + x;
+         int var4 = this.field1093 * 64 - this.field1097 * 64 + y;
+         return new Coord(this.field1090, var3, var4);
       }
    }
 
@@ -160,165 +154,111 @@ public class WorldMapSection1 implements WorldMapSection {
       garbageValue = "-113"
    )
    @Export("read")
-   public void read(Buffer var1) {
-      this.__m = var1.readUnsignedByte();
-      this.__f = var1.readUnsignedByte();
-      this.__q = var1.__ag_302();
-      this.__g = var1.readUnsignedByte();
-      this.__w = var1.__ag_302();
-      this.__l = var1.readUnsignedByte();
-      this.__o = var1.__ag_302();
-      this.__e = var1.readUnsignedByte();
-      this.__u = var1.__ag_302();
-      this.__x = var1.readUnsignedByte();
-      this.__g_84();
+   public void read(Buffer buffer) {
+      this.field1090 = buffer.readUnsignedByte();
+      this.field1091 = buffer.readUnsignedByte();
+      this.field1092 = buffer.readUnsignedShort();
+      this.field1093 = buffer.readUnsignedShort();
+      this.field1094 = buffer.readUnsignedShort();
+      this.field1095 = buffer.readUnsignedShort();
+      this.field1096 = buffer.readUnsignedShort();
+      this.field1097 = buffer.readUnsignedShort();
+      this.field1098 = buffer.readUnsignedShort();
+      this.field1099 = buffer.readUnsignedShort();
+      this.method426();
    }
 
    @ObfuscatedName("g")
    @ObfuscatedSignature(
-      signature = "(I)V",
-      garbageValue = "2026323437"
+      signature = "(B)V",
+      garbageValue = "-126"
    )
-   void __g_84() {
+   void method426() {
    }
 
-   @ObfuscatedName("m")
+   @ObfuscatedName("d")
    @ObfuscatedSignature(
-      signature = "(II)Lim;",
-      garbageValue = "-205156540"
+      signature = "(Lho;II)V",
+      garbageValue = "1115233428"
    )
-   @Export("getKitDefinition")
-   public static KitDefinition getKitDefinition(int var0) {
-      KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0);
-      if(var1 != null) {
-         return var1;
+   static final void method345(Widget var0, int var1) {
+      if (var0.field966 == null) {
+         throw new RuntimeException();
       } else {
-         byte[] var2 = KitDefinition.KitDefinition_indexCache.takeRecord(3, var0);
-         var1 = new KitDefinition();
-         if(var2 != null) {
-            var1.read(new Buffer(var2));
+         if (var0.field984 == null) {
+            var0.field984 = new int[var0.field966.length];
          }
 
-         KitDefinition.KitDefinition_cached.put(var1, (long)var0);
-         return var1;
+         var0.field984[var1] = Integer.MAX_VALUE;
       }
    }
 
-   @ObfuscatedName("fc")
+   @ObfuscatedName("am")
    @ObfuscatedSignature(
-      signature = "(I)V",
-      garbageValue = "2142100332"
+      signature = "(IB)V",
+      garbageValue = "23"
    )
-   static void method808() {
-      Client.mouseLastLastPressedTimeMillis = 1L;
-      Projectile.mouseRecorder.index = 0;
-      class230.__hy_az = true;
-      Client.__client_cw = true;
-      Client.__client_pp = -1L;
-      class68.method1694();
-      Client.packetWriter.__m_165();
-      Client.packetWriter.packetBuffer.index = 0;
-      Client.packetWriter.serverPacket0 = null;
-      Client.packetWriter.__k = null;
-      Client.packetWriter.__n = null;
-      Client.packetWriter.__i = null;
-      Client.packetWriter.serverPacket0Length = 0;
-      Client.packetWriter.__x = 0;
-      Client.rebootTimer = 0;
-      Client.__client_fd = 0;
-      Client.hintArrowType = 0;
-      Client.menuOptionsCount = 0;
-      Client.isMenuOpen = false;
-      MouseHandler.MouseHandler_idleCycles = 0;
-      GroundItem.method2094();
-      Client.isItemSelected = 0;
-      Client.isSpellSelected = false;
-      Client.soundEffectCount = 0;
-      Client.minimapOrientation = 0;
-      Client.oculusOrbState = 0;
-      ClientParameter.field3645 = null;
-      Client.minimapState = 0;
-      Client.__client_ph = -1;
-      Client.destinationX = 0;
-      Client.destinationY = 0;
-      Client.playerAttackOption = AttackOption.AttackOption_hidden;
-      Client.npcAttackOption = AttackOption.AttackOption_hidden;
-      Client.npcCount = 0;
-      Players.Players_count = 0;
+   @Export("runWidgetOnLoadListener")
+   static void runWidgetOnLoadListener(int var0) {
+      if (var0 != -1 && GroundItemPile.loadInterface(var0)) {
+         Widget[] var1 = Widget.interfaceComponents[var0];
 
-      int var0;
-      for(var0 = 0; var0 < 2048; ++var0) {
-         Players.__cq_o[var0] = null;
-         Players.__cq_w[var0] = 1;
-      }
-
-      for(var0 = 0; var0 < 2048; ++var0) {
-         Client.players[var0] = null;
-      }
-
-      for(var0 = 0; var0 < 32768; ++var0) {
-         Client.npcs[var0] = null;
-      }
-
-      Client.combatTargetPlayerIndex = -1;
-      Client.projectiles.clear();
-      Client.graphicsObjects.clear();
-
-      for(var0 = 0; var0 < 4; ++var0) {
-         for(int var1 = 0; var1 < 104; ++var1) {
-            for(int var2 = 0; var2 < 104; ++var2) {
-               Client.groundItems[var0][var1][var2] = null;
+         for (int var2 = 0; var2 < var1.length; ++var2) {
+            Widget var3 = var1[var2];
+            if (var3.onLoad != null) {
+               ScriptEvent var4 = new ScriptEvent();
+               var4.widget = var3;
+               var4.args0 = var3.onLoad;
+               GrandExchangeEvent.runScript0(var4, 5000000);
             }
          }
       }
 
-      Client.__client_kh = new NodeDeque();
-      WorldMapArea.friendSystem.clear();
+   }
 
-      for(var0 = 0; var0 < VarpDefinition.__ix_f; ++var0) {
-         VarpDefinition var3 = SecureRandomCallable.method1140(var0);
-         if(var3 != null) {
-            Varps.Varps_temp[var0] = 0;
-            Varps.Varps_main[var0] = 0;
-         }
+   @ObfuscatedName("ic")
+   @ObfuscatedSignature(
+      signature = "(Lho;IIZB)V",
+      garbageValue = "-35"
+   )
+   @Export("alignWidgetSize")
+   static void alignWidgetSize(Widget component, int parentWidth, int parentHeight, boolean var3) {
+      int var4 = component.width;
+      int var5 = component.height;
+      if (component.widthAlignment == 0) {
+         component.width = component.rawWidth;
+      } else if (component.widthAlignment == 1) {
+         component.width = parentWidth - component.rawWidth;
+      } else if (component.widthAlignment == 2) {
+         component.width = component.rawWidth * parentWidth >> 14;
       }
 
-      class196.varcs.clearTransient();
-      Client.followerIndex = -1;
-      if(Client.rootWidgetGroup != -1) {
-         AbstractByteArrayCopier.unloadWidgetGroup(Client.rootWidgetGroup);
+      if (component.heightAlignment == 0) {
+         component.height = component.rawHeight;
+      } else if (component.heightAlignment == 1) {
+         component.height = parentHeight - component.rawHeight;
+      } else if (component.heightAlignment == 2) {
+         component.height = parentHeight * component.rawHeight >> 14;
       }
 
-      for(WidgetGroupParent var4 = (WidgetGroupParent)Client.widgetGroupParents.first(); var4 != null; var4 = (WidgetGroupParent)Client.widgetGroupParents.next()) {
-         MenuAction.closeWidgetGroup(var4, true);
+      if (component.widthAlignment == 4) {
+         component.width = component.height * component.field958 / component.field959;
       }
 
-      Client.rootWidgetGroup = -1;
-      Client.widgetGroupParents = new NodeHashTable(8);
-      Client.__client_mo = null;
-      Client.menuOptionsCount = 0;
-      Client.isMenuOpen = false;
-      Client.__client_ru.__m_385((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1);
-
-      for(var0 = 0; var0 < 8; ++var0) {
-         Client.playerMenuActions[var0] = null;
-         Client.playerOptionsPriorities[var0] = false;
+      if (component.heightAlignment == 4) {
+         component.height = component.width * component.field959 / component.field958;
       }
 
-      SpriteMask.method4389();
-      Client.isLoading = true;
-
-      for(var0 = 0; var0 < 100; ++var0) {
-         Client.__client_od[var0] = true;
+      if (component.contentType == 1337) {
+         Client.viewportWidget = component;
       }
 
-      AbstractByteArrayCopier.method4024();
-      PacketWriter.clanChat = null;
-
-      for(var0 = 0; var0 < 8; ++var0) {
-         Client.grandExchangeOffers[var0] = new GrandExchangeOffer();
+      if (var3 && component.onResize != null && (var4 != component.width || var5 != component.height)) {
+         ScriptEvent var6 = new ScriptEvent();
+         var6.widget = component;
+         var6.args0 = component.onResize;
+         Client.scriptEvents.addFirst(var6);
       }
 
-      FloorDecoration.grandExchangeEvents = null;
    }
 }
diff --git a/runescape-client/src/main/java/WorldMapSection2.java b/runescape-client/src/main/java/WorldMapSection2.java
index ce26f97738..cc68c4570b 100644
--- a/runescape-client/src/main/java/WorldMapSection2.java
+++ b/runescape-client/src/main/java/WorldMapSection2.java
@@ -4,44 +4,79 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("ah")
+@ObfuscatedName("as")
 @Implements("WorldMapSection2")
 public class WorldMapSection2 implements WorldMapSection {
-   @ObfuscatedName("l")
-   static int[] __ah_l;
-   @ObfuscatedName("j")
-   @Export("cacheDirectoryLocations")
-   public static String[] cacheDirectoryLocations;
+   @ObfuscatedName("c")
+   @Export("userHomeDirectory")
+   public static String userHomeDirectory;
+   @ObfuscatedName("du")
+   @ObfuscatedSignature(
+      signature = "Lit;"
+   )
+   @Export("archive15")
+   static Archive archive15;
+   @ObfuscatedName("ey")
+   @ObfuscatedGetter(
+      intValue = -1516124929
+   )
+   static int field1071;
+   @ObfuscatedName("ha")
+   @ObfuscatedGetter(
+      intValue = 1052834531
+   )
+   @Export("cameraX")
+   static int cameraX;
    @ObfuscatedName("m")
    @ObfuscatedGetter(
-      intValue = -1561552223
+      intValue = -1971304641
    )
-   int __m;
+   int field1072;
    @ObfuscatedName("f")
    @ObfuscatedGetter(
-      intValue = -245382089
+      intValue = 1483447179
    )
-   int __f;
+   int field1073;
    @ObfuscatedName("q")
    @ObfuscatedGetter(
-      intValue = -1024859679
+      intValue = -1875803617
    )
-   int __q;
+   int field1074;
    @ObfuscatedName("w")
    @ObfuscatedGetter(
-      intValue = 40495485
+      intValue = 284566685
    )
-   int __w;
+   int field1075;
    @ObfuscatedName("o")
    @ObfuscatedGetter(
-      intValue = 982234927
+      intValue = -1513010233
    )
-   int __o;
+   int field1076;
    @ObfuscatedName("u")
    @ObfuscatedGetter(
-      intValue = -1272330125
+      intValue = -1383826035
    )
-   int __u;
+   int field1077;
+   @ObfuscatedName("g")
+   @ObfuscatedGetter(
+      intValue = 1526007343
+   )
+   int field1078;
+   @ObfuscatedName("l")
+   @ObfuscatedGetter(
+      intValue = -890169045
+   )
+   int field1079;
+   @ObfuscatedName("e")
+   @ObfuscatedGetter(
+      intValue = -1797724181
+   )
+   int field1080;
+   @ObfuscatedName("x")
+   @ObfuscatedGetter(
+      intValue = 325777555
+   )
+   int field1081;
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
@@ -49,21 +84,21 @@ public class WorldMapSection2 implements WorldMapSection {
       garbageValue = "1384899025"
    )
    @Export("expandBounds")
-   public void expandBounds(WorldMapArea var1) {
-      if(var1.minX0 > this.__o) {
-         var1.minX0 = this.__o;
+   public void expandBounds(WorldMapArea area) {
+      if (area.minX0 > this.field1076) {
+         area.minX0 = this.field1076;
       }
 
-      if(var1.maxX0 < this.__o) {
-         var1.maxX0 = this.__o;
+      if (area.maxX0 < this.field1076) {
+         area.maxX0 = this.field1076;
       }
 
-      if(var1.minY0 > this.__u) {
-         var1.minY0 = this.__u;
+      if (area.minY0 > this.field1077) {
+         area.minY0 = this.field1077;
       }
 
-      if(var1.maxY0 < this.__u) {
-         var1.maxY0 = this.__u;
+      if (area.maxY0 < this.field1077) {
+         area.maxY0 = this.field1077;
       }
 
    }
@@ -74,8 +109,8 @@ public class WorldMapSection2 implements WorldMapSection {
       garbageValue = "93"
    )
    @Export("containsCoord")
-   public boolean containsCoord(int var1, int var2, int var3) {
-      return var1 >= this.__m && var1 < this.__m + this.__f?var2 >> 6 == this.__q && var3 >> 6 == this.__w:false;
+   public boolean containsCoord(int plane, int x, int y) {
+      return plane >= this.field1072 && plane < this.field1072 + this.field1073 ? x >= (this.field1074 << 6) + (this.field1078 << 3) && x <= (this.field1074 << 6) + (this.field1078 << 3) + 7 && y >= (this.field1075 << 6) + (this.field1079 << 3) && y <= (this.field1075 << 6) + (this.field1079 << 3) + 7 : false;
    }
 
    @ObfuscatedName("q")
@@ -84,8 +119,8 @@ public class WorldMapSection2 implements WorldMapSection {
       garbageValue = "4"
    )
    @Export("containsPosition")
-   public boolean containsPosition(int var1, int var2) {
-      return var1 >> 6 == this.__o && var2 >> 6 == this.__u;
+   public boolean containsPosition(int x, int y) {
+      return x >= (this.field1076 << 6) + (this.field1080 << 3) && x <= (this.field1076 << 6) + (this.field1080 << 3) + 7 && y >= (this.field1077 << 6) + (this.field1081 << 3) && y <= (this.field1077 << 6) + (this.field1081 << 3) + 7;
    }
 
    @ObfuscatedName("w")
@@ -94,11 +129,11 @@ public class WorldMapSection2 implements WorldMapSection {
       garbageValue = "1545934424"
    )
    @Export("position")
-   public int[] position(int var1, int var2, int var3) {
-      if(!this.containsCoord(var1, var2, var3)) {
+   public int[] position(int plane, int x, int y) {
+      if (!this.containsCoord(plane, x, y)) {
          return null;
       } else {
-         int[] var4 = new int[]{this.__o * 64 - this.__q * 64 + var2, var3 + (this.__u * 64 - this.__w * 64)};
+         int[] var4 = new int[]{this.field1076 * 64 - this.field1074 * 64 + x + (this.field1080 * 8 - this.field1078 * 8), y + (this.field1077 * 64 - this.field1075 * 64) + (this.field1081 * 8 - this.field1079 * 8)};
          return var4;
       }
    }
@@ -109,13 +144,13 @@ public class WorldMapSection2 implements WorldMapSection {
       garbageValue = "-1916486802"
    )
    @Export("coord")
-   public TileLocation coord(int var1, int var2) {
-      if(!this.containsPosition(var1, var2)) {
+   public Coord coord(int x, int y) {
+      if (!this.containsPosition(x, y)) {
          return null;
       } else {
-         int var3 = this.__q * 64 - this.__o * 64 + var1;
-         int var4 = this.__w * 64 - this.__u * 64 + var2;
-         return new TileLocation(this.__m, var3, var4);
+         int var3 = this.field1074 * 64 - this.field1076 * 64 + (this.field1078 * 8 - this.field1080 * 8) + x;
+         int var4 = this.field1075 * 64 - this.field1077 * 64 + y + (this.field1079 * 8 - this.field1081 * 8);
+         return new Coord(this.field1072, var3, var4);
       }
    }
 
@@ -125,191 +160,165 @@ public class WorldMapSection2 implements WorldMapSection {
       garbageValue = "-113"
    )
    @Export("read")
-   public void read(Buffer var1) {
-      this.__m = var1.readUnsignedByte();
-      this.__f = var1.readUnsignedByte();
-      this.__q = var1.__ag_302();
-      this.__w = var1.__ag_302();
-      this.__o = var1.__ag_302();
-      this.__u = var1.__ag_302();
-      this.__g_65();
+   public void read(Buffer buffer) {
+      this.field1072 = buffer.readUnsignedByte();
+      this.field1073 = buffer.readUnsignedByte();
+      this.field1074 = buffer.readUnsignedShort();
+      this.field1078 = buffer.readUnsignedByte();
+      this.field1075 = buffer.readUnsignedShort();
+      this.field1079 = buffer.readUnsignedByte();
+      this.field1076 = buffer.readUnsignedShort();
+      this.field1080 = buffer.readUnsignedByte();
+      this.field1077 = buffer.readUnsignedShort();
+      this.field1081 = buffer.readUnsignedByte();
+      this.method424();
    }
 
    @ObfuscatedName("g")
    @ObfuscatedSignature(
       signature = "(I)V",
-      garbageValue = "-1602858772"
+      garbageValue = "2026323437"
    )
-   void __g_65() {
+   void method424() {
    }
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
-      signature = "(II)I",
-      garbageValue = "409746497"
+      signature = "(II)Lim;",
+      garbageValue = "-205156540"
    )
-   @Export("getVarbit")
-   public static int getVarbit(int var0) {
-      VarbitDefinition var1 = Occluder.method3255(var0);
-      int var2 = var1.varp;
-      int var3 = var1.lowBit;
-      int var4 = var1.highBit;
-      int var5 = Varps.Varps_masks[var4 - var3];
-      return Varps.Varps_main[var2] >> var3 & var5;
+   @Export("getKitDefinition")
+   public static KitDefinition getKitDefinition(int var0) {
+      KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0);
+      if (var1 != null) {
+         return var1;
+      } else {
+         byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0);
+         var1 = new KitDefinition();
+         if (var2 != null) {
+            var1.decode(new Buffer(var2));
+         }
+
+         KitDefinition.KitDefinition_cached.put(var1, (long)var0);
+         return var1;
+      }
    }
 
-   @ObfuscatedName("f")
+   @ObfuscatedName("fc")
    @ObfuscatedSignature(
-      signature = "(IILfe;Lfy;I)Z",
-      garbageValue = "-2025028346"
+      signature = "(I)V",
+      garbageValue = "2142100332"
    )
-   static final boolean method593(int srcX, int srcY, RouteStrategy strategy, CollisionMap collisionMap) {
-      int var4 = srcX;
-      int var5 = srcY;
-      byte var6 = 64;
-      byte var7 = 64;
-      int graphBaseX = srcX - var6;
-      int graphBaseY = srcY - var7;
-      class178.directions[var6][var7] = 99;
-      class178.distances[var6][var7] = 0;
-      byte var10 = 0;
-      int var11 = 0;
-      class178.bufferX[var10] = srcX;
-      byte var10001 = var10;
-      int var18 = var10 + 1;
-      class178.bufferY[var10001] = srcY;
-      int[][] var12 = collisionMap.flags;
+   static void method808() {
+      Client.mouseLastLastPressedTimeMillis = 1L;
+      Projectile.mouseRecorder.index = 0;
+      class230.field1138 = true;
+      Client.field166 = true;
+      Client.field126 = -1L;
+      PendingSpawn.method1694();
+      Client.packetWriter.method239();
+      Client.packetWriter.packetBuffer.index = 0;
+      Client.packetWriter.serverPacket0 = null;
+      Client.packetWriter.field676 = null;
+      Client.packetWriter.field677 = null;
+      Client.packetWriter.field678 = null;
+      Client.packetWriter.serverPacket0Length = 0;
+      Client.packetWriter.field674 = 0;
+      Client.rebootTimer = 0;
+      Client.field175 = 0;
+      Client.hintArrowType = 0;
+      Client.menuOptionsCount = 0;
+      Client.isMenuOpen = false;
+      MouseHandler.MouseHandler_idleCycles = 0;
+      GroundItem.method2094();
+      Client.isItemSelected = 0;
+      Client.isSpellSelected = false;
+      Client.soundEffectCount = 0;
+      Client.camAngleY = 0;
+      Client.oculusOrbState = 0;
+      ClientParameter.field3645 = null;
+      Client.minimapState = 0;
+      Client.field125 = -1;
+      Client.destinationX = 0;
+      Client.destinationY = 0;
+      Client.playerAttackOption = AttackOption.AttackOption_hidden;
+      Client.npcAttackOption = AttackOption.AttackOption_hidden;
+      Client.npcCount = 0;
+      Players.Players_count = 0;
 
-      while(var18 != var11) {
-         var4 = class178.bufferX[var11];
-         var5 = class178.bufferY[var11];
-         var11 = var11 + 1 & 4095;
-         int var16 = var4 - graphBaseX;
-         int var17 = var5 - graphBaseY;
-         int var13 = var4 - collisionMap.xInset;
-         int var14 = var5 - collisionMap.yInset;
-         if(strategy.vmethod3644(2, var4, var5, collisionMap)) {
-            WidgetGroupParent.__bx_o = var4;
-            UrlRequester.__eo_u = var5;
-            return true;
-         }
-
-         int var15 = class178.distances[var16][var17] + 1;
-         if(var16 > 0 && class178.directions[var16 - 1][var17] == 0 && (var12[var13 - 1][var14] & 19136782) == 0 && (var12[var13 - 1][var14 + 1] & 19136824) == 0) {
-            class178.bufferX[var18] = var4 - 1;
-            class178.bufferY[var18] = var5;
-            var18 = var18 + 1 & 4095;
-            class178.directions[var16 - 1][var17] = 2;
-            class178.distances[var16 - 1][var17] = var15;
-         }
-
-         if(var16 < 126 && class178.directions[var16 + 1][var17] == 0 && (var12[var13 + 2][var14] & 19136899) == 0 && (var12[var13 + 2][var14 + 1] & 19136992) == 0) {
-            class178.bufferX[var18] = var4 + 1;
-            class178.bufferY[var18] = var5;
-            var18 = var18 + 1 & 4095;
-            class178.directions[var16 + 1][var17] = 8;
-            class178.distances[var16 + 1][var17] = var15;
-         }
-
-         if(var17 > 0 && class178.directions[var16][var17 - 1] == 0 && (var12[var13][var14 - 1] & 19136782) == 0 && (var12[var13 + 1][var14 - 1] & 19136899) == 0) {
-            class178.bufferX[var18] = var4;
-            class178.bufferY[var18] = var5 - 1;
-            var18 = var18 + 1 & 4095;
-            class178.directions[var16][var17 - 1] = 1;
-            class178.distances[var16][var17 - 1] = var15;
-         }
-
-         if(var17 < 126 && class178.directions[var16][var17 + 1] == 0 && (var12[var13][var14 + 2] & 19136824) == 0 && (var12[var13 + 1][var14 + 2] & 19136992) == 0) {
-            class178.bufferX[var18] = var4;
-            class178.bufferY[var18] = var5 + 1;
-            var18 = var18 + 1 & 4095;
-            class178.directions[var16][var17 + 1] = 4;
-            class178.distances[var16][var17 + 1] = var15;
-         }
-
-         if(var16 > 0 && var17 > 0 && class178.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) {
-            class178.bufferX[var18] = var4 - 1;
-            class178.bufferY[var18] = var5 - 1;
-            var18 = var18 + 1 & 4095;
-            class178.directions[var16 - 1][var17 - 1] = 3;
-            class178.distances[var16 - 1][var17 - 1] = var15;
-         }
-
-         if(var16 < 126 && var17 > 0 && class178.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) {
-            class178.bufferX[var18] = var4 + 1;
-            class178.bufferY[var18] = var5 - 1;
-            var18 = var18 + 1 & 4095;
-            class178.directions[var16 + 1][var17 - 1] = 9;
-            class178.distances[var16 + 1][var17 - 1] = var15;
-         }
-
-         if(var16 > 0 && var17 < 126 && class178.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) {
-            class178.bufferX[var18] = var4 - 1;
-            class178.bufferY[var18] = var5 + 1;
-            var18 = var18 + 1 & 4095;
-            class178.directions[var16 - 1][var17 + 1] = 6;
-            class178.distances[var16 - 1][var17 + 1] = var15;
-         }
-
-         if(var16 < 126 && var17 < 126 && class178.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) {
-            class178.bufferX[var18] = var4 + 1;
-            class178.bufferY[var18] = var5 + 1;
-            var18 = var18 + 1 & 4095;
-            class178.directions[var16 + 1][var17 + 1] = 12;
-            class178.distances[var16 + 1][var17 + 1] = var15;
-         }
+      int var0;
+      for (var0 = 0; var0 < 2048; ++var0) {
+         Players.field733[var0] = null;
+         Players.field732[var0] = 1;
       }
 
-      WidgetGroupParent.__bx_o = var4;
-      UrlRequester.__eo_u = var5;
-      return false;
-   }
+      for (var0 = 0; var0 < 2048; ++var0) {
+         Client.players[var0] = null;
+      }
 
-   @ObfuscatedName("hc")
-   @ObfuscatedSignature(
-      signature = "(ILjava/lang/String;I)V",
-      garbageValue = "-1850233906"
-   )
-   static void method583(int var0, String var1) {
-      int var2 = Players.Players_count;
-      int[] var3 = Players.Players_indices;
-      boolean var4 = false;
-      Username var5 = new Username(var1, KeyHandler.loginType);
+      for (var0 = 0; var0 < 32768; ++var0) {
+         Client.npcs[var0] = null;
+      }
 
-      for(int var6 = 0; var6 < var2; ++var6) {
-         Player var7 = Client.players[var3[var6]];
-         if(var7 != null && var7 != Canvas.localPlayer && var7.username != null && var7.username.equals(var5)) {
-            PacketBufferNode var8;
-            if(var0 == 1) {
-               var8 = Interpreter.method1915(ClientPacket.__gs_ao, Client.packetWriter.isaacCipher);
-               var8.packetBuffer.writeShort(var3[var6]);
-               var8.packetBuffer.__ai_315(0);
-               Client.packetWriter.__q_167(var8);
-            } else if(var0 == 4) {
-               var8 = Interpreter.method1915(ClientPacket.__gs_aq, Client.packetWriter.isaacCipher);
-               var8.packetBuffer.__bx_323(var3[var6]);
-               var8.packetBuffer.__ai_315(0);
-               Client.packetWriter.__q_167(var8);
-            } else if(var0 == 6) {
-               var8 = Interpreter.method1915(ClientPacket.__gs_cf, Client.packetWriter.isaacCipher);
-               var8.packetBuffer.__bo_322(var3[var6]);
-               var8.packetBuffer.__ba_316(0);
-               Client.packetWriter.__q_167(var8);
-            } else if(var0 == 7) {
-               var8 = Interpreter.method1915(ClientPacket.__gs_be, Client.packetWriter.isaacCipher);
-               var8.packetBuffer.__ba_316(0);
-               var8.packetBuffer.writeShortLE(var3[var6]);
-               Client.packetWriter.__q_167(var8);
+      Client.combatTargetPlayerIndex = -1;
+      Client.projectiles.clear();
+      Client.graphicsObjects.clear();
+
+      for (var0 = 0; var0 < 4; ++var0) {
+         for (int var1 = 0; var1 < 104; ++var1) {
+            for (int var2 = 0; var2 < 104; ++var2) {
+               Client.groundItems[var0][var1][var2] = null;
             }
-
-            var4 = true;
-            break;
          }
       }
 
-      if(!var4) {
-         WorldMapIcon1.method219(4, "", "Unable to find " + var1);
+      Client.pendingSpawns = new NodeDeque();
+      WorldMapArea.friendSystem.clear();
+
+      for (var0 = 0; var0 < VarpDefinition.field944; ++var0) {
+         VarpDefinition var3 = SecureRandomCallable.method1140(var0);
+         if (var3 != null) {
+            Varps.Varps_temp[var0] = 0;
+            Varps.Varps_main[var0] = 0;
+         }
       }
 
+      class196.varcs.clearTransient();
+      Client.followerIndex = -1;
+      if (Client.rootInterface != -1) {
+         AbstractByteArrayCopier.unloadInterface(Client.rootInterface);
+      }
+
+      for (InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.first(); var4 != null; var4 = (InterfaceParent)Client.interfaceParents.next()) {
+         MenuAction.closeInterface(var4, true);
+      }
+
+      Client.rootInterface = -1;
+      Client.interfaceParents = new NodeHashTable(8);
+      Client.field127 = null;
+      Client.menuOptionsCount = 0;
+      Client.isMenuOpen = false;
+      Client.playerAppearance.update((int[])null, new int[]{0, 0, 0, 0, 0}, false, -1);
+
+      for (var0 = 0; var0 < 8; ++var0) {
+         Client.playerMenuActions[var0] = null;
+         Client.playerOptionsPriorities[var0] = false;
+      }
+
+      SpriteMask.method4389();
+      Client.isLoading = true;
+
+      for (var0 = 0; var0 < 100; ++var0) {
+         Client.field100[var0] = true;
+      }
+
+      AbstractByteArrayCopier.method4024();
+      PacketWriter.clanChat = null;
+
+      for (var0 = 0; var0 < 8; ++var0) {
+         Client.grandExchangeOffers[var0] = new GrandExchangeOffer();
+      }
+
+      FloorDecoration.grandExchangeEvents = null;
    }
 }
diff --git a/runescape-client/src/main/java/WorldMapSection3.java b/runescape-client/src/main/java/WorldMapSection3.java
index 77c5862ad7..1f50642d0f 100644
--- a/runescape-client/src/main/java/WorldMapSection3.java
+++ b/runescape-client/src/main/java/WorldMapSection3.java
@@ -4,73 +4,86 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("p")
+@ObfuscatedName("y")
 @Implements("WorldMapSection3")
 public class WorldMapSection3 implements WorldMapSection {
-   @ObfuscatedName("h")
-   @Export("osNameLowerCase")
-   public static String osNameLowerCase;
-   @ObfuscatedName("dr")
-   @ObfuscatedSignature(
-      signature = "Lit;"
-   )
-   @Export("indexCache8")
-   static IndexCache indexCache8;
-   @ObfuscatedName("go")
+   @ObfuscatedName("sn")
    @ObfuscatedGetter(
-      intValue = -948290091
+      intValue = -1946112139
    )
-   static int __p_go;
+   static int field1055;
+   @ObfuscatedName("p")
+   static int[] field1056;
    @ObfuscatedName("m")
    @ObfuscatedGetter(
-      intValue = 1389733201
+      intValue = -2011838881
    )
-   int __m;
+   int field1057;
    @ObfuscatedName("f")
    @ObfuscatedGetter(
-      intValue = -1622972483
+      intValue = 1299225715
    )
-   int __f;
+   int field1058;
    @ObfuscatedName("q")
    @ObfuscatedGetter(
-      intValue = 702057599
+      intValue = 82600709
    )
-   int __q;
+   int field1059;
    @ObfuscatedName("w")
    @ObfuscatedGetter(
-      intValue = -1068088609
+      intValue = -477370575
    )
-   int __w;
+   int field1060;
    @ObfuscatedName("o")
    @ObfuscatedGetter(
-      intValue = 1257151629
+      intValue = -671345527
    )
-   int __o;
+   int field1061;
    @ObfuscatedName("u")
    @ObfuscatedGetter(
-      intValue = -1351623663
+      intValue = 529427495
    )
-   int __u;
+   int field1062;
    @ObfuscatedName("g")
    @ObfuscatedGetter(
-      intValue = 1016557381
+      intValue = -150870205
    )
-   int __g;
+   int field1063;
    @ObfuscatedName("l")
    @ObfuscatedGetter(
-      intValue = 884736611
+      intValue = 1009718107
    )
-   int __l;
+   int field1064;
    @ObfuscatedName("e")
    @ObfuscatedGetter(
-      intValue = 395786901
+      intValue = -1022177315
    )
-   int __e;
+   int field1065;
    @ObfuscatedName("x")
    @ObfuscatedGetter(
-      intValue = -627081155
+      intValue = -1397517463
    )
-   int __x;
+   int field1066;
+   @ObfuscatedName("d")
+   @ObfuscatedGetter(
+      intValue = -799353317
+   )
+   int field1067;
+   @ObfuscatedName("k")
+   @ObfuscatedGetter(
+      intValue = -1388959491
+   )
+   int field1068;
+   @ObfuscatedName("n")
+   @ObfuscatedGetter(
+      intValue = -1657956317
+   )
+   int field1069;
+   @ObfuscatedName("i")
+   @ObfuscatedGetter(
+      intValue = 1345061881
+   )
+   int field1070;
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
@@ -78,21 +91,21 @@ public class WorldMapSection3 implements WorldMapSection {
       garbageValue = "1384899025"
    )
    @Export("expandBounds")
-   public void expandBounds(WorldMapArea var1) {
-      if(var1.minX0 > this.__g) {
-         var1.minX0 = this.__g;
+   public void expandBounds(WorldMapArea area) {
+      if (area.minX0 > this.field1061) {
+         area.minX0 = this.field1061;
       }
 
-      if(var1.maxX0 < this.__e) {
-         var1.maxX0 = this.__e;
+      if (area.maxX0 < this.field1061) {
+         area.maxX0 = this.field1061;
       }
 
-      if(var1.minY0 > this.__l) {
-         var1.minY0 = this.__l;
+      if (area.minY0 > this.field1062) {
+         area.minY0 = this.field1062;
       }
 
-      if(var1.maxY0 < this.__x) {
-         var1.maxY0 = this.__x;
+      if (area.maxY0 < this.field1062) {
+         area.maxY0 = this.field1062;
       }
 
    }
@@ -103,8 +116,8 @@ public class WorldMapSection3 implements WorldMapSection {
       garbageValue = "93"
    )
    @Export("containsCoord")
-   public boolean containsCoord(int var1, int var2, int var3) {
-      return var1 >= this.__m && var1 < this.__m + this.__f?var2 >> 6 >= this.__q && var2 >> 6 <= this.__o && var3 >> 6 >= this.__w && var3 >> 6 <= this.__u:false;
+   public boolean containsCoord(int plane, int x, int y) {
+      return plane >= this.field1057 && plane < this.field1057 + this.field1058 ? x >= (this.field1059 << 6) + (this.field1063 << 3) && x <= (this.field1059 << 6) + (this.field1065 << 3) + 7 && y >= (this.field1060 << 6) + (this.field1064 << 3) && y <= (this.field1060 << 6) + (this.field1066 << 3) + 7 : false;
    }
 
    @ObfuscatedName("q")
@@ -113,8 +126,8 @@ public class WorldMapSection3 implements WorldMapSection {
       garbageValue = "4"
    )
    @Export("containsPosition")
-   public boolean containsPosition(int var1, int var2) {
-      return var1 >> 6 >= this.__g && var1 >> 6 <= this.__e && var2 >> 6 >= this.__l && var2 >> 6 <= this.__x;
+   public boolean containsPosition(int x, int y) {
+      return x >= (this.field1061 << 6) + (this.field1067 << 3) && x <= (this.field1061 << 6) + (this.field1069 << 3) + 7 && y >= (this.field1062 << 6) + (this.field1068 << 3) && y <= (this.field1062 << 6) + (this.field1070 << 3) + 7;
    }
 
    @ObfuscatedName("w")
@@ -123,11 +136,11 @@ public class WorldMapSection3 implements WorldMapSection {
       garbageValue = "1545934424"
    )
    @Export("position")
-   public int[] position(int var1, int var2, int var3) {
-      if(!this.containsCoord(var1, var2, var3)) {
+   public int[] position(int plane, int x, int y) {
+      if (!this.containsCoord(plane, x, y)) {
          return null;
       } else {
-         int[] var4 = new int[]{this.__g * 64 - this.__q * 64 + var2, var3 + (this.__l * 64 - this.__w * 64)};
+         int[] var4 = new int[]{this.field1061 * 64 - this.field1059 * 64 + x + (this.field1067 * 8 - this.field1063 * 8), y + (this.field1062 * 64 - this.field1060 * 64) + (this.field1068 * 8 - this.field1064 * 8)};
          return var4;
       }
    }
@@ -138,13 +151,13 @@ public class WorldMapSection3 implements WorldMapSection {
       garbageValue = "-1916486802"
    )
    @Export("coord")
-   public TileLocation coord(int var1, int var2) {
-      if(!this.containsPosition(var1, var2)) {
+   public Coord coord(int x, int y) {
+      if (!this.containsPosition(x, y)) {
          return null;
       } else {
-         int var3 = this.__q * 64 - this.__g * 64 + var1;
-         int var4 = this.__w * 64 - this.__l * 64 + var2;
-         return new TileLocation(this.__m, var3, var4);
+         int var3 = this.field1059 * 64 - this.field1061 * 64 + (this.field1063 * 8 - this.field1067 * 8) + x;
+         int var4 = this.field1060 * 64 - this.field1062 * 64 + y + (this.field1064 * 8 - this.field1068 * 8);
+         return new Coord(this.field1057, var3, var4);
       }
    }
 
@@ -154,112 +167,116 @@ public class WorldMapSection3 implements WorldMapSection {
       garbageValue = "-113"
    )
    @Export("read")
-   public void read(Buffer var1) {
-      this.__m = var1.readUnsignedByte();
-      this.__f = var1.readUnsignedByte();
-      this.__q = var1.__ag_302();
-      this.__w = var1.__ag_302();
-      this.__o = var1.__ag_302();
-      this.__u = var1.__ag_302();
-      this.__g = var1.__ag_302();
-      this.__l = var1.__ag_302();
-      this.__e = var1.__ag_302();
-      this.__x = var1.__ag_302();
-      this.__g_38();
+   public void read(Buffer buffer) {
+      this.field1057 = buffer.readUnsignedByte();
+      this.field1058 = buffer.readUnsignedByte();
+      this.field1059 = buffer.readUnsignedShort();
+      this.field1063 = buffer.readUnsignedByte();
+      this.field1065 = buffer.readUnsignedByte();
+      this.field1060 = buffer.readUnsignedShort();
+      this.field1064 = buffer.readUnsignedByte();
+      this.field1066 = buffer.readUnsignedByte();
+      this.field1061 = buffer.readUnsignedShort();
+      this.field1067 = buffer.readUnsignedByte();
+      this.field1069 = buffer.readUnsignedByte();
+      this.field1062 = buffer.readUnsignedShort();
+      this.field1068 = buffer.readUnsignedByte();
+      this.field1070 = buffer.readUnsignedByte();
+      this.method423();
    }
 
    @ObfuscatedName("g")
    @ObfuscatedSignature(
-      signature = "(B)V",
-      garbageValue = "-126"
+      signature = "(I)V",
+      garbageValue = "1967186894"
    )
-   void __g_38() {
+   void method423() {
    }
 
-   @ObfuscatedName("d")
+   @ObfuscatedName("w")
    @ObfuscatedSignature(
-      signature = "(Lho;II)V",
-      garbageValue = "1115233428"
+      signature = "(I)V",
+      garbageValue = "-2102591569"
    )
-   static final void method345(Widget var0, int var1) {
-      if(var0.__cf == null) {
-         throw new RuntimeException();
-      } else {
-         if(var0.__fh == null) {
-            var0.__fh = new int[var0.__cf.length];
-         }
+   @Export("savePreferences")
+   static void savePreferences() {
+      AccessFile var0 = null;
 
-         var0.__fh[var1] = Integer.MAX_VALUE;
+      try {
+         var0 = LoginPacket.getPreferencesFile("", WorldMapRectangle.studioGame.name, true);
+         Buffer var1 = ReflectionCheck.clientPreferences.toBuffer();
+         var0.write(var1.array, 0, var1.index);
+      } catch (Exception var3) {
       }
+
+      try {
+         if (var0 != null) {
+            var0.closeSync(true);
+         }
+      } catch (Exception var2) {
+      }
+
    }
 
-   @ObfuscatedName("am")
+   @ObfuscatedName("hz")
    @ObfuscatedSignature(
-      signature = "(IB)V",
-      garbageValue = "23"
+      signature = "(II)V",
+      garbageValue = "1886145284"
    )
-   @Export("runWidgetOnLoadListener")
-   static void runWidgetOnLoadListener(int var0) {
-      if(var0 != -1) {
-         if(GroundItemPile.loadWidgetGroup(var0)) {
-            Widget[] var1 = Widget.widgets[var0];
+   static final void method245(int var0) {
+      if (var0 >= 0) {
+         int var1 = Client.menuArguments1[var0];
+         int var2 = Client.menuArguments2[var0];
+         int var3 = Client.menuOpcodes[var0];
+         int var4 = Client.menuArguments0[var0];
+         String var5 = Client.menuActions[var0];
+         String var6 = Client.menuTargetNames[var0];
+         Actor.menuAction(var1, var2, var3, var4, var5, var6, MouseHandler.MouseHandler_lastPressedX, MouseHandler.MouseHandler_lastPressedY);
+      }
 
-            for(int var2 = 0; var2 < var1.length; ++var2) {
-               Widget var3 = var1[var2];
-               if(var3.onLoad != null) {
-                  ScriptEvent var4 = new ScriptEvent();
-                  var4.widget = var3;
-                  var4.args0 = var3.onLoad;
-                  GrandExchangeEvent.runScript0(var4, 5000000);
-               }
+   }
+
+   @ObfuscatedName("io")
+   @ObfuscatedSignature(
+      signature = "(Lho;IIIIIII)V",
+      garbageValue = "-1723792771"
+   )
+   static final void method246(Widget var0, int var1, int var2, int var3, int var4, int var5, int var6) {
+      if (Client.field188) {
+         Client.field189 = 32;
+      } else {
+         Client.field189 = 0;
+      }
+
+      Client.field188 = false;
+      int var7;
+      if (MouseHandler.MouseHandler_currentButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_currentButton == 4) {
+         if (var5 >= var1 && var5 < var1 + 16 && var6 >= var2 && var6 < var2 + 16) {
+            var0.scrollY -= 4;
+            WorldMapRectangle.method295(var0);
+         } else if (var5 >= var1 && var5 < var1 + 16 && var6 >= var3 + var2 - 16 && var6 < var3 + var2) {
+            var0.scrollY += 4;
+            WorldMapRectangle.method295(var0);
+         } else if (var5 >= var1 - Client.field189 && var5 < Client.field189 + var1 + 16 && var6 >= var2 + 16 && var6 < var3 + var2 - 16) {
+            var7 = var3 * (var3 - 32) / var4;
+            if (var7 < 8) {
+               var7 = 8;
             }
 
+            int var8 = var6 - var2 - 16 - var7 / 2;
+            int var9 = var3 - 32 - var7;
+            var0.scrollY = var8 * (var4 - var3) / var9;
+            WorldMapRectangle.method295(var0);
+            Client.field188 = true;
          }
       }
-   }
 
-   @ObfuscatedName("ic")
-   @ObfuscatedSignature(
-      signature = "(Lho;IIZB)V",
-      garbageValue = "-35"
-   )
-   @Export("alignWidgetSize")
-   static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) {
-      int var4 = var0.width;
-      int var5 = var0.height;
-      if(var0.widthAlignment == 0) {
-         var0.width = var0.rawWidth;
-      } else if(var0.widthAlignment == 1) {
-         var0.width = var1 - var0.rawWidth;
-      } else if(var0.widthAlignment == 2) {
-         var0.width = var0.rawWidth * var1 >> 14;
-      }
-
-      if(var0.heightAlignment == 0) {
-         var0.height = var0.rawHeight;
-      } else if(var0.heightAlignment == 1) {
-         var0.height = var2 - var0.rawHeight;
-      } else if(var0.heightAlignment == 2) {
-         var0.height = var2 * var0.rawHeight >> 14;
-      }
-
-      if(var0.widthAlignment == 4) {
-         var0.width = var0.height * var0.__aw / var0.__al;
-      }
-
-      if(var0.heightAlignment == 4) {
-         var0.height = var0.width * var0.__al / var0.__aw;
-      }
-
-      if(var0.contentType == 1337) {
-         Client.viewportWidget = var0;
-      }
-
-      if(var3 && var0.__ee != null && (var4 != var0.width || var5 != var0.height)) {
-         ScriptEvent var6 = new ScriptEvent();
-         var6.widget = var0;
-         var6.args0 = var0.__ee;
-         Client.scriptEvents.addFirst(var6);
+      if (Client.mouseWheelRotation != 0) {
+         var7 = var0.width;
+         if (var5 >= var1 - var7 && var6 >= var2 && var5 < var1 + 16 && var6 <= var3 + var2) {
+            var0.scrollY += Client.mouseWheelRotation * 45;
+            WorldMapRectangle.method295(var0);
+         }
       }
 
    }
diff --git a/runescape-client/src/main/java/WorldMapSectionType.java b/runescape-client/src/main/java/WorldMapSectionType.java
index 25bac17559..5b094b7385 100644
--- a/runescape-client/src/main/java/WorldMapSectionType.java
+++ b/runescape-client/src/main/java/WorldMapSectionType.java
@@ -4,6 +4,7 @@ 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("h")
 @Implements("WorldMapSectionType")
@@ -12,22 +13,27 @@ public enum WorldMapSectionType implements Enumerated {
    @ObfuscatedSignature(
       signature = "Lh;"
    )
-  __h_m(1, (byte)0),
+   @Export("WORLDMAPSECTIONTYPE0")
+   WORLDMAPSECTIONTYPE0(1, (byte)0),
    @ObfuscatedName("f")
    @ObfuscatedSignature(
       signature = "Lh;"
    )
-   __h_f(0, (byte)1),
+   @Export("WORLDMAPSECTIONTYPE1")
+   WORLDMAPSECTIONTYPE1(0, (byte)1),
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Lh;"
    )
-   __h_q(3, (byte)2),
+   @Export("WORLDMAPSECTIONTYPE2")
+   WORLDMAPSECTIONTYPE2(3, (byte)2),
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "Lh;"
    )
-   __h_w(2, (byte)3);
+   @Export("WORLDMAPSECTIONTYPE3")
+   WORLDMAPSECTIONTYPE3(2, (byte)3);
+
    @ObfuscatedName("e")
    @ObfuscatedSignature(
       signature = "Llq;"
@@ -35,7 +41,7 @@ public enum WorldMapSectionType implements Enumerated {
    @Export("logoSprite")
    static IndexedSprite logoSprite;
    @ObfuscatedName("n")
-   static int[] __h_n;
+   static int[] field1104;
    @ObfuscatedName("gc")
    @ObfuscatedSignature(
       signature = "[Llq;"
@@ -52,7 +58,7 @@ public enum WorldMapSectionType implements Enumerated {
    @Export("id")
    final byte id;
 
-   WorldMapSectionType(int var3, byte var4) {
+   private WorldMapSectionType(int var3, byte var4) {
       this.type = var3;
       this.id = var4;
    }
@@ -69,15 +75,15 @@ public enum WorldMapSectionType implements Enumerated {
 
    @ObfuscatedName("m")
    public static String method252(long var0) {
-      class211.__hg_q.setTime(new Date(var0));
-      int var2 = class211.__hg_q.get(7);
-      int var3 = class211.__hg_q.get(5);
-      int var4 = class211.__hg_q.get(2);
-      int var5 = class211.__hg_q.get(1);
-      int var6 = class211.__hg_q.get(11);
-      int var7 = class211.__hg_q.get(12);
-      int var8 = class211.__hg_q.get(13);
-      return class211.__hg_f[var2 - 1] + ", " + var3 / 10 + var3 % 10 + "-" + class211.__hg_m[0][var4] + "-" + var5 + " " + var6 / 10 + var6 % 10 + ":" + var7 / 10 + var7 % 10 + ":" + var8 / 10 + var8 % 10 + " GMT";
+      Calendar.Calendar_calendar.setTime(new Date(var0));
+      int var2 = Calendar.Calendar_calendar.get(7);
+      int var3 = Calendar.Calendar_calendar.get(5);
+      int var4 = Calendar.Calendar_calendar.get(2);
+      int var5 = Calendar.Calendar_calendar.get(1);
+      int var6 = Calendar.Calendar_calendar.get(11);
+      int var7 = Calendar.Calendar_calendar.get(12);
+      int var8 = Calendar.Calendar_calendar.get(13);
+      return Calendar.DAYS_OF_THE_WEEK[var2 - 1] + ", " + var3 / 10 + var3 % 10 + "-" + Calendar.MONTH_NAMES_ENGLISH_GERMAN[0][var4] + "-" + var5 + " " + var6 / 10 + var6 % 10 + ":" + var7 / 10 + var7 % 10 + ":" + var8 / 10 + var8 % 10 + " GMT";
    }
 
    @ObfuscatedName("w")
@@ -85,9 +91,10 @@ public enum WorldMapSectionType implements Enumerated {
       signature = "(IZIZI)V",
       garbageValue = "2102950996"
    )
-   static void method248(int var0, boolean var1, int var2, boolean var3) {
-      if(ItemContainer.worlds != null) {
-         class3.method42(0, ItemContainer.worlds.length - 1, var0, var1, var2, var3);
+   @Export("sortWorldList")
+   static void sortWorldList(int primaryMode, boolean primaryReversed, int secondaryMode, boolean secondaryReversed) {
+      if (ItemContainer.worlds != null) {
+         class3.doWorldSorting(0, ItemContainer.worlds.length - 1, primaryMode, primaryReversed, secondaryMode, secondaryReversed);
       }
 
    }
@@ -98,23 +105,23 @@ public enum WorldMapSectionType implements Enumerated {
       garbageValue = "-1520594673"
    )
    static int method253(int var0, Script var1, boolean var2) {
-      Widget var3 = var2?WorldMapIcon1.__t_i:class12.__n_n;
-      if(var0 == 1500) {
+      Widget var3 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111;
+      if (var0 == ScriptOpcodes.CC_GETX) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.x;
          return 1;
-      } else if(var0 == 1501) {
+      } else if (var0 == ScriptOpcodes.CC_GETY) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.y;
          return 1;
-      } else if(var0 == 1502) {
+      } else if (var0 == ScriptOpcodes.CC_GETWIDTH) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.width;
          return 1;
-      } else if(var0 == 1503) {
+      } else if (var0 == ScriptOpcodes.CC_GETHEIGHT) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.height;
          return 1;
-      } else if(var0 == 1504) {
-         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.isHidden?1:0;
+      } else if (var0 == ScriptOpcodes.CC_GETHIDE) {
+         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0;
          return 1;
-      } else if(var0 == 1505) {
+      } else if (var0 == ScriptOpcodes.CC_GETLAYER) {
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.parentId;
          return 1;
       } else {
@@ -128,8 +135,8 @@ public enum WorldMapSectionType implements Enumerated {
       garbageValue = "1187868759"
    )
    static void method254() {
-      if(class60.worldMap0 != null) {
-         class60.worldMap0.__a_525(SoundSystem.plane, (Canvas.localPlayer.x >> 7) + class50.baseX, (Canvas.localPlayer.y >> 7) + GraphicsObject.baseY, false);
+      if (class60.worldMap0 != null) {
+         class60.worldMap0.method366(SoundSystem.plane, (Canvas.localPlayer.x >> 7) + class50.baseX, (Canvas.localPlayer.y >> 7) + GraphicsObject.baseY, false);
          class60.worldMap0.loadCache();
       }
 
diff --git a/runescape-client/src/main/java/class1.java b/runescape-client/src/main/java/class1.java
index 7e78c1a9c0..0ad3f3a622 100644
--- a/runescape-client/src/main/java/class1.java
+++ b/runescape-client/src/main/java/class1.java
@@ -1,6 +1,7 @@
 import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
 @ObfuscatedName("f")
 final class class1 implements class0 {
@@ -8,7 +9,7 @@ final class class1 implements class0 {
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   public static AbstractIndexCache __f_m;
+   public static AbstractArchive field1105;
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
@@ -25,7 +26,7 @@ final class class1 implements class0 {
       garbageValue = "704451908"
    )
    public Object vmethod46(Buffer var1) {
-      return Integer.valueOf(var1.readInt());
+      return var1.readInt();
    }
 
    @ObfuscatedName("g")
@@ -34,7 +35,7 @@ final class class1 implements class0 {
       garbageValue = "-254123307"
    )
    void method6(Integer var1, Buffer var2) {
-      var2.writeInt(var1.intValue());
+      var2.writeInt(var1);
    }
 
    @ObfuscatedName("q")
@@ -43,7 +44,7 @@ final class class1 implements class0 {
       garbageValue = "553036714"
    )
    public static boolean method19(int var0) {
-      return var0 == class231.field2819.field2820;
+      return var0 == WorldMapDecorationType.field2819.id;
    }
 
    @ObfuscatedName("q")
@@ -53,15 +54,15 @@ final class class1 implements class0 {
    )
    static int method18(int var0, int var1) {
       ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
-      if(var2 == null) {
+      if (var2 == null) {
          return 0;
-      } else if(var1 == -1) {
+      } else if (var1 == -1) {
          return 0;
       } else {
          int var3 = 0;
 
-         for(int var4 = 0; var4 < var2.quantities.length; ++var4) {
-            if(var2.ids[var4] == var1) {
+         for (int var4 = 0; var4 < var2.quantities.length; ++var4) {
+            if (var2.ids[var4] == var1) {
                var3 += var2.quantities[var4];
             }
          }
@@ -78,52 +79,52 @@ final class class1 implements class0 {
    static int method8(int var0, Script var1, boolean var2) {
       int var3 = -1;
       Widget var4;
-      if(var0 >= 2000) {
+      if (var0 >= 2000) {
          var0 -= 1000;
          var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
          var4 = Huffman.getWidget(var3);
       } else {
-         var4 = var2?WorldMapIcon1.__t_i:class12.__n_n;
+         var4 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111;
       }
 
-      if(var0 == 1000) {
+      if (var0 == ScriptOpcodes.CC_SETPOSITION) {
          RouteStrategy.Interpreter_intStackSize -= 4;
          var4.rawX = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
          var4.rawY = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
          var4.xAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
          var4.yAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3];
-         class22.method295(var4);
+         WorldMapRectangle.method295(var4);
          TextureProvider.client.alignWidget(var4);
-         if(var3 != -1 && var4.type == 0) {
-            class39.revalidateWidgetScroll(Widget.widgets[var3 >> 16], var4, false);
+         if (var3 != -1 && var4.type == 0) {
+            class39.revalidateWidgetScroll(Widget.interfaceComponents[var3 >> 16], var4, false);
          }
 
          return 1;
-      } else if(var0 == 1001) {
+      } else if (var0 == ScriptOpcodes.CC_SETSIZE) {
          RouteStrategy.Interpreter_intStackSize -= 4;
          var4.rawWidth = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
          var4.rawHeight = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
          var4.widthAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
          var4.heightAlignment = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3];
-         class22.method295(var4);
+         WorldMapRectangle.method295(var4);
          TextureProvider.client.alignWidget(var4);
-         if(var3 != -1 && var4.type == 0) {
-            class39.revalidateWidgetScroll(Widget.widgets[var3 >> 16], var4, false);
+         if (var3 != -1 && var4.type == 0) {
+            class39.revalidateWidgetScroll(Widget.interfaceComponents[var3 >> 16], var4, false);
          }
 
          return 1;
-      } else if(var0 == 1003) {
+      } else if (var0 == ScriptOpcodes.CC_SETHIDE) {
          boolean var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-         if(var5 != var4.isHidden) {
+         if (var5 != var4.isHidden) {
             var4.isHidden = var5;
-            class22.method295(var4);
+            WorldMapRectangle.method295(var4);
          }
 
          return 1;
-      } else if(var0 == 1005) {
+      } else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) {
          var4.noClickThrough = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
          return 1;
-      } else if(var0 == 1006) {
+      } else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) {
          var4.noScrollThrough = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
          return 1;
       } else {
@@ -138,107 +139,107 @@ final class class1 implements class0 {
    )
    static int method16(int var0, Script var1, boolean var2) {
       int var3;
-      if(var0 == 4200) {
+      if (var0 == ScriptOpcodes.OC_NAME) {
          var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
          Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Skills.getItemDefinition(var3).name;
          return 1;
       } else {
          int var4;
          ItemDefinition var5;
-         if(var0 == 4201) {
+         if (var0 == ScriptOpcodes.OC_OP) {
             RouteStrategy.Interpreter_intStackSize -= 2;
             var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
             var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
             var5 = Skills.getItemDefinition(var3);
-            if(var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) {
+            if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) {
                Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1];
             } else {
                Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
             }
 
             return 1;
-         } else if(var0 == 4202) {
+         } else if (var0 == ScriptOpcodes.OC_IOP) {
             RouteStrategy.Interpreter_intStackSize -= 2;
             var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
             var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
             var5 = Skills.getItemDefinition(var3);
-            if(var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) {
+            if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) {
                Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1];
             } else {
                Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
             }
 
             return 1;
-         } else if(var0 == 4203) {
+         } else if (var0 == ScriptOpcodes.OC_COST) {
             var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var3).price;
             return 1;
-         } else if(var0 == 4204) {
+         } else if (var0 == ScriptOpcodes.OC_STACKABLE) {
             var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-            Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var3).isStackable == 1?1:0;
+            Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var3).isStackable == 1 ? 1 : 0;
             return 1;
          } else {
             ItemDefinition var6;
-            if(var0 == 4205) {
+            if (var0 == ScriptOpcodes.OC_CERT) {
                var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
                var6 = Skills.getItemDefinition(var3);
-               if(var6.noteTemplate == -1 && var6.note >= 0) {
+               if (var6.noteTemplate == -1 && var6.note >= 0) {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.note;
                } else {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3;
                }
 
                return 1;
-            } else if(var0 == 4206) {
+            } else if (var0 == ScriptOpcodes.OC_UNCERT) {
                var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
                var6 = Skills.getItemDefinition(var3);
-               if(var6.noteTemplate >= 0 && var6.note >= 0) {
+               if (var6.noteTemplate >= 0 && var6.note >= 0) {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.note;
                } else {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3;
                }
 
                return 1;
-            } else if(var0 == 4207) {
+            } else if (var0 == ScriptOpcodes.OC_MEMBERS) {
                var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var3).isMembersOnly?1:0;
+               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var3).isMembersOnly ? 1 : 0;
                return 1;
-            } else if(var0 == 4208) {
+            } else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) {
                var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
                var6 = Skills.getItemDefinition(var3);
-               if(var6.placeholderTemplate == -1 && var6.placeholder >= 0) {
+               if (var6.placeholderTemplate == -1 && var6.placeholder >= 0) {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.placeholder;
                } else {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3;
                }
 
                return 1;
-            } else if(var0 == 4209) {
+            } else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) {
                var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
                var6 = Skills.getItemDefinition(var3);
-               if(var6.placeholderTemplate >= 0 && var6.placeholder >= 0) {
+               if (var6.placeholderTemplate >= 0 && var6.placeholder >= 0) {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.placeholder;
                } else {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3;
                }
 
                return 1;
-            } else if(var0 == 4210) {
+            } else if (var0 == ScriptOpcodes.OC_FIND) {
                String var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
                var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
                class50.method900(var7, var4 == 1);
-               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapSection0.__y_sn;
+               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = WorldMapSection3.field1055;
                return 1;
-            } else if(var0 != 4211) {
-               if(var0 == 4212) {
-                  class231.__hb_sg = 0;
+            } else if (var0 != ScriptOpcodes.OC_FINDNEXT) {
+               if (var0 == ScriptOpcodes.OC_FINDRESET) {
+                  WorldMapDecorationType.field1139 = 0;
                   return 1;
                } else {
                   return 2;
                }
             } else {
-               if(AttackOption.__cj_sp != null && class231.__hb_sg < WorldMapSection0.__y_sn) {
-                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = AttackOption.__cj_sp[++class231.__hb_sg - 1] & '\uffff';
+               if (AttackOption.field30 != null && WorldMapDecorationType.field1139 < WorldMapSection3.field1055) {
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = AttackOption.field30[++WorldMapDecorationType.field1139 - 1] & '\uffff';
                } else {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                }
@@ -255,8 +256,8 @@ final class class1 implements class0 {
       garbageValue = "-370289311"
    )
    static boolean method15(int var0) {
-      for(int var1 = 0; var1 < Client.__client_pm; ++var1) {
-         if(Client.__client_pn[var1] == var0) {
+      for (int var1 = 0; var1 < Client.field137; ++var1) {
+         if (Client.field145[var1] == var0) {
             return true;
          }
       }
@@ -270,8 +271,8 @@ final class class1 implements class0 {
       garbageValue = "1809366429"
    )
    @Export("getWidgetClickMask")
-   static int getWidgetClickMask(Widget var0) {
-      IntegerNode var1 = (IntegerNode)Client.widgetClickMasks.get(((long)var0.id << 32) + (long)var0.childIndex);
-      return var1 != null?var1.integer:var0.clickMask;
+   static int getWidgetClickMask(Widget component) {
+      IntegerNode var1 = (IntegerNode)Client.widgetClickMasks.get(((long)component.id << 32) + (long)component.childIndex);
+      return var1 != null ? var1.integer : component.clickMask;
    }
 }
diff --git a/runescape-client/src/main/java/class102.java b/runescape-client/src/main/java/class102.java
index 5099b3aa94..0e13792535 100644
--- a/runescape-client/src/main/java/class102.java
+++ b/runescape-client/src/main/java/class102.java
@@ -1,18 +1,17 @@
-import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
 
 @ObfuscatedName("ca")
 public class class102 {
    @ObfuscatedName("m")
-   static final int[] __ca_m;
+   static final int[] field1106;
    @ObfuscatedName("f")
-   static final float[] __ca_f;
+   static final float[] field1107;
    @ObfuscatedName("x")
-   static int[] __ca_x;
+   static int[] field1108;
    @ObfuscatedName("d")
-   static int[] __ca_d;
+   static int[] field1109;
    @ObfuscatedName("k")
-   static boolean[] __ca_k;
+   static boolean[] field1110;
    @ObfuscatedName("q")
    int[] field1353;
    @ObfuscatedName("w")
@@ -28,14 +27,9 @@ public class class102 {
    @ObfuscatedName("e")
    int[][] field1359;
 
-   static {
-      __ca_m = new int[]{256, 128, 86, 64};
-      __ca_f = 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};
-   }
-
    class102() {
       int var1 = MusicSample.method2352(16);
-      if(var1 != 1) {
+      if (var1 != 1) {
          throw new RuntimeException();
       } else {
          int var2 = MusicSample.method2352(5);
@@ -44,10 +38,10 @@ public class class102 {
 
          int var4;
          int var5;
-         for(var4 = 0; var4 < var2; ++var4) {
+         for (var4 = 0; var4 < var2; ++var4) {
             var5 = MusicSample.method2352(4);
             this.field1357[var4] = var5;
-            if(var5 >= var3) {
+            if (var5 >= var3) {
                var3 = var5 + 1;
             }
          }
@@ -57,20 +51,20 @@ public class class102 {
          this.field1358 = new int[var3];
          this.field1359 = new int[var3][];
 
-         int var7;
-         for(var4 = 0; var4 < var3; ++var4) {
+         int var6;
+         for (var4 = 0; var4 < var3; ++var4) {
             this.field1352[var4] = MusicSample.method2352(3) + 1;
             var5 = this.field1356[var4] = MusicSample.method2352(2);
-            if(var5 != 0) {
+            if (var5 != 0) {
                this.field1358[var4] = MusicSample.method2352(8);
             }
 
             var5 = 1 << var5;
-            int[] var6 = new int[var5];
-            this.field1359[var4] = var6;
+            int[] var7 = new int[var5];
+            this.field1359[var4] = var7;
 
-            for(var7 = 0; var7 < var5; ++var7) {
-               var6[var7] = MusicSample.method2352(8) - 1;
+            for (var6 = 0; var6 < var5; ++var6) {
+               var7[var6] = MusicSample.method2352(8) - 1;
             }
          }
 
@@ -79,7 +73,7 @@ public class class102 {
          var5 = 2;
 
          int var9;
-         for(var9 = 0; var9 < var2; ++var9) {
+         for (var9 = 0; var9 < var2; ++var9) {
             var5 += this.field1352[this.field1357[var9]];
          }
 
@@ -88,18 +82,18 @@ public class class102 {
          this.field1353[1] = 1 << var4;
          var5 = 2;
 
-         for(var9 = 0; var9 < var2; ++var9) {
-            var7 = this.field1357[var9];
+         for (var9 = 0; var9 < var2; ++var9) {
+            var6 = this.field1357[var9];
 
-            for(int var8 = 0; var8 < this.field1352[var7]; ++var8) {
+            for (int var8 = 0; var8 < this.field1352[var6]; ++var8) {
                this.field1353[var5++] = MusicSample.method2352(var4);
             }
          }
 
-         if(__ca_x == null || __ca_x.length < var5) {
-            __ca_x = new int[var5];
-            __ca_d = new int[var5];
-            __ca_k = new boolean[var5];
+         if (field1108 == null || field1108.length < var5) {
+            field1108 = new int[var5];
+            field1109 = new int[var5];
+            field1110 = new boolean[var5];
          }
 
       }
@@ -109,103 +103,104 @@ public class class102 {
    int method2379(int var1, int var2, int var3, int var4, int var5) {
       int var6 = var4 - var2;
       int var7 = var3 - var1;
-      int var8 = var6 < 0?-var6:var6;
+      int var8 = var6 < 0 ? -var6 : var6;
       int var9 = (var5 - var1) * var8;
       int var10 = var9 / var7;
-      return var6 < 0?var2 - var10:var10 + var2;
+      return var6 < 0 ? var2 - var10 : var10 + var2;
    }
 
    @ObfuscatedName("w")
    void method2365(int var1, int var2, int var3, int var4, float[] var5, int var6) {
       int var7 = var4 - var2;
       int var8 = var3 - var1;
-      int var9 = var7 < 0?-var7:var7;
+      int var9 = var7 < 0 ? -var7 : var7;
       int var10 = var7 / var8;
       int var11 = var2;
       int var12 = 0;
-      int var13 = var7 < 0?var10 - 1:var10 + 1;
-      var9 -= (var10 < 0?-var10:var10) * var8;
-      var5[var1] *= __ca_f[var2];
-      if(var3 > var6) {
+      int var13 = var7 < 0 ? var10 - 1 : var10 + 1;
+      var9 -= (var10 < 0 ? -var10 : var10) * var8;
+      var5[var1] *= field1107[var2];
+      if (var3 > var6) {
          var3 = var6;
       }
 
-      for(int var14 = var1 + 1; var14 < var3; ++var14) {
+      for (int var14 = var1 + 1; var14 < var3; ++var14) {
          var12 += var9;
-         if(var12 >= var8) {
+         if (var12 >= var8) {
             var12 -= var8;
             var11 += var13;
          } else {
             var11 += var10;
          }
 
-         var5[var14] *= __ca_f[var11];
+         var5[var14] *= field1107[var11];
       }
 
    }
 
    @ObfuscatedName("o")
    void method2366(int var1, int var2) {
-      if(var1 < var2) {
+      if (var1 < var2) {
          int var3 = var1;
-         int var4 = __ca_x[var1];
-         int var5 = __ca_d[var1];
-         boolean var6 = __ca_k[var1];
+         int var4 = field1108[var1];
+         int var5 = field1109[var1];
+         boolean var6 = field1110[var1];
 
-         for(int var7 = var1 + 1; var7 <= var2; ++var7) {
-            int var8 = __ca_x[var7];
-            if(var8 < var4) {
-               __ca_x[var3] = var8;
-               __ca_d[var3] = __ca_d[var7];
-               __ca_k[var3] = __ca_k[var7];
+         for (int var7 = var1 + 1; var7 <= var2; ++var7) {
+            int var8 = field1108[var7];
+            if (var8 < var4) {
+               field1108[var3] = var8;
+               field1109[var3] = field1109[var7];
+               field1110[var3] = field1110[var7];
                ++var3;
-               __ca_x[var7] = __ca_x[var3];
-               __ca_d[var7] = __ca_d[var3];
-               __ca_k[var7] = __ca_k[var3];
+               field1108[var7] = field1108[var3];
+               field1109[var7] = field1109[var3];
+               field1110[var7] = field1110[var3];
             }
          }
 
-         __ca_x[var3] = var4;
-         __ca_d[var3] = var5;
-         __ca_k[var3] = var6;
+         field1108[var3] = var4;
+         field1109[var3] = var5;
+         field1110[var3] = var6;
          this.method2366(var1, var3 - 1);
          this.method2366(var3 + 1, var2);
       }
+
    }
 
    @ObfuscatedName("u")
    boolean method2367() {
       boolean var1 = MusicSample.method2338() != 0;
-      if(!var1) {
+      if (!var1) {
          return false;
       } else {
          int var2 = this.field1353.length;
 
          int var3;
-         for(var3 = 0; var3 < var2; ++var3) {
-            __ca_x[var3] = this.field1353[var3];
+         for (var3 = 0; var3 < var2; ++var3) {
+            field1108[var3] = this.field1353[var3];
          }
 
-         var3 = __ca_m[this.field1360 - 1];
+         var3 = field1106[this.field1360 - 1];
          int var4 = WorldMapCacheName.method634(var3 - 1);
-         __ca_d[0] = MusicSample.method2352(var4);
-         __ca_d[1] = MusicSample.method2352(var4);
+         field1109[0] = MusicSample.method2352(var4);
+         field1109[1] = MusicSample.method2352(var4);
          int var5 = 2;
 
-         for(int var6 = 0; var6 < this.field1357.length; ++var6) {
+         for (int var6 = 0; var6 < this.field1357.length; ++var6) {
             int var7 = this.field1357[var6];
             int var8 = this.field1352[var7];
             int var9 = this.field1356[var7];
             int var10 = (1 << var9) - 1;
             int var11 = 0;
-            if(var9 > 0) {
+            if (var9 > 0) {
                var11 = MusicSample.field1323[this.field1358[var7]].method2306();
             }
 
-            for(int var12 = 0; var12 < var8; ++var12) {
+            for (int var12 = 0; var12 < var8; ++var12) {
                int var13 = this.field1359[var7][var11 & var10];
                var11 >>>= var9;
-               __ca_d[var5++] = var13 >= 0?MusicSample.field1323[var13].method2306():0;
+               field1109[var5++] = var13 >= 0 ? MusicSample.field1323[var13].method2306() : 0;
             }
          }
 
@@ -216,9 +211,9 @@ public class class102 {
    @ObfuscatedName("g")
    void method2375(float[] var1, int var2) {
       int var3 = this.field1353.length;
-      int var4 = __ca_m[this.field1360 - 1];
-      boolean[] var5 = __ca_k;
-      __ca_k[1] = true;
+      int var4 = field1106[this.field1360 - 1];
+      boolean[] var5 = field1110;
+      field1110[1] = true;
       var5[0] = true;
 
       int var6;
@@ -226,39 +221,39 @@ public class class102 {
       int var8;
       int var9;
       int var10;
-      for(var6 = 2; var6 < var3; ++var6) {
-         var7 = method2369(__ca_x, var6);
-         var8 = method2363(__ca_x, var6);
-         var9 = this.method2379(__ca_x[var7], __ca_d[var7], __ca_x[var8], __ca_d[var8], __ca_x[var6]);
-         var10 = __ca_d[var6];
+      for (var6 = 2; var6 < var3; ++var6) {
+         var7 = method2369(field1108, var6);
+         var8 = method2363(field1108, var6);
+         var9 = this.method2379(field1108[var7], field1109[var7], field1108[var8], field1109[var8], field1108[var6]);
+         var10 = field1109[var6];
          int var11 = var4 - var9;
-         int var13 = (var11 < var9?var11:var9) << 1;
-         if(var10 != 0) {
-            boolean[] var14 = __ca_k;
-            __ca_k[var8] = true;
-            var14[var7] = true;
-            __ca_k[var6] = true;
-            if(var10 >= var13) {
-               __ca_d[var6] = var11 > var9?var9 + (var10 - var9):var11 + (var9 - var10) - 1;
+         int var12 = (var11 < var9 ? var11 : var9) << 1;
+         if (var10 != 0) {
+            boolean[] var13 = field1110;
+            field1110[var8] = true;
+            var13[var7] = true;
+            field1110[var6] = true;
+            if (var10 >= var12) {
+               field1109[var6] = var11 > var9 ? var9 + (var10 - var9) : var11 + (var9 - var10) - 1;
             } else {
-               __ca_d[var6] = (var10 & 1) != 0?var9 - (var10 + 1) / 2:var10 / 2 + var9;
+               field1109[var6] = (var10 & 1) != 0 ? var9 - (var10 + 1) / 2 : var10 / 2 + var9;
             }
          } else {
-            __ca_k[var6] = false;
-            __ca_d[var6] = var9;
+            field1110[var6] = false;
+            field1109[var6] = var9;
          }
       }
 
       this.method2366(0, var3 - 1);
       var6 = 0;
-      var7 = __ca_d[0] * this.field1360;
+      var7 = field1109[0] * this.field1360;
 
-      for(var8 = 1; var8 < var3; ++var8) {
-         if(__ca_k[var8]) {
-            var9 = __ca_x[var8];
-            var10 = __ca_d[var8] * this.field1360;
+      for (var8 = 1; var8 < var3; ++var8) {
+         if (field1110[var8]) {
+            var9 = field1108[var8];
+            var10 = field1109[var8] * this.field1360;
             this.method2365(var6, var7, var9, var10, var1, var2);
-            if(var9 >= var2) {
+            if (var9 >= var2) {
                return;
             }
 
@@ -267,10 +262,10 @@ public class class102 {
          }
       }
 
-      float var16 = __ca_f[var7];
+      float var14 = field1107[var7];
 
-      for(var9 = var6; var9 < var2; ++var9) {
-         var1[var9] *= var16;
+      for (var9 = var6; var9 < var2; ++var9) {
+         var1[var9] *= var14;
       }
 
    }
@@ -281,9 +276,9 @@ public class class102 {
       int var3 = -1;
       int var4 = Integer.MIN_VALUE;
 
-      for(int var5 = 0; var5 < var1; ++var5) {
+      for (int var5 = 0; var5 < var1; ++var5) {
          int var6 = var0[var5];
-         if(var6 < var2 && var6 > var4) {
+         if (var6 < var2 && var6 > var4) {
             var3 = var5;
             var4 = var6;
          }
@@ -298,9 +293,9 @@ public class class102 {
       int var3 = -1;
       int var4 = Integer.MAX_VALUE;
 
-      for(int var5 = 0; var5 < var1; ++var5) {
+      for (int var5 = 0; var5 < var1; ++var5) {
          int var6 = var0[var5];
-         if(var6 > var2 && var6 < var4) {
+         if (var6 > var2 && var6 < var4) {
             var3 = var5;
             var4 = var6;
          }
@@ -308,4 +303,9 @@ public class class102 {
 
       return var3;
    }
+
+   static {
+      field1106 = new int[]{256, 128, 86, 64};
+      field1107 = 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};
+   }
 }
diff --git a/runescape-client/src/main/java/class109.java b/runescape-client/src/main/java/class109.java
index aa4195a34b..8e91a37d29 100644
--- a/runescape-client/src/main/java/class109.java
+++ b/runescape-client/src/main/java/class109.java
@@ -27,11 +27,11 @@ public class class109 {
       int[] var1 = new int[this.field1405];
 
       int var2;
-      for(var2 = 0; var2 < this.field1405; ++var2) {
+      for (var2 = 0; var2 < this.field1405; ++var2) {
          int var3 = 0;
          int var4 = MusicSample.method2352(3);
          boolean var5 = MusicSample.method2338() != 0;
-         if(var5) {
+         if (var5) {
             var3 = MusicSample.method2352(5);
          }
 
@@ -40,8 +40,8 @@ public class class109 {
 
       this.field1410 = new int[this.field1405 * 8];
 
-      for(var2 = 0; var2 < this.field1405 * 8; ++var2) {
-         this.field1410[var2] = (var1[var2 >> 3] & 1 << (var2 & 7)) != 0?MusicSample.method2352(8):-1;
+      for (var2 = 0; var2 < this.field1405 * 8; ++var2) {
+         this.field1410[var2] = (var1[var2 >> 3] & 1 << (var2 & 7)) != 0 ? MusicSample.method2352(8) : -1;
       }
 
    }
@@ -49,27 +49,27 @@ public class class109 {
    @ObfuscatedName("m")
    void method2473(float[] var1, int var2, boolean var3) {
       int var4;
-      for(var4 = 0; var4 < var2; ++var4) {
+      for (var4 = 0; var4 < var2; ++var4) {
          var1[var4] = 0.0F;
       }
 
-      if(!var3) {
+      if (!var3) {
          var4 = MusicSample.field1323[this.field1411].field1306;
          int var5 = this.field1407 - this.field1406;
          int var6 = var5 / this.field1408;
          int[] var7 = new int[var6];
 
-         for(int var8 = 0; var8 < 8; ++var8) {
+         for (int var8 = 0; var8 < 8; ++var8) {
             int var9 = 0;
 
-            while(var9 < var6) {
+            while (var9 < var6) {
                int var10;
                int var11;
-               if(var8 == 0) {
+               if (var8 == 0) {
                   var10 = MusicSample.field1323[this.field1411].method2306();
 
-                  for(var11 = var4 - 1; var11 >= 0; --var11) {
-                     if(var9 + var11 < var6) {
+                  for (var11 = var4 - 1; var11 >= 0; --var11) {
+                     if (var9 + var11 < var6) {
                         var7[var9 + var11] = var10 % this.field1405;
                      }
 
@@ -77,31 +77,31 @@ public class class109 {
                   }
                }
 
-               for(var10 = 0; var10 < var4; ++var10) {
+               for (var10 = 0; var10 < var4; ++var10) {
                   var11 = var7[var9];
                   int var12 = this.field1410[var8 + var11 * 8];
-                  if(var12 >= 0) {
+                  if (var12 >= 0) {
                      int var13 = var9 * this.field1408 + this.field1406;
                      class98 var14 = MusicSample.field1323[var12];
                      int var15;
-                     if(this.field1409 == 0) {
+                     if (this.field1409 == 0) {
                         var15 = this.field1408 / var14.field1306;
 
-                        for(int var16 = 0; var16 < var15; ++var16) {
-                           float[] var17 = var14.method2307();
+                        for (int var19 = 0; var19 < var15; ++var19) {
+                           float[] var20 = var14.method2307();
 
-                           for(int var18 = 0; var18 < var14.field1306; ++var18) {
-                              var1[var13 + var16 + var18 * var15] += var17[var18];
+                           for (int var18 = 0; var18 < var14.field1306; ++var18) {
+                              var1[var13 + var19 + var18 * var15] += var20[var18];
                            }
                         }
                      } else {
                         var15 = 0;
 
-                        while(var15 < this.field1408) {
-                           float[] var19 = var14.method2307();
+                        while (var15 < this.field1408) {
+                           float[] var16 = var14.method2307();
 
-                           for(int var20 = 0; var20 < var14.field1306; ++var20) {
-                              var1[var13 + var15] += var19[var20];
+                           for (int var17 = 0; var17 < var14.field1306; ++var17) {
+                              var1[var13 + var15] += var16[var17];
                               ++var15;
                            }
                         }
@@ -109,13 +109,13 @@ public class class109 {
                   }
 
                   ++var9;
-                  if(var9 >= var6) {
+                  if (var9 >= var6) {
                      break;
                   }
                }
             }
          }
-
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/class114.java b/runescape-client/src/main/java/class114.java
index 8339fc27b5..b45e205c8a 100644
--- a/runescape-client/src/main/java/class114.java
+++ b/runescape-client/src/main/java/class114.java
@@ -13,20 +13,20 @@ public class class114 {
 
    class114() {
       MusicSample.method2352(16);
-      this.field1453 = MusicSample.method2338() != 0?MusicSample.method2352(4) + 1:1;
-      if(MusicSample.method2338() != 0) {
+      this.field1453 = MusicSample.method2338() != 0 ? MusicSample.method2352(4) + 1 : 1;
+      if (MusicSample.method2338() != 0) {
          MusicSample.method2352(8);
       }
 
       MusicSample.method2352(2);
-      if(this.field1453 > 1) {
+      if (this.field1453 > 1) {
          this.field1454 = MusicSample.method2352(4);
       }
 
       this.field1452 = new int[this.field1453];
       this.field1455 = new int[this.field1453];
 
-      for(int var1 = 0; var1 < this.field1453; ++var1) {
+      for (int var1 = 0; var1 < this.field1453; ++var1) {
          MusicSample.method2352(8);
          this.field1452[var1] = MusicSample.method2352(8);
          this.field1455[var1] = MusicSample.method2352(8);
diff --git a/runescape-client/src/main/java/class13.java b/runescape-client/src/main/java/class13.java
index bd6ef3a987..fb13bb6aae 100644
--- a/runescape-client/src/main/java/class13.java
+++ b/runescape-client/src/main/java/class13.java
@@ -6,7 +6,7 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("i")
 public class class13 {
    @ObfuscatedName("x")
-   static int[] __i_x;
+   static int[] field1112;
    @ObfuscatedName("k")
    @ObfuscatedSignature(
       signature = "Lhe;"
@@ -26,7 +26,7 @@ public class class13 {
       garbageValue = "862375604"
    )
    static Sprite method164(int var0, int var1, int var2) {
-      return (Sprite)WorldMapRegion.__av_o.get(MouseHandler.method1083(var0, var1, var2));
+      return (Sprite)WorldMapRegion.field1051.get(MouseHandler.method1083(var0, var1, var2));
    }
 
    @ObfuscatedName("fm")
@@ -36,11 +36,11 @@ public class class13 {
    )
    @Export("playPcmPlayers")
    static final void playPcmPlayers() {
-      if(AbstractIndexCache.pcmPlayer1 != null) {
-         AbstractIndexCache.pcmPlayer1.run();
+      if (AbstractArchive.pcmPlayer1 != null) {
+         AbstractArchive.pcmPlayer1.run();
       }
 
-      if(WorldMapCacheName.pcmPlayer0 != null) {
+      if (WorldMapCacheName.pcmPlayer0 != null) {
          WorldMapCacheName.pcmPlayer0.run();
       }
 
@@ -51,29 +51,29 @@ public class class13 {
       signature = "(Lbi;I)V",
       garbageValue = "-527387190"
    )
-   static final void method165(class68 var0) {
+   static final void method165(PendingSpawn var0) {
       long var1 = 0L;
       int var3 = -1;
       int var4 = 0;
       int var5 = 0;
-      if(var0.field906 == 0) {
-         var1 = class65.scene.__ar_244(var0.field911, var0.field913, var0.field901);
+      if (var0.type == 0) {
+         var1 = class65.scene.getBoundaryObjectTag(var0.plane, var0.x, var0.y);
       }
 
-      if(var0.field906 == 1) {
-         var1 = class65.scene.__ac_245(var0.field911, var0.field913, var0.field901);
+      if (var0.type == 1) {
+         var1 = class65.scene.getWallDecorationTag(var0.plane, var0.x, var0.y);
       }
 
-      if(var0.field906 == 2) {
-         var1 = class65.scene.__ay_246(var0.field911, var0.field913, var0.field901);
+      if (var0.type == 2) {
+         var1 = class65.scene.getGameObjectTag(var0.plane, var0.x, var0.y);
       }
 
-      if(var0.field906 == 3) {
-         var1 = class65.scene.getFloorDecorationTag(var0.field911, var0.field913, var0.field901);
+      if (var0.type == 3) {
+         var1 = class65.scene.getFloorDecorationTag(var0.plane, var0.x, var0.y);
       }
 
-      if(var1 != 0L) {
-         int var6 = class65.scene.getObjectFlags(var0.field911, var0.field913, var0.field901, var1);
+      if (var1 != 0L) {
+         int var6 = class65.scene.getObjectFlags(var0.plane, var0.x, var0.y, var1);
          var3 = HitSplatDefinition.method4972(var1);
          var4 = var6 & 31;
          var5 = var6 >> 6 & 3;
diff --git a/runescape-client/src/main/java/class14.java b/runescape-client/src/main/java/class14.java
index 04ce881b16..05982b75e4 100644
--- a/runescape-client/src/main/java/class14.java
+++ b/runescape-client/src/main/java/class14.java
@@ -15,10 +15,10 @@ public class class14 {
          AccessFile var2 = new AccessFile(class337.clDat, "rw", 10000L);
          Buffer var3 = new Buffer(500);
          var3.writeByte(3);
-         var3.writeByte(var1 != null?1:0);
-         var3.__j_296(var0.getPath());
-         if(var1 != null) {
-            var3.__j_296("");
+         var3.writeByte(var1 != null ? 1 : 0);
+         var3.writeCESU8(var0.getPath());
+         if (var1 != null) {
+            var3.writeCESU8("");
          }
 
          var2.write(var3.array, 0, var3.index);
@@ -36,12 +36,12 @@ public class class14 {
    )
    public static char method171(byte var0) {
       int var1 = var0 & 255;
-      if(var1 == 0) {
+      if (var1 == 0) {
          throw new IllegalArgumentException("");
       } else {
-         if(var1 >= 128 && var1 < 160) {
+         if (var1 >= 128 && var1 < 160) {
             char var2 = class304.cp1252AsciiExtension[var1 - 128];
-            if(var2 == 0) {
+            if (var2 == 0) {
                var2 = '?';
             }
 
@@ -58,6 +58,6 @@ public class class14 {
       garbageValue = "-1103685678"
    )
    static boolean method169() {
-      return (Client.__client_ke & 8) != 0;
+      return (Client.field210 & 8) != 0;
    }
 }
diff --git a/runescape-client/src/main/java/class15.java b/runescape-client/src/main/java/class15.java
index 0bcb48c166..c58056d2b0 100644
--- a/runescape-client/src/main/java/class15.java
+++ b/runescape-client/src/main/java/class15.java
@@ -2,6 +2,7 @@ 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("z")
 public class class15 extends class21 {
@@ -9,7 +10,7 @@ public class class15 extends class21 {
    @ObfuscatedGetter(
       longValue = 3423502126894795079L
    )
-   static long __z_si;
+   static long field1113;
    @ObfuscatedName("j")
    @ObfuscatedSignature(
       signature = "Lap;"
@@ -36,17 +37,17 @@ public class class15 extends class21 {
    )
    void method173(Buffer var1) {
       int var2 = var1.readUnsignedByte();
-      if(var2 != class31.field259.field255) {
+      if (var2 != class31.field259.field255) {
          throw new IllegalStateException("");
       } else {
          super.field148 = var1.readUnsignedByte();
          super.field156 = var1.readUnsignedByte();
-         super.field149 = var1.__ag_302();
-         super.field146 = var1.__ag_302();
-         super.field159 = var1.__ag_302();
-         super.field147 = var1.__ag_302();
-         super.field150 = var1.__ap_310();
-         super.field152 = var1.__ap_310();
+         super.field149 = var1.readUnsignedShort();
+         super.field146 = var1.readUnsignedShort();
+         super.field159 = var1.readUnsignedShort();
+         super.field147 = var1.readUnsignedShort();
+         super.field150 = var1.method51();
+         super.field152 = var1.method51();
       }
    }
 
@@ -61,16 +62,16 @@ public class class15 extends class21 {
       super.field145 = new short[super.field156][64][64];
       super.field154 = new byte[super.field156][64][64];
       super.field155 = new byte[super.field156][64][64];
-      super.field144 = new class25[super.field156][64][64][];
+      super.decorations = new WorldMapDecoration[super.field156][64][64][];
       int var2 = var1.readUnsignedByte();
-      if(var2 != class30.field246.field248) {
+      if (var2 != class30.field246.field248) {
          throw new IllegalStateException("");
       } else {
          int var3 = var1.readUnsignedByte();
          int var4 = var1.readUnsignedByte();
-         if(var3 == super.field159 && var4 == super.field147) {
-            for(int var5 = 0; var5 < 64; ++var5) {
-               for(int var6 = 0; var6 < 64; ++var6) {
+         if (var3 == super.field159 && var4 == super.field147) {
+            for (int var5 = 0; var5 < 64; ++var5) {
+               for (int var6 = 0; var6 < 64; ++var6) {
                   this.method259(var5, var6, var1);
                }
             }
@@ -82,7 +83,7 @@ public class class15 extends class21 {
    }
 
    public boolean equals(Object var1) {
-      if(!(var1 instanceof class15)) {
+      if (!(var1 instanceof class15)) {
          return false;
       } else {
          class15 var2 = (class15)var1;
@@ -100,13 +101,13 @@ public class class15 extends class21 {
       garbageValue = "3"
    )
    static final int method183(int var0, int var1) {
-      if(var0 == -1) {
+      if (var0 == -1) {
          return 12345678;
       } else {
          var1 = (var0 & 127) * var1 / 128;
-         if(var1 < 2) {
+         if (var1 < 2) {
             var1 = 2;
-         } else if(var1 > 126) {
+         } else if (var1 > 126) {
             var1 = 126;
          }
 
@@ -121,12 +122,12 @@ public class class15 extends class21 {
    )
    static int method182(int var0, Script var1, boolean var2) {
       Widget var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
-      if(var0 == 2800) {
-         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class211.method4107(class1.getWidgetClickMask(var3));
+      if (var0 == ScriptOpcodes.IF_GETTARGETMASK) {
+         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Calendar.method4107(class1.getWidgetClickMask(var3));
          return 1;
-      } else if(var0 != 2801) {
-         if(var0 == 2802) {
-            if(var3.dataText == null) {
+      } else if (var0 != ScriptOpcodes.IF_GETOP) {
+         if (var0 == ScriptOpcodes.IF_GETOPBASE) {
+            if (var3.dataText == null) {
                Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
             } else {
                Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.dataText;
@@ -139,7 +140,7 @@ public class class15 extends class21 {
       } else {
          int var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
          --var4;
-         if(var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) {
+         if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) {
             Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.actions[var4];
          } else {
             Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
@@ -155,10 +156,10 @@ public class class15 extends class21 {
       garbageValue = "-1757982583"
    )
    static final void method184(boolean var0) {
-      if(var0) {
-         Client.field658 = Login.__cu_ba?class159.field1980:class159.field1983;
+      if (var0) {
+         Client.field658 = Login.field470 ? class159.field1980 : class159.field1983;
       } else {
-         Client.field658 = ReflectionCheck.clientPreferences.parameters.containsKey(Integer.valueOf(class279.method5357(Login.Login_username)))?class159.field1982:class159.field1985;
+         Client.field658 = ReflectionCheck.clientPreferences.parameters.containsKey(class279.method5357(Login.Login_username)) ? class159.field1982 : class159.field1985;
       }
 
    }
@@ -168,42 +169,41 @@ public class class15 extends class21 {
       signature = "(Lho;I)V",
       garbageValue = "1585987978"
    )
-   static final void method186(Widget var0) {
-      int var1 = var0.contentType;
-      if(var1 == 324) {
-         if(Client.__client_sd == -1) {
-            Client.__client_sd = var0.spriteId2;
-            Client.__client_sl = var0.spriteId;
+   static final void method186(Widget component) {
+      int var1 = component.contentType;
+      if (var1 == 324) {
+         if (Client.field118 == -1) {
+            Client.field118 = component.spriteId2;
+            Client.field120 = component.spriteId;
          }
 
-         if(Client.__client_ru.isFemale) {
-            var0.spriteId2 = Client.__client_sd;
+         if (Client.playerAppearance.isFemale) {
+            component.spriteId2 = Client.field118;
          } else {
-            var0.spriteId2 = Client.__client_sl;
+            component.spriteId2 = Client.field120;
+         }
+      } else if (var1 == 325) {
+         if (Client.field118 == -1) {
+            Client.field118 = component.spriteId2;
+            Client.field120 = component.spriteId;
          }
 
-      } else if(var1 == 325) {
-         if(Client.__client_sd == -1) {
-            Client.__client_sd = var0.spriteId2;
-            Client.__client_sl = var0.spriteId;
-         }
-
-         if(Client.__client_ru.isFemale) {
-            var0.spriteId2 = Client.__client_sl;
+         if (Client.playerAppearance.isFemale) {
+            component.spriteId2 = Client.field120;
          } else {
-            var0.spriteId2 = Client.__client_sd;
+            component.spriteId2 = Client.field118;
          }
-
-      } else if(var1 == 327) {
-         var0.modelAngleX = 150;
-         var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047;
-         var0.modelType = 5;
-         var0.modelId = 0;
-      } else if(var1 == 328) {
-         var0.modelAngleX = 150;
-         var0.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047;
-         var0.modelType = 5;
-         var0.modelId = 1;
+      } else if (var1 == 327) {
+         component.modelAngleX = 150;
+         component.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047;
+         component.modelType = 5;
+         component.modelId = 0;
+      } else if (var1 == 328) {
+         component.modelAngleX = 150;
+         component.modelAngleY = (int)(Math.sin((double)Client.cycle / 40.0D) * 256.0D) & 2047;
+         component.modelType = 5;
+         component.modelId = 1;
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/class159.java b/runescape-client/src/main/java/class159.java
index f38ef0ffc0..58d72f6461 100644
--- a/runescape-client/src/main/java/class159.java
+++ b/runescape-client/src/main/java/class159.java
@@ -35,11 +35,12 @@ public enum class159 implements Enumerated {
    @ObfuscatedGetter(
       intValue = 458308007
    )
-   final int field1981;
+   @Export("id")
+   final int id;
 
-   class159(int var3, int var4) {
+   private class159(int var3, int var4) {
       this.field1984 = var3;
-      this.field1981 = var4;
+      this.id = var4;
    }
 
    @ObfuscatedName("f")
@@ -49,7 +50,7 @@ public enum class159 implements Enumerated {
    )
    @Export("rsOrdinal")
    public int rsOrdinal() {
-      return this.field1981;
+      return this.id;
    }
 
    @ObfuscatedName("d")
@@ -57,7 +58,8 @@ public enum class159 implements Enumerated {
       signature = "(CI)Z",
       garbageValue = "1176730001"
    )
-   public static boolean method3394(char var0) {
+   @Export("isCharDigit")
+   public static boolean isCharDigit(char var0) {
       return var0 >= '0' && var0 <= '9';
    }
 }
diff --git a/runescape-client/src/main/java/class16.java b/runescape-client/src/main/java/class16.java
index ad03754107..d3099181eb 100644
--- a/runescape-client/src/main/java/class16.java
+++ b/runescape-client/src/main/java/class16.java
@@ -1,6 +1,7 @@
 import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
 @ObfuscatedName("j")
 public class class16 {
@@ -20,8 +21,8 @@ public class class16 {
    @ObfuscatedSignature(
       signature = "Lit;"
    )
-   @Export("indexCache10")
-   static IndexCache indexCache10;
+   @Export("archive10")
+   static Archive archive10;
    @ObfuscatedName("ga")
    @ObfuscatedSignature(
       signature = "[Lln;"
@@ -38,11 +39,11 @@ public class class16 {
       int var3 = var2.length();
       int var4 = var1;
 
-      for(int var5 = 0; var5 < var3; ++var5) {
+      for (int var5 = 0; var5 < var3; ++var5) {
          char var6 = var2.charAt(var5);
-         if(var6 <= 127) {
+         if (var6 <= 127) {
             var0[var4++] = (byte)var6;
-         } else if(var6 <= 2047) {
+         } else if (var6 <= 2047) {
             var0[var4++] = (byte)(192 | var6 >> 6);
             var0[var4++] = (byte)(128 | var6 & '?');
          } else {
@@ -61,13 +62,13 @@ public class class16 {
       garbageValue = "1394688825"
    )
    static int method188(int var0, Script var1, boolean var2) {
-      Widget var3 = var2?WorldMapIcon1.__t_i:class12.__n_n;
-      if(var0 == 1800) {
-         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class211.method4107(class1.getWidgetClickMask(var3));
+      Widget var3 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111;
+      if (var0 == ScriptOpcodes.CC_GETTARGETMASK) {
+         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Calendar.method4107(class1.getWidgetClickMask(var3));
          return 1;
-      } else if(var0 != 1801) {
-         if(var0 == 1802) {
-            if(var3.dataText == null) {
+      } else if (var0 != ScriptOpcodes.CC_GETOP) {
+         if (var0 == ScriptOpcodes.CC_GETOPBASE) {
+            if (var3.dataText == null) {
                Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
             } else {
                Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.dataText;
@@ -80,7 +81,7 @@ public class class16 {
       } else {
          int var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
          --var4;
-         if(var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) {
+         if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) {
             Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.actions[var4];
          } else {
             Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
@@ -97,44 +98,44 @@ public class class16 {
    )
    static final void method189(class190 var0) {
       PacketBuffer var1 = Client.packetWriter.packetBuffer;
+      int var2;
       int var3;
+      int var4;
       int var5;
       int var6;
       int var7;
       int var8;
       int var9;
-      int var10;
-      int var12;
-      byte var13;
-      int var14;
-      if(class190.field2342 == var0) {
-         byte var2 = var1.__bk_320();
-         var3 = var1.__bm_326();
-         byte var4 = var1.__bk_320();
-         var5 = var1.__bu_325();
-         var6 = var1.__ag_302();
-         var7 = var1.__bb_317();
-         var8 = var7 >> 2;
-         var9 = var7 & 3;
-         var10 = Client.__client_gd[var8];
-         byte var11 = var1.__bn_319();
-         var12 = var1.__by_324();
-         var13 = var1.__bk_320();
-         var14 = var1.readUnsignedByteNegate();
-         int var15 = (var14 >> 4 & 7) + WorldMapSection3.__p_go;
-         int var16 = (var14 & 7) + Canvas.__ao_gk;
+      byte var10;
+      int var11;
+      if (class190.field2342 == var0) {
+         byte var12 = var1.method61();
+         var2 = var1.method67();
+         byte var13 = var1.method61();
+         var3 = var1.method66();
+         var4 = var1.readUnsignedShort();
+         var5 = var1.method58();
+         var6 = var5 >> 2;
+         var7 = var5 & 3;
+         var8 = Client.field182[var6];
+         byte var14 = var1.method60();
+         var9 = var1.method65();
+         var10 = var1.method61();
+         var11 = var1.readUnsignedByteNegate();
+         int var15 = (var11 >> 4 & 7) + WorldMapSection1.field1089;
+         int var16 = (var11 & 7) + Canvas.field95;
          Player var17;
-         if(var12 == Client.localPlayerIndex) {
+         if (var9 == Client.localPlayerIndex) {
             var17 = Canvas.localPlayer;
          } else {
-            var17 = Client.players[var12];
+            var17 = Client.players[var9];
          }
 
-         if(var17 != null) {
-            ObjectDefinition var18 = class50.getObjectDefinition(var5);
+         if (var17 != null) {
+            ObjectDefinition var18 = class50.getObjectDefinition(var3);
             int var19;
             int var20;
-            if(var9 != 1 && var9 != 3) {
+            if (var7 != 1 && var7 != 3) {
                var19 = var18.sizeX;
                var20 = var18.sizeY;
             } else {
@@ -150,259 +151,253 @@ public class class16 {
             int var26 = var25[var22][var23] + var25[var21][var23] + var25[var21][var24] + var25[var22][var24] >> 2;
             int var27 = (var15 << 7) + (var19 << 6);
             int var28 = (var16 << 7) + (var20 << 6);
-            Model var29 = var18.getModel(var8, var9, var25, var27, var26, var28);
-            if(var29 != null) {
-               class258.method4898(SoundSystem.plane, var15, var16, var10, -1, 0, 0, var6 + 1, var3 + 1);
-               var17.animationCycleStart = var6 + Client.cycle;
-               var17.animationCycleEnd = var3 + Client.cycle;
+            Model var29 = var18.getModel(var6, var7, var25, var27, var26, var28);
+            if (var29 != null) {
+               class258.method4898(SoundSystem.plane, var15, var16, var8, -1, 0, 0, var4 + 1, var2 + 1);
+               var17.animationCycleStart = var4 + Client.cycle;
+               var17.animationCycleEnd = var2 + Client.cycle;
                var17.model0 = var29;
-               var17.__k = var15 * 128 + var19 * 64;
-               var17.__i = var16 * 128 + var20 * 64;
+               var17.field719 = var15 * 128 + var19 * 64;
+               var17.field720 = var16 * 128 + var20 * 64;
                var17.tileHeight2 = var26;
                byte var30;
-               if(var2 > var13) {
-                  var30 = var2;
-                  var2 = var13;
+               if (var12 > var10) {
+                  var30 = var12;
+                  var12 = var10;
+                  var10 = var30;
+               }
+
+               if (var14 > var13) {
+                  var30 = var14;
+                  var14 = var13;
                   var13 = var30;
                }
 
-               if(var11 > var4) {
-                  var30 = var11;
-                  var11 = var4;
-                  var4 = var30;
-               }
-
-               var17.__z = var15 + var2;
-               var17.__s = var13 + var15;
-               var17.__j = var11 + var16;
-               var17.__t = var4 + var16;
+               var17.field721 = var15 + var12;
+               var17.field723 = var10 + var15;
+               var17.field722 = var14 + var16;
+               var17.field724 = var13 + var16;
             }
          }
       }
 
-      int var37;
-      int var38;
-      if(class190.field2349 == var0) {
-         var37 = var1.__bb_317();
-         var3 = (var37 >> 4 & 7) + WorldMapSection3.__p_go;
-         var38 = (var37 & 7) + Canvas.__ao_gk;
-         var5 = var1.__bq_318();
-         var6 = var5 >> 2;
-         var7 = var5 & 3;
-         var8 = Client.__client_gd[var6];
-         var9 = var1.__bu_325();
-         if(var3 >= 0 && var38 >= 0 && var3 < 104 && var38 < 104) {
-            class258.method4898(SoundSystem.plane, var3, var38, var8, var9, var6, var7, 0, -1);
+      int var31;
+      int var32;
+      if (class190.field2349 == var0) {
+         var31 = var1.method58();
+         var2 = (var31 >> 4 & 7) + WorldMapSection1.field1089;
+         var32 = (var31 & 7) + Canvas.field95;
+         var3 = var1.method59();
+         var4 = var3 >> 2;
+         var5 = var3 & 3;
+         var6 = Client.field182[var4];
+         var7 = var1.method66();
+         if (var2 >= 0 && var32 >= 0 && var2 < 104 && var32 < 104) {
+            class258.method4898(SoundSystem.plane, var2, var32, var6, var7, var4, var5, 0, -1);
          }
-
       } else {
-         if(class190.field2345 == var0) {
-            var37 = var1.readUnsignedByte();
-            var3 = (var37 >> 4 & 7) + WorldMapSection3.__p_go;
-            var38 = (var37 & 7) + Canvas.__ao_gk;
-            var5 = var1.__bq_318();
-            var6 = var1.__bb_317();
-            var7 = var6 >> 4 & 15;
-            var8 = var6 & 7;
-            var9 = var1.__bm_326();
-            if(var3 >= 0 && var38 >= 0 && var3 < 104 && var38 < 104) {
-               var10 = var7 + 1;
-               if(Canvas.localPlayer.pathX[0] >= var3 - var10 && Canvas.localPlayer.pathX[0] <= var10 + var3 && Canvas.localPlayer.pathY[0] >= var38 - var10 && Canvas.localPlayer.pathY[0] <= var10 + var38 && Client.__client_qc != 0 && var8 > 0 && Client.soundEffectCount < 50) {
-                  Client.soundEffectIds[Client.soundEffectCount] = var9;
-                  Client.queuedSoundEffectLoops[Client.soundEffectCount] = var8;
-                  Client.queuedSoundEffectDelays[Client.soundEffectCount] = var5;
+         if (class190.field2345 == var0) {
+            var31 = var1.readUnsignedByte();
+            var2 = (var31 >> 4 & 7) + WorldMapSection1.field1089;
+            var32 = (var31 & 7) + Canvas.field95;
+            var3 = var1.method59();
+            var4 = var1.method58();
+            var5 = var4 >> 4 & 15;
+            var6 = var4 & 7;
+            var7 = var1.method67();
+            if (var2 >= 0 && var32 >= 0 && var2 < 104 && var32 < 104) {
+               var8 = var5 + 1;
+               if (Canvas.localPlayer.pathX[0] >= var2 - var8 && Canvas.localPlayer.pathX[0] <= var8 + var2 && Canvas.localPlayer.pathY[0] >= var32 - var8 && Canvas.localPlayer.pathY[0] <= var8 + var32 && Client.field115 != 0 && var6 > 0 && Client.soundEffectCount < 50) {
+                  Client.soundEffectIds[Client.soundEffectCount] = var7;
+                  Client.queuedSoundEffectLoops[Client.soundEffectCount] = var6;
+                  Client.queuedSoundEffectDelays[Client.soundEffectCount] = var3;
                   Client.soundEffects[Client.soundEffectCount] = null;
-                  Client.soundLocations[Client.soundEffectCount] = var7 + (var38 << 8) + (var3 << 16);
+                  Client.soundLocations[Client.soundEffectCount] = var5 + (var32 << 8) + (var2 << 16);
                   ++Client.soundEffectCount;
                }
             }
          }
 
-         if(class190.field2341 == var0) {
-            var37 = var1.__ag_302();
-            var3 = var1.__bb_317();
-            var38 = var1.__bu_325();
-            var5 = var1.readUnsignedByte();
-            var6 = (var5 >> 4 & 7) + WorldMapSection3.__p_go;
-            var7 = (var5 & 7) + Canvas.__ao_gk;
-            if(var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) {
-               var6 = var6 * 128 + 64;
-               var7 = var7 * 128 + 64;
-               GraphicsObject var42 = new GraphicsObject(var37, SoundSystem.plane, var6, var7, class32.getTileHeight(var6, var7, SoundSystem.plane) - var3, var38, Client.cycle);
-               Client.graphicsObjects.addFirst(var42);
+         if (class190.field2341 == var0) {
+            var31 = var1.readUnsignedShort();
+            var2 = var1.method58();
+            var32 = var1.method66();
+            var3 = var1.readUnsignedByte();
+            var4 = (var3 >> 4 & 7) + WorldMapSection1.field1089;
+            var5 = (var3 & 7) + Canvas.field95;
+            if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) {
+               var4 = var4 * 128 + 64;
+               var5 = var5 * 128 + 64;
+               GraphicsObject var33 = new GraphicsObject(var31, SoundSystem.plane, var4, var5, class32.getTileHeight(var4, var5, SoundSystem.plane) - var2, var32, Client.cycle);
+               Client.graphicsObjects.addFirst(var33);
             }
-
          } else {
-            int var39;
-            if(class190.field2344 == var0) {
-               var37 = var1.__bq_318();
-               var3 = var37 >> 2;
-               var38 = var37 & 3;
-               var5 = Client.__client_gd[var3];
-               var6 = var1.readUnsignedByteNegate();
-               var7 = (var6 >> 4 & 7) + WorldMapSection3.__p_go;
-               var8 = (var6 & 7) + Canvas.__ao_gk;
-               var9 = var1.__ag_302();
-               if(var7 >= 0 && var8 >= 0 && var7 < 103 && var8 < 103) {
-                  if(var5 == 0) {
-                     BoundaryObject var32 = class65.scene.getBoundaryObject(SoundSystem.plane, var7, var8);
-                     if(var32 != null) {
-                        var39 = HitSplatDefinition.method4972(var32.tag);
-                        if(var3 == 2) {
-                           var32.entity1 = new DynamicObject(var39, 2, var38 + 4, SoundSystem.plane, var7, var8, var9, false, var32.entity1);
-                           var32.entity2 = new DynamicObject(var39, 2, var38 + 1 & 3, SoundSystem.plane, var7, var8, var9, false, var32.entity2);
+            int var35;
+            if (class190.field2344 == var0) {
+               var31 = var1.method59();
+               var2 = var31 >> 2;
+               var32 = var31 & 3;
+               var3 = Client.field182[var2];
+               var4 = var1.readUnsignedByteNegate();
+               var5 = (var4 >> 4 & 7) + WorldMapSection1.field1089;
+               var6 = (var4 & 7) + Canvas.field95;
+               var7 = var1.readUnsignedShort();
+               if (var5 >= 0 && var6 >= 0 && var5 < 103 && var6 < 103) {
+                  if (var3 == 0) {
+                     BoundaryObject var34 = class65.scene.getBoundaryObject(SoundSystem.plane, var5, var6);
+                     if (var34 != null) {
+                        var35 = HitSplatDefinition.method4972(var34.tag);
+                        if (var2 == 2) {
+                           var34.entity1 = new DynamicObject(var35, 2, var32 + 4, SoundSystem.plane, var5, var6, var7, false, var34.entity1);
+                           var34.entity2 = new DynamicObject(var35, 2, var32 + 1 & 3, SoundSystem.plane, var5, var6, var7, false, var34.entity2);
                         } else {
-                           var32.entity1 = new DynamicObject(var39, var3, var38, SoundSystem.plane, var7, var8, var9, false, var32.entity1);
+                           var34.entity1 = new DynamicObject(var35, var2, var32, SoundSystem.plane, var5, var6, var7, false, var34.entity1);
                         }
                      }
                   }
 
-                  if(var5 == 1) {
-                     WallDecoration var43 = class65.scene.getWallDecoration(SoundSystem.plane, var7, var8);
-                     if(var43 != null) {
-                        var39 = HitSplatDefinition.method4972(var43.tag);
-                        if(var3 != 4 && var3 != 5) {
-                           if(var3 == 6) {
-                              var43.entity1 = new DynamicObject(var39, 4, var38 + 4, SoundSystem.plane, var7, var8, var9, false, var43.entity1);
-                           } else if(var3 == 7) {
-                              var43.entity1 = new DynamicObject(var39, 4, (var38 + 2 & 3) + 4, SoundSystem.plane, var7, var8, var9, false, var43.entity1);
-                           } else if(var3 == 8) {
-                              var43.entity1 = new DynamicObject(var39, 4, var38 + 4, SoundSystem.plane, var7, var8, var9, false, var43.entity1);
-                              var43.entity2 = new DynamicObject(var39, 4, (var38 + 2 & 3) + 4, SoundSystem.plane, var7, var8, var9, false, var43.entity2);
+                  if (var3 == 1) {
+                     WallDecoration var36 = class65.scene.getWallDecoration(SoundSystem.plane, var5, var6);
+                     if (var36 != null) {
+                        var35 = HitSplatDefinition.method4972(var36.tag);
+                        if (var2 != 4 && var2 != 5) {
+                           if (var2 == 6) {
+                              var36.entity1 = new DynamicObject(var35, 4, var32 + 4, SoundSystem.plane, var5, var6, var7, false, var36.entity1);
+                           } else if (var2 == 7) {
+                              var36.entity1 = new DynamicObject(var35, 4, (var32 + 2 & 3) + 4, SoundSystem.plane, var5, var6, var7, false, var36.entity1);
+                           } else if (var2 == 8) {
+                              var36.entity1 = new DynamicObject(var35, 4, var32 + 4, SoundSystem.plane, var5, var6, var7, false, var36.entity1);
+                              var36.entity2 = new DynamicObject(var35, 4, (var32 + 2 & 3) + 4, SoundSystem.plane, var5, var6, var7, false, var36.entity2);
                            }
                         } else {
-                           var43.entity1 = new DynamicObject(var39, 4, var38, SoundSystem.plane, var7, var8, var9, false, var43.entity1);
+                           var36.entity1 = new DynamicObject(var35, 4, var32, SoundSystem.plane, var5, var6, var7, false, var36.entity1);
                         }
                      }
                   }
 
-                  if(var5 == 2) {
-                     GameObject var44 = class65.scene.__aj_243(SoundSystem.plane, var7, var8);
-                     if(var3 == 11) {
-                        var3 = 10;
+                  if (var3 == 2) {
+                     GameObject var37 = class65.scene.method289(SoundSystem.plane, var5, var6);
+                     if (var2 == 11) {
+                        var2 = 10;
                      }
 
-                     if(var44 != null) {
-                        var44.entity = new DynamicObject(HitSplatDefinition.method4972(var44.tag), var3, var38, SoundSystem.plane, var7, var8, var9, false, var44.entity);
+                     if (var37 != null) {
+                        var37.entity = new DynamicObject(HitSplatDefinition.method4972(var37.tag), var2, var32, SoundSystem.plane, var5, var6, var7, false, var37.entity);
                      }
                   }
 
-                  if(var5 == 3) {
-                     FloorDecoration var45 = class65.scene.getFloorDecoration(SoundSystem.plane, var7, var8);
-                     if(var45 != null) {
-                        var45.entity = new DynamicObject(HitSplatDefinition.method4972(var45.tag), 22, var38, SoundSystem.plane, var7, var8, var9, false, var45.entity);
+                  if (var3 == 3) {
+                     FloorDecoration var39 = class65.scene.getFloorDecoration(SoundSystem.plane, var5, var6);
+                     if (var39 != null) {
+                        var39.entity = new DynamicObject(HitSplatDefinition.method4972(var39.tag), 22, var32, SoundSystem.plane, var5, var6, var7, false, var39.entity);
                      }
                   }
                }
-
             } else {
-               GroundItem var34;
-               if(class190.field2347 == var0) {
-                  var37 = var1.__bb_317();
-                  var3 = (var37 >> 4 & 7) + WorldMapSection3.__p_go;
-                  var38 = (var37 & 7) + Canvas.__ao_gk;
-                  var5 = var1.__bm_326();
-                  if(var3 >= 0 && var38 >= 0 && var3 < 104 && var38 < 104) {
-                     NodeDeque var33 = Client.groundItems[SoundSystem.plane][var3][var38];
-                     if(var33 != null) {
-                        for(var34 = (GroundItem)var33.last(); var34 != null; var34 = (GroundItem)var33.previous()) {
-                           if((var5 & 32767) == var34.id) {
-                              var34.remove();
+               GroundItem var38;
+               NodeDeque var40;
+               if (class190.field2347 == var0) {
+                  var31 = var1.method58();
+                  var2 = (var31 >> 4 & 7) + WorldMapSection1.field1089;
+                  var32 = (var31 & 7) + Canvas.field95;
+                  var3 = var1.method67();
+                  if (var2 >= 0 && var32 >= 0 && var2 < 104 && var32 < 104) {
+                     var40 = Client.groundItems[SoundSystem.plane][var2][var32];
+                     if (var40 != null) {
+                        for (var38 = (GroundItem)var40.last(); var38 != null; var38 = (GroundItem)var40.previous()) {
+                           if ((var3 & 32767) == var38.id) {
+                              var38.remove();
                               break;
                            }
                         }
 
-                        if(var33.last() == null) {
-                           Client.groundItems[SoundSystem.plane][var3][var38] = null;
+                        if (var40.last() == null) {
+                           Client.groundItems[SoundSystem.plane][var2][var32] = null;
                         }
 
-                        TilePaint.method3061(var3, var38);
+                        TilePaint.updateItemPile(var2, var32);
                      }
                   }
-
-               } else if(class190.field2350 == var0) {
-                  var37 = var1.__bq_318();
-                  var3 = var37 >> 2;
-                  var38 = var37 & 3;
-                  var5 = Client.__client_gd[var3];
-                  var6 = var1.__bq_318();
-                  var7 = (var6 >> 4 & 7) + WorldMapSection3.__p_go;
-                  var8 = (var6 & 7) + Canvas.__ao_gk;
-                  if(var7 >= 0 && var8 >= 0 && var7 < 104 && var8 < 104) {
-                     class258.method4898(SoundSystem.plane, var7, var8, var5, -1, var3, var38, 0, -1);
+               } else if (class190.field2350 == var0) {
+                  var31 = var1.method59();
+                  var2 = var31 >> 2;
+                  var32 = var31 & 3;
+                  var3 = Client.field182[var2];
+                  var4 = var1.method59();
+                  var5 = (var4 >> 4 & 7) + WorldMapSection1.field1089;
+                  var6 = (var4 & 7) + Canvas.field95;
+                  if (var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) {
+                     class258.method4898(SoundSystem.plane, var5, var6, var3, -1, var2, var32, 0, -1);
                   }
-
-               } else if(class190.field2352 == var0) {
-                  var37 = var1.__bq_318() * 4;
-                  var3 = var1.__ag_302();
-                  var38 = var1.__bu_325();
-                  var5 = var1.__bq_318() * 4;
-                  var6 = var1.__bl_327();
-                  var7 = var1.readUnsignedByte();
-                  var8 = var1.__bq_318();
-                  var9 = var1.__by_324();
-                  var10 = var1.__bb_317();
-                  var39 = (var10 >> 4 & 7) + WorldMapSection3.__p_go;
-                  var12 = (var10 & 7) + Canvas.__ao_gk;
-                  var13 = var1.__bn_319();
-                  byte var40 = var1.__bk_320();
-                  var14 = var40 + var39;
-                  int var41 = var13 + var12;
-                  if(var39 >= 0 && var12 >= 0 && var39 < 104 && var12 < 104 && var14 >= 0 && var41 >= 0 && var14 < 104 && var41 < 104 && var38 != 65535) {
-                     var39 = var39 * 128 + 64;
-                     var12 = var12 * 128 + 64;
-                     var14 = var14 * 128 + 64;
-                     var41 = var41 * 128 + 64;
-                     Projectile var35 = new Projectile(var38, SoundSystem.plane, var39, var12, class32.getTileHeight(var39, var12, SoundSystem.plane) - var5, var9 + Client.cycle, var3 + Client.cycle, var7, var8, var6, var37);
-                     var35.setDestination(var14, var41, class32.getTileHeight(var14, var41, SoundSystem.plane) - var37, var9 + Client.cycle);
-                     Client.projectiles.addFirst(var35);
+               } else if (class190.field2352 == var0) {
+                  var31 = var1.method59() * 4;
+                  var2 = var1.readUnsignedShort();
+                  var32 = var1.method66();
+                  var3 = var1.method59() * 4;
+                  var4 = var1.method68();
+                  var5 = var1.readUnsignedByte();
+                  var6 = var1.method59();
+                  var7 = var1.method65();
+                  var8 = var1.method58();
+                  var35 = (var8 >> 4 & 7) + WorldMapSection1.field1089;
+                  var9 = (var8 & 7) + Canvas.field95;
+                  var10 = var1.method60();
+                  byte var41 = var1.method61();
+                  var11 = var41 + var35;
+                  int var42 = var10 + var9;
+                  if (var35 >= 0 && var9 >= 0 && var35 < 104 && var9 < 104 && var11 >= 0 && var42 >= 0 && var11 < 104 && var42 < 104 && var32 != 65535) {
+                     var35 = var35 * 128 + 64;
+                     var9 = var9 * 128 + 64;
+                     var11 = var11 * 128 + 64;
+                     var42 = var42 * 128 + 64;
+                     Projectile var44 = new Projectile(var32, SoundSystem.plane, var35, var9, class32.getTileHeight(var35, var9, SoundSystem.plane) - var3, var7 + Client.cycle, var2 + Client.cycle, var5, var6, var4, var31);
+                     var44.setDestination(var11, var42, class32.getTileHeight(var11, var42, SoundSystem.plane) - var31, var7 + Client.cycle);
+                     Client.projectiles.addFirst(var44);
                   }
-
-               } else if(class190.field2346 != var0) {
-                  if(class190.field2343 == var0) {
-                     var37 = var1.__bu_325();
-                     var3 = var1.__bm_326();
-                     var38 = var1.__bb_317();
-                     var5 = (var38 >> 4 & 7) + WorldMapSection3.__p_go;
-                     var6 = (var38 & 7) + Canvas.__ao_gk;
-                     if(var5 >= 0 && var6 >= 0 && var5 < 104 && var6 < 104) {
-                        var34 = new GroundItem();
-                        var34.id = var3;
-                        var34.quantity = var37;
-                        if(Client.groundItems[SoundSystem.plane][var5][var6] == null) {
-                           Client.groundItems[SoundSystem.plane][var5][var6] = new NodeDeque();
+               } else if (class190.field2346 != var0) {
+                  if (class190.field2343 == var0) {
+                     var31 = var1.method66();
+                     var2 = var1.method67();
+                     var32 = var1.method58();
+                     var3 = (var32 >> 4 & 7) + WorldMapSection1.field1089;
+                     var4 = (var32 & 7) + Canvas.field95;
+                     if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) {
+                        var38 = new GroundItem();
+                        var38.id = var2;
+                        var38.quantity = var31;
+                        if (Client.groundItems[SoundSystem.plane][var3][var4] == null) {
+                           Client.groundItems[SoundSystem.plane][var3][var4] = new NodeDeque();
                         }
 
-                        Client.groundItems[SoundSystem.plane][var5][var6].addFirst(var34);
-                        TilePaint.method3061(var5, var6);
+                        Client.groundItems[SoundSystem.plane][var3][var4].addFirst(var38);
+                        TilePaint.updateItemPile(var3, var4);
                      }
-
                   }
                } else {
-                  var37 = var1.__by_324();
-                  var3 = var1.__bm_326();
-                  var38 = var1.__by_324();
-                  var5 = var1.__bb_317();
-                  var6 = (var5 >> 4 & 7) + WorldMapSection3.__p_go;
-                  var7 = (var5 & 7) + Canvas.__ao_gk;
-                  if(var6 >= 0 && var7 >= 0 && var6 < 104 && var7 < 104) {
-                     NodeDeque var31 = Client.groundItems[SoundSystem.plane][var6][var7];
-                     if(var31 != null) {
-                        for(GroundItem var36 = (GroundItem)var31.last(); var36 != null; var36 = (GroundItem)var31.previous()) {
-                           if((var37 & 32767) == var36.id && var38 == var36.quantity) {
-                              var36.quantity = var3;
+                  var31 = var1.method65();
+                  var2 = var1.method67();
+                  var32 = var1.method65();
+                  var3 = var1.method58();
+                  var4 = (var3 >> 4 & 7) + WorldMapSection1.field1089;
+                  var5 = (var3 & 7) + Canvas.field95;
+                  if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) {
+                     var40 = Client.groundItems[SoundSystem.plane][var4][var5];
+                     if (var40 != null) {
+                        for (GroundItem var43 = (GroundItem)var40.last(); var43 != null; var43 = (GroundItem)var40.previous()) {
+                           if ((var31 & 32767) == var43.id && var32 == var43.quantity) {
+                              var43.quantity = var2;
                               break;
                            }
                         }
 
-                        TilePaint.method3061(var6, var7);
+                        TilePaint.updateItemPile(var4, var5);
                      }
                   }
-
                }
             }
          }
       }
+
    }
 
    @ObfuscatedName("il")
@@ -411,20 +406,18 @@ public class class16 {
       garbageValue = "0"
    )
    @Export("insertMenuItem")
-   static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) {
-      if(!Client.isMenuOpen) {
-         if(Client.menuOptionsCount < 500) {
-            Client.menuActions[Client.menuOptionsCount] = var0;
-            Client.menuTargetNames[Client.menuOptionsCount] = var1;
-            Client.menuOpcodes[Client.menuOptionsCount] = var2;
-            Client.menuArguments0[Client.menuOptionsCount] = var3;
-            Client.menuArguments1[Client.menuOptionsCount] = var4;
-            Client.menuArguments2[Client.menuOptionsCount] = var5;
-            Client.menuShiftClick[Client.menuOptionsCount] = var6;
-            ++Client.menuOptionsCount;
-         }
-
+   static final void insertMenuItem(String action, String targetName, int opcode, int var3, int var4, int var5, boolean var6) {
+      if (!Client.isMenuOpen && Client.menuOptionsCount < 500) {
+         Client.menuActions[Client.menuOptionsCount] = action;
+         Client.menuTargetNames[Client.menuOptionsCount] = targetName;
+         Client.menuOpcodes[Client.menuOptionsCount] = opcode;
+         Client.menuArguments0[Client.menuOptionsCount] = var3;
+         Client.menuArguments1[Client.menuOptionsCount] = var4;
+         Client.menuArguments2[Client.menuOptionsCount] = var5;
+         Client.menuShiftClick[Client.menuOptionsCount] = var6;
+         ++Client.menuOptionsCount;
       }
+
    }
 
    @ObfuscatedName("ii")
@@ -433,30 +426,30 @@ public class class16 {
       garbageValue = "931169314"
    )
    static final int method187(Widget var0, int var1) {
-      if(var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) {
+      if (var0.cs1Instructions != null && var1 < var0.cs1Instructions.length) {
          try {
             int[] var2 = var0.cs1Instructions[var1];
             int var3 = 0;
             int var4 = 0;
             byte var5 = 0;
 
-            while(true) {
+            while (true) {
                int var6 = var2[var4++];
                int var7 = 0;
                byte var8 = 0;
-               if(var6 == 0) {
+               if (var6 == 0) {
                   return var3;
                }
 
-               if(var6 == 1) {
+               if (var6 == 1) {
                   var7 = Client.currentLevels[var2[var4++]];
                }
 
-               if(var6 == 2) {
+               if (var6 == 2) {
                   var7 = Client.levels[var2[var4++]];
                }
 
-               if(var6 == 3) {
+               if (var6 == 3) {
                   var7 = Client.experience[var2[var4++]];
                }
 
@@ -464,52 +457,52 @@ public class class16 {
                Widget var10;
                int var11;
                int var12;
-               if(var6 == 4) {
+               if (var6 == 4) {
                   var9 = var2[var4++] << 16;
                   var9 += var2[var4++];
                   var10 = Huffman.getWidget(var9);
                   var11 = var2[var4++];
-                  if(var11 != -1 && (!Skills.getItemDefinition(var11).isMembersOnly || Client.isMembersWorld)) {
-                     for(var12 = 0; var12 < var10.itemIds.length; ++var12) {
-                        if(var11 + 1 == var10.itemIds[var12]) {
+                  if (var11 != -1 && (!Skills.getItemDefinition(var11).isMembersOnly || Client.isMembersWorld)) {
+                     for (var12 = 0; var12 < var10.itemIds.length; ++var12) {
+                        if (var11 + 1 == var10.itemIds[var12]) {
                            var7 += var10.itemQuantities[var12];
                         }
                      }
                   }
                }
 
-               if(var6 == 5) {
+               if (var6 == 5) {
                   var7 = Varps.Varps_main[var2[var4++]];
                }
 
-               if(var6 == 6) {
+               if (var6 == 6) {
                   var7 = Skills.Skills_experienceTable[Client.levels[var2[var4++]] - 1];
                }
 
-               if(var6 == 7) {
+               if (var6 == 7) {
                   var7 = Varps.Varps_main[var2[var4++]] * 100 / 46875;
                }
 
-               if(var6 == 8) {
+               if (var6 == 8) {
                   var7 = Canvas.localPlayer.combatLevel;
                }
 
-               if(var6 == 9) {
-                  for(var9 = 0; var9 < 25; ++var9) {
-                     if(Skills.Skills_enabled[var9]) {
+               if (var6 == 9) {
+                  for (var9 = 0; var9 < 25; ++var9) {
+                     if (Skills.Skills_enabled[var9]) {
                         var7 += Client.levels[var9];
                      }
                   }
                }
 
-               if(var6 == 10) {
+               if (var6 == 10) {
                   var9 = var2[var4++] << 16;
                   var9 += var2[var4++];
                   var10 = Huffman.getWidget(var9);
                   var11 = var2[var4++];
-                  if(var11 != -1 && (!Skills.getItemDefinition(var11).isMembersOnly || Client.isMembersWorld)) {
-                     for(var12 = 0; var12 < var10.itemIds.length; ++var12) {
-                        if(var11 + 1 == var10.itemIds[var12]) {
+                  if (var11 != -1 && (!Skills.getItemDefinition(var11).isMembersOnly || Client.isMembersWorld)) {
+                     for (var12 = 0; var12 < var10.itemIds.length; ++var12) {
+                        if (var11 + 1 == var10.itemIds[var12]) {
                            var7 = 999999999;
                            break;
                         }
@@ -517,63 +510,63 @@ public class class16 {
                   }
                }
 
-               if(var6 == 11) {
+               if (var6 == 11) {
                   var7 = Client.runEnergy;
                }
 
-               if(var6 == 12) {
+               if (var6 == 12) {
                   var7 = Client.weight;
                }
 
-               if(var6 == 13) {
+               if (var6 == 13) {
                   var9 = Varps.Varps_main[var2[var4++]];
                   int var13 = var2[var4++];
-                  var7 = (var9 & 1 << var13) != 0?1:0;
+                  var7 = (var9 & 1 << var13) != 0 ? 1 : 0;
                }
 
-               if(var6 == 14) {
+               if (var6 == 14) {
                   var9 = var2[var4++];
-                  var7 = WorldMapSection2.getVarbit(var9);
+                  var7 = WorldMapSection0.getVarbit(var9);
                }
 
-               if(var6 == 15) {
+               if (var6 == 15) {
                   var8 = 1;
                }
 
-               if(var6 == 16) {
+               if (var6 == 16) {
                   var8 = 2;
                }
 
-               if(var6 == 17) {
+               if (var6 == 17) {
                   var8 = 3;
                }
 
-               if(var6 == 18) {
+               if (var6 == 18) {
                   var7 = (Canvas.localPlayer.x >> 7) + class50.baseX;
                }
 
-               if(var6 == 19) {
+               if (var6 == 19) {
                   var7 = (Canvas.localPlayer.y >> 7) + GraphicsObject.baseY;
                }
 
-               if(var6 == 20) {
+               if (var6 == 20) {
                   var7 = var2[var4++];
                }
 
-               if(var8 == 0) {
-                  if(var5 == 0) {
+               if (var8 == 0) {
+                  if (var5 == 0) {
                      var3 += var7;
                   }
 
-                  if(var5 == 1) {
+                  if (var5 == 1) {
                      var3 -= var7;
                   }
 
-                  if(var5 == 2 && var7 != 0) {
+                  if (var5 == 2 && var7 != 0) {
                      var3 /= var7;
                   }
 
-                  if(var5 == 3) {
+                  if (var5 == 3) {
                      var3 *= var7;
                   }
 
diff --git a/runescape-client/src/main/java/class168.java b/runescape-client/src/main/java/class168.java
index 4b534460d2..9073494309 100644
--- a/runescape-client/src/main/java/class168.java
+++ b/runescape-client/src/main/java/class168.java
@@ -7,7 +7,7 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("fs")
 public class class168 {
    @ObfuscatedName("o")
-   public static File __fs_o;
+   public static File field1115;
    @ObfuscatedName("u")
    @ObfuscatedGetter(
       intValue = -2051451755
@@ -39,12 +39,6 @@ public class class168 {
    @Export("optionButtonSpriteSubWidth")
    static int optionButtonSpriteSubWidth;
 
-   static {
-      randomDat = null;
-      dat2File = null;
-      idx255File = null;
-   }
-
    @ObfuscatedName("o")
    @ObfuscatedSignature(
       signature = "(II)Z",
@@ -62,10 +56,16 @@ public class class168 {
    public static String method3450(char var0, int var1) {
       char[] var2 = new char[var1];
 
-      for(int var3 = 0; var3 < var1; ++var3) {
+      for (int var3 = 0; var3 < var1; ++var3) {
          var2[var3] = var0;
       }
 
       return new String(var2);
    }
+
+   static {
+      randomDat = null;
+      dat2File = null;
+      idx255File = null;
+   }
 }
diff --git a/runescape-client/src/main/java/class171.java b/runescape-client/src/main/java/class171.java
index e097229418..e367b2fbc8 100644
--- a/runescape-client/src/main/java/class171.java
+++ b/runescape-client/src/main/java/class171.java
@@ -1,6 +1,5 @@
 import java.io.File;
 import java.util.Hashtable;
-import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
@@ -11,18 +10,13 @@ public class class171 {
    @ObfuscatedGetter(
       intValue = -852697585
    )
-   static int __fo_ro;
+   static int field1116;
    @ObfuscatedName("m")
-   public static boolean __fo_m;
+   public static boolean field1117;
    @ObfuscatedName("f")
-   public static File __fo_f;
+   public static File field1118;
    @ObfuscatedName("q")
-   static Hashtable __fo_q;
-
-   static {
-      __fo_m = false;
-      __fo_q = new Hashtable(16);
-   }
+   static Hashtable field1119;
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
@@ -33,36 +27,36 @@ public class class171 {
       KeyHandler var0 = KeyHandler.KeyHandler_instance;
       synchronized(KeyHandler.KeyHandler_instance) {
          ++KeyHandler.KeyHandler_idleCycles;
-         KeyHandler.__an_ct = KeyHandler.__an_cc;
-         KeyHandler.__an_cl = 0;
-         int var1;
-         if(KeyHandler.__an_cw < 0) {
-            for(var1 = 0; var1 < 112; ++var1) {
-               KeyHandler.KeyHandler_pressedKeys[var1] = false;
+         KeyHandler.field453 = KeyHandler.field455;
+         KeyHandler.field452 = 0;
+         int var2;
+         if (KeyHandler.field448 < 0) {
+            for (var2 = 0; var2 < 112; ++var2) {
+               KeyHandler.KeyHandler_pressedKeys[var2] = false;
             }
 
-            KeyHandler.__an_cw = KeyHandler.__an_ch;
+            KeyHandler.field448 = KeyHandler.field447;
          } else {
-            while(KeyHandler.__an_cw != KeyHandler.__an_ch) {
-               var1 = KeyHandler.__an_cq[KeyHandler.__an_ch];
-               KeyHandler.__an_ch = KeyHandler.__an_ch + 1 & 127;
-               if(var1 < 0) {
-                  KeyHandler.KeyHandler_pressedKeys[~var1] = false;
+            while (KeyHandler.field448 != KeyHandler.field447) {
+               var2 = KeyHandler.field446[KeyHandler.field447];
+               KeyHandler.field447 = KeyHandler.field447 + 1 & 127;
+               if (var2 < 0) {
+                  KeyHandler.KeyHandler_pressedKeys[~var2] = false;
                } else {
-                  if(!KeyHandler.KeyHandler_pressedKeys[var1] && KeyHandler.__an_cl < KeyHandler.__an_cp.length - 1) {
-                     KeyHandler.__an_cp[++KeyHandler.__an_cl - 1] = var1;
+                  if (!KeyHandler.KeyHandler_pressedKeys[var2] && KeyHandler.field452 < KeyHandler.field451.length - 1) {
+                     KeyHandler.field451[++KeyHandler.field452 - 1] = var2;
                   }
 
-                  KeyHandler.KeyHandler_pressedKeys[var1] = true;
+                  KeyHandler.KeyHandler_pressedKeys[var2] = true;
                }
             }
          }
 
-         if(KeyHandler.__an_cl > 0) {
+         if (KeyHandler.field452 > 0) {
             KeyHandler.KeyHandler_idleCycles = 0;
          }
 
-         KeyHandler.__an_cc = KeyHandler.__an_cz;
+         KeyHandler.field455 = KeyHandler.field454;
       }
    }
 
@@ -72,14 +66,14 @@ public class class171 {
       garbageValue = "-1048935304"
    )
    public static int method3496(int var0, int var1, int var2, int var3, int var4, int var5) {
-      if((var5 & 1) == 1) {
+      if ((var5 & 1) == 1) {
          int var6 = var3;
          var3 = var4;
          var4 = var6;
       }
 
       var2 &= 3;
-      return var2 == 0?var1:(var2 == 1?7 - var0 - (var3 - 1):(var2 == 2?7 - var1 - (var4 - 1):var0));
+      return var2 == 0 ? var1 : (var2 == 1 ? 7 - var0 - (var3 - 1) : (var2 == 2 ? 7 - var1 - (var4 - 1) : var0));
    }
 
    @ObfuscatedName("fq")
@@ -89,118 +83,118 @@ public class class171 {
    )
    static void method3497() {
       int var0;
-      if(Client.titleLoadingStage == 0) {
+      if (Client.titleLoadingStage == 0) {
          class65.scene = new Scene(4, 104, 104, Tiles.Tiles_heights);
 
-         for(var0 = 0; var0 < 4; ++var0) {
+         for (var0 = 0; var0 < 4; ++var0) {
             Client.collisionMaps[var0] = new CollisionMap(104, 104);
          }
 
-         WidgetGroupParent.sceneMinimapSprite = new Sprite(512, 512);
+         InterfaceParent.sceneMinimapSprite = new Sprite(512, 512);
          Login.Login_loadingText = "Starting game engine...";
          Login.Login_loadingPercent = 5;
          Client.titleLoadingStage = 20;
-      } else if(Client.titleLoadingStage == 20) {
+      } else if (Client.titleLoadingStage == 20) {
          Login.Login_loadingText = "Prepared visibility map";
          Login.Login_loadingPercent = 10;
          Client.titleLoadingStage = 30;
-      } else if(Client.titleLoadingStage == 30) {
-         AbstractIndexCache.indexCache0 = class22.newIndexCache(0, false, true, true);
-         Skeleton.indexCache1 = class22.newIndexCache(1, false, true, true);
-         ObjectSound.indexCache2 = class22.newIndexCache(2, true, false, true);
-         WorldMapIcon1.indexCache3 = class22.newIndexCache(3, false, true, true);
-         class25.indexCache4 = class22.newIndexCache(4, false, true, true);
-         SecureRandomFuture.indexCache5 = class22.newIndexCache(5, true, true, true);
-         UserComparator3.indexCache6 = class22.newIndexCache(6, true, true, true);
-         class40.indexCache7 = class22.newIndexCache(7, false, true, true);
-         WorldMapSection3.indexCache8 = class22.newIndexCache(8, false, true, true);
-         class238.indexCache9 = class22.newIndexCache(9, false, true, true);
-         class16.indexCache10 = class22.newIndexCache(10, false, true, true);
-         Login.indexCache11 = class22.newIndexCache(11, false, true, true);
-         Formatting.indexCache12 = class22.newIndexCache(12, false, true, true);
-         ByteArrayPool.indexCache13 = class22.newIndexCache(13, true, false, true);
-         class2.indexCache14 = class22.newIndexCache(14, false, true, true);
-         WorldMapSection1.indexCache15 = class22.newIndexCache(15, false, true, true);
-         class22.indexCache16 = class22.newIndexCache(17, true, true, true);
-         WorldMapLabelSize.__s_dq = class22.newIndexCache(18, false, true, true);
-         ItemContainer.__bc_dm = class22.newIndexCache(19, false, true, true);
-         AbstractByteArrayCopier.__gu_et = class22.newIndexCache(20, false, true, true);
+      } else if (Client.titleLoadingStage == 30) {
+         AbstractArchive.archive0 = WorldMapRectangle.newArchive(0, false, true, true);
+         Skeleton.archive1 = WorldMapRectangle.newArchive(1, false, true, true);
+         ObjectSound.archive2 = WorldMapRectangle.newArchive(2, true, false, true);
+         WorldMapIcon1.archive3 = WorldMapRectangle.newArchive(3, false, true, true);
+         WorldMapDecoration.archive4 = WorldMapRectangle.newArchive(4, false, true, true);
+         SecureRandomFuture.archive5 = WorldMapRectangle.newArchive(5, true, true, true);
+         UserComparator3.archive6 = WorldMapRectangle.newArchive(6, true, true, true);
+         class40.archive7 = WorldMapRectangle.newArchive(7, false, true, true);
+         WorldMapSection1.archive8 = WorldMapRectangle.newArchive(8, false, true, true);
+         class238.archive9 = WorldMapRectangle.newArchive(9, false, true, true);
+         class16.archive10 = WorldMapRectangle.newArchive(10, false, true, true);
+         Login.archive11 = WorldMapRectangle.newArchive(11, false, true, true);
+         Formatting.archive12 = WorldMapRectangle.newArchive(12, false, true, true);
+         ByteArrayPool.archive13 = WorldMapRectangle.newArchive(13, true, false, true);
+         class2.archive14 = WorldMapRectangle.newArchive(14, false, true, true);
+         WorldMapSection2.archive15 = WorldMapRectangle.newArchive(15, false, true, true);
+         WorldMapRectangle.archive17 = WorldMapRectangle.newArchive(17, true, true, true);
+         WorldMapLabelSize.archive18 = WorldMapRectangle.newArchive(18, false, true, true);
+         ItemContainer.archive19 = WorldMapRectangle.newArchive(19, false, true, true);
+         AbstractByteArrayCopier.archive20 = WorldMapRectangle.newArchive(20, false, true, true);
          Login.Login_loadingText = "Connecting to update server";
          Login.Login_loadingPercent = 20;
          Client.titleLoadingStage = 40;
-      } else if(Client.titleLoadingStage == 40) {
-         byte var33 = 0;
-         var0 = var33 + AbstractIndexCache.indexCache0.__ca_405() * 4 / 100;
-         var0 += Skeleton.indexCache1.__ca_405() * 4 / 100;
-         var0 += ObjectSound.indexCache2.__ca_405() * 2 / 100;
-         var0 += WorldMapIcon1.indexCache3.__ca_405() * 2 / 100;
-         var0 += class25.indexCache4.__ca_405() * 6 / 100;
-         var0 += SecureRandomFuture.indexCache5.__ca_405() * 4 / 100;
-         var0 += UserComparator3.indexCache6.__ca_405() * 2 / 100;
-         var0 += class40.indexCache7.__ca_405() * 56 / 100;
-         var0 += WorldMapSection3.indexCache8.__ca_405() * 2 / 100;
-         var0 += class238.indexCache9.__ca_405() * 2 / 100;
-         var0 += class16.indexCache10.__ca_405() * 2 / 100;
-         var0 += Login.indexCache11.__ca_405() * 2 / 100;
-         var0 += Formatting.indexCache12.__ca_405() * 2 / 100;
-         var0 += ByteArrayPool.indexCache13.__ca_405() * 2 / 100;
-         var0 += class2.indexCache14.__ca_405() * 2 / 100;
-         var0 += WorldMapSection1.indexCache15.__ca_405() * 2 / 100;
-         var0 += ItemContainer.__bc_dm.__ca_405() / 100;
-         var0 += WorldMapLabelSize.__s_dq.__ca_405() / 100;
-         var0 += AbstractByteArrayCopier.__gu_et.__ca_405() / 100;
-         var0 += class22.indexCache16.__cx_404() && class22.indexCache16.__l_394()?1:0;
-         if(var0 != 100) {
-            if(var0 != 0) {
+      } else if (Client.titleLoadingStage == 40) {
+         byte var1 = 0;
+         var0 = var1 + AbstractArchive.archive0.percentage() * 4 / 100;
+         var0 += Skeleton.archive1.percentage() * 4 / 100;
+         var0 += ObjectSound.archive2.percentage() * 2 / 100;
+         var0 += WorldMapIcon1.archive3.percentage() * 2 / 100;
+         var0 += WorldMapDecoration.archive4.percentage() * 6 / 100;
+         var0 += SecureRandomFuture.archive5.percentage() * 4 / 100;
+         var0 += UserComparator3.archive6.percentage() * 2 / 100;
+         var0 += class40.archive7.percentage() * 56 / 100;
+         var0 += WorldMapSection1.archive8.percentage() * 2 / 100;
+         var0 += class238.archive9.percentage() * 2 / 100;
+         var0 += class16.archive10.percentage() * 2 / 100;
+         var0 += Login.archive11.percentage() * 2 / 100;
+         var0 += Formatting.archive12.percentage() * 2 / 100;
+         var0 += ByteArrayPool.archive13.percentage() * 2 / 100;
+         var0 += class2.archive14.percentage() * 2 / 100;
+         var0 += WorldMapSection2.archive15.percentage() * 2 / 100;
+         var0 += ItemContainer.archive19.percentage() / 100;
+         var0 += WorldMapLabelSize.archive18.percentage() / 100;
+         var0 += AbstractByteArrayCopier.archive20.percentage() / 100;
+         var0 += WorldMapRectangle.archive17.method130() && WorldMapRectangle.archive17.method2() ? 1 : 0;
+         if (var0 != 100) {
+            if (var0 != 0) {
                Login.Login_loadingText = "Checking for updates - " + var0 + "%";
             }
 
             Login.Login_loadingPercent = 30;
          } else {
-            AbstractWorldMapIcon.method625(AbstractIndexCache.indexCache0, "Animations");
-            AbstractWorldMapIcon.method625(Skeleton.indexCache1, "Skeletons");
-            AbstractWorldMapIcon.method625(class25.indexCache4, "Sound FX");
-            AbstractWorldMapIcon.method625(SecureRandomFuture.indexCache5, "Maps");
-            AbstractWorldMapIcon.method625(UserComparator3.indexCache6, "Music Tracks");
-            AbstractWorldMapIcon.method625(class40.indexCache7, "Models");
-            AbstractWorldMapIcon.method625(WorldMapSection3.indexCache8, "Sprites");
-            AbstractWorldMapIcon.method625(Login.indexCache11, "Music Jingles");
-            AbstractWorldMapIcon.method625(class2.indexCache14, "Music Samples");
-            AbstractWorldMapIcon.method625(WorldMapSection1.indexCache15, "Music Patches");
-            AbstractWorldMapIcon.method625(ItemContainer.__bc_dm, "World Map");
-            AbstractWorldMapIcon.method625(WorldMapLabelSize.__s_dq, "World Map Geography");
-            AbstractWorldMapIcon.method625(AbstractByteArrayCopier.__gu_et, "World Map Ground");
-            class211.spriteIds = new SpriteIds();
-            class211.spriteIds.read(class22.indexCache16);
+            AbstractWorldMapIcon.method625(AbstractArchive.archive0, "Animations");
+            AbstractWorldMapIcon.method625(Skeleton.archive1, "Skeletons");
+            AbstractWorldMapIcon.method625(WorldMapDecoration.archive4, "Sound FX");
+            AbstractWorldMapIcon.method625(SecureRandomFuture.archive5, "Maps");
+            AbstractWorldMapIcon.method625(UserComparator3.archive6, "Music Tracks");
+            AbstractWorldMapIcon.method625(class40.archive7, "Models");
+            AbstractWorldMapIcon.method625(WorldMapSection1.archive8, "Sprites");
+            AbstractWorldMapIcon.method625(Login.archive11, "Music Jingles");
+            AbstractWorldMapIcon.method625(class2.archive14, "Music Samples");
+            AbstractWorldMapIcon.method625(WorldMapSection2.archive15, "Music Patches");
+            AbstractWorldMapIcon.method625(ItemContainer.archive19, "World Map");
+            AbstractWorldMapIcon.method625(WorldMapLabelSize.archive18, "World Map Geography");
+            AbstractWorldMapIcon.method625(AbstractByteArrayCopier.archive20, "World Map Ground");
+            Calendar.spriteIds = new GraphicsDefaults();
+            Calendar.spriteIds.decode(WorldMapRectangle.archive17);
             Login.Login_loadingText = "Loaded update list";
             Login.Login_loadingPercent = 30;
             Client.titleLoadingStage = 45;
          }
-      } else if(Client.titleLoadingStage == 45) {
+      } else if (Client.titleLoadingStage == 45) {
          Tiles.method1097(22050, !Client.isLowDetail, 2);
-         MidiPcmStream var36 = new MidiPcmStream();
-         var36.__j_342(9, 128);
+         MidiPcmStream var28 = new MidiPcmStream();
+         var28.method174(9, 128);
          WorldMapCacheName.pcmPlayer0 = Players.newPcmPlayer(GameShell.taskHandler, 0, 22050);
-         WorldMapCacheName.pcmPlayer0.setStream(var36);
-         NetSocket.method3537(WorldMapSection1.indexCache15, class2.indexCache14, class25.indexCache4, var36);
-         AbstractIndexCache.pcmPlayer1 = Players.newPcmPlayer(GameShell.taskHandler, 1, 2048);
+         WorldMapCacheName.pcmPlayer0.setStream(var28);
+         NetSocket.method3537(WorldMapSection2.archive15, class2.archive14, WorldMapDecoration.archive4, var28);
+         AbstractArchive.pcmPlayer1 = Players.newPcmPlayer(GameShell.taskHandler, 1, 2048);
          TaskHandler.pcmStreamMixer = new PcmStreamMixer();
-         AbstractIndexCache.pcmPlayer1.setStream(TaskHandler.pcmStreamMixer);
+         AbstractArchive.pcmPlayer1.setStream(TaskHandler.pcmStreamMixer);
          MilliClock.decimator = new Decimator(22050, class309.PcmPlayer_sampleRate);
          Login.Login_loadingText = "Prepared sound engine";
          Login.Login_loadingPercent = 35;
          Client.titleLoadingStage = 50;
-         WorldMapElement.fonts = new Fonts(WorldMapSection3.indexCache8, ByteArrayPool.indexCache13);
+         WorldMapElement.WorldMapElement_fonts = new Fonts(WorldMapSection1.archive8, ByteArrayPool.archive13);
       } else {
-         int var1;
-         if(Client.titleLoadingStage == 50) {
-            FontName[] var35 = new FontName[]{FontName.FontName_verdana15, FontName.FontName_bold12, FontName.FontName_plain12, FontName.FontName_verdana11, FontName.FontName_plain11, FontName.FontName_verdana13};
-            var1 = var35.length;
-            Fonts var32 = WorldMapElement.fonts;
-            FontName[] var31 = new FontName[]{FontName.FontName_verdana15, FontName.FontName_bold12, FontName.FontName_plain12, FontName.FontName_verdana11, FontName.FontName_plain11, FontName.FontName_verdana13};
-            Client.fontsMap = var32.createMap(var31);
-            if(Client.fontsMap.size() < var1) {
-               Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var1 + "%";
+         int var29;
+         if (Client.titleLoadingStage == 50) {
+            FontName[] var2 = new FontName[]{FontName.FontName_verdana15, FontName.FontName_bold12, FontName.FontName_plain12, FontName.FontName_verdana11, FontName.FontName_plain11, FontName.FontName_verdana13};
+            var29 = var2.length;
+            Fonts var3 = WorldMapElement.WorldMapElement_fonts;
+            FontName[] var4 = new FontName[]{FontName.FontName_verdana15, FontName.FontName_bold12, FontName.FontName_plain12, FontName.FontName_verdana11, FontName.FontName_plain11, FontName.FontName_verdana13};
+            Client.fontsMap = var3.createMap(var4);
+            if (Client.fontsMap.size() < var29) {
+               Login.Login_loadingText = "Loading fonts - " + Client.fontsMap.size() * 100 / var29 + "%";
                Login.Login_loadingPercent = 40;
             } else {
                ScriptEvent.fontPlain11 = (Font)Client.fontsMap.get(FontName.FontName_plain11);
@@ -211,11 +205,11 @@ public class class171 {
                Login.Login_loadingPercent = 40;
                Client.titleLoadingStage = 60;
             }
-         } else if(Client.titleLoadingStage == 60) {
-            var0 = FloorDecoration.method2853(class16.indexCache10, WorldMapSection3.indexCache8);
-            var1 = class3.method36();
-            if(var0 < var1) {
-               Login.Login_loadingText = "Loading title screen - " + var0 * 100 / var1 + "%";
+         } else if (Client.titleLoadingStage == 60) {
+            var0 = FloorDecoration.method2853(class16.archive10, WorldMapSection1.archive8);
+            var29 = class3.method36();
+            if (var0 < var29) {
+               Login.Login_loadingText = "Loading title screen - " + var0 * 100 / var29 + "%";
                Login.Login_loadingPercent = 50;
             } else {
                Login.Login_loadingText = "Loaded title screen";
@@ -224,82 +218,82 @@ public class class171 {
                Client.titleLoadingStage = 70;
             }
          } else {
-            IndexCache var2;
-            if(Client.titleLoadingStage == 70) {
-               if(!ObjectSound.indexCache2.__l_394()) {
-                  Login.Login_loadingText = "Loading config - " + ObjectSound.indexCache2.loadPercent() + "%";
+            Archive var30;
+            if (Client.titleLoadingStage == 70) {
+               if (!ObjectSound.archive2.method2()) {
+                  Login.Login_loadingText = "Loading config - " + ObjectSound.archive2.loadPercent() + "%";
                   Login.Login_loadingPercent = 60;
                } else {
-                  Varcs.method2160(ObjectSound.indexCache2);
-                  Varps.method4393(ObjectSound.indexCache2);
-                  IndexCache var34 = ObjectSound.indexCache2;
-                  IndexCache var38 = class40.indexCache7;
-                  KitDefinition.KitDefinition_indexCache = var34;
-                  KitDefinition.__im_f = var38;
-                  KitDefinition.__im_q = KitDefinition.KitDefinition_indexCache.__s_396(3);
-                  RectangleMode.method6028(ObjectSound.indexCache2, class40.indexCache7, Client.isLowDetail);
-                  IsaacCipher.method4082(ObjectSound.indexCache2, class40.indexCache7);
-                  var2 = ObjectSound.indexCache2;
-                  StructDefinition.__jq_m = var2;
-                  IndexCache var3 = ObjectSound.indexCache2;
-                  IndexCache var4 = class40.indexCache7;
-                  boolean var5 = Client.isMembersWorld;
-                  Font var6 = ScriptEvent.fontPlain11;
-                  ItemDefinition.ItemDefinition_indexCache = var3;
-                  ItemDefinition.ItemDefinition_modelIndexCache = var4;
-                  class30.inMembersWorld = var5;
-                  class83.__cm_e = ItemDefinition.ItemDefinition_indexCache.__s_396(10);
-                  class204.__gx_n = var6;
-                  IndexCache var7 = ObjectSound.indexCache2;
-                  IndexCache var8 = AbstractIndexCache.indexCache0;
-                  IndexCache var9 = Skeleton.indexCache1;
-                  SequenceDefinition.SequenceDefinition_indexCache = var7;
-                  SequenceDefinition.__jh_f = var8;
-                  SequenceDefinition.__jh_q = var9;
-                  IndexCache var10 = ObjectSound.indexCache2;
-                  IndexCache var11 = class40.indexCache7;
-                  SpotAnimationDefinition.SpotAnimationDefinition_indexCache = var10;
-                  SpotAnimationDefinition.SpotAnimationDefinition_modelIndexCache = var11;
-                  UnitPriceComparator.method135(ObjectSound.indexCache2);
-                  IndexCache var12 = ObjectSound.indexCache2;
-                  VarpDefinition.__ix_m = var12;
-                  VarpDefinition.__ix_f = VarpDefinition.__ix_m.__s_396(16);
-                  IndexCache var13 = WorldMapIcon1.indexCache3;
-                  IndexCache var14 = class40.indexCache7;
-                  IndexCache var15 = WorldMapSection3.indexCache8;
-                  IndexCache var16 = ByteArrayPool.indexCache13;
-                  Widget.Widget_indexCache = var13;
-                  BufferedSource.__fh_x = var14;
-                  Widget.__ho_d = var15;
-                  class27.__aq_k = var16;
-                  Widget.widgets = new Widget[Widget.Widget_indexCache.__t_397()][];
-                  Widget.loadedWidgetGroups = new boolean[Widget.Widget_indexCache.__t_397()];
-                  IndexCache var17 = ObjectSound.indexCache2;
-                  class4.__o_m = var17;
-                  IndexCache var18 = ObjectSound.indexCache2;
-                  EnumDefinition.EnumDefinition_indexCache = var18;
-                  Frames.method3241(ObjectSound.indexCache2);
-                  IndexCache var19 = ObjectSound.indexCache2;
-                  ParamKeyDefinition.__jb_m = var19;
+                  Varcs.method2160(ObjectSound.archive2);
+                  Varps.method4393(ObjectSound.archive2);
+                  Archive var31 = ObjectSound.archive2;
+                  Archive var33 = class40.archive7;
+                  KitDefinition.KitDefinition_archive = var31;
+                  KitDefinition.field456 = var33;
+                  KitDefinition.KitDefinition_totalCount = KitDefinition.KitDefinition_archive.getGroupFileCount(3);
+                  RectangleMode.setObjectDefinitionArchives(ObjectSound.archive2, class40.archive7, Client.isLowDetail);
+                  IsaacCipher.setNpcDefinitionArchives(ObjectSound.archive2, class40.archive7);
+                  var30 = ObjectSound.archive2;
+                  StructDefinition.StructDefinition_archive = var30;
+                  Archive var5 = ObjectSound.archive2;
+                  Archive var6 = class40.archive7;
+                  boolean var7 = Client.isMembersWorld;
+                  Font var8 = ScriptEvent.fontPlain11;
+                  ItemDefinition.ItemDefinition_archive = var5;
+                  ItemDefinition.ItemDefinition_modelArchive = var6;
+                  class30.inMembersWorld = var7;
+                  class83.field1167 = ItemDefinition.ItemDefinition_archive.getGroupFileCount(10);
+                  class204.field1122 = var8;
+                  Archive var9 = ObjectSound.archive2;
+                  Archive var10 = AbstractArchive.archive0;
+                  Archive var11 = Skeleton.archive1;
+                  SequenceDefinition.SequenceDefinition_archive = var9;
+                  SequenceDefinition.field773 = var10;
+                  SequenceDefinition.field774 = var11;
+                  Archive var12 = ObjectSound.archive2;
+                  Archive var13 = class40.archive7;
+                  SpotAnimationDefinition.SpotAnimationDefinition_archive = var12;
+                  SpotAnimationDefinition.SpotAnimationDefinition_modelArchive = var13;
+                  GrandExchangeOfferUnitPriceComparator.setVarbitDefinitionArchive(ObjectSound.archive2);
+                  Archive var14 = ObjectSound.archive2;
+                  VarpDefinition.field943 = var14;
+                  VarpDefinition.field944 = VarpDefinition.field943.getGroupFileCount(16);
+                  Archive var15 = WorldMapIcon1.archive3;
+                  Archive var16 = class40.archive7;
+                  Archive var17 = WorldMapSection1.archive8;
+                  Archive var18 = ByteArrayPool.archive13;
+                  Widget.Widget_archive = var15;
+                  BufferedSource.field54 = var16;
+                  Widget.field955 = var17;
+                  class27.field1143 = var18;
+                  Widget.interfaceComponents = new Widget[Widget.Widget_archive.getGroupCount()][];
+                  Widget.loadedInterfaces = new boolean[Widget.Widget_archive.getGroupCount()];
+                  Archive var19 = ObjectSound.archive2;
+                  class4.InvDefinition_archive = var19;
+                  Archive var20 = ObjectSound.archive2;
+                  EnumDefinition.EnumDefinition_archive = var20;
+                  Frames.method3241(ObjectSound.archive2);
+                  Archive var21 = ObjectSound.archive2;
+                  ParamDefinition.ParamDefinition_archive = var21;
                   class196.varcs = new Varcs();
-                  class60.method1172(ObjectSound.indexCache2, WorldMapSection3.indexCache8, ByteArrayPool.indexCache13);
-                  IndexCache var20 = ObjectSound.indexCache2;
-                  IndexCache var21 = WorldMapSection3.indexCache8;
-                  HealthBarDefinition.__ii_m = var20;
-                  HealthBarDefinition.__ii_f = var21;
-                  IndexCache var22 = ObjectSound.indexCache2;
-                  IndexCache var23 = WorldMapSection3.indexCache8;
-                  WorldMapElement.__ic_m = var23;
-                  if(var22.__l_394()) {
-                     UserComparator4.WorldMapElement_count = var22.__s_396(35);
+                  class60.method1172(ObjectSound.archive2, WorldMapSection1.archive8, ByteArrayPool.archive13);
+                  Archive var22 = ObjectSound.archive2;
+                  Archive var23 = WorldMapSection1.archive8;
+                  HealthBarDefinition.field379 = var22;
+                  HealthBarDefinition.field380 = var23;
+                  Archive var24 = ObjectSound.archive2;
+                  Archive var25 = WorldMapSection1.archive8;
+                  WorldMapElement.WorldMapElement_archive = var25;
+                  if (var24.method2()) {
+                     UserComparator4.WorldMapElement_count = var24.getGroupFileCount(35);
                      Widget.WorldMapElement_cached = new WorldMapElement[UserComparator4.WorldMapElement_count];
 
-                     for(int var24 = 0; var24 < UserComparator4.WorldMapElement_count; ++var24) {
-                        byte[] var25 = var22.takeRecord(35, var24);
-                        Widget.WorldMapElement_cached[var24] = new WorldMapElement(var24);
-                        if(var25 != null) {
-                           Widget.WorldMapElement_cached[var24].read(new Buffer(var25));
-                           Widget.WorldMapElement_cached[var24].__w_409();
+                     for (int var26 = 0; var26 < UserComparator4.WorldMapElement_count; ++var26) {
+                        byte[] var27 = var24.takeFile(35, var26);
+                        Widget.WorldMapElement_cached[var26] = new WorldMapElement(var26);
+                        if (var27 != null) {
+                           Widget.WorldMapElement_cached[var26].decode(new Buffer(var27));
+                           Widget.WorldMapElement_cached[var26].method389();
                         }
                      }
                   }
@@ -308,177 +302,177 @@ public class class171 {
                   Login.Login_loadingPercent = 60;
                   Client.titleLoadingStage = 80;
                }
-            } else if(Client.titleLoadingStage == 80) {
+            } else if (Client.titleLoadingStage == 80) {
                var0 = 0;
-               if(UnitPriceComparator.compass == null) {
-                  UnitPriceComparator.compass = class322.readSprite(WorldMapSection3.indexCache8, class211.spriteIds.__m, 0);
+               if (GrandExchangeOfferUnitPriceComparator.compass == null) {
+                  GrandExchangeOfferUnitPriceComparator.compass = class322.readSprite(WorldMapSection1.archive8, Calendar.spriteIds.field878, 0);
                } else {
                   ++var0;
                }
 
-               if(FaceNormal.__el_gm == null) {
-                  FaceNormal.__el_gm = class322.readSprite(WorldMapSection3.indexCache8, class211.spriteIds.__f, 0);
+               if (FaceNormal.field345 == null) {
+                  FaceNormal.field345 = class322.readSprite(WorldMapSection1.archive8, Calendar.spriteIds.field879, 0);
                } else {
                   ++var0;
                }
 
-               IndexedSprite[] var27;
-               int var28;
-               if(class192.mapSceneSprites == null) {
-                  var2 = WorldMapSection3.indexCache8;
-                  var28 = class211.spriteIds.mapScenes;
-                  if(!SpriteMask.loadSprite(var2, var28, 0)) {
-                     var27 = null;
+               IndexedSprite[] var32;
+               int var34;
+               if (class192.mapSceneSprites == null) {
+                  var30 = WorldMapSection1.archive8;
+                  var34 = Calendar.spriteIds.mapScenes;
+                  if (!SpriteMask.loadSprite(var30, var34, 0)) {
+                     var32 = null;
                   } else {
-                     var27 = WorldMapLabel.createIndexedSpriteArray();
+                     var32 = WorldMapLabel.createIndexedSpriteArray();
                   }
 
-                  class192.mapSceneSprites = var27;
+                  class192.mapSceneSprites = var32;
                } else {
                   ++var0;
                }
 
-               Sprite[] var37;
-               if(class15.headIconPkSprites == null) {
-                  var2 = WorldMapSection3.indexCache8;
-                  var28 = class211.spriteIds.headIconsPk;
-                  if(!SpriteMask.loadSprite(var2, var28, 0)) {
-                     var37 = null;
+               Sprite[] var35;
+               if (class15.headIconPkSprites == null) {
+                  var30 = WorldMapSection1.archive8;
+                  var34 = Calendar.spriteIds.headIconsPk;
+                  if (!SpriteMask.loadSprite(var30, var34, 0)) {
+                     var35 = null;
                   } else {
-                     var37 = UserComparator9.createSpriteArray();
+                     var35 = UserComparator9.createSpriteArray();
                   }
 
-                  class15.headIconPkSprites = var37;
+                  class15.headIconPkSprites = var35;
                } else {
                   ++var0;
                }
 
-               if(ClientPreferences.headIconPrayerSprites == null) {
-                  var2 = WorldMapSection3.indexCache8;
-                  var28 = class211.spriteIds.headIconsPrayer;
-                  if(!SpriteMask.loadSprite(var2, var28, 0)) {
-                     var37 = null;
+               if (ClientPreferences.headIconPrayerSprites == null) {
+                  var30 = WorldMapSection1.archive8;
+                  var34 = Calendar.spriteIds.headIconsPrayer;
+                  if (!SpriteMask.loadSprite(var30, var34, 0)) {
+                     var35 = null;
                   } else {
-                     var37 = UserComparator9.createSpriteArray();
+                     var35 = UserComparator9.createSpriteArray();
                   }
 
-                  ClientPreferences.headIconPrayerSprites = var37;
+                  ClientPreferences.headIconPrayerSprites = var35;
                } else {
                   ++var0;
                }
 
-               if(Player.headIconHintSprites == null) {
-                  var2 = WorldMapSection3.indexCache8;
-                  var28 = class211.spriteIds.headIconsHint;
-                  if(!SpriteMask.loadSprite(var2, var28, 0)) {
-                     var37 = null;
+               if (Player.headIconHintSprites == null) {
+                  var30 = WorldMapSection1.archive8;
+                  var34 = Calendar.spriteIds.headIconsHint;
+                  if (!SpriteMask.loadSprite(var30, var34, 0)) {
+                     var35 = null;
                   } else {
-                     var37 = UserComparator9.createSpriteArray();
+                     var35 = UserComparator9.createSpriteArray();
                   }
 
-                  Player.headIconHintSprites = var37;
+                  Player.headIconHintSprites = var35;
                } else {
                   ++var0;
                }
 
-               if(class16.mapMarkerSprites == null) {
-                  var2 = WorldMapSection3.indexCache8;
-                  var28 = class211.spriteIds.mapMarkers;
-                  if(!SpriteMask.loadSprite(var2, var28, 0)) {
-                     var37 = null;
+               if (class16.mapMarkerSprites == null) {
+                  var30 = WorldMapSection1.archive8;
+                  var34 = Calendar.spriteIds.mapMarkers;
+                  if (!SpriteMask.loadSprite(var30, var34, 0)) {
+                     var35 = null;
                   } else {
-                     var37 = UserComparator9.createSpriteArray();
+                     var35 = UserComparator9.createSpriteArray();
                   }
 
-                  class16.mapMarkerSprites = var37;
+                  class16.mapMarkerSprites = var35;
                } else {
                   ++var0;
                }
 
-               if(KeyHandler.crossSprites == null) {
-                  var2 = WorldMapSection3.indexCache8;
-                  var28 = class211.spriteIds.crosses;
-                  if(!SpriteMask.loadSprite(var2, var28, 0)) {
-                     var37 = null;
+               if (KeyHandler.crossSprites == null) {
+                  var30 = WorldMapSection1.archive8;
+                  var34 = Calendar.spriteIds.crosses;
+                  if (!SpriteMask.loadSprite(var30, var34, 0)) {
+                     var35 = null;
                   } else {
-                     var37 = UserComparator9.createSpriteArray();
+                     var35 = UserComparator9.createSpriteArray();
                   }
 
-                  KeyHandler.crossSprites = var37;
+                  KeyHandler.crossSprites = var35;
                } else {
                   ++var0;
                }
 
-               if(class39.mapDotSprites == null) {
-                  var2 = WorldMapSection3.indexCache8;
-                  var28 = class211.spriteIds.mapDots;
-                  if(!SpriteMask.loadSprite(var2, var28, 0)) {
-                     var37 = null;
+               if (class39.mapDotSprites == null) {
+                  var30 = WorldMapSection1.archive8;
+                  var34 = Calendar.spriteIds.mapDots;
+                  if (!SpriteMask.loadSprite(var30, var34, 0)) {
+                     var35 = null;
                   } else {
-                     var37 = UserComparator9.createSpriteArray();
+                     var35 = UserComparator9.createSpriteArray();
                   }
 
-                  class39.mapDotSprites = var37;
+                  class39.mapDotSprites = var35;
                } else {
                   ++var0;
                }
 
-               if(class32.scrollBarSprites == null) {
-                  var2 = WorldMapSection3.indexCache8;
-                  var28 = class211.spriteIds.scrollBars;
-                  if(!SpriteMask.loadSprite(var2, var28, 0)) {
-                     var27 = null;
+               if (class32.scrollBarSprites == null) {
+                  var30 = WorldMapSection1.archive8;
+                  var34 = Calendar.spriteIds.scrollBars;
+                  if (!SpriteMask.loadSprite(var30, var34, 0)) {
+                     var32 = null;
                   } else {
-                     var27 = WorldMapLabel.createIndexedSpriteArray();
+                     var32 = WorldMapLabel.createIndexedSpriteArray();
                   }
 
-                  class32.scrollBarSprites = var27;
+                  class32.scrollBarSprites = var32;
                } else {
                   ++var0;
                }
 
-               if(WorldMapSectionType.modIconSprites == null) {
-                  var2 = WorldMapSection3.indexCache8;
-                  var28 = class211.spriteIds.modIcons;
-                  if(!SpriteMask.loadSprite(var2, var28, 0)) {
-                     var27 = null;
+               if (WorldMapSectionType.modIconSprites == null) {
+                  var30 = WorldMapSection1.archive8;
+                  var34 = Calendar.spriteIds.modIcons;
+                  if (!SpriteMask.loadSprite(var30, var34, 0)) {
+                     var32 = null;
                   } else {
-                     var27 = WorldMapLabel.createIndexedSpriteArray();
+                     var32 = WorldMapLabel.createIndexedSpriteArray();
                   }
 
-                  WorldMapSectionType.modIconSprites = var27;
+                  WorldMapSectionType.modIconSprites = var32;
                } else {
                   ++var0;
                }
 
-               if(var0 < 11) {
+               if (var0 < 11) {
                   Login.Login_loadingText = "Loading sprites - " + var0 * 100 / 12 + "%";
                   Login.Login_loadingPercent = 70;
                } else {
                   AbstractFont.AbstractFont_modIconSprites = WorldMapSectionType.modIconSprites;
-                  FaceNormal.__el_gm.normalize();
-                  var1 = (int)(Math.random() * 21.0D) - 10;
-                  int var29 = (int)(Math.random() * 21.0D) - 10;
-                  var28 = (int)(Math.random() * 21.0D) - 10;
-                  int var30 = (int)(Math.random() * 41.0D) - 20;
-                  class192.mapSceneSprites[0].shiftColors(var30 + var1, var30 + var29, var30 + var28);
+                  FaceNormal.field345.normalize();
+                  var29 = (int)(Math.random() * 21.0D) - 10;
+                  int var36 = (int)(Math.random() * 21.0D) - 10;
+                  var34 = (int)(Math.random() * 21.0D) - 10;
+                  int var38 = (int)(Math.random() * 41.0D) - 20;
+                  class192.mapSceneSprites[0].shiftColors(var38 + var29, var38 + var36, var38 + var34);
                   Login.Login_loadingText = "Loaded sprites";
                   Login.Login_loadingPercent = 70;
                   Client.titleLoadingStage = 90;
                }
-            } else if(Client.titleLoadingStage == 90) {
-               if(!class238.indexCache9.__l_394()) {
-                  Login.Login_loadingText = "Loading textures - " + "0%";
+            } else if (Client.titleLoadingStage == 90) {
+               if (!class238.archive9.method2()) {
+                  Login.Login_loadingText = "Loading textures - 0%";
                   Login.Login_loadingPercent = 90;
                } else {
-                  SecureRandomFuture.textureProvider = new TextureProvider(class238.indexCache9, WorldMapSection3.indexCache8, 20, 0.8D, Client.isLowDetail?64:128);
+                  SecureRandomFuture.textureProvider = new TextureProvider(class238.archive9, WorldMapSection1.archive8, 20, 0.8D, Client.isLowDetail ? 64 : 128);
                   Rasterizer3D.Rasterizer3D_setTextureLoader(SecureRandomFuture.textureProvider);
                   Rasterizer3D.Rasterizer3D_setBrightness(0.8D);
                   Client.titleLoadingStage = 100;
                }
-            } else if(Client.titleLoadingStage == 100) {
-               var0 = SecureRandomFuture.textureProvider.__m_212();
-               if(var0 < 100) {
+            } else if (Client.titleLoadingStage == 100) {
+               var0 = SecureRandomFuture.textureProvider.method323();
+               if (var0 < 100) {
                   Login.Login_loadingText = "Loading textures - " + var0 + "%";
                   Login.Login_loadingPercent = 90;
                } else {
@@ -486,56 +480,57 @@ public class class171 {
                   Login.Login_loadingPercent = 90;
                   Client.titleLoadingStage = 110;
                }
-            } else if(Client.titleLoadingStage == 110) {
+            } else if (Client.titleLoadingStage == 110) {
                Projectile.mouseRecorder = new MouseRecorder();
                GameShell.taskHandler.newThreadTask(Projectile.mouseRecorder, 10);
                Login.Login_loadingText = "Loaded input handler";
                Login.Login_loadingPercent = 92;
                Client.titleLoadingStage = 120;
-            } else if(Client.titleLoadingStage == 120) {
-               if(!class16.indexCache10.tryLoadRecordByNames("huffman", "")) {
-                  Login.Login_loadingText = "Loading wordpack - " + 0 + "%";
+            } else if (Client.titleLoadingStage == 120) {
+               if (!class16.archive10.tryLoadFileByNames("huffman", "")) {
+                  Login.Login_loadingText = "Loading wordpack - 0%";
                   Login.Login_loadingPercent = 94;
                } else {
-                  Huffman var26 = new Huffman(class16.indexCache10.takeRecordByNames("huffman", ""));
-                  class303.huffman = var26;
+                  Huffman var37 = new Huffman(class16.archive10.takeFileByNames("huffman", ""));
+                  class303.huffman = var37;
                   Login.Login_loadingText = "Loaded wordpack";
                   Login.Login_loadingPercent = 94;
                   Client.titleLoadingStage = 130;
                }
-            } else if(Client.titleLoadingStage == 130) {
-               if(!WorldMapIcon1.indexCache3.__l_394()) {
-                  Login.Login_loadingText = "Loading interfaces - " + WorldMapIcon1.indexCache3.loadPercent() * 4 / 5 + "%";
+            } else if (Client.titleLoadingStage == 130) {
+               if (!WorldMapIcon1.archive3.method2()) {
+                  Login.Login_loadingText = "Loading interfaces - " + WorldMapIcon1.archive3.loadPercent() * 4 / 5 + "%";
                   Login.Login_loadingPercent = 96;
-               } else if(!Formatting.indexCache12.__l_394()) {
-                  Login.Login_loadingText = "Loading interfaces - " + (80 + Formatting.indexCache12.loadPercent() / 6) + "%";
+               } else if (!Formatting.archive12.method2()) {
+                  Login.Login_loadingText = "Loading interfaces - " + (80 + Formatting.archive12.loadPercent() / 6) + "%";
                   Login.Login_loadingPercent = 96;
-               } else if(!ByteArrayPool.indexCache13.__l_394()) {
-                  Login.Login_loadingText = "Loading interfaces - " + (96 + ByteArrayPool.indexCache13.loadPercent() / 50) + "%";
+               } else if (!ByteArrayPool.archive13.method2()) {
+                  Login.Login_loadingText = "Loading interfaces - " + (96 + ByteArrayPool.archive13.loadPercent() / 50) + "%";
                   Login.Login_loadingPercent = 96;
                } else {
                   Login.Login_loadingText = "Loaded interfaces";
                   Login.Login_loadingPercent = 98;
                   Client.titleLoadingStage = 140;
                }
-            } else if(Client.titleLoadingStage == 140) {
+            } else if (Client.titleLoadingStage == 140) {
                Login.Login_loadingPercent = 100;
-               if(!ItemContainer.__bc_dm.tryLoadArchiveByName(WorldMapCacheName.WorldMapCacheName_details.name)) {
-                  Login.Login_loadingText = "Loading world map - " + ItemContainer.__bc_dm.archiveLoadPercentByName(WorldMapCacheName.WorldMapCacheName_details.name) / 10 + "%";
+               if (!ItemContainer.archive19.tryLoadGroupByName(WorldMapCacheName.WorldMapCacheName_details.name)) {
+                  Login.Login_loadingText = "Loading world map - " + ItemContainer.archive19.groupLoadPercentByName(WorldMapCacheName.WorldMapCacheName_details.name) / 10 + "%";
                } else {
-                  if(class60.worldMap0 == null) {
+                  if (class60.worldMap0 == null) {
                      class60.worldMap0 = new WorldMap();
-                     class60.worldMap0.init(ItemContainer.__bc_dm, WorldMapLabelSize.__s_dq, AbstractByteArrayCopier.__gu_et, class2.fontBold12, Client.fontsMap, class192.mapSceneSprites);
+                     class60.worldMap0.init(ItemContainer.archive19, WorldMapLabelSize.archive18, AbstractByteArrayCopier.archive20, class2.fontBold12, Client.fontsMap, class192.mapSceneSprites);
                   }
 
                   Login.Login_loadingText = "Loaded world map";
                   Client.titleLoadingStage = 150;
                }
-            } else if(Client.titleLoadingStage == 150) {
+            } else if (Client.titleLoadingStage == 150) {
                GameShell.updateGameState(10);
             }
          }
       }
+
    }
 
    @ObfuscatedName("ie")
@@ -543,111 +538,116 @@ public class class171 {
       signature = "(IIIILjava/lang/String;I)V",
       garbageValue = "49247882"
    )
-   static void method3494(int opIndex, int parentID, int childID, int itemID, String target) {
-      Widget var5 = class204.getWidgetChild(parentID, childID);
-      if(var5 != null) {
-         if(var5.onOp != null) {
+   static void method3494(int var0, int var1, int var2, int var3, String var4) {
+      Widget var5 = class204.getWidgetChild(var1, var2);
+      if (var5 != null) {
+         if (var5.onOp != null) {
             ScriptEvent var6 = new ScriptEvent();
             var6.widget = var5;
-            var6.opIndex = opIndex;
-            var6.targetName = target;
+            var6.opIndex = var0;
+            var6.targetName = var4;
             var6.args0 = var5.onOp;
-            AbstractIndexCache.runScript(var6);
+            AbstractArchive.runScript(var6);
          }
 
          boolean var11 = true;
-         if(var5.contentType > 0) {
+         if (var5.contentType > 0) {
             var11 = ViewportMouse.method2957(var5);
          }
 
-         if(var11) {
-            int var8 = class1.getWidgetClickMask(var5);
-            int var9 = opIndex - 1;
-            boolean var7 = (var8 >> var9 + 1 & 1) != 0;
-            if(var7) {
+         if (var11) {
+            int var7 = class1.getWidgetClickMask(var5);
+            int var8 = var0 - 1;
+            boolean var9 = (var7 >> var8 + 1 & 1) != 0;
+            if (var9) {
                PacketBufferNode var10;
-               if(opIndex == 1) {
-                  var10 = Interpreter.method1915(ClientPacket.__gs_bi, Client.packetWriter.isaacCipher);
-                  var10.packetBuffer.writeInt(parentID);
-                  var10.packetBuffer.writeShort(childID);
-                  var10.packetBuffer.writeShort(itemID);
-                  Client.packetWriter.__q_167(var10);
+               if (var0 == 1) {
+                  var10 = Interpreter.method1915(ClientPacket.field290, Client.packetWriter.isaacCipher);
+                  var10.packetBuffer.writeInt(var1);
+                  var10.packetBuffer.writeShort(var2);
+                  var10.packetBuffer.writeShort(var3);
+                  Client.packetWriter.method241(var10);
                }
 
-               if(opIndex == 2) {
-                  var10 = Interpreter.method1915(ClientPacket.__gs_b, Client.packetWriter.isaacCipher);
-                  var10.packetBuffer.writeInt(parentID);
-                  var10.packetBuffer.writeShort(childID);
-                  var10.packetBuffer.writeShort(itemID);
-                  Client.packetWriter.__q_167(var10);
+               if (var0 == 2) {
+                  var10 = Interpreter.method1915(ClientPacket.field243, Client.packetWriter.isaacCipher);
+                  var10.packetBuffer.writeInt(var1);
+                  var10.packetBuffer.writeShort(var2);
+                  var10.packetBuffer.writeShort(var3);
+                  Client.packetWriter.method241(var10);
                }
 
-               if(opIndex == 3) {
-                  var10 = Interpreter.method1915(ClientPacket.__gs_aa, Client.packetWriter.isaacCipher);
-                  var10.packetBuffer.writeInt(parentID);
-                  var10.packetBuffer.writeShort(childID);
-                  var10.packetBuffer.writeShort(itemID);
-                  Client.packetWriter.__q_167(var10);
+               if (var0 == 3) {
+                  var10 = Interpreter.method1915(ClientPacket.field270, Client.packetWriter.isaacCipher);
+                  var10.packetBuffer.writeInt(var1);
+                  var10.packetBuffer.writeShort(var2);
+                  var10.packetBuffer.writeShort(var3);
+                  Client.packetWriter.method241(var10);
                }
 
-               if(opIndex == 4) {
-                  var10 = Interpreter.method1915(ClientPacket.__gs_y, Client.packetWriter.isaacCipher);
-                  var10.packetBuffer.writeInt(parentID);
-                  var10.packetBuffer.writeShort(childID);
-                  var10.packetBuffer.writeShort(itemID);
-                  Client.packetWriter.__q_167(var10);
+               if (var0 == 4) {
+                  var10 = Interpreter.method1915(ClientPacket.field241, Client.packetWriter.isaacCipher);
+                  var10.packetBuffer.writeInt(var1);
+                  var10.packetBuffer.writeShort(var2);
+                  var10.packetBuffer.writeShort(var3);
+                  Client.packetWriter.method241(var10);
                }
 
-               if(opIndex == 5) {
-                  var10 = Interpreter.method1915(ClientPacket.__gs_ad, Client.packetWriter.isaacCipher);
-                  var10.packetBuffer.writeInt(parentID);
-                  var10.packetBuffer.writeShort(childID);
-                  var10.packetBuffer.writeShort(itemID);
-                  Client.packetWriter.__q_167(var10);
+               if (var0 == 5) {
+                  var10 = Interpreter.method1915(ClientPacket.field262, Client.packetWriter.isaacCipher);
+                  var10.packetBuffer.writeInt(var1);
+                  var10.packetBuffer.writeShort(var2);
+                  var10.packetBuffer.writeShort(var3);
+                  Client.packetWriter.method241(var10);
                }
 
-               if(opIndex == 6) {
-                  var10 = Interpreter.method1915(ClientPacket.__gs_br, Client.packetWriter.isaacCipher);
-                  var10.packetBuffer.writeInt(parentID);
-                  var10.packetBuffer.writeShort(childID);
-                  var10.packetBuffer.writeShort(itemID);
-                  Client.packetWriter.__q_167(var10);
+               if (var0 == 6) {
+                  var10 = Interpreter.method1915(ClientPacket.field288, Client.packetWriter.isaacCipher);
+                  var10.packetBuffer.writeInt(var1);
+                  var10.packetBuffer.writeShort(var2);
+                  var10.packetBuffer.writeShort(var3);
+                  Client.packetWriter.method241(var10);
                }
 
-               if(opIndex == 7) {
-                  var10 = Interpreter.method1915(ClientPacket.__gs_cu, Client.packetWriter.isaacCipher);
-                  var10.packetBuffer.writeInt(parentID);
-                  var10.packetBuffer.writeShort(childID);
-                  var10.packetBuffer.writeShort(itemID);
-                  Client.packetWriter.__q_167(var10);
+               if (var0 == 7) {
+                  var10 = Interpreter.method1915(ClientPacket.field307, Client.packetWriter.isaacCipher);
+                  var10.packetBuffer.writeInt(var1);
+                  var10.packetBuffer.writeShort(var2);
+                  var10.packetBuffer.writeShort(var3);
+                  Client.packetWriter.method241(var10);
                }
 
-               if(opIndex == 8) {
-                  var10 = Interpreter.method1915(ClientPacket.__gs_a, Client.packetWriter.isaacCipher);
-                  var10.packetBuffer.writeInt(parentID);
-                  var10.packetBuffer.writeShort(childID);
-                  var10.packetBuffer.writeShort(itemID);
-                  Client.packetWriter.__q_167(var10);
+               if (var0 == 8) {
+                  var10 = Interpreter.method1915(ClientPacket.field236, Client.packetWriter.isaacCipher);
+                  var10.packetBuffer.writeInt(var1);
+                  var10.packetBuffer.writeShort(var2);
+                  var10.packetBuffer.writeShort(var3);
+                  Client.packetWriter.method241(var10);
                }
 
-               if(opIndex == 9) {
-                  var10 = Interpreter.method1915(ClientPacket.__gs_cj, Client.packetWriter.isaacCipher);
-                  var10.packetBuffer.writeInt(parentID);
-                  var10.packetBuffer.writeShort(childID);
-                  var10.packetBuffer.writeShort(itemID);
-                  Client.packetWriter.__q_167(var10);
+               if (var0 == 9) {
+                  var10 = Interpreter.method1915(ClientPacket.field306, Client.packetWriter.isaacCipher);
+                  var10.packetBuffer.writeInt(var1);
+                  var10.packetBuffer.writeShort(var2);
+                  var10.packetBuffer.writeShort(var3);
+                  Client.packetWriter.method241(var10);
                }
 
-               if(opIndex == 10) {
-                  var10 = Interpreter.method1915(ClientPacket.__gs_m, Client.packetWriter.isaacCipher);
-                  var10.packetBuffer.writeInt(parentID);
-                  var10.packetBuffer.writeShort(childID);
-                  var10.packetBuffer.writeShort(itemID);
-                  Client.packetWriter.__q_167(var10);
+               if (var0 == 10) {
+                  var10 = Interpreter.method1915(ClientPacket.field222, Client.packetWriter.isaacCipher);
+                  var10.packetBuffer.writeInt(var1);
+                  var10.packetBuffer.writeShort(var2);
+                  var10.packetBuffer.writeShort(var3);
+                  Client.packetWriter.method241(var10);
                }
-
             }
          }
       }
+
+   }
+
+   static {
+      field1117 = false;
+      field1119 = new Hashtable(16);
    }
 }
diff --git a/runescape-client/src/main/java/class190.java b/runescape-client/src/main/java/class190.java
index b36e1c9dfa..0da28fa61f 100644
--- a/runescape-client/src/main/java/class190.java
+++ b/runescape-client/src/main/java/class190.java
@@ -58,19 +58,6 @@ public class class190 {
    @Export("xteaKeys")
    static int[][] xteaKeys;
 
-   static {
-      field2346 = new class190(7);
-      field2352 = new class190(15);
-      field2342 = new class190(14);
-      field2341 = new class190(6);
-      field2344 = new class190(4);
-      field2345 = new class190(5);
-      field2350 = new class190(2);
-      field2347 = new class190(3);
-      field2343 = new class190(5);
-      field2349 = new class190(4);
-   }
-
    @ObfuscatedSignature(
       signature = "(I)V",
       garbageValue = "7"
@@ -83,9 +70,10 @@ public class class190 {
       signature = "(I)Lbt;",
       garbageValue = "-68901151"
    )
-   static World method3672() {
-      World.__bt_g = 0;
-      return Fonts.method5647();
+   @Export("worldListStart")
+   static World worldListStart() {
+      World.worldListWorldCount = 0;
+      return Fonts.getNextWorldListWorld();
    }
 
    @ObfuscatedName("iv")
@@ -96,17 +84,17 @@ public class class190 {
    static final void method3669(int var0, int var1, int var2, int var3, int var4, int var5) {
       int var6 = var2 - var0;
       int var7 = var3 - var1;
-      int var8 = var6 >= 0?var6:-var6;
-      int var9 = var7 >= 0?var7:-var7;
+      int var8 = var6 >= 0 ? var6 : -var6;
+      int var9 = var7 >= 0 ? var7 : -var7;
       int var10 = var8;
-      if(var8 < var9) {
+      if (var8 < var9) {
          var10 = var9;
       }
 
-      if(var10 != 0) {
+      if (var10 != 0) {
          int var11 = (var6 << 16) / var10;
          int var12 = (var7 << 16) / var10;
-         if(var12 <= var11) {
+         if (var12 <= var11) {
             var11 = -var11;
          } else {
             var12 = -var12;
@@ -131,5 +119,19 @@ public class class190 {
          Rasterizer3D.method2985(var17, var19, var20);
          Rasterizer3D.method3020(var21, var23, var24, var17, var19, var20, var4);
       }
+
+   }
+
+   static {
+      field2346 = new class190(7);
+      field2352 = new class190(15);
+      field2342 = new class190(14);
+      field2341 = new class190(6);
+      field2344 = new class190(4);
+      field2345 = new class190(5);
+      field2350 = new class190(2);
+      field2347 = new class190(3);
+      field2343 = new class190(5);
+      field2349 = new class190(4);
    }
 }
diff --git a/runescape-client/src/main/java/class196.java b/runescape-client/src/main/java/class196.java
index 750c5159bc..5df771cfd5 100644
--- a/runescape-client/src/main/java/class196.java
+++ b/runescape-client/src/main/java/class196.java
@@ -12,17 +12,13 @@ public class class196 {
    @Export("varcs")
    static Varcs varcs;
 
-   static {
-      new HashMap();
-   }
-
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "(ILcg;ZB)I",
       garbageValue = "125"
    )
    static int method3736(int var0, Script var1, boolean var2) {
-      return var0 < 1000?Canvas.method861(var0, var1, var2):(var0 < 1100?class1.method8(var0, var1, var2):(var0 < 1200?StructDefinition.method4952(var0, var1, var2):(var0 < 1300?class32.method576(var0, var1, var2):(var0 < 1400?WorldMapAreaData.method710(var0, var1, var2):(var0 < 1500?class11.method141(var0, var1, var2):(var0 < 1600?WorldMapSectionType.method253(var0, var1, var2):(var0 < 1700?ScriptEvent.method1185(var0, var1, var2):(var0 < 1800?Formatting.method2023(var0, var1, var2):(var0 < 1900?class16.method188(var0, var1, var2):(var0 < 2000?FriendSystem.method1867(var0, var1, var2):(var0 < 2100?class1.method8(var0, var1, var2):(var0 < 2200?StructDefinition.method4952(var0, var1, var2):(var0 < 2300?class32.method576(var0, var1, var2):(var0 < 2400?WorldMapAreaData.method710(var0, var1, var2):(var0 < 2500?class11.method141(var0, var1, var2):(var0 < 2600?ViewportMouse.method2983(var0, var1, var2):(var0 < 2700?GrandExchangeEvents.method75(var0, var1, var2):(var0 < 2800?class11.method146(var0, var1, var2):(var0 < 2900?class15.method182(var0, var1, var2):(var0 < 3000?FriendSystem.method1867(var0, var1, var2):(var0 < 3200?class4.method54(var0, var1, var2):(var0 < 3300?WorldComparator.method68(var0, var1, var2):(var0 < 3400?ScriptEvent.method1187(var0, var1, var2):(var0 < 3500?Formatting.method2022(var0, var1, var2):(var0 < 3700?FontName.method5639(var0, var1, var2):(var0 < 4000?class248.method4741(var0, var1, var2):(var0 < 4100?TextureProvider.method2752(var0, var1, var2):(var0 < 4200?class211.method4103(var0, var1, var2):(var0 < 4300?class1.method16(var0, var1, var2):(var0 < 5100?DynamicObject.method2223(var0, var1, var2):(var0 < 5400?UserComparator4.method3335(var0, var1, var2):(var0 < 5600?OwnWorldComparator.method1285(var0, var1, var2):(var0 < 5700?Decimator.method2492(var0, var1, var2):(var0 < 6300?class229.method4513(var0, var1, var2):(var0 < 6600?class31.method573(var0, var1, var2):(var0 < 6700?class54.method1093(var0, var1, var2):2))))))))))))))))))))))))))))))))))));
+      return var0 < 1000 ? Canvas.method861(var0, var1, var2) : (var0 < 1100 ? class1.method8(var0, var1, var2) : (var0 < 1200 ? StructDefinition.method4952(var0, var1, var2) : (var0 < 1300 ? class32.method576(var0, var1, var2) : (var0 < 1400 ? WorldMapAreaData.method710(var0, var1, var2) : (var0 < 1500 ? GrandExchangeOfferNameComparator.method141(var0, var1, var2) : (var0 < 1600 ? WorldMapSectionType.method253(var0, var1, var2) : (var0 < 1700 ? ScriptEvent.method1185(var0, var1, var2) : (var0 < 1800 ? Formatting.method2023(var0, var1, var2) : (var0 < 1900 ? class16.method188(var0, var1, var2) : (var0 < 2000 ? FriendSystem.method1867(var0, var1, var2) : (var0 < 2100 ? class1.method8(var0, var1, var2) : (var0 < 2200 ? StructDefinition.method4952(var0, var1, var2) : (var0 < 2300 ? class32.method576(var0, var1, var2) : (var0 < 2400 ? WorldMapAreaData.method710(var0, var1, var2) : (var0 < 2500 ? GrandExchangeOfferNameComparator.method141(var0, var1, var2) : (var0 < 2600 ? ViewportMouse.method2983(var0, var1, var2) : (var0 < 2700 ? GrandExchangeEvents.method75(var0, var1, var2) : (var0 < 2800 ? GrandExchangeOfferNameComparator.method146(var0, var1, var2) : (var0 < 2900 ? class15.method182(var0, var1, var2) : (var0 < 3000 ? FriendSystem.method1867(var0, var1, var2) : (var0 < 3200 ? class4.method54(var0, var1, var2) : (var0 < 3300 ? GrandExchangeOfferWorldComparator.method68(var0, var1, var2) : (var0 < 3400 ? ScriptEvent.method1187(var0, var1, var2) : (var0 < 3500 ? Formatting.method2022(var0, var1, var2) : (var0 < 3700 ? FontName.method5639(var0, var1, var2) : (var0 < 4000 ? class248.method4741(var0, var1, var2) : (var0 < 4100 ? TextureProvider.method2752(var0, var1, var2) : (var0 < 4200 ? Calendar.method4103(var0, var1, var2) : (var0 < 4300 ? class1.method16(var0, var1, var2) : (var0 < 5100 ? DynamicObject.method2223(var0, var1, var2) : (var0 < 5400 ? UserComparator4.method3335(var0, var1, var2) : (var0 < 5600 ? GrandExchangeOfferOwnWorldComparator.method1285(var0, var1, var2) : (var0 < 5700 ? Decimator.method2492(var0, var1, var2) : (var0 < 6300 ? class229.method4513(var0, var1, var2) : (var0 < 6600 ? class31.method573(var0, var1, var2) : (var0 < 6700 ? class54.method1093(var0, var1, var2) : 2))))))))))))))))))))))))))))))))))));
    }
 
    @ObfuscatedName("u")
@@ -31,7 +27,7 @@ public class class196 {
       garbageValue = "-127"
    )
    static void method3740() {
-      if(Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) {
+      if (Client.Login_isUsernameRemembered && Login.Login_username != null && Login.Login_username.length() > 0) {
          Login.currentLoginField = 1;
       } else {
          Login.currentLoginField = 0;
@@ -45,6 +41,10 @@ public class class196 {
       garbageValue = "1247389467"
    )
    static final String method3735(int var0) {
-      return var0 < 100000?"<col=ffff00>" + var0 + "</col>":(var0 < 10000000?"<col=ffffff>" + var0 / 1000 + "K" + "</col>":"<col=00ff80>" + var0 / 1000000 + "M" + "</col>");
+      return var0 < 100000 ? "<col=ffff00>" + var0 + "</col>" : (var0 < 10000000 ? "<col=ffffff>" + var0 / 1000 + "K</col>" : "<col=00ff80>" + var0 / 1000000 + "M</col>");
+   }
+
+   static {
+      new HashMap();
    }
 }
diff --git a/runescape-client/src/main/java/class198.java b/runescape-client/src/main/java/class198.java
index bf77a5a5b6..8c993792a7 100644
--- a/runescape-client/src/main/java/class198.java
+++ b/runescape-client/src/main/java/class198.java
@@ -9,6 +9,6 @@ public class class198 {
       garbageValue = "1713547686"
    )
    static String method3745(Widget var0) {
-      return class211.method4107(class1.getWidgetClickMask(var0)) == 0?null:(var0.spellActionName != null && var0.spellActionName.trim().length() != 0?var0.spellActionName:null);
+      return Calendar.method4107(class1.getWidgetClickMask(var0)) == 0 ? null : (var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null);
    }
 }
diff --git a/runescape-client/src/main/java/class2.java b/runescape-client/src/main/java/class2.java
index 7c697769f4..988d364e39 100644
--- a/runescape-client/src/main/java/class2.java
+++ b/runescape-client/src/main/java/class2.java
@@ -9,8 +9,8 @@ final class class2 implements class0 {
    @ObfuscatedSignature(
       signature = "Lit;"
    )
-   @Export("indexCache14")
-   static IndexCache indexCache14;
+   @Export("archive14")
+   static Archive archive14;
    @ObfuscatedName("ee")
    @ObfuscatedGetter(
       intValue = -753026759
@@ -39,7 +39,7 @@ final class class2 implements class0 {
       garbageValue = "704451908"
    )
    public Object vmethod46(Buffer var1) {
-      return Long.valueOf(var1.readLong());
+      return var1.readLong();
    }
 
    @ObfuscatedName("g")
@@ -48,7 +48,7 @@ final class class2 implements class0 {
       garbageValue = "1518625016"
    )
    void method21(Long var1, Buffer var2) {
-      var2.writeLong(var1.longValue());
+      var2.writeLong(var1);
    }
 
    @ObfuscatedName("q")
@@ -56,40 +56,39 @@ final class class2 implements class0 {
       signature = "(Lir;Lir;ZII)V",
       garbageValue = "-1535318699"
    )
-   static void method27(AbstractIndexCache var0, AbstractIndexCache var1, boolean var2, int var3) {
-      if(Login.__cu_f) {
-         if(var3 == 4) {
+   static void method27(AbstractArchive var0, AbstractArchive var1, boolean var2, int var3) {
+      if (Login.field465) {
+         if (var3 == 4) {
             Login.loginIndex = 4;
          }
-
       } else {
          Login.loginIndex = var3;
          Rasterizer2D.Rasterizer2D_clear();
-         byte[] var4 = var0.takeRecordByNames("title.jpg", "");
+         byte[] var4 = var0.takeFileByNames("title.jpg", "");
          Login.leftTitleSprite = class27.convertJpgToSprite(var4);
          Fonts.rightTitleSprite = Login.leftTitleSprite.copy();
-         if((Client.worldProperties & 0x20000000) != 0) {
+         if ((Client.worldProperties & 536870912) != 0) {
             WorldMapSectionType.logoSprite = MenuAction.loadIndexedSpriteByName(var1, "logo_deadman_mode", "");
          } else {
             WorldMapSectionType.logoSprite = MenuAction.loadIndexedSpriteByName(var1, "logo", "");
          }
 
          Login.titleboxSprite = MenuAction.loadIndexedSpriteByName(var1, "titlebox", "");
-         IndexCacheLoader.titlebuttonSprite = MenuAction.loadIndexedSpriteByName(var1, "titlebutton", "");
-         int var6 = var1.getArchiveId("runes");
-         int var7 = var1.getRecordId(var6, "");
-         IndexedSprite[] var8;
-         if(!SpriteMask.loadSprite(var1, var6, var7)) {
-            var8 = null;
+         ArchiveLoader.titlebuttonSprite = MenuAction.loadIndexedSpriteByName(var1, "titlebutton", "");
+         int var5 = var1.getGroupId("runes");
+         int var6 = var1.getFileId(var5, "");
+         IndexedSprite[] var7;
+         if (!SpriteMask.loadSprite(var1, var5, var6)) {
+            var7 = null;
          } else {
-            var8 = WorldMapLabel.createIndexedSpriteArray();
+            var7 = WorldMapLabel.createIndexedSpriteArray();
          }
 
-         WorldMapEvent.runesSprite = var8;
-         var7 = var1.getArchiveId("title_mute");
-         int var10 = var1.getRecordId(var7, "");
+         WorldMapEvent.runesSprite = var7;
+         var6 = var1.getGroupId("title_mute");
+         int var8 = var1.getFileId(var6, "");
          IndexedSprite[] var9;
-         if(!SpriteMask.loadSprite(var1, var7, var10)) {
+         if (!SpriteMask.loadSprite(var1, var6, var8)) {
             var9 = null;
          } else {
             var9 = WorldMapLabel.createIndexedSpriteArray();
@@ -103,23 +102,23 @@ final class class2 implements class0 {
          class168.optionButtonSpriteSubWidth = Login.options_buttons_0Sprite.subWidth;
          GroundItemPile.optionButtonSpriteSubHeight = Login.options_buttons_0Sprite.subHeight;
          class16.loginScreenRunesAnimation = new LoginScreenAnimation(WorldMapEvent.runesSprite);
-         if(var2) {
+         if (var2) {
             Login.Login_username = "";
             Login.Login_password = "";
          }
 
          class13.otpInt = 0;
          Login.otp = "";
-         Login.__cu_ba = true;
+         Login.field470 = true;
          Login.worldSelectOpen = false;
-         if(!ReflectionCheck.clientPreferences.titleMusicDisabled) {
-            Canvas.method858(2, UserComparator3.indexCache6, "scape main", "", 255, false);
+         if (!ReflectionCheck.clientPreferences.titleMusicDisabled) {
+            Canvas.method858(2, UserComparator3.archive6, "scape main", "", 255, false);
          } else {
             AbstractSocket.method3488(2);
          }
 
          UserComparator9.method3343(false);
-         Login.__cu_f = true;
+         Login.field465 = true;
          Login.xPadding = (SoundCache.canvasWidth - 765) / 2;
          Login.loginBoxX = Login.xPadding + 202;
          Varps.loginBoxCenter = Login.loginBoxX + 180;
@@ -127,6 +126,7 @@ final class class2 implements class0 {
          Fonts.rightTitleSprite.drawAt(Login.xPadding + 382, 0);
          WorldMapSectionType.logoSprite.drawAt(Login.xPadding + 382 - WorldMapSectionType.logoSprite.subWidth / 2, 18);
       }
+
    }
 
    @ObfuscatedName("w")
@@ -134,11 +134,11 @@ final class class2 implements class0 {
       signature = "(Lir;Ljava/lang/String;Ljava/lang/String;B)[Lln;",
       garbageValue = "0"
    )
-   public static Sprite[] method20(AbstractIndexCache var0, String var1, String var2) {
-      int var3 = var0.getArchiveId(var1);
-      int var4 = var0.getRecordId(var3, var2);
+   public static Sprite[] method20(AbstractArchive var0, String var1, String var2) {
+      int var3 = var0.getGroupId(var1);
+      int var4 = var0.getFileId(var3, var2);
       Sprite[] var5;
-      if(!SpriteMask.loadSprite(var0, var3, var4)) {
+      if (!SpriteMask.loadSprite(var0, var3, var4)) {
          var5 = null;
       } else {
          var5 = UserComparator9.createSpriteArray();
diff --git a/runescape-client/src/main/java/class203.java b/runescape-client/src/main/java/class203.java
index 57b042deea..8761324d52 100644
--- a/runescape-client/src/main/java/class203.java
+++ b/runescape-client/src/main/java/class203.java
@@ -26,7 +26,7 @@ public class class203 {
    @Export("currentTimeMs")
    public static synchronized long currentTimeMs() {
       long var0 = System.currentTimeMillis();
-      if(var0 < ModelData0.currentTimeMsLast) {
+      if (var0 < ModelData0.currentTimeMsLast) {
          currentTimeMsOffset += ModelData0.currentTimeMsLast - var0;
       }
 
@@ -36,30 +36,27 @@ public class class203 {
 
    @ObfuscatedName("m")
    public static final void method4010(long var0) {
-      if(var0 > 0L) {
-         if(var0 % 10L == 0L) {
+      if (var0 > 0L) {
+         if (var0 % 10L == 0L) {
             long var2 = var0 - 1L;
 
             try {
                Thread.sleep(var2);
-            } catch (InterruptedException var8) {
-               ;
+            } catch (InterruptedException var7) {
             }
 
             try {
                Thread.sleep(1L);
-            } catch (InterruptedException var7) {
-               ;
+            } catch (InterruptedException var6) {
             }
          } else {
             try {
                Thread.sleep(var0);
-            } catch (InterruptedException var6) {
-               ;
+            } catch (InterruptedException var5) {
             }
          }
-
       }
+
    }
 
    @ObfuscatedName("w")
@@ -68,10 +65,10 @@ public class class203 {
       garbageValue = "571835999"
    )
    public static void method4008(int var0) {
-      if(class214.__hf_o != 0) {
-         WorldMapLabel.__aj_e = var0;
+      if (class214.field1129 != 0) {
+         WorldMapLabel.field1039 = var0;
       } else {
-         class214.midiPcmStream.__m_340(var0);
+         class214.midiPcmStream.method169(var0);
       }
 
    }
diff --git a/runescape-client/src/main/java/class204.java b/runescape-client/src/main/java/class204.java
index 191a9e79af..91a9695535 100644
--- a/runescape-client/src/main/java/class204.java
+++ b/runescape-client/src/main/java/class204.java
@@ -5,26 +5,14 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("gx")
 public class class204 {
    @ObfuscatedName("x")
-   static final int[] __gx_x;
+   static final int[] field1120;
    @ObfuscatedName("d")
-   static final int[] __gx_d;
+   static final int[] field1121;
    @ObfuscatedName("n")
    @ObfuscatedSignature(
       signature = "Lkk;"
    )
-   public static Font __gx_n;
-
-   static {
-      __gx_x = new int[2048];
-      __gx_d = new int[2048];
-      double var0 = 0.0030679615757712823D;
-
-      for(int var2 = 0; var2 < 2048; ++var2) {
-         __gx_x[var2] = (int)(65536.0D * Math.sin(var0 * (double)var2));
-         __gx_d[var2] = (int)(65536.0D * Math.cos(var0 * (double)var2));
-      }
-
-   }
+   public static Font field1122;
 
    @ObfuscatedName("f")
    @ObfuscatedSignature(
@@ -34,7 +22,7 @@ public class class204 {
    @Export("getWidgetChild")
    public static Widget getWidgetChild(int var0, int var1) {
       Widget var2 = Huffman.getWidget(var0);
-      return var1 == -1?var2:(var2 != null && var2.children != null && var1 < var2.children.length?var2.children[var1]:null);
+      return var1 == -1 ? var2 : (var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null);
    }
 
    @ObfuscatedName("f")
@@ -42,10 +30,10 @@ public class class204 {
       signature = "(Lir;Ljava/lang/String;Ljava/lang/String;IZB)V",
       garbageValue = "0"
    )
-   public static void method4011(AbstractIndexCache var0, String var1, String var2, int var3, boolean var4) {
-      int var5 = var0.getArchiveId(var1);
-      int var6 = var0.getRecordId(var5, var2);
-      Login.method2076(var0, var5, var6, var3, var4);
+   public static void method4011(AbstractArchive archive, String groupName, String fileName, int var3, boolean var4) {
+      int var5 = archive.getGroupId(groupName);
+      int var6 = archive.getFileId(var5, fileName);
+      Login.method2076(archive, var5, var6, var3, var4);
    }
 
    @ObfuscatedName("w")
@@ -54,43 +42,56 @@ public class class204 {
       garbageValue = "64"
    )
    static final void method4013(byte[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, CollisionMap[] var8) {
-      int var10;
-      for(int var9 = 0; var9 < 8; ++var9) {
-         for(var10 = 0; var10 < 8; ++var10) {
-            if(var9 + var2 > 0 && var9 + var2 < 103 && var3 + var10 > 0 && var3 + var10 < 103) {
-               var8[var1].flags[var9 + var2][var3 + var10] &= -16777217;
+      int var9;
+      for (int var10 = 0; var10 < 8; ++var10) {
+         for (var9 = 0; var9 < 8; ++var9) {
+            if (var10 + var2 > 0 && var10 + var2 < 103 && var3 + var9 > 0 && var3 + var9 < 103) {
+               int[] var11 = var8[var1].flags[var10 + var2];
+               var11[var3 + var9] &= -16777217;
             }
          }
       }
 
-      Buffer var21 = new Buffer(var0);
+      Buffer var18 = new Buffer(var0);
 
-      for(var10 = 0; var10 < 4; ++var10) {
-         for(int var11 = 0; var11 < 64; ++var11) {
-            for(int var12 = 0; var12 < 64; ++var12) {
-               if(var10 == var4 && var11 >= var5 && var11 < var5 + 8 && var12 >= var6 && var12 < var6 + 8) {
-                  int var15 = var2 + CollisionMap.method3632(var11 & 7, var12 & 7, var7);
-                  int var18 = var11 & 7;
-                  int var19 = var12 & 7;
-                  int var20 = var7 & 3;
+      for (var9 = 0; var9 < 4; ++var9) {
+         for (int var19 = 0; var19 < 64; ++var19) {
+            for (int var12 = 0; var12 < 64; ++var12) {
+               if (var9 == var4 && var19 >= var5 && var19 < var5 + 8 && var12 >= var6 && var12 < var6 + 8) {
+                  int var13 = var2 + CollisionMap.method3632(var19 & 7, var12 & 7, var7);
+                  int var14 = var19 & 7;
+                  int var15 = var12 & 7;
+                  int var16 = var7 & 3;
                   int var17;
-                  if(var20 == 0) {
-                     var17 = var19;
-                  } else if(var20 == 1) {
-                     var17 = 7 - var18;
-                  } else if(var20 == 2) {
-                     var17 = 7 - var19;
+                  if (var16 == 0) {
+                     var17 = var15;
+                  } else if (var16 == 1) {
+                     var17 = 7 - var14;
+                  } else if (var16 == 2) {
+                     var17 = 7 - var15;
                   } else {
-                     var17 = var18;
+                     var17 = var14;
                   }
 
-                  TotalQuantityComparator.loadTerrain(var21, var1, var15, var3 + var17, 0, 0, var7);
+                  GrandExchangeOfferTotalQuantityComparator.loadTerrain(var18, var1, var13, var3 + var17, 0, 0, var7);
                } else {
-                  TotalQuantityComparator.loadTerrain(var21, 0, -1, -1, 0, 0, 0);
+                  GrandExchangeOfferTotalQuantityComparator.loadTerrain(var18, 0, -1, -1, 0, 0, 0);
                }
             }
          }
       }
 
    }
+
+   static {
+      field1120 = new int[2048];
+      field1121 = new int[2048];
+      double var0 = 0.0030679615757712823D;
+
+      for (int var2 = 0; var2 < 2048; ++var2) {
+         field1120[var2] = (int)(65536.0D * Math.sin(var0 * (double)var2));
+         field1121[var2] = (int)(65536.0D * Math.cos(var0 * (double)var2));
+      }
+
+   }
 }
diff --git a/runescape-client/src/main/java/class206.java b/runescape-client/src/main/java/class206.java
index 05ab4835f3..b30272a9cb 100644
--- a/runescape-client/src/main/java/class206.java
+++ b/runescape-client/src/main/java/class206.java
@@ -1,3 +1,4 @@
+import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
@@ -8,7 +9,8 @@ public class class206 {
       signature = "(I)Z",
       garbageValue = "-1763054678"
    )
-   static boolean method4028() {
+   @Export("getTapToDrop")
+   static boolean getTapToDrop() {
       return Client.tapToDrop;
    }
 }
diff --git a/runescape-client/src/main/java/class21.java b/runescape-client/src/main/java/class21.java
index 6aa5d7d036..c7fa01f8f1 100644
--- a/runescape-client/src/main/java/class21.java
+++ b/runescape-client/src/main/java/class21.java
@@ -7,7 +7,7 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("b")
 public abstract class class21 {
    @ObfuscatedName("by")
-   static String __b_by;
+   static String field1123;
    @ObfuscatedName("m")
    @ObfuscatedGetter(
       intValue = -474193537
@@ -60,7 +60,8 @@ public abstract class class21 {
    @ObfuscatedSignature(
       signature = "[[[[Lv;"
    )
-   class25[][][][] field144;
+   @Export("decorations")
+   WorldMapDecoration[][][][] decorations;
    @ObfuscatedName("i")
    boolean field157;
    @ObfuscatedName("a")
@@ -95,16 +96,16 @@ public abstract class class21 {
       signature = "(Lir;B)V",
       garbageValue = "-108"
    )
-   void method263(AbstractIndexCache var1) {
-      if(!this.method271()) {
-         byte[] var2 = var1.takeRecord(this.field150, this.field152);
-         if(var2 != null) {
+   void method263(AbstractArchive var1) {
+      if (!this.method271()) {
+         byte[] var2 = var1.takeFile(this.field150, this.field152);
+         if (var2 != null) {
             this.vmethod715(new Buffer(var2));
             this.field157 = true;
             this.field153 = true;
          }
-
       }
+
    }
 
    @ObfuscatedName("x")
@@ -113,11 +114,11 @@ public abstract class class21 {
       garbageValue = "-2111523326"
    )
    void method282() {
-      this.field151 = null;
-      this.field145 = null;
-      this.field154 = null;
-      this.field155 = null;
-      this.field144 = null;
+      this.field151 = ((short[][][])null);
+      this.field145 = ((short[][][])null);
+      this.field154 = ((byte[][][])null);
+      this.field155 = ((byte[][][])null);
+      this.decorations = ((WorldMapDecoration[][][][])null);
       this.field157 = false;
       this.field153 = false;
    }
@@ -129,14 +130,14 @@ public abstract class class21 {
    )
    void method259(int var1, int var2, Buffer var3) {
       int var4 = var3.readUnsignedByte();
-      if(var4 != 0) {
-         if((var4 & 1) != 0) {
+      if (var4 != 0) {
+         if ((var4 & 1) != 0) {
             this.method260(var1, var2, var3, var4);
          } else {
             this.method257(var1, var2, var3, var4);
          }
-
       }
+
    }
 
    @ObfuscatedName("a")
@@ -146,7 +147,7 @@ public abstract class class21 {
    )
    void method260(int var1, int var2, Buffer var3, int var4) {
       boolean var5 = (var4 & 2) != 0;
-      if(var5) {
+      if (var5) {
          this.field145[0][var1][var2] = (short)var3.readUnsignedByte();
       }
 
@@ -165,31 +166,31 @@ public abstract class class21 {
       this.field151[0][var1][var2] = (short)var3.readUnsignedByte();
       int var8;
       int var9;
-      int var11;
-      if(var6) {
+      int var10;
+      if (var6) {
          var8 = var3.readUnsignedByte();
 
-         for(var9 = 0; var9 < var8; ++var9) {
-            int var10 = var3.readUnsignedByte();
-            if(var10 != 0) {
-               this.field145[var9][var1][var2] = (short)var10;
-               var11 = var3.readUnsignedByte();
-               this.field154[var9][var1][var2] = (byte)(var11 >> 2);
-               this.field155[var9][var1][var2] = (byte)(var11 & 3);
+         for (var9 = 0; var9 < var8; ++var9) {
+            int var11 = var3.readUnsignedByte();
+            if (var11 != 0) {
+               this.field145[var9][var1][var2] = (short)var11;
+               var10 = var3.readUnsignedByte();
+               this.field154[var9][var1][var2] = (byte)(var10 >> 2);
+               this.field155[var9][var1][var2] = (byte)(var10 & 3);
             }
          }
       }
 
-      if(var7) {
-         for(var8 = 0; var8 < var5; ++var8) {
+      if (var7) {
+         for (var8 = 0; var8 < var5; ++var8) {
             var9 = var3.readUnsignedByte();
-            if(var9 != 0) {
-               class25[] var14 = this.field144[var8][var1][var2] = new class25[var9];
+            if (var9 != 0) {
+               WorldMapDecoration[] var14 = this.decorations[var8][var1][var2] = new WorldMapDecoration[var9];
 
-               for(var11 = 0; var11 < var9; ++var11) {
-                  int var12 = var3.__ap_310();
+               for (var10 = 0; var10 < var9; ++var10) {
+                  int var12 = var3.method51();
                   int var13 = var3.readUnsignedByte();
-                  var14[var11] = new class25(var12, var13 >> 2, var13 & 3);
+                  var14[var10] = new WorldMapDecoration(var12, var13 >> 2, var13 & 3);
                }
             }
          }
@@ -221,116 +222,116 @@ public abstract class class21 {
       garbageValue = "-3"
    )
    static final void method293(PacketBuffer var0) {
-      for(int var1 = 0; var1 < Players.__cq_n; ++var1) {
-         int var2 = Players.__cq_i[var1];
+      for (int var1 = 0; var1 < Players.field736; ++var1) {
+         int var2 = Players.field737[var1];
          Player var3 = Client.players[var2];
          int var4 = var0.readUnsignedByte();
-         if((var4 & 8) != 0) {
+         if ((var4 & 8) != 0) {
             var4 += var0.readUnsignedByte() << 8;
          }
 
          byte var5 = -1;
          int var6;
          int var7;
+         int var8;
          int var9;
          int var10;
-         int var13;
-         if((var4 & 64) != 0) {
-            var6 = var0.__bb_317();
-            int var8;
+         if ((var4 & 64) != 0) {
+            var6 = var0.method58();
             int var11;
             int var12;
-            if(var6 > 0) {
-               for(var7 = 0; var7 < var6; ++var7) {
+            int var13;
+            if (var6 > 0) {
+               for (var7 = 0; var7 < var6; ++var7) {
+                  var8 = -1;
                   var9 = -1;
-                  var10 = -1;
-                  var11 = -1;
-                  var8 = var0.__ae_307();
-                  if(var8 == 32767) {
-                     var8 = var0.__ae_307();
-                     var10 = var0.__ae_307();
-                     var9 = var0.__ae_307();
-                     var11 = var0.__ae_307();
-                  } else if(var8 != 32766) {
-                     var10 = var0.__ae_307();
+                  var12 = -1;
+                  var11 = var0.readUShortSmart();
+                  if (var11 == 32767) {
+                     var11 = var0.readUShortSmart();
+                     var9 = var0.readUShortSmart();
+                     var8 = var0.readUShortSmart();
+                     var12 = var0.readUShortSmart();
+                  } else if (var11 != 32766) {
+                     var9 = var0.readUShortSmart();
                   } else {
-                     var8 = -1;
+                     var11 = -1;
                   }
 
-                  var12 = var0.__ae_307();
-                  var3.addHitSplat(var8, var10, var9, var11, Client.cycle, var12);
+                  var13 = var0.readUShortSmart();
+                  var3.addHitSplat(var11, var9, var8, var12, Client.cycle, var13);
                }
             }
 
             var7 = var0.readUnsignedByteNegate();
-            if(var7 > 0) {
-               for(var8 = 0; var8 < var7; ++var8) {
-                  var9 = var0.__ae_307();
-                  var10 = var0.__ae_307();
-                  if(var10 != 32767) {
-                     var11 = var0.__ae_307();
-                     var12 = var0.__bb_317();
-                     var13 = var10 > 0?var0.readUnsignedByte():var12;
-                     var3.addHealthBar(var9, Client.cycle, var10, var11, var12, var13);
+            if (var7 > 0) {
+               for (var11 = 0; var11 < var7; ++var11) {
+                  var8 = var0.readUShortSmart();
+                  var9 = var0.readUShortSmart();
+                  if (var9 != 32767) {
+                     var12 = var0.readUShortSmart();
+                     var13 = var0.method58();
+                     var10 = var9 > 0 ? var0.readUnsignedByte() : var13;
+                     var3.addHealthBar(var8, Client.cycle, var9, var12, var13, var10);
                   } else {
-                     var3.removeHealthBar(var9);
+                     var3.removeHealthBar(var8);
                   }
                }
             }
          }
 
-         if((var4 & 512) != 0) {
-            var3.spotAnimation = var0.__bm_326();
-            var6 = var0.__bp_331();
+         if ((var4 & 512) != 0) {
+            var3.spotAnimation = var0.method67();
+            var6 = var0.method72();
             var3.heightOffset = var6 >> 16;
-            var3.__bt = (var6 & 65535) + Client.cycle;
+            var3.field14 = (var6 & 65535) + Client.cycle;
             var3.spotAnimationFrame = 0;
             var3.spotAnimationFrameCycle = 0;
-            if(var3.__bt > Client.cycle) {
+            if (var3.field14 > Client.cycle) {
                var3.spotAnimationFrame = -1;
             }
 
-            if(var3.spotAnimation == 65535) {
+            if (var3.spotAnimation == 65535) {
                var3.spotAnimation = -1;
             }
          }
 
-         if((var4 & 4096) != 0) {
-            var5 = var0.__bn_319();
+         if ((var4 & 4096) != 0) {
+            var5 = var0.method60();
          }
 
-         if((var4 & 1024) != 0) {
-            var3.__bf = var0.__bd_321();
-            var3.__be = var0.__bn_319();
-            var3.__bh = var0.__bn_319();
-            var3.__bv = var0.__bd_321();
-            var3.__bw = var0.__bu_325() + Client.cycle;
-            var3.__cr = var0.__by_324() + Client.cycle;
-            var3.__cv = var0.__ag_302();
-            if(var3.__ag) {
-               var3.__bf += var3.tileX;
-               var3.__be += var3.tileY;
-               var3.__bh += var3.tileX;
-               var3.__bv += var3.tileY;
+         if ((var4 & 1024) != 0) {
+            var3.field15 = var0.method62();
+            var3.field17 = var0.method60();
+            var3.field16 = var0.method60();
+            var3.field18 = var0.method62();
+            var3.field19 = var0.method66() + Client.cycle;
+            var3.field20 = var0.method65() + Client.cycle;
+            var3.field21 = var0.readUnsignedShort();
+            if (var3.field725) {
+               var3.field15 += var3.tileX;
+               var3.field17 += var3.tileY;
+               var3.field16 += var3.tileX;
+               var3.field18 += var3.tileY;
                var3.pathLength = 0;
             } else {
-               var3.__bf += var3.pathX[0];
-               var3.__be += var3.pathY[0];
-               var3.__bh += var3.pathX[0];
-               var3.__bv += var3.pathY[0];
+               var3.field15 += var3.pathX[0];
+               var3.field17 += var3.pathY[0];
+               var3.field16 += var3.pathX[0];
+               var3.field18 += var3.pathY[0];
                var3.pathLength = 1;
             }
 
-            var3.__ch = 0;
+            var3.field25 = 0;
          }
 
-         if((var4 & 32) != 0) {
+         if ((var4 & 32) != 0) {
             var3.overheadText = var0.readStringCp1252NullTerminated();
-            if(var3.overheadText.charAt(0) == '~') {
+            if (var3.overheadText.charAt(0) == '~') {
                var3.overheadText = var3.overheadText.substring(1);
-               WorldMapIcon1.method219(2, var3.username.getName(), var3.overheadText);
-            } else if(var3 == Canvas.localPlayer) {
-               WorldMapIcon1.method219(2, var3.username.getName(), var3.overheadText);
+               WorldMapIcon1.addGameMessage(2, var3.username.getName(), var3.overheadText);
+            } else if (var3 == Canvas.localPlayer) {
+               WorldMapIcon1.addGameMessage(2, var3.username.getName(), var3.overheadText);
             }
 
             var3.isAutoChatting = false;
@@ -339,102 +340,102 @@ public abstract class class21 {
             var3.overheadTextCyclesRemaining = 150;
          }
 
-         if((var4 & 4) != 0) {
-            var3.__bc = var0.__by_324();
-            if(var3.pathLength == 0) {
-               var3.orientation = var3.__bc;
-               var3.__bc = -1;
+         if ((var4 & 4) != 0) {
+            var3.field12 = var0.method65();
+            if (var3.pathLength == 0) {
+               var3.orientation = var3.field12;
+               var3.field12 = -1;
             }
          }
 
-         if((var4 & 1) != 0) {
-            var6 = var0.__bq_318();
-            byte[] var14 = new byte[var6];
-            Buffer var15 = new Buffer(var14);
-            var0.__bh_333(var14, 0, var6);
-            Players.__cq_o[var2] = var15;
-            var3.read(var15);
+         if ((var4 & 1) != 0) {
+            var6 = var0.method59();
+            byte[] var15 = new byte[var6];
+            Buffer var16 = new Buffer(var15);
+            var0.method74(var15, 0, var6);
+            Players.field733[var2] = var16;
+            var3.read(var16);
          }
 
-         if((var4 & 2) != 0) {
-            var3.targetIndex = var0.__bu_325();
-            if(var3.targetIndex == 65535) {
+         if ((var4 & 2) != 0) {
+            var3.targetIndex = var0.method66();
+            if (var3.targetIndex == 65535) {
                var3.targetIndex = -1;
             }
          }
 
-         if((var4 & 2048) != 0) {
-            Players.__cq_w[var2] = var0.__bn_319();
+         if ((var4 & 2048) != 0) {
+            Players.field732[var2] = var0.method60();
          }
 
-         if((var4 & 16) != 0) {
-            var6 = var0.__bu_325();
-            PlayerType var20 = (PlayerType)ScriptFrame.findEnumerated(class48.method865(), var0.readUnsignedByte());
+         if ((var4 & 16) != 0) {
+            var6 = var0.method66();
+            PlayerType var17 = (PlayerType)ScriptFrame.findEnumerated(class48.method865(), var0.readUnsignedByte());
             boolean var18 = var0.readUnsignedByteNegate() == 1;
-            var9 = var0.readUnsignedByte();
-            var10 = var0.index;
-            if(var3.username != null && var3.appearance != null) {
+            var8 = var0.readUnsignedByte();
+            var9 = var0.index;
+            if (var3.username != null && var3.appearance != null) {
                boolean var19 = false;
-               if(var20.isUser && WorldMapArea.friendSystem.isIgnored(var3.username)) {
+               if (var17.isUser && WorldMapArea.friendSystem.isIgnored(var3.username)) {
                   var19 = true;
                }
 
-               if(!var19 && Client.__client_jc == 0 && !var3.isHidden) {
-                  Players.__cq_a.index = 0;
-                  var0.__al_305(Players.__cq_a.array, 0, var9);
-                  Players.__cq_a.index = 0;
-                  String var16 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(Players.__cq_a)));
-                  var3.overheadText = var16.trim();
+               if (!var19 && Client.field208 == 0 && !var3.isHidden) {
+                  Players.field738.index = 0;
+                  var0.readBytes(Players.field738.array, 0, var8);
+                  Players.field738.index = 0;
+                  String var14 = AbstractFont.escapeBrackets(class233.method4527(KitDefinition.method4866(Players.field738)));
+                  var3.overheadText = var14.trim();
                   var3.overheadTextColor = var6 >> 8;
                   var3.overheadTextEffect = var6 & 255;
                   var3.overheadTextCyclesRemaining = 150;
                   var3.isAutoChatting = var18;
-                  var3.__az = var3 != Canvas.localPlayer && var20.isUser && "" != Client.__client_pz && var16.toLowerCase().indexOf(Client.__client_pz) == -1;
-                  if(var20.isPrivileged) {
-                     var13 = var18?91:1;
+                  var3.field11 = var3 != Canvas.localPlayer && var17.isUser && "" != Client.field158 && var14.toLowerCase().indexOf(Client.field158) == -1;
+                  if (var17.isPrivileged) {
+                     var10 = var18 ? 91 : 1;
                   } else {
-                     var13 = var18?90:2;
+                     var10 = var18 ? 90 : 2;
                   }
 
-                  if(var20.modIcon != -1) {
-                     WorldMapIcon1.method219(var13, ItemContainer.method1170(var20.modIcon) + var3.username.getName(), var16);
+                  if (var17.modIcon != -1) {
+                     WorldMapIcon1.addGameMessage(var10, ItemContainer.method1170(var17.modIcon) + var3.username.getName(), var14);
                   } else {
-                     WorldMapIcon1.method219(var13, var3.username.getName(), var16);
+                     WorldMapIcon1.addGameMessage(var10, var3.username.getName(), var14);
                   }
                }
             }
 
-            var0.index = var10 + var9;
+            var0.index = var9 + var8;
          }
 
-         if((var4 & 256) != 0) {
-            for(var6 = 0; var6 < 3; ++var6) {
+         if ((var4 & 256) != 0) {
+            for (var6 = 0; var6 < 3; ++var6) {
                var3.actions[var6] = var0.readStringCp1252NullTerminated();
             }
          }
 
-         if((var4 & 128) != 0) {
-            var6 = var0.__ag_302();
-            if(var6 == 65535) {
+         if ((var4 & 128) != 0) {
+            var6 = var0.readUnsignedShort();
+            if (var6 == 65535) {
                var6 = -1;
             }
 
             var7 = var0.readUnsignedByte();
-            class234.method4534(var3, var6, var7);
+            class234.performPlayerAnimation(var3, var6, var7);
          }
 
-         if(var3.__ag) {
-            if(var5 == 127) {
+         if (var3.field725) {
+            if (var5 == 127) {
                var3.resetPath(var3.tileX, var3.tileY);
             } else {
-               byte var17;
-               if(var5 != -1) {
-                  var17 = var5;
+               byte var20;
+               if (var5 != -1) {
+                  var20 = var5;
                } else {
-                  var17 = Players.__cq_w[var2];
+                  var20 = Players.field732[var2];
                }
 
-               var3.__x_130(var3.tileX, var3.tileY, var17);
+               var3.method254(var3.tileX, var3.tileY, var20);
             }
          }
       }
diff --git a/runescape-client/src/main/java/class210.java b/runescape-client/src/main/java/class210.java
index ea27bac5c4..163a3ddb17 100644
--- a/runescape-client/src/main/java/class210.java
+++ b/runescape-client/src/main/java/class210.java
@@ -18,176 +18,178 @@ public class class210 {
    )
    static void method4101(PacketBuffer var0, int var1) {
       boolean var2 = var0.readBits(1) == 1;
-      if(var2) {
-         Players.__cq_i[++Players.__cq_n - 1] = var1;
+      if (var2) {
+         Players.field737[++Players.field736 - 1] = var1;
       }
 
       int var3 = var0.readBits(2);
       Player var4 = Client.players[var1];
-      if(var3 == 0) {
-         if(var2) {
-            var4.__ag = false;
-         } else if(Client.localPlayerIndex == var1) {
-            throw new RuntimeException();
+      if (var3 == 0) {
+         if (var2) {
+            var4.field725 = false;
          } else {
+            if (Client.localPlayerIndex == var1) {
+               throw new RuntimeException();
+            }
+
             Players.Players_regions[var1] = (var4.plane << 28) + (GraphicsObject.baseY + var4.pathY[0] >> 13) + (class50.baseX + var4.pathX[0] >> 13 << 14);
-            if(var4.__bc != -1) {
-               Players.Players_orientations[var1] = var4.__bc;
+            if (var4.field12 != -1) {
+               Players.Players_orientations[var1] = var4.field12;
             } else {
                Players.Players_orientations[var1] = var4.orientation;
             }
 
             Players.Players_targetIndices[var1] = var4.targetIndex;
             Client.players[var1] = null;
-            if(var0.readBits(1) != 0) {
+            if (var0.readBits(1) != 0) {
                class236.updateExternalPlayer(var0, var1);
             }
-
          }
       } else {
          int var5;
          int var6;
          int var7;
-         if(var3 == 1) {
+         if (var3 == 1) {
             var5 = var0.readBits(3);
             var6 = var4.pathX[0];
             var7 = var4.pathY[0];
-            if(var5 == 0) {
+            if (var5 == 0) {
                --var6;
                --var7;
-            } else if(var5 == 1) {
+            } else if (var5 == 1) {
                --var7;
-            } else if(var5 == 2) {
+            } else if (var5 == 2) {
                ++var6;
                --var7;
-            } else if(var5 == 3) {
+            } else if (var5 == 3) {
                --var6;
-            } else if(var5 == 4) {
+            } else if (var5 == 4) {
                ++var6;
-            } else if(var5 == 5) {
+            } else if (var5 == 5) {
                --var6;
                ++var7;
-            } else if(var5 == 6) {
+            } else if (var5 == 6) {
                ++var7;
-            } else if(var5 == 7) {
+            } else if (var5 == 7) {
                ++var6;
                ++var7;
             }
 
-            if(Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) {
-               var4.resetPath(var6, var7);
-               var4.__ag = false;
-            } else if(var2) {
-               var4.__ag = true;
-               var4.tileX = var6;
-               var4.tileY = var7;
+            if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) {
+               if (var2) {
+                  var4.field725 = true;
+                  var4.tileX = var6;
+                  var4.tileY = var7;
+               } else {
+                  var4.field725 = false;
+                  var4.method254(var6, var7, Players.field732[var1]);
+               }
             } else {
-               var4.__ag = false;
-               var4.__x_130(var6, var7, Players.__cq_w[var1]);
+               var4.resetPath(var6, var7);
+               var4.field725 = false;
             }
-
-         } else if(var3 == 2) {
+         } else if (var3 == 2) {
             var5 = var0.readBits(4);
             var6 = var4.pathX[0];
             var7 = var4.pathY[0];
-            if(var5 == 0) {
+            if (var5 == 0) {
                var6 -= 2;
                var7 -= 2;
-            } else if(var5 == 1) {
+            } else if (var5 == 1) {
                --var6;
                var7 -= 2;
-            } else if(var5 == 2) {
+            } else if (var5 == 2) {
                var7 -= 2;
-            } else if(var5 == 3) {
+            } else if (var5 == 3) {
                ++var6;
                var7 -= 2;
-            } else if(var5 == 4) {
+            } else if (var5 == 4) {
                var6 += 2;
                var7 -= 2;
-            } else if(var5 == 5) {
+            } else if (var5 == 5) {
                var6 -= 2;
                --var7;
-            } else if(var5 == 6) {
+            } else if (var5 == 6) {
                var6 += 2;
                --var7;
-            } else if(var5 == 7) {
+            } else if (var5 == 7) {
                var6 -= 2;
-            } else if(var5 == 8) {
+            } else if (var5 == 8) {
                var6 += 2;
-            } else if(var5 == 9) {
+            } else if (var5 == 9) {
                var6 -= 2;
                ++var7;
-            } else if(var5 == 10) {
+            } else if (var5 == 10) {
                var6 += 2;
                ++var7;
-            } else if(var5 == 11) {
+            } else if (var5 == 11) {
                var6 -= 2;
                var7 += 2;
-            } else if(var5 == 12) {
+            } else if (var5 == 12) {
                --var6;
                var7 += 2;
-            } else if(var5 == 13) {
+            } else if (var5 == 13) {
                var7 += 2;
-            } else if(var5 == 14) {
+            } else if (var5 == 14) {
                ++var6;
                var7 += 2;
-            } else if(var5 == 15) {
+            } else if (var5 == 15) {
                var6 += 2;
                var7 += 2;
             }
 
-            if(Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) {
-               var4.resetPath(var6, var7);
-               var4.__ag = false;
-            } else if(var2) {
-               var4.__ag = true;
-               var4.tileX = var6;
-               var4.tileY = var7;
+            if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) {
+               if (var2) {
+                  var4.field725 = true;
+                  var4.tileX = var6;
+                  var4.tileY = var7;
+               } else {
+                  var4.field725 = false;
+                  var4.method254(var6, var7, Players.field732[var1]);
+               }
             } else {
-               var4.__ag = false;
-               var4.__x_130(var6, var7, Players.__cq_w[var1]);
+               var4.resetPath(var6, var7);
+               var4.field725 = false;
             }
-
          } else {
             var5 = var0.readBits(1);
             int var8;
             int var9;
             int var10;
             int var11;
-            if(var5 == 0) {
+            if (var5 == 0) {
                var6 = var0.readBits(12);
                var7 = var6 >> 10;
                var8 = var6 >> 5 & 31;
-               if(var8 > 15) {
+               if (var8 > 15) {
                   var8 -= 32;
                }
 
                var9 = var6 & 31;
-               if(var9 > 15) {
+               if (var9 > 15) {
                   var9 -= 32;
                }
 
                var10 = var8 + var4.pathX[0];
                var11 = var9 + var4.pathY[0];
-               if(Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) {
-                  if(var2) {
-                     var4.__ag = true;
+               if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) {
+                  if (var2) {
+                     var4.field725 = true;
                      var4.tileX = var10;
                      var4.tileY = var11;
                   } else {
-                     var4.__ag = false;
-                     var4.__x_130(var10, var11, Players.__cq_w[var1]);
+                     var4.field725 = false;
+                     var4.method254(var10, var11, Players.field732[var1]);
                   }
                } else {
                   var4.resetPath(var10, var11);
-                  var4.__ag = false;
+                  var4.field725 = false;
                }
 
                var4.plane = (byte)(var7 + var4.plane & 3);
-               if(Client.localPlayerIndex == var1) {
+               if (Client.localPlayerIndex == var1) {
                   SoundSystem.plane = var4.plane;
                }
-
             } else {
                var6 = var0.readBits(30);
                var7 = var6 >> 28;
@@ -195,25 +197,25 @@ public class class210 {
                var9 = var6 & 16383;
                var10 = (var8 + class50.baseX + var4.pathX[0] & 16383) - class50.baseX;
                var11 = (var9 + GraphicsObject.baseY + var4.pathY[0] & 16383) - GraphicsObject.baseY;
-               if(Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) {
+               if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) {
                   var4.resetPath(var10, var11);
-                  var4.__ag = false;
-               } else if(var2) {
-                  var4.__ag = true;
+                  var4.field725 = false;
+               } else if (var2) {
+                  var4.field725 = true;
                   var4.tileX = var10;
                   var4.tileY = var11;
                } else {
-                  var4.__ag = false;
-                  var4.__x_130(var10, var11, Players.__cq_w[var1]);
+                  var4.field725 = false;
+                  var4.method254(var10, var11, Players.field732[var1]);
                }
 
                var4.plane = (byte)(var7 + var4.plane & 3);
-               if(Client.localPlayerIndex == var1) {
+               if (Client.localPlayerIndex == var1) {
                   SoundSystem.plane = var4.plane;
                }
-
             }
          }
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/class212.java b/runescape-client/src/main/java/class212.java
index 21afc326ac..24005d53ea 100644
--- a/runescape-client/src/main/java/class212.java
+++ b/runescape-client/src/main/java/class212.java
@@ -5,18 +5,18 @@ import net.runelite.mapping.ObfuscatedName;
 public class class212 {
    @ObfuscatedName("m")
    public static void method4109(byte[] var0, int var1, byte[] var2, int var3, int var4) {
-      if(var2 == var0) {
-         if(var3 == var1) {
+      if (var2 == var0) {
+         if (var3 == var1) {
             return;
          }
 
-         if(var3 > var1 && var3 < var4 + var1) {
+         if (var3 > var1 && var3 < var4 + var1) {
             --var4;
             var1 += var4;
             var3 += var4;
             var4 = var1 - var4;
 
-            for(var4 += 7; var1 >= var4; var2[var3--] = var0[var1--]) {
+            for (var4 += 7; var1 >= var4; var2[var3--] = var0[var1--]) {
                var2[var3--] = var0[var1--];
                var2[var3--] = var0[var1--];
                var2[var3--] = var0[var1--];
@@ -26,8 +26,7 @@ public class class212 {
                var2[var3--] = var0[var1--];
             }
 
-            for(var4 -= 7; var1 >= var4; var2[var3--] = var0[var1--]) {
-               ;
+            for (var4 -= 7; var1 >= var4; var2[var3--] = var0[var1--]) {
             }
 
             return;
@@ -36,7 +35,7 @@ public class class212 {
 
       var4 += var1;
 
-      for(var4 -= 7; var1 < var4; var2[var3++] = var0[var1++]) {
+      for (var4 -= 7; var1 < var4; var2[var3++] = var0[var1++]) {
          var2[var3++] = var0[var1++];
          var2[var3++] = var0[var1++];
          var2[var3++] = var0[var1++];
@@ -46,8 +45,7 @@ public class class212 {
          var2[var3++] = var0[var1++];
       }
 
-      for(var4 += 7; var1 < var4; var2[var3++] = var0[var1++]) {
-         ;
+      for (var4 += 7; var1 < var4; var2[var3++] = var0[var1++]) {
       }
 
    }
@@ -55,7 +53,7 @@ public class class212 {
    @ObfuscatedName("x")
    @Export("clearIntArray")
    public static void clearIntArray(int[] var0, int var1, int var2) {
-      for(var2 = var2 + var1 - 7; var1 < var2; var0[var1++] = 0) {
+      for (var2 = var2 + var1 - 7; var1 < var2; var0[var1++] = 0) {
          var0[var1++] = 0;
          var0[var1++] = 0;
          var0[var1++] = 0;
@@ -65,8 +63,7 @@ public class class212 {
          var0[var1++] = 0;
       }
 
-      for(var2 += 7; var1 < var2; var0[var1++] = 0) {
-         ;
+      for (var2 += 7; var1 < var2; var0[var1++] = 0) {
       }
 
    }
diff --git a/runescape-client/src/main/java/class214.java b/runescape-client/src/main/java/class214.java
index c5924e20a2..39911f035c 100644
--- a/runescape-client/src/main/java/class214.java
+++ b/runescape-client/src/main/java/class214.java
@@ -9,12 +9,12 @@ public class class214 {
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   public static AbstractIndexCache __hf_f;
+   public static AbstractArchive field1127;
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   public static AbstractIndexCache __hf_q;
+   public static AbstractArchive field1128;
    @ObfuscatedName("w")
    @ObfuscatedSignature(
       signature = "Lhm;"
@@ -25,14 +25,14 @@ public class class214 {
    @ObfuscatedGetter(
       intValue = -848833001
    )
-   public static int __hf_o;
+   public static int field1129;
    @ObfuscatedName("u")
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   public static AbstractIndexCache __hf_u;
+   public static AbstractArchive field1130;
    @ObfuscatedName("k")
-   static int[] __hf_k;
+   static int[] field1131;
    @ObfuscatedName("ko")
    @ObfuscatedGetter(
       intValue = 2079315667
@@ -40,62 +40,58 @@ public class class214 {
    @Export("menuWidth")
    static int menuWidth;
 
-   static {
-      __hf_o = 0;
-   }
-
    @ObfuscatedName("q")
    @ObfuscatedSignature(
       signature = "(Ljava/lang/CharSequence;IZI)Z",
       garbageValue = "-125135280"
    )
    static boolean method4144(CharSequence var0, int var1, boolean var2) {
-      if(var1 >= 2 && var1 <= 36) {
+      if (var1 >= 2 && var1 <= 36) {
          boolean var3 = false;
          boolean var4 = false;
          int var5 = 0;
          int var6 = var0.length();
 
-         for(int var7 = 0; var7 < var6; ++var7) {
+         for (int var7 = 0; var7 < var6; ++var7) {
             char var8 = var0.charAt(var7);
-            if(var7 == 0) {
-               if(var8 == '-') {
+            if (var7 == 0) {
+               if (var8 == '-') {
                   var3 = true;
                   continue;
                }
 
-               if(var8 == '+') {
+               if (var8 == '+') {
                   continue;
                }
             }
 
-            int var10;
-            if(var8 >= '0' && var8 <= '9') {
-               var10 = var8 - '0';
-            } else if(var8 >= 'A' && var8 <= 'Z') {
-               var10 = var8 - '7';
+            int var9;
+            if (var8 >= '0' && var8 <= '9') {
+               var9 = var8 - '0';
+            } else if (var8 >= 'A' && var8 <= 'Z') {
+               var9 = var8 - '7';
             } else {
-               if(var8 < 'a' || var8 > 'z') {
+               if (var8 < 'a' || var8 > 'z') {
                   return false;
                }
 
-               var10 = var8 - 'W';
+               var9 = var8 - 'W';
             }
 
-            if(var10 >= var1) {
+            if (var9 >= var1) {
                return false;
             }
 
-            if(var3) {
-               var10 = -var10;
+            if (var3) {
+               var9 = -var9;
             }
 
-            int var9 = var5 * var1 + var10;
-            if(var9 / var1 != var5) {
+            int var10 = var5 * var1 + var9;
+            if (var10 / var1 != var5) {
                return false;
             }
 
-            var5 = var9;
+            var5 = var10;
             var4 = true;
          }
 
@@ -113,4 +109,8 @@ public class class214 {
    public static int method4157(CharSequence var0, int var1) {
       return IgnoreList.method5438(var0, var1, true);
    }
+
+   static {
+      field1129 = 0;
+   }
 }
diff --git a/runescape-client/src/main/java/class226.java b/runescape-client/src/main/java/class226.java
index 6ae0e4e5b4..9432e890f4 100644
--- a/runescape-client/src/main/java/class226.java
+++ b/runescape-client/src/main/java/class226.java
@@ -5,20 +5,13 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("ht")
 public class class226 {
    @ObfuscatedName("m")
-   public static final short[] __ht_m;
+   public static final short[] field1132;
    @ObfuscatedName("f")
-   public static final short[][] __ht_f;
+   public static final short[][] field1133;
    @ObfuscatedName("q")
-   public static final short[] __ht_q;
+   public static final short[] field1134;
    @ObfuscatedName("w")
-   public static final short[][] __ht_w;
-
-   static {
-      __ht_m = new short[]{(short)6798, (short)8741, (short)25238, (short)4626, (short)4550};
-      __ht_f = new short[][]{{(short)6798, (short)107, (short)10283, (short)16, (short)4797, (short)7744, (short)5799, (short)4634, (short)-31839, (short)22433, (short)2983, (short)-11343, (short)8, (short)5281, (short)10438, (short)3650, (short)-27322, (short)-21845, (short)200, (short)571, (short)908, (short)21830, (short)28946, (short)-15701, (short)-14010}, {(short)8741, (short)12, (short)-1506, (short)-22374, (short)7735, (short)8404, (short)1701, (short)-27106, (short)24094, (short)10153, (short)-8915, (short)4783, (short)1341, (short)16578, (short)-30533, (short)25239, (short)8, (short)5281, (short)10438, (short)3650, (short)-27322, (short)-21845, (short)200, (short)571, (short)908, (short)21830, (short)28946, (short)-15701, (short)-14010}, {(short)25238, (short)8742, (short)12, (short)-1506, (short)-22374, (short)7735, (short)8404, (short)1701, (short)-27106, (short)24094, (short)10153, (short)-8915, (short)4783, (short)1341, (short)16578, (short)-30533, (short)8, (short)5281, (short)10438, (short)3650, (short)-27322, (short)-21845, (short)200, (short)571, (short)908, (short)21830, (short)28946, (short)-15701, (short)-14010}, {(short)4626, (short)11146, (short)6439, (short)12, (short)4758, (short)10270}, {(short)4550, (short)4537, (short)5681, (short)5673, (short)5790, (short)6806, (short)8076, (short)4574, (short)17050, (short)0, (short)127, (short)-31821, (short)-17991}};
-      __ht_q = new short[]{(short)-10304, (short)9104, (short)-1, (short)-1, (short)-1};
-      __ht_w = new short[][]{{(short)6554, (short)115, (short)10304, (short)28, (short)5702, (short)7756, (short)5681, (short)4510, (short)-31835, (short)22437, (short)2859, (short)-11339, (short)16, (short)5157, (short)10446, (short)3658, (short)-27314, (short)-21965, (short)472, (short)580, (short)784, (short)21966, (short)28950, (short)-15697, (short)-14002}, {(short)9104, (short)10275, (short)7595, (short)3610, (short)7975, (short)8526, (short)918, (short)-26734, (short)24466, (short)10145, (short)-6882, (short)5027, (short)1457, (short)16565, (short)-30545, (short)25486, (short)24, (short)5392, (short)10429, (short)3673, (short)-27335, (short)-21957, (short)192, (short)687, (short)412, (short)21821, (short)28835, (short)-15460, (short)-14019}, new short[0], new short[0], new short[0]};
-   }
+   public static final short[][] field1135;
 
    @ObfuscatedName("d")
    @ObfuscatedSignature(
@@ -26,55 +19,55 @@ public class class226 {
       garbageValue = "-76173898"
    )
    @Export("getItemSprite")
-   public static final Sprite getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) {
-      if(var1 == -1) {
-         var4 = 0;
-      } else if(var4 == 2 && var1 != 1) {
-         var4 = 1;
+   public static final Sprite getItemSprite(int id, int quantity, int outline, int shadow, int quantityMode, boolean noted) {
+      if (quantity == -1) {
+         quantityMode = 0;
+      } else if (quantityMode == 2 && quantity != 1) {
+         quantityMode = 1;
       }
 
-      long var6 = ((long)var1 << 16) + (long)var0 + ((long)var2 << 38) + ((long)var4 << 40) + ((long)var3 << 42);
+      long var6 = ((long)quantity << 16) + (long)id + ((long)outline << 38) + ((long)quantityMode << 40) + ((long)shadow << 42);
       Sprite var8;
-      if(!var5) {
+      if (!noted) {
          var8 = (Sprite)ItemDefinition.Sprite_cached.get(var6);
-         if(var8 != null) {
+         if (var8 != null) {
             return var8;
          }
       }
 
-      ItemDefinition var9 = Skills.getItemDefinition(var0);
-      if(var1 > 1 && var9.__az != null) {
+      ItemDefinition var9 = Skills.getItemDefinition(id);
+      if (quantity > 1 && var9.countobj != null) {
          int var10 = -1;
 
-         for(int var11 = 0; var11 < 10; ++var11) {
-            if(var1 >= var9.__au[var11] && var9.__au[var11] != 0) {
-               var10 = var9.__az[var11];
+         for (int var11 = 0; var11 < 10; ++var11) {
+            if (quantity >= var9.countco[var11] && var9.countco[var11] != 0) {
+               var10 = var9.countobj[var11];
             }
          }
 
-         if(var10 != -1) {
+         if (var10 != -1) {
             var9 = Skills.getItemDefinition(var10);
          }
       }
 
       Model var19 = var9.getModel(1);
-      if(var19 == null) {
+      if (var19 == null) {
          return null;
       } else {
          Sprite var20 = null;
-         if(var9.noteTemplate != -1) {
+         if (var9.noteTemplate != -1) {
             var20 = getItemSprite(var9.note, 10, 1, 0, 0, true);
-            if(var20 == null) {
+            if (var20 == null) {
                return null;
             }
-         } else if(var9.notedId != -1) {
-            var20 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false);
-            if(var20 == null) {
+         } else if (var9.notedId != -1) {
+            var20 = getItemSprite(var9.unnotedId, quantity, outline, shadow, 0, false);
+            if (var20 == null) {
                return null;
             }
-         } else if(var9.placeholderTemplate != -1) {
-            var20 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false);
-            if(var20 == null) {
+         } else if (var9.placeholderTemplate != -1) {
+            var20 = getItemSprite(var9.placeholder, quantity, 0, 0, 0, false);
+            if (var20 == null) {
                return null;
             }
          }
@@ -87,58 +80,65 @@ public class class226 {
          var8 = new Sprite(36, 32);
          Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32);
          Rasterizer2D.Rasterizer2D_clear();
-         Rasterizer3D.Rasterizer3D_method1();
+         Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D();
          Rasterizer3D.method2989(16, 16);
-         Rasterizer3D.__et_w = false;
-         if(var9.placeholderTemplate != -1) {
+         Rasterizer3D.field741 = false;
+         if (var9.placeholderTemplate != -1) {
             var20.drawAt2(0, 0);
          }
 
          int var16 = var9.zoom2d;
-         if(var5) {
+         if (noted) {
             var16 = (int)((double)var16 * 1.5D);
-         } else if(var2 == 2) {
+         } else if (outline == 2) {
             var16 = (int)((double)var16 * 1.04D);
          }
 
          int var17 = var16 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16;
          int var18 = var16 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16;
          var19.calculateBoundsCylinder();
-         var19.__c_234(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var19.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d);
-         if(var9.notedId != -1) {
+         var19.method199(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var19.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d);
+         if (var9.notedId != -1) {
             var20.drawAt2(0, 0);
          }
 
-         if(var2 >= 1) {
-            var8.__l_502(1);
+         if (outline >= 1) {
+            var8.outline(1);
          }
 
-         if(var2 >= 2) {
-            var8.__l_502(16777215);
+         if (outline >= 2) {
+            var8.outline(16777215);
          }
 
-         if(var3 != 0) {
-            var8.__e_503(var3);
+         if (shadow != 0) {
+            var8.shadow(shadow);
          }
 
          Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32);
-         if(var9.noteTemplate != -1) {
+         if (var9.noteTemplate != -1) {
             var20.drawAt2(0, 0);
          }
 
-         if(var4 == 1 || var4 == 2 && var9.isStackable == 1) {
-            class204.__gx_n.draw(class196.method3735(var1), 0, 9, 16776960, 1);
+         if (quantityMode == 1 || quantityMode == 2 && var9.isStackable == 1) {
+            class204.field1122.draw(class196.method3735(quantity), 0, 9, 16776960, 1);
          }
 
-         if(!var5) {
+         if (!noted) {
             ItemDefinition.Sprite_cached.put(var8, var6);
          }
 
          Rasterizer2D.Rasterizer2D_replace(var12, var13, var14);
          Rasterizer2D.Rasterizer2D_setClipArray(var15);
-         Rasterizer3D.Rasterizer3D_method1();
-         Rasterizer3D.__et_w = true;
+         Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D();
+         Rasterizer3D.field741 = true;
          return var8;
       }
    }
+
+   static {
+      field1132 = new short[]{6798, 8741, 25238, 4626, 4550};
+      field1133 = 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}};
+      field1134 = new short[]{-10304, 9104, -1, -1, -1};
+      field1135 = 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]};
+   }
 }
diff --git a/runescape-client/src/main/java/class227.java b/runescape-client/src/main/java/class227.java
index 55b596870c..b42c492b72 100644
--- a/runescape-client/src/main/java/class227.java
+++ b/runescape-client/src/main/java/class227.java
@@ -1,11 +1,10 @@
-import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("hj")
 public class class227 {
    @ObfuscatedName("e")
-   public static short[] __hj_e;
+   public static short[] field1136;
 
    @ObfuscatedName("l")
    @ObfuscatedSignature(
@@ -13,15 +12,15 @@ public class class227 {
       garbageValue = "120"
    )
    static final void method4446(int var0, int var1, int var2, int var3, int var4, int var5, Scene var6, CollisionMap var7) {
-      if(!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var1][var2] & 2) != 0 || (Tiles.Tiles_renderFlags[var0][var1][var2] & 16) == 0) {
-         if(var0 < Tiles.Tiles_minPlane) {
+      if (!Client.isLowDetail || (Tiles.Tiles_renderFlags[0][var1][var2] & 2) != 0 || (Tiles.Tiles_renderFlags[var0][var1][var2] & 16) == 0) {
+         if (var0 < Tiles.Tiles_minPlane) {
             Tiles.Tiles_minPlane = var0;
          }
 
          ObjectDefinition var8 = class50.getObjectDefinition(var3);
          int var9;
          int var10;
-         if(var4 != 1 && var4 != 3) {
+         if (var4 != 1 && var4 != 3) {
             var9 = var8.sizeX;
             var10 = var8.sizeY;
          } else {
@@ -31,7 +30,7 @@ public class class227 {
 
          int var11;
          int var12;
-         if(var9 + var1 <= 104) {
+         if (var9 + var1 <= 104) {
             var11 = (var9 >> 1) + var1;
             var12 = (var9 + 1 >> 1) + var1;
          } else {
@@ -41,7 +40,7 @@ public class class227 {
 
          int var13;
          int var14;
-         if(var10 + var2 <= 104) {
+         if (var10 + var2 <= 104) {
             var13 = (var10 >> 1) + var2;
             var14 = var2 + (var10 + 1 >> 1);
          } else {
@@ -53,332 +52,340 @@ public class class227 {
          int var16 = var15[var12][var14] + var15[var11][var14] + var15[var11][var13] + var15[var12][var13] >> 2;
          int var17 = (var1 << 7) + (var9 << 6);
          int var18 = (var2 << 7) + (var10 << 6);
-         long var19 = FontName.method5637(var1, var2, 2, var8.int1 == 0, var3);
+         long var19 = FontName.calculateTag(var1, var2, 2, var8.int1 == 0, var3);
          int var21 = var5 + (var4 << 6);
-         if(var8.int3 == 1) {
+         if (var8.int3 == 1) {
             var21 += 256;
          }
 
+         int var22;
          int var23;
-         int var24;
-         if(var8.__t_424()) {
-            ObjectSound var22 = new ObjectSound();
-            var22.__f = var0;
-            var22.__q = var1 * 128;
-            var22.__w = var2 * 128;
-            var23 = var8.sizeX;
-            var24 = var8.sizeY;
-            if(var4 == 1 || var4 == 3) {
-               var23 = var8.sizeY;
-               var24 = var8.sizeX;
+         if (var8.method233()) {
+            ObjectSound var24 = new ObjectSound();
+            var24.field647 = var0;
+            var24.field648 = var1 * 128;
+            var24.field649 = var2 * 128;
+            var22 = var8.sizeX;
+            var23 = var8.sizeY;
+            if (var4 == 1 || var4 == 3) {
+               var22 = var8.sizeY;
+               var23 = var8.sizeX;
             }
 
-            var22.__o = (var23 + var1) * 128;
-            var22.__u = (var24 + var2) * 128;
-            var22.soundEffectId = var8.ambientSoundId;
-            var22.__g = var8.int4 * 128;
-            var22.__x = var8.int5;
-            var22.__d = var8.int6;
-            var22.soundEffectIds = var8.__ax;
-            if(var8.transforms != null) {
-               var22.obj = var8;
-               var22.set();
+            var24.field650 = (var22 + var1) * 128;
+            var24.field651 = (var23 + var2) * 128;
+            var24.soundEffectId = var8.ambientSoundId;
+            var24.field652 = var8.int4 * 128;
+            var24.field653 = var8.int5;
+            var24.field654 = var8.int6;
+            var24.soundEffectIds = var8.field646;
+            if (var8.transforms != null) {
+               var24.obj = var8;
+               var24.set();
             }
 
-            ObjectSound.objectSounds.addFirst(var22);
-            if(var22.soundEffectIds != null) {
-               var22.__n = var22.__x + (int)(Math.random() * (double)(var22.__d - var22.__x));
+            ObjectSound.objectSounds.addFirst(var24);
+            if (var24.soundEffectIds != null) {
+               var24.field655 = var24.field653 + (int)(Math.random() * (double)(var24.field654 - var24.field653));
             }
          }
 
-         Object var34;
-         if(var5 == 22) {
-            if(!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) {
-               if(var8.animationId == -1 && var8.transforms == null) {
-                  var34 = var8.__l_423(22, var4, var15, var17, var16, var18);
+         Object var32;
+         if (var5 == 22) {
+            if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) {
+               if (var8.animationId == -1 && var8.transforms == null) {
+                  var32 = var8.method232(22, var4, var15, var17, var16, var18);
                } else {
-                  var34 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
+                  var32 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
                }
 
-               var6.newFloorDecoration(var0, var1, var2, var16, (Entity)var34, var19, var21);
-               if(var8.interactType == 1 && var7 != null) {
-                  var7.__o_286(var1, var2);
-               }
-
-            }
-         } else if(var5 != 10 && var5 != 11) {
-            if(var5 >= 12) {
-               if(var8.animationId == -1 && var8.transforms == null) {
-                  var34 = var8.__l_423(var5, var4, var15, var17, var16, var18);
-               } else {
-                  var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
-               }
-
-               var6.__d_238(var0, var1, var2, var16, 1, 1, (Entity)var34, 0, var19, var21);
-               if(var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) {
-                  Tiles.__bq_a[var0][var1][var2] |= 2340;
-               }
-
-               if(var8.interactType != 0 && var7 != null) {
-                  var7.__q_284(var1, var2, var9, var10, var8.boolean1);
-               }
-
-            } else if(var5 == 0) {
-               if(var8.animationId == -1 && var8.transforms == null) {
-                  var34 = var8.__l_423(0, var4, var15, var17, var16, var18);
-               } else {
-                  var34 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
-               }
-
-               var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.__bq_t[var4], 0, var19, var21);
-               if(var4 == 0) {
-                  if(var8.clipped) {
-                     Tiles.__bq_l[var0][var1][var2] = 50;
-                     Tiles.__bq_l[var0][var1][var2 + 1] = 50;
-                  }
-
-                  if(var8.modelClipped) {
-                     Tiles.__bq_a[var0][var1][var2] |= 585;
-                  }
-               } else if(var4 == 1) {
-                  if(var8.clipped) {
-                     Tiles.__bq_l[var0][var1][var2 + 1] = 50;
-                     Tiles.__bq_l[var0][var1 + 1][var2 + 1] = 50;
-                  }
-
-                  if(var8.modelClipped) {
-                     Tiles.__bq_a[var0][var1][1 + var2] |= 1170;
-                  }
-               } else if(var4 == 2) {
-                  if(var8.clipped) {
-                     Tiles.__bq_l[var0][var1 + 1][var2] = 50;
-                     Tiles.__bq_l[var0][var1 + 1][var2 + 1] = 50;
-                  }
-
-                  if(var8.modelClipped) {
-                     Tiles.__bq_a[var0][var1 + 1][var2] |= 585;
-                  }
-               } else if(var4 == 3) {
-                  if(var8.clipped) {
-                     Tiles.__bq_l[var0][var1][var2] = 50;
-                     Tiles.__bq_l[var0][var1 + 1][var2] = 50;
-                  }
-
-                  if(var8.modelClipped) {
-                     Tiles.__bq_a[var0][var1][var2] |= 1170;
-                  }
-               }
-
-               if(var8.interactType != 0 && var7 != null) {
-                  var7.__f_283(var1, var2, var5, var4, var8.boolean1);
-               }
-
-               if(var8.int2 != 16) {
-                  var6.__y_241(var0, var1, var2, var8.int2);
-               }
-
-            } else if(var5 == 1) {
-               if(var8.animationId == -1 && var8.transforms == null) {
-                  var34 = var8.__l_423(1, var4, var15, var17, var16, var18);
-               } else {
-                  var34 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
-               }
-
-               var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.__bq_y[var4], 0, var19, var21);
-               if(var8.clipped) {
-                  if(var4 == 0) {
-                     Tiles.__bq_l[var0][var1][var2 + 1] = 50;
-                  } else if(var4 == 1) {
-                     Tiles.__bq_l[var0][var1 + 1][var2 + 1] = 50;
-                  } else if(var4 == 2) {
-                     Tiles.__bq_l[var0][var1 + 1][var2] = 50;
-                  } else if(var4 == 3) {
-                     Tiles.__bq_l[var0][var1][var2] = 50;
-                  }
-               }
-
-               if(var8.interactType != 0 && var7 != null) {
-                  var7.__f_283(var1, var2, var5, var4, var8.boolean1);
-               }
-
-            } else {
-               int var28;
-               if(var5 == 2) {
-                  var28 = var4 + 1 & 3;
-                  Object var29;
-                  Object var30;
-                  if(var8.animationId == -1 && var8.transforms == null) {
-                     var29 = var8.__l_423(2, var4 + 4, var15, var17, var16, var18);
-                     var30 = var8.__l_423(2, var28, var15, var17, var16, var18);
-                  } else {
-                     var29 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
-                     var30 = new DynamicObject(var3, 2, var28, var0, var1, var2, var8.animationId, true, (Entity)null);
-                  }
-
-                  var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var29, (Entity)var30, Tiles.__bq_t[var4], Tiles.__bq_t[var28], var19, var21);
-                  if(var8.modelClipped) {
-                     if(var4 == 0) {
-                        Tiles.__bq_a[var0][var1][var2] |= 585;
-                        Tiles.__bq_a[var0][var1][1 + var2] |= 1170;
-                     } else if(var4 == 1) {
-                        Tiles.__bq_a[var0][var1][1 + var2] |= 1170;
-                        Tiles.__bq_a[var0][var1 + 1][var2] |= 585;
-                     } else if(var4 == 2) {
-                        Tiles.__bq_a[var0][var1 + 1][var2] |= 585;
-                        Tiles.__bq_a[var0][var1][var2] |= 1170;
-                     } else if(var4 == 3) {
-                        Tiles.__bq_a[var0][var1][var2] |= 1170;
-                        Tiles.__bq_a[var0][var1][var2] |= 585;
-                     }
-                  }
-
-                  if(var8.interactType != 0 && var7 != null) {
-                     var7.__f_283(var1, var2, var5, var4, var8.boolean1);
-                  }
-
-                  if(var8.int2 != 16) {
-                     var6.__y_241(var0, var1, var2, var8.int2);
-                  }
-
-               } else if(var5 == 3) {
-                  if(var8.animationId == -1 && var8.transforms == null) {
-                     var34 = var8.__l_423(3, var4, var15, var17, var16, var18);
-                  } else {
-                     var34 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
-                  }
-
-                  var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.__bq_y[var4], 0, var19, var21);
-                  if(var8.clipped) {
-                     if(var4 == 0) {
-                        Tiles.__bq_l[var0][var1][var2 + 1] = 50;
-                     } else if(var4 == 1) {
-                        Tiles.__bq_l[var0][var1 + 1][var2 + 1] = 50;
-                     } else if(var4 == 2) {
-                        Tiles.__bq_l[var0][var1 + 1][var2] = 50;
-                     } else if(var4 == 3) {
-                        Tiles.__bq_l[var0][var1][var2] = 50;
-                     }
-                  }
-
-                  if(var8.interactType != 0 && var7 != null) {
-                     var7.__f_283(var1, var2, var5, var4, var8.boolean1);
-                  }
-
-               } else if(var5 == 9) {
-                  if(var8.animationId == -1 && var8.transforms == null) {
-                     var34 = var8.__l_423(var5, var4, var15, var17, var16, var18);
-                  } else {
-                     var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
-                  }
-
-                  var6.__d_238(var0, var1, var2, var16, 1, 1, (Entity)var34, 0, var19, var21);
-                  if(var8.interactType != 0 && var7 != null) {
-                     var7.__q_284(var1, var2, var9, var10, var8.boolean1);
-                  }
-
-                  if(var8.int2 != 16) {
-                     var6.__y_241(var0, var1, var2, var8.int2);
-                  }
-
-               } else if(var5 == 4) {
-                  if(var8.animationId == -1 && var8.transforms == null) {
-                     var34 = var8.__l_423(4, var4, var15, var17, var16, var18);
-                  } else {
-                     var34 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
-                  }
-
-                  var6.newWallDecoration(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.__bq_t[var4], 0, 0, 0, var19, var21);
-               } else {
-                  long var31;
-                  Object var33;
-                  if(var5 == 5) {
-                     var28 = 16;
-                     var31 = var6.__ar_244(var0, var1, var2);
-                     if(var31 != 0L) {
-                        var28 = class50.getObjectDefinition(HitSplatDefinition.method4972(var31)).int2;
-                     }
-
-                     if(var8.animationId == -1 && var8.transforms == null) {
-                        var33 = var8.__l_423(4, var4, var15, var17, var16, var18);
-                     } else {
-                        var33 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
-                     }
-
-                     var6.newWallDecoration(var0, var1, var2, var16, (Entity)var33, (Entity)null, Tiles.__bq_t[var4], 0, var28 * Tiles.__bq_h[var4], var28 * Tiles.__bq_b[var4], var19, var21);
-                  } else if(var5 == 6) {
-                     var28 = 8;
-                     var31 = var6.__ar_244(var0, var1, var2);
-                     if(var31 != 0L) {
-                        var28 = class50.getObjectDefinition(HitSplatDefinition.method4972(var31)).int2 / 2;
-                     }
-
-                     if(var8.animationId == -1 && var8.transforms == null) {
-                        var33 = var8.__l_423(4, var4 + 4, var15, var17, var16, var18);
-                     } else {
-                        var33 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
-                     }
-
-                     var6.newWallDecoration(var0, var1, var2, var16, (Entity)var33, (Entity)null, 256, var4, var28 * Tiles.__bq_c[var4], var28 * Tiles.__bq_r[var4], var19, var21);
-                  } else if(var5 == 7) {
-                     var23 = var4 + 2 & 3;
-                     if(var8.animationId == -1 && var8.transforms == null) {
-                        var34 = var8.__l_423(4, var23 + 4, var15, var17, var16, var18);
-                     } else {
-                        var34 = new DynamicObject(var3, 4, var23 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
-                     }
-
-                     var6.newWallDecoration(var0, var1, var2, var16, (Entity)var34, (Entity)null, 256, var23, 0, 0, var19, var21);
-                  } else if(var5 == 8) {
-                     var28 = 8;
-                     var31 = var6.__ar_244(var0, var1, var2);
-                     if(var31 != 0L) {
-                        var28 = class50.getObjectDefinition(HitSplatDefinition.method4972(var31)).int2 / 2;
-                     }
-
-                     int var27 = var4 + 2 & 3;
-                     Object var26;
-                     if(var8.animationId == -1 && var8.transforms == null) {
-                        var33 = var8.__l_423(4, var4 + 4, var15, var17, var16, var18);
-                        var26 = var8.__l_423(4, var27 + 4, var15, var17, var16, var18);
-                     } else {
-                        var33 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
-                        var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
-                     }
-
-                     var6.newWallDecoration(var0, var1, var2, var16, (Entity)var33, (Entity)var26, 256, var4, var28 * Tiles.__bq_c[var4], var28 * Tiles.__bq_r[var4], var19, var21);
-                  }
+               var6.newFloorDecoration(var0, var1, var2, var16, (Entity)var32, var19, var21);
+               if (var8.interactType == 1 && var7 != null) {
+                  var7.method93(var1, var2);
                }
             }
          } else {
-            if(var8.animationId == -1 && var8.transforms == null) {
-               var34 = var8.__l_423(10, var4, var15, var17, var16, var18);
-            } else {
-               var34 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
-            }
-
-            if(var34 != null && var6.__d_238(var0, var1, var2, var16, var9, var10, (Entity)var34, var5 == 11?256:0, var19, var21) && var8.clipped) {
-               var23 = 15;
-               if(var34 instanceof Model) {
-                  var23 = ((Model)var34).__l_233() / 4;
-                  if(var23 > 30) {
-                     var23 = 30;
+            int var25;
+            if (var5 != 10 && var5 != 11) {
+               int[] var26;
+               if (var5 >= 12) {
+                  if (var8.animationId == -1 && var8.transforms == null) {
+                     var32 = var8.method232(var5, var4, var15, var17, var16, var18);
+                  } else {
+                     var32 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
                   }
-               }
 
-               for(var24 = 0; var24 <= var9; ++var24) {
-                  for(int var25 = 0; var25 <= var10; ++var25) {
-                     if(var23 > Tiles.__bq_l[var0][var24 + var1][var25 + var2]) {
-                        Tiles.__bq_l[var0][var24 + var1][var25 + var2] = (byte)var23;
+                  var6.method284(var0, var1, var2, var16, 1, 1, (Entity)var32, 0, var19, var21);
+                  if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) {
+                     var26 = Tiles.field910[var0][var1];
+                     var26[var2] |= 2340;
+                  }
+
+                  if (var8.interactType != 0 && var7 != null) {
+                     var7.method91(var1, var2, var9, var10, var8.boolean1);
+                  }
+               } else if (var5 == 0) {
+                  if (var8.animationId == -1 && var8.transforms == null) {
+                     var32 = var8.method232(0, var4, var15, var17, var16, var18);
+                  } else {
+                     var32 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
+                  }
+
+                  var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var32, (Entity)null, Tiles.field911[var4], 0, var19, var21);
+                  if (var4 == 0) {
+                     if (var8.clipped) {
+                        Tiles.field909[var0][var1][var2] = 50;
+                        Tiles.field909[var0][var1][var2 + 1] = 50;
+                     }
+
+                     if (var8.modelClipped) {
+                        var26 = Tiles.field910[var0][var1];
+                        var26[var2] |= 585;
+                     }
+                  } else if (var4 == 1) {
+                     if (var8.clipped) {
+                        Tiles.field909[var0][var1][var2 + 1] = 50;
+                        Tiles.field909[var0][var1 + 1][var2 + 1] = 50;
+                     }
+
+                     if (var8.modelClipped) {
+                        var26 = Tiles.field910[var0][var1];
+                        var26[1 + var2] |= 1170;
+                     }
+                  } else if (var4 == 2) {
+                     if (var8.clipped) {
+                        Tiles.field909[var0][var1 + 1][var2] = 50;
+                        Tiles.field909[var0][var1 + 1][var2 + 1] = 50;
+                     }
+
+                     if (var8.modelClipped) {
+                        var26 = Tiles.field910[var0][var1 + 1];
+                        var26[var2] |= 585;
+                     }
+                  } else if (var4 == 3) {
+                     if (var8.clipped) {
+                        Tiles.field909[var0][var1][var2] = 50;
+                        Tiles.field909[var0][var1 + 1][var2] = 50;
+                     }
+
+                     if (var8.modelClipped) {
+                        var26 = Tiles.field910[var0][var1];
+                        var26[var2] |= 1170;
+                     }
+                  }
+
+                  if (var8.interactType != 0 && var7 != null) {
+                     var7.method90(var1, var2, var5, var4, var8.boolean1);
+                  }
+
+                  if (var8.int2 != 16) {
+                     var6.method287(var0, var1, var2, var8.int2);
+                  }
+               } else if (var5 == 1) {
+                  if (var8.animationId == -1 && var8.transforms == null) {
+                     var32 = var8.method232(1, var4, var15, var17, var16, var18);
+                  } else {
+                     var32 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
+                  }
+
+                  var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var32, (Entity)null, Tiles.field912[var4], 0, var19, var21);
+                  if (var8.clipped) {
+                     if (var4 == 0) {
+                        Tiles.field909[var0][var1][var2 + 1] = 50;
+                     } else if (var4 == 1) {
+                        Tiles.field909[var0][var1 + 1][var2 + 1] = 50;
+                     } else if (var4 == 2) {
+                        Tiles.field909[var0][var1 + 1][var2] = 50;
+                     } else if (var4 == 3) {
+                        Tiles.field909[var0][var1][var2] = 50;
+                     }
+                  }
+
+                  if (var8.interactType != 0 && var7 != null) {
+                     var7.method90(var1, var2, var5, var4, var8.boolean1);
+                  }
+               } else {
+                  Object var27;
+                  if (var5 == 2) {
+                     var25 = var4 + 1 & 3;
+                     Object var28;
+                     if (var8.animationId == -1 && var8.transforms == null) {
+                        var27 = var8.method232(2, var4 + 4, var15, var17, var16, var18);
+                        var28 = var8.method232(2, var25, var15, var17, var16, var18);
+                     } else {
+                        var27 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
+                        var28 = new DynamicObject(var3, 2, var25, var0, var1, var2, var8.animationId, true, (Entity)null);
+                     }
+
+                     var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var27, (Entity)var28, Tiles.field911[var4], Tiles.field911[var25], var19, var21);
+                     if (var8.modelClipped) {
+                        if (var4 == 0) {
+                           var26 = Tiles.field910[var0][var1];
+                           var26[var2] |= 585;
+                           var26 = Tiles.field910[var0][var1];
+                           var26[1 + var2] |= 1170;
+                        } else if (var4 == 1) {
+                           var26 = Tiles.field910[var0][var1];
+                           var26[1 + var2] |= 1170;
+                           var26 = Tiles.field910[var0][var1 + 1];
+                           var26[var2] |= 585;
+                        } else if (var4 == 2) {
+                           var26 = Tiles.field910[var0][var1 + 1];
+                           var26[var2] |= 585;
+                           var26 = Tiles.field910[var0][var1];
+                           var26[var2] |= 1170;
+                        } else if (var4 == 3) {
+                           var26 = Tiles.field910[var0][var1];
+                           var26[var2] |= 1170;
+                           var26 = Tiles.field910[var0][var1];
+                           var26[var2] |= 585;
+                        }
+                     }
+
+                     if (var8.interactType != 0 && var7 != null) {
+                        var7.method90(var1, var2, var5, var4, var8.boolean1);
+                     }
+
+                     if (var8.int2 != 16) {
+                        var6.method287(var0, var1, var2, var8.int2);
+                     }
+                  } else if (var5 == 3) {
+                     if (var8.animationId == -1 && var8.transforms == null) {
+                        var32 = var8.method232(3, var4, var15, var17, var16, var18);
+                     } else {
+                        var32 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
+                     }
+
+                     var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var32, (Entity)null, Tiles.field912[var4], 0, var19, var21);
+                     if (var8.clipped) {
+                        if (var4 == 0) {
+                           Tiles.field909[var0][var1][var2 + 1] = 50;
+                        } else if (var4 == 1) {
+                           Tiles.field909[var0][var1 + 1][var2 + 1] = 50;
+                        } else if (var4 == 2) {
+                           Tiles.field909[var0][var1 + 1][var2] = 50;
+                        } else if (var4 == 3) {
+                           Tiles.field909[var0][var1][var2] = 50;
+                        }
+                     }
+
+                     if (var8.interactType != 0 && var7 != null) {
+                        var7.method90(var1, var2, var5, var4, var8.boolean1);
+                     }
+                  } else if (var5 == 9) {
+                     if (var8.animationId == -1 && var8.transforms == null) {
+                        var32 = var8.method232(var5, var4, var15, var17, var16, var18);
+                     } else {
+                        var32 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
+                     }
+
+                     var6.method284(var0, var1, var2, var16, 1, 1, (Entity)var32, 0, var19, var21);
+                     if (var8.interactType != 0 && var7 != null) {
+                        var7.method91(var1, var2, var9, var10, var8.boolean1);
+                     }
+
+                     if (var8.int2 != 16) {
+                        var6.method287(var0, var1, var2, var8.int2);
+                     }
+                  } else if (var5 == 4) {
+                     if (var8.animationId == -1 && var8.transforms == null) {
+                        var32 = var8.method232(4, var4, var15, var17, var16, var18);
+                     } else {
+                        var32 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
+                     }
+
+                     var6.newWallDecoration(var0, var1, var2, var16, (Entity)var32, (Entity)null, Tiles.field911[var4], 0, 0, 0, var19, var21);
+                  } else {
+                     long var33;
+                     if (var5 == 5) {
+                        var25 = 16;
+                        var33 = var6.getBoundaryObjectTag(var0, var1, var2);
+                        if (var33 != 0L) {
+                           var25 = class50.getObjectDefinition(HitSplatDefinition.method4972(var33)).int2;
+                        }
+
+                        if (var8.animationId == -1 && var8.transforms == null) {
+                           var27 = var8.method232(4, var4, var15, var17, var16, var18);
+                        } else {
+                           var27 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
+                        }
+
+                        var6.newWallDecoration(var0, var1, var2, var16, (Entity)var27, (Entity)null, Tiles.field911[var4], 0, var25 * Tiles.field913[var4], var25 * Tiles.field914[var4], var19, var21);
+                     } else if (var5 == 6) {
+                        var25 = 8;
+                        var33 = var6.getBoundaryObjectTag(var0, var1, var2);
+                        if (var33 != 0L) {
+                           var25 = class50.getObjectDefinition(HitSplatDefinition.method4972(var33)).int2 / 2;
+                        }
+
+                        if (var8.animationId == -1 && var8.transforms == null) {
+                           var27 = var8.method232(4, var4 + 4, var15, var17, var16, var18);
+                        } else {
+                           var27 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
+                        }
+
+                        var6.newWallDecoration(var0, var1, var2, var16, (Entity)var27, (Entity)null, 256, var4, var25 * Tiles.field915[var4], var25 * Tiles.field916[var4], var19, var21);
+                     } else if (var5 == 7) {
+                        var22 = var4 + 2 & 3;
+                        if (var8.animationId == -1 && var8.transforms == null) {
+                           var32 = var8.method232(4, var22 + 4, var15, var17, var16, var18);
+                        } else {
+                           var32 = new DynamicObject(var3, 4, var22 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
+                        }
+
+                        var6.newWallDecoration(var0, var1, var2, var16, (Entity)var32, (Entity)null, 256, var22, 0, 0, var19, var21);
+                     } else if (var5 == 8) {
+                        var25 = 8;
+                        var33 = var6.getBoundaryObjectTag(var0, var1, var2);
+                        if (var33 != 0L) {
+                           var25 = class50.getObjectDefinition(HitSplatDefinition.method4972(var33)).int2 / 2;
+                        }
+
+                        int var30 = var4 + 2 & 3;
+                        Object var31;
+                        if (var8.animationId == -1 && var8.transforms == null) {
+                           var27 = var8.method232(4, var4 + 4, var15, var17, var16, var18);
+                           var31 = var8.method232(4, var30 + 4, var15, var17, var16, var18);
+                        } else {
+                           var27 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
+                           var31 = new DynamicObject(var3, 4, var30 + 4, var0, var1, var2, var8.animationId, true, (Entity)null);
+                        }
+
+                        var6.newWallDecoration(var0, var1, var2, var16, (Entity)var27, (Entity)var31, 256, var4, var25 * Tiles.field915[var4], var25 * Tiles.field916[var4], var19, var21);
                      }
                   }
                }
-            }
+            } else {
+               if (var8.animationId == -1 && var8.transforms == null) {
+                  var32 = var8.method232(10, var4, var15, var17, var16, var18);
+               } else {
+                  var32 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, true, (Entity)null);
+               }
 
-            if(var8.interactType != 0 && var7 != null) {
-               var7.__q_284(var1, var2, var9, var10, var8.boolean1);
-            }
+               if (var32 != null && var6.method284(var0, var1, var2, var16, var9, var10, (Entity)var32, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) {
+                  var22 = 15;
+                  if (var32 instanceof Model) {
+                     var22 = ((Model)var32).method198() / 4;
+                     if (var22 > 30) {
+                        var22 = 30;
+                     }
+                  }
 
+                  for (var23 = 0; var23 <= var9; ++var23) {
+                     for (var25 = 0; var25 <= var10; ++var25) {
+                        if (var22 > Tiles.field909[var0][var23 + var1][var25 + var2]) {
+                           Tiles.field909[var0][var23 + var1][var25 + var2] = (byte)var22;
+                        }
+                     }
+                  }
+               }
+
+               if (var8.interactType != 0 && var7 != null) {
+                  var7.method91(var1, var2, var9, var10, var8.boolean1);
+               }
+            }
          }
       }
+
    }
 }
diff --git a/runescape-client/src/main/java/class229.java b/runescape-client/src/main/java/class229.java
index 3ee3edf4e1..45b2567226 100644
--- a/runescape-client/src/main/java/class229.java
+++ b/runescape-client/src/main/java/class229.java
@@ -1,31 +1,32 @@
 import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
 @ObfuscatedName("hz")
 public class class229 {
    @ObfuscatedName("l")
-   public static short[][] __hz_l;
+   public static short[][] field1137;
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "(IB)Ljb;",
       garbageValue = "-41"
    )
-   @Export("getParamKeyDefinition")
-   public static ParamKeyDefinition getParamKeyDefinition(int var0) {
-      ParamKeyDefinition var1 = (ParamKeyDefinition)ParamKeyDefinition.ParamKeyDefinition_cached.get((long)var0);
-      if(var1 != null) {
+   @Export("getParamDefinition")
+   public static ParamDefinition getParamDefinition(int var0) {
+      ParamDefinition var1 = (ParamDefinition)ParamDefinition.ParamDefinition_cached.get((long)var0);
+      if (var1 != null) {
          return var1;
       } else {
-         byte[] var2 = ParamKeyDefinition.__jb_m.takeRecord(11, var0);
-         var1 = new ParamKeyDefinition();
-         if(var2 != null) {
-            var1.read(new Buffer(var2));
+         byte[] var2 = ParamDefinition.ParamDefinition_archive.takeFile(11, var0);
+         var1 = new ParamDefinition();
+         if (var2 != null) {
+            var1.decode(new Buffer(var2));
          }
 
-         var1.init();
-         ParamKeyDefinition.ParamKeyDefinition_cached.put(var1, (long)var0);
+         var1.postDecode();
+         ParamDefinition.ParamDefinition_cached.put(var1, (long)var0);
          return var1;
       }
    }
@@ -36,61 +37,61 @@ public class class229 {
       garbageValue = "1886084106"
    )
    static int method4513(int var0, Script var1, boolean var2) {
-      if(var0 == 6200) {
+      if (var0 == ScriptOpcodes.VIEWPORT_SETFOV) {
          RouteStrategy.Interpreter_intStackSize -= 2;
-         Client.__client_rw = (short)class161.method3395(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]);
-         if(Client.__client_rw <= 0) {
-            Client.__client_rw = 256;
+         Client.field130 = (short)class161.method3395(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize]);
+         if (Client.field130 <= 0) {
+            Client.field130 = 256;
          }
 
-         Client.__client_rm = (short)class161.method3395(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]);
-         if(Client.__client_rm <= 0) {
-            Client.__client_rm = 256;
+         Client.field131 = (short)class161.method3395(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]);
+         if (Client.field131 <= 0) {
+            Client.field131 = 256;
          }
 
          return 1;
-      } else if(var0 == 6201) {
+      } else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) {
          RouteStrategy.Interpreter_intStackSize -= 2;
-         Client.__client_re = (short)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-         if(Client.__client_re <= 0) {
-            Client.__client_re = 256;
+         Client.field150 = (short)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
+         if (Client.field150 <= 0) {
+            Client.field150 = 256;
          }
 
-         Client.__client_rb = (short)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-         if(Client.__client_rb <= 0) {
-            Client.__client_rb = 320;
+         Client.field149 = (short)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
+         if (Client.field149 <= 0) {
+            Client.field149 = 320;
          }
 
          return 1;
-      } else if(var0 == 6202) {
+      } else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) {
          RouteStrategy.Interpreter_intStackSize -= 4;
-         Client.__client_rv = (short)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-         if(Client.__client_rv <= 0) {
-            Client.__client_rv = 1;
+         Client.field135 = (short)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
+         if (Client.field135 <= 0) {
+            Client.field135 = 1;
          }
 
-         Client.__client_ri = (short)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-         if(Client.__client_ri <= 0) {
-            Client.__client_ri = 32767;
-         } else if(Client.__client_ri < Client.__client_rv) {
-            Client.__client_ri = Client.__client_rv;
+         Client.field134 = (short)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
+         if (Client.field134 <= 0) {
+            Client.field134 = 32767;
+         } else if (Client.field134 < Client.field135) {
+            Client.field134 = Client.field135;
          }
 
-         Client.__client_rs = (short)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
-         if(Client.__client_rs <= 0) {
-            Client.__client_rs = 1;
+         Client.field132 = (short)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
+         if (Client.field132 <= 0) {
+            Client.field132 = 1;
          }
 
-         Client.__client_rp = (short)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3];
-         if(Client.__client_rp <= 0) {
-            Client.__client_rp = 32767;
-         } else if(Client.__client_rp < Client.__client_rs) {
-            Client.__client_rp = Client.__client_rs;
+         Client.field133 = (short)Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3];
+         if (Client.field133 <= 0) {
+            Client.field133 = 32767;
+         } else if (Client.field133 < Client.field132) {
+            Client.field133 = Client.field132;
          }
 
          return 1;
-      } else if(var0 == 6203) {
-         if(Client.viewportWidget != null) {
+      } else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) {
+         if (Client.viewportWidget != null) {
             FontName.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false);
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.viewportWidth;
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.viewportHeight;
@@ -100,13 +101,13 @@ public class class229 {
          }
 
          return 1;
-      } else if(var0 == 6204) {
-         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.__client_re;
-         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.__client_rb;
+      } else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) {
+         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.field150;
+         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.field149;
          return 1;
-      } else if(var0 == 6205) {
-         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class30.method571(Client.__client_rw);
-         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class30.method571(Client.__client_rm);
+      } else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) {
+         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class30.method571(Client.field130);
+         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class30.method571(Client.field131);
          return 1;
       } else {
          return 2;
@@ -119,7 +120,7 @@ public class class229 {
       garbageValue = "-21"
    )
    static void method4514() {
-      if(Canvas.localPlayer.x >> 7 == Client.destinationX && Canvas.localPlayer.y >> 7 == Client.destinationY) {
+      if (Canvas.localPlayer.x >> 7 == Client.destinationX && Canvas.localPlayer.y >> 7 == Client.destinationY) {
          Client.destinationX = 0;
       }
 
@@ -132,7 +133,7 @@ public class class229 {
    )
    static final void method4512() {
       SecureRandomFuture.method2104();
-      if(PacketWriter.clanChat != null) {
+      if (PacketWriter.clanChat != null) {
          PacketWriter.clanChat.clearIgnoreds();
       }
 
diff --git a/runescape-client/src/main/java/class230.java b/runescape-client/src/main/java/class230.java
index 320164629a..ab493cd64a 100644
--- a/runescape-client/src/main/java/class230.java
+++ b/runescape-client/src/main/java/class230.java
@@ -1,11 +1,10 @@
-import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("hy")
 public class class230 {
    @ObfuscatedName("az")
-   protected static boolean __hy_az;
+   protected static boolean field1138;
 
    @ObfuscatedName("q")
    @ObfuscatedSignature(
@@ -16,66 +15,68 @@ public class class230 {
       int var1 = var0.length();
       byte[] var2 = new byte[var1];
 
-      for(int var3 = 0; var3 < var1; ++var3) {
+      for (int var3 = 0; var3 < var1; ++var3) {
          char var4 = var0.charAt(var3);
-         if(var4 > 0 && var4 < 128 || var4 >= 160 && var4 <= 255) {
-            var2[var3] = (byte)var4;
-         } else if(var4 == 8364) {
-            var2[var3] = -128;
-         } else if(var4 == 8218) {
-            var2[var3] = -126;
-         } else if(var4 == 402) {
-            var2[var3] = -125;
-         } else if(var4 == 8222) {
-            var2[var3] = -124;
-         } else if(var4 == 8230) {
-            var2[var3] = -123;
-         } else if(var4 == 8224) {
-            var2[var3] = -122;
-         } else if(var4 == 8225) {
-            var2[var3] = -121;
-         } else if(var4 == 710) {
-            var2[var3] = -120;
-         } else if(var4 == 8240) {
-            var2[var3] = -119;
-         } else if(var4 == 352) {
-            var2[var3] = -118;
-         } else if(var4 == 8249) {
-            var2[var3] = -117;
-         } else if(var4 == 338) {
-            var2[var3] = -116;
-         } else if(var4 == 381) {
-            var2[var3] = -114;
-         } else if(var4 == 8216) {
-            var2[var3] = -111;
-         } else if(var4 == 8217) {
-            var2[var3] = -110;
-         } else if(var4 == 8220) {
-            var2[var3] = -109;
-         } else if(var4 == 8221) {
-            var2[var3] = -108;
-         } else if(var4 == 8226) {
-            var2[var3] = -107;
-         } else if(var4 == 8211) {
-            var2[var3] = -106;
-         } else if(var4 == 8212) {
-            var2[var3] = -105;
-         } else if(var4 == 732) {
-            var2[var3] = -104;
-         } else if(var4 == 8482) {
-            var2[var3] = -103;
-         } else if(var4 == 353) {
-            var2[var3] = -102;
-         } else if(var4 == 8250) {
-            var2[var3] = -101;
-         } else if(var4 == 339) {
-            var2[var3] = -100;
-         } else if(var4 == 382) {
-            var2[var3] = -98;
-         } else if(var4 == 376) {
-            var2[var3] = -97;
+         if ((var4 <= 0 || var4 >= 128) && (var4 < 160 || var4 > 255)) {
+            if (var4 == 8364) {
+               var2[var3] = -128;
+            } else if (var4 == 8218) {
+               var2[var3] = -126;
+            } else if (var4 == 402) {
+               var2[var3] = -125;
+            } else if (var4 == 8222) {
+               var2[var3] = -124;
+            } else if (var4 == 8230) {
+               var2[var3] = -123;
+            } else if (var4 == 8224) {
+               var2[var3] = -122;
+            } else if (var4 == 8225) {
+               var2[var3] = -121;
+            } else if (var4 == 710) {
+               var2[var3] = -120;
+            } else if (var4 == 8240) {
+               var2[var3] = -119;
+            } else if (var4 == 352) {
+               var2[var3] = -118;
+            } else if (var4 == 8249) {
+               var2[var3] = -117;
+            } else if (var4 == 338) {
+               var2[var3] = -116;
+            } else if (var4 == 381) {
+               var2[var3] = -114;
+            } else if (var4 == 8216) {
+               var2[var3] = -111;
+            } else if (var4 == 8217) {
+               var2[var3] = -110;
+            } else if (var4 == 8220) {
+               var2[var3] = -109;
+            } else if (var4 == 8221) {
+               var2[var3] = -108;
+            } else if (var4 == 8226) {
+               var2[var3] = -107;
+            } else if (var4 == 8211) {
+               var2[var3] = -106;
+            } else if (var4 == 8212) {
+               var2[var3] = -105;
+            } else if (var4 == 732) {
+               var2[var3] = -104;
+            } else if (var4 == 8482) {
+               var2[var3] = -103;
+            } else if (var4 == 353) {
+               var2[var3] = -102;
+            } else if (var4 == 8250) {
+               var2[var3] = -101;
+            } else if (var4 == 339) {
+               var2[var3] = -100;
+            } else if (var4 == 382) {
+               var2[var3] = -98;
+            } else if (var4 == 376) {
+               var2[var3] = -97;
+            } else {
+               var2[var3] = 63;
+            }
          } else {
-            var2[var3] = 63;
+            var2[var3] = (byte)var4;
          }
       }
 
diff --git a/runescape-client/src/main/java/class233.java b/runescape-client/src/main/java/class233.java
index 378320997a..f3fc121e9f 100644
--- a/runescape-client/src/main/java/class233.java
+++ b/runescape-client/src/main/java/class233.java
@@ -13,13 +13,13 @@ public class class233 {
       char[] var2 = new char[var1];
       byte var3 = 2;
 
-      for(int var4 = 0; var4 < var1; ++var4) {
+      for (int var4 = 0; var4 < var1; ++var4) {
          char var5 = var0.charAt(var4);
-         if(var3 == 0) {
+         if (var3 == 0) {
             var5 = Character.toLowerCase(var5);
-         } else if(var3 == 2 || Character.isUpperCase(var5)) {
+         } else if (var3 == 2 || Character.isUpperCase(var5)) {
             char var6;
-            if(var5 != 181 && var5 != 402) {
+            if (var5 != 181 && var5 != 402) {
                var6 = Character.toTitleCase(var5);
             } else {
                var6 = var5;
@@ -28,11 +28,11 @@ public class class233 {
             var5 = var6;
          }
 
-         if(Character.isLetter(var5)) {
+         if (Character.isLetter(var5)) {
             var3 = 0;
-         } else if(var5 != '.' && var5 != '?' && var5 != '!') {
-            if(Character.isSpaceChar(var5)) {
-               if(var3 != 2) {
+         } else if (var5 != '.' && var5 != '?' && var5 != '!') {
+            if (Character.isSpaceChar(var5)) {
+               if (var3 != 2) {
                   var3 = 1;
                }
             } else {
diff --git a/runescape-client/src/main/java/class234.java b/runescape-client/src/main/java/class234.java
index 269612760a..d065094361 100644
--- a/runescape-client/src/main/java/class234.java
+++ b/runescape-client/src/main/java/class234.java
@@ -1,3 +1,4 @@
+import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
@@ -8,26 +9,27 @@ public class class234 {
       signature = "(Lbr;III)V",
       garbageValue = "-701527010"
    )
-   static void method4534(Player var0, int var1, int var2) {
-      if(var0.sequence == var1 && var1 != -1) {
-         int var3 = WorldMapAreaData.getSequenceDefinition(var1).__t;
-         if(var3 == 1) {
+   @Export("performPlayerAnimation")
+   static void performPlayerAnimation(Player var0, int var1, int var2) {
+      if (var0.sequence == var1 && var1 != -1) {
+         int var3 = WorldMapAreaData.getSequenceDefinition(var1).field783;
+         if (var3 == 1) {
             var0.sequenceFrame = 0;
             var0.sequenceFrameCycle = 0;
             var0.sequenceDelay = var2;
-            var0.__bj = 0;
+            var0.field13 = 0;
          }
 
-         if(var3 == 2) {
-            var0.__bj = 0;
+         if (var3 == 2) {
+            var0.field13 = 0;
          }
-      } else if(var1 == -1 || var0.sequence == -1 || WorldMapAreaData.getSequenceDefinition(var1).__n >= WorldMapAreaData.getSequenceDefinition(var0.sequence).__n) {
+      } else if (var1 == -1 || var0.sequence == -1 || WorldMapAreaData.getSequenceDefinition(var1).field779 >= WorldMapAreaData.getSequenceDefinition(var0.sequence).field779) {
          var0.sequence = var1;
          var0.sequenceFrame = 0;
          var0.sequenceFrameCycle = 0;
          var0.sequenceDelay = var2;
-         var0.__bj = 0;
-         var0.__ch = var0.pathLength;
+         var0.field13 = 0;
+         var0.field25 = var0.pathLength;
       }
 
    }
@@ -39,12 +41,11 @@ public class class234 {
    )
    static void method4535(Buffer var0, int var1) {
       class50.method902(var0.array, var1);
-      if(class168.randomDat != null) {
+      if (class168.randomDat != null) {
          try {
             class168.randomDat.seek(0L);
             class168.randomDat.write(var0.array, var1, 24);
          } catch (Exception var3) {
-            ;
          }
       }
 
diff --git a/runescape-client/src/main/java/class236.java b/runescape-client/src/main/java/class236.java
index 77d9f09cf7..214b6ba767 100644
--- a/runescape-client/src/main/java/class236.java
+++ b/runescape-client/src/main/java/class236.java
@@ -14,107 +14,107 @@ public class class236 {
       int var2 = var0.readBits(2);
       int var3;
       int var4;
+      int var5;
+      int var6;
       int var7;
       int var8;
-      int var9;
-      int var10;
-      if(var2 == 0) {
-         if(var0.readBits(1) != 0) {
+      if (var2 == 0) {
+         if (var0.readBits(1) != 0) {
             updateExternalPlayer(var0, var1);
          }
 
          var3 = var0.readBits(13);
          var4 = var0.readBits(13);
-         boolean var12 = var0.readBits(1) == 1;
-         if(var12) {
-            Players.__cq_i[++Players.__cq_n - 1] = var1;
+         boolean var11 = var0.readBits(1) == 1;
+         if (var11) {
+            Players.field737[++Players.field736 - 1] = var1;
          }
 
-         if(Client.players[var1] != null) {
+         if (Client.players[var1] != null) {
             throw new RuntimeException();
          } else {
-            Player var6 = Client.players[var1] = new Player();
-            var6.index = var1;
-            if(Players.__cq_o[var1] != null) {
-               var6.read(Players.__cq_o[var1]);
+            Player var12 = Client.players[var1] = new Player();
+            var12.index = var1;
+            if (Players.field733[var1] != null) {
+               var12.read(Players.field733[var1]);
             }
 
-            var6.orientation = Players.Players_orientations[var1];
-            var6.targetIndex = Players.Players_targetIndices[var1];
-            var7 = Players.Players_regions[var1];
-            var8 = var7 >> 28;
-            var9 = var7 >> 14 & 255;
-            var10 = var7 & 255;
-            var6.pathTraversed[0] = Players.__cq_w[var1];
-            var6.plane = (byte)var8;
-            var6.resetPath((var9 << 13) + var3 - class50.baseX, (var10 << 13) + var4 - GraphicsObject.baseY);
-            var6.__ag = false;
+            var12.orientation = Players.Players_orientations[var1];
+            var12.targetIndex = Players.Players_targetIndices[var1];
+            var5 = Players.Players_regions[var1];
+            var6 = var5 >> 28;
+            var7 = var5 >> 14 & 255;
+            var8 = var5 & 255;
+            var12.pathTraversed[0] = Players.field732[var1];
+            var12.plane = (byte)var6;
+            var12.resetPath((var7 << 13) + var3 - class50.baseX, (var8 << 13) + var4 - GraphicsObject.baseY);
+            var12.field725 = false;
             return true;
          }
-      } else if(var2 == 1) {
+      } else if (var2 == 1) {
          var3 = var0.readBits(2);
          var4 = Players.Players_regions[var1];
          Players.Players_regions[var1] = (((var4 >> 28) + var3 & 3) << 28) + (var4 & 268435455);
          return false;
       } else {
-         int var5;
-         int var11;
-         if(var2 == 2) {
+         int var9;
+         int var10;
+         if (var2 == 2) {
             var3 = var0.readBits(5);
             var4 = var3 >> 3;
-            var5 = var3 & 7;
-            var11 = Players.Players_regions[var1];
-            var7 = (var11 >> 28) + var4 & 3;
-            var8 = var11 >> 14 & 255;
-            var9 = var11 & 255;
-            if(var5 == 0) {
-               --var8;
-               --var9;
+            var9 = var3 & 7;
+            var10 = Players.Players_regions[var1];
+            var5 = (var10 >> 28) + var4 & 3;
+            var6 = var10 >> 14 & 255;
+            var7 = var10 & 255;
+            if (var9 == 0) {
+               --var6;
+               --var7;
             }
 
-            if(var5 == 1) {
-               --var9;
+            if (var9 == 1) {
+               --var7;
             }
 
-            if(var5 == 2) {
-               ++var8;
-               --var9;
+            if (var9 == 2) {
+               ++var6;
+               --var7;
             }
 
-            if(var5 == 3) {
-               --var8;
+            if (var9 == 3) {
+               --var6;
             }
 
-            if(var5 == 4) {
-               ++var8;
+            if (var9 == 4) {
+               ++var6;
             }
 
-            if(var5 == 5) {
-               --var8;
-               ++var9;
+            if (var9 == 5) {
+               --var6;
+               ++var7;
             }
 
-            if(var5 == 6) {
-               ++var9;
+            if (var9 == 6) {
+               ++var7;
             }
 
-            if(var5 == 7) {
-               ++var8;
-               ++var9;
+            if (var9 == 7) {
+               ++var6;
+               ++var7;
             }
 
-            Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28);
+            Players.Players_regions[var1] = (var6 << 14) + var7 + (var5 << 28);
             return false;
          } else {
             var3 = var0.readBits(18);
             var4 = var3 >> 16;
-            var5 = var3 >> 8 & 255;
-            var11 = var3 & 255;
-            var7 = Players.Players_regions[var1];
-            var8 = (var7 >> 28) + var4 & 3;
-            var9 = var5 + (var7 >> 14) & 255;
-            var10 = var7 + var11 & 255;
-            Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28);
+            var9 = var3 >> 8 & 255;
+            var10 = var3 & 255;
+            var5 = Players.Players_regions[var1];
+            var6 = (var5 >> 28) + var4 & 3;
+            var7 = var9 + (var5 >> 14) & 255;
+            var8 = var5 + var10 & 255;
+            Players.Players_regions[var1] = (var7 << 14) + var8 + (var6 << 28);
             return false;
          }
       }
diff --git a/runescape-client/src/main/java/class238.java b/runescape-client/src/main/java/class238.java
index aa5ea9e654..b7aa774a6e 100644
--- a/runescape-client/src/main/java/class238.java
+++ b/runescape-client/src/main/java/class238.java
@@ -8,8 +8,8 @@ public final class class238 {
    @ObfuscatedSignature(
       signature = "Lit;"
    )
-   @Export("indexCache9")
-   static IndexCache indexCache9;
+   @Export("archive9")
+   static Archive archive9;
 
    @ObfuscatedName("im")
    @ObfuscatedSignature(
@@ -17,26 +17,26 @@ public final class class238 {
       garbageValue = "188151075"
    )
    @Export("runCs1")
-   static final boolean runCs1(Widget var0) {
-      if(var0.cs1Comparisons == null) {
+   static final boolean runCs1(Widget component) {
+      if (component.cs1Comparisons == null) {
          return false;
       } else {
-         for(int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) {
-            int var2 = class16.method187(var0, var1);
-            int var3 = var0.cs1ComparisonValues[var1];
-            if(var0.cs1Comparisons[var1] == 2) {
-               if(var2 >= var3) {
+         for (int var1 = 0; var1 < component.cs1Comparisons.length; ++var1) {
+            int var2 = class16.method187(component, var1);
+            int var3 = component.cs1ComparisonValues[var1];
+            if (component.cs1Comparisons[var1] == 2) {
+               if (var2 >= var3) {
                   return false;
                }
-            } else if(var0.cs1Comparisons[var1] == 3) {
-               if(var2 <= var3) {
+            } else if (component.cs1Comparisons[var1] == 3) {
+               if (var2 <= var3) {
                   return false;
                }
-            } else if(var0.cs1Comparisons[var1] == 4) {
-               if(var2 == var3) {
+            } else if (component.cs1Comparisons[var1] == 4) {
+               if (var2 == var3) {
                   return false;
                }
-            } else if(var3 != var2) {
+            } else if (var3 != var2) {
                return false;
             }
          }
@@ -50,543 +50,544 @@ public final class class238 {
       signature = "([Lho;IIIIIIII)V",
       garbageValue = "1706481742"
    )
-   @Export("updateWidgetGroup")
-   static final void updateWidgetGroup(Widget[] var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) {
-      for(int var8 = 0; var8 < var0.length; ++var8) {
-         Widget var9 = var0[var8];
-         if(var9 != null && var9.parentId == var1 && (!var9.isIf3 || var9.type == 0 || var9.hasListener || class1.getWidgetClickMask(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) {
-            if(var9.isIf3) {
-               if(PacketBufferNode.method3673(var9)) {
+   @Export("updateInterface")
+   static final void updateInterface(Widget[] components, int parentId, int var2, int var3, int var4, int var5, int x, int y) {
+      for (int var8 = 0; var8 < components.length; ++var8) {
+         Widget var9 = components[var8];
+         if (var9 != null && var9.parentId == parentId && (!var9.isIf3 || var9.type == 0 || var9.hasListener || class1.getWidgetClickMask(var9) != 0 || var9 == Client.clickedWidgetParent || var9.contentType == 1338)) {
+            if (var9.isIf3) {
+               if (PacketBufferNode.isComponentHidden(var9)) {
                   continue;
                }
-            } else if(var9.type == 0 && var9 != Clock.mousedOverWidgetIf1 && PacketBufferNode.method3673(var9)) {
+            } else if (var9.type == 0 && var9 != Clock.mousedOverWidgetIf1 && PacketBufferNode.isComponentHidden(var9)) {
                continue;
             }
 
-            int var10 = var9.x + var6;
-            int var11 = var7 + var9.y;
+            int var10 = var9.x + x;
+            int var11 = y + var9.y;
             int var12;
             int var13;
             int var14;
             int var15;
+            int var16;
             int var17;
-            int var18;
-            if(var9.type == 2) {
+            if (var9.type == 2) {
                var12 = var2;
                var13 = var3;
                var14 = var4;
                var15 = var5;
             } else {
-               int var16;
-               if(var9.type == 9) {
-                  var16 = var10;
-                  var17 = var11;
-                  var18 = var10 + var9.width;
+               int var18;
+               if (var9.type == 9) {
+                  var18 = var10;
+                  var16 = var11;
+                  var17 = var10 + var9.width;
                   int var19 = var11 + var9.height;
-                  if(var18 < var10) {
-                     var16 = var18;
-                     var18 = var10;
+                  if (var17 < var10) {
+                     var18 = var17;
+                     var17 = var10;
                   }
 
-                  if(var19 < var11) {
-                     var17 = var19;
+                  if (var19 < var11) {
+                     var16 = var19;
                      var19 = var11;
                   }
 
-                  ++var18;
+                  ++var17;
                   ++var19;
-                  var12 = var16 > var2?var16:var2;
-                  var13 = var17 > var3?var17:var3;
-                  var14 = var18 < var4?var18:var4;
-                  var15 = var19 < var5?var19:var5;
+                  var12 = var18 > var2 ? var18 : var2;
+                  var13 = var16 > var3 ? var16 : var3;
+                  var14 = var17 < var4 ? var17 : var4;
+                  var15 = var19 < var5 ? var19 : var5;
                } else {
-                  var16 = var10 + var9.width;
-                  var17 = var11 + var9.height;
-                  var12 = var10 > var2?var10:var2;
-                  var13 = var11 > var3?var11:var3;
-                  var14 = var16 < var4?var16:var4;
-                  var15 = var17 < var5?var17:var5;
+                  var18 = var10 + var9.width;
+                  var16 = var11 + var9.height;
+                  var12 = var10 > var2 ? var10 : var2;
+                  var13 = var11 > var3 ? var11 : var3;
+                  var14 = var18 < var4 ? var18 : var4;
+                  var15 = var16 < var5 ? var16 : var5;
                }
             }
 
-            if(var9 == Client.clickedWidget) {
-               Client.__client_nt = true;
-               Client.__client_nk = var10;
-               Client.__client_np = var11;
+            if (var9 == Client.clickedWidget) {
+               Client.field103 = true;
+               Client.field110 = var10;
+               Client.field111 = var11;
             }
 
-            boolean var32 = false;
-            if(var9.__cg) {
-               switch(Client.__client_mf) {
+            boolean var28 = false;
+            if (var9.field965) {
+               switch(Client.field151) {
                case 0:
-                  var32 = true;
+                  var28 = true;
                case 1:
                default:
                   break;
                case 2:
-                  if(Client.__client_ms == var9.id >>> 16) {
-                     var32 = true;
+                  if (Client.field153 == var9.id >>> 16) {
+                     var28 = true;
                   }
                   break;
                case 3:
-                  if(var9.id == Client.__client_ms) {
-                     var32 = true;
+                  if (var9.id == Client.field153) {
+                     var28 = true;
                   }
                }
             }
 
-            if(var32 || !var9.isIf3 || var12 < var14 && var13 < var15) {
-               if(var9.isIf3) {
-                  ScriptEvent var26;
-                  if(var9.noClickThrough) {
-                     if(MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) {
-                        for(var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) {
-                           if(var26.boolean1) {
-                              var26.remove();
-                              var26.widget.__fq = false;
+            if (var28 || !var9.isIf3 || var12 < var14 && var13 < var15) {
+               if (var9.isIf3) {
+                  ScriptEvent var29;
+                  if (var9.noClickThrough) {
+                     if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) {
+                        for (var29 = (ScriptEvent)Client.scriptEvents.last(); var29 != null; var29 = (ScriptEvent)Client.scriptEvents.previous()) {
+                           if (var29.boolean1) {
+                              var29.remove();
+                              var29.widget.field978 = false;
                            }
                         }
 
-                        if(MouseRecorder.widgetDragDuration == 0) {
+                        if (MouseRecorder.widgetDragDuration == 0) {
                            Client.clickedWidget = null;
                            Client.clickedWidgetParent = null;
                         }
 
-                        if(!Client.isMenuOpen) {
+                        if (!Client.isMenuOpen) {
                            class30.resetMenuEntries();
                         }
                      }
-                  } else if(var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) {
-                     for(var26 = (ScriptEvent)Client.scriptEvents.last(); var26 != null; var26 = (ScriptEvent)Client.scriptEvents.previous()) {
-                        if(var26.boolean1 && var26.widget.onScroll == var26.args0) {
-                           var26.remove();
+                  } else if (var9.noScrollThrough && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) {
+                     for (var29 = (ScriptEvent)Client.scriptEvents.last(); var29 != null; var29 = (ScriptEvent)Client.scriptEvents.previous()) {
+                        if (var29.boolean1 && var29.widget.onScroll == var29.args0) {
+                           var29.remove();
                         }
                      }
                   }
                }
 
-               var17 = MouseHandler.MouseHandler_x;
-               var18 = MouseHandler.MouseHandler_y;
-               if(MouseHandler.MouseHandler_lastButton != 0) {
-                  var17 = MouseHandler.MouseHandler_lastPressedX;
-                  var18 = MouseHandler.MouseHandler_lastPressedY;
+               var16 = MouseHandler.MouseHandler_x;
+               var17 = MouseHandler.MouseHandler_y;
+               if (MouseHandler.MouseHandler_lastButton != 0) {
+                  var16 = MouseHandler.MouseHandler_lastPressedX;
+                  var17 = MouseHandler.MouseHandler_lastPressedY;
                }
 
-               boolean var33 = var17 >= var12 && var18 >= var13 && var17 < var14 && var18 < var15;
-               if(var9.contentType == 1337) {
-                  if(!Client.isLoading && !Client.isMenuOpen && var33) {
-                     WorldMapEvent.method781(var17, var18, var12, var13);
+               boolean var30 = var16 >= var12 && var17 >= var13 && var16 < var14 && var17 < var15;
+               if (var9.contentType == 1337) {
+                  if (!Client.isLoading && !Client.isMenuOpen && var30) {
+                     WorldMapEvent.addSceneMenuOptions(var16, var17, var12, var13);
                   }
-               } else if(var9.contentType == 1338) {
+               } else if (var9.contentType == 1338) {
                   WorldMapRegion.method567(var9, var10, var11);
                } else {
-                  if(var9.contentType == 1400) {
-                     class60.worldMap0.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var33, var10, var11, var9.width, var9.height);
+                  if (var9.contentType == 1400) {
+                     class60.worldMap0.onCycle(MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y, var30, var10, var11, var9.width, var9.height);
                   }
 
-                  if(!Client.isMenuOpen && var33) {
-                     if(var9.contentType == 1400) {
-                        class60.worldMap0.__bd_544(var10, var11, var9.width, var9.height, var17, var18);
+                  if (!Client.isMenuOpen && var30) {
+                     if (var9.contentType == 1400) {
+                        class60.worldMap0.method384(var10, var11, var9.width, var9.height, var16, var17);
                      } else {
-                        ChatChannel.method2237(var9, var17 - var10, var18 - var11);
+                        ChatChannel.method2237(var9, var16 - var10, var17 - var11);
                      }
                   }
 
-                  boolean var21;
-                  int var23;
-                  if(var32) {
-                     for(int var20 = 0; var20 < var9.__cf.length; ++var20) {
-                        var21 = false;
-                        boolean var22 = false;
-                        if(!var21 && var9.__cf[var20] != null) {
-                           for(var23 = 0; var23 < var9.__cf[var20].length; ++var23) {
+                  boolean var20;
+                  int var21;
+                  boolean var23;
+                  if (var28) {
+                     for (int var22 = 0; var22 < var9.field966.length; ++var22) {
+                        var20 = false;
+                        var23 = false;
+                        if (!var20 && var9.field966[var22] != null) {
+                           for (var21 = 0; var21 < var9.field966[var22].length; ++var21) {
                               boolean var24 = false;
-                              if(var9.__fh != null) {
-                                 var24 = KeyHandler.KeyHandler_pressedKeys[var9.__cf[var20][var23]];
+                              if (var9.field984 != null) {
+                                 var24 = KeyHandler.KeyHandler_pressedKeys[var9.field966[var22][var21]];
                               }
 
-                              if(class1.method15(var9.__cf[var20][var23]) || var24) {
-                                 var21 = true;
-                                 if(var9.__fh != null && var9.__fh[var20] > Client.cycle) {
+                              if (class1.method15(var9.field966[var22][var21]) || var24) {
+                                 var20 = true;
+                                 if (var9.field984 != null && var9.field984[var22] > Client.cycle) {
                                     break;
                                  }
 
-                                 byte var25 = var9.__cp[var20][var23];
-                                 if(var25 == 0 || ((var25 & 8) == 0 || !KeyHandler.KeyHandler_pressedKeys[86] && !KeyHandler.KeyHandler_pressedKeys[82] && !KeyHandler.KeyHandler_pressedKeys[81]) && ((var25 & 2) == 0 || KeyHandler.KeyHandler_pressedKeys[86]) && ((var25 & 1) == 0 || KeyHandler.KeyHandler_pressedKeys[82]) && ((var25 & 4) == 0 || KeyHandler.KeyHandler_pressedKeys[81])) {
-                                    var22 = true;
+                                 byte var25 = var9.field967[var22][var21];
+                                 if (var25 == 0 || ((var25 & 8) == 0 || !KeyHandler.KeyHandler_pressedKeys[86] && !KeyHandler.KeyHandler_pressedKeys[82] && !KeyHandler.KeyHandler_pressedKeys[81]) && ((var25 & 2) == 0 || KeyHandler.KeyHandler_pressedKeys[86]) && ((var25 & 1) == 0 || KeyHandler.KeyHandler_pressedKeys[82]) && ((var25 & 4) == 0 || KeyHandler.KeyHandler_pressedKeys[81])) {
+                                    var23 = true;
                                     break;
                                  }
                               }
                            }
                         }
 
-                        if(var22) {
-                           if(var20 < 10) {
-                              class171.method3494(var20 + 1, var9.id, var9.childIndex, var9.itemId, "");
-                           } else if(var20 == 10) {
+                        if (var23) {
+                           if (var22 < 10) {
+                              class171.method3494(var22 + 1, var9.id, var9.childIndex, var9.itemId, "");
+                           } else if (var22 == 10) {
                               Player.method1281();
-                              class25.method350(var9.id, var9.childIndex, class211.method4107(class1.getWidgetClickMask(var9)), var9.itemId);
+                              WorldMapDecoration.method350(var9.id, var9.childIndex, Calendar.method4107(class1.getWidgetClickMask(var9)), var9.itemId);
                               Client.selectedSpellActionName = class198.method3745(var9);
-                              if(Client.selectedSpellActionName == null) {
+                              if (Client.selectedSpellActionName == null) {
                                  Client.selectedSpellActionName = "null";
                               }
 
                               Client.selectedSpellName = var9.dataText + BufferedFile.colorStartTag(16777215);
                            }
 
-                           var23 = var9.__cc[var20];
-                           if(var9.__fh == null) {
-                              var9.__fh = new int[var9.__cf.length];
+                           var21 = var9.field968[var22];
+                           if (var9.field984 == null) {
+                              var9.field984 = new int[var9.field966.length];
                            }
 
-                           if(var9.__ci == null) {
-                              var9.__ci = new int[var9.__cf.length];
+                           if (var9.field969 == null) {
+                              var9.field969 = new int[var9.field966.length];
                            }
 
-                           if(var23 != 0) {
-                              if(var9.__fh[var20] == 0) {
-                                 var9.__fh[var20] = var23 + Client.cycle + var9.__ci[var20];
+                           if (var21 != 0) {
+                              if (var9.field984[var22] == 0) {
+                                 var9.field984[var22] = var21 + Client.cycle + var9.field969[var22];
                               } else {
-                                 var9.__fh[var20] = var23 + Client.cycle;
+                                 var9.field984[var22] = var21 + Client.cycle;
                               }
                            } else {
-                              var9.__fh[var20] = Integer.MAX_VALUE;
+                              var9.field984[var22] = Integer.MAX_VALUE;
                            }
                         }
 
-                        if(!var21 && var9.__fh != null) {
-                           var9.__fh[var20] = 0;
+                        if (!var20 && var9.field984 != null) {
+                           var9.field984[var22] = 0;
                         }
                      }
                   }
 
-                  if(var9.isIf3) {
-                     if(MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) {
-                        var33 = true;
+                  ScriptEvent var31;
+                  if (var9.isIf3) {
+                     if (MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) {
+                        var30 = true;
                      } else {
-                        var33 = false;
+                        var30 = false;
                      }
 
-                     boolean var34 = false;
-                     if((MouseHandler.MouseHandler_currentButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var33) {
-                        var34 = true;
+                     var23 = false;
+                     if ((MouseHandler.MouseHandler_currentButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_currentButton == 4) && var30) {
+                        var23 = true;
                      }
 
-                     var21 = false;
-                     if((MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) {
-                        var21 = true;
+                     var20 = false;
+                     if ((MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= var12 && MouseHandler.MouseHandler_lastPressedY >= var13 && MouseHandler.MouseHandler_lastPressedX < var14 && MouseHandler.MouseHandler_lastPressedY < var15) {
+                        var20 = true;
                      }
 
-                     if(var21) {
+                     if (var20) {
                         Players.clickWidget(var9, MouseHandler.MouseHandler_lastPressedX - var10, MouseHandler.MouseHandler_lastPressedY - var11);
                      }
 
-                     if(var9.contentType == 1400) {
-                        class60.worldMap0.__w_519(var17, var18, var33 & var34, var33 & var21);
+                     if (var9.contentType == 1400) {
+                        class60.worldMap0.method361(var16, var17, var30 & var23, var30 & var20);
                      }
 
-                     if(Client.clickedWidget != null && var9 != Client.clickedWidget && var33 && class54.method1090(class1.getWidgetClickMask(var9))) {
+                     if (Client.clickedWidget != null && var9 != Client.clickedWidget && var30 && class54.method1090(class1.getWidgetClickMask(var9))) {
                         Client.draggedOnWidget = var9;
                      }
 
-                     if(var9 == Client.clickedWidgetParent) {
-                        Client.__client_nn = true;
-                        Client.__client_nw = var10;
-                        Client.__client_nl = var11;
+                     if (var9 == Client.clickedWidgetParent) {
+                        Client.field106 = true;
+                        Client.field108 = var10;
+                        Client.field109 = var11;
                      }
 
-                     if(var9.hasListener) {
-                        ScriptEvent var27;
-                        if(var33 && Client.mouseWheelRotation != 0 && var9.onScroll != null) {
-                           var27 = new ScriptEvent();
-                           var27.boolean1 = true;
-                           var27.widget = var9;
-                           var27.mouseY = Client.mouseWheelRotation;
-                           var27.args0 = var9.onScroll;
-                           Client.scriptEvents.addFirst(var27);
+                     if (var9.hasListener) {
+                        if (var30 && Client.mouseWheelRotation != 0 && var9.onScroll != null) {
+                           var31 = new ScriptEvent();
+                           var31.boolean1 = true;
+                           var31.widget = var9;
+                           var31.mouseY = Client.mouseWheelRotation;
+                           var31.args0 = var9.onScroll;
+                           Client.scriptEvents.addFirst(var31);
                         }
 
-                        if(Client.clickedWidget != null || DevicePcmPlayerProvider.dragInventoryWidget != null || Client.isMenuOpen) {
-                           var21 = false;
-                           var34 = false;
-                           var33 = false;
+                        if (Client.clickedWidget != null || DevicePcmPlayerProvider.dragInventoryWidget != null || Client.isMenuOpen) {
+                           var20 = false;
+                           var23 = false;
+                           var30 = false;
                         }
 
-                        if(!var9.__fw && var21) {
-                           var9.__fw = true;
-                           if(var9.onClick != null) {
-                              var27 = new ScriptEvent();
-                              var27.boolean1 = true;
-                              var27.widget = var9;
-                              var27.mouseX = MouseHandler.MouseHandler_lastPressedX - var10;
-                              var27.mouseY = MouseHandler.MouseHandler_lastPressedY - var11;
-                              var27.args0 = var9.onClick;
-                              Client.scriptEvents.addFirst(var27);
-                           }
-                        }
-
-                        if(var9.__fw && var34 && var9.onClickRepeat != null) {
-                           var27 = new ScriptEvent();
-                           var27.boolean1 = true;
-                           var27.widget = var9;
-                           var27.mouseX = MouseHandler.MouseHandler_x - var10;
-                           var27.mouseY = MouseHandler.MouseHandler_y - var11;
-                           var27.args0 = var9.onClickRepeat;
-                           Client.scriptEvents.addFirst(var27);
-                        }
-
-                        if(var9.__fw && !var34) {
-                           var9.__fw = false;
-                           if(var9.onRelease != null) {
-                              var27 = new ScriptEvent();
-                              var27.boolean1 = true;
-                              var27.widget = var9;
-                              var27.mouseX = MouseHandler.MouseHandler_x - var10;
-                              var27.mouseY = MouseHandler.MouseHandler_y - var11;
-                              var27.args0 = var9.onRelease;
-                              Client.__client_oc.addFirst(var27);
-                           }
-                        }
-
-                        if(var34 && var9.onHold != null) {
-                           var27 = new ScriptEvent();
-                           var27.boolean1 = true;
-                           var27.widget = var9;
-                           var27.mouseX = MouseHandler.MouseHandler_x - var10;
-                           var27.mouseY = MouseHandler.MouseHandler_y - var11;
-                           var27.args0 = var9.onHold;
-                           Client.scriptEvents.addFirst(var27);
-                        }
-
-                        if(!var9.__fq && var33) {
-                           var9.__fq = true;
-                           if(var9.onMouseOver != null) {
-                              var27 = new ScriptEvent();
-                              var27.boolean1 = true;
-                              var27.widget = var9;
-                              var27.mouseX = MouseHandler.MouseHandler_x - var10;
-                              var27.mouseY = MouseHandler.MouseHandler_y - var11;
-                              var27.args0 = var9.onMouseOver;
-                              Client.scriptEvents.addFirst(var27);
-                           }
-                        }
-
-                        if(var9.__fq && var33 && var9.onMouseRepeat != null) {
-                           var27 = new ScriptEvent();
-                           var27.boolean1 = true;
-                           var27.widget = var9;
-                           var27.mouseX = MouseHandler.MouseHandler_x - var10;
-                           var27.mouseY = MouseHandler.MouseHandler_y - var11;
-                           var27.args0 = var9.onMouseRepeat;
-                           Client.scriptEvents.addFirst(var27);
-                        }
-
-                        if(var9.__fq && !var33) {
-                           var9.__fq = false;
-                           if(var9.onMouseLeave != null) {
-                              var27 = new ScriptEvent();
-                              var27.boolean1 = true;
-                              var27.widget = var9;
-                              var27.mouseX = MouseHandler.MouseHandler_x - var10;
-                              var27.mouseY = MouseHandler.MouseHandler_y - var11;
-                              var27.args0 = var9.onMouseLeave;
-                              Client.__client_oc.addFirst(var27);
-                           }
-                        }
-
-                        if(var9.onTimer != null) {
-                           var27 = new ScriptEvent();
-                           var27.widget = var9;
-                           var27.args0 = var9.onTimer;
-                           Client.__client_oh.addFirst(var27);
-                        }
-
-                        ScriptEvent var30;
-                        int var35;
-                        int var36;
-                        if(var9.onVarTransmit != null && Client.__client_nd > var9.__fc) {
-                           if(var9.varTransmitTriggers != null && Client.__client_nd - var9.__fc <= 32) {
-                              label887:
-                              for(var35 = var9.__fc; var35 < Client.__client_nd; ++var35) {
-                                 var23 = Client.__client_nr[var35 & 31];
-
-                                 for(var36 = 0; var36 < var9.varTransmitTriggers.length; ++var36) {
-                                    if(var23 == var9.varTransmitTriggers[var36]) {
-                                       var30 = new ScriptEvent();
-                                       var30.widget = var9;
-                                       var30.args0 = var9.onVarTransmit;
-                                       Client.scriptEvents.addFirst(var30);
-                                       break label887;
-                                    }
-                                 }
-                              }
-                           } else {
-                              var27 = new ScriptEvent();
-                              var27.widget = var9;
-                              var27.args0 = var9.onVarTransmit;
-                              Client.scriptEvents.addFirst(var27);
-                           }
-
-                           var9.__fc = Client.__client_nd;
-                        }
-
-                        if(var9.onInvTransmit != null && Client.__client_ns > var9.__fl) {
-                           if(var9.invTransmitTriggers != null && Client.__client_ns - var9.__fl <= 32) {
-                              label863:
-                              for(var35 = var9.__fl; var35 < Client.__client_ns; ++var35) {
-                                 var23 = Client.__client_nz[var35 & 31];
-
-                                 for(var36 = 0; var36 < var9.invTransmitTriggers.length; ++var36) {
-                                    if(var23 == var9.invTransmitTriggers[var36]) {
-                                       var30 = new ScriptEvent();
-                                       var30.widget = var9;
-                                       var30.args0 = var9.onInvTransmit;
-                                       Client.scriptEvents.addFirst(var30);
-                                       break label863;
-                                    }
-                                 }
-                              }
-                           } else {
-                              var27 = new ScriptEvent();
-                              var27.widget = var9;
-                              var27.args0 = var9.onInvTransmit;
-                              Client.scriptEvents.addFirst(var27);
-                           }
-
-                           var9.__fl = Client.__client_ns;
-                        }
-
-                        if(var9.onStatTransmit != null && Client.changedSkillsCount > var9.__fj) {
-                           if(var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.__fj <= 32) {
-                              label839:
-                              for(var35 = var9.__fj; var35 < Client.changedSkillsCount; ++var35) {
-                                 var23 = Client.changedSkills[var35 & 31];
-
-                                 for(var36 = 0; var36 < var9.statTransmitTriggers.length; ++var36) {
-                                    if(var23 == var9.statTransmitTriggers[var36]) {
-                                       var30 = new ScriptEvent();
-                                       var30.widget = var9;
-                                       var30.args0 = var9.onStatTransmit;
-                                       Client.scriptEvents.addFirst(var30);
-                                       break label839;
-                                    }
-                                 }
-                              }
-                           } else {
-                              var27 = new ScriptEvent();
-                              var27.widget = var9;
-                              var27.args0 = var9.onStatTransmit;
-                              Client.scriptEvents.addFirst(var27);
-                           }
-
-                           var9.__fj = Client.changedSkillsCount;
-                        }
-
-                        if(Client.chatCycle > var9.__fg && var9.__em != null) {
-                           var27 = new ScriptEvent();
-                           var27.widget = var9;
-                           var27.args0 = var9.__em;
-                           Client.scriptEvents.addFirst(var27);
-                        }
-
-                        if(Client.__client_na > var9.__fg && var9.__ex != null) {
-                           var27 = new ScriptEvent();
-                           var27.widget = var9;
-                           var27.args0 = var9.__ex;
-                           Client.scriptEvents.addFirst(var27);
-                        }
-
-                        if(Client.__client_nh > var9.__fg && var9.__ej != null) {
-                           var27 = new ScriptEvent();
-                           var27.widget = var9;
-                           var27.args0 = var9.__ej;
-                           Client.scriptEvents.addFirst(var27);
-                        }
-
-                        if(Client.__client_nv > var9.__fg && var9.__eq != null) {
-                           var27 = new ScriptEvent();
-                           var27.widget = var9;
-                           var27.args0 = var9.__eq;
-                           Client.scriptEvents.addFirst(var27);
-                        }
-
-                        if(Client.__client_nc > var9.__fg && var9.__eh != null) {
-                           var27 = new ScriptEvent();
-                           var27.widget = var9;
-                           var27.args0 = var9.__eh;
-                           Client.scriptEvents.addFirst(var27);
-                        }
-
-                        if(Client.__client_ni > var9.__fg && var9.__el != null) {
-                           var27 = new ScriptEvent();
-                           var27.widget = var9;
-                           var27.args0 = var9.__el;
-                           Client.scriptEvents.addFirst(var27);
-                        }
-
-                        var9.__fg = Client.cycleCntr;
-                        if(var9.onKeyListener != null) {
-                           for(var35 = 0; var35 < Client.__client_pm; ++var35) {
-                              ScriptEvent var31 = new ScriptEvent();
+                        if (!var9.field979 && var20) {
+                           var9.field979 = true;
+                           if (var9.onClick != null) {
+                              var31 = new ScriptEvent();
+                              var31.boolean1 = true;
                               var31.widget = var9;
-                              var31.keyTyped = Client.__client_pn[var35];
-                              var31.keyPressed = Client.__client_pq[var35];
-                              var31.args0 = var9.onKeyListener;
+                              var31.mouseX = MouseHandler.MouseHandler_lastPressedX - var10;
+                              var31.mouseY = MouseHandler.MouseHandler_lastPressedY - var11;
+                              var31.args0 = var9.onClick;
                               Client.scriptEvents.addFirst(var31);
                            }
                         }
+
+                        if (var9.field979 && var23 && var9.onClickRepeat != null) {
+                           var31 = new ScriptEvent();
+                           var31.boolean1 = true;
+                           var31.widget = var9;
+                           var31.mouseX = MouseHandler.MouseHandler_x - var10;
+                           var31.mouseY = MouseHandler.MouseHandler_y - var11;
+                           var31.args0 = var9.onClickRepeat;
+                           Client.scriptEvents.addFirst(var31);
+                        }
+
+                        if (var9.field979 && !var23) {
+                           var9.field979 = false;
+                           if (var9.onRelease != null) {
+                              var31 = new ScriptEvent();
+                              var31.boolean1 = true;
+                              var31.widget = var9;
+                              var31.mouseX = MouseHandler.MouseHandler_x - var10;
+                              var31.mouseY = MouseHandler.MouseHandler_y - var11;
+                              var31.args0 = var9.onRelease;
+                              Client.field148.addFirst(var31);
+                           }
+                        }
+
+                        if (var23 && var9.onHold != null) {
+                           var31 = new ScriptEvent();
+                           var31.boolean1 = true;
+                           var31.widget = var9;
+                           var31.mouseX = MouseHandler.MouseHandler_x - var10;
+                           var31.mouseY = MouseHandler.MouseHandler_y - var11;
+                           var31.args0 = var9.onHold;
+                           Client.scriptEvents.addFirst(var31);
+                        }
+
+                        if (!var9.field978 && var30) {
+                           var9.field978 = true;
+                           if (var9.onMouseOver != null) {
+                              var31 = new ScriptEvent();
+                              var31.boolean1 = true;
+                              var31.widget = var9;
+                              var31.mouseX = MouseHandler.MouseHandler_x - var10;
+                              var31.mouseY = MouseHandler.MouseHandler_y - var11;
+                              var31.args0 = var9.onMouseOver;
+                              Client.scriptEvents.addFirst(var31);
+                           }
+                        }
+
+                        if (var9.field978 && var30 && var9.onMouseRepeat != null) {
+                           var31 = new ScriptEvent();
+                           var31.boolean1 = true;
+                           var31.widget = var9;
+                           var31.mouseX = MouseHandler.MouseHandler_x - var10;
+                           var31.mouseY = MouseHandler.MouseHandler_y - var11;
+                           var31.args0 = var9.onMouseRepeat;
+                           Client.scriptEvents.addFirst(var31);
+                        }
+
+                        if (var9.field978 && !var30) {
+                           var9.field978 = false;
+                           if (var9.onMouseLeave != null) {
+                              var31 = new ScriptEvent();
+                              var31.boolean1 = true;
+                              var31.widget = var9;
+                              var31.mouseX = MouseHandler.MouseHandler_x - var10;
+                              var31.mouseY = MouseHandler.MouseHandler_y - var11;
+                              var31.args0 = var9.onMouseLeave;
+                              Client.field148.addFirst(var31);
+                           }
+                        }
+
+                        if (var9.onTimer != null) {
+                           var31 = new ScriptEvent();
+                           var31.widget = var9;
+                           var31.args0 = var9.onTimer;
+                           Client.field147.addFirst(var31);
+                        }
+
+                        int var26;
+                        int var32;
+                        ScriptEvent var33;
+                        if (var9.onVarTransmit != null && Client.field123 > var9.field981) {
+                           if (var9.varTransmitTriggers != null && Client.field123 - var9.field981 <= 32) {
+                              label590:
+                              for (var26 = var9.field981; var26 < Client.field123; ++var26) {
+                                 var21 = Client.field121[var26 & 31];
+
+                                 for (var32 = 0; var32 < var9.varTransmitTriggers.length; ++var32) {
+                                    if (var21 == var9.varTransmitTriggers[var32]) {
+                                       var33 = new ScriptEvent();
+                                       var33.widget = var9;
+                                       var33.args0 = var9.onVarTransmit;
+                                       Client.scriptEvents.addFirst(var33);
+                                       break label590;
+                                    }
+                                 }
+                              }
+                           } else {
+                              var31 = new ScriptEvent();
+                              var31.widget = var9;
+                              var31.args0 = var9.onVarTransmit;
+                              Client.scriptEvents.addFirst(var31);
+                           }
+
+                           var9.field981 = Client.field123;
+                        }
+
+                        if (var9.onInvTransmit != null && Client.field117 > var9.field982) {
+                           if (var9.invTransmitTriggers != null && Client.field117 - var9.field982 <= 32) {
+                              label566:
+                              for (var26 = var9.field982; var26 < Client.field117; ++var26) {
+                                 var21 = Client.field116[var26 & 31];
+
+                                 for (var32 = 0; var32 < var9.invTransmitTriggers.length; ++var32) {
+                                    if (var21 == var9.invTransmitTriggers[var32]) {
+                                       var33 = new ScriptEvent();
+                                       var33.widget = var9;
+                                       var33.args0 = var9.onInvTransmit;
+                                       Client.scriptEvents.addFirst(var33);
+                                       break label566;
+                                    }
+                                 }
+                              }
+                           } else {
+                              var31 = new ScriptEvent();
+                              var31.widget = var9;
+                              var31.args0 = var9.onInvTransmit;
+                              Client.scriptEvents.addFirst(var31);
+                           }
+
+                           var9.field982 = Client.field117;
+                        }
+
+                        if (var9.onStatTransmit != null && Client.changedSkillsCount > var9.field983) {
+                           if (var9.statTransmitTriggers != null && Client.changedSkillsCount - var9.field983 <= 32) {
+                              label542:
+                              for (var26 = var9.field983; var26 < Client.changedSkillsCount; ++var26) {
+                                 var21 = Client.changedSkills[var26 & 31];
+
+                                 for (var32 = 0; var32 < var9.statTransmitTriggers.length; ++var32) {
+                                    if (var21 == var9.statTransmitTriggers[var32]) {
+                                       var33 = new ScriptEvent();
+                                       var33.widget = var9;
+                                       var33.args0 = var9.onStatTransmit;
+                                       Client.scriptEvents.addFirst(var33);
+                                       break label542;
+                                    }
+                                 }
+                              }
+                           } else {
+                              var31 = new ScriptEvent();
+                              var31.widget = var9;
+                              var31.args0 = var9.onStatTransmit;
+                              Client.scriptEvents.addFirst(var31);
+                           }
+
+                           var9.field983 = Client.changedSkillsCount;
+                        }
+
+                        if (Client.chatCycle > var9.field980 && var9.onChatTransmit != null) {
+                           var31 = new ScriptEvent();
+                           var31.widget = var9;
+                           var31.args0 = var9.onChatTransmit;
+                           Client.scriptEvents.addFirst(var31);
+                        }
+
+                        if (Client.field105 > var9.field980 && var9.onFriendTransmit != null) {
+                           var31 = new ScriptEvent();
+                           var31.widget = var9;
+                           var31.args0 = var9.onFriendTransmit;
+                           Client.scriptEvents.addFirst(var31);
+                        }
+
+                        if (Client.field129 > var9.field980 && var9.onClanTransmit != null) {
+                           var31 = new ScriptEvent();
+                           var31.widget = var9;
+                           var31.args0 = var9.onClanTransmit;
+                           Client.scriptEvents.addFirst(var31);
+                        }
+
+                        if (Client.field122 > var9.field980 && var9.onStockTransmit != null) {
+                           var31 = new ScriptEvent();
+                           var31.widget = var9;
+                           var31.args0 = var9.onStockTransmit;
+                           Client.scriptEvents.addFirst(var31);
+                        }
+
+                        if (Client.field154 > var9.field980 && var9.field977 != null) {
+                           var31 = new ScriptEvent();
+                           var31.widget = var9;
+                           var31.args0 = var9.field977;
+                           Client.scriptEvents.addFirst(var31);
+                        }
+
+                        if (Client.field124 > var9.field980 && var9.onMiscTransmit != null) {
+                           var31 = new ScriptEvent();
+                           var31.widget = var9;
+                           var31.args0 = var9.onMiscTransmit;
+                           Client.scriptEvents.addFirst(var31);
+                        }
+
+                        var9.field980 = Client.cycleCntr;
+                        if (var9.onKey != null) {
+                           for (var26 = 0; var26 < Client.field137; ++var26) {
+                              ScriptEvent var27 = new ScriptEvent();
+                              var27.widget = var9;
+                              var27.keyTyped = Client.field145[var26];
+                              var27.keyPressed = Client.field146[var26];
+                              var27.args0 = var9.onKey;
+                              Client.scriptEvents.addFirst(var27);
+                           }
+                        }
                      }
                   }
 
-                  if(!var9.isIf3) {
-                     if(Client.clickedWidget != null || DevicePcmPlayerProvider.dragInventoryWidget != null || Client.isMenuOpen) {
+                  if (!var9.isIf3) {
+                     if (Client.clickedWidget != null || DevicePcmPlayerProvider.dragInventoryWidget != null || Client.isMenuOpen) {
                         continue;
                      }
 
-                     if((var9.mouseOverRedirect >= 0 || var9.mouseOverColor != 0) && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) {
-                        if(var9.mouseOverRedirect >= 0) {
-                           Clock.mousedOverWidgetIf1 = var0[var9.mouseOverRedirect];
+                     if ((var9.mouseOverRedirect >= 0 || var9.mouseOverColor != 0) && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) {
+                        if (var9.mouseOverRedirect >= 0) {
+                           Clock.mousedOverWidgetIf1 = components[var9.mouseOverRedirect];
                         } else {
                            Clock.mousedOverWidgetIf1 = var9;
                         }
                      }
 
-                     if(var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) {
-                        AccessFile.__dk_lm = var9;
+                     if (var9.type == 8 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15) {
+                        AccessFile.field8 = var9;
                      }
 
-                     if(var9.scrollHeight > var9.height) {
-                        WorldMapSection0.method246(var9, var10 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y);
+                     if (var9.scrollHeight > var9.height) {
+                        WorldMapSection3.method246(var9, var10 + var9.width, var11, var9.height, var9.scrollHeight, MouseHandler.MouseHandler_x, MouseHandler.MouseHandler_y);
                      }
                   }
 
-                  if(var9.type == 0) {
-                     updateWidgetGroup(var0, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY);
-                     if(var9.children != null) {
-                        updateWidgetGroup(var9.children, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY);
+                  if (var9.type == 0) {
+                     updateInterface(components, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY);
+                     if (var9.children != null) {
+                        updateInterface(var9.children, var9.id, var12, var13, var14, var15, var10 - var9.scrollX, var11 - var9.scrollY);
                      }
 
-                     WidgetGroupParent var28 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var9.id);
-                     if(var28 != null) {
-                        if(var28.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) {
-                           for(ScriptEvent var29 = (ScriptEvent)Client.scriptEvents.last(); var29 != null; var29 = (ScriptEvent)Client.scriptEvents.previous()) {
-                              if(var29.boolean1) {
-                                 var29.remove();
-                                 var29.widget.__fq = false;
+                     InterfaceParent var34 = (InterfaceParent)Client.interfaceParents.get((long)var9.id);
+                     if (var34 != null) {
+                        if (var34.type == 0 && MouseHandler.MouseHandler_x >= var12 && MouseHandler.MouseHandler_y >= var13 && MouseHandler.MouseHandler_x < var14 && MouseHandler.MouseHandler_y < var15 && !Client.isMenuOpen) {
+                           for (var31 = (ScriptEvent)Client.scriptEvents.last(); var31 != null; var31 = (ScriptEvent)Client.scriptEvents.previous()) {
+                              if (var31.boolean1) {
+                                 var31.remove();
+                                 var31.widget.field978 = false;
                               }
                            }
 
-                           if(MouseRecorder.widgetDragDuration == 0) {
+                           if (MouseRecorder.widgetDragDuration == 0) {
                               Client.clickedWidget = null;
                               Client.clickedWidgetParent = null;
                            }
 
-                           if(!Client.isMenuOpen) {
+                           if (!Client.isMenuOpen) {
                               class30.resetMenuEntries();
                            }
                         }
 
-                        class231.method4517(var28.group, var12, var13, var14, var15, var10, var11);
+                        WorldMapDecorationType.method4517(var34.group, var12, var13, var14, var15, var10, var11);
                      }
                   }
                }
diff --git a/runescape-client/src/main/java/class248.java b/runescape-client/src/main/java/class248.java
index 7d529fbf77..83ad2b9478 100644
--- a/runescape-client/src/main/java/class248.java
+++ b/runescape-client/src/main/java/class248.java
@@ -1,18 +1,18 @@
 import java.util.HashMap;
-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("iu")
 public class class248 {
    @ObfuscatedName("e")
-   static int[] __iu_e;
+   static int[] field1141;
    @ObfuscatedName("n")
    @ObfuscatedGetter(
       intValue = 662119345
    )
-   static int __iu_n;
+   static int field1142;
    @ObfuscatedName("m")
    final HashMap field3267;
    @ObfuscatedName("f")
@@ -51,17 +51,17 @@ public class class248 {
       int[] var6 = new int[var2 * var2];
       boolean var7 = false;
 
-      for(int var8 = 0; var8 < var2; ++var8) {
-         for(int var9 = 0; var9 < var2; ++var9) {
+      for (int var8 = 0; var8 < var2; ++var8) {
+         for (int var9 = 0; var9 < var2; ++var9) {
             int var10 = var6[var9 + var2 * var8] = (int)(256.0D * (var3[var9] * var3[var8] / var4));
-            if(!var7 && var10 > 0) {
+            if (!var7 && var10 > 0) {
                var7 = true;
             }
          }
       }
 
       Sprite var11 = new Sprite(var6, var2, var2);
-      this.field3267.put(Integer.valueOf(var1), var11);
+      this.field3267.put(var1, var11);
    }
 
    @ObfuscatedName("q")
@@ -70,11 +70,11 @@ public class class248 {
       garbageValue = "-1847730067"
    )
    Sprite method4718(int var1) {
-      if(!this.field3267.containsKey(Integer.valueOf(var1))) {
+      if (!this.field3267.containsKey(var1)) {
          this.method4716(var1);
       }
 
-      return (Sprite)this.field3267.get(Integer.valueOf(var1));
+      return (Sprite)this.field3267.get(var1);
    }
 
    @ObfuscatedName("w")
@@ -83,11 +83,12 @@ public class class248 {
       garbageValue = "-703491177"
    )
    public final void method4738(int var1, int var2) {
-      if(this.field3266 < this.field3271.length) {
+      if (this.field3266 < this.field3271.length) {
          this.field3271[this.field3266] = var1;
          this.field3262[this.field3266] = var2;
          ++this.field3266;
       }
+
    }
 
    @ObfuscatedName("o")
@@ -110,38 +111,38 @@ public class class248 {
       int var7 = var5 * 2 + 1;
       Bounds var8 = new Bounds(0, 0, var3.subWidth, var3.subHeight);
       Bounds var9 = new Bounds(0, 0);
-      this.field3263.__f_488(var7, var7);
+      this.field3263.method29(var7, var7);
       System.nanoTime();
 
       int var10;
       int var11;
       int var12;
-      for(var10 = 0; var10 < this.field3266; ++var10) {
+      for (var10 = 0; var10 < this.field3266; ++var10) {
          var11 = this.field3271[var10];
          var12 = this.field3262[var10];
          int var13 = (int)(var4 * (float)(var11 - var1)) - var5;
          int var14 = (int)((float)var3.subHeight - (float)(var12 - var2) * var4) - var5;
-         this.field3263.__m_487(var13, var14);
-         this.field3263.__q_490(var8, var9);
+         this.field3263.method28(var13, var14);
+         this.field3263.method30(var8, var9);
          this.method4721(var6, var3, var9);
       }
 
       System.nanoTime();
       System.nanoTime();
 
-      for(var10 = 0; var10 < var3.pixels.length; ++var10) {
-         if(var3.pixels[var10] == 0) {
+      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;
-            if(var11 <= 0) {
+            if (var11 <= 0) {
                var3.pixels[var10] = -16777216;
             } else {
-               if(var11 > __iu_e.length) {
-                  var11 = __iu_e.length;
+               if (var11 > field1141.length) {
+                  var11 = field1141.length;
                }
 
-               var12 = __iu_e[var11 - 1];
+               var12 = field1141[var11 - 1];
                var3.pixels[var10] = -16777216 | var12;
             }
          }
@@ -156,31 +157,32 @@ public class class248 {
       garbageValue = "112"
    )
    void method4721(Sprite var1, Sprite var2, Bounds var3) {
-      if(var3.__q != 0 && var3.__w != 0) {
+      if (var3.field43 != 0 && var3.field44 != 0) {
          int var4 = 0;
          int var5 = 0;
-         if(var3.__m == 0) {
-            var4 = var1.subWidth - var3.__q;
+         if (var3.field41 == 0) {
+            var4 = var1.subWidth - var3.field43;
          }
 
-         if(var3.__f == 0) {
-            var5 = var1.subHeight - var3.__w;
+         if (var3.field42 == 0) {
+            var5 = var1.subHeight - var3.field44;
          }
 
          int var6 = var4 + var5 * var1.subWidth;
-         int var7 = var2.subWidth * var3.__f + var3.__m;
+         int var7 = var2.subWidth * var3.field42 + var3.field41;
 
-         for(int var8 = 0; var8 < var3.__w; ++var8) {
-            for(int var9 = 0; var9 < var3.__q; ++var9) {
-               int var10001 = var7++;
-               var2.pixels[var10001] += var1.pixels[var6++];
+         for (int var8 = 0; var8 < var3.field44; ++var8) {
+            for (int var9 = 0; var9 < var3.field43; ++var9) {
+               int var10 = var7++;
+               int[] var11 = var2.pixels;
+               var11[var10] += var1.pixels[var6++];
             }
 
-            var6 += var1.subWidth - var3.__q;
-            var7 += var2.subWidth - var3.__q;
+            var6 += var1.subWidth - var3.field43;
+            var7 += var2.subWidth - var3.field43;
          }
-
       }
+
    }
 
    @ObfuscatedName("ar")
@@ -190,136 +192,136 @@ public class class248 {
    )
    static int method4741(int var0, Script var1, boolean var2) {
       int var3;
-      if(var0 == 3903) {
+      if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERTYPE) {
          var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type();
          return 1;
-      } else if(var0 == 3904) {
+      } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) {
          var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id;
          return 1;
-      } else if(var0 == 3905) {
+      } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) {
          var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice;
          return 1;
-      } else if(var0 == 3906) {
+      } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) {
          var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity;
          return 1;
-      } else if(var0 == 3907) {
+      } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) {
          var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity;
          return 1;
-      } else if(var0 == 3908) {
+      } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) {
          var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
          Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice;
          return 1;
       } else {
-         int var12;
-         if(var0 == 3910) {
+         int var4;
+         if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) {
             var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-            var12 = Client.grandExchangeOffers[var3].status();
-            Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var12 == 0?1:0;
+            var4 = Client.grandExchangeOffers[var3].status();
+            Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4 == 0 ? 1 : 0;
             return 1;
-         } else if(var0 == 3911) {
+         } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) {
             var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-            var12 = Client.grandExchangeOffers[var3].status();
-            Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var12 == 2?1:0;
+            var4 = Client.grandExchangeOffers[var3].status();
+            Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4 == 2 ? 1 : 0;
             return 1;
-         } else if(var0 == 3912) {
+         } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) {
             var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-            var12 = Client.grandExchangeOffers[var3].status();
-            Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var12 == 5?1:0;
+            var4 = Client.grandExchangeOffers[var3].status();
+            Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4 == 5 ? 1 : 0;
             return 1;
-         } else if(var0 == 3913) {
+         } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) {
             var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-            var12 = Client.grandExchangeOffers[var3].status();
-            Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var12 == 1?1:0;
+            var4 = Client.grandExchangeOffers[var3].status();
+            Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4 == 1 ? 1 : 0;
             return 1;
          } else {
-            boolean var13;
-            if(var0 == 3914) {
-               var13 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-               if(FloorDecoration.grandExchangeEvents != null) {
-                  FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.__g_w, var13);
+            boolean var5;
+            if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) {
+               var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+               if (FloorDecoration.grandExchangeEvents != null) {
+                  FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.geItemNameComparator, var5);
                }
 
                return 1;
-            } else if(var0 == 3915) {
-               var13 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-               if(FloorDecoration.grandExchangeEvents != null) {
-                  FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.__g_q, var13);
+            } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) {
+               var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+               if (FloorDecoration.grandExchangeEvents != null) {
+                  FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.geUnitPriceComparator, var5);
                }
 
                return 1;
-            } else if(var0 == 3916) {
+            } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) {
                RouteStrategy.Interpreter_intStackSize -= 2;
-               var13 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] == 1;
-               boolean var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1] == 1;
-               if(FloorDecoration.grandExchangeEvents != null) {
-                  Client.__client_sj.__m = var4;
-                  FloorDecoration.grandExchangeEvents.sort(Client.__client_sj, var13);
+               var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize] == 1;
+               boolean var13 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1] == 1;
+               if (FloorDecoration.grandExchangeEvents != null) {
+                  Client.geOwnWorldComparator.compareOwnWorld = var13;
+                  FloorDecoration.grandExchangeEvents.sort(Client.geOwnWorldComparator, var5);
                }
 
                return 1;
-            } else if(var0 == 3917) {
-               var13 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-               if(FloorDecoration.grandExchangeEvents != null) {
-                  FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.__g_f, var13);
+            } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) {
+               var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+               if (FloorDecoration.grandExchangeEvents != null) {
+                  FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.geAgeComparator, var5);
                }
 
                return 1;
-            } else if(var0 == 3918) {
-               var13 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-               if(FloorDecoration.grandExchangeEvents != null) {
-                  FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.__g_o, var13);
+            } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) {
+               var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+               if (FloorDecoration.grandExchangeEvents != null) {
+                  FloorDecoration.grandExchangeEvents.sort(GrandExchangeEvents.geTotalQuantityComparator, var5);
                }
 
                return 1;
-            } else if(var0 == 3919) {
-               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = FloorDecoration.grandExchangeEvents == null?0:FloorDecoration.grandExchangeEvents.events.size();
+            } else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) {
+               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = FloorDecoration.grandExchangeEvents == null ? 0 : FloorDecoration.grandExchangeEvents.events.size();
                return 1;
             } else {
-               GrandExchangeEvent var11;
-               if(var0 == 3920) {
+               GrandExchangeEvent var6;
+               if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) {
                   var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                  var11 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3);
-                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.world;
+                  var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3);
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.world;
                   return 1;
-               } else if(var0 == 3921) {
+               } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) {
                   var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                  var11 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3);
-                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.__m_3();
+                  var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3);
+                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.getOfferName();
                   return 1;
-               } else if(var0 == 3922) {
+               } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) {
                   var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                  var11 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3);
-                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var11.__f_4();
+                  var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3);
+                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.getPreviousOfferName();
                   return 1;
-               } else if(var0 == 3923) {
+               } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) {
                   var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                  var11 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3);
-                  long var5 = class203.currentTimeMs() - class15.__z_si - var11.__f;
-                  int var7 = (int)(var5 / 3600000L);
-                  int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L);
-                  int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L);
-                  String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10;
-                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var10;
+                  var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3);
+                  long var7 = class203.currentTimeMs() - class15.field1113 - var6.field370;
+                  int var9 = (int)(var7 / 3600000L);
+                  int var10 = (int)((var7 - (long)(var9 * 3600000)) / 60000L);
+                  int var11 = (int)((var7 - (long)(var9 * 3600000) - (long)(var10 * 60000)) / 1000L);
+                  String var12 = var9 + ":" + var10 / 10 + var10 % 10 + ":" + var11 / 10 + var11 % 10;
+                  Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var12;
                   return 1;
-               } else if(var0 == 3924) {
+               } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) {
                   var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                  var11 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3);
-                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.totalQuantity;
+                  var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3);
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.grandExchangeOffer.totalQuantity;
                   return 1;
-               } else if(var0 == 3925) {
+               } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) {
                   var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                  var11 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3);
-                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.unitPrice;
+                  var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3);
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.grandExchangeOffer.unitPrice;
                   return 1;
-               } else if(var0 == 3926) {
+               } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) {
                   var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                  var11 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3);
-                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.id;
+                  var6 = (GrandExchangeEvent)FloorDecoration.grandExchangeEvents.events.get(var3);
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.grandExchangeOffer.id;
                   return 1;
                } else {
                   return 2;
diff --git a/runescape-client/src/main/java/class258.java b/runescape-client/src/main/java/class258.java
index 94185ddd44..c020bc70dd 100644
--- a/runescape-client/src/main/java/class258.java
+++ b/runescape-client/src/main/java/class258.java
@@ -20,7 +20,7 @@ public class class258 {
       byte[] var2 = class328.spritePixels[0];
       var0.pixels = new int[var1];
 
-      for(int var3 = 0; var3 < var1; ++var3) {
+      for (int var3 = 0; var3 < var1; ++var3) {
          var0.pixels[var3] = class328.indexedSpritePalette[var2[var3] & 255];
       }
 
@@ -29,7 +29,7 @@ public class class258 {
       VarbitDefinition.indexedSpriteWidths = null;
       SecureRandomCallable.indexedSpriteHeights = null;
       class328.indexedSpritePalette = null;
-      class328.spritePixels = null;
+      class328.spritePixels = ((byte[][])null);
       return var0;
    }
 
@@ -39,29 +39,29 @@ public class class258 {
       garbageValue = "772902595"
    )
    static final void method4898(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
-      class68 var9 = null;
+      PendingSpawn var9 = null;
 
-      for(class68 var10 = (class68)Client.__client_kh.last(); var10 != null; var10 = (class68)Client.__client_kh.previous()) {
-         if(var0 == var10.field911 && var10.field913 == var1 && var2 == var10.field901 && var3 == var10.field906) {
+      for (PendingSpawn var10 = (PendingSpawn)Client.pendingSpawns.last(); var10 != null; var10 = (PendingSpawn)Client.pendingSpawns.previous()) {
+         if (var0 == var10.plane && var10.x == var1 && var2 == var10.y && var3 == var10.type) {
             var9 = var10;
             break;
          }
       }
 
-      if(var9 == null) {
-         var9 = new class68();
-         var9.field911 = var0;
-         var9.field906 = var3;
-         var9.field913 = var1;
-         var9.field901 = var2;
+      if (var9 == null) {
+         var9 = new PendingSpawn();
+         var9.plane = var0;
+         var9.type = var3;
+         var9.x = var1;
+         var9.y = var2;
          class13.method165(var9);
-         Client.__client_kh.addFirst(var9);
+         Client.pendingSpawns.addFirst(var9);
       }
 
-      var9.field899 = var4;
+      var9.id = var4;
       var9.field908 = var5;
-      var9.field907 = var6;
-      var9.field909 = var7;
-      var9.field910 = var8;
+      var9.orientation = var6;
+      var9.delay = var7;
+      var9.hitpoints = var8;
    }
 }
diff --git a/runescape-client/src/main/java/class27.java b/runescape-client/src/main/java/class27.java
index 56f35f4e9d..f9786265b1 100644
--- a/runescape-client/src/main/java/class27.java
+++ b/runescape-client/src/main/java/class27.java
@@ -13,7 +13,7 @@ public final class class27 {
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   public static AbstractIndexCache __aq_k;
+   public static AbstractArchive field1143;
    @ObfuscatedName("f")
    final int[] field225;
 
@@ -40,7 +40,7 @@ public final class class27 {
       garbageValue = "37"
    )
    public static ServerPacket[] method429() {
-      return new ServerPacket[]{ServerPacket.__ge_m, ServerPacket.__ge_f, ServerPacket.__ge_q, ServerPacket.__ge_w, ServerPacket.__ge_o, ServerPacket.__ge_u, ServerPacket.__ge_g, ServerPacket.__ge_l, ServerPacket.__ge_e, ServerPacket.__ge_x, ServerPacket.__ge_d, ServerPacket.__ge_k, ServerPacket.__ge_n, ServerPacket.__ge_i, ServerPacket.__ge_a, ServerPacket.__ge_z, ServerPacket.__ge_j, ServerPacket.__ge_s, ServerPacket.__ge_t, ServerPacket.__ge_y, ServerPacket.__ge_h, ServerPacket.__ge_b, ServerPacket.__ge_c, ServerPacket.__ge_r, ServerPacket.__ge_p, ServerPacket.__ge_v, ServerPacket.__ge_ag, ServerPacket.__ge_aq, ServerPacket.__ge_aj, ServerPacket.__ge_av, ServerPacket.__ge_ar, ServerPacket.__ge_ac, ServerPacket.__ge_ay, ServerPacket.__ge_ah, ServerPacket.__ge_ak, ServerPacket.__ge_aw, ServerPacket.__ge_al, ServerPacket.__ge_ab, ServerPacket.__ge_ae, ServerPacket.__ge_at, ServerPacket.__ge_ad, ServerPacket.__ge_ap, ServerPacket.__ge_as, ServerPacket.__ge_am, ServerPacket.__ge_an, ServerPacket.__ge_az, ServerPacket.__ge_au, ServerPacket.__ge_ao, ServerPacket.__ge_aa, ServerPacket.__ge_ax, ServerPacket.__ge_af, ServerPacket.__ge_ai, ServerPacket.__ge_ba, ServerPacket.__ge_bb, ServerPacket.__ge_bs, ServerPacket.__ge_bq, ServerPacket.__ge_bn, ServerPacket.__ge_bk, ServerPacket.__ge_bd, ServerPacket.__ge_bc, ServerPacket.__ge_bo, ServerPacket.__ge_bx, ServerPacket.__ge_by, ServerPacket.__ge_bu, ServerPacket.__ge_bm, ServerPacket.__ge_bl, ServerPacket.__ge_br, ServerPacket.__ge_bj, ServerPacket.__ge_bi, ServerPacket.__ge_bz, ServerPacket.__ge_bg, ServerPacket.__ge_bt, ServerPacket.__ge_bp, ServerPacket.__ge_bf, ServerPacket.__ge_bh, ServerPacket.__ge_be, ServerPacket.__ge_bv, ServerPacket.__ge_bw, ServerPacket.__ge_cr, ServerPacket.__ge_cv, ServerPacket.__ge_ce, ServerPacket.__ge_cy, ServerPacket.__ge_cs, ServerPacket.__ge_cm, ServerPacket.__ge_cj};
+      return new ServerPacket[]{ServerPacket.field789, ServerPacket.field790, ServerPacket.field791, ServerPacket.field792, ServerPacket.field793, ServerPacket.field794, ServerPacket.field795, ServerPacket.field796, ServerPacket.field797, ServerPacket.field798, ServerPacket.field799, ServerPacket.field800, ServerPacket.field801, ServerPacket.field802, ServerPacket.field803, ServerPacket.field804, ServerPacket.field805, ServerPacket.field806, ServerPacket.field807, ServerPacket.field808, ServerPacket.field809, ServerPacket.field810, ServerPacket.field811, ServerPacket.field812, ServerPacket.field813, ServerPacket.field814, ServerPacket.field815, ServerPacket.field816, ServerPacket.field817, ServerPacket.field818, ServerPacket.field819, ServerPacket.field820, ServerPacket.field821, ServerPacket.field822, ServerPacket.field823, ServerPacket.field824, ServerPacket.field825, ServerPacket.field826, ServerPacket.field827, ServerPacket.field828, ServerPacket.field829, ServerPacket.field830, ServerPacket.field831, ServerPacket.field832, ServerPacket.field833, ServerPacket.field834, ServerPacket.field835, ServerPacket.field836, ServerPacket.field837, ServerPacket.field838, ServerPacket.field839, ServerPacket.field840, ServerPacket.field841, ServerPacket.field842, ServerPacket.field843, ServerPacket.field844, ServerPacket.field845, ServerPacket.field846, ServerPacket.field847, ServerPacket.field848, ServerPacket.field849, ServerPacket.field850, ServerPacket.field851, ServerPacket.field852, ServerPacket.field853, ServerPacket.field854, ServerPacket.field855, ServerPacket.field856, ServerPacket.field857, ServerPacket.field858, ServerPacket.field859, ServerPacket.field860, ServerPacket.field861, ServerPacket.field862, ServerPacket.field863, ServerPacket.field864, ServerPacket.field865, ServerPacket.field866, ServerPacket.field867, ServerPacket.field868, ServerPacket.field869, ServerPacket.field870, ServerPacket.field871, ServerPacket.field872, ServerPacket.field873};
    }
 
    @ObfuscatedName("m")
@@ -60,10 +60,8 @@ public final class class27 {
          PixelGrabber var5 = new PixelGrabber(var1, 0, 0, var2, var3, var4, 0, var2);
          var5.grabPixels();
          return new Sprite(var4, var2, var3);
-      } catch (IOException var7) {
-         ;
-      } catch (InterruptedException var8) {
-         ;
+      } catch (IOException var6) {
+      } catch (InterruptedException var7) {
       }
 
       return new Sprite(0, 0);
diff --git a/runescape-client/src/main/java/class277.java b/runescape-client/src/main/java/class277.java
index 4842816eaa..561600be0e 100644
--- a/runescape-client/src/main/java/class277.java
+++ b/runescape-client/src/main/java/class277.java
@@ -1,4 +1,3 @@
-import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
@@ -8,16 +7,16 @@ public class class277 {
    @ObfuscatedSignature(
       signature = "Llq;"
    )
-   static IndexedSprite __jn_by;
+   static IndexedSprite field1144;
 
    @ObfuscatedName("m")
    public static final int method5355(double var0, double var2, double var4) {
       double var6 = var4;
       double var8 = var4;
       double var10 = var4;
-      if(0.0D != var2) {
+      if (0.0D != var2) {
          double var12;
-         if(var4 < 0.5D) {
+         if (var4 < 0.5D) {
             var12 = var4 * (var2 + 1.0D);
          } else {
             var12 = var4 + var2 - var2 * var4;
@@ -25,50 +24,50 @@ public class class277 {
 
          double var14 = var4 * 2.0D - var12;
          double var16 = var0 + 0.3333333333333333D;
-         if(var16 > 1.0D) {
+         if (var16 > 1.0D) {
             --var16;
          }
 
-         double var20 = var0 - 0.3333333333333333D;
-         if(var20 < 0.0D) {
-            ++var20;
+         double var18 = var0 - 0.3333333333333333D;
+         if (var18 < 0.0D) {
+            ++var18;
          }
 
-         if(6.0D * var16 < 1.0D) {
+         if (6.0D * var16 < 1.0D) {
             var6 = var16 * (var12 - var14) * 6.0D + var14;
-         } else if(var16 * 2.0D < 1.0D) {
+         } else if (var16 * 2.0D < 1.0D) {
             var6 = var12;
-         } else if(var16 * 3.0D < 2.0D) {
+         } else if (var16 * 3.0D < 2.0D) {
             var6 = var14 + (var12 - var14) * (0.6666666666666666D - var16) * 6.0D;
          } else {
             var6 = var14;
          }
 
-         if(var0 * 6.0D < 1.0D) {
+         if (var0 * 6.0D < 1.0D) {
             var8 = var14 + (var12 - var14) * 6.0D * var0;
-         } else if(var0 * 2.0D < 1.0D) {
+         } else if (var0 * 2.0D < 1.0D) {
             var8 = var12;
-         } else if(var0 * 3.0D < 2.0D) {
+         } else if (var0 * 3.0D < 2.0D) {
             var8 = 6.0D * (0.6666666666666666D - var0) * (var12 - var14) + var14;
          } else {
             var8 = var14;
          }
 
-         if(var20 * 6.0D < 1.0D) {
-            var10 = var20 * 6.0D * (var12 - var14) + var14;
-         } else if(2.0D * var20 < 1.0D) {
+         if (var18 * 6.0D < 1.0D) {
+            var10 = var18 * 6.0D * (var12 - var14) + var14;
+         } else if (2.0D * var18 < 1.0D) {
             var10 = var12;
-         } else if(var20 * 3.0D < 2.0D) {
-            var10 = var14 + 6.0D * (0.6666666666666666D - var20) * (var12 - var14);
+         } else if (var18 * 3.0D < 2.0D) {
+            var10 = var14 + 6.0D * (0.6666666666666666D - var18) * (var12 - var14);
          } else {
             var10 = var14;
          }
       }
 
-      int var22 = (int)(256.0D * var6);
+      int var20 = (int)(256.0D * var6);
       int var13 = (int)(var8 * 256.0D);
-      int var23 = (int)(var10 * 256.0D);
-      int var15 = var23 + (var13 << 8) + (var22 << 16);
+      int var21 = (int)(var10 * 256.0D);
+      int var15 = var21 + (var13 << 8) + (var20 << 16);
       return var15;
    }
 
@@ -78,18 +77,18 @@ public class class277 {
       garbageValue = "1648987580"
    )
    public static String method5356(CharSequence[] var0, int var1, int var2) {
-      if(var2 == 0) {
+      if (var2 == 0) {
          return "";
-      } else if(var2 == 1) {
-         CharSequence var3 = var0[var1];
-         return var3 == null?"null":var3.toString();
+      } else if (var2 == 1) {
+         CharSequence var8 = var0[var1];
+         return var8 == null ? "null" : var8.toString();
       } else {
-         int var8 = var2 + var1;
+         int var3 = var2 + var1;
          int var4 = 0;
 
-         for(int var5 = var1; var5 < var8; ++var5) {
+         for (int var5 = var1; var5 < var3; ++var5) {
             CharSequence var6 = var0[var5];
-            if(var6 == null) {
+            if (var6 == null) {
                var4 += 4;
             } else {
                var4 += var6.length();
@@ -98,9 +97,9 @@ public class class277 {
 
          StringBuilder var9 = new StringBuilder(var4);
 
-         for(int var10 = var1; var10 < var8; ++var10) {
+         for (int var10 = var1; var10 < var3; ++var10) {
             CharSequence var7 = var0[var10];
-            if(var7 == null) {
+            if (var7 == null) {
                var9.append("null");
             } else {
                var9.append(var7);
diff --git a/runescape-client/src/main/java/class279.java b/runescape-client/src/main/java/class279.java
index d04cc4cf14..f133883da7 100644
--- a/runescape-client/src/main/java/class279.java
+++ b/runescape-client/src/main/java/class279.java
@@ -1,4 +1,3 @@
-import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
@@ -8,7 +7,7 @@ public class class279 {
    @ObfuscatedSignature(
       signature = "[Lho;"
    )
-   static Widget[] __jx_ne;
+   static Widget[] field1145;
 
    @ObfuscatedName("e")
    @ObfuscatedSignature(
@@ -19,7 +18,7 @@ public class class279 {
       int var1 = var0.length();
       int var2 = 0;
 
-      for(int var3 = 0; var3 < var1; ++var3) {
+      for (int var3 = 0; var3 < var1; ++var3) {
          var2 = (var2 << 5) - var2 + var0.charAt(var3);
       }
 
diff --git a/runescape-client/src/main/java/class3.java b/runescape-client/src/main/java/class3.java
index 897fa6c136..98d7e65ec0 100644
--- a/runescape-client/src/main/java/class3.java
+++ b/runescape-client/src/main/java/class3.java
@@ -9,7 +9,7 @@ public class class3 implements Enumerated {
    @ObfuscatedGetter(
       intValue = 1608439891
    )
-   static int __w_qs;
+   static int field1146;
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "Lw;"
@@ -34,7 +34,7 @@ public class class3 implements Enumerated {
    @ObfuscatedGetter(
       intValue = -393250053
    )
-   public final int id;
+   public final int field1147;
    @ObfuscatedName("u")
    public final Class field18;
    @ObfuscatedName("g")
@@ -43,18 +43,12 @@ public class class3 implements Enumerated {
    )
    public final class0 field19;
 
-   static {
-      field20 = new class3(2, 0, Integer.class, new class1());
-      field14 = new class3(0, 1, Long.class, new class2());
-      field15 = new class3(1, 2, String.class, new class4());
-   }
-
    @ObfuscatedSignature(
       signature = "(IILjava/lang/Class;Lm;)V"
    )
    class3(int var1, int var2, Class var3, class0 var4) {
       this.field13 = var1;
-      this.id = var2;
+      this.field1147 = var2;
       this.field18 = var3;
       this.field19 = var4;
    }
@@ -66,7 +60,7 @@ public class class3 implements Enumerated {
    )
    @Export("rsOrdinal")
    public int rsOrdinal() {
-      return this.id;
+      return this.field1147;
    }
 
    @ObfuscatedName("q")
@@ -102,18 +96,18 @@ public class class3 implements Enumerated {
       garbageValue = "729662922"
    )
    public static void method41() {
-      while(true) {
-         NodeDeque var1 = IndexStoreActionHandler.IndexStoreActionHandler_requestQueue;
-         IndexStoreAction var0;
-         synchronized(IndexStoreActionHandler.IndexStoreActionHandler_requestQueue) {
-            var0 = (IndexStoreAction)IndexStoreActionHandler.IndexStoreActionHandler_responseQueue.removeLast();
+      while (true) {
+         NodeDeque var0 = ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue;
+         ArchiveDiskAction var1;
+         synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) {
+            var1 = (ArchiveDiskAction)ArchiveDiskActionHandler.ArchiveDiskActionHandler_responseQueue.removeLast();
          }
 
-         if(var0 == null) {
+         if (var1 == null) {
             return;
          }
 
-         var0.indexCache.load(var0.indexStore, (int)var0.key, var0.data, false);
+         var1.archive.load(var1.archiveDisk, (int)var1.key, var1.data, false);
       }
    }
 
@@ -122,46 +116,47 @@ public class class3 implements Enumerated {
       signature = "(IIIZIZI)V",
       garbageValue = "653716649"
    )
-   static void method42(int var0, int var1, int var2, boolean var3, int var4, boolean var5) {
-      if(var0 < var1) {
-         int var6 = (var0 + var1) / 2;
-         int var7 = var0;
+   @Export("doWorldSorting")
+   static void doWorldSorting(int lowestUnsorted, int highestUnsorted, int primaryMode, boolean primaryReversed, int secondaryMode, boolean secondaryReversed) {
+      if (lowestUnsorted < highestUnsorted) {
+         int var6 = (lowestUnsorted + highestUnsorted) / 2;
+         int var7 = lowestUnsorted;
          World var8 = ItemContainer.worlds[var6];
-         ItemContainer.worlds[var6] = ItemContainer.worlds[var1];
-         ItemContainer.worlds[var1] = var8;
+         ItemContainer.worlds[var6] = ItemContainer.worlds[highestUnsorted];
+         ItemContainer.worlds[highestUnsorted] = var8;
 
-         for(int var9 = var0; var9 < var1; ++var9) {
-            World var11 = ItemContainer.worlds[var9];
-            int var12 = WorldMapLabel.compareWorlds(var11, var8, var2, var3);
-            int var10;
-            if(var12 != 0) {
-               if(var3) {
-                  var10 = -var12;
+         for (int var9 = lowestUnsorted; var9 < highestUnsorted; ++var9) {
+            World var10 = ItemContainer.worlds[var9];
+            int var11 = WorldMapLabel.compareWorlds(var10, var8, primaryMode, primaryReversed);
+            int var12;
+            if (var11 != 0) {
+               if (primaryReversed) {
+                  var12 = -var11;
                } else {
-                  var10 = var12;
+                  var12 = var11;
                }
-            } else if(var4 == -1) {
-               var10 = 0;
+            } else if (secondaryMode == -1) {
+               var12 = 0;
             } else {
-               int var13 = WorldMapLabel.compareWorlds(var11, var8, var4, var5);
-               if(var5) {
-                  var10 = -var13;
+               int var13 = WorldMapLabel.compareWorlds(var10, var8, secondaryMode, secondaryReversed);
+               if (secondaryReversed) {
+                  var12 = -var13;
                } else {
-                  var10 = var13;
+                  var12 = var13;
                }
             }
 
-            if(var10 <= 0) {
+            if (var12 <= 0) {
                World var14 = ItemContainer.worlds[var9];
                ItemContainer.worlds[var9] = ItemContainer.worlds[var7];
                ItemContainer.worlds[var7++] = var14;
             }
          }
 
-         ItemContainer.worlds[var1] = ItemContainer.worlds[var7];
+         ItemContainer.worlds[highestUnsorted] = ItemContainer.worlds[var7];
          ItemContainer.worlds[var7] = var8;
-         method42(var0, var7 - 1, var2, var3, var4, var5);
-         method42(var7 + 1, var1, var2, var3, var4, var5);
+         doWorldSorting(lowestUnsorted, var7 - 1, primaryMode, primaryReversed, secondaryMode, secondaryReversed);
+         doWorldSorting(var7 + 1, highestUnsorted, primaryMode, primaryReversed, secondaryMode, secondaryReversed);
       }
 
    }
@@ -173,158 +168,164 @@ public class class3 implements Enumerated {
    )
    @Export("updateNpcs")
    static final void updateNpcs(boolean var0, PacketBuffer var1) {
-      Client.__client_ky = 0;
-      Client.__client_fw = 0;
+      Client.field211 = 0;
+      Client.field173 = 0;
       PacketBuffer var2 = Client.packetWriter.packetBuffer;
       var2.importIndex();
       int var3 = var2.readBits(8);
       int var4;
-      if(var3 < Client.npcCount) {
-         for(var4 = var3; var4 < Client.npcCount; ++var4) {
-            Client.__client_kd[++Client.__client_ky - 1] = Client.npcIndices[var4];
+      if (var3 < Client.npcCount) {
+         for (var4 = var3; var4 < Client.npcCount; ++var4) {
+            Client.field212[++Client.field211 - 1] = Client.npcIndices[var4];
          }
       }
 
-      if(var3 > Client.npcCount) {
+      if (var3 > Client.npcCount) {
          throw new RuntimeException("");
       } else {
          Client.npcCount = 0;
 
          int var5;
+         int var6;
          int var7;
          int var8;
-         int var9;
-         for(var4 = 0; var4 < var3; ++var4) {
+         for (var4 = 0; var4 < var3; ++var4) {
             var5 = Client.npcIndices[var4];
-            Npc var6 = Client.npcs[var5];
-            var7 = var2.readBits(1);
-            if(var7 == 0) {
+            NPC var9 = Client.npcs[var5];
+            var6 = var2.readBits(1);
+            if (var6 == 0) {
                Client.npcIndices[++Client.npcCount - 1] = var5;
-               var6.npcCycle = Client.cycle;
+               var9.npcCycle = Client.cycle;
             } else {
-               var8 = var2.readBits(2);
-               if(var8 == 0) {
+               var7 = var2.readBits(2);
+               if (var7 == 0) {
                   Client.npcIndices[++Client.npcCount - 1] = var5;
-                  var6.npcCycle = Client.cycle;
-                  Client.__client_fg[++Client.__client_fw - 1] = var5;
+                  var9.npcCycle = Client.cycle;
+                  Client.field174[++Client.field173 - 1] = var5;
                } else {
                   int var10;
-                  if(var8 == 1) {
+                  if (var7 == 1) {
                      Client.npcIndices[++Client.npcCount - 1] = var5;
-                     var6.npcCycle = Client.cycle;
-                     var9 = var2.readBits(3);
-                     var6.__m_162(var9, (byte)1);
+                     var9.npcCycle = Client.cycle;
+                     var8 = var2.readBits(3);
+                     var9.method227(var8, (byte)1);
                      var10 = var2.readBits(1);
-                     if(var10 == 1) {
-                        Client.__client_fg[++Client.__client_fw - 1] = var5;
+                     if (var10 == 1) {
+                        Client.field174[++Client.field173 - 1] = var5;
                      }
-                  } else if(var8 == 2) {
+                  } else if (var7 == 2) {
                      Client.npcIndices[++Client.npcCount - 1] = var5;
-                     var6.npcCycle = Client.cycle;
-                     var9 = var2.readBits(3);
-                     var6.__m_162(var9, (byte)2);
+                     var9.npcCycle = Client.cycle;
+                     var8 = var2.readBits(3);
+                     var9.method227(var8, (byte)2);
                      var10 = var2.readBits(3);
-                     var6.__m_162(var10, (byte)2);
+                     var9.method227(var10, (byte)2);
                      int var11 = var2.readBits(1);
-                     if(var11 == 1) {
-                        Client.__client_fg[++Client.__client_fw - 1] = var5;
+                     if (var11 == 1) {
+                        Client.field174[++Client.field173 - 1] = var5;
                      }
-                  } else if(var8 == 3) {
-                     Client.__client_kd[++Client.__client_ky - 1] = var5;
+                  } else if (var7 == 3) {
+                     Client.field212[++Client.field211 - 1] = var5;
                   }
                }
             }
          }
 
-         int var12;
-         while(var1.bitsRemaining(Client.packetWriter.serverPacket0Length) >= 27) {
-            var12 = var1.readBits(15);
-            if(var12 == 32767) {
+         int var13;
+         while (var1.bitsRemaining(Client.packetWriter.serverPacket0Length) >= 27) {
+            var13 = var1.readBits(15);
+            if (var13 == 32767) {
                break;
             }
 
-            boolean var15 = false;
-            if(Client.npcs[var12] == null) {
-               Client.npcs[var12] = new Npc();
-               var15 = true;
+            boolean var14 = false;
+            if (Client.npcs[var13] == null) {
+               Client.npcs[var13] = new NPC();
+               var14 = true;
             }
 
-            Npc var13 = Client.npcs[var12];
-            Client.npcIndices[++Client.npcCount - 1] = var12;
-            var13.npcCycle = Client.cycle;
-            if(var0) {
+            NPC var15 = Client.npcs[var13];
+            Client.npcIndices[++Client.npcCount - 1] = var13;
+            var15.npcCycle = Client.cycle;
+            if (var0) {
                var5 = var1.readBits(8);
-               if(var5 > 127) {
+               if (var5 > 127) {
                   var5 -= 256;
                }
             } else {
                var5 = var1.readBits(5);
-               if(var5 > 15) {
+               if (var5 > 15) {
                   var5 -= 32;
                }
             }
 
-            int var14 = var1.readBits(1);
-            var7 = Client.__client_kn[var1.readBits(3)];
-            if(var15) {
-               var13.orientation = var13.__ac = var7;
+            int var12 = var1.readBits(1);
+            var6 = Client.field213[var1.readBits(3)];
+            if (var14) {
+               var15.orientation = var15.field9 = var6;
             }
 
-            var8 = var1.readBits(1);
-            if(var8 == 1) {
-               Client.__client_fg[++Client.__client_fw - 1] = var12;
+            var7 = var1.readBits(1);
+            if (var7 == 1) {
+               Client.field174[++Client.field173 - 1] = var13;
             }
 
-            if(var0) {
-               var9 = var1.readBits(8);
-               if(var9 > 127) {
-                  var9 -= 256;
+            if (var0) {
+               var8 = var1.readBits(8);
+               if (var8 > 127) {
+                  var8 -= 256;
                }
             } else {
-               var9 = var1.readBits(5);
-               if(var9 > 15) {
-                  var9 -= 32;
+               var8 = var1.readBits(5);
+               if (var8 > 15) {
+                  var8 -= 32;
                }
             }
 
-            var13.definition = ObjectDefinition.getNpcDefinition(var1.readBits(14));
-            var13.size = var13.definition.size;
-            var13.__cj = var13.definition.__av;
-            if(var13.__cj == 0) {
-               var13.__ac = 0;
+            var15.definition = ObjectDefinition.getNpcDefinition(var1.readBits(14));
+            var15.size = var15.definition.size;
+            var15.field23 = var15.definition.field639;
+            if (var15.field23 == 0) {
+               var15.field9 = 0;
             }
 
-            var13.walkSequence = var13.definition.walkSequence;
-            var13.walkTurnSequence = var13.definition.walkTurnSequence;
-            var13.walkTurnLeftSequence = var13.definition.walkTurnLeftSequence;
-            var13.walkTurnRightSequence = var13.definition.walkTurnRightSequence;
-            var13.idleSequence = var13.definition.idleSequence;
-            var13.turnLeftSequence = var13.definition.turnLeftSequence;
-            var13.turnRightSequence = var13.definition.turnRightSequence;
-            var13.__f_163(Canvas.localPlayer.pathX[0] + var5, Canvas.localPlayer.pathY[0] + var9, var14 == 1);
+            var15.walkSequence = var15.definition.walkSequence;
+            var15.walkBackSequence = var15.definition.walkBackSequence;
+            var15.walkLeftSequence = var15.definition.walkLeftSequence;
+            var15.walkRightSequence = var15.definition.walkRightSequence;
+            var15.readySequence = var15.definition.readySequence;
+            var15.turnLeftSequence = var15.definition.turnLeftSequence;
+            var15.turnRightSequence = var15.definition.turnRightSequence;
+            var15.method228(Canvas.localPlayer.pathX[0] + var5, Canvas.localPlayer.pathY[0] + var8, var12 == 1);
          }
 
          var1.exportIndex();
-         WorldComparator.method67(var1);
+         GrandExchangeOfferWorldComparator.method67(var1);
 
-         for(var12 = 0; var12 < Client.__client_ky; ++var12) {
-            var3 = Client.__client_kd[var12];
-            if(Client.npcs[var3].npcCycle != Client.cycle) {
+         for (var13 = 0; var13 < Client.field211; ++var13) {
+            var3 = Client.field212[var13];
+            if (Client.npcs[var3].npcCycle != Client.cycle) {
                Client.npcs[var3].definition = null;
                Client.npcs[var3] = null;
             }
          }
 
-         if(var1.index != Client.packetWriter.serverPacket0Length) {
+         if (var1.index != Client.packetWriter.serverPacket0Length) {
             throw new RuntimeException(var1.index + "," + Client.packetWriter.serverPacket0Length);
          } else {
-            for(var12 = 0; var12 < Client.npcCount; ++var12) {
-               if(Client.npcs[Client.npcIndices[var12]] == null) {
-                  throw new RuntimeException(var12 + "," + Client.npcCount);
+            for (var13 = 0; var13 < Client.npcCount; ++var13) {
+               if (Client.npcs[Client.npcIndices[var13]] == null) {
+                  throw new RuntimeException(var13 + "," + Client.npcCount);
                }
             }
 
          }
       }
    }
+
+   static {
+      field20 = new class3(2, 0, Integer.class, new class1());
+      field14 = new class3(0, 1, Long.class, new class2());
+      field15 = new class3(1, 2, String.class, new class4());
+   }
 }
diff --git a/runescape-client/src/main/java/class30.java b/runescape-client/src/main/java/class30.java
index 77772fbde5..aceac67d05 100644
--- a/runescape-client/src/main/java/class30.java
+++ b/runescape-client/src/main/java/class30.java
@@ -9,7 +9,7 @@ public class class30 {
    @ObfuscatedGetter(
       intValue = -1555836449
    )
-   static int __ar_qw;
+   static int field1148;
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "Lar;"
@@ -24,8 +24,8 @@ public class class30 {
    @ObfuscatedGetter(
       intValue = -18917723
    )
-   @Export("musicTrackArchiveId")
-   public static int musicTrackArchiveId;
+   @Export("musicTrackGroupId")
+   public static int musicTrackGroupId;
    @ObfuscatedName("l")
    @Export("inMembersWorld")
    public static boolean inMembersWorld;
@@ -41,11 +41,6 @@ public class class30 {
    )
    final int field248;
 
-   static {
-      field246 = new class30(0);
-      field247 = new class30(1);
-   }
-
    class30(int var1) {
       this.field248 = var1;
    }
@@ -56,7 +51,7 @@ public class class30 {
       garbageValue = "2127022463"
    )
    static int method571(int var0) {
-      return (int)((Math.log((double)var0) / Interpreter.__bv_r - 7.0D) * 256.0D);
+      return (int)((Math.log((double)var0) / Interpreter.field426 - 7.0D) * 256.0D);
    }
 
    @ObfuscatedName("hp")
@@ -81,43 +76,48 @@ public class class30 {
       garbageValue = "-1070833742"
    )
    static final void method570(Widget[] var0, int var1) {
-      for(int var2 = 0; var2 < var0.length; ++var2) {
+      for (int var2 = 0; var2 < var0.length; ++var2) {
          Widget var3 = var0[var2];
-         if(var3 != null) {
-            if(var3.type == 0) {
-               if(var3.children != null) {
+         if (var3 != null) {
+            if (var3.type == 0) {
+               if (var3.children != null) {
                   method570(var3.children, var1);
                }
 
-               WidgetGroupParent var4 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var3.id);
-               if(var4 != null) {
+               InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var3.id);
+               if (var4 != null) {
                   GrandExchangeEvents.method74(var4.group, var1);
                }
             }
 
-            ScriptEvent var5;
-            if(var1 == 0 && var3.onDialogAbortListener != null) {
-               var5 = new ScriptEvent();
-               var5.widget = var3;
-               var5.args0 = var3.onDialogAbortListener;
-               AbstractIndexCache.runScript(var5);
+            ScriptEvent var6;
+            if (var1 == 0 && var3.onDialogAbort != null) {
+               var6 = new ScriptEvent();
+               var6.widget = var3;
+               var6.args0 = var3.onDialogAbort;
+               AbstractArchive.runScript(var6);
             }
 
-            if(var1 == 1 && var3.__ei != null) {
-               if(var3.childIndex >= 0) {
-                  Widget var6 = Huffman.getWidget(var3.id);
-                  if(var6 == null || var6.children == null || var3.childIndex >= var6.children.length || var3 != var6.children[var3.childIndex]) {
+            if (var1 == 1 && var3.onSubChange != null) {
+               if (var3.childIndex >= 0) {
+                  Widget var5 = Huffman.getWidget(var3.id);
+                  if (var5 == null || var5.children == null || var3.childIndex >= var5.children.length || var3 != var5.children[var3.childIndex]) {
                      continue;
                   }
                }
 
-               var5 = new ScriptEvent();
-               var5.widget = var3;
-               var5.args0 = var3.__ei;
-               AbstractIndexCache.runScript(var5);
+               var6 = new ScriptEvent();
+               var6.widget = var3;
+               var6.args0 = var3.onSubChange;
+               AbstractArchive.runScript(var6);
             }
          }
       }
 
    }
+
+   static {
+      field246 = new class30(0);
+      field247 = new class30(1);
+   }
 }
diff --git a/runescape-client/src/main/java/class305.java b/runescape-client/src/main/java/class305.java
index c3c1e965b5..063e617d05 100644
--- a/runescape-client/src/main/java/class305.java
+++ b/runescape-client/src/main/java/class305.java
@@ -1,15 +1,14 @@
-import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
 
 @ObfuscatedName("kb")
 public class class305 {
    @ObfuscatedName("q")
-   static final char[] __kb_q;
+   static final char[] field1149;
    @ObfuscatedName("w")
-   static final char[] __kb_w;
+   static final char[] field1150;
 
    static {
-      __kb_q = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'};
-      __kb_w = new char[]{'[', ']', '#'};
+      field1149 = new char[]{' ', ' ', '_', '-', 'à', 'á', 'â', 'ä', 'ã', 'À', 'Á', 'Â', 'Ä', 'Ã', 'è', 'é', 'ê', 'ë', 'È', 'É', 'Ê', 'Ë', 'í', 'î', 'ï', 'Í', 'Î', 'Ï', 'ò', 'ó', 'ô', 'ö', 'õ', 'Ò', 'Ó', 'Ô', 'Ö', 'Õ', 'ù', 'ú', 'û', 'ü', 'Ù', 'Ú', 'Û', 'Ü', 'ç', 'Ç', 'ÿ', 'Ÿ', 'ñ', 'Ñ', 'ß'};
+      field1150 = new char[]{'[', ']', '#'};
    }
 }
diff --git a/runescape-client/src/main/java/class306.java b/runescape-client/src/main/java/class306.java
index 86c014ae84..5e43864f4f 100644
--- a/runescape-client/src/main/java/class306.java
+++ b/runescape-client/src/main/java/class306.java
@@ -9,10 +9,6 @@ public final class class306 {
    @Export("base37Table")
    public static final char[] base37Table;
 
-   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'};
-   }
-
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "(Ljava/lang/CharSequence;B)Ljava/lang/String;",
@@ -22,23 +18,23 @@ public final class class306 {
       int var1 = var0.length();
       StringBuilder var2 = new StringBuilder(var1);
 
-      for(int var3 = 0; var3 < var1; ++var3) {
+      for (int var3 = 0; var3 < var1; ++var3) {
          char var4 = var0.charAt(var3);
-         if((var4 < 'a' || var4 > 'z') && (var4 < 'A' || var4 > 'Z') && (var4 < '0' || var4 > '9') && var4 != '.' && var4 != '-' && var4 != '*' && var4 != '_') {
-            if(var4 == ' ') {
+         if ((var4 < 'a' || var4 > 'z') && (var4 < 'A' || var4 > 'Z') && (var4 < '0' || var4 > '9') && var4 != '.' && var4 != '-' && var4 != '*' && var4 != '_') {
+            if (var4 == ' ') {
                var2.append('+');
             } else {
                byte var5 = HealthBar.charToByteCp1252(var4);
                var2.append('%');
                int var6 = var5 >> 4 & 15;
-               if(var6 >= 10) {
+               if (var6 >= 10) {
                   var2.append((char)(var6 + 55));
                } else {
                   var2.append((char)(var6 + 48));
                }
 
                var6 = var5 & 15;
-               if(var6 >= 10) {
+               if (var6 >= 10) {
                   var2.append((char)(var6 + 55));
                } else {
                   var2.append((char)(var6 + 48));
@@ -62,30 +58,32 @@ public final class class306 {
       ClientPreferences var1 = new ClientPreferences();
 
       try {
-         var0 = LoginPacket.getPreferencesFile("", class22.studioGame.name, false);
+         var0 = LoginPacket.getPreferencesFile("", WorldMapRectangle.studioGame.name, false);
          byte[] var2 = new byte[(int)var0.length()];
 
-         int var4;
-         for(int var3 = 0; var3 < var2.length; var3 += var4) {
-            var4 = var0.read(var2, var3, var2.length - var3);
-            if(var4 == -1) {
+         int var3;
+         for (int var4 = 0; var4 < var2.length; var4 += var3) {
+            var3 = var0.read(var2, var4, var2.length - var4);
+            if (var3 == -1) {
                throw new IOException();
             }
          }
 
          var1 = new ClientPreferences(new Buffer(var2));
       } catch (Exception var6) {
-         ;
       }
 
       try {
-         if(var0 != null) {
+         if (var0 != null) {
             var0.close();
          }
       } catch (Exception var5) {
-         ;
       }
 
       return var1;
    }
+
+   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'};
+   }
 }
diff --git a/runescape-client/src/main/java/class307.java b/runescape-client/src/main/java/class307.java
index dd819cd054..a7d579e6b4 100644
--- a/runescape-client/src/main/java/class307.java
+++ b/runescape-client/src/main/java/class307.java
@@ -5,15 +5,15 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("kc")
 public class class307 {
    @ObfuscatedName("m")
-   public static char[] __kc_m;
+   public static char[] field1151;
    @ObfuscatedName("f")
-   static char[] __kc_f;
+   static char[] field1152;
    @ObfuscatedName("q")
-   static char[] __kc_q;
+   static char[] field1153;
    @ObfuscatedName("w")
-   static int[] __kc_w;
+   static int[] field1154;
    @ObfuscatedName("g")
-   static byte[][][] __kc_g;
+   static byte[][][] field1155;
    @ObfuscatedName("n")
    @ObfuscatedSignature(
       signature = "Ldt;"
@@ -22,78 +22,78 @@ public class class307 {
    public static SoundCache soundCache;
 
    static {
-      __kc_m = new char[64];
+      field1151 = new char[64];
 
       int var0;
-      for(var0 = 0; var0 < 26; ++var0) {
-         __kc_m[var0] = (char)(var0 + 65);
+      for (var0 = 0; var0 < 26; ++var0) {
+         field1151[var0] = (char)(var0 + 65);
       }
 
-      for(var0 = 26; var0 < 52; ++var0) {
-         __kc_m[var0] = (char)(var0 + 97 - 26);
+      for (var0 = 26; var0 < 52; ++var0) {
+         field1151[var0] = (char)(var0 + 97 - 26);
       }
 
-      for(var0 = 52; var0 < 62; ++var0) {
-         __kc_m[var0] = (char)(var0 + 48 - 52);
+      for (var0 = 52; var0 < 62; ++var0) {
+         field1151[var0] = (char)(var0 + 48 - 52);
       }
 
-      __kc_m[62] = '+';
-      __kc_m[63] = '/';
-      __kc_f = new char[64];
+      field1151[62] = '+';
+      field1151[63] = '/';
+      field1152 = new char[64];
 
-      for(var0 = 0; var0 < 26; ++var0) {
-         __kc_f[var0] = (char)(var0 + 65);
+      for (var0 = 0; var0 < 26; ++var0) {
+         field1152[var0] = (char)(var0 + 65);
       }
 
-      for(var0 = 26; var0 < 52; ++var0) {
-         __kc_f[var0] = (char)(var0 + 97 - 26);
+      for (var0 = 26; var0 < 52; ++var0) {
+         field1152[var0] = (char)(var0 + 97 - 26);
       }
 
-      for(var0 = 52; var0 < 62; ++var0) {
-         __kc_f[var0] = (char)(var0 + 48 - 52);
+      for (var0 = 52; var0 < 62; ++var0) {
+         field1152[var0] = (char)(var0 + 48 - 52);
       }
 
-      __kc_f[62] = '*';
-      __kc_f[63] = '-';
-      __kc_q = new char[64];
+      field1152[62] = '*';
+      field1152[63] = '-';
+      field1153 = new char[64];
 
-      for(var0 = 0; var0 < 26; ++var0) {
-         __kc_q[var0] = (char)(var0 + 65);
+      for (var0 = 0; var0 < 26; ++var0) {
+         field1153[var0] = (char)(var0 + 65);
       }
 
-      for(var0 = 26; var0 < 52; ++var0) {
-         __kc_q[var0] = (char)(var0 + 97 - 26);
+      for (var0 = 26; var0 < 52; ++var0) {
+         field1153[var0] = (char)(var0 + 97 - 26);
       }
 
-      for(var0 = 52; var0 < 62; ++var0) {
-         __kc_q[var0] = (char)(var0 + 48 - 52);
+      for (var0 = 52; var0 < 62; ++var0) {
+         field1153[var0] = (char)(var0 + 48 - 52);
       }
 
-      __kc_q[62] = '-';
-      __kc_q[63] = '_';
-      __kc_w = new int[128];
+      field1153[62] = '-';
+      field1153[63] = '_';
+      field1154 = new int[128];
 
-      for(var0 = 0; var0 < __kc_w.length; ++var0) {
-         __kc_w[var0] = -1;
+      for (var0 = 0; var0 < field1154.length; ++var0) {
+         field1154[var0] = -1;
       }
 
-      for(var0 = 65; var0 <= 90; ++var0) {
-         __kc_w[var0] = var0 - 65;
+      for (var0 = 65; var0 <= 90; ++var0) {
+         field1154[var0] = var0 - 65;
       }
 
-      for(var0 = 97; var0 <= 122; ++var0) {
-         __kc_w[var0] = var0 - 97 + 26;
+      for (var0 = 97; var0 <= 122; ++var0) {
+         field1154[var0] = var0 - 97 + 26;
       }
 
-      for(var0 = 48; var0 <= 57; ++var0) {
-         __kc_w[var0] = var0 - 48 + 52;
+      for (var0 = 48; var0 <= 57; ++var0) {
+         field1154[var0] = var0 - 48 + 52;
       }
 
-      int[] var2 = __kc_w;
-      __kc_w[43] = 62;
-      var2[42] = 62;
-      int[] var1 = __kc_w;
-      __kc_w[47] = 63;
-      var1[45] = 63;
+      int[] var1 = field1154;
+      field1154[43] = 62;
+      var1[42] = 62;
+      int[] var2 = field1154;
+      field1154[47] = 63;
+      var2[45] = 63;
    }
 }
diff --git a/runescape-client/src/main/java/class31.java b/runescape-client/src/main/java/class31.java
index ac2e2a8f2f..f4c2c2884a 100644
--- a/runescape-client/src/main/java/class31.java
+++ b/runescape-client/src/main/java/class31.java
@@ -2,6 +2,7 @@ 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("ac")
 public class class31 {
@@ -21,11 +22,6 @@ public class class31 {
    )
    final int field255;
 
-   static {
-      field259 = new class31(0);
-      field254 = new class31(1);
-   }
-
    class31(int var1) {
       this.field255 = var1;
    }
@@ -37,10 +33,10 @@ public class class31 {
    )
    @Export("changeWorld")
    static void changeWorld(World var0) {
-      if(var0.isMembersOnly() != Client.isMembersWorld) {
+      if (var0.isMembersOnly() != Client.isMembersWorld) {
          Client.isMembersWorld = var0.isMembersOnly();
          boolean var1 = var0.isMembersOnly();
-         if(var1 != class30.inMembersWorld) {
+         if (var1 != class30.inMembersWorld) {
             LoginScreenAnimation.method1780();
             class30.inMembersWorld = var1;
          }
@@ -49,8 +45,8 @@ public class class31 {
       class50.worldHost = var0.host;
       Client.worldId = var0.id;
       Client.worldProperties = var0.properties;
-      class2.port1 = Client.gameBuild == 0?43594:var0.id + 40000;
-      WorldMapArea.port2 = Client.gameBuild == 0?443:var0.id + 50000;
+      class2.port1 = Client.gameBuild == 0 ? 43594 : var0.id + 40000;
+      WorldMapArea.port2 = Client.gameBuild == 0 ? 443 : var0.id + 50000;
       class203.port3 = class2.port1;
    }
 
@@ -60,14 +56,14 @@ public class class31 {
       garbageValue = "130306081"
    )
    static int method573(int var0, Script var1, boolean var2) {
-      if(var0 == 6500) {
-         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ClientParameter.loadWorlds()?1:0;
+      if (var0 == ScriptOpcodes.WORLDLIST_FETCH) {
+         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ClientParameter.loadWorlds() ? 1 : 0;
          return 1;
       } else {
          World var3;
-         if(var0 == 6501) {
-            var3 = class190.method3672();
-            if(var3 != null) {
+         if (var0 == ScriptOpcodes.WORLDLIST_START) {
+            var3 = class190.worldListStart();
+            if (var3 != null) {
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.id;
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.properties;
                Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.activity;
@@ -84,9 +80,9 @@ public class class31 {
             }
 
             return 1;
-         } else if(var0 == 6502) {
-            var3 = Fonts.method5647();
-            if(var3 != null) {
+         } else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) {
+            var3 = Fonts.getNextWorldListWorld();
+            if (var3 != null) {
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.id;
                Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var3.properties;
                Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var3.activity;
@@ -106,19 +102,19 @@ public class class31 {
          } else {
             World var4;
             int var5;
-            int var7;
-            if(var0 == 6506) {
-               var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+            int var6;
+            if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) {
+               var6 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
                var4 = null;
 
-               for(var5 = 0; var5 < World.worldsCount; ++var5) {
-                  if(var7 == ItemContainer.worlds[var5].id) {
+               for (var5 = 0; var5 < World.worldsCount; ++var5) {
+                  if (var6 == ItemContainer.worlds[var5].id) {
                      var4 = ItemContainer.worlds[var5];
                      break;
                   }
                }
 
-               if(var4 != null) {
+               if (var4 != null) {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4.id;
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4.properties;
                   Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.activity;
@@ -135,94 +131,94 @@ public class class31 {
                }
 
                return 1;
-            } else if(var0 == 6507) {
+            } else if (var0 == ScriptOpcodes.WORLDLIST_SORT) {
                RouteStrategy.Interpreter_intStackSize -= 4;
-               var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-               boolean var10 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1] == 1;
+               var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
+               boolean var9 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1] == 1;
                var5 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
-               boolean var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3] == 1;
-               WorldMapSectionType.method248(var7, var10, var5, var6);
+               boolean var10 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 3] == 1;
+               WorldMapSectionType.sortWorldList(var6, var9, var5, var10);
                return 1;
-            } else if(var0 != 6511) {
-               if(var0 == 6512) {
+            } else if (var0 != ScriptOpcodes.GETWORLDINFO) {
+               if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) {
                   Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
                   return 1;
                } else {
-                  int var8;
-                  ParamKeyDefinition var9;
-                  if(var0 == 6513) {
+                  int var7;
+                  ParamDefinition var8;
+                  if (var0 == ScriptOpcodes.NC_PARAM) {
                      RouteStrategy.Interpreter_intStackSize -= 2;
-                     var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-                     var8 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-                     var9 = class229.getParamKeyDefinition(var8);
-                     if(var9.isString()) {
-                        Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ObjectDefinition.getNpcDefinition(var7).getStringParam(var8, var9.keyString);
+                     var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
+                     var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
+                     var8 = class229.getParamDefinition(var7);
+                     if (var8.isString()) {
+                        Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = ObjectDefinition.getNpcDefinition(var6).getStringParam(var7, var8.defaultStr);
                      } else {
-                        Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ObjectDefinition.getNpcDefinition(var7).getIntParam(var8, var9.keyInt);
+                        Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ObjectDefinition.getNpcDefinition(var6).getIntParam(var7, var8.defaultInt);
                      }
 
                      return 1;
-                  } else if(var0 == 6514) {
+                  } else if (var0 == ScriptOpcodes.LC_PARAM) {
                      RouteStrategy.Interpreter_intStackSize -= 2;
-                     var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-                     var8 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-                     var9 = class229.getParamKeyDefinition(var8);
-                     if(var9.isString()) {
-                        Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class50.getObjectDefinition(var7).getStringParam(var8, var9.keyString);
+                     var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
+                     var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
+                     var8 = class229.getParamDefinition(var7);
+                     if (var8.isString()) {
+                        Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = class50.getObjectDefinition(var6).getStringParam(var7, var8.defaultStr);
                      } else {
-                        Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class50.getObjectDefinition(var7).getIntParam(var8, var9.keyInt);
+                        Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class50.getObjectDefinition(var6).getIntParam(var7, var8.defaultInt);
                      }
 
                      return 1;
-                  } else if(var0 == 6515) {
+                  } else if (var0 == ScriptOpcodes.OC_PARAM) {
                      RouteStrategy.Interpreter_intStackSize -= 2;
-                     var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-                     var8 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-                     var9 = class229.getParamKeyDefinition(var8);
-                     if(var9.isString()) {
-                        Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Skills.getItemDefinition(var7).getStringParam(var8, var9.keyString);
+                     var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
+                     var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
+                     var8 = class229.getParamDefinition(var7);
+                     if (var8.isString()) {
+                        Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = Skills.getItemDefinition(var6).getStringParam(var7, var8.defaultStr);
                      } else {
-                        Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var7).getIntParam(var8, var9.keyInt);
+                        Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Skills.getItemDefinition(var6).getIntParam(var7, var8.defaultInt);
                      }
 
                      return 1;
-                  } else if(var0 == 6516) {
+                  } else if (var0 == ScriptOpcodes.STRUCT_PARAM) {
                      RouteStrategy.Interpreter_intStackSize -= 2;
-                     var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-                     var8 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-                     var9 = class229.getParamKeyDefinition(var8);
-                     if(var9.isString()) {
-                        Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = GzipDecompressor.method3702(var7).getStringParam(var8, var9.keyString);
+                     var6 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
+                     var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
+                     var8 = class229.getParamDefinition(var7);
+                     if (var8.isString()) {
+                        Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = GzipDecompressor.getStructDefinition(var6).getStringParam(var7, var8.defaultStr);
                      } else {
-                        Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = GzipDecompressor.method3702(var7).getIntParam(var8, var9.keyInt);
+                        Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = GzipDecompressor.getStructDefinition(var6).getIntParam(var7, var8.defaultInt);
                      }
 
                      return 1;
-                  } else if(var0 == 6518) {
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.__client_bl?1:0;
+                  } else if (var0 == ScriptOpcodes.ON_MOBILE) {
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0;
                      return 1;
-                  } else if(var0 == 6519) {
+                  } else if (var0 == ScriptOpcodes.CLIENTTYPE) {
                      Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.clientType & 3;
                      return 1;
-                  } else if(var0 == 6520) {
+                  } else if (var0 == 6520) {
                      return 1;
-                  } else if(var0 == 6521) {
+                  } else if (var0 == 6521) {
                      return 1;
-                  } else if(var0 == 6522) {
+                  } else if (var0 == 6522) {
                      --Interpreter.Interpreter_stringStackSize;
                      --RouteStrategy.Interpreter_intStackSize;
                      return 1;
-                  } else if(var0 == 6523) {
+                  } else if (var0 == 6523) {
                      --Interpreter.Interpreter_stringStackSize;
                      --RouteStrategy.Interpreter_intStackSize;
                      return 1;
-                  } else if(var0 == 6524) {
+                  } else if (var0 == ScriptOpcodes.BATTERYLEVEL) {
                      Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                      return 1;
-                  } else if(var0 == 6525) {
+                  } else if (var0 == ScriptOpcodes.BATTERYCHARGING) {
                      Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1;
                      return 1;
-                  } else if(var0 == 6526) {
+                  } else if (var0 == ScriptOpcodes.WIFIAVAILABLE) {
                      Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 1;
                      return 1;
                   } else {
@@ -230,9 +226,9 @@ public class class31 {
                   }
                }
             } else {
-               var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-               if(var7 >= 0 && var7 < World.worldsCount) {
-                  var4 = ItemContainer.worlds[var7];
+               var6 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+               if (var6 >= 0 && var6 < World.worldsCount) {
+                  var4 = ItemContainer.worlds[var6];
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4.id;
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4.properties;
                   Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var4.activity;
@@ -260,11 +256,17 @@ public class class31 {
       garbageValue = "-110"
    )
    static final void method574(String var0) {
-      if(!var0.equals("")) {
-         PacketBufferNode var1 = Interpreter.method1915(ClientPacket.__gs_cr, Client.packetWriter.isaacCipher);
-         var1.packetBuffer.writeByte(WorldMapRegion.method550(var0));
+      if (!var0.equals("")) {
+         PacketBufferNode var1 = Interpreter.method1915(ClientPacket.field300, Client.packetWriter.isaacCipher);
+         var1.packetBuffer.writeByte(WorldMapRegion.stringCp1252NullTerminatedByteSize(var0));
          var1.packetBuffer.writeStringCp1252NullTerminated(var0);
-         Client.packetWriter.__q_167(var1);
+         Client.packetWriter.method241(var1);
       }
+
+   }
+
+   static {
+      field259 = new class31(0);
+      field254 = new class31(1);
    }
 }
diff --git a/runescape-client/src/main/java/class310.java b/runescape-client/src/main/java/class310.java
index 49b9df7811..d853fd44c9 100644
--- a/runescape-client/src/main/java/class310.java
+++ b/runescape-client/src/main/java/class310.java
@@ -25,13 +25,13 @@ public class class310 {
    )
    public final int field3804;
 
+   class310(int var1) {
+      this.field3804 = var1;
+   }
+
    static {
       field3806 = new class310(0);
       field3805 = new class310(1);
       field3807 = new class310(2);
    }
-
-   class310(int var1) {
-      this.field3804 = var1;
-   }
 }
diff --git a/runescape-client/src/main/java/class313.java b/runescape-client/src/main/java/class313.java
index 1b7fea7a37..9e6b6af821 100644
--- a/runescape-client/src/main/java/class313.java
+++ b/runescape-client/src/main/java/class313.java
@@ -62,7 +62,7 @@ public enum class313 implements Enumerated {
    )
    final int field3827;
 
-   class313(int var3, int var4) {
+   private class313(int var3, int var4) {
       this.field3833 = var3;
       this.field3827 = var4;
    }
diff --git a/runescape-client/src/main/java/class32.java b/runescape-client/src/main/java/class32.java
index 95bd7cf314..e55e10c7de 100644
--- a/runescape-client/src/main/java/class32.java
+++ b/runescape-client/src/main/java/class32.java
@@ -1,11 +1,12 @@
 import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
 @ObfuscatedName("ay")
 public class class32 {
    @ObfuscatedName("u")
-   static byte[][][] __ay_u;
+   static byte[][][] field1157;
    @ObfuscatedName("gj")
    @ObfuscatedSignature(
       signature = "[Llq;"
@@ -20,20 +21,20 @@ public class class32 {
    )
    static int method576(int var0, Script var1, boolean var2) {
       Widget var3;
-      if(var0 >= 2000) {
+      if (var0 >= 2000) {
          var0 -= 1000;
          var3 = Huffman.getWidget(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
       } else {
-         var3 = var2?WorldMapIcon1.__t_i:class12.__n_n;
+         var3 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111;
       }
 
-      class22.method295(var3);
-      if(var0 != 1200 && var0 != 1205 && var0 != 1212) {
-         if(var0 == 1201) {
+      WorldMapRectangle.method295(var3);
+      if (var0 != ScriptOpcodes.CC_SETOBJECT && var0 != ScriptOpcodes.CC_SETOBJECT_NONUM && var0 != ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM) {
+         if (var0 == ScriptOpcodes.CC_SETNPCHEAD) {
             var3.modelType = 2;
             var3.modelId = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
             return 1;
-         } else if(var0 == 1202) {
+         } else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) {
             var3.modelType = 3;
             var3.modelId = Canvas.localPlayer.appearance.getChatHeadId();
             return 1;
@@ -53,17 +54,17 @@ public class class32 {
          var3.modelOffsetX = var6.offsetX2d;
          var3.modelOffsetY = var6.offsetY2d;
          var3.modelZoom = var6.zoom2d;
-         if(var0 == 1205) {
+         if (var0 == ScriptOpcodes.CC_SETOBJECT_NONUM) {
             var3.itemQuantityMode = 0;
-         } else if(var0 == 1212 | 1 == var6.isStackable) {
+         } else if (var0 == ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM | 1 == var6.isStackable) {
             var3.itemQuantityMode = 1;
          } else {
             var3.itemQuantityMode = 2;
          }
 
-         if(var3.__bf > 0) {
-            var3.modelZoom = var3.modelZoom * 32 / var3.__bf;
-         } else if(var3.rawWidth > 0) {
+         if (var3.field962 > 0) {
+            var3.modelZoom = var3.modelZoom * 32 / var3.field962;
+         } else if (var3.rawWidth > 0) {
             var3.modelZoom = var3.modelZoom * 32 / var3.rawWidth;
          }
 
@@ -78,7 +79,7 @@ public class class32 {
    )
    static void method578(int var0) {
       Login.loginIndex = 12;
-      Login.__cu_aj = var0;
+      Login.field466 = var0;
    }
 
    @ObfuscatedName("gu")
@@ -90,9 +91,9 @@ public class class32 {
    static final int getTileHeight(int var0, int var1, int var2) {
       int var3 = var0 >> 7;
       int var4 = var1 >> 7;
-      if(var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) {
+      if (var3 >= 0 && var4 >= 0 && var3 <= 103 && var4 <= 103) {
          int var5 = var2;
-         if(var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) {
+         if (var2 < 3 && (Tiles.Tiles_renderFlags[1][var3][var4] & 2) == 2) {
             var5 = var2 + 1;
          }
 
diff --git a/runescape-client/src/main/java/class322.java b/runescape-client/src/main/java/class322.java
index b73ed654bb..279019cb09 100644
--- a/runescape-client/src/main/java/class322.java
+++ b/runescape-client/src/main/java/class322.java
@@ -11,17 +11,17 @@ public class class322 {
    @Export("reflectionChecks")
    public static IterableNodeDeque reflectionChecks;
 
-   static {
-      reflectionChecks = new IterableNodeDeque();
-   }
-
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "(Lir;III)Lln;",
       garbageValue = "-2000477161"
    )
    @Export("readSprite")
-   public static Sprite readSprite(AbstractIndexCache var0, int var1, int var2) {
-      return !SpriteMask.loadSprite(var0, var1, var2)?null:class258.method4900();
+   public static Sprite readSprite(AbstractArchive archive, int group, int file) {
+      return !SpriteMask.loadSprite(archive, group, file) ? null : class258.method4900();
+   }
+
+   static {
+      reflectionChecks = new IterableNodeDeque();
    }
 }
diff --git a/runescape-client/src/main/java/class39.java b/runescape-client/src/main/java/class39.java
index 98926a8e6f..e06fd1e3b0 100644
--- a/runescape-client/src/main/java/class39.java
+++ b/runescape-client/src/main/java/class39.java
@@ -39,21 +39,21 @@ public class class39 extends class21 {
    )
    void method714(Buffer var1) {
       int var2 = var1.readUnsignedByte();
-      if(var2 != class31.field254.field255) {
+      if (var2 != class31.field254.field255) {
          throw new IllegalStateException("");
       } else {
          super.field148 = var1.readUnsignedByte();
          super.field156 = var1.readUnsignedByte();
-         super.field149 = var1.__ag_302();
-         super.field146 = var1.__ag_302();
+         super.field149 = var1.readUnsignedShort();
+         super.field146 = var1.readUnsignedShort();
          this.field318 = var1.readUnsignedByte();
          this.field319 = var1.readUnsignedByte();
-         super.field159 = var1.__ag_302();
-         super.field147 = var1.__ag_302();
+         super.field159 = var1.readUnsignedShort();
+         super.field147 = var1.readUnsignedShort();
          this.field321 = var1.readUnsignedByte();
          this.field323 = var1.readUnsignedByte();
-         super.field150 = var1.__ap_310();
-         super.field152 = var1.__ap_310();
+         super.field150 = var1.method51();
+         super.field152 = var1.method51();
       }
    }
 
@@ -68,18 +68,18 @@ public class class39 extends class21 {
       super.field145 = new short[super.field156][64][64];
       super.field154 = new byte[super.field156][64][64];
       super.field155 = new byte[super.field156][64][64];
-      super.field144 = new class25[super.field156][64][64][];
+      super.decorations = new WorldMapDecoration[super.field156][64][64][];
       int var2 = var1.readUnsignedByte();
-      if(var2 != class30.field247.field248) {
+      if (var2 != class30.field247.field248) {
          throw new IllegalStateException("");
       } else {
          int var3 = var1.readUnsignedByte();
          int var4 = var1.readUnsignedByte();
          int var5 = var1.readUnsignedByte();
          int var6 = var1.readUnsignedByte();
-         if(var3 == super.field159 && var4 == super.field147 && var5 == this.field321 && var6 == this.field323) {
-            for(int var7 = 0; var7 < 8; ++var7) {
-               for(int var8 = 0; var8 < 8; ++var8) {
+         if (var3 == super.field159 && var4 == super.field147 && var5 == this.field321 && var6 == this.field323) {
+            for (int var7 = 0; var7 < 8; ++var7) {
+               for (int var8 = 0; var8 < 8; ++var8) {
                   this.method259(var7 + this.field321 * 8, var8 + this.field323 * 8, var1);
                }
             }
@@ -131,11 +131,11 @@ public class class39 extends class21 {
    }
 
    public boolean equals(Object var1) {
-      if(!(var1 instanceof class39)) {
+      if (!(var1 instanceof class39)) {
          return false;
       } else {
          class39 var2 = (class39)var1;
-         return var2.field159 == super.field159 && var2.field147 == super.field147?this.field321 == var2.field321 && var2.field323 == this.field323:false;
+         return var2.field159 == super.field159 && var2.field147 == super.field147 ? this.field321 == var2.field321 && var2.field323 == this.field323 : false;
       }
    }
 
@@ -145,278 +145,278 @@ public class class39 extends class21 {
       garbageValue = "-1"
    )
    @Export("drawActor2d")
-   static final void drawActor2d(Actor var0, int var1, int var2, int var3, int var4, int var5) {
-      if(var0 != null && var0.isVisible()) {
-         if(var0 instanceof Npc) {
-            NpcDefinition var6 = ((Npc)var0).definition;
-            if(var6.transforms != null) {
+   static final void drawActor2d(Actor actor, int var1, int var2, int var3, int var4, int var5) {
+      if (actor != null && actor.isVisible()) {
+         if (actor instanceof NPC) {
+            NPCDefinition var6 = ((NPC)actor).definition;
+            if (var6.transforms != null) {
                var6 = var6.transform();
             }
 
-            if(var6 == null) {
+            if (var6 == null) {
                return;
             }
          }
 
-         int var75 = Players.Players_count;
+         int var77 = Players.Players_count;
          int[] var7 = Players.Players_indices;
          byte var8 = 0;
-         Player var10;
-         if(var1 < var75 && var0.playerCycle == Client.cycle) {
-            var10 = (Player)var0;
-            boolean var9;
-            if(Client.__client_ke == 0) {
-               var9 = false;
-            } else if(var10 != Canvas.localPlayer) {
-               boolean var77 = (Client.__client_ke & 4) != 0;
-               boolean var78 = var77;
+         Player var9;
+         if (var1 < var77 && actor.playerCycle == Client.cycle) {
+            var9 = (Player)actor;
+            boolean var10;
+            if (Client.field210 == 0) {
+               var10 = false;
+            } else if (var9 != Canvas.localPlayer) {
+               boolean var11 = (Client.field210 & 4) != 0;
+               boolean var12 = var11;
                boolean var13;
-               if(!var77) {
-                  var13 = (Client.__client_ke & 1) != 0;
-                  var78 = var13 && var10.isFriend();
+               if (!var11) {
+                  var13 = (Client.field210 & 1) != 0;
+                  var12 = var13 && var9.isFriend();
                }
 
-               var13 = var78;
-               if(!var78) {
-                  boolean var79 = (Client.__client_ke & 2) != 0;
-                  var13 = var79 && var10.isClanMember();
+               var13 = var12;
+               if (!var12) {
+                  boolean var14 = (Client.field210 & 2) != 0;
+                  var13 = var14 && var9.isClanMember();
                }
 
-               var9 = var13;
+               var10 = var13;
             } else {
-               var9 = class14.method169();
+               var10 = class14.method169();
             }
 
-            if(var9) {
-               Player var11 = (Player)var0;
-               if(var1 < var75) {
-                  DevicePcmPlayerProvider.method840(var0, var0.defaultHeight + 15);
-                  AbstractFont var12 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12);
-                  byte var92 = 9;
-                  var12.drawCentered(var11.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var92, 16777215, 0);
+            if (var10) {
+               Player var79 = (Player)actor;
+               if (var1 < var77) {
+                  DevicePcmPlayerProvider.method840(actor, actor.defaultHeight + 15);
+                  AbstractFont var81 = (AbstractFont)Client.fontsMap.get(FontName.FontName_plain12);
+                  byte var83 = 9;
+                  var81.drawCentered(var79.username.getName(), var2 + Client.viewportTempX, var3 + Client.viewportTempY - var83, 16777215, 0);
                   var8 = 18;
                }
             }
          }
 
-         int var87 = -2;
+         int var78 = -2;
          int var15;
-         int var22;
-         int var23;
-         if(!var0.healthBars.isEmpty()) {
-            DevicePcmPlayerProvider.method840(var0, var0.defaultHeight + 15);
+         int var80;
+         int var82;
+         int var84;
+         int var85;
+         if (!actor.healthBars.isEmpty()) {
+            DevicePcmPlayerProvider.method840(actor, actor.defaultHeight + 15);
 
-            for(HealthBar var88 = (HealthBar)var0.healthBars.last(); var88 != null; var88 = (HealthBar)var0.healthBars.previous()) {
-               HealthBarUpdate var89 = var88.get(Client.cycle);
-               if(var89 == null) {
-                  if(var88.isEmpty()) {
-                     var88.remove();
+            for (HealthBar var16 = (HealthBar)actor.healthBars.last(); var16 != null; var16 = (HealthBar)actor.healthBars.previous()) {
+               HealthBarUpdate var17 = var16.get(Client.cycle);
+               if (var17 == null) {
+                  if (var16.isEmpty()) {
+                     var16.remove();
                   }
                } else {
-                  HealthBarDefinition var91 = var88.definition;
-                  Sprite var76 = var91.getSprite2();
-                  Sprite var14 = var91.getSprite1();
-                  int var16 = 0;
-                  if(var76 != null && var14 != null) {
-                     if(var91.widthPadding * 2 < var14.subWidth) {
-                        var16 = var91.widthPadding;
+                  HealthBarDefinition var18 = var16.definition;
+                  Sprite var19 = var18.getSprite2();
+                  Sprite var20 = var18.getSprite1();
+                  int var21 = 0;
+                  if (var19 != null && var20 != null) {
+                     if (var18.widthPadding * 2 < var20.subWidth) {
+                        var21 = var18.widthPadding;
                      }
 
-                     var15 = var14.subWidth - var16 * 2;
+                     var85 = var20.subWidth - var21 * 2;
                   } else {
-                     var15 = var91.width;
+                     var85 = var18.width;
                   }
 
-                  int var17 = 255;
-                  boolean var18 = true;
-                  int var19 = Client.cycle - var89.cycle;
-                  int var20 = var15 * var89.health2 / var91.width;
-                  int var21;
-                  int var93;
-                  if(var89.cycleOffset > var19) {
-                     var21 = var91.int4 == 0?0:var91.int4 * (var19 / var91.int4);
-                     var22 = var15 * var89.health / var91.width;
-                     var93 = var21 * (var20 - var22) / var89.cycleOffset + var22;
+                  int var22 = 255;
+                  boolean var23 = true;
+                  int var24 = Client.cycle - var17.cycle;
+                  int var25 = var85 * var17.health2 / var18.width;
+                  if (var17.cycleOffset > var24) {
+                     var80 = var18.int4 == 0 ? 0 : var18.int4 * (var24 / var18.int4);
+                     var84 = var85 * var17.health / var18.width;
+                     var82 = var80 * (var25 - var84) / var17.cycleOffset + var84;
                   } else {
-                     var93 = var20;
-                     var21 = var89.cycleOffset + var91.int5 - var19;
-                     if(var91.int3 >= 0) {
-                        var17 = (var21 << 8) / (var91.int5 - var91.int3);
+                     var82 = var25;
+                     var80 = var17.cycleOffset + var18.int5 - var24;
+                     if (var18.int3 >= 0) {
+                        var22 = (var80 << 8) / (var18.int5 - var18.int3);
                      }
                   }
 
-                  if(var89.health2 > 0 && var93 < 1) {
-                     var93 = 1;
+                  if (var17.health2 > 0 && var82 < 1) {
+                     var82 = 1;
                   }
 
-                  if(var76 != null && var14 != null) {
-                     if(var15 == var93) {
-                        var93 += var16 * 2;
+                  if (var19 != null && var20 != null) {
+                     if (var85 == var82) {
+                        var82 += var21 * 2;
                      } else {
-                        var93 += var16;
+                        var82 += var21;
                      }
 
-                     var21 = var76.subHeight;
-                     var87 += var21;
-                     var22 = var2 + Client.viewportTempX - (var15 >> 1);
-                     var23 = var3 + Client.viewportTempY - var87;
-                     var22 -= var16;
-                     if(var17 >= 0 && var17 < 255) {
-                        var76.__h_508(var22, var23, var17);
-                        Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var22 + var93, var23 + var21);
-                        var14.__h_508(var22, var23, var17);
+                     var80 = var19.subHeight;
+                     var78 += var80;
+                     var84 = var2 + Client.viewportTempX - (var85 >> 1);
+                     var15 = var3 + Client.viewportTempY - var78;
+                     var84 -= var21;
+                     if (var22 >= 0 && var22 < 255) {
+                        var19.method310(var84, var15, var22);
+                        Rasterizer2D.Rasterizer2D_expandClip(var84, var15, var84 + var82, var15 + var80);
+                        var20.method310(var84, var15, var22);
                      } else {
-                        var76.drawAt2(var22, var23);
-                        Rasterizer2D.Rasterizer2D_expandClip(var22, var23, var93 + var22, var21 + var23);
-                        var14.drawAt2(var22, var23);
+                        var19.drawAt2(var84, var15);
+                        Rasterizer2D.Rasterizer2D_expandClip(var84, var15, var82 + var84, var80 + var15);
+                        var20.drawAt2(var84, var15);
                      }
 
                      Rasterizer2D.Rasterizer2D_setClip(var2, var3, var2 + var4, var3 + var5);
-                     var87 += 2;
+                     var78 += 2;
                   } else {
-                     var87 += 5;
-                     if(Client.viewportTempX > -1) {
-                        var21 = var2 + Client.viewportTempX - (var15 >> 1);
-                        var22 = var3 + Client.viewportTempY - var87;
-                        Rasterizer2D.Rasterizer2D_fillRectangle(var21, var22, var93, 5, 0xff00);
-                        Rasterizer2D.Rasterizer2D_fillRectangle(var21 + var93, var22, var15 - var93, 5, 0xff0000);
+                     var78 += 5;
+                     if (Client.viewportTempX > -1) {
+                        var80 = var2 + Client.viewportTempX - (var85 >> 1);
+                        var84 = var3 + Client.viewportTempY - var78;
+                        Rasterizer2D.Rasterizer2D_fillRectangle(var80, var84, var82, 5, 65280);
+                        Rasterizer2D.Rasterizer2D_fillRectangle(var80 + var82, var84, var85 - var82, 5, 16711680);
                      }
 
-                     var87 += 2;
+                     var78 += 2;
                   }
                }
             }
          }
 
-         if(var87 == -2) {
-            var87 += 7;
+         if (var78 == -2) {
+            var78 += 7;
          }
 
-         var87 += var8;
-         if(var1 < var75) {
-            var10 = (Player)var0;
-            if(var10.isHidden) {
+         var78 += var8;
+         if (var1 < var77) {
+            var9 = (Player)actor;
+            if (var9.isHidden) {
                return;
             }
 
-            if(var10.headIconPk != -1 || var10.headIconPrayer != -1) {
-               DevicePcmPlayerProvider.method840(var0, var0.defaultHeight + 15);
-               if(Client.viewportTempX > -1) {
-                  if(var10.headIconPk != -1) {
-                     var87 += 25;
-                     class15.headIconPkSprites[var10.headIconPk].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87);
+            if (var9.headIconPk != -1 || var9.headIconPrayer != -1) {
+               DevicePcmPlayerProvider.method840(actor, actor.defaultHeight + 15);
+               if (Client.viewportTempX > -1) {
+                  if (var9.headIconPk != -1) {
+                     var78 += 25;
+                     class15.headIconPkSprites[var9.headIconPk].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var78);
                   }
 
-                  if(var10.headIconPrayer != -1) {
-                     var87 += 25;
-                     ClientPreferences.headIconPrayerSprites[var10.headIconPrayer].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87);
+                  if (var9.headIconPrayer != -1) {
+                     var78 += 25;
+                     ClientPreferences.headIconPrayerSprites[var9.headIconPrayer].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var78);
                   }
                }
             }
 
-            if(var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) {
-               DevicePcmPlayerProvider.method840(var0, var0.defaultHeight + 15);
-               if(Client.viewportTempX > -1) {
-                  var87 += Player.headIconHintSprites[1].subHeight;
-                  Player.headIconHintSprites[1].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var87);
+            if (var1 >= 0 && Client.hintArrowType == 10 && var7[var1] == Client.hintArrowPlayerIndex) {
+               DevicePcmPlayerProvider.method840(actor, actor.defaultHeight + 15);
+               if (Client.viewportTempX > -1) {
+                  var78 += Player.headIconHintSprites[1].subHeight;
+                  Player.headIconHintSprites[1].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - var78);
                }
             }
          } else {
-            NpcDefinition var90 = ((Npc)var0).definition;
-            if(var90.transforms != null) {
-               var90 = var90.transform();
+            NPCDefinition var86 = ((NPC)actor).definition;
+            if (var86.transforms != null) {
+               var86 = var86.transform();
             }
 
-            if(var90.headIconPrayer >= 0 && var90.headIconPrayer < ClientPreferences.headIconPrayerSprites.length) {
-               DevicePcmPlayerProvider.method840(var0, var0.defaultHeight + 15);
-               if(Client.viewportTempX > -1) {
-                  ClientPreferences.headIconPrayerSprites[var90.headIconPrayer].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30);
+            if (var86.headIconPrayer >= 0 && var86.headIconPrayer < ClientPreferences.headIconPrayerSprites.length) {
+               DevicePcmPlayerProvider.method840(actor, actor.defaultHeight + 15);
+               if (Client.viewportTempX > -1) {
+                  ClientPreferences.headIconPrayerSprites[var86.headIconPrayer].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 30);
                }
             }
 
-            if(Client.hintArrowType == 1 && Client.npcIndices[var1 - var75] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) {
-               DevicePcmPlayerProvider.method840(var0, var0.defaultHeight + 15);
-               if(Client.viewportTempX > -1) {
+            if (Client.hintArrowType == 1 && Client.npcIndices[var1 - var77] == Client.hintArrowNpcIndex && Client.cycle % 20 < 10) {
+               DevicePcmPlayerProvider.method840(actor, actor.defaultHeight + 15);
+               if (Client.viewportTempX > -1) {
                   Player.headIconHintSprites[0].drawAt2(var2 + Client.viewportTempX - 12, var3 + Client.viewportTempY - 28);
                }
             }
          }
 
-         if(var0.overheadText != null && (var1 >= var75 || !var0.__az && (Client.publicChatMode == 4 || !var0.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)var0).isFriend())))) {
-            DevicePcmPlayerProvider.method840(var0, var0.defaultHeight);
-            if(Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) {
-               Client.overheadTextXOffsets[Client.overheadTextCount] = class2.fontBold12.stringWidth(var0.overheadText) / 2;
+         if (actor.overheadText != null && (var1 >= var77 || !actor.field11 && (Client.publicChatMode == 4 || !actor.isAutoChatting && (Client.publicChatMode == 0 || Client.publicChatMode == 3 || Client.publicChatMode == 1 && ((Player)actor).isFriend())))) {
+            DevicePcmPlayerProvider.method840(actor, actor.defaultHeight);
+            if (Client.viewportTempX > -1 && Client.overheadTextCount < Client.overheadTextLimit) {
+               Client.overheadTextXOffsets[Client.overheadTextCount] = class2.fontBold12.stringWidth(actor.overheadText) / 2;
                Client.overheadTextAscents[Client.overheadTextCount] = class2.fontBold12.ascent;
                Client.overheadTextXs[Client.overheadTextCount] = Client.viewportTempX;
                Client.overheadTextYs[Client.overheadTextCount] = Client.viewportTempY;
-               Client.overheadTextColors[Client.overheadTextCount] = var0.overheadTextColor;
-               Client.overheadTextEffects[Client.overheadTextCount] = var0.overheadTextEffect;
-               Client.overheadTextCyclesRemaining[Client.overheadTextCount] = var0.overheadTextCyclesRemaining;
-               Client.overheadText[Client.overheadTextCount] = var0.overheadText;
+               Client.overheadTextColors[Client.overheadTextCount] = actor.overheadTextColor;
+               Client.overheadTextEffects[Client.overheadTextCount] = actor.overheadTextEffect;
+               Client.overheadTextCyclesRemaining[Client.overheadTextCount] = actor.overheadTextCyclesRemaining;
+               Client.overheadText[Client.overheadTextCount] = actor.overheadText;
                ++Client.overheadTextCount;
             }
          }
 
-         for(int var80 = 0; var80 < 4; ++var80) {
-            int var96 = var0.hitSplatCycles[var80];
-            int var97 = var0.hitSplatTypes[var80];
-            HitSplatDefinition var95 = null;
-            int var98 = 0;
-            if(var97 >= 0) {
-               if(var96 <= Client.cycle) {
+         for (int var88 = 0; var88 < 4; ++var88) {
+            int var87 = actor.hitSplatCycles[var88];
+            int var89 = actor.hitSplatTypes[var88];
+            HitSplatDefinition var90 = null;
+            int var91 = 0;
+            if (var89 >= 0) {
+               if (var87 <= Client.cycle) {
                   continue;
                }
 
-               var95 = LoginScreenAnimation.getHitSplatDefinition(var0.hitSplatTypes[var80]);
-               var98 = var95.__i;
-               if(var95 != null && var95.transforms != null) {
-                  var95 = var95.transform();
-                  if(var95 == null) {
-                     var0.hitSplatCycles[var80] = -1;
+               var90 = LoginScreenAnimation.getHitSplatDefinition(actor.hitSplatTypes[var88]);
+               var91 = var90.field387;
+               if (var90 != null && var90.transforms != null) {
+                  var90 = var90.transform();
+                  if (var90 == null) {
+                     actor.hitSplatCycles[var88] = -1;
                      continue;
                   }
                }
-            } else if(var96 < 0) {
+            } else if (var87 < 0) {
                continue;
             }
 
-            var15 = var0.hitSplatTypes2[var80];
-            HitSplatDefinition var81 = null;
-            if(var15 >= 0) {
-               var81 = LoginScreenAnimation.getHitSplatDefinition(var15);
-               if(var81 != null && var81.transforms != null) {
-                  var81 = var81.transform();
+            var85 = actor.hitSplatTypes2[var88];
+            HitSplatDefinition var92 = null;
+            if (var85 >= 0) {
+               var92 = LoginScreenAnimation.getHitSplatDefinition(var85);
+               if (var92 != null && var92.transforms != null) {
+                  var92 = var92.transform();
                }
             }
 
-            if(var96 - var98 <= Client.cycle) {
-               if(var95 == null) {
-                  var0.hitSplatCycles[var80] = -1;
+            if (var87 - var91 <= Client.cycle) {
+               if (var90 == null) {
+                  actor.hitSplatCycles[var88] = -1;
                } else {
-                  DevicePcmPlayerProvider.method840(var0, var0.defaultHeight / 2);
-                  if(Client.viewportTempX > -1) {
-                     if(var80 == 1) {
+                  DevicePcmPlayerProvider.method840(actor, actor.defaultHeight / 2);
+                  if (Client.viewportTempX > -1) {
+                     if (var88 == 1) {
                         Client.viewportTempY -= 20;
                      }
 
-                     if(var80 == 2) {
+                     if (var88 == 2) {
                         Client.viewportTempX -= 15;
                         Client.viewportTempY -= 10;
                      }
 
-                     if(var80 == 3) {
+                     if (var88 == 3) {
                         Client.viewportTempX += 15;
                         Client.viewportTempY -= 10;
                      }
 
-                     Sprite var82 = null;
-                     Sprite var83 = null;
-                     Sprite var84 = null;
-                     Sprite var85 = null;
-                     var22 = 0;
-                     var23 = 0;
-                     int var24 = 0;
-                     int var25 = 0;
+                     Sprite var93 = null;
+                     Sprite var94 = null;
+                     Sprite var95 = null;
+                     Sprite var96 = null;
+                     var84 = 0;
+                     var15 = 0;
+                     var80 = 0;
+                     var82 = 0;
                      int var26 = 0;
                      int var27 = 0;
                      int var28 = 0;
@@ -434,90 +434,90 @@ public class class39 extends class21 {
                      int var40 = 0;
                      int var41 = 0;
                      int var42 = 0;
-                     var82 = var95.__g_417();
+                     var93 = var90.method123();
                      int var43;
-                     if(var82 != null) {
-                        var22 = var82.subWidth;
-                        var43 = var82.subHeight;
-                        if(var43 > var42) {
+                     if (var93 != null) {
+                        var84 = var93.subWidth;
+                        var43 = var93.subHeight;
+                        if (var43 > var42) {
                            var42 = var43;
                         }
 
-                        var26 = var82.yOffset;
+                        var26 = var93.yOffset;
                      }
 
-                     var83 = var95.__l_418();
-                     if(var83 != null) {
-                        var23 = var83.subWidth;
-                        var43 = var83.subHeight;
-                        if(var43 > var42) {
+                     var94 = var90.method124();
+                     if (var94 != null) {
+                        var15 = var94.subWidth;
+                        var43 = var94.subHeight;
+                        if (var43 > var42) {
                            var42 = var43;
                         }
 
-                        var27 = var83.yOffset;
+                        var27 = var94.yOffset;
                      }
 
-                     var84 = var95.__e_419();
-                     if(var84 != null) {
-                        var24 = var84.subWidth;
-                        var43 = var84.subHeight;
-                        if(var43 > var42) {
+                     var95 = var90.method125();
+                     if (var95 != null) {
+                        var80 = var95.subWidth;
+                        var43 = var95.subHeight;
+                        if (var43 > var42) {
                            var42 = var43;
                         }
 
-                        var28 = var84.yOffset;
+                        var28 = var95.yOffset;
                      }
 
-                     var85 = var95.__x_420();
-                     if(var85 != null) {
-                        var25 = var85.subWidth;
-                        var43 = var85.subHeight;
-                        if(var43 > var42) {
+                     var96 = var90.method126();
+                     if (var96 != null) {
+                        var82 = var96.subWidth;
+                        var43 = var96.subHeight;
+                        if (var43 > var42) {
                            var42 = var43;
                         }
 
-                        var29 = var85.yOffset;
+                        var29 = var96.yOffset;
                      }
 
-                     if(var81 != null) {
-                        var30 = var81.__g_417();
-                        if(var30 != null) {
+                     if (var92 != null) {
+                        var30 = var92.method123();
+                        if (var30 != null) {
                            var34 = var30.subWidth;
                            var43 = var30.subHeight;
-                           if(var43 > var42) {
+                           if (var43 > var42) {
                               var42 = var43;
                            }
 
                            var38 = var30.yOffset;
                         }
 
-                        var31 = var81.__l_418();
-                        if(var31 != null) {
+                        var31 = var92.method124();
+                        if (var31 != null) {
                            var35 = var31.subWidth;
                            var43 = var31.subHeight;
-                           if(var43 > var42) {
+                           if (var43 > var42) {
                               var42 = var43;
                            }
 
                            var39 = var31.yOffset;
                         }
 
-                        var32 = var81.__e_419();
-                        if(var32 != null) {
+                        var32 = var92.method125();
+                        if (var32 != null) {
                            var36 = var32.subWidth;
                            var43 = var32.subHeight;
-                           if(var43 > var42) {
+                           if (var43 > var42) {
                               var42 = var43;
                            }
 
                            var40 = var32.yOffset;
                         }
 
-                        var33 = var81.__x_420();
-                        if(var33 != null) {
+                        var33 = var92.method126();
+                        if (var33 != null) {
                            var37 = var33.subWidth;
                            var43 = var33.subHeight;
-                           if(var43 > var42) {
+                           if (var43 > var42) {
                               var42 = var43;
                            }
 
@@ -525,241 +525,239 @@ public class class39 extends class21 {
                         }
                      }
 
-                     Font var86 = var95.getFont();
-                     if(var86 == null) {
-                        var86 = ScriptEvent.fontPlain11;
-                     }
-
-                     Font var44;
-                     if(var81 != null) {
-                        var44 = var81.getFont();
-                        if(var44 == null) {
-                           var44 = ScriptEvent.fontPlain11;
-                        }
-                     } else {
+                     Font var44 = var90.getFont();
+                     if (var44 == null) {
                         var44 = ScriptEvent.fontPlain11;
                      }
 
-                     String var45 = null;
+                     Font var45;
+                     if (var92 != null) {
+                        var45 = var92.getFont();
+                        if (var45 == null) {
+                           var45 = ScriptEvent.fontPlain11;
+                        }
+                     } else {
+                        var45 = ScriptEvent.fontPlain11;
+                     }
+
                      String var46 = null;
-                     boolean var47 = false;
-                     int var48 = 0;
-                     var45 = var95.getString(var0.hitSplatValues[var80]);
-                     int var94 = var86.stringWidth(var45);
-                     if(var81 != null) {
-                        var46 = var81.getString(var0.hitSplatValues2[var80]);
-                        var48 = var44.stringWidth(var46);
-                     }
-
+                     String var47 = null;
+                     boolean var48 = false;
                      int var49 = 0;
-                     int var50 = 0;
-                     if(var23 > 0) {
-                        if(var84 == null && var85 == null) {
-                           var49 = 1;
-                        } else {
-                           var49 = var94 / var23 + 1;
-                        }
-                     }
-
-                     if(var81 != null && var35 > 0) {
-                        if(var32 == null && var33 == null) {
-                           var50 = 1;
-                        } else {
-                           var50 = var48 / var35 + 1;
-                        }
+                     var46 = var90.getString(actor.hitSplatValues[var88]);
+                     int var50 = var44.stringWidth(var46);
+                     if (var92 != null) {
+                        var47 = var92.getString(actor.hitSplatValues2[var88]);
+                        var49 = var45.stringWidth(var47);
                      }
 
                      int var51 = 0;
-                     int var52 = var51;
-                     if(var22 > 0) {
-                        var51 += var22;
+                     int var52 = 0;
+                     if (var15 > 0) {
+                        if (var95 == null && var96 == null) {
+                           var51 = 1;
+                        } else {
+                           var51 = var50 / var15 + 1;
+                        }
                      }
 
-                     var51 += 2;
-                     int var53 = var51;
-                     if(var24 > 0) {
-                        var51 += var24;
+                     if (var92 != null && var35 > 0) {
+                        if (var32 == null && var33 == null) {
+                           var52 = 1;
+                        } else {
+                           var52 = var49 / var35 + 1;
+                        }
                      }
 
-                     int var54 = var51;
-                     int var55 = var51;
-                     int var56;
-                     if(var23 > 0) {
-                        var56 = var23 * var49;
-                        var51 += var56;
-                        var55 += (var56 - var94) / 2;
+                     int var53 = 0;
+                     int var54 = var53;
+                     if (var84 > 0) {
+                        var53 += var84;
+                     }
+
+                     var53 += 2;
+                     int var55 = var53;
+                     if (var80 > 0) {
+                        var53 += var80;
+                     }
+
+                     int var56 = var53;
+                     int var57 = var53;
+                     int var58;
+                     if (var15 > 0) {
+                        var58 = var15 * var51;
+                        var53 += var58;
+                        var57 += (var58 - var50) / 2;
                      } else {
-                        var51 += var94;
+                        var53 += var50;
                      }
 
-                     var56 = var51;
-                     if(var25 > 0) {
-                        var51 += var25;
+                     var58 = var53;
+                     if (var82 > 0) {
+                        var53 += var82;
                      }
 
-                     int var57 = 0;
-                     int var58 = 0;
                      int var59 = 0;
                      int var60 = 0;
                      int var61 = 0;
-                     int var62;
-                     if(var81 != null) {
-                        var51 += 2;
-                        var57 = var51;
-                        if(var34 > 0) {
-                           var51 += var34;
+                     int var62 = 0;
+                     int var63 = 0;
+                     int var64;
+                     if (var92 != null) {
+                        var53 += 2;
+                        var59 = var53;
+                        if (var34 > 0) {
+                           var53 += var34;
                         }
 
-                        var51 += 2;
-                        var58 = var51;
-                        if(var36 > 0) {
-                           var51 += var36;
+                        var53 += 2;
+                        var60 = var53;
+                        if (var36 > 0) {
+                           var53 += var36;
                         }
 
-                        var59 = var51;
-                        var61 = var51;
-                        if(var35 > 0) {
-                           var62 = var35 * var50;
-                           var51 += var62;
-                           var61 += (var62 - var48) / 2;
+                        var61 = var53;
+                        var63 = var53;
+                        if (var35 > 0) {
+                           var64 = var35 * var52;
+                           var53 += var64;
+                           var63 += (var64 - var49) / 2;
                         } else {
-                           var51 += var48;
+                           var53 += var49;
                         }
 
-                        var60 = var51;
-                        if(var37 > 0) {
-                           var51 += var37;
+                        var62 = var53;
+                        if (var37 > 0) {
+                           var53 += var37;
                         }
                      }
 
-                     var62 = var0.hitSplatCycles[var80] - Client.cycle;
-                     int var63 = var95.__t - var62 * var95.__t / var95.__i;
-                     int var64 = var62 * var95.__y / var95.__i + -var95.__y;
-                     int var65 = var63 + (var2 + Client.viewportTempX - (var51 >> 1));
-                     int var66 = var64 + (var3 + Client.viewportTempY - 12);
-                     int var67 = var66;
-                     int var68 = var42 + var66;
-                     int var69 = var66 + var95.__r + 15;
-                     int var70 = var69 - var86.maxAscent;
-                     int var71 = var69 + var86.maxDescent;
-                     if(var70 < var66) {
-                        var67 = var70;
+                     var64 = actor.hitSplatCycles[var88] - Client.cycle;
+                     int var65 = var90.field392 - var64 * var90.field392 / var90.field387;
+                     int var66 = var64 * var90.field393 / var90.field387 + -var90.field393;
+                     int var67 = var65 + (var2 + Client.viewportTempX - (var53 >> 1));
+                     int var68 = var66 + (var3 + Client.viewportTempY - 12);
+                     int var69 = var68;
+                     int var70 = var42 + var68;
+                     int var71 = var68 + var90.field397 + 15;
+                     int var72 = var71 - var44.maxAscent;
+                     int var73 = var71 + var44.maxDescent;
+                     if (var72 < var68) {
+                        var69 = var72;
                      }
 
-                     if(var71 > var68) {
-                        var68 = var71;
+                     if (var73 > var70) {
+                        var70 = var73;
                      }
 
-                     int var72 = 0;
-                     int var73;
-                     int var74;
-                     if(var81 != null) {
-                        var72 = var66 + var81.__r + 15;
-                        var73 = var72 - var44.maxAscent;
-                        var74 = var72 + var44.maxDescent;
-                        if(var73 < var67) {
-                           ;
+                     int var74 = 0;
+                     int var75;
+                     int var76;
+                     if (var92 != null) {
+                        var74 = var68 + var92.field397 + 15;
+                        var75 = var74 - var45.maxAscent;
+                        var76 = var74 + var45.maxDescent;
+                        if (var75 < var69) {
                         }
 
-                        if(var74 > var68) {
-                           ;
+                        if (var76 > var70) {
                         }
                      }
 
-                     var73 = 255;
-                     if(var95.__h >= 0) {
-                        var73 = (var62 << 8) / (var95.__i - var95.__h);
+                     var75 = 255;
+                     if (var90.field394 >= 0) {
+                        var75 = (var64 << 8) / (var90.field387 - var90.field394);
                      }
 
-                     if(var73 >= 0 && var73 < 255) {
-                        if(var82 != null) {
-                           var82.__h_508(var52 + var65 - var26, var66, var73);
+                     if (var75 >= 0 && var75 < 255) {
+                        if (var93 != null) {
+                           var93.method310(var54 + var67 - var26, var68, var75);
                         }
 
-                        if(var84 != null) {
-                           var84.__h_508(var65 + var53 - var28, var66, var73);
+                        if (var95 != null) {
+                           var95.method310(var67 + var55 - var28, var68, var75);
                         }
 
-                        if(var83 != null) {
-                           for(var74 = 0; var74 < var49; ++var74) {
-                              var83.__h_508(var23 * var74 + (var65 + var54 - var27), var66, var73);
+                        if (var94 != null) {
+                           for (var76 = 0; var76 < var51; ++var76) {
+                              var94.method310(var15 * var76 + (var67 + var56 - var27), var68, var75);
                            }
                         }
 
-                        if(var85 != null) {
-                           var85.__h_508(var56 + var65 - var29, var66, var73);
+                        if (var96 != null) {
+                           var96.method310(var58 + var67 - var29, var68, var75);
                         }
 
-                        var86.drawAlpha(var45, var55 + var65, var69, var95.__n, 0, var73);
-                        if(var81 != null) {
-                           if(var30 != null) {
-                              var30.__h_508(var65 + var57 - var38, var66, var73);
+                        var44.drawAlpha(var46, var57 + var67, var71, var90.field386, 0, var75);
+                        if (var92 != null) {
+                           if (var30 != null) {
+                              var30.method310(var67 + var59 - var38, var68, var75);
                            }
 
-                           if(var32 != null) {
-                              var32.__h_508(var65 + var58 - var40, var66, var73);
+                           if (var32 != null) {
+                              var32.method310(var67 + var60 - var40, var68, var75);
                            }
 
-                           if(var31 != null) {
-                              for(var74 = 0; var74 < var50; ++var74) {
-                                 var31.__h_508(var74 * var35 + (var59 + var65 - var39), var66, var73);
+                           if (var31 != null) {
+                              for (var76 = 0; var76 < var52; ++var76) {
+                                 var31.method310(var76 * var35 + (var61 + var67 - var39), var68, var75);
                               }
                            }
 
-                           if(var33 != null) {
-                              var33.__h_508(var60 + var65 - var41, var66, var73);
+                           if (var33 != null) {
+                              var33.method310(var62 + var67 - var41, var68, var75);
                            }
 
-                           var44.drawAlpha(var46, var61 + var65, var72, var81.__n, 0, var73);
+                           var45.drawAlpha(var47, var63 + var67, var74, var92.field386, 0, var75);
                         }
                      } else {
-                        if(var82 != null) {
-                           var82.drawAt2(var52 + var65 - var26, var66);
+                        if (var93 != null) {
+                           var93.drawAt2(var54 + var67 - var26, var68);
                         }
 
-                        if(var84 != null) {
-                           var84.drawAt2(var65 + var53 - var28, var66);
+                        if (var95 != null) {
+                           var95.drawAt2(var67 + var55 - var28, var68);
                         }
 
-                        if(var83 != null) {
-                           for(var74 = 0; var74 < var49; ++var74) {
-                              var83.drawAt2(var23 * var74 + (var54 + var65 - var27), var66);
+                        if (var94 != null) {
+                           for (var76 = 0; var76 < var51; ++var76) {
+                              var94.drawAt2(var15 * var76 + (var56 + var67 - var27), var68);
                            }
                         }
 
-                        if(var85 != null) {
-                           var85.drawAt2(var56 + var65 - var29, var66);
+                        if (var96 != null) {
+                           var96.drawAt2(var58 + var67 - var29, var68);
                         }
 
-                        var86.draw(var45, var55 + var65, var69, var95.__n | -16777216, 0);
-                        if(var81 != null) {
-                           if(var30 != null) {
-                              var30.drawAt2(var65 + var57 - var38, var66);
+                        var44.draw(var46, var57 + var67, var71, var90.field386 | -16777216, 0);
+                        if (var92 != null) {
+                           if (var30 != null) {
+                              var30.drawAt2(var67 + var59 - var38, var68);
                            }
 
-                           if(var32 != null) {
-                              var32.drawAt2(var58 + var65 - var40, var66);
+                           if (var32 != null) {
+                              var32.drawAt2(var60 + var67 - var40, var68);
                            }
 
-                           if(var31 != null) {
-                              for(var74 = 0; var74 < var50; ++var74) {
-                                 var31.drawAt2(var74 * var35 + (var65 + var59 - var39), var66);
+                           if (var31 != null) {
+                              for (var76 = 0; var76 < var52; ++var76) {
+                                 var31.drawAt2(var76 * var35 + (var67 + var61 - var39), var68);
                               }
                            }
 
-                           if(var33 != null) {
-                              var33.drawAt2(var60 + var65 - var41, var66);
+                           if (var33 != null) {
+                              var33.drawAt2(var62 + var67 - var41, var68);
                            }
 
-                           var44.draw(var46, var61 + var65, var72, var81.__n | -16777216, 0);
+                           var45.draw(var47, var63 + var67, var74, var92.field386 | -16777216, 0);
                         }
                      }
                   }
                }
             }
          }
-
       }
+
    }
 
    @ObfuscatedName("hv")
@@ -769,34 +767,33 @@ public class class39 extends class21 {
    )
    @Export("drawMenuActionTextAt")
    static final void drawMenuActionTextAt(int var0, int var1) {
-      if(Client.menuOptionsCount >= 2 || Client.isItemSelected != 0 || Client.isSpellSelected) {
-         if(Client.showMouseOverText) {
-            int var2 = Client.menuOptionsCount - 1;
+      if ((Client.menuOptionsCount >= 2 || Client.isItemSelected != 0 || Client.isSpellSelected) && Client.showMouseOverText) {
+         int var2 = Client.menuOptionsCount - 1;
+         String var3;
+         if (Client.isItemSelected == 1 && Client.menuOptionsCount < 2) {
+            var3 = "Use " + Client.selectedItemName + " ->";
+         } else if (Client.isSpellSelected && Client.menuOptionsCount < 2) {
+            var3 = Client.selectedSpellActionName + " " + Client.selectedSpellName + " ->";
+         } else {
             String var4;
-            if(Client.isItemSelected == 1 && Client.menuOptionsCount < 2) {
-               var4 = "Use" + " " + Client.selectedItemName + " " + "->";
-            } else if(Client.isSpellSelected && Client.menuOptionsCount < 2) {
-               var4 = Client.selectedSpellActionName + " " + Client.selectedSpellName + " " + "->";
+            if (var2 < 0) {
+               var4 = "";
+            } else if (Client.menuTargetNames[var2].length() > 0) {
+               var4 = Client.menuActions[var2] + " " + Client.menuTargetNames[var2];
             } else {
-               String var5;
-               if(var2 < 0) {
-                  var5 = "";
-               } else if(Client.menuTargetNames[var2].length() > 0) {
-                  var5 = Client.menuActions[var2] + " " + Client.menuTargetNames[var2];
-               } else {
-                  var5 = Client.menuActions[var2];
-               }
-
-               var4 = var5;
+               var4 = Client.menuActions[var2];
             }
 
-            if(Client.menuOptionsCount > 2) {
-               var4 = var4 + BufferedFile.colorStartTag(0xffffff) + " " + '/' + " " + (Client.menuOptionsCount - 2) + " more options";
-            }
-
-            class2.fontBold12.drawRandomAlphaAndSpacing(var4, var0 + 4, var1 + 15, 0xffffff, 0, Client.cycle / 1000);
+            var3 = var4;
          }
+
+         if (Client.menuOptionsCount > 2) {
+            var3 = var3 + BufferedFile.colorStartTag(16777215) + " " + '/' + " " + (Client.menuOptionsCount - 2) + " more options";
+         }
+
+         class2.fontBold12.drawRandomAlphaAndSpacing(var3, var0 + 4, var1 + 15, 16777215, 0, Client.cycle / 1000);
       }
+
    }
 
    @ObfuscatedName("ib")
@@ -806,23 +803,22 @@ public class class39 extends class21 {
    )
    @Export("revalidateWidgetScroll")
    static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) {
-      int var3 = var1.scrollWidth != 0?var1.scrollWidth:var1.width;
-      int var4 = var1.scrollHeight != 0?var1.scrollHeight:var1.height;
+      int var3 = var1.scrollWidth != 0 ? var1.scrollWidth : var1.width;
+      int var4 = var1.scrollHeight != 0 ? var1.scrollHeight : var1.height;
       WorldMapRegion.notRevalidateWidgetScroll(var0, var1.id, var3, var4, var2);
-      if(var1.children != null) {
+      if (var1.children != null) {
          WorldMapRegion.notRevalidateWidgetScroll(var1.children, var1.id, var3, var4, var2);
       }
 
-      WidgetGroupParent var5 = (WidgetGroupParent)Client.widgetGroupParents.get((long)var1.id);
-      if(var5 != null) {
+      InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id);
+      if (var5 != null) {
          int var6 = var5.group;
-         if(GroundItemPile.loadWidgetGroup(var6)) {
-            WorldMapRegion.notRevalidateWidgetScroll(Widget.widgets[var6], -1, var3, var4, var2);
+         if (GroundItemPile.loadInterface(var6)) {
+            WorldMapRegion.notRevalidateWidgetScroll(Widget.interfaceComponents[var6], -1, var3, var4, var2);
          }
       }
 
-      if(var1.contentType == 1337) {
-         ;
+      if (var1.contentType == 1337) {
       }
 
    }
diff --git a/runescape-client/src/main/java/class4.java b/runescape-client/src/main/java/class4.java
index bdc7d67388..85b1bbb8a8 100644
--- a/runescape-client/src/main/java/class4.java
+++ b/runescape-client/src/main/java/class4.java
@@ -1,6 +1,7 @@
 import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
+import net.runelite.rs.ScriptOpcodes;
 
 @ObfuscatedName("o")
 final class class4 implements class0 {
@@ -8,7 +9,8 @@ final class class4 implements class0 {
    @ObfuscatedSignature(
       signature = "Lir;"
    )
-   public static AbstractIndexCache __o_m;
+   @Export("InvDefinition_archive")
+   public static AbstractArchive InvDefinition_archive;
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
@@ -43,7 +45,7 @@ final class class4 implements class0 {
       garbageValue = "253581236"
    )
    public static ClientParameter[] method47() {
-      return new ClientParameter[]{ClientParameter.__ji_e, ClientParameter.__ji_m, ClientParameter.__ji_g, ClientParameter.__ji_d, ClientParameter.__ji_u, ClientParameter.__ji_o, ClientParameter.__ji_k, ClientParameter.__ji_j, ClientParameter.__ji_q, ClientParameter.__ji_z, ClientParameter.__ji_n, ClientParameter.__ji_a, ClientParameter.__ji_t, ClientParameter.__ji_w, ClientParameter.__ji_i, ClientParameter.__ji_s, ClientParameter.__ji_x, ClientParameter.__ji_f, ClientParameter.__ji_l};
+      return new ClientParameter[]{ClientParameter.field330, ClientParameter.field322, ClientParameter.field328, ClientParameter.field332, ClientParameter.field327, ClientParameter.field326, ClientParameter.field333, ClientParameter.field338, ClientParameter.field324, ClientParameter.field337, ClientParameter.field334, ClientParameter.field336, ClientParameter.field340, ClientParameter.field325, ClientParameter.field335, ClientParameter.field339, ClientParameter.field331, ClientParameter.field323, ClientParameter.field329};
    }
 
    @ObfuscatedName("u")
@@ -52,7 +54,7 @@ final class class4 implements class0 {
       garbageValue = "-843046456"
    )
    public static void method55() {
-      OverlayDefinition.__jf_f.clear();
+      FloorOverlayDefinition.FloorOverlayDefinition_cached.clear();
    }
 
    @ObfuscatedName("v")
@@ -62,266 +64,264 @@ final class class4 implements class0 {
    )
    static int method54(int var0, Script var1, boolean var2) {
       String var3;
-      if(var0 == 3100) {
+      if (var0 == ScriptOpcodes.MES) {
          var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-         WorldMapIcon1.method219(0, "", var3);
+         WorldMapIcon1.addGameMessage(0, "", var3);
          return 1;
-      } else if(var0 == 3101) {
+      } else if (var0 == ScriptOpcodes.ANIM) {
          RouteStrategy.Interpreter_intStackSize -= 2;
-         class234.method4534(Canvas.localPlayer, Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize], Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]);
+         class234.performPlayerAnimation(Canvas.localPlayer, Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize], Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]);
          return 1;
-      } else if(var0 == 3103) {
-         if(!Interpreter.__bv_t) {
-            Interpreter.__bv_s = true;
+      } else if (var0 == ScriptOpcodes.IF_CLOSE) {
+         if (!Interpreter.field424) {
+            Interpreter.field423 = true;
          }
 
          return 1;
       } else {
-         int var10;
-         if(var0 == 3104) {
+         int var4;
+         PacketBufferNode var5;
+         if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) {
             var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-            var10 = 0;
-            if(UserComparator4.method3336(var3)) {
-               var10 = MouseHandler.method1085(var3);
+            var4 = 0;
+            if (UserComparator4.method3336(var3)) {
+               var4 = MouseHandler.method1085(var3);
             }
 
-            PacketBufferNode var12 = Interpreter.method1915(ClientPacket.__gs_s, Client.packetWriter.isaacCipher);
-            var12.packetBuffer.writeInt(var10);
-            Client.packetWriter.__q_167(var12);
+            var5 = Interpreter.method1915(ClientPacket.field239, Client.packetWriter.isaacCipher);
+            var5.packetBuffer.writeInt(var4);
+            Client.packetWriter.method241(var5);
+            return 1;
+         } else if (var0 == ScriptOpcodes.RESUME_NAMEDIALOG) {
+            var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+            var5 = Interpreter.method1915(ClientPacket.field317, Client.packetWriter.isaacCipher);
+            var5.packetBuffer.writeByte(var3.length() + 1);
+            var5.packetBuffer.writeStringCp1252NullTerminated(var3);
+            Client.packetWriter.method241(var5);
+            return 1;
+         } else if (var0 == ScriptOpcodes.RESUME_STRINGDIALOG) {
+            var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+            var5 = Interpreter.method1915(ClientPacket.field230, Client.packetWriter.isaacCipher);
+            var5.packetBuffer.writeByte(var3.length() + 1);
+            var5.packetBuffer.writeStringCp1252NullTerminated(var3);
+            Client.packetWriter.method241(var5);
             return 1;
          } else {
-            PacketBufferNode var14;
-            if(var0 == 3105) {
-               var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-               var14 = Interpreter.method1915(ClientPacket.__gs_cl, Client.packetWriter.isaacCipher);
-               var14.packetBuffer.writeByte(var3.length() + 1);
-               var14.packetBuffer.writeStringCp1252NullTerminated(var3);
-               Client.packetWriter.__q_167(var14);
+            String var6;
+            int var7;
+            if (var0 == ScriptOpcodes.OPPLAYER) {
+               var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+               var6 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
+               WorldMapSection0.method583(var7, var6);
                return 1;
-            } else if(var0 == 3106) {
-               var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-               var14 = Interpreter.method1915(ClientPacket.__gs_e, Client.packetWriter.isaacCipher);
-               var14.packetBuffer.writeByte(var3.length() + 1);
-               var14.packetBuffer.writeStringCp1252NullTerminated(var3);
-               Client.packetWriter.__q_167(var14);
+            } else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) {
+               RouteStrategy.Interpreter_intStackSize -= 3;
+               var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
+               var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
+               int var13 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
+               Widget var11 = Huffman.getWidget(var13);
+               Players.clickWidget(var11, var7, var4);
+               return 1;
+            } else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) {
+               RouteStrategy.Interpreter_intStackSize -= 2;
+               var7 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
+               var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
+               Widget var12 = var2 ? WorldMapIcon1.field1030 : GrandExchangeOfferAgeComparator.field1111;
+               Players.clickWidget(var12, var7, var4);
+               return 1;
+            } else if (var0 == ScriptOpcodes.MOUSECAM) {
+               AbstractRasterProvider.mouseCam = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+               return 1;
+            } else if (var0 == ScriptOpcodes.GETREMOVEROOFS) {
+               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.roofsHidden ? 1 : 0;
+               return 1;
+            } else if (var0 == ScriptOpcodes.SETREMOVEROOFS) {
+               ReflectionCheck.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+               WorldMapSection3.savePreferences();
                return 1;
             } else {
-               String var7;
-               int var15;
-               if(var0 == 3107) {
-                  var15 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                  var7 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-                  WorldMapSection2.method583(var15, var7);
-                  return 1;
-               } else if(var0 == 3108) {
-                  RouteStrategy.Interpreter_intStackSize -= 3;
-                  var15 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-                  var10 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-                  int var9 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 2];
-                  Widget var13 = Huffman.getWidget(var9);
-                  Players.clickWidget(var13, var15, var10);
-                  return 1;
-               } else if(var0 == 3109) {
-                  RouteStrategy.Interpreter_intStackSize -= 2;
-                  var15 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-                  var10 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
-                  Widget var11 = var2?WorldMapIcon1.__t_i:class12.__n_n;
-                  Players.clickWidget(var11, var15, var10);
-                  return 1;
-               } else if(var0 == 3110) {
-                  AbstractRasterProvider.mouseCam = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                  return 1;
-               } else if(var0 == 3111) {
-                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.roofsHidden?1:0;
-                  return 1;
-               } else if(var0 == 3112) {
-                  ReflectionCheck.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                  WorldMapSection0.savePreferences();
-                  return 1;
-               } else if(var0 == 3113) {
+               boolean var8;
+               if (var0 == ScriptOpcodes.OPENURL) {
                   var3 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
-                  boolean var4 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                  WorldMapCacheName.method635(var3, var4, false);
+                  var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                  WorldMapCacheName.openURL(var3, var8, false);
                   return 1;
-               } else if(var0 == 3115) {
-                  var15 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                  var14 = Interpreter.method1915(ClientPacket.__gs_as, Client.packetWriter.isaacCipher);
-                  var14.packetBuffer.writeShort(var15);
-                  Client.packetWriter.__q_167(var14);
+               } else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) {
+                  var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+                  var5 = Interpreter.method1915(ClientPacket.field264, Client.packetWriter.isaacCipher);
+                  var5.packetBuffer.writeShort(var7);
+                  Client.packetWriter.method241(var5);
                   return 1;
-               } else if(var0 == 3116) {
-                  var15 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+               } else if (var0 == ScriptOpcodes.BUG_REPORT) {
+                  var7 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
                   Interpreter.Interpreter_stringStackSize -= 2;
-                  var7 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize];
-                  String var5 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
-                  if(var7.length() > 500) {
+                  var6 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize];
+                  String var9 = Interpreter.Interpreter_stringStack[Interpreter.Interpreter_stringStackSize + 1];
+                  if (var6.length() > 500) {
                      return 1;
-                  } else if(var5.length() > 500) {
+                  } else if (var9.length() > 500) {
                      return 1;
                   } else {
-                     PacketBufferNode var6 = Interpreter.method1915(ClientPacket.__gs_j, Client.packetWriter.isaacCipher);
-                     var6.packetBuffer.writeShort(1 + WorldMapRegion.method550(var7) + WorldMapRegion.method550(var5));
-                     var6.packetBuffer.writeStringCp1252NullTerminated(var7);
-                     var6.packetBuffer.writeByte(var15);
-                     var6.packetBuffer.writeStringCp1252NullTerminated(var5);
-                     Client.packetWriter.__q_167(var6);
+                     PacketBufferNode var10 = Interpreter.method1915(ClientPacket.field238, Client.packetWriter.isaacCipher);
+                     var10.packetBuffer.writeShort(1 + WorldMapRegion.stringCp1252NullTerminatedByteSize(var6) + WorldMapRegion.stringCp1252NullTerminatedByteSize(var9));
+                     var10.packetBuffer.writeStringCp1252NullTerminated(var6);
+                     var10.packetBuffer.writeByte(var7);
+                     var10.packetBuffer.writeStringCp1252NullTerminated(var9);
+                     Client.packetWriter.method241(var10);
                      return 1;
                   }
-               } else if(var0 == 3117) {
+               } else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) {
                   Client.shiftClickDrop = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
                   return 1;
-               } else if(var0 == 3118) {
+               } else if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) {
                   Client.showMouseOverText = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
                   return 1;
-               } else if(var0 == 3119) {
+               } else if (var0 == ScriptOpcodes.RENDERSELF) {
                   Client.renderSelf = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
                   return 1;
-               } else if(var0 == 3120) {
-                  if(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1) {
-                     Client.__client_ke |= 1;
+               } else if (var0 == 3120) {
+                  if (Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1) {
+                     Client.field210 |= 1;
                   } else {
-                     Client.__client_ke &= -2;
+                     Client.field210 &= -2;
                   }
 
                   return 1;
-               } else if(var0 == 3121) {
-                  if(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1) {
-                     Client.__client_ke |= 2;
+               } else if (var0 == 3121) {
+                  if (Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1) {
+                     Client.field210 |= 2;
                   } else {
-                     Client.__client_ke &= -3;
+                     Client.field210 &= -3;
                   }
 
                   return 1;
-               } else if(var0 == 3122) {
-                  if(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1) {
-                     Client.__client_ke |= 4;
+               } else if (var0 == 3122) {
+                  if (Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1) {
+                     Client.field210 |= 4;
                   } else {
-                     Client.__client_ke &= -5;
+                     Client.field210 &= -5;
                   }
 
                   return 1;
-               } else if(var0 == 3123) {
-                  if(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1) {
-                     Client.__client_ke |= 8;
+               } else if (var0 == 3123) {
+                  if (Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1) {
+                     Client.field210 |= 8;
                   } else {
-                     Client.__client_ke &= -9;
+                     Client.field210 &= -9;
                   }
 
                   return 1;
-               } else if(var0 == 3124) {
-                  Client.__client_ke = 0;
+               } else if (var0 == 3124) {
+                  Client.field210 = 0;
                   return 1;
-               } else if(var0 == 3125) {
+               } else if (var0 == ScriptOpcodes.SETSHOWMOUSECROSS) {
                   Client.showMouseCross = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
                   return 1;
-               } else if(var0 == 3126) {
+               } else if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) {
                   Client.showLoadingMessages = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
                   return 1;
-               } else if(var0 == 3127) {
-                  WorldMapAreaData.method705(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1);
+               } else if (var0 == ScriptOpcodes.SETTAPTODROP) {
+                  WorldMapAreaData.setTapToDrop(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1);
                   return 1;
-               } else if(var0 == 3128) {
-                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class206.method4028()?1:0;
+               } else if (var0 == ScriptOpcodes.GETTAPTODROP) {
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class206.getTapToDrop() ? 1 : 0;
                   return 1;
-               } else if(var0 == 3129) {
+               } else if (var0 == ScriptOpcodes.SETOCULUSORBSPEED) {
                   RouteStrategy.Interpreter_intStackSize -= 2;
                   Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-                  Client.__client_in = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
+                  Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1];
                   return 1;
-               } else if(var0 == 3130) {
+               } else if (var0 == 3130) {
                   RouteStrategy.Interpreter_intStackSize -= 2;
                   return 1;
-               } else if(var0 == 3131) {
+               } else if (var0 == 3131) {
                   --RouteStrategy.Interpreter_intStackSize;
                   return 1;
-               } else if(var0 == 3132) {
+               } else if (var0 == ScriptOpcodes.GETCANVASSIZE) {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = SoundCache.canvasWidth;
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Huffman.canvasHeight;
                   return 1;
-               } else if(var0 == 3133) {
+               } else if (var0 == 3133) {
                   --RouteStrategy.Interpreter_intStackSize;
                   return 1;
-               } else if(var0 == 3134) {
+               } else if (var0 == 3134) {
                   return 1;
-               } else if(var0 == 3135) {
+               } else if (var0 == 3135) {
                   RouteStrategy.Interpreter_intStackSize -= 2;
                   return 1;
-               } else if(var0 == 3136) {
-                  Client.__client_mf = 3;
-                  Client.__client_ms = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+               } else if (var0 == 3136) {
+                  Client.field151 = 3;
+                  Client.field153 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
                   return 1;
-               } else if(var0 == 3137) {
-                  Client.__client_mf = 2;
-                  Client.__client_ms = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
+               } else if (var0 == 3137) {
+                  Client.field151 = 2;
+                  Client.field153 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
                   return 1;
-               } else if(var0 == 3138) {
-                  Client.__client_mf = 0;
+               } else if (var0 == 3138) {
+                  Client.field151 = 0;
                   return 1;
-               } else if(var0 == 3139) {
-                  Client.__client_mf = 1;
+               } else if (var0 == 3139) {
+                  Client.field151 = 1;
                   return 1;
-               } else if(var0 == 3140) {
-                  Client.__client_mf = 3;
-                  Client.__client_ms = var2?WorldMapIcon1.__t_i.id:class12.__n_n.id;
+               } else if (var0 == 3140) {
+                  Client.field151 = 3;
+                  Client.field153 = var2 ? WorldMapIcon1.field1030.id : GrandExchangeOfferAgeComparator.field1111.id;
+                  return 1;
+               } else if (var0 == ScriptOpcodes.SETHIDEUSERNAME) {
+                  var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                  ReflectionCheck.clientPreferences.hideUsername = var8;
+                  WorldMapSection3.savePreferences();
+                  return 1;
+               } else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) {
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.hideUsername ? 1 : 0;
+                  return 1;
+               } else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) {
+                  var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                  Client.Login_isUsernameRemembered = var8;
+                  if (!var8) {
+                     ReflectionCheck.clientPreferences.rememberedUsername = "";
+                     WorldMapSection3.savePreferences();
+                  }
+
+                  return 1;
+               } else if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) {
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0;
+                  return 1;
+               } else if (var0 == 3145) {
+                  return 1;
+               } else if (var0 == ScriptOpcodes.SETTITLEMUSICENABLED) {
+                  var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                  if (var8 == ReflectionCheck.clientPreferences.titleMusicDisabled) {
+                     ReflectionCheck.clientPreferences.titleMusicDisabled = !var8;
+                     WorldMapSection3.savePreferences();
+                  }
+
+                  return 1;
+               } else if (var0 == ScriptOpcodes.GETTITLEMUSICENABLED) {
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.titleMusicDisabled ? 0 : 1;
+                  return 1;
+               } else if (var0 == 3148) {
+                  return 1;
+               } else if (var0 == 3149) {
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
+                  return 1;
+               } else if (var0 == 3150) {
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
+                  return 1;
+               } else if (var0 == 3151) {
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
+                  return 1;
+               } else if (var0 == 3152) {
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
+                  return 1;
+               } else if (var0 == 3153) {
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Login.Login_loadingPercent;
+                  return 1;
+               } else if (var0 == 3154) {
+                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = GrandExchangeOffer.method101();
                   return 1;
                } else {
-                  boolean var8;
-                  if(var0 == 3141) {
-                     var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     ReflectionCheck.clientPreferences.hideUsername = var8;
-                     WorldMapSection0.savePreferences();
-                     return 1;
-                  } else if(var0 == 3142) {
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.hideUsername?1:0;
-                     return 1;
-                  } else if(var0 == 3143) {
-                     var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     Client.Login_isUsernameRemembered = var8;
-                     if(!var8) {
-                        ReflectionCheck.clientPreferences.rememberedUsername = "";
-                        WorldMapSection0.savePreferences();
-                     }
-
-                     return 1;
-                  } else if(var0 == 3144) {
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered?1:0;
-                     return 1;
-                  } else if(var0 == 3145) {
-                     return 1;
-                  } else if(var0 == 3146) {
-                     var8 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                     if(var8 == ReflectionCheck.clientPreferences.titleMusicDisabled) {
-                        ReflectionCheck.clientPreferences.titleMusicDisabled = !var8;
-                        WorldMapSection0.savePreferences();
-                     }
-
-                     return 1;
-                  } else if(var0 == 3147) {
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = ReflectionCheck.clientPreferences.titleMusicDisabled?0:1;
-                     return 1;
-                  } else if(var0 == 3148) {
-                     return 1;
-                  } else if(var0 == 3149) {
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
-                     return 1;
-                  } else if(var0 == 3150) {
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
-                     return 1;
-                  } else if(var0 == 3151) {
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
-                     return 1;
-                  } else if(var0 == 3152) {
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
-                     return 1;
-                  } else if(var0 == 3153) {
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = Login.Login_loadingPercent;
-                     return 1;
-                  } else if(var0 == 3154) {
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = GrandExchangeOffer.method101();
-                     return 1;
-                  } else {
-                     return 2;
-                  }
+                  return 2;
                }
             }
          }
diff --git a/runescape-client/src/main/java/class40.java b/runescape-client/src/main/java/class40.java
index ad1e35f2a5..1a197bd508 100644
--- a/runescape-client/src/main/java/class40.java
+++ b/runescape-client/src/main/java/class40.java
@@ -9,8 +9,8 @@ public class class40 {
    @ObfuscatedSignature(
       signature = "Lit;"
    )
-   @Export("indexCache7")
-   static IndexCache indexCache7;
+   @Export("archive7")
+   static Archive archive7;
    @ObfuscatedName("gs")
    @Export("regionLandArchives")
    static byte[][] regionLandArchives;
@@ -31,12 +31,13 @@ public class class40 {
       signature = "(IIIIIIIIB)V",
       garbageValue = "125"
    )
-   void method743(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
-      if(var7 != 0 && this.field326 != 0 && this.field329 != null) {
+   void method743(int x, int y, int var3, int var4, int width, int height, int var7, int var8) {
+      if (var7 != 0 && this.field326 != 0 && this.field329 != null) {
          var8 = this.method744(var8, var7);
          var7 = this.method774(var7);
-         Rasterizer2D.raster2d7(var1, var2, var5, var6, var3, var4, this.field329[var7 - 1][var8], this.field326);
+         Rasterizer2D.raster2d7(x, y, width, height, var3, var4, this.field329[var7 - 1][var8], this.field326);
       }
+
    }
 
    @ObfuscatedName("f")
@@ -45,15 +46,15 @@ public class class40 {
       garbageValue = "-203451964"
    )
    int method744(int var1, int var2) {
-      if(var2 == 9) {
+      if (var2 == 9) {
          var1 = var1 + 1 & 3;
       }
 
-      if(var2 == 10) {
+      if (var2 == 10) {
          var1 = var1 + 3 & 3;
       }
 
-      if(var2 == 11) {
+      if (var2 == 11) {
          var1 = var1 + 3 & 3;
       }
 
@@ -66,7 +67,7 @@ public class class40 {
       garbageValue = "-63"
    )
    int method774(int var1) {
-      return var1 != 9 && var1 != 10?(var1 == 11?8:var1):1;
+      return var1 != 9 && var1 != 10 ? (var1 == 11 ? 8 : var1) : 1;
    }
 
    @ObfuscatedName("w")
@@ -75,7 +76,7 @@ public class class40 {
       garbageValue = "1551779144"
    )
    void method763() {
-      if(this.field329 == null) {
+      if (this.field329 == null) {
          this.field329 = new byte[8][4][];
          this.method745();
          this.method748();
@@ -86,6 +87,7 @@ public class class40 {
          this.method753();
          this.method754();
       }
+
    }
 
    @ObfuscatedName("o")
@@ -99,9 +101,9 @@ public class class40 {
 
       int var3;
       int var4;
-      for(var3 = 0; var3 < this.field326; ++var3) {
-         for(var4 = 0; var4 < this.field326; ++var4) {
-            if(var4 <= var3) {
+      for (var3 = 0; var3 < this.field326; ++var3) {
+         for (var4 = 0; var4 < this.field326; ++var4) {
+            if (var4 <= var3) {
                var1[var2] = -1;
             }
 
@@ -113,9 +115,9 @@ public class class40 {
       var1 = new byte[this.field326 * this.field326];
       var2 = 0;
 
-      for(var3 = this.field326 - 1; var3 >= 0; --var3) {
-         for(var4 = 0; var4 < this.field326; ++var4) {
-            if(var4 <= var3) {
+      for (var3 = this.field326 - 1; var3 >= 0; --var3) {
+         for (var4 = 0; var4 < this.field326; ++var4) {
+            if (var4 <= var3) {
                var1[var2] = -1;
             }
 
@@ -127,9 +129,9 @@ public class class40 {
       var1 = new byte[this.field326 * this.field326];
       var2 = 0;
 
-      for(var3 = 0; var3 < this.field326; ++var3) {
-         for(var4 = 0; var4 < this.field326; ++var4) {
-            if(var4 >= var3) {
+      for (var3 = 0; var3 < this.field326; ++var3) {
+         for (var4 = 0; var4 < this.field326; ++var4) {
+            if (var4 >= var3) {
                var1[var2] = -1;
             }
 
@@ -141,9 +143,9 @@ public class class40 {
       var1 = new byte[this.field326 * this.field326];
       var2 = 0;
 
-      for(var3 = this.field326 - 1; var3 >= 0; --var3) {
-         for(var4 = 0; var4 < this.field326; ++var4) {
-            if(var4 >= var3) {
+      for (var3 = this.field326 - 1; var3 >= 0; --var3) {
+         for (var4 = 0; var4 < this.field326; ++var4) {
+            if (var4 >= var3) {
                var1[var2] = -1;
             }
 
@@ -165,9 +167,9 @@ public class class40 {
 
       int var3;
       int var4;
-      for(var3 = this.field326 - 1; var3 >= 0; --var3) {
-         for(var4 = 0; var4 < this.field326; ++var4) {
-            if(var4 <= var3 >> 1) {
+      for (var3 = this.field326 - 1; var3 >= 0; --var3) {
+         for (var4 = 0; var4 < this.field326; ++var4) {
+            if (var4 <= var3 >> 1) {
                var1[var2] = -1;
             }
 
@@ -179,10 +181,10 @@ public class class40 {
       var1 = new byte[this.field326 * this.field326];
       var2 = 0;
 
-      for(var3 = 0; var3 < this.field326; ++var3) {
-         for(var4 = 0; var4 < this.field326; ++var4) {
-            if(var2 >= 0 && var2 < var1.length) {
-               if(var4 >= var3 << 1) {
+      for (var3 = 0; var3 < this.field326; ++var3) {
+         for (var4 = 0; var4 < this.field326; ++var4) {
+            if (var2 >= 0 && var2 < var1.length) {
+               if (var4 >= var3 << 1) {
                   var1[var2] = -1;
                }
 
@@ -197,9 +199,9 @@ public class class40 {
       var1 = new byte[this.field326 * this.field326];
       var2 = 0;
 
-      for(var3 = 0; var3 < this.field326; ++var3) {
-         for(var4 = this.field326 - 1; var4 >= 0; --var4) {
-            if(var4 <= var3 >> 1) {
+      for (var3 = 0; var3 < this.field326; ++var3) {
+         for (var4 = this.field326 - 1; var4 >= 0; --var4) {
+            if (var4 <= var3 >> 1) {
                var1[var2] = -1;
             }
 
@@ -211,9 +213,9 @@ public class class40 {
       var1 = new byte[this.field326 * this.field326];
       var2 = 0;
 
-      for(var3 = this.field326 - 1; var3 >= 0; --var3) {
-         for(var4 = this.field326 - 1; var4 >= 0; --var4) {
-            if(var4 >= var3 << 1) {
+      for (var3 = this.field326 - 1; var3 >= 0; --var3) {
+         for (var4 = this.field326 - 1; var4 >= 0; --var4) {
+            if (var4 >= var3 << 1) {
                var1[var2] = -1;
             }
 
@@ -235,9 +237,9 @@ public class class40 {
 
       int var3;
       int var4;
-      for(var3 = this.field326 - 1; var3 >= 0; --var3) {
-         for(var4 = this.field326 - 1; var4 >= 0; --var4) {
-            if(var4 <= var3 >> 1) {
+      for (var3 = this.field326 - 1; var3 >= 0; --var3) {
+         for (var4 = this.field326 - 1; var4 >= 0; --var4) {
+            if (var4 <= var3 >> 1) {
                var1[var2] = -1;
             }
 
@@ -249,9 +251,9 @@ public class class40 {
       var1 = new byte[this.field326 * this.field326];
       var2 = 0;
 
-      for(var3 = this.field326 - 1; var3 >= 0; --var3) {
-         for(var4 = 0; var4 < this.field326; ++var4) {
-            if(var4 >= var3 << 1) {
+      for (var3 = this.field326 - 1; var3 >= 0; --var3) {
+         for (var4 = 0; var4 < this.field326; ++var4) {
+            if (var4 >= var3 << 1) {
                var1[var2] = -1;
             }
 
@@ -263,9 +265,9 @@ public class class40 {
       var1 = new byte[this.field326 * this.field326];
       var2 = 0;
 
-      for(var3 = 0; var3 < this.field326; ++var3) {
-         for(var4 = 0; var4 < this.field326; ++var4) {
-            if(var4 <= var3 >> 1) {
+      for (var3 = 0; var3 < this.field326; ++var3) {
+         for (var4 = 0; var4 < this.field326; ++var4) {
+            if (var4 <= var3 >> 1) {
                var1[var2] = -1;
             }
 
@@ -277,9 +279,9 @@ public class class40 {
       var1 = new byte[this.field326 * this.field326];
       var2 = 0;
 
-      for(var3 = 0; var3 < this.field326; ++var3) {
-         for(var4 = this.field326 - 1; var4 >= 0; --var4) {
-            if(var4 >= var3 << 1) {
+      for (var3 = 0; var3 < this.field326; ++var3) {
+         for (var4 = this.field326 - 1; var4 >= 0; --var4) {
+            if (var4 >= var3 << 1) {
                var1[var2] = -1;
             }
 
@@ -301,9 +303,9 @@ public class class40 {
 
       int var3;
       int var4;
-      for(var3 = this.field326 - 1; var3 >= 0; --var3) {
-         for(var4 = 0; var4 < this.field326; ++var4) {
-            if(var4 >= var3 >> 1) {
+      for (var3 = this.field326 - 1; var3 >= 0; --var3) {
+         for (var4 = 0; var4 < this.field326; ++var4) {
+            if (var4 >= var3 >> 1) {
                var1[var2] = -1;
             }
 
@@ -315,9 +317,9 @@ public class class40 {
       var1 = new byte[this.field326 * this.field326];
       var2 = 0;
 
-      for(var3 = 0; var3 < this.field326; ++var3) {
-         for(var4 = 0; var4 < this.field326; ++var4) {
-            if(var4 <= var3 << 1) {
+      for (var3 = 0; var3 < this.field326; ++var3) {
+         for (var4 = 0; var4 < this.field326; ++var4) {
+            if (var4 <= var3 << 1) {
                var1[var2] = -1;
             }
 
@@ -329,9 +331,9 @@ public class class40 {
       var1 = new byte[this.field326 * this.field326];
       var2 = 0;
 
-      for(var3 = 0; var3 < this.field326; ++var3) {
-         for(var4 = this.field326 - 1; var4 >= 0; --var4) {
-            if(var4 >= var3 >> 1) {
+      for (var3 = 0; var3 < this.field326; ++var3) {
+         for (var4 = this.field326 - 1; var4 >= 0; --var4) {
+            if (var4 >= var3 >> 1) {
                var1[var2] = -1;
             }
 
@@ -343,9 +345,9 @@ public class class40 {
       var1 = new byte[this.field326 * this.field326];
       var2 = 0;
 
-      for(var3 = this.field326 - 1; var3 >= 0; --var3) {
-         for(var4 = this.field326 - 1; var4 >= 0; --var4) {
-            if(var4 <= var3 << 1) {
+      for (var3 = this.field326 - 1; var3 >= 0; --var3) {
+         for (var4 = this.field326 - 1; var4 >= 0; --var4) {
+            if (var4 <= var3 << 1) {
                var1[var2] = -1;
             }
 
@@ -367,9 +369,9 @@ public class class40 {
 
       int var3;
       int var4;
-      for(var3 = this.field326 - 1; var3 >= 0; --var3) {
-         for(var4 = this.field326 - 1; var4 >= 0; --var4) {
-            if(var4 >= var3 >> 1) {
+      for (var3 = this.field326 - 1; var3 >= 0; --var3) {
+         for (var4 = this.field326 - 1; var4 >= 0; --var4) {
+            if (var4 >= var3 >> 1) {
                var1[var2] = -1;
             }
 
@@ -381,9 +383,9 @@ public class class40 {
       var1 = new byte[this.field326 * this.field326];
       var2 = 0;
 
-      for(var3 = this.field326 - 1; var3 >= 0; --var3) {
-         for(var4 = 0; var4 < this.field326; ++var4) {
-            if(var4 <= var3 << 1) {
+      for (var3 = this.field326 - 1; var3 >= 0; --var3) {
+         for (var4 = 0; var4 < this.field326; ++var4) {
+            if (var4 <= var3 << 1) {
                var1[var2] = -1;
             }
 
@@ -395,9 +397,9 @@ public class class40 {
       var1 = new byte[this.field326 * this.field326];
       var2 = 0;
 
-      for(var3 = 0; var3 < this.field326; ++var3) {
-         for(var4 = 0; var4 < this.field326; ++var4) {
-            if(var4 >= var3 >> 1) {
+      for (var3 = 0; var3 < this.field326; ++var3) {
+         for (var4 = 0; var4 < this.field326; ++var4) {
+            if (var4 >= var3 >> 1) {
                var1[var2] = -1;
             }
 
@@ -409,9 +411,9 @@ public class class40 {
       var1 = new byte[this.field326 * this.field326];
       var2 = 0;
 
-      for(var3 = 0; var3 < this.field326; ++var3) {
-         for(var4 = this.field326 - 1; var4 >= 0; --var4) {
-            if(var4 <= var3 << 1) {
+      for (var3 = 0; var3 < this.field326; ++var3) {
+         for (var4 = this.field326 - 1; var4 >= 0; --var4) {
+            if (var4 <= var3 << 1) {
                var1[var2] = -1;
             }
 
@@ -431,59 +433,59 @@ public class class40 {
       byte[] var1 = new byte[this.field326 * this.field326];
       boolean var2 = false;
       var1 = new byte[this.field326 * this.field326];
-      int var5 = 0;
+      int var3 = 0;
 
-      int var3;
       int var4;
-      for(var3 = 0; var3 < this.field326; ++var3) {
-         for(var4 = 0; var4 < this.field326; ++var4) {
-            if(var4 <= this.field326 / 2) {
-               var1[var5] = -1;
+      int var5;
+      for (var4 = 0; var4 < this.field326; ++var4) {
+         for (var5 = 0; var5 < this.field326; ++var5) {
+            if (var5 <= this.field326 / 2) {
+               var1[var3] = -1;
             }
 
-            ++var5;
+            ++var3;
          }
       }
 
       this.field329[5][0] = var1;
       var1 = new byte[this.field326 * this.field326];
-      var5 = 0;
+      var3 = 0;
 
-      for(var3 = 0; var3 < this.field326; ++var3) {
-         for(var4 = 0; var4 < this.field326; ++var4) {
-            if(var3 <= this.field326 / 2) {
-               var1[var5] = -1;
+      for (var4 = 0; var4 < this.field326; ++var4) {
+         for (var5 = 0; var5 < this.field326; ++var5) {
+            if (var4 <= this.field326 / 2) {
+               var1[var3] = -1;
             }
 
-            ++var5;
+            ++var3;
          }
       }
 
       this.field329[5][1] = var1;
       var1 = new byte[this.field326 * this.field326];
-      var5 = 0;
+      var3 = 0;
 
-      for(var3 = 0; var3 < this.field326; ++var3) {
-         for(var4 = 0; var4 < this.field326; ++var4) {
-            if(var4 >= this.field326 / 2) {
-               var1[var5] = -1;
+      for (var4 = 0; var4 < this.field326; ++var4) {
+         for (var5 = 0; var5 < this.field326; ++var5) {
+            if (var5 >= this.field326 / 2) {
+               var1[var3] = -1;
             }
 
-            ++var5;
+            ++var3;
          }
       }
 
       this.field329[5][2] = var1;
       var1 = new byte[this.field326 * this.field326];
-      var5 = 0;
+      var3 = 0;
 
-      for(var3 = 0; var3 < this.field326; ++var3) {
-         for(var4 = 0; var4 < this.field326; ++var4) {
-            if(var3 >= this.field326 / 2) {
-               var1[var5] = -1;
+      for (var4 = 0; var4 < this.field326; ++var4) {
+         for (var5 = 0; var5 < this.field326; ++var5) {
+            if (var4 >= this.field326 / 2) {
+               var1[var3] = -1;
             }
 
-            ++var5;
+            ++var3;
          }
       }
 
@@ -499,59 +501,59 @@ public class class40 {
       byte[] var1 = new byte[this.field326 * this.field326];
       boolean var2 = false;
       var1 = new byte[this.field326 * this.field326];
-      int var5 = 0;
+      int var3 = 0;
 
-      int var3;
       int var4;
-      for(var3 = 0; var3 < this.field326; ++var3) {
-         for(var4 = 0; var4 < this.field326; ++var4) {
-            if(var4 <= var3 - this.field326 / 2) {
-               var1[var5] = -1;
+      int var5;
+      for (var4 = 0; var4 < this.field326; ++var4) {
+         for (var5 = 0; var5 < this.field326; ++var5) {
+            if (var5 <= var4 - this.field326 / 2) {
+               var1[var3] = -1;
             }
 
-            ++var5;
+            ++var3;
          }
       }
 
       this.field329[6][0] = var1;
       var1 = new byte[this.field326 * this.field326];
-      var5 = 0;
+      var3 = 0;
 
-      for(var3 = this.field326 - 1; var3 >= 0; --var3) {
-         for(var4 = 0; var4 < this.field326; ++var4) {
-            if(var4 <= var3 - this.field326 / 2) {
-               var1[var5] = -1;
+      for (var4 = this.field326 - 1; var4 >= 0; --var4) {
+         for (var5 = 0; var5 < this.field326; ++var5) {
+            if (var5 <= var4 - this.field326 / 2) {
+               var1[var3] = -1;
             }
 
-            ++var5;
+            ++var3;
          }
       }
 
       this.field329[6][1] = var1;
       var1 = new byte[this.field326 * this.field326];
-      var5 = 0;
+      var3 = 0;
 
-      for(var3 = this.field326 - 1; var3 >= 0; --var3) {
-         for(var4 = this.field326 - 1; var4 >= 0; --var4) {
-            if(var4 <= var3 - this.field326 / 2) {
-               var1[var5] = -1;
+      for (var4 = this.field326 - 1; var4 >= 0; --var4) {
+         for (var5 = this.field326 - 1; var5 >= 0; --var5) {
+            if (var5 <= var4 - this.field326 / 2) {
+               var1[var3] = -1;
             }
 
-            ++var5;
+            ++var3;
          }
       }
 
       this.field329[6][2] = var1;
       var1 = new byte[this.field326 * this.field326];
-      var5 = 0;
+      var3 = 0;
 
-      for(var3 = 0; var3 < this.field326; ++var3) {
-         for(var4 = this.field326 - 1; var4 >= 0; --var4) {
-            if(var4 <= var3 - this.field326 / 2) {
-               var1[var5] = -1;
+      for (var4 = 0; var4 < this.field326; ++var4) {
+         for (var5 = this.field326 - 1; var5 >= 0; --var5) {
+            if (var5 <= var4 - this.field326 / 2) {
+               var1[var3] = -1;
             }
 
-            ++var5;
+            ++var3;
          }
       }
 
@@ -567,59 +569,59 @@ public class class40 {
       byte[] var1 = new byte[this.field326 * this.field326];
       boolean var2 = false;
       var1 = new byte[this.field326 * this.field326];
-      int var5 = 0;
+      int var3 = 0;
 
-      int var3;
       int var4;
-      for(var3 = 0; var3 < this.field326; ++var3) {
-         for(var4 = 0; var4 < this.field326; ++var4) {
-            if(var4 >= var3 - this.field326 / 2) {
-               var1[var5] = -1;
+      int var5;
+      for (var4 = 0; var4 < this.field326; ++var4) {
+         for (var5 = 0; var5 < this.field326; ++var5) {
+            if (var5 >= var4 - this.field326 / 2) {
+               var1[var3] = -1;
             }
 
-            ++var5;
+            ++var3;
          }
       }
 
       this.field329[7][0] = var1;
       var1 = new byte[this.field326 * this.field326];
-      var5 = 0;
+      var3 = 0;
 
-      for(var3 = this.field326 - 1; var3 >= 0; --var3) {
-         for(var4 = 0; var4 < this.field326; ++var4) {
-            if(var4 >= var3 - this.field326 / 2) {
-               var1[var5] = -1;
+      for (var4 = this.field326 - 1; var4 >= 0; --var4) {
+         for (var5 = 0; var5 < this.field326; ++var5) {
+            if (var5 >= var4 - this.field326 / 2) {
+               var1[var3] = -1;
             }
 
-            ++var5;
+            ++var3;
          }
       }
 
       this.field329[7][1] = var1;
       var1 = new byte[this.field326 * this.field326];
-      var5 = 0;
+      var3 = 0;
 
-      for(var3 = this.field326 - 1; var3 >= 0; --var3) {
-         for(var4 = this.field326 - 1; var4 >= 0; --var4) {
-            if(var4 >= var3 - this.field326 / 2) {
-               var1[var5] = -1;
+      for (var4 = this.field326 - 1; var4 >= 0; --var4) {
+         for (var5 = this.field326 - 1; var5 >= 0; --var5) {
+            if (var5 >= var4 - this.field326 / 2) {
+               var1[var3] = -1;
             }
 
-            ++var5;
+            ++var3;
          }
       }
 
       this.field329[7][2] = var1;
       var1 = new byte[this.field326 * this.field326];
-      var5 = 0;
+      var3 = 0;
 
-      for(var3 = 0; var3 < this.field326; ++var3) {
-         for(var4 = this.field326 - 1; var4 >= 0; --var4) {
-            if(var4 >= var3 - this.field326 / 2) {
-               var1[var5] = -1;
+      for (var4 = 0; var4 < this.field326; ++var4) {
+         for (var5 = this.field326 - 1; var5 >= 0; --var5) {
+            if (var5 >= var4 - this.field326 / 2) {
+               var1[var3] = -1;
             }
 
-            ++var5;
+            ++var3;
          }
       }
 
@@ -635,65 +637,65 @@ public class class40 {
    static final void drawEntities(int var0, int var1, int var2, int var3) {
       ++Client.viewportDrawCount;
       class229.method4514();
-      class25.method349();
-      TriBool.method5560();
+      WorldMapDecoration.addLocalPlayerToScene();
+      TriBool.addTargetPlayerToScene();
       BufferedSource.method3423(true);
       int var4 = Players.Players_count;
       int[] var5 = Players.Players_indices;
 
       int var6;
-      for(var6 = 0; var6 < var4; ++var6) {
-         if(var5[var6] != Client.combatTargetPlayerIndex && var5[var6] != Client.localPlayerIndex) {
+      for (var6 = 0; var6 < var4; ++var6) {
+         if (var5[var6] != Client.combatTargetPlayerIndex && var5[var6] != Client.localPlayerIndex) {
             WorldMapCacheName.addPlayerToScene(Client.players[var5[var6]], true);
          }
       }
 
       BufferedSource.method3423(false);
 
-      for(Projectile var20 = (Projectile)Client.projectiles.last(); var20 != null; var20 = (Projectile)Client.projectiles.previous()) {
-         if(var20.plane == SoundSystem.plane && Client.cycle <= var20.cycleEnd) {
-            if(Client.cycle >= var20.cycleStart) {
-               if(var20.targetIndex > 0) {
-                  Npc var22 = Client.npcs[var20.targetIndex - 1];
-                  if(var22 != null && var22.x >= 0 && var22.x < 13312 && var22.y >= 0 && var22.y < 13312) {
-                     var20.setDestination(var22.x, var22.y, class32.getTileHeight(var22.x, var22.y, var20.plane) - var20.endHeight, Client.cycle);
+      for (Projectile var7 = (Projectile)Client.projectiles.last(); var7 != null; var7 = (Projectile)Client.projectiles.previous()) {
+         if (var7.plane == SoundSystem.plane && Client.cycle <= var7.cycleEnd) {
+            if (Client.cycle >= var7.cycleStart) {
+               if (var7.targetIndex > 0) {
+                  NPC var8 = Client.npcs[var7.targetIndex - 1];
+                  if (var8 != null && var8.x >= 0 && var8.x < 13312 && var8.y >= 0 && var8.y < 13312) {
+                     var7.setDestination(var8.x, var8.y, class32.getTileHeight(var8.x, var8.y, var7.plane) - var7.endHeight, Client.cycle);
                   }
                }
 
-               if(var20.targetIndex < 0) {
-                  var6 = -var20.targetIndex - 1;
+               if (var7.targetIndex < 0) {
+                  var6 = -var7.targetIndex - 1;
                   Player var23;
-                  if(var6 == Client.localPlayerIndex) {
+                  if (var6 == Client.localPlayerIndex) {
                      var23 = Canvas.localPlayer;
                   } else {
                      var23 = Client.players[var6];
                   }
 
-                  if(var23 != null && var23.x >= 0 && var23.x < 13312 && var23.y >= 0 && var23.y < 13312) {
-                     var20.setDestination(var23.x, var23.y, class32.getTileHeight(var23.x, var23.y, var20.plane) - var20.endHeight, Client.cycle);
+                  if (var23 != null && var23.x >= 0 && var23.x < 13312 && var23.y >= 0 && var23.y < 13312) {
+                     var7.setDestination(var23.x, var23.y, class32.getTileHeight(var23.x, var23.y, var7.plane) - var7.endHeight, Client.cycle);
                   }
                }
 
-               var20.advance(Client.__client_gy);
-               class65.scene.__a_239(SoundSystem.plane, (int)var20.x, (int)var20.y, (int)var20.z, 60, var20, var20.yaw, -1L, false);
+               var7.advance(Client.field183);
+               class65.scene.method285(SoundSystem.plane, (int)var7.x, (int)var7.y, (int)var7.z, 60, var7, var7.yaw, -1L, false);
             }
          } else {
-            var20.remove();
+            var7.remove();
          }
       }
 
-      for(GraphicsObject var25 = (GraphicsObject)Client.graphicsObjects.last(); var25 != null; var25 = (GraphicsObject)Client.graphicsObjects.previous()) {
-         if(var25.plane == SoundSystem.plane && !var25.isFinished) {
-            if(Client.cycle >= var25.cycleStart) {
-               var25.advance(Client.__client_gy);
-               if(var25.isFinished) {
-                  var25.remove();
+      for (GraphicsObject var21 = (GraphicsObject)Client.graphicsObjects.last(); var21 != null; var21 = (GraphicsObject)Client.graphicsObjects.previous()) {
+         if (var21.plane == SoundSystem.plane && !var21.isFinished) {
+            if (Client.cycle >= var21.cycleStart) {
+               var21.advance(Client.field183);
+               if (var21.isFinished) {
+                  var21.remove();
                } else {
-                  class65.scene.__a_239(var25.plane, var25.x, var25.y, var25.height, 60, var25, 0, -1L, false);
+                  class65.scene.method285(var21.plane, var21.x, var21.y, var21.height, 60, var21, 0, -1L, false);
                }
             }
          } else {
-            var25.remove();
+            var21.remove();
          }
       }
 
@@ -703,130 +705,130 @@ public class class40 {
       var2 = Client.viewportWidth;
       var3 = Client.viewportHeight;
       Rasterizer2D.Rasterizer2D_setClip(var0, var1, var0 + var2, var3 + var1);
-      Rasterizer3D.Rasterizer3D_method1();
-      int var7;
-      int var8;
+      Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D();
       int var9;
       int var10;
       int var11;
       int var12;
       int var13;
       int var14;
-      int var21;
-      if(!Client.isCameraLocked) {
-         var4 = Client.cameraPitchTarget;
-         if(Client.__client_ik / 256 > var4) {
-            var4 = Client.__client_ik / 256;
+      int var15;
+      int var22;
+      int var24;
+      if (!Client.isCameraLocked) {
+         var4 = Client.camAngleX;
+         if (Client.field202 / 256 > var4) {
+            var4 = Client.field202 / 256;
          }
 
-         if(Client.__client_rh[4] && Client.__client_rl[4] + 128 > var4) {
-            var4 = Client.__client_rl[4] + 128;
+         if (Client.field139[4] && Client.field142[4] + 128 > var4) {
+            var4 = Client.field142[4] + 128;
          }
 
-         var21 = Client.minimapOrientation & 2047;
+         var13 = Client.camAngleY & 2047;
          var6 = MouseHandler.oculusOrbFocalPointX;
-         var7 = MouseRecorder.__bu_hy;
-         var8 = ScriptEvent.oculusOrbFocalPointY;
-         var9 = var4 * 3 + 600;
-         var10 = ScriptEvent.method1176(var9, var3);
-         var11 = 2048 - var4 & 2047;
-         var12 = 2048 - var21 & 2047;
-         var13 = 0;
-         var14 = 0;
-         int var15 = var10;
-         int var16;
+         var14 = MouseRecorder.field566;
+         var15 = ScriptEvent.oculusOrbFocalPointY;
+         var22 = var4 * 3 + 600;
+         var24 = ScriptEvent.method1176(var22, var3);
+         var9 = 2048 - var4 & 2047;
+         var10 = 2048 - var13 & 2047;
+         var11 = 0;
+         var12 = 0;
+         int var16 = var24;
          int var17;
          int var18;
-         if(var11 != 0) {
-            var16 = Rasterizer3D.Rasterizer3D_sine[var11];
-            var17 = Rasterizer3D.Rasterizer3D_cosine[var11];
-            var18 = var14 * var17 - var16 * var10 >> 16;
-            var15 = var17 * var10 + var16 * var14 >> 16;
-            var14 = var18;
+         int var19;
+         if (var9 != 0) {
+            var17 = Rasterizer3D.Rasterizer3D_sine[var9];
+            var18 = Rasterizer3D.Rasterizer3D_cosine[var9];
+            var19 = var12 * var18 - var17 * var24 >> 16;
+            var16 = var18 * var24 + var17 * var12 >> 16;
+            var12 = var19;
          }
 
-         if(var12 != 0) {
-            var16 = Rasterizer3D.Rasterizer3D_sine[var12];
-            var17 = Rasterizer3D.Rasterizer3D_cosine[var12];
-            var18 = var15 * var16 + var17 * var13 >> 16;
-            var15 = var15 * var17 - var16 * var13 >> 16;
-            var13 = var18;
+         if (var10 != 0) {
+            var17 = Rasterizer3D.Rasterizer3D_sine[var10];
+            var18 = Rasterizer3D.Rasterizer3D_cosine[var10];
+            var19 = var16 * var17 + var18 * var11 >> 16;
+            var16 = var16 * var18 - var17 * var11 >> 16;
+            var11 = var19;
          }
 
-         WorldMapSection1.cameraX = var6 - var13;
-         GrandExchangeEvents.cameraY = var7 - var14;
-         class11.cameraZ = var8 - var15;
+         WorldMapSection2.cameraX = var6 - var11;
+         GrandExchangeEvents.cameraY = var14 - var12;
+         GrandExchangeOfferNameComparator.cameraZ = var15 - var16;
          WorldMapIcon1.cameraPitch = var4;
-         MusicPatchNode.cameraYaw = var21;
-         if(Client.oculusOrbState == 1 && Client.rights >= 2 && Client.cycle % 50 == 0 && (MouseHandler.oculusOrbFocalPointX >> 7 != Canvas.localPlayer.x >> 7 || ScriptEvent.oculusOrbFocalPointY >> 7 != Canvas.localPlayer.y >> 7)) {
-            var16 = Canvas.localPlayer.plane;
-            var17 = (MouseHandler.oculusOrbFocalPointX >> 7) + class50.baseX;
-            var18 = (ScriptEvent.oculusOrbFocalPointY >> 7) + GraphicsObject.baseY;
-            PacketBufferNode var19 = Interpreter.method1915(ClientPacket.__gs_bx, Client.packetWriter.isaacCipher);
-            var19.packetBuffer.writeIntME(Client.__client_il);
-            var19.packetBuffer.writeShortLE(var18);
-            var19.packetBuffer.__ai_315(var16);
-            var19.packetBuffer.writeShort(var17);
-            Client.packetWriter.__q_167(var19);
+         MusicPatchNode.cameraYaw = var13;
+         if (Client.oculusOrbState == 1 && Client.staffModLevel >= 2 && Client.cycle % 50 == 0 && (MouseHandler.oculusOrbFocalPointX >> 7 != Canvas.localPlayer.x >> 7 || ScriptEvent.oculusOrbFocalPointY >> 7 != Canvas.localPlayer.y >> 7)) {
+            var17 = Canvas.localPlayer.plane;
+            var18 = (MouseHandler.oculusOrbFocalPointX >> 7) + class50.baseX;
+            var19 = (ScriptEvent.oculusOrbFocalPointY >> 7) + GraphicsObject.baseY;
+            PacketBufferNode var20 = Interpreter.method1915(ClientPacket.field283, Client.packetWriter.isaacCipher);
+            var20.packetBuffer.writeIntME(Client.field198);
+            var20.packetBuffer.writeShortLE(var19);
+            var20.packetBuffer.method56(var17);
+            var20.packetBuffer.writeShort(var18);
+            Client.packetWriter.method241(var20);
          }
       }
 
-      if(!Client.isCameraLocked) {
-         var4 = UnitPriceComparator.method131();
+      if (!Client.isCameraLocked) {
+         var4 = GrandExchangeOfferUnitPriceComparator.method131();
       } else {
          var4 = Login.method2061();
       }
 
-      var21 = WorldMapSection1.cameraX;
+      var13 = WorldMapSection2.cameraX;
       var6 = GrandExchangeEvents.cameraY;
-      var7 = class11.cameraZ;
-      var8 = WorldMapIcon1.cameraPitch;
-      var9 = MusicPatchNode.cameraYaw;
+      var14 = GrandExchangeOfferNameComparator.cameraZ;
+      var15 = WorldMapIcon1.cameraPitch;
+      var22 = MusicPatchNode.cameraYaw;
 
-      for(var10 = 0; var10 < 5; ++var10) {
-         if(Client.__client_rh[var10]) {
-            var11 = (int)(Math.random() * (double)(Client.__client_rd[var10] * 2 + 1) - (double)Client.__client_rd[var10] + Math.sin((double)Client.__client_rk[var10] * ((double)Client.__client_rj[var10] / 100.0D)) * (double)Client.__client_rl[var10]);
-            if(var10 == 0) {
-               WorldMapSection1.cameraX += var11;
+      for (var24 = 0; var24 < 5; ++var24) {
+         if (Client.field139[var24]) {
+            var9 = (int)(Math.random() * (double)(Client.field141[var24] * 2 + 1) - (double)Client.field141[var24] + Math.sin((double)Client.field144[var24] * ((double)Client.field143[var24] / 100.0D)) * (double)Client.field142[var24]);
+            if (var24 == 0) {
+               WorldMapSection2.cameraX += var9;
             }
 
-            if(var10 == 1) {
-               GrandExchangeEvents.cameraY += var11;
+            if (var24 == 1) {
+               GrandExchangeEvents.cameraY += var9;
             }
 
-            if(var10 == 2) {
-               class11.cameraZ += var11;
+            if (var24 == 2) {
+               GrandExchangeOfferNameComparator.cameraZ += var9;
             }
 
-            if(var10 == 3) {
-               MusicPatchNode.cameraYaw = var11 + MusicPatchNode.cameraYaw & 2047;
+            if (var24 == 3) {
+               MusicPatchNode.cameraYaw = var9 + MusicPatchNode.cameraYaw & 2047;
             }
 
-            if(var10 == 4) {
-               WorldMapIcon1.cameraPitch += var11;
-               if(WorldMapIcon1.cameraPitch < 128) {
+            if (var24 == 4) {
+               WorldMapIcon1.cameraPitch += var9;
+               if (WorldMapIcon1.cameraPitch < 128) {
                   WorldMapIcon1.cameraPitch = 128;
                }
 
-               if(WorldMapIcon1.cameraPitch > 383) {
+               if (WorldMapIcon1.cameraPitch > 383) {
                   WorldMapIcon1.cameraPitch = 383;
                }
             }
          }
       }
 
-      var10 = MouseHandler.MouseHandler_x;
-      var11 = MouseHandler.MouseHandler_y;
-      if(MouseHandler.MouseHandler_lastButton != 0) {
-         var10 = MouseHandler.MouseHandler_lastPressedX;
-         var11 = MouseHandler.MouseHandler_lastPressedY;
+      var24 = MouseHandler.MouseHandler_x;
+      var9 = MouseHandler.MouseHandler_y;
+      if (MouseHandler.MouseHandler_lastButton != 0) {
+         var24 = MouseHandler.MouseHandler_lastPressedX;
+         var9 = MouseHandler.MouseHandler_lastPressedY;
       }
 
-      if(var10 >= var0 && var10 < var0 + var2 && var11 >= var1 && var11 < var3 + var1) {
-         var12 = var10 - var0;
-         var13 = var11 - var1;
-         ViewportMouse.ViewportMouse_x = var12;
-         ViewportMouse.ViewportMouse_y = var13;
+      if (var24 >= var0 && var24 < var0 + var2 && var9 >= var1 && var9 < var3 + var1) {
+         var10 = var24 - var0;
+         var11 = var9 - var1;
+         ViewportMouse.ViewportMouse_x = var10;
+         ViewportMouse.ViewportMouse_y = var11;
          ViewportMouse.ViewportMouse_isInViewport = true;
          ViewportMouse.ViewportMouse_entityCount = 0;
          ViewportMouse.ViewportMouse_false0 = false;
@@ -838,46 +840,46 @@ public class class40 {
       class13.playPcmPlayers();
       Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0);
       class13.playPcmPlayers();
-      var12 = Rasterizer3D.Rasterizer3D_zoom;
+      var10 = Rasterizer3D.Rasterizer3D_zoom;
       Rasterizer3D.Rasterizer3D_zoom = Client.viewportZoom;
-      class65.scene.draw(WorldMapSection1.cameraX, GrandExchangeEvents.cameraY, class11.cameraZ, WorldMapIcon1.cameraPitch, MusicPatchNode.cameraYaw, var4);
-      Rasterizer3D.Rasterizer3D_zoom = var12;
+      class65.scene.draw(WorldMapSection2.cameraX, GrandExchangeEvents.cameraY, GrandExchangeOfferNameComparator.cameraZ, WorldMapIcon1.cameraPitch, MusicPatchNode.cameraYaw, var4);
+      Rasterizer3D.Rasterizer3D_zoom = var10;
       class13.playPcmPlayers();
       class65.scene.clearTempGameObjects();
       UrlRequester.method3258(var0, var1, var2, var3);
-      UnitPriceComparator.method136(var0, var1);
-      ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.__client_gy);
-      Client.__client_jc = 0;
-      var13 = (Canvas.localPlayer.x >> 7) + class50.baseX;
-      var14 = (Canvas.localPlayer.y >> 7) + GraphicsObject.baseY;
-      if(var13 >= 3053 && var13 <= 3156 && var14 >= 3056 && var14 <= 3136) {
-         Client.__client_jc = 1;
+      GrandExchangeOfferUnitPriceComparator.method136(var0, var1);
+      ((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).animate(Client.field183);
+      Client.field208 = 0;
+      var11 = (Canvas.localPlayer.x >> 7) + class50.baseX;
+      var12 = (Canvas.localPlayer.y >> 7) + GraphicsObject.baseY;
+      if (var11 >= 3053 && var11 <= 3156 && var12 >= 3056 && var12 <= 3136) {
+         Client.field208 = 1;
       }
 
-      if(var13 >= 3072 && var13 <= 3118 && var14 >= 9492 && var14 <= 9535) {
-         Client.__client_jc = 1;
+      if (var11 >= 3072 && var11 <= 3118 && var12 >= 9492 && var12 <= 9535) {
+         Client.field208 = 1;
       }
 
-      if(Client.__client_jc == 1 && var13 >= 3139 && var13 <= 3199 && var14 >= 3008 && var14 <= 3062) {
-         Client.__client_jc = 0;
+      if (Client.field208 == 1 && var11 >= 3139 && var11 <= 3199 && var12 >= 3008 && var12 <= 3062) {
+         Client.field208 = 0;
       }
 
-      WorldMapSection1.cameraX = var21;
+      WorldMapSection2.cameraX = var13;
       GrandExchangeEvents.cameraY = var6;
-      class11.cameraZ = var7;
-      WorldMapIcon1.cameraPitch = var8;
-      MusicPatchNode.cameraYaw = var9;
-      if(Client.isLoading) {
-         byte var24 = 0;
-         var14 = var24 + NetCache.NetCache_pendingPriorityWritesCount + NetCache.NetCache_pendingPriorityResponsesCount;
-         if(var14 == 0) {
+      GrandExchangeOfferNameComparator.cameraZ = var14;
+      WorldMapIcon1.cameraPitch = var15;
+      MusicPatchNode.cameraYaw = var22;
+      if (Client.isLoading) {
+         byte var25 = 0;
+         var12 = var25 + NetCache.NetCache_pendingPriorityWritesCount + NetCache.NetCache_pendingPriorityResponsesCount;
+         if (var12 == 0) {
             Client.isLoading = false;
          }
       }
 
-      if(Client.isLoading) {
+      if (Client.isLoading) {
          Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1, var2, var3, 0);
-         class68.drawLoadingMessage("Loading - please wait.", false);
+         PendingSpawn.drawLoadingMessage("Loading - please wait.", false);
       }
 
    }
diff --git a/runescape-client/src/main/java/class48.java b/runescape-client/src/main/java/class48.java
index fbbac8a5e6..1f1da473c8 100644
--- a/runescape-client/src/main/java/class48.java
+++ b/runescape-client/src/main/java/class48.java
@@ -4,10 +4,6 @@ import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("aa")
 public class class48 {
-   static {
-      ImageIO.setUseCache(false);
-   }
-
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "(I)[Lij;",
@@ -23,14 +19,15 @@ public class class48 {
       garbageValue = "643714573"
    )
    static final void method868() {
-      if(Client.__client_fd > 0) {
+      if (Client.field175 > 0) {
          TextureProvider.method2773();
       } else {
-         Client.timer.__f_454();
+         Client.timer.method330();
          GameShell.updateGameState(40);
-         ClientParameter.__ji_fp = Client.packetWriter.getSocket();
+         ClientParameter.field341 = Client.packetWriter.getSocket();
          Client.packetWriter.removeSocket();
       }
+
    }
 
    @ObfuscatedName("je")
@@ -39,23 +36,23 @@ public class class48 {
       garbageValue = "-1926681563"
    )
    static Widget method869(Widget var0) {
-      Widget var2 = var0;
-      int var3 = WorldMapRegion.method568(class1.getWidgetClickMask(var0));
-      Widget var1;
-      if(var3 == 0) {
-         var1 = null;
+      Widget var1 = var0;
+      int var2 = WorldMapRegion.method568(class1.getWidgetClickMask(var0));
+      Widget var3;
+      if (var2 == 0) {
+         var3 = null;
       } else {
          int var4 = 0;
 
-         while(true) {
-            if(var4 >= var3) {
-               var1 = var2;
+         while (true) {
+            if (var4 >= var2) {
+               var3 = var1;
                break;
             }
 
-            var2 = Huffman.getWidget(var2.parentId);
-            if(var2 == null) {
-               var1 = null;
+            var1 = Huffman.getWidget(var1.parentId);
+            if (var1 == null) {
+               var3 = null;
                break;
             }
 
@@ -63,11 +60,15 @@ public class class48 {
          }
       }
 
-      Widget var5 = var1;
-      if(var1 == null) {
+      Widget var5 = var3;
+      if (var3 == null) {
          var5 = var0.parent;
       }
 
       return var5;
    }
+
+   static {
+      ImageIO.setUseCache(false);
+   }
 }
diff --git a/runescape-client/src/main/java/class50.java b/runescape-client/src/main/java/class50.java
index b88da2916a..2320090bd0 100644
--- a/runescape-client/src/main/java/class50.java
+++ b/runescape-client/src/main/java/class50.java
@@ -7,9 +7,9 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("af")
 public class class50 {
    @ObfuscatedName("m")
-   public static Applet __af_m;
+   public static Applet field1159;
    @ObfuscatedName("f")
-   public static String __af_f;
+   public static String field1160;
    @ObfuscatedName("ei")
    @Export("worldHost")
    static String worldHost;
@@ -20,11 +20,6 @@ public class class50 {
    @Export("baseX")
    static int baseX;
 
-   static {
-      __af_m = null;
-      __af_f = "";
-   }
-
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "(IB)Lio;",
@@ -33,14 +28,14 @@ public class class50 {
    @Export("getSpotAnimationDefinition")
    public static SpotAnimationDefinition getSpotAnimationDefinition(int var0) {
       SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0);
-      if(var1 != null) {
+      if (var1 != null) {
          return var1;
       } else {
-         byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_indexCache.takeRecord(13, var0);
+         byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0);
          var1 = new SpotAnimationDefinition();
          var1.id = var0;
-         if(var2 != null) {
-            var1.read(new Buffer(var2));
+         if (var2 != null) {
+            var1.decode(new Buffer(var2));
          }
 
          SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0);
@@ -56,18 +51,18 @@ public class class50 {
    @Export("getObjectDefinition")
    public static ObjectDefinition getObjectDefinition(int var0) {
       ObjectDefinition var1 = (ObjectDefinition)ObjectDefinition.ObjectDefinition_cached.get((long)var0);
-      if(var1 != null) {
+      if (var1 != null) {
          return var1;
       } else {
-         byte[] var2 = ObjectDefinition.ObjectDefinition_indexCache.takeRecord(6, var0);
+         byte[] var2 = ObjectDefinition.ObjectDefinition_archive.takeFile(6, var0);
          var1 = new ObjectDefinition();
          var1.id = var0;
-         if(var2 != null) {
-            var1.read(new Buffer(var2));
+         if (var2 != null) {
+            var1.decode(new Buffer(var2));
          }
 
-         var1.init();
-         if(var1.isSolid) {
+         var1.postDecode();
+         if (var1.isSolid) {
             var1.interactType = 0;
             var1.boolean1 = false;
          }
@@ -83,116 +78,116 @@ public class class50 {
       garbageValue = "83"
    )
    @Export("loadRegions")
-   static final void loadRegions(boolean var0, PacketBuffer var1) {
-      Client.isInInstance = var0;
+   static final void loadRegions(boolean isInInstance, PacketBuffer packetBuffer) {
+      Client.isInInstance = isInInstance;
       int var2;
       int var3;
+      int var4;
       int var5;
       int var6;
       int var7;
-      int var8;
-      if(!Client.isInInstance) {
-         var2 = var1.__bm_326();
-         var3 = var1.__bu_325();
-         int var4 = var1.__ag_302();
-         class190.xteaKeys = new int[var4][4];
+      if (!Client.isInInstance) {
+         var2 = packetBuffer.method67();
+         var3 = packetBuffer.method66();
+         int var8 = packetBuffer.readUnsignedShort();
+         class190.xteaKeys = new int[var8][4];
 
-         for(var5 = 0; var5 < var4; ++var5) {
-            for(var6 = 0; var6 < 4; ++var6) {
-               class190.xteaKeys[var5][var6] = var1.readInt();
+         for (var4 = 0; var4 < var8; ++var4) {
+            for (var5 = 0; var5 < 4; ++var5) {
+               class190.xteaKeys[var4][var5] = packetBuffer.readInt();
             }
          }
 
-         class308.regions = new int[var4];
-         IndexCacheLoader.regionMapArchiveIds = new int[var4];
-         MouseHandler.regionLandArchiveIds = new int[var4];
-         class40.regionLandArchives = new byte[var4][];
-         HealthBarUpdate.regionMapArchives = new byte[var4][];
-         boolean var16 = false;
-         if((var3 / 8 == 48 || var3 / 8 == 49) && var2 / 8 == 48) {
-            var16 = true;
+         class308.regions = new int[var8];
+         ArchiveLoader.regionMapArchiveIds = new int[var8];
+         MouseHandler.regionLandArchiveIds = new int[var8];
+         class40.regionLandArchives = new byte[var8][];
+         HealthBarUpdate.regionMapArchives = new byte[var8][];
+         boolean var9 = false;
+         if ((var3 / 8 == 48 || var3 / 8 == 49) && var2 / 8 == 48) {
+            var9 = true;
          }
 
-         if(var3 / 8 == 48 && var2 / 8 == 148) {
-            var16 = true;
+         if (var3 / 8 == 48 && var2 / 8 == 148) {
+            var9 = true;
          }
 
-         var4 = 0;
+         var8 = 0;
 
-         for(var6 = (var3 - 6) / 8; var6 <= (var3 + 6) / 8; ++var6) {
-            for(var7 = (var2 - 6) / 8; var7 <= (var2 + 6) / 8; ++var7) {
-               var8 = var7 + (var6 << 8);
-               if(!var16 || var7 != 49 && var7 != 149 && var7 != 147 && var6 != 50 && (var6 != 49 || var7 != 47)) {
-                  class308.regions[var4] = var8;
-                  IndexCacheLoader.regionMapArchiveIds[var4] = SecureRandomFuture.indexCache5.getArchiveId("m" + var6 + "_" + var7);
-                  MouseHandler.regionLandArchiveIds[var4] = SecureRandomFuture.indexCache5.getArchiveId("l" + var6 + "_" + var7);
-                  ++var4;
+         for (var5 = (var3 - 6) / 8; var5 <= (var3 + 6) / 8; ++var5) {
+            for (var6 = (var2 - 6) / 8; var6 <= (var2 + 6) / 8; ++var6) {
+               var7 = var6 + (var5 << 8);
+               if (!var9 || var6 != 49 && var6 != 149 && var6 != 147 && var5 != 50 && (var5 != 49 || var6 != 47)) {
+                  class308.regions[var8] = var7;
+                  ArchiveLoader.regionMapArchiveIds[var8] = SecureRandomFuture.archive5.getGroupId("m" + var5 + "_" + var6);
+                  MouseHandler.regionLandArchiveIds[var8] = SecureRandomFuture.archive5.getGroupId("l" + var5 + "_" + var6);
+                  ++var8;
                }
             }
          }
 
          DynamicObject.method2224(var3, var2, true);
       } else {
-         var2 = var1.__bu_325();
-         var3 = var1.__bm_326();
-         boolean var15 = var1.readUnsignedByte() == 1;
-         var5 = var1.__ag_302();
-         var1.importIndex();
+         var2 = packetBuffer.method66();
+         var3 = packetBuffer.method67();
+         boolean var15 = packetBuffer.readUnsignedByte() == 1;
+         var4 = packetBuffer.readUnsignedShort();
+         packetBuffer.importIndex();
 
-         int var9;
-         for(var6 = 0; var6 < 4; ++var6) {
-            for(var7 = 0; var7 < 13; ++var7) {
-               for(var8 = 0; var8 < 13; ++var8) {
-                  var9 = var1.readBits(1);
-                  if(var9 == 1) {
-                     Client.instanceChunkTemplates[var6][var7][var8] = var1.readBits(26);
+         int var16;
+         for (var5 = 0; var5 < 4; ++var5) {
+            for (var6 = 0; var6 < 13; ++var6) {
+               for (var7 = 0; var7 < 13; ++var7) {
+                  var16 = packetBuffer.readBits(1);
+                  if (var16 == 1) {
+                     Client.instanceChunkTemplates[var5][var6][var7] = packetBuffer.readBits(26);
                   } else {
-                     Client.instanceChunkTemplates[var6][var7][var8] = -1;
+                     Client.instanceChunkTemplates[var5][var6][var7] = -1;
                   }
                }
             }
          }
 
-         var1.exportIndex();
-         class190.xteaKeys = new int[var5][4];
+         packetBuffer.exportIndex();
+         class190.xteaKeys = new int[var4][4];
 
-         for(var6 = 0; var6 < var5; ++var6) {
-            for(var7 = 0; var7 < 4; ++var7) {
-               class190.xteaKeys[var6][var7] = var1.readInt();
+         for (var5 = 0; var5 < var4; ++var5) {
+            for (var6 = 0; var6 < 4; ++var6) {
+               class190.xteaKeys[var5][var6] = packetBuffer.readInt();
             }
          }
 
-         class308.regions = new int[var5];
-         IndexCacheLoader.regionMapArchiveIds = new int[var5];
-         MouseHandler.regionLandArchiveIds = new int[var5];
-         class40.regionLandArchives = new byte[var5][];
-         HealthBarUpdate.regionMapArchives = new byte[var5][];
-         var5 = 0;
+         class308.regions = new int[var4];
+         ArchiveLoader.regionMapArchiveIds = new int[var4];
+         MouseHandler.regionLandArchiveIds = new int[var4];
+         class40.regionLandArchives = new byte[var4][];
+         HealthBarUpdate.regionMapArchives = new byte[var4][];
+         var4 = 0;
 
-         for(var6 = 0; var6 < 4; ++var6) {
-            for(var7 = 0; var7 < 13; ++var7) {
-               for(var8 = 0; var8 < 13; ++var8) {
-                  var9 = Client.instanceChunkTemplates[var6][var7][var8];
-                  if(var9 != -1) {
-                     int var10 = var9 >> 14 & 1023;
-                     int var11 = var9 >> 3 & 2047;
+         for (var5 = 0; var5 < 4; ++var5) {
+            for (var6 = 0; var6 < 13; ++var6) {
+               for (var7 = 0; var7 < 13; ++var7) {
+                  var16 = Client.instanceChunkTemplates[var5][var6][var7];
+                  if (var16 != -1) {
+                     int var10 = var16 >> 14 & 1023;
+                     int var11 = var16 >> 3 & 2047;
                      int var12 = (var10 / 8 << 8) + var11 / 8;
 
                      int var13;
-                     for(var13 = 0; var13 < var5; ++var13) {
-                        if(class308.regions[var13] == var12) {
+                     for (var13 = 0; var13 < var4; ++var13) {
+                        if (class308.regions[var13] == var12) {
                            var12 = -1;
                            break;
                         }
                      }
 
-                     if(var12 != -1) {
-                        class308.regions[var5] = var12;
+                     if (var12 != -1) {
+                        class308.regions[var4] = var12;
                         var13 = var12 >> 8 & 255;
                         int var14 = var12 & 255;
-                        IndexCacheLoader.regionMapArchiveIds[var5] = SecureRandomFuture.indexCache5.getArchiveId("m" + var13 + "_" + var14);
-                        MouseHandler.regionLandArchiveIds[var5] = SecureRandomFuture.indexCache5.getArchiveId("l" + var13 + "_" + var14);
-                        ++var5;
+                        ArchiveLoader.regionMapArchiveIds[var4] = SecureRandomFuture.archive5.getGroupId("m" + var13 + "_" + var14);
+                        MouseHandler.regionLandArchiveIds[var4] = SecureRandomFuture.archive5.getGroupId("l" + var13 + "_" + var14);
+                        ++var4;
                      }
                   }
                }
@@ -214,19 +209,19 @@ public class class50 {
       short[] var2 = new short[16];
       int var3 = 0;
 
-      for(int var4 = 0; var4 < class83.__cm_e; ++var4) {
+      for (int var4 = 0; var4 < class83.field1167; ++var4) {
          ItemDefinition var5 = Skills.getItemDefinition(var4);
-         if((!var1 || var5.isTradable) && var5.noteTemplate == -1 && var5.name.toLowerCase().indexOf(var0) != -1) {
-            if(var3 >= 250) {
-               WorldMapSection0.__y_sn = -1;
-               AttackOption.__cj_sp = null;
+         if ((!var1 || var5.isTradable) && var5.noteTemplate == -1 && var5.name.toLowerCase().indexOf(var0) != -1) {
+            if (var3 >= 250) {
+               WorldMapSection3.field1055 = -1;
+               AttackOption.field30 = null;
                return;
             }
 
-            if(var3 >= var2.length) {
+            if (var3 >= var2.length) {
                short[] var6 = new short[var2.length * 2];
 
-               for(int var7 = 0; var7 < var3; ++var7) {
+               for (int var7 = 0; var7 < var3; ++var7) {
                   var6[var7] = var2[var7];
                }
 
@@ -237,16 +232,16 @@ public class class50 {
          }
       }
 
-      AttackOption.__cj_sp = var2;
-      class231.__hb_sg = 0;
-      WorldMapSection0.__y_sn = var3;
-      String[] var8 = new String[WorldMapSection0.__y_sn];
+      AttackOption.field30 = var2;
+      WorldMapDecorationType.field1139 = 0;
+      WorldMapSection3.field1055 = var3;
+      String[] var8 = new String[WorldMapSection3.field1055];
 
-      for(int var9 = 0; var9 < WorldMapSection0.__y_sn; ++var9) {
+      for (int var9 = 0; var9 < WorldMapSection3.field1055; ++var9) {
          var8[var9] = Skills.getItemDefinition(var2[var9]).name;
       }
 
-      Huffman.method3695(var8, AttackOption.__cj_sp);
+      Huffman.method3695(var8, AttackOption.field30);
    }
 
    @ObfuscatedName("kk")
@@ -255,10 +250,15 @@ public class class50 {
       garbageValue = "-522943529"
    )
    static void method902(byte[] var0, int var1) {
-      if(Client.__client_ev == null) {
-         Client.__client_ev = new byte[24];
+      if (Client.field172 == null) {
+         Client.field172 = new byte[24];
       }
 
-      class212.method4109(var0, var1, Client.__client_ev, 0, 24);
+      class212.method4109(var0, var1, Client.field172, 0, 24);
+   }
+
+   static {
+      field1159 = null;
+      field1160 = "";
    }
 }
diff --git a/runescape-client/src/main/java/class54.java b/runescape-client/src/main/java/class54.java
index 75a8e68f79..cfed70848e 100644
--- a/runescape-client/src/main/java/class54.java
+++ b/runescape-client/src/main/java/class54.java
@@ -1,7 +1,7 @@
-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("bs")
 public final class class54 {
@@ -9,7 +9,7 @@ public final class class54 {
    @ObfuscatedGetter(
       intValue = -1247107945
    )
-   static int __bs_nb;
+   static int field1161;
 
    @ObfuscatedName("q")
    @ObfuscatedSignature(
@@ -18,7 +18,7 @@ public final class class54 {
    )
    static int method1086(int var0, int var1) {
       long var2 = (long)((var0 << 16) + var1);
-      return ModelData0.NetCache_currentResponse != null && var2 == ModelData0.NetCache_currentResponse.key?class22.NetCache_responseArchiveBuffer.index * 99 / (class22.NetCache_responseArchiveBuffer.array.length - ModelData0.NetCache_currentResponse.padding) + 1:0;
+      return ModelData0.NetCache_currentResponse != null && var2 == ModelData0.NetCache_currentResponse.key ? WorldMapRectangle.NetCache_responseArchiveBuffer.index * 99 / (WorldMapRectangle.NetCache_responseArchiveBuffer.array.length - ModelData0.NetCache_currentResponse.padding) + 1 : 0;
    }
 
    @ObfuscatedName("q")
@@ -36,129 +36,43 @@ public final class class54 {
       garbageValue = "-603753561"
    )
    static void method1092(GameShell var0) {
-      int var3;
-      int var15;
-      if(Login.worldSelectOpen) {
-         while(true) {
-            if(!Decimator.method2490()) {
-               if(MouseHandler.MouseHandler_lastButton != 1 && (AbstractRasterProvider.mouseCam || MouseHandler.MouseHandler_lastButton != 4)) {
-                  break;
-               }
-
-               int var1 = Login.xPadding + 280;
-               if(MouseHandler.MouseHandler_lastPressedX >= var1 && MouseHandler.MouseHandler_lastPressedX <= var1 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
-                  Interpreter.changeWorldSelectSorting(0, 0);
-                  break;
-               }
-
-               if(MouseHandler.MouseHandler_lastPressedX >= var1 + 15 && MouseHandler.MouseHandler_lastPressedX <= var1 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
-                  Interpreter.changeWorldSelectSorting(0, 1);
-                  break;
-               }
-
-               int var2 = Login.xPadding + 390;
-               if(MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
-                  Interpreter.changeWorldSelectSorting(1, 0);
-                  break;
-               }
-
-               if(MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
-                  Interpreter.changeWorldSelectSorting(1, 1);
-                  break;
-               }
-
-               var3 = Login.xPadding + 500;
-               if(MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
-                  Interpreter.changeWorldSelectSorting(2, 0);
-                  break;
-               }
-
-               if(MouseHandler.MouseHandler_lastPressedX >= var3 + 15 && MouseHandler.MouseHandler_lastPressedX <= var3 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
-                  Interpreter.changeWorldSelectSorting(2, 1);
-                  break;
-               }
-
-               var15 = Login.xPadding + 610;
-               if(MouseHandler.MouseHandler_lastPressedX >= var15 && MouseHandler.MouseHandler_lastPressedX <= var15 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
-                  Interpreter.changeWorldSelectSorting(3, 0);
-                  break;
-               }
-
-               if(MouseHandler.MouseHandler_lastPressedX >= var15 + 15 && MouseHandler.MouseHandler_lastPressedX <= var15 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
-                  Interpreter.changeWorldSelectSorting(3, 1);
-                  break;
-               }
-
-               if(MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) {
-                  FontName.closeWorldSelect();
-                  break;
-               }
-
-               if(Login.hoveredWorldIndex != -1) {
-                  World var13 = ItemContainer.worlds[Login.hoveredWorldIndex];
-                  class31.changeWorld(var13);
-                  FontName.closeWorldSelect();
-               } else {
-                  if(Login.worldSelectPage > 0 && SecureRandomFuture.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= SecureRandomFuture.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= Huffman.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= Huffman.canvasHeight / 2 + 50) {
-                     --Login.worldSelectPage;
-                  }
-
-                  if(Login.worldSelectPage < Login.worldSelectPagesCount && NetSocket.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= SoundCache.canvasWidth - NetSocket.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= SoundCache.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= Huffman.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= Huffman.canvasHeight / 2 + 50) {
-                     ++Login.worldSelectPage;
-                  }
-               }
-               break;
-            }
-
-            if(IndexStoreAction.__ik_cn == 13) {
-               FontName.closeWorldSelect();
-               break;
-            }
-
-            if(IndexStoreAction.__ik_cn == 96) {
-               if(Login.worldSelectPage > 0 && SecureRandomFuture.worldSelectLeftSprite != null) {
-                  --Login.worldSelectPage;
-               }
-            } else if(IndexStoreAction.__ik_cn == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && NetSocket.worldSelectRightSprite != null) {
-               ++Login.worldSelectPage;
-            }
-         }
-
-      } else {
-         if((MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) {
+      int var1;
+      int var2;
+      if (!Login.worldSelectOpen) {
+         if ((MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_lastButton == 4) && MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 765 - 50 && MouseHandler.MouseHandler_lastPressedY >= 453) {
             ReflectionCheck.clientPreferences.titleMusicDisabled = !ReflectionCheck.clientPreferences.titleMusicDisabled;
-            WorldMapSection0.savePreferences();
-            if(!ReflectionCheck.clientPreferences.titleMusicDisabled) {
-               class204.method4011(UserComparator3.indexCache6, "scape main", "", 255, false);
+            WorldMapSection3.savePreferences();
+            if (!ReflectionCheck.clientPreferences.titleMusicDisabled) {
+               class204.method4011(UserComparator3.archive6, "scape main", "", 255, false);
             } else {
                class214.midiPcmStream.clear();
-               class214.__hf_o = 1;
-               class214.__hf_u = null;
+               class214.field1129 = 1;
+               class214.field1130 = null;
             }
          }
 
-         if(Client.gameState != 5) {
-            if(-1L == Login.__cu_bi) {
-               Login.__cu_bi = class203.currentTimeMs() + 1000L;
+         if (Client.gameState != 5) {
+            if (-1L == Login.field471) {
+               Login.field471 = class203.currentTimeMs() + 1000L;
             }
 
-            long var11 = class203.currentTimeMs();
-            if(AbstractIndexCache.method4585() && -1L == Login.__cu_bz) {
-               Login.__cu_bz = var11;
-               if(Login.__cu_bz > Login.__cu_bi) {
-                  Login.__cu_bi = Login.__cu_bz;
+            long var15 = class203.currentTimeMs();
+            if (AbstractArchive.method4585() && -1L == Login.field472) {
+               Login.field472 = var15;
+               if (Login.field472 > Login.field471) {
+                  Login.field471 = Login.field472;
                }
             }
 
-            if(Client.gameState == 10 || Client.gameState == 11) {
-               if(Client.language == 0) {
-                  if(MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_lastButton == 4) {
-                     var3 = Login.xPadding + 5;
-                     short var4 = 463;
-                     byte var5 = 100;
-                     byte var6 = 35;
-                     if(MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + var5 && MouseHandler.MouseHandler_lastPressedY >= var4 && MouseHandler.MouseHandler_lastPressedY <= var6 + var4) {
-                        if(ClientParameter.loadWorlds()) {
+            if (Client.gameState == 10 || Client.gameState == 11) {
+               if (Client.language == 0) {
+                  if (MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_lastButton == 4) {
+                     var1 = Login.xPadding + 5;
+                     short var16 = 463;
+                     byte var6 = 100;
+                     byte var7 = 35;
+                     if (MouseHandler.MouseHandler_lastPressedX >= var1 && MouseHandler.MouseHandler_lastPressedX <= var1 + var6 && MouseHandler.MouseHandler_lastPressedY >= var16 && MouseHandler.MouseHandler_lastPressedY <= var7 + var16) {
+                        if (ClientParameter.loadWorlds()) {
                            Login.worldSelectOpen = true;
                            Login.worldSelectPage = 0;
                            Login.worldSelectPagesCount = 0;
@@ -168,56 +82,56 @@ public final class class54 {
                      }
                   }
 
-                  if(FriendLoginUpdate.__kn_x != null && ClientParameter.loadWorlds()) {
+                  if (FriendLoginUpdate.field356 != null && ClientParameter.loadWorlds()) {
                      Login.worldSelectOpen = true;
                      Login.worldSelectPage = 0;
                      Login.worldSelectPagesCount = 0;
                   }
                }
 
-               var3 = MouseHandler.MouseHandler_lastButton;
-               var15 = MouseHandler.MouseHandler_lastPressedX;
-               int var16 = MouseHandler.MouseHandler_lastPressedY;
-               if(var3 == 0) {
-                  var15 = MouseHandler.MouseHandler_x;
-                  var16 = MouseHandler.MouseHandler_y;
+               var1 = MouseHandler.MouseHandler_lastButton;
+               var2 = MouseHandler.MouseHandler_lastPressedX;
+               int var17 = MouseHandler.MouseHandler_lastPressedY;
+               if (var1 == 0) {
+                  var2 = MouseHandler.MouseHandler_x;
+                  var17 = MouseHandler.MouseHandler_y;
                }
 
-               if(!AbstractRasterProvider.mouseCam && var3 == 4) {
-                  var3 = 1;
+               if (!AbstractRasterProvider.mouseCam && var1 == 4) {
+                  var1 = 1;
                }
 
-               int var7;
-               short var8;
-               if(Login.loginIndex == 0) {
-                  boolean var17 = false;
+               int var18;
+               short var19;
+               if (Login.loginIndex == 0) {
+                  boolean var8 = false;
 
-                  while(Decimator.method2490()) {
-                     if(IndexStoreAction.__ik_cn == 84) {
-                        var17 = true;
+                  while (Decimator.method2490()) {
+                     if (ArchiveDiskAction.field411 == 84) {
+                        var8 = true;
                      }
                   }
 
-                  var7 = Varps.loginBoxCenter - 80;
-                  var8 = 291;
-                  if(var3 == 1 && var15 >= var7 - 75 && var15 <= var7 + 75 && var16 >= var8 - 20 && var16 <= var8 + 20) {
-                     WorldMapCacheName.method635(Message.method1227("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false);
+                  var18 = Varps.loginBoxCenter - 80;
+                  var19 = 291;
+                  if (var1 == 1 && var2 >= var18 - 75 && var2 <= var18 + 75 && var17 >= var19 - 20 && var17 <= var19 + 20) {
+                     WorldMapCacheName.openURL(Message.method1227("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false);
                   }
 
-                  var7 = Varps.loginBoxCenter + 80;
-                  if(var3 == 1 && var15 >= var7 - 75 && var15 <= var7 + 75 && var16 >= var8 - 20 && var16 <= var8 + 20 || var17) {
-                     if((Client.worldProperties & 0x2000000) != 0) {
+                  var18 = Varps.loginBoxCenter + 80;
+                  if (var1 == 1 && var2 >= var18 - 75 && var2 <= var18 + 75 && var17 >= var19 - 20 && var17 <= var19 + 20 || var8) {
+                     if ((Client.worldProperties & 33554432) != 0) {
                         Login.Login_response0 = "";
                         Login.Login_response1 = "This is a <col=00ffff>Beta<col=ffffff> world.";
                         Login.Login_response2 = "Your normal account will not be affected.";
                         Login.Login_response3 = "";
                         Login.loginIndex = 1;
                         class196.method3740();
-                     } else if((Client.worldProperties & 4) != 0) {
-                        if((Client.worldProperties & 1024) != 0) {
+                     } else if ((Client.worldProperties & 4) != 0) {
+                        if ((Client.worldProperties & 1024) != 0) {
                            Login.Login_response1 = "This is a <col=ffff00>High Risk <col=ff0000>PvP<col=ffffff> world.";
                            Login.Login_response2 = "Players can attack each other almost everywhere";
-                           Login.Login_response3 = "and the Protect Item prayer won\'t work.";
+                           Login.Login_response3 = "and the Protect Item prayer won't work.";
                         } else {
                            Login.Login_response1 = "This is a <col=ff0000>PvP<col=ffffff> world.";
                            Login.Login_response2 = "Players can attack each other";
@@ -227,7 +141,7 @@ public final class class54 {
                         Login.Login_response0 = "Warning!";
                         Login.loginIndex = 1;
                         class196.method3740();
-                     } else if((Client.worldProperties & 1024) != 0) {
+                     } else if ((Client.worldProperties & 1024) != 0) {
                         Login.Login_response1 = "This is a <col=ffff00>High Risk<col=ffffff> world.";
                         Login.Login_response2 = "The Protect Item prayer will";
                         Login.Login_response3 = "not work on this world.";
@@ -239,50 +153,50 @@ public final class class54 {
                      }
                   }
                } else {
-                  int var18;
+                  int var9;
                   short var20;
-                  if(Login.loginIndex != 1) {
-                     boolean var9;
-                     int var10;
-                     short var19;
-                     if(Login.loginIndex == 2) {
-                        var19 = 201;
-                        var18 = var19 + 52;
-                        if(var3 == 1 && var16 >= var18 - 12 && var16 < var18 + 2) {
+                  if (Login.loginIndex != 1) {
+                     boolean var10;
+                     int var11;
+                     short var12;
+                     if (Login.loginIndex == 2) {
+                        var12 = 201;
+                        var9 = var12 + 52;
+                        if (var1 == 1 && var17 >= var9 - 12 && var17 < var9 + 2) {
                            Login.currentLoginField = 0;
                         }
 
-                        var18 += 15;
-                        if(var3 == 1 && var16 >= var18 - 12 && var16 < var18 + 2) {
+                        var9 += 15;
+                        if (var1 == 1 && var17 >= var9 - 12 && var17 < var9 + 2) {
                            Login.currentLoginField = 1;
                         }
 
-                        var18 += 15;
-                        var19 = 361;
-                        if(TilePaint.__eb_ah != null) {
-                           var7 = TilePaint.__eb_ah.__q / 2;
-                           if(var3 == 1 && var15 >= TilePaint.__eb_ah.__m - var7 && var15 <= var7 + TilePaint.__eb_ah.__m && var16 >= var19 - 15 && var16 < var19) {
-                              switch(Login.__cu_ac) {
+                        var9 += 15;
+                        var12 = 361;
+                        if (TilePaint.field907 != null) {
+                           var18 = TilePaint.field907.field43 / 2;
+                           if (var1 == 1 && var2 >= TilePaint.field907.field41 - var18 && var2 <= var18 + TilePaint.field907.field41 && var17 >= var12 - 15 && var17 < var12) {
+                              switch(Login.field467) {
                               case 1:
                                  method1089("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address.");
                                  Login.loginIndex = 5;
                                  return;
                               case 2:
-                                 WorldMapCacheName.method635("https://support.runescape.com/hc/en-gb", true, false);
+                                 WorldMapCacheName.openURL("https://support.runescape.com/hc/en-gb", true, false);
                               }
                            }
                         }
 
-                        var7 = Varps.loginBoxCenter - 80;
-                        var8 = 321;
-                        if(var3 == 1 && var15 >= var7 - 75 && var15 <= var7 + 75 && var16 >= var8 - 20 && var16 <= var8 + 20) {
+                        var18 = Varps.loginBoxCenter - 80;
+                        var19 = 321;
+                        if (var1 == 1 && var2 >= var18 - 75 && var2 <= var18 + 75 && var17 >= var19 - 20 && var17 <= var19 + 20) {
                            Login.Login_username = Login.Login_username.trim();
-                           if(Login.Login_username.length() == 0) {
+                           if (Login.Login_username.length() == 0) {
                               method1089("", "Please enter your username/email address.", "");
                               return;
                            }
 
-                           if(Login.Login_password.length() == 0) {
+                           if (Login.Login_password.length() == 0) {
                               method1089("", "Please enter your password.", "");
                               return;
                            }
@@ -293,88 +207,88 @@ public final class class54 {
                            return;
                         }
 
-                        var7 = Login.loginBoxX + 180 + 80;
-                        if(var3 == 1 && var15 >= var7 - 75 && var15 <= var7 + 75 && var16 >= var8 - 20 && var16 <= var8 + 20) {
+                        var18 = Login.loginBoxX + 180 + 80;
+                        if (var1 == 1 && var2 >= var18 - 75 && var2 <= var18 + 75 && var17 >= var19 - 20 && var17 <= var19 + 20) {
                            Login.loginIndex = 0;
                            Login.Login_username = "";
                            Login.Login_password = "";
                            class13.otpInt = 0;
                            Login.otp = "";
-                           Login.__cu_ba = true;
+                           Login.field470 = true;
                         }
 
-                        var7 = Varps.loginBoxCenter + -117;
-                        var8 = 277;
-                        Login.__cu_aa = var15 >= var7 && var15 < var7 + class168.optionButtonSpriteSubWidth && var16 >= var8 && var16 < var8 + GroundItemPile.optionButtonSpriteSubHeight;
-                        if(var3 == 1 && Login.__cu_aa) {
+                        var18 = Varps.loginBoxCenter + -117;
+                        var19 = 277;
+                        Login.field468 = var2 >= var18 && var2 < var18 + class168.optionButtonSpriteSubWidth && var17 >= var19 && var17 < var19 + GroundItemPile.optionButtonSpriteSubHeight;
+                        if (var1 == 1 && Login.field468) {
                            Client.Login_isUsernameRemembered = !Client.Login_isUsernameRemembered;
-                           if(!Client.Login_isUsernameRemembered && ReflectionCheck.clientPreferences.rememberedUsername != null) {
+                           if (!Client.Login_isUsernameRemembered && ReflectionCheck.clientPreferences.rememberedUsername != null) {
                               ReflectionCheck.clientPreferences.rememberedUsername = null;
-                              WorldMapSection0.savePreferences();
+                              WorldMapSection3.savePreferences();
                            }
                         }
 
-                        var7 = Varps.loginBoxCenter + 24;
-                        var8 = 277;
-                        Login.__cu_ax = var15 >= var7 && var15 < var7 + class168.optionButtonSpriteSubWidth && var16 >= var8 && var16 < var8 + GroundItemPile.optionButtonSpriteSubHeight;
-                        if(var3 == 1 && Login.__cu_ax) {
+                        var18 = Varps.loginBoxCenter + 24;
+                        var19 = 277;
+                        Login.field469 = var2 >= var18 && var2 < var18 + class168.optionButtonSpriteSubWidth && var17 >= var19 && var17 < var19 + GroundItemPile.optionButtonSpriteSubHeight;
+                        if (var1 == 1 && Login.field469) {
                            ReflectionCheck.clientPreferences.hideUsername = !ReflectionCheck.clientPreferences.hideUsername;
-                           if(!ReflectionCheck.clientPreferences.hideUsername) {
+                           if (!ReflectionCheck.clientPreferences.hideUsername) {
                               Login.Login_username = "";
                               ReflectionCheck.clientPreferences.rememberedUsername = null;
                               class196.method3740();
                            }
 
-                           WorldMapSection0.savePreferences();
+                           WorldMapSection3.savePreferences();
                         }
 
-                        while(true) {
-                           while(Decimator.method2490()) {
-                              var9 = false;
+                        while (true) {
+                           while (Decimator.method2490()) {
+                              var10 = false;
 
-                              for(var10 = 0; var10 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:\'@#~,<.>/?\\| ".length(); ++var10) {
-                                 if(GzipDecompressor.__go_ck == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:\'@#~,<.>/?\\| ".charAt(var10)) {
-                                    var9 = true;
+                              for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var11) {
+                                 if (GzipDecompressor.field378 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11)) {
+                                    var10 = true;
                                     break;
                                  }
                               }
 
-                              if(IndexStoreAction.__ik_cn == 13) {
+                              if (ArchiveDiskAction.field411 == 13) {
                                  Login.loginIndex = 0;
                                  Login.Login_username = "";
                                  Login.Login_password = "";
                                  class13.otpInt = 0;
                                  Login.otp = "";
-                                 Login.__cu_ba = true;
-                              } else if(Login.currentLoginField == 0) {
-                                 if(IndexStoreAction.__ik_cn == 85 && Login.Login_username.length() > 0) {
+                                 Login.field470 = true;
+                              } else if (Login.currentLoginField == 0) {
+                                 if (ArchiveDiskAction.field411 == 85 && Login.Login_username.length() > 0) {
                                     Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1);
                                  }
 
-                                 if(IndexStoreAction.__ik_cn == 84 || IndexStoreAction.__ik_cn == 80) {
+                                 if (ArchiveDiskAction.field411 == 84 || ArchiveDiskAction.field411 == 80) {
                                     Login.currentLoginField = 1;
                                  }
 
-                                 if(var9 && Login.Login_username.length() < 320) {
-                                    Login.Login_username = Login.Login_username + GzipDecompressor.__go_ck;
+                                 if (var10 && Login.Login_username.length() < 320) {
+                                    Login.Login_username = Login.Login_username + GzipDecompressor.field378;
                                  }
-                              } else if(Login.currentLoginField == 1) {
-                                 if(IndexStoreAction.__ik_cn == 85 && Login.Login_password.length() > 0) {
+                              } else if (Login.currentLoginField == 1) {
+                                 if (ArchiveDiskAction.field411 == 85 && Login.Login_password.length() > 0) {
                                     Login.Login_password = Login.Login_password.substring(0, Login.Login_password.length() - 1);
                                  }
 
-                                 if(IndexStoreAction.__ik_cn == 84 || IndexStoreAction.__ik_cn == 80) {
+                                 if (ArchiveDiskAction.field411 == 84 || ArchiveDiskAction.field411 == 80) {
                                     Login.currentLoginField = 0;
                                  }
 
-                                 if(IndexStoreAction.__ik_cn == 84) {
+                                 if (ArchiveDiskAction.field411 == 84) {
                                     Login.Login_username = Login.Login_username.trim();
-                                    if(Login.Login_username.length() == 0) {
+                                    if (Login.Login_username.length() == 0) {
                                        method1089("", "Please enter your username/email address.", "");
                                        return;
                                     }
 
-                                    if(Login.Login_password.length() == 0) {
+                                    if (Login.Login_password.length() == 0) {
                                        method1089("", "Please enter your password.", "");
                                        return;
                                     }
@@ -385,36 +299,38 @@ public final class class54 {
                                     return;
                                  }
 
-                                 if(var9 && Login.Login_password.length() < 20) {
-                                    Login.Login_password = Login.Login_password + GzipDecompressor.__go_ck;
+                                 if (var10 && Login.Login_password.length() < 20) {
+                                    Login.Login_password = Login.Login_password + GzipDecompressor.field378;
                                  }
                               }
                            }
 
                            return;
                         }
-                     } else if(Login.loginIndex == 3) {
-                        var18 = Login.loginBoxX + 180;
+                     }
+
+                     if (Login.loginIndex == 3) {
+                        var9 = Login.loginBoxX + 180;
                         var20 = 276;
-                        if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
+                        if (var1 == 1 && var2 >= var9 - 75 && var2 <= var9 + 75 && var17 >= var20 - 20 && var17 <= var20 + 20) {
                            MouseHandler.method1084(false);
                         }
 
-                        var18 = Login.loginBoxX + 180;
+                        var9 = Login.loginBoxX + 180;
                         var20 = 326;
-                        if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
+                        if (var1 == 1 && var2 >= var9 - 75 && var2 <= var9 + 75 && var17 >= var20 - 20 && var17 <= var20 + 20) {
                            method1089("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address.");
                            Login.loginIndex = 5;
                            return;
                         }
                      } else {
-                        int var22;
-                        if(Login.loginIndex == 4) {
-                           var18 = Login.loginBoxX + 180 - 80;
+                        int var13;
+                        if (Login.loginIndex == 4) {
+                           var9 = Login.loginBoxX + 180 - 80;
                            var20 = 321;
-                           if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
+                           if (var1 == 1 && var2 >= var9 - 75 && var2 <= var9 + 75 && var17 >= var20 - 20 && var17 <= var20 + 20) {
                               Login.otp.trim();
-                              if(Login.otp.length() != 6) {
+                              if (Login.otp.length() != 6) {
                                  method1089("", "Please enter a 6-digit PIN.", "");
                                  return;
                               }
@@ -427,16 +343,16 @@ public final class class54 {
                               return;
                            }
 
-                           if(var3 == 1 && var15 >= Login.loginBoxX + 180 - 9 && var15 <= Login.loginBoxX + 180 + 130 && var16 >= 263 && var16 <= 296) {
-                              Login.__cu_ba = !Login.__cu_ba;
+                           if (var1 == 1 && var2 >= Login.loginBoxX + 180 - 9 && var2 <= Login.loginBoxX + 180 + 130 && var17 >= 263 && var17 <= 296) {
+                              Login.field470 = !Login.field470;
                            }
 
-                           if(var3 == 1 && var15 >= Login.loginBoxX + 180 - 34 && var15 <= Login.loginBoxX + 34 + 180 && var16 >= 351 && var16 <= 363) {
-                              WorldMapCacheName.method635(Message.method1227("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false);
+                           if (var1 == 1 && var2 >= Login.loginBoxX + 180 - 34 && var2 <= Login.loginBoxX + 34 + 180 && var17 >= 351 && var17 <= 363) {
+                              WorldMapCacheName.openURL(Message.method1227("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false);
                            }
 
-                           var18 = Login.loginBoxX + 180 + 80;
-                           if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
+                           var9 = Login.loginBoxX + 180 + 80;
+                           if (var1 == 1 && var2 >= var9 - 75 && var2 <= var9 + 75 && var17 >= var20 - 20 && var17 <= var20 + 20) {
                               Login.loginIndex = 0;
                               Login.Login_username = "";
                               Login.Login_password = "";
@@ -444,30 +360,30 @@ public final class class54 {
                               Login.otp = "";
                            }
 
-                           while(Decimator.method2490()) {
-                              boolean var21 = false;
+                           while (Decimator.method2490()) {
+                              boolean var14 = false;
 
-                              for(var22 = 0; var22 < "1234567890".length(); ++var22) {
-                                 if(GzipDecompressor.__go_ck == "1234567890".charAt(var22)) {
-                                    var21 = true;
+                              for (var13 = 0; var13 < "1234567890".length(); ++var13) {
+                                 if (GzipDecompressor.field378 == "1234567890".charAt(var13)) {
+                                    var14 = true;
                                     break;
                                  }
                               }
 
-                              if(IndexStoreAction.__ik_cn == 13) {
+                              if (ArchiveDiskAction.field411 == 13) {
                                  Login.loginIndex = 0;
                                  Login.Login_username = "";
                                  Login.Login_password = "";
                                  class13.otpInt = 0;
                                  Login.otp = "";
                               } else {
-                                 if(IndexStoreAction.__ik_cn == 85 && Login.otp.length() > 0) {
+                                 if (ArchiveDiskAction.field411 == 85 && Login.otp.length() > 0) {
                                     Login.otp = Login.otp.substring(0, Login.otp.length() - 1);
                                  }
 
-                                 if(IndexStoreAction.__ik_cn == 84) {
+                                 if (ArchiveDiskAction.field411 == 84) {
                                     Login.otp.trim();
-                                    if(Login.otp.length() != 6) {
+                                    if (Login.otp.length() != 6) {
                                        method1089("", "Please enter a 6-digit PIN.", "");
                                        return;
                                     }
@@ -480,156 +396,222 @@ public final class class54 {
                                     return;
                                  }
 
-                                 if(var21 && Login.otp.length() < 6) {
-                                    Login.otp = Login.otp + GzipDecompressor.__go_ck;
+                                 if (var14 && Login.otp.length() < 6) {
+                                    Login.otp = Login.otp + GzipDecompressor.field378;
                                  }
                               }
                            }
-                        } else if(Login.loginIndex == 5) {
-                           var18 = Login.loginBoxX + 180 - 80;
+                        } else if (Login.loginIndex == 5) {
+                           var9 = Login.loginBoxX + 180 - 80;
                            var20 = 321;
-                           if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
-                              NpcDefinition.method5162();
+                           if (var1 == 1 && var2 >= var9 - 75 && var2 <= var9 + 75 && var17 >= var20 - 20 && var17 <= var20 + 20) {
+                              NPCDefinition.method5162();
                               return;
                            }
 
-                           var18 = Login.loginBoxX + 180 + 80;
-                           if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
+                           var9 = Login.loginBoxX + 180 + 80;
+                           if (var1 == 1 && var2 >= var9 - 75 && var2 <= var9 + 75 && var17 >= var20 - 20 && var17 <= var20 + 20) {
                               MouseHandler.method1084(true);
                            }
 
-                           var8 = 361;
-                           if(UrlRequester.__eo_ak != null) {
-                              var22 = UrlRequester.__eo_ak.__q / 2;
-                              if(var3 == 1 && var15 >= UrlRequester.__eo_ak.__m - var22 && var15 <= var22 + UrlRequester.__eo_ak.__m && var16 >= var8 - 15 && var16 < var8) {
-                                 WorldMapCacheName.method635(Message.method1227("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false);
+                           var19 = 361;
+                           if (UrlRequester.field930 != null) {
+                              var13 = UrlRequester.field930.field43 / 2;
+                              if (var1 == 1 && var2 >= UrlRequester.field930.field41 - var13 && var2 <= var13 + UrlRequester.field930.field41 && var17 >= var19 - 15 && var17 < var19) {
+                                 WorldMapCacheName.openURL(Message.method1227("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false);
                               }
                            }
 
-                           while(Decimator.method2490()) {
-                              var9 = false;
+                           while (Decimator.method2490()) {
+                              var10 = false;
 
-                              for(var10 = 0; var10 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:\'@#~,<.>/?\\| ".length(); ++var10) {
-                                 if(GzipDecompressor.__go_ck == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:\'@#~,<.>/?\\| ".charAt(var10)) {
-                                    var9 = true;
+                              for (var11 = 0; var11 < "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".length(); ++var11) {
+                                 if (GzipDecompressor.field378 == "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"£$%^&*()-_=+[{]};:'@#~,<.>/?\\| ".charAt(var11)) {
+                                    var10 = true;
                                     break;
                                  }
                               }
 
-                              if(IndexStoreAction.__ik_cn == 13) {
+                              if (ArchiveDiskAction.field411 == 13) {
                                  MouseHandler.method1084(true);
                               } else {
-                                 if(IndexStoreAction.__ik_cn == 85 && Login.Login_username.length() > 0) {
+                                 if (ArchiveDiskAction.field411 == 85 && Login.Login_username.length() > 0) {
                                     Login.Login_username = Login.Login_username.substring(0, Login.Login_username.length() - 1);
                                  }
 
-                                 if(IndexStoreAction.__ik_cn == 84) {
-                                    NpcDefinition.method5162();
+                                 if (ArchiveDiskAction.field411 == 84) {
+                                    NPCDefinition.method5162();
                                     return;
                                  }
 
-                                 if(var9 && Login.Login_username.length() < 320) {
-                                    Login.Login_username = Login.Login_username + GzipDecompressor.__go_ck;
+                                 if (var10 && Login.Login_username.length() < 320) {
+                                    Login.Login_username = Login.Login_username + GzipDecompressor.field378;
                                  }
                               }
                            }
-                        } else if(Login.loginIndex == 6) {
-                           while(true) {
-                              do {
-                                 if(!Decimator.method2490()) {
-                                    var19 = 321;
-                                    if(var3 == 1 && var16 >= var19 - 20 && var16 <= var19 + 20) {
-                                       MouseHandler.method1084(true);
+                        } else {
+                           if (Login.loginIndex == 6) {
+                              while (true) {
+                                 do {
+                                    if (!Decimator.method2490()) {
+                                       var12 = 321;
+                                       if (var1 == 1 && var17 >= var12 - 20 && var17 <= var12 + 20) {
+                                          MouseHandler.method1084(true);
+                                       }
+
+                                       return;
                                     }
+                                 } while(ArchiveDiskAction.field411 != 84 && ArchiveDiskAction.field411 != 13);
 
-                                    return;
-                                 }
-                              } while(IndexStoreAction.__ik_cn != 84 && IndexStoreAction.__ik_cn != 13);
-
-                              MouseHandler.method1084(true);
-                           }
-                        } else if(Login.loginIndex == 7) {
-                           var18 = Login.loginBoxX + 180 - 80;
-                           var20 = 321;
-                           if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
-                              WorldMapCacheName.method635(Message.method1227("secure", true) + "m=dob/set_dob.ws", true, false);
-                              method1089("", "Page has opened in a new window.", "(Please check your popup blocker.)");
-                              Login.loginIndex = 6;
-                              return;
+                                 MouseHandler.method1084(true);
+                              }
                            }
 
-                           var18 = Login.loginBoxX + 180 + 80;
-                           if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
-                              MouseHandler.method1084(true);
-                           }
-                        } else if(Login.loginIndex == 8) {
-                           var18 = Login.loginBoxX + 180 - 80;
-                           var20 = 321;
-                           if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
-                              WorldMapCacheName.method635("https://www.jagex.com/terms/privacy/#eight", true, false);
-                              method1089("", "Page has opened in a new window.", "(Please check your popup blocker.)");
-                              Login.loginIndex = 6;
-                              return;
-                           }
+                           if (Login.loginIndex == 7) {
+                              var9 = Login.loginBoxX + 180 - 80;
+                              var20 = 321;
+                              if (var1 == 1 && var2 >= var9 - 75 && var2 <= var9 + 75 && var17 >= var20 - 20 && var17 <= var20 + 20) {
+                                 WorldMapCacheName.openURL(Message.method1227("secure", true) + "m=dob/set_dob.ws", true, false);
+                                 method1089("", "Page has opened in a new window.", "(Please check your popup blocker.)");
+                                 Login.loginIndex = 6;
+                                 return;
+                              }
 
-                           var18 = Login.loginBoxX + 180 + 80;
-                           if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
-                              MouseHandler.method1084(true);
-                           }
-                        } else if(Login.loginIndex == 12) {
-                           String var14 = "";
-                           switch(Login.__cu_aj) {
-                           case 0:
-                              var14 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans";
-                              break;
-                           case 1:
-                              var14 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked";
-                              break;
-                           default:
-                              MouseHandler.method1084(false);
-                           }
+                              var9 = Login.loginBoxX + 180 + 80;
+                              if (var1 == 1 && var2 >= var9 - 75 && var2 <= var9 + 75 && var17 >= var20 - 20 && var17 <= var20 + 20) {
+                                 MouseHandler.method1084(true);
+                              }
+                           } else if (Login.loginIndex == 8) {
+                              var9 = Login.loginBoxX + 180 - 80;
+                              var20 = 321;
+                              if (var1 == 1 && var2 >= var9 - 75 && var2 <= var9 + 75 && var17 >= var20 - 20 && var17 <= var20 + 20) {
+                                 WorldMapCacheName.openURL("https://www.jagex.com/terms/privacy/#eight", true, false);
+                                 method1089("", "Page has opened in a new window.", "(Please check your popup blocker.)");
+                                 Login.loginIndex = 6;
+                                 return;
+                              }
 
-                           var7 = Login.loginBoxX + 180;
-                           var8 = 276;
-                           if(var3 == 1 && var15 >= var7 - 75 && var15 <= var7 + 75 && var16 >= var8 - 20 && var16 <= var8 + 20) {
-                              WorldMapCacheName.method635(var14, true, false);
-                              method1089("", "Page has opened in a new window.", "(Please check your popup blocker.)");
-                              Login.loginIndex = 6;
-                              return;
-                           }
+                              var9 = Login.loginBoxX + 180 + 80;
+                              if (var1 == 1 && var2 >= var9 - 75 && var2 <= var9 + 75 && var17 >= var20 - 20 && var17 <= var20 + 20) {
+                                 MouseHandler.method1084(true);
+                              }
+                           } else if (Login.loginIndex == 12) {
+                              String var21 = "";
+                              switch(Login.field466) {
+                              case 0:
+                                 var21 = "https://support.runescape.com/hc/en-gb/articles/115002238729-Account-Bans";
+                                 break;
+                              case 1:
+                                 var21 = "https://support.runescape.com/hc/en-gb/articles/206103939-My-account-is-locked";
+                                 break;
+                              default:
+                                 MouseHandler.method1084(false);
+                              }
 
-                           var7 = Login.loginBoxX + 180;
-                           var8 = 326;
-                           if(var3 == 1 && var15 >= var7 - 75 && var15 <= var7 + 75 && var16 >= var8 - 20 && var16 <= var8 + 20) {
-                              MouseHandler.method1084(false);
+                              var18 = Login.loginBoxX + 180;
+                              var19 = 276;
+                              if (var1 == 1 && var2 >= var18 - 75 && var2 <= var18 + 75 && var17 >= var19 - 20 && var17 <= var19 + 20) {
+                                 WorldMapCacheName.openURL(var21, true, false);
+                                 method1089("", "Page has opened in a new window.", "(Please check your popup blocker.)");
+                                 Login.loginIndex = 6;
+                                 return;
+                              }
+
+                              var18 = Login.loginBoxX + 180;
+                              var19 = 326;
+                              if (var1 == 1 && var2 >= var18 - 75 && var2 <= var18 + 75 && var17 >= var19 - 20 && var17 <= var19 + 20) {
+                                 MouseHandler.method1084(false);
+                              }
                            }
                         }
                      }
                   } else {
-                     while(Decimator.method2490()) {
-                        if(IndexStoreAction.__ik_cn == 84) {
+                     while (Decimator.method2490()) {
+                        if (ArchiveDiskAction.field411 == 84) {
                            MouseHandler.method1084(false);
-                        } else if(IndexStoreAction.__ik_cn == 13) {
+                        } else if (ArchiveDiskAction.field411 == 13) {
                            Login.loginIndex = 0;
                         }
                      }
 
-                     var18 = Varps.loginBoxCenter - 80;
+                     var9 = Varps.loginBoxCenter - 80;
                      var20 = 321;
-                     if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
+                     if (var1 == 1 && var2 >= var9 - 75 && var2 <= var9 + 75 && var17 >= var20 - 20 && var17 <= var20 + 20) {
                         MouseHandler.method1084(false);
                      }
 
-                     var18 = Varps.loginBoxCenter + 80;
-                     if(var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
+                     var9 = Varps.loginBoxCenter + 80;
+                     if (var1 == 1 && var2 >= var9 - 75 && var2 <= var9 + 75 && var17 >= var20 - 20 && var17 <= var20 + 20) {
                         Login.loginIndex = 0;
                      }
                   }
                }
+            }
+         }
+      } else {
+         while (true) {
+            if (!Decimator.method2490()) {
+               if (MouseHandler.MouseHandler_lastButton == 1 || !AbstractRasterProvider.mouseCam && MouseHandler.MouseHandler_lastButton == 4) {
+                  int var3 = Login.xPadding + 280;
+                  if (MouseHandler.MouseHandler_lastPressedX >= var3 && MouseHandler.MouseHandler_lastPressedX <= var3 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
+                     Interpreter.changeWorldSelectSorting(0, 0);
+                  } else if (MouseHandler.MouseHandler_lastPressedX >= var3 + 15 && MouseHandler.MouseHandler_lastPressedX <= var3 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
+                     Interpreter.changeWorldSelectSorting(0, 1);
+                  } else {
+                     int var4 = Login.xPadding + 390;
+                     if (MouseHandler.MouseHandler_lastPressedX >= var4 && MouseHandler.MouseHandler_lastPressedX <= var4 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
+                        Interpreter.changeWorldSelectSorting(1, 0);
+                     } else if (MouseHandler.MouseHandler_lastPressedX >= var4 + 15 && MouseHandler.MouseHandler_lastPressedX <= var4 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
+                        Interpreter.changeWorldSelectSorting(1, 1);
+                     } else {
+                        var1 = Login.xPadding + 500;
+                        if (MouseHandler.MouseHandler_lastPressedX >= var1 && MouseHandler.MouseHandler_lastPressedX <= var1 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
+                           Interpreter.changeWorldSelectSorting(2, 0);
+                        } else if (MouseHandler.MouseHandler_lastPressedX >= var1 + 15 && MouseHandler.MouseHandler_lastPressedX <= var1 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
+                           Interpreter.changeWorldSelectSorting(2, 1);
+                        } else {
+                           var2 = Login.xPadding + 610;
+                           if (MouseHandler.MouseHandler_lastPressedX >= var2 && MouseHandler.MouseHandler_lastPressedX <= var2 + 14 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
+                              Interpreter.changeWorldSelectSorting(3, 0);
+                           } else if (MouseHandler.MouseHandler_lastPressedX >= var2 + 15 && MouseHandler.MouseHandler_lastPressedX <= var2 + 80 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedY <= 18) {
+                              Interpreter.changeWorldSelectSorting(3, 1);
+                           } else if (MouseHandler.MouseHandler_lastPressedX >= Login.xPadding + 708 && MouseHandler.MouseHandler_lastPressedY >= 4 && MouseHandler.MouseHandler_lastPressedX <= Login.xPadding + 708 + 50 && MouseHandler.MouseHandler_lastPressedY <= 20) {
+                              FontName.closeWorldSelect();
+                           } else if (Login.hoveredWorldIndex != -1) {
+                              World var5 = ItemContainer.worlds[Login.hoveredWorldIndex];
+                              class31.changeWorld(var5);
+                              FontName.closeWorldSelect();
+                           } else {
+                              if (Login.worldSelectPage > 0 && SecureRandomFuture.worldSelectLeftSprite != null && MouseHandler.MouseHandler_lastPressedX >= 0 && MouseHandler.MouseHandler_lastPressedX <= SecureRandomFuture.worldSelectLeftSprite.subWidth && MouseHandler.MouseHandler_lastPressedY >= Huffman.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= Huffman.canvasHeight / 2 + 50) {
+                                 --Login.worldSelectPage;
+                              }
 
+                              if (Login.worldSelectPage < Login.worldSelectPagesCount && NetSocket.worldSelectRightSprite != null && MouseHandler.MouseHandler_lastPressedX >= SoundCache.canvasWidth - NetSocket.worldSelectRightSprite.subWidth - 5 && MouseHandler.MouseHandler_lastPressedX <= SoundCache.canvasWidth && MouseHandler.MouseHandler_lastPressedY >= Huffman.canvasHeight / 2 - 50 && MouseHandler.MouseHandler_lastPressedY <= Huffman.canvasHeight / 2 + 50) {
+                                 ++Login.worldSelectPage;
+                              }
+                           }
+                        }
+                     }
+                  }
+               }
+               break;
+            }
+
+            if (ArchiveDiskAction.field411 == 13) {
+               FontName.closeWorldSelect();
+               break;
+            }
+
+            if (ArchiveDiskAction.field411 == 96) {
+               if (Login.worldSelectPage > 0 && SecureRandomFuture.worldSelectLeftSprite != null) {
+                  --Login.worldSelectPage;
+               }
+            } else if (ArchiveDiskAction.field411 == 97 && Login.worldSelectPage < Login.worldSelectPagesCount && NetSocket.worldSelectRightSprite != null) {
+               ++Login.worldSelectPage;
             }
          }
       }
+
    }
 
    @ObfuscatedName("d")
@@ -650,155 +632,155 @@ public final class class54 {
    )
    static int method1093(int var0, Script var1, boolean var2) {
       int var3;
-      if(var0 == 6600) {
+      if (var0 == 6600) {
          var3 = SoundSystem.plane;
-         int var9 = (Canvas.localPlayer.x >> 7) + class50.baseX;
-         int var5 = (Canvas.localPlayer.y >> 7) + GraphicsObject.baseY;
-         BufferedFile.worldMap().__a_525(var3, var9, var5, true);
+         int var13 = (Canvas.localPlayer.x >> 7) + class50.baseX;
+         int var16 = (Canvas.localPlayer.y >> 7) + GraphicsObject.baseY;
+         BufferedFile.worldMap().method366(var3, var13, var16, true);
          return 1;
       } else {
-         WorldMapArea var11;
-         if(var0 == 6601) {
+         WorldMapArea var4;
+         if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) {
             var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-            String var16 = "";
-            var11 = BufferedFile.worldMap().getMapArea(var3);
-            if(var11 != null) {
-               var16 = var11.name();
+            String var14 = "";
+            var4 = BufferedFile.worldMap().getMapArea(var3);
+            if (var4 != null) {
+               var14 = var4.name();
             }
 
-            Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var16;
+            Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var14;
             return 1;
-         } else if(var0 == 6602) {
+         } else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) {
             var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
             BufferedFile.worldMap().setCurrentMapAreaId(var3);
             return 1;
-         } else if(var0 == 6603) {
+         } else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) {
             Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().getZoomLevel();
             return 1;
-         } else if(var0 == 6604) {
+         } else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) {
             var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
             BufferedFile.worldMap().setZoomLevel(var3);
             return 1;
-         } else if(var0 == 6605) {
-            Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().isCacheLoaded()?1:0;
+         } else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) {
+            Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().isCacheLoaded() ? 1 : 0;
             return 1;
          } else {
-            TileLocation var15;
-            if(var0 == 6606) {
-               var15 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
-               BufferedFile.worldMap().setWorldMapPositionTarget(var15.x, var15.y);
+            Coord var5;
+            if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) {
+               var5 = new Coord(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
+               BufferedFile.worldMap().setWorldMapPositionTarget(var5.x, var5.y);
                return 1;
-            } else if(var0 == 6607) {
-               var15 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
-               BufferedFile.worldMap().__aw_531(var15.x, var15.y);
+            } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) {
+               var5 = new Coord(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
+               BufferedFile.worldMap().setWorldMapPositionTargetInstant(var5.x, var5.y);
                return 1;
-            } else if(var0 == 6608) {
-               var15 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
-               BufferedFile.worldMap().__al_532(var15.plane, var15.x, var15.y);
+            } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) {
+               var5 = new Coord(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
+               BufferedFile.worldMap().jumpToSourceCoord(var5.plane, var5.x, var5.y);
                return 1;
-            } else if(var0 == 6609) {
-               var15 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
-               BufferedFile.worldMap().__ab_533(var15.plane, var15.x, var15.y);
+            } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) {
+               var5 = new Coord(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
+               BufferedFile.worldMap().jumpToSourceCoordInstant(var5.plane, var5.x, var5.y);
                return 1;
-            } else if(var0 == 6610) {
-               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().__ae_534();
-               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().__at_535();
+            } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) {
+               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().getDisplayX();
+               Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().getDisplayY();
                return 1;
             } else {
-               WorldMapArea var13;
-               if(var0 == 6611) {
+               WorldMapArea var6;
+               if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) {
                   var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                  var13 = BufferedFile.worldMap().getMapArea(var3);
-                  if(var13 == null) {
+                  var6 = BufferedFile.worldMap().getMapArea(var3);
+                  if (var6 == null) {
                      Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
                   } else {
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var13.origin().packed();
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.origin().packed();
                   }
 
                   return 1;
-               } else if(var0 == 6612) {
+               } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) {
                   var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                  var13 = BufferedFile.worldMap().getMapArea(var3);
-                  if(var13 == null) {
+                  var6 = BufferedFile.worldMap().getMapArea(var3);
+                  if (var6 == null) {
                      Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
                      Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
                   } else {
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (var13.maxX() - var13.minX() + 1) * 64;
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (var13.maxY() - var13.minY() + 1) * 64;
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (var6.maxX() - var6.minX() + 1) * 64;
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = (var6.maxY() - var6.minY() + 1) * 64;
                   }
 
                   return 1;
-               } else if(var0 == 6613) {
+               } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) {
                   var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                  var13 = BufferedFile.worldMap().getMapArea(var3);
-                  if(var13 == null) {
+                  var6 = BufferedFile.worldMap().getMapArea(var3);
+                  if (var6 == null) {
                      Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
                      Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
                      Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
                      Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
                   } else {
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var13.minX() * 64;
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var13.minY() * 64;
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var13.maxX() * 64 + 64 - 1;
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var13.maxY() * 64 + 64 - 1;
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.minX() * 64;
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.minY() * 64;
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.maxX() * 64 + 64 - 1;
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.maxY() * 64 + 64 - 1;
                   }
 
                   return 1;
-               } else if(var0 == 6614) {
+               } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) {
                   var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                  var13 = BufferedFile.worldMap().getMapArea(var3);
-                  if(var13 == null) {
+                  var6 = BufferedFile.worldMap().getMapArea(var3);
+                  if (var6 == null) {
                      Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                   } else {
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var13.zoom();
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.zoom();
                   }
 
                   return 1;
-               } else if(var0 == 6615) {
-                  var15 = BufferedFile.worldMap().__ad_536();
-                  if(var15 == null) {
+               } else if (var0 == 6615) {
+                  var5 = BufferedFile.worldMap().getDisplayCoord();
+                  if (var5 == null) {
                      Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                      Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                   } else {
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var15.x;
-                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var15.y;
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var5.x;
+                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var5.y;
                   }
 
                   return 1;
-               } else if(var0 == 6616) {
+               } else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) {
                   Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().currentMapAreaId();
                   return 1;
-               } else if(var0 == 6617) {
-                  var15 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
-                  var13 = BufferedFile.worldMap().getCurrentMapArea();
-                  if(var13 == null) {
+               } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) {
+                  var5 = new Coord(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
+                  var6 = BufferedFile.worldMap().getCurrentMapArea();
+                  if (var6 == null) {
                      Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                      Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                      return 1;
                   } else {
-                     int[] var14 = var13.position(var15.plane, var15.x, var15.y);
-                     if(var14 == null) {
+                     int[] var15 = var6.position(var5.plane, var5.x, var5.y);
+                     if (var15 == null) {
                         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                      } else {
-                        Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var14[0];
-                        Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var14[1];
+                        Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var15[0];
+                        Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var15[1];
                      }
 
                      return 1;
                   }
                } else {
-                  TileLocation var7;
-                  if(var0 == 6618) {
-                     var15 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
-                     var13 = BufferedFile.worldMap().getCurrentMapArea();
-                     if(var13 == null) {
+                  Coord var7;
+                  if (var0 == 6618) {
+                     var5 = new Coord(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
+                     var6 = BufferedFile.worldMap().getCurrentMapArea();
+                     if (var6 == null) {
                         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                         Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                         return 1;
                      } else {
-                        var7 = var13.coord(var15.x, var15.y);
-                        if(var7 == null) {
+                        var7 = var6.coord(var5.x, var5.y);
+                        if (var7 == null) {
                            Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                         } else {
                            Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var7.packed();
@@ -807,109 +789,109 @@ public final class class54 {
                         return 1;
                      }
                   } else {
-                     TileLocation var12;
-                     if(var0 == 6619) {
+                     Coord var8;
+                     if (var0 == 6619) {
                         RouteStrategy.Interpreter_intStackSize -= 2;
                         var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-                        var12 = new TileLocation(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]);
-                        TotalQuantityComparator.method96(var3, var12, false);
+                        var8 = new Coord(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]);
+                        GrandExchangeOfferTotalQuantityComparator.method96(var3, var8, false);
                         return 1;
-                     } else if(var0 == 6620) {
+                     } else if (var0 == 6620) {
                         RouteStrategy.Interpreter_intStackSize -= 2;
                         var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-                        var12 = new TileLocation(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]);
-                        TotalQuantityComparator.method96(var3, var12, true);
+                        var8 = new Coord(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]);
+                        GrandExchangeOfferTotalQuantityComparator.method96(var3, var8, true);
                         return 1;
-                     } else if(var0 == 6621) {
+                     } else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) {
                         RouteStrategy.Interpreter_intStackSize -= 2;
                         var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-                        var12 = new TileLocation(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]);
-                        var11 = BufferedFile.worldMap().getMapArea(var3);
-                        if(var11 == null) {
+                        var8 = new Coord(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]);
+                        var4 = BufferedFile.worldMap().getMapArea(var3);
+                        if (var4 == null) {
                            Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = 0;
                            return 1;
                         } else {
-                           Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.containsCoord(var12.plane, var12.x, var12.y)?1:0;
+                           Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var4.containsCoord(var8.plane, var8.x, var8.y) ? 1 : 0;
                            return 1;
                         }
-                     } else if(var0 == 6622) {
-                        Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().__ap_537();
-                        Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().__as_538();
+                     } else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) {
+                        Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().getDisplayWith();
+                        Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().getDisplayHeight();
                         return 1;
-                     } else if(var0 == 6623) {
-                        var15 = new TileLocation(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
-                        var13 = BufferedFile.worldMap().mapAreaAtCoord(var15.plane, var15.x, var15.y);
-                        if(var13 == null) {
+                     } else if (var0 == 6623) {
+                        var5 = new Coord(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
+                        var6 = BufferedFile.worldMap().mapAreaAtCoord(var5.plane, var5.x, var5.y);
+                        if (var6 == null) {
                            Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                         } else {
-                           Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var13.id();
+                           Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.id();
                         }
 
                         return 1;
-                     } else if(var0 == 6624) {
-                        BufferedFile.worldMap().__am_539(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
+                     } else if (var0 == 6624) {
+                        BufferedFile.worldMap().method379(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
                         return 1;
-                     } else if(var0 == 6625) {
-                        BufferedFile.worldMap().__an_540();
+                     } else if (var0 == 6625) {
+                        BufferedFile.worldMap().method380();
                         return 1;
-                     } else if(var0 == 6626) {
-                        BufferedFile.worldMap().__az_541(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
+                     } else if (var0 == 6626) {
+                        BufferedFile.worldMap().method381(Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]);
                         return 1;
-                     } else if(var0 == 6627) {
-                        BufferedFile.worldMap().__au_542();
+                     } else if (var0 == 6627) {
+                        BufferedFile.worldMap().method382();
                         return 1;
                      } else {
-                        boolean var10;
-                        if(var0 == 6628) {
-                           var10 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                           BufferedFile.worldMap().perpetualFlash(var10);
+                        boolean var9;
+                        if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) {
+                           var9 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                           BufferedFile.worldMap().setPerpetualFlash(var9);
                            return 1;
-                        } else if(var0 == 6629) {
+                        } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) {
                            var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
                            BufferedFile.worldMap().flashElement(var3);
                            return 1;
-                        } else if(var0 == 6630) {
+                        } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) {
                            var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
                            BufferedFile.worldMap().flashCategory(var3);
                            return 1;
-                        } else if(var0 == 6631) {
+                        } else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) {
                            BufferedFile.worldMap().stopCurrentFlashes();
                            return 1;
-                        } else if(var0 == 6632) {
-                           var10 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
-                           BufferedFile.worldMap().setElementsEnabled(var10);
+                        } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) {
+                           var9 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize] == 1;
+                           BufferedFile.worldMap().setElementsEnabled(var9);
                            return 1;
                         } else {
-                           boolean var4;
-                           if(var0 == 6633) {
+                           boolean var10;
+                           if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) {
                               RouteStrategy.Interpreter_intStackSize -= 2;
                               var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-                              var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1] == 1;
-                              BufferedFile.worldMap().disableElement(var3, var4);
+                              var10 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1] == 1;
+                              BufferedFile.worldMap().disableElement(var3, var10);
                               return 1;
-                           } else if(var0 == 6634) {
+                           } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) {
                               RouteStrategy.Interpreter_intStackSize -= 2;
                               var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-                              var4 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1] == 1;
-                              BufferedFile.worldMap().disableCategory(var3, var4);
+                              var10 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1] == 1;
+                              BufferedFile.worldMap().disableCategory(var3, var10);
                               return 1;
-                           } else if(var0 == 6635) {
-                              Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().getElementsEnabled()?1:0;
+                           } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) {
+                              Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().getElementsEnabled() ? 1 : 0;
                               return 1;
-                           } else if(var0 == 6636) {
+                           } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) {
                               var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                              Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().isElementDisabled(var3)?1:0;
+                              Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().isElementDisabled(var3) ? 1 : 0;
                               return 1;
-                           } else if(var0 == 6637) {
+                           } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) {
                               var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                              Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().isCategoryDisabled(var3)?1:0;
+                              Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = BufferedFile.worldMap().isCategoryDisabled(var3) ? 1 : 0;
                               return 1;
-                           } else if(var0 == 6638) {
+                           } else if (var0 == 6638) {
                               RouteStrategy.Interpreter_intStackSize -= 2;
                               var3 = Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize];
-                              var12 = new TileLocation(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]);
-                              var7 = BufferedFile.worldMap().__bc_545(var3, var12);
-                              if(var7 == null) {
+                              var8 = new Coord(Interpreter.Interpreter_intStack[RouteStrategy.Interpreter_intStackSize + 1]);
+                              var7 = BufferedFile.worldMap().method385(var3, var8);
+                              if (var7 == null) {
                                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                               } else {
                                  Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var7.packed();
@@ -917,73 +899,73 @@ public final class class54 {
 
                               return 1;
                            } else {
-                              AbstractWorldMapIcon var8;
-                              if(var0 == 6639) {
-                                 var8 = BufferedFile.worldMap().iconStart();
-                                 if(var8 == null) {
+                              AbstractWorldMapIcon var11;
+                              if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) {
+                                 var11 = BufferedFile.worldMap().iconStart();
+                                 if (var11 == null) {
                                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                                  } else {
-                                    Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var8.__m_15();
-                                    Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var8.coord2.packed();
+                                    Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.getElement();
+                                    Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.coord2.packed();
                                  }
 
                                  return 1;
-                              } else if(var0 == 6640) {
-                                 var8 = BufferedFile.worldMap().iconNext();
-                                 if(var8 == null) {
+                              } else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) {
+                                 var11 = BufferedFile.worldMap().iconNext();
+                                 if (var11 == null) {
                                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                                  } else {
-                                    Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var8.__m_15();
-                                    Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var8.coord2.packed();
+                                    Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.getElement();
+                                    Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var11.coord2.packed();
                                  }
 
                                  return 1;
                               } else {
-                                 WorldMapElement var6;
-                                 if(var0 == 6693) {
+                                 WorldMapElement var12;
+                                 if (var0 == ScriptOpcodes.MEC_TEXT) {
                                     var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                                    var6 = ViewportMouse.getWorldMapElement(var3);
-                                    if(var6.__l == null) {
+                                    var12 = ViewportMouse.getWorldMapElement(var3);
+                                    if (var12.name == null) {
                                        Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = "";
                                     } else {
-                                       Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var6.__l;
+                                       Interpreter.Interpreter_stringStack[++Interpreter.Interpreter_stringStackSize - 1] = var12.name;
                                     }
 
                                     return 1;
-                                 } else if(var0 == 6694) {
+                                 } else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) {
                                     var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                                    var6 = ViewportMouse.getWorldMapElement(var3);
-                                    Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.textSize;
+                                    var12 = ViewportMouse.getWorldMapElement(var3);
+                                    Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var12.textSize;
                                     return 1;
-                                 } else if(var0 == 6695) {
+                                 } else if (var0 == ScriptOpcodes.MEC_CATEGORY) {
                                     var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                                    var6 = ViewportMouse.getWorldMapElement(var3);
-                                    if(var6 == null) {
+                                    var12 = ViewportMouse.getWorldMapElement(var3);
+                                    if (var12 == null) {
                                        Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                                     } else {
-                                       Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.category;
+                                       Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var12.category;
                                     }
 
                                     return 1;
-                                 } else if(var0 == 6696) {
+                                 } else if (var0 == ScriptOpcodes.MEC_SPRITE) {
                                     var3 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize];
-                                    var6 = ViewportMouse.getWorldMapElement(var3);
-                                    if(var6 == null) {
+                                    var12 = ViewportMouse.getWorldMapElement(var3);
+                                    if (var12 == null) {
                                        Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = -1;
                                     } else {
-                                       Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var6.sprite1;
+                                       Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = var12.sprite1;
                                     }
 
                                     return 1;
-                                 } else if(var0 == 6697) {
+                                 } else if (var0 == 6697) {
                                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class15.worldMapEvent.mapElement;
                                     return 1;
-                                 } else if(var0 == 6698) {
+                                 } else if (var0 == 6698) {
                                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class15.worldMapEvent.coord1.packed();
                                     return 1;
-                                 } else if(var0 == 6699) {
+                                 } else if (var0 == 6699) {
                                     Interpreter.Interpreter_intStack[++RouteStrategy.Interpreter_intStackSize - 1] = class15.worldMapEvent.coord2.packed();
                                     return 1;
                                  } else {
@@ -1012,19 +994,19 @@ public final class class54 {
       int var3;
       int var4;
       int var5;
-      if(Client.oculusOrbState == 0) {
+      if (Client.oculusOrbState == 0) {
          var0 = Canvas.localPlayer.x;
          var1 = Canvas.localPlayer.y;
-         if(MouseHandler.oculusOrbFocalPointX - var0 < -500 || MouseHandler.oculusOrbFocalPointX - var0 > 500 || ScriptEvent.oculusOrbFocalPointY - var1 < -500 || ScriptEvent.oculusOrbFocalPointY - var1 > 500) {
+         if (MouseHandler.oculusOrbFocalPointX - var0 < -500 || MouseHandler.oculusOrbFocalPointX - var0 > 500 || ScriptEvent.oculusOrbFocalPointY - var1 < -500 || ScriptEvent.oculusOrbFocalPointY - var1 > 500) {
             MouseHandler.oculusOrbFocalPointX = var0;
             ScriptEvent.oculusOrbFocalPointY = var1;
          }
 
-         if(var0 != MouseHandler.oculusOrbFocalPointX) {
+         if (var0 != MouseHandler.oculusOrbFocalPointX) {
             MouseHandler.oculusOrbFocalPointX += (var0 - MouseHandler.oculusOrbFocalPointX) / 16;
          }
 
-         if(var1 != ScriptEvent.oculusOrbFocalPointY) {
+         if (var1 != ScriptEvent.oculusOrbFocalPointY) {
             ScriptEvent.oculusOrbFocalPointY += (var1 - ScriptEvent.oculusOrbFocalPointY) / 16;
          }
 
@@ -1033,16 +1015,16 @@ public final class class54 {
          var4 = class32.getTileHeight(MouseHandler.oculusOrbFocalPointX, ScriptEvent.oculusOrbFocalPointY, SoundSystem.plane);
          var5 = 0;
          int var6;
-         if(var2 > 3 && var3 > 3 && var2 < 100 && var3 < 100) {
-            for(var6 = var2 - 4; var6 <= var2 + 4; ++var6) {
-               for(int var7 = var3 - 4; var7 <= var3 + 4; ++var7) {
+         if (var2 > 3 && var3 > 3 && var2 < 100 && var3 < 100) {
+            for (var6 = var2 - 4; var6 <= var2 + 4; ++var6) {
+               for (int var7 = var3 - 4; var7 <= var3 + 4; ++var7) {
                   int var8 = SoundSystem.plane;
-                  if(var8 < 3 && (Tiles.Tiles_renderFlags[1][var6][var7] & 2) == 2) {
+                  if (var8 < 3 && (Tiles.Tiles_renderFlags[1][var6][var7] & 2) == 2) {
                      ++var8;
                   }
 
                   int var9 = var4 - Tiles.Tiles_heights[var8][var6][var7];
-                  if(var9 > var5) {
+                  if (var9 > var5) {
                      var5 = var9;
                   }
                }
@@ -1050,149 +1032,149 @@ public final class class54 {
          }
 
          var6 = var5 * 192;
-         if(var6 > 98048) {
+         if (var6 > 98048) {
             var6 = 98048;
          }
 
-         if(var6 < 32768) {
+         if (var6 < 32768) {
             var6 = 32768;
          }
 
-         if(var6 > Client.__client_ik) {
-            Client.__client_ik += (var6 - Client.__client_ik) / 24;
-         } else if(var6 < Client.__client_ik) {
-            Client.__client_ik += (var6 - Client.__client_ik) / 80;
+         if (var6 > Client.field202) {
+            Client.field202 += (var6 - Client.field202) / 24;
+         } else if (var6 < Client.field202) {
+            Client.field202 += (var6 - Client.field202) / 80;
          }
 
-         MouseRecorder.__bu_hy = class32.getTileHeight(Canvas.localPlayer.x, Canvas.localPlayer.y, SoundSystem.plane) - Client.cameraFollowHeight;
-      } else if(Client.oculusOrbState == 1) {
-         if(Client.__client_ij && Canvas.localPlayer != null) {
+         MouseRecorder.field566 = class32.getTileHeight(Canvas.localPlayer.x, Canvas.localPlayer.y, SoundSystem.plane) - Client.camFollowHeight;
+      } else if (Client.oculusOrbState == 1) {
+         if (Client.field199 && Canvas.localPlayer != null) {
             var0 = Canvas.localPlayer.pathX[0];
             var1 = Canvas.localPlayer.pathY[0];
-            if(var0 >= 0 && var1 >= 0 && var0 < 104 && var1 < 104) {
+            if (var0 >= 0 && var1 >= 0 && var0 < 104 && var1 < 104) {
                MouseHandler.oculusOrbFocalPointX = Canvas.localPlayer.x;
-               var2 = class32.getTileHeight(Canvas.localPlayer.x, Canvas.localPlayer.y, SoundSystem.plane) - Client.cameraFollowHeight;
-               if(var2 < MouseRecorder.__bu_hy) {
-                  MouseRecorder.__bu_hy = var2;
+               var2 = class32.getTileHeight(Canvas.localPlayer.x, Canvas.localPlayer.y, SoundSystem.plane) - Client.camFollowHeight;
+               if (var2 < MouseRecorder.field566) {
+                  MouseRecorder.field566 = var2;
                }
 
                ScriptEvent.oculusOrbFocalPointY = Canvas.localPlayer.y;
-               Client.__client_ij = false;
+               Client.field199 = false;
             }
          }
 
-         short var10 = -1;
-         if(KeyHandler.KeyHandler_pressedKeys[33]) {
-            var10 = 0;
-         } else if(KeyHandler.KeyHandler_pressedKeys[49]) {
-            var10 = 1024;
+         short var11 = -1;
+         if (KeyHandler.KeyHandler_pressedKeys[33]) {
+            var11 = 0;
+         } else if (KeyHandler.KeyHandler_pressedKeys[49]) {
+            var11 = 1024;
          }
 
-         if(KeyHandler.KeyHandler_pressedKeys[48]) {
-            if(var10 == 0) {
-               var10 = 1792;
-            } else if(var10 == 1024) {
-               var10 = 1280;
+         if (KeyHandler.KeyHandler_pressedKeys[48]) {
+            if (var11 == 0) {
+               var11 = 1792;
+            } else if (var11 == 1024) {
+               var11 = 1280;
             } else {
-               var10 = 1536;
+               var11 = 1536;
             }
-         } else if(KeyHandler.KeyHandler_pressedKeys[50]) {
-            if(var10 == 0) {
-               var10 = 256;
-            } else if(var10 == 1024) {
-               var10 = 768;
+         } else if (KeyHandler.KeyHandler_pressedKeys[50]) {
+            if (var11 == 0) {
+               var11 = 256;
+            } else if (var11 == 1024) {
+               var11 = 768;
             } else {
-               var10 = 512;
+               var11 = 512;
             }
          }
 
-         byte var11 = 0;
-         if(KeyHandler.KeyHandler_pressedKeys[35]) {
-            var11 = -1;
-         } else if(KeyHandler.KeyHandler_pressedKeys[51]) {
-            var11 = 1;
+         byte var10 = 0;
+         if (KeyHandler.KeyHandler_pressedKeys[35]) {
+            var10 = -1;
+         } else if (KeyHandler.KeyHandler_pressedKeys[51]) {
+            var10 = 1;
          }
 
          var2 = 0;
-         if(var10 >= 0 || var11 != 0) {
-            var2 = KeyHandler.KeyHandler_pressedKeys[81]?Client.__client_in:Client.oculusOrbNormalSpeed;
+         if (var11 >= 0 || var10 != 0) {
+            var2 = KeyHandler.KeyHandler_pressedKeys[81] ? Client.oculusOrbSlowedSpeed : Client.oculusOrbNormalSpeed;
             var2 *= 16;
-            Client.__client_hk = var10;
-            Client.__client_if = var11;
+            Client.field195 = var11;
+            Client.field196 = var10;
          }
 
-         if(Client.__client_hc < var2) {
-            Client.__client_hc += var2 / 8;
-            if(Client.__client_hc > var2) {
-               Client.__client_hc = var2;
+         if (Client.field194 < var2) {
+            Client.field194 += var2 / 8;
+            if (Client.field194 > var2) {
+               Client.field194 = var2;
             }
-         } else if(Client.__client_hc > var2) {
-            Client.__client_hc = Client.__client_hc * 9 / 10;
+         } else if (Client.field194 > var2) {
+            Client.field194 = Client.field194 * 9 / 10;
          }
 
-         if(Client.__client_hc > 0) {
-            var3 = Client.__client_hc / 16;
-            if(Client.__client_hk >= 0) {
-               var0 = Client.__client_hk - MusicPatchNode.cameraYaw & 2047;
+         if (Client.field194 > 0) {
+            var3 = Client.field194 / 16;
+            if (Client.field195 >= 0) {
+               var0 = Client.field195 - MusicPatchNode.cameraYaw & 2047;
                var4 = Rasterizer3D.Rasterizer3D_sine[var0];
                var5 = Rasterizer3D.Rasterizer3D_cosine[var0];
                MouseHandler.oculusOrbFocalPointX += var3 * var4 / 65536;
                ScriptEvent.oculusOrbFocalPointY += var3 * var5 / 65536;
             }
 
-            if(Client.__client_if != 0) {
-               MouseRecorder.__bu_hy += var3 * Client.__client_if;
-               if(MouseRecorder.__bu_hy > 0) {
-                  MouseRecorder.__bu_hy = 0;
+            if (Client.field196 != 0) {
+               MouseRecorder.field566 += var3 * Client.field196;
+               if (MouseRecorder.field566 > 0) {
+                  MouseRecorder.field566 = 0;
                }
             }
          } else {
-            Client.__client_hk = -1;
-            Client.__client_if = -1;
+            Client.field195 = -1;
+            Client.field196 = -1;
          }
 
-         if(KeyHandler.KeyHandler_pressedKeys[13]) {
-            Client.packetWriter.__q_167(Interpreter.method1915(ClientPacket.__gs_ab, Client.packetWriter.isaacCipher));
+         if (KeyHandler.KeyHandler_pressedKeys[13]) {
+            Client.packetWriter.method241(Interpreter.method1915(ClientPacket.field259, Client.packetWriter.isaacCipher));
             Client.oculusOrbState = 0;
          }
       }
 
-      if(MouseHandler.MouseHandler_currentButton == 4 && AbstractRasterProvider.mouseCam) {
-         var0 = MouseHandler.MouseHandler_y - Client.__client_ht;
-         Client.__client_hu = var0 * 2;
-         Client.__client_ht = var0 != -1 && var0 != 1?(MouseHandler.MouseHandler_y + Client.__client_ht) / 2:MouseHandler.MouseHandler_y;
-         var1 = Client.__client_hi - MouseHandler.MouseHandler_x;
-         Client.__client_hv = var1 * 2;
-         Client.__client_hi = var1 != -1 && var1 != 1?(Client.__client_hi + MouseHandler.MouseHandler_x) / 2:MouseHandler.MouseHandler_x;
+      if (MouseHandler.MouseHandler_currentButton == 4 && AbstractRasterProvider.mouseCam) {
+         var0 = MouseHandler.MouseHandler_y - Client.field193;
+         Client.field191 = var0 * 2;
+         Client.field193 = var0 != -1 && var0 != 1 ? (MouseHandler.MouseHandler_y + Client.field193) / 2 : MouseHandler.MouseHandler_y;
+         var1 = Client.field192 - MouseHandler.MouseHandler_x;
+         Client.field190 = var1 * 2;
+         Client.field192 = var1 != -1 && var1 != 1 ? (Client.field192 + MouseHandler.MouseHandler_x) / 2 : MouseHandler.MouseHandler_x;
       } else {
-         if(KeyHandler.KeyHandler_pressedKeys[96]) {
-            Client.__client_hv += (-24 - Client.__client_hv) / 2;
-         } else if(KeyHandler.KeyHandler_pressedKeys[97]) {
-            Client.__client_hv += (24 - Client.__client_hv) / 2;
+         if (KeyHandler.KeyHandler_pressedKeys[96]) {
+            Client.field190 += (-24 - Client.field190) / 2;
+         } else if (KeyHandler.KeyHandler_pressedKeys[97]) {
+            Client.field190 += (24 - Client.field190) / 2;
          } else {
-            Client.__client_hv /= 2;
+            Client.field190 /= 2;
          }
 
-         if(KeyHandler.KeyHandler_pressedKeys[98]) {
-            Client.__client_hu += (12 - Client.__client_hu) / 2;
-         } else if(KeyHandler.KeyHandler_pressedKeys[99]) {
-            Client.__client_hu += (-12 - Client.__client_hu) / 2;
+         if (KeyHandler.KeyHandler_pressedKeys[98]) {
+            Client.field191 += (12 - Client.field191) / 2;
+         } else if (KeyHandler.KeyHandler_pressedKeys[99]) {
+            Client.field191 += (-12 - Client.field191) / 2;
          } else {
-            Client.__client_hu /= 2;
+            Client.field191 /= 2;
          }
 
-         Client.__client_ht = MouseHandler.MouseHandler_y;
-         Client.__client_hi = MouseHandler.MouseHandler_x;
+         Client.field193 = MouseHandler.MouseHandler_y;
+         Client.field192 = MouseHandler.MouseHandler_x;
       }
 
-      Client.minimapOrientation = Client.__client_hv / 2 + Client.minimapOrientation & 2047;
-      Client.cameraPitchTarget += Client.__client_hu / 2;
-      if(Client.cameraPitchTarget < 128) {
-         Client.cameraPitchTarget = 128;
+      Client.camAngleY = Client.field190 / 2 + Client.camAngleY & 2047;
+      Client.camAngleX += Client.field191 / 2;
+      if (Client.camAngleX < 128) {
+         Client.camAngleX = 128;
       }
 
-      if(Client.cameraPitchTarget > 383) {
-         Client.cameraPitchTarget = 383;
+      if (Client.camAngleX > 383) {
+         Client.camAngleX = 383;
       }
 
    }
diff --git a/runescape-client/src/main/java/class60.java b/runescape-client/src/main/java/class60.java
index 9eeaa4ca44..d02a243340 100644
--- a/runescape-client/src/main/java/class60.java
+++ b/runescape-client/src/main/java/class60.java
@@ -12,16 +12,16 @@ public class class60 {
    @Export("worldMap0")
    static WorldMap worldMap0;
    @ObfuscatedName("ar")
-   static FontMetrics __bo_ar;
+   static FontMetrics field1162;
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
       signature = "(Lir;Lir;Lir;I)V",
       garbageValue = "1583108922"
    )
-   public static void method1172(AbstractIndexCache var0, AbstractIndexCache var1, AbstractIndexCache var2) {
-      HitSplatDefinition.__jm_m = var0;
-      HitSplatDefinition.__jm_f = var1;
-      HitSplatDefinition.__jm_q = var2;
+   public static void method1172(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2) {
+      HitSplatDefinition.field382 = var0;
+      HitSplatDefinition.field383 = var1;
+      HitSplatDefinition.field384 = var2;
    }
 }
diff --git a/runescape-client/src/main/java/class65.java b/runescape-client/src/main/java/class65.java
index 9f33160c98..ae0ceac3db 100644
--- a/runescape-client/src/main/java/class65.java
+++ b/runescape-client/src/main/java/class65.java
@@ -3,8 +3,7 @@ import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("bl")
-public class class65 extends RouteStrategy
-{
+public class class65 extends RouteStrategy {
    @ObfuscatedName("n")
    @ObfuscatedSignature(
       signature = "Lcz;"
@@ -32,180 +31,180 @@ public class class65 extends RouteStrategy
       signature = "(Lbz;II)V",
       garbageValue = "406386718"
    )
-   static final void method1232(Actor actor, int var1) {
-      if(actor.__bw > Client.cycle) {
-         SpriteIds.method5828(actor);
+   static final void method1232(Actor var0, int var1) {
+      if (var0.field19 > Client.cycle) {
+         GraphicsDefaults.method5828(var0);
       } else {
          int var2;
          int var3;
          int var4;
          int var5;
-         int var7;
-         if(actor.__cr >= Client.cycle) {
-            if(actor.__cr == Client.cycle || actor.sequence == -1 || actor.sequenceDelay != 0 || actor.sequenceFrameCycle + 1 > WorldMapAreaData.getSequenceDefinition(actor.sequence).frameLengths[actor.sequenceFrame]) {
-               var2 = actor.__cr - actor.__bw;
-               var3 = Client.cycle - actor.__bw;
-               var4 = actor.__bf * 128 + actor.size * 64;
-               var5 = actor.__be * 128 + actor.size * 64;
-               int var6 = actor.__bh * 128 + actor.size * 64;
-               var7 = actor.__bv * 128 + actor.size * 64;
-               actor.x = (var3 * var6 + var4 * (var2 - var3)) / var2;
-               actor.y = (var3 * var7 + var5 * (var2 - var3)) / var2;
+         int var6;
+         if (var0.field20 >= Client.cycle) {
+            if (var0.field20 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > WorldMapAreaData.getSequenceDefinition(var0.sequence).frameLengths[var0.sequenceFrame]) {
+               var2 = var0.field20 - var0.field19;
+               var3 = Client.cycle - var0.field19;
+               var4 = var0.field15 * 128 + var0.size * 64;
+               var5 = var0.field17 * 128 + var0.size * 64;
+               int var7 = var0.field16 * 128 + var0.size * 64;
+               var6 = var0.field18 * 128 + var0.size * 64;
+               var0.x = (var3 * var7 + var4 * (var2 - var3)) / var2;
+               var0.y = (var3 * var6 + var5 * (var2 - var3)) / var2;
             }
 
-            actor.__cq = 0;
-            actor.orientation = actor.__cv;
-            actor.__ac = actor.orientation;
+            var0.field24 = 0;
+            var0.orientation = var0.field21;
+            var0.field9 = var0.orientation;
          } else {
-            actor.movementSequence = actor.idleSequence;
-            if(actor.pathLength == 0) {
-               actor.__cq = 0;
+            var0.movementSequence = var0.readySequence;
+            if (var0.pathLength == 0) {
+               var0.field24 = 0;
             } else {
-               label310: {
-                  if(actor.sequence != -1 && actor.sequenceDelay == 0) {
-                     SequenceDefinition var11 = WorldMapAreaData.getSequenceDefinition(actor.sequence);
-                     if(actor.__ch > 0 && var11.__j == 0) {
-                        ++actor.__cq;
-                        break label310;
+               label225: {
+                  if (var0.sequence != -1 && var0.sequenceDelay == 0) {
+                     SequenceDefinition var11 = WorldMapAreaData.getSequenceDefinition(var0.sequence);
+                     if (var0.field25 > 0 && var11.field781 == 0) {
+                        ++var0.field24;
+                        break label225;
                      }
 
-                     if(actor.__ch <= 0 && var11.__s == 0) {
-                        ++actor.__cq;
-                        break label310;
+                     if (var0.field25 <= 0 && var11.field782 == 0) {
+                        ++var0.field24;
+                        break label225;
                      }
                   }
 
-                  var2 = actor.x;
-                  var3 = actor.y;
-                  var4 = actor.pathX[actor.pathLength - 1] * 128 + actor.size * 64;
-                  var5 = actor.pathY[actor.pathLength - 1] * 128 + actor.size * 64;
-                  if(var2 < var4) {
-                     if(var3 < var5) {
-                        actor.orientation = 1280;
-                     } else if(var3 > var5) {
-                        actor.orientation = 1792;
+                  var2 = var0.x;
+                  var3 = var0.y;
+                  var4 = var0.pathX[var0.pathLength - 1] * 128 + var0.size * 64;
+                  var5 = var0.pathY[var0.pathLength - 1] * 128 + var0.size * 64;
+                  if (var2 < var4) {
+                     if (var3 < var5) {
+                        var0.orientation = 1280;
+                     } else if (var3 > var5) {
+                        var0.orientation = 1792;
                      } else {
-                        actor.orientation = 1536;
+                        var0.orientation = 1536;
                      }
-                  } else if(var2 > var4) {
-                     if(var3 < var5) {
-                        actor.orientation = 768;
-                     } else if(var3 > var5) {
-                        actor.orientation = 256;
+                  } else if (var2 > var4) {
+                     if (var3 < var5) {
+                        var0.orientation = 768;
+                     } else if (var3 > var5) {
+                        var0.orientation = 256;
                      } else {
-                        actor.orientation = 512;
+                        var0.orientation = 512;
                      }
-                  } else if(var3 < var5) {
-                     actor.orientation = 1024;
-                  } else if(var3 > var5) {
-                     actor.orientation = 0;
+                  } else if (var3 < var5) {
+                     var0.orientation = 1024;
+                  } else if (var3 > var5) {
+                     var0.orientation = 0;
                   }
 
-                  byte var12 = actor.pathTraversed[actor.pathLength - 1];
-                  if(var4 - var2 <= 256 && var4 - var2 >= -256 && var5 - var3 <= 256 && var5 - var3 >= -256) {
-                     var7 = actor.orientation - actor.__ac & 2047;
-                     if(var7 > 1024) {
-                        var7 -= 2048;
+                  byte var12 = var0.pathTraversed[var0.pathLength - 1];
+                  if (var4 - var2 <= 256 && var4 - var2 >= -256 && var5 - var3 <= 256 && var5 - var3 >= -256) {
+                     var6 = var0.orientation - var0.field9 & 2047;
+                     if (var6 > 1024) {
+                        var6 -= 2048;
                      }
 
-                     int var8 = actor.walkTurnSequence;
-                     if(var7 >= -256 && var7 <= 256) {
-                        var8 = actor.walkSequence;
-                     } else if(var7 >= 256 && var7 < 768) {
-                        var8 = actor.walkTurnRightSequence;
-                     } else if(var7 >= -768 && var7 <= -256) {
-                        var8 = actor.walkTurnLeftSequence;
+                     int var8 = var0.walkBackSequence;
+                     if (var6 >= -256 && var6 <= 256) {
+                        var8 = var0.walkSequence;
+                     } else if (var6 >= 256 && var6 < 768) {
+                        var8 = var0.walkRightSequence;
+                     } else if (var6 >= -768 && var6 <= -256) {
+                        var8 = var0.walkLeftSequence;
                      }
 
-                     if(var8 == -1) {
-                        var8 = actor.walkSequence;
+                     if (var8 == -1) {
+                        var8 = var0.walkSequence;
                      }
 
-                     actor.movementSequence = var8;
+                     var0.movementSequence = var8;
                      int var9 = 4;
                      boolean var10 = true;
-                     if(actor instanceof Npc) {
-                        var10 = ((Npc)actor).definition.isClickable;
+                     if (var0 instanceof NPC) {
+                        var10 = ((NPC)var0).definition.isClickable;
                      }
 
-                     if(var10) {
-                        if(actor.__ac != actor.orientation && actor.targetIndex == -1 && actor.__cj != 0) {
+                     if (var10) {
+                        if (var0.field9 != var0.orientation && var0.targetIndex == -1 && var0.field23 != 0) {
                            var9 = 2;
                         }
 
-                        if(actor.pathLength > 2) {
+                        if (var0.pathLength > 2) {
                            var9 = 6;
                         }
 
-                        if(actor.pathLength > 3) {
+                        if (var0.pathLength > 3) {
                            var9 = 8;
                         }
 
-                        if(actor.__cq > 0 && actor.pathLength > 1) {
+                        if (var0.field24 > 0 && var0.pathLength > 1) {
                            var9 = 8;
-                           --actor.__cq;
+                           --var0.field24;
                         }
                      } else {
-                        if(actor.pathLength > 1) {
+                        if (var0.pathLength > 1) {
                            var9 = 6;
                         }
 
-                        if(actor.pathLength > 2) {
+                        if (var0.pathLength > 2) {
                            var9 = 8;
                         }
 
-                        if(actor.__cq > 0 && actor.pathLength > 1) {
+                        if (var0.field24 > 0 && var0.pathLength > 1) {
                            var9 = 8;
-                           --actor.__cq;
+                           --var0.field24;
                         }
                      }
 
-                     if(var12 == 2) {
+                     if (var12 == 2) {
                         var9 <<= 1;
                      }
 
-                     if(var9 >= 8 && actor.movementSequence == actor.walkSequence && actor.runSequence != -1) {
-                        actor.movementSequence = actor.runSequence;
+                     if (var9 >= 8 && var0.movementSequence == var0.walkSequence && var0.runSequence != -1) {
+                        var0.movementSequence = var0.runSequence;
                      }
 
-                     if(var2 != var4 || var5 != var3) {
-                        if(var2 < var4) {
-                           actor.x += var9;
-                           if(actor.x > var4) {
-                              actor.x = var4;
+                     if (var2 != var4 || var5 != var3) {
+                        if (var2 < var4) {
+                           var0.x += var9;
+                           if (var0.x > var4) {
+                              var0.x = var4;
                            }
-                        } else if(var2 > var4) {
-                           actor.x -= var9;
-                           if(actor.x < var4) {
-                              actor.x = var4;
+                        } else if (var2 > var4) {
+                           var0.x -= var9;
+                           if (var0.x < var4) {
+                              var0.x = var4;
                            }
                         }
 
-                        if(var3 < var5) {
-                           actor.y += var9;
-                           if(actor.y > var5) {
-                              actor.y = var5;
+                        if (var3 < var5) {
+                           var0.y += var9;
+                           if (var0.y > var5) {
+                              var0.y = var5;
                            }
-                        } else if(var3 > var5) {
-                           actor.y -= var9;
-                           if(actor.y < var5) {
-                              actor.y = var5;
+                        } else if (var3 > var5) {
+                           var0.y -= var9;
+                           if (var0.y < var5) {
+                              var0.y = var5;
                            }
                         }
                      }
 
-                     if(var4 == actor.x && var5 == actor.y) {
-                        --actor.pathLength;
-                        if(actor.__ch > 0) {
-                           --actor.__ch;
+                     if (var4 == var0.x && var5 == var0.y) {
+                        --var0.pathLength;
+                        if (var0.field25 > 0) {
+                           --var0.field25;
                         }
                      }
                   } else {
-                     actor.x = var4;
-                     actor.y = var5;
-                     --actor.pathLength;
-                     if(actor.__ch > 0) {
-                        --actor.__ch;
+                     var0.x = var4;
+                     var0.y = var5;
+                     --var0.pathLength;
+                     if (var0.field25 > 0) {
+                        --var0.field25;
                      }
                   }
                }
@@ -213,27 +212,27 @@ public class class65 extends RouteStrategy
          }
       }
 
-      if(actor.x < 128 || actor.y < 128 || actor.x >= 13184 || actor.y >= 13184) {
-         actor.sequence = -1;
-         actor.spotAnimation = -1;
-         actor.__bw = 0;
-         actor.__cr = 0;
-         actor.x = actor.pathX[0] * 128 + actor.size * 64;
-         actor.y = actor.pathY[0] * 128 + actor.size * 64;
-         actor.__bb_143();
+      if (var0.x < 128 || var0.y < 128 || var0.x >= 13184 || var0.y >= 13184) {
+         var0.sequence = -1;
+         var0.spotAnimation = -1;
+         var0.field19 = 0;
+         var0.field20 = 0;
+         var0.x = var0.pathX[0] * 128 + var0.size * 64;
+         var0.y = var0.pathY[0] * 128 + var0.size * 64;
+         var0.method23();
       }
 
-      if(Canvas.localPlayer == actor && (actor.x < 1536 || actor.y < 1536 || actor.x >= 11776 || actor.y >= 11776)) {
-         actor.sequence = -1;
-         actor.spotAnimation = -1;
-         actor.__bw = 0;
-         actor.__cr = 0;
-         actor.x = actor.pathX[0] * 128 + actor.size * 64;
-         actor.y = actor.pathY[0] * 128 + actor.size * 64;
-         actor.__bb_143();
+      if (Canvas.localPlayer == var0 && (var0.x < 1536 || var0.y < 1536 || var0.x >= 11776 || var0.y >= 11776)) {
+         var0.sequence = -1;
+         var0.spotAnimation = -1;
+         var0.field19 = 0;
+         var0.field20 = 0;
+         var0.x = var0.pathX[0] * 128 + var0.size * 64;
+         var0.y = var0.pathY[0] * 128 + var0.size * 64;
+         var0.method23();
       }
 
-      IndexStoreAction.method4553(actor);
-      ChatChannel.method2225(actor);
+      ArchiveDiskAction.method4553(var0);
+      ChatChannel.method2225(var0);
    }
 }
diff --git a/runescape-client/src/main/java/class80.java b/runescape-client/src/main/java/class80.java
index 3c671e174b..360e9b06c2 100644
--- a/runescape-client/src/main/java/class80.java
+++ b/runescape-client/src/main/java/class80.java
@@ -1,19 +1,13 @@
 import java.math.BigInteger;
-import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("ce")
 public class class80 {
    @ObfuscatedName("o")
-   static final BigInteger __ce_o;
+   static final BigInteger field1163;
    @ObfuscatedName("u")
-   static final BigInteger __ce_u;
-
-   static {
-      __ce_o = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049");
-      __ce_u = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683");
-   }
+   static final BigInteger field1164;
 
    @ObfuscatedName("o")
    @ObfuscatedSignature(
@@ -21,9 +15,9 @@ public class class80 {
       garbageValue = "1844169387"
    )
    static void method2015() {
-      if(Login.__cu_f) {
+      if (Login.field465) {
          Login.titleboxSprite = null;
-         IndexCacheLoader.titlebuttonSprite = null;
+         ArchiveLoader.titlebuttonSprite = null;
          WorldMapEvent.runesSprite = null;
          Login.leftTitleSprite = null;
          Fonts.rightTitleSprite = null;
@@ -35,11 +29,17 @@ public class class80 {
          Frames.worldSelectFlagSprites = null;
          AttackOption.worldSelectArrows = null;
          UrlRequest.worldSelectStars = null;
-         class277.__jn_by = null;
+         class277.field1144 = null;
          class16.loginScreenRunesAnimation.method1762();
          AbstractSocket.method3488(2);
          UserComparator9.method3343(true);
-         Login.__cu_f = false;
+         Login.field465 = false;
       }
+
+   }
+
+   static {
+      field1163 = new BigInteger("80782894952180643741752986186714059433953886149239752893425047584684715842049");
+      field1164 = new BigInteger("7237300117305667488707183861728052766358166655052137727439795191253340127955075499635575104901523446809299097934591732635674173519120047404024393881551683");
    }
 }
diff --git a/runescape-client/src/main/java/class83.java b/runescape-client/src/main/java/class83.java
index e9198a0915..b6afdbadba 100644
--- a/runescape-client/src/main/java/class83.java
+++ b/runescape-client/src/main/java/class83.java
@@ -1,7 +1,6 @@
 import java.math.BigInteger;
 import java.net.MalformedURLException;
 import java.net.URL;
-import net.runelite.mapping.Export;
 import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
@@ -9,19 +8,14 @@ import net.runelite.mapping.ObfuscatedSignature;
 @ObfuscatedName("cm")
 public class class83 {
    @ObfuscatedName("m")
-   static final BigInteger __cm_m;
+   static final BigInteger field1165;
    @ObfuscatedName("f")
-   static final BigInteger __cm_f;
+   static final BigInteger field1166;
    @ObfuscatedName("e")
    @ObfuscatedGetter(
       intValue = 533653621
    )
-   public static int __cm_e;
-
-   static {
-      __cm_m = new BigInteger("10001", 16);
-      __cm_f = new BigInteger("83ff79a3e258b99ead1a70e1049883e78e513c4cdec538d8da9483879a9f81689c0c7d146d7b82b52d05cf26132b1cda5930eeef894e4ccf3d41eebc3aabe54598c4ca48eb5a31d736bfeea17875a35558b9e3fcd4aebe2a9cc970312a477771b36e173dc2ece6001ab895c553e2770de40073ea278026f36961c94428d8d7db", 16);
-   }
+   public static int field1167;
 
    @ObfuscatedName("m")
    @ObfuscatedSignature(
@@ -30,7 +24,7 @@ public class class83 {
    )
    static int method2027(int var0, int var1) {
       ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0);
-      return var2 == null?-1:(var1 >= 0 && var1 < var2.ids.length?var2.ids[var1]:-1);
+      return var2 == null ? -1 : (var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1);
    }
 
    @ObfuscatedName("f")
@@ -39,7 +33,7 @@ public class class83 {
       garbageValue = "-1468699107"
    )
    static boolean method2026(String var0) {
-      if(var0 == null) {
+      if (var0 == null) {
          return false;
       } else {
          try {
@@ -56,7 +50,12 @@ public class class83 {
       signature = "(Lir;II)Llq;",
       garbageValue = "1413048059"
    )
-   public static IndexedSprite method2028(AbstractIndexCache var0, int var1) {
-      return !RouteStrategy.loadSpriteFlat(var0, var1)?null:ServerPacket.createIndexedSprite();
+   public static IndexedSprite method2028(AbstractArchive var0, int var1) {
+      return !RouteStrategy.loadSpriteFlat(var0, var1) ? null : ServerPacket.createIndexedSprite();
+   }
+
+   static {
+      field1165 = new BigInteger("10001", 16);
+      field1166 = new BigInteger("83ff79a3e258b99ead1a70e1049883e78e513c4cdec538d8da9483879a9f81689c0c7d146d7b82b52d05cf26132b1cda5930eeef894e4ccf3d41eebc3aabe54598c4ca48eb5a31d736bfeea17875a35558b9e3fcd4aebe2a9cc970312a477771b36e173dc2ece6001ab895c553e2770de40073ea278026f36961c94428d8d7db", 16);
    }
 }
diff --git a/runescape-client/src/main/java/class98.java b/runescape-client/src/main/java/class98.java
index 2e7e07fc24..f770d715d3 100644
--- a/runescape-client/src/main/java/class98.java
+++ b/runescape-client/src/main/java/class98.java
@@ -23,22 +23,22 @@ public class class98 {
       boolean var1 = MusicSample.method2338() != 0;
       int var2;
       int var3;
-      int var5;
-      if(var1) {
+      int var4;
+      if (var1) {
          var2 = 0;
 
-         for(var3 = MusicSample.method2352(5) + 1; var2 < this.field1303; ++var3) {
-            int var4 = MusicSample.method2352(WorldMapCacheName.method634(this.field1303 - var2));
+         for (var3 = MusicSample.method2352(5) + 1; var2 < this.field1303; ++var3) {
+            int var5 = MusicSample.method2352(WorldMapCacheName.method634(this.field1303 - var2));
 
-            for(var5 = 0; var5 < var4; ++var5) {
+            for (var4 = 0; var4 < var5; ++var4) {
                this.field1304[var2++] = var3;
             }
          }
       } else {
-         boolean var14 = MusicSample.method2338() != 0;
+         boolean var15 = MusicSample.method2338() != 0;
 
-         for(var3 = 0; var3 < this.field1303; ++var3) {
-            if(var14 && MusicSample.method2338() == 0) {
+         for (var3 = 0; var3 < this.field1303; ++var3) {
+            if (var15 && MusicSample.method2338() == 0) {
                this.field1304[var3] = 0;
             } else {
                this.field1304[var3] = MusicSample.method2352(5) + 1;
@@ -48,58 +48,58 @@ public class class98 {
 
       this.method2311();
       var2 = MusicSample.method2352(4);
-      if(var2 > 0) {
-         float var15 = MusicSample.method2357(MusicSample.method2352(32));
+      if (var2 > 0) {
          float var16 = MusicSample.method2357(MusicSample.method2352(32));
-         var5 = MusicSample.method2352(4) + 1;
-         boolean var6 = MusicSample.method2338() != 0;
-         int var7;
-         if(var2 == 1) {
-            var7 = method2310(this.field1303, this.field1306);
+         float var6 = MusicSample.method2357(MusicSample.method2352(32));
+         var4 = MusicSample.method2352(4) + 1;
+         boolean var7 = MusicSample.method2338() != 0;
+         int var8;
+         if (var2 == 1) {
+            var8 = method2310(this.field1303, this.field1306);
          } else {
-            var7 = this.field1303 * this.field1306;
+            var8 = this.field1303 * this.field1306;
          }
 
-         this.field1305 = new int[var7];
+         this.field1305 = new int[var8];
 
-         int var8;
-         for(var8 = 0; var8 < var7; ++var8) {
-            this.field1305[var8] = MusicSample.method2352(var5);
+         int var9;
+         for (var9 = 0; var9 < var8; ++var9) {
+            this.field1305[var9] = MusicSample.method2352(var4);
          }
 
          this.field1302 = new float[this.field1303][this.field1306];
-         float var9;
-         int var10;
+         float var10;
          int var11;
-         if(var2 == 1) {
-            for(var8 = 0; var8 < this.field1303; ++var8) {
-               var9 = 0.0F;
-               var10 = 1;
+         int var12;
+         if (var2 == 1) {
+            for (var9 = 0; var9 < this.field1303; ++var9) {
+               var10 = 0.0F;
+               var11 = 1;
 
-               for(var11 = 0; var11 < this.field1306; ++var11) {
-                  int var12 = var8 / var10 % var7;
-                  float var13 = (float)this.field1305[var12] * var16 + var15 + var9;
-                  this.field1302[var8][var11] = var13;
-                  if(var6) {
-                     var9 = var13;
+               for (var12 = 0; var12 < this.field1306; ++var12) {
+                  int var13 = var9 / var11 % var8;
+                  float var14 = (float)this.field1305[var13] * var6 + var16 + var10;
+                  this.field1302[var9][var12] = var14;
+                  if (var7) {
+                     var10 = var14;
                   }
 
-                  var10 *= var7;
+                  var11 *= var8;
                }
             }
          } else {
-            for(var8 = 0; var8 < this.field1303; ++var8) {
-               var9 = 0.0F;
-               var10 = var8 * this.field1306;
+            for (var9 = 0; var9 < this.field1303; ++var9) {
+               var10 = 0.0F;
+               var11 = var9 * this.field1306;
 
-               for(var11 = 0; var11 < this.field1306; ++var11) {
-                  float var17 = (float)this.field1305[var10] * var16 + var15 + var9;
-                  this.field1302[var8][var11] = var17;
-                  if(var6) {
-                     var9 = var17;
+               for (var12 = 0; var12 < this.field1306; ++var12) {
+                  float var17 = (float)this.field1305[var11] * var6 + var16 + var10;
+                  this.field1302[var9][var12] = var17;
+                  if (var7) {
+                     var10 = var17;
                   }
 
-                  ++var10;
+                  ++var11;
                }
             }
          }
@@ -118,40 +118,40 @@ public class class98 {
       int var6;
       int var7;
       int var8;
+      int var9;
       int var10;
-      for(var3 = 0; var3 < this.field1303; ++var3) {
+      for (var3 = 0; var3 < this.field1303; ++var3) {
          var4 = this.field1304[var3];
-         if(var4 != 0) {
+         if (var4 != 0) {
             var5 = 1 << 32 - var4;
             var6 = var2[var4];
             var1[var3] = var6;
-            int var12;
-            if((var6 & var5) != 0) {
+            if ((var6 & var5) != 0) {
                var7 = var2[var4 - 1];
             } else {
                var7 = var6 | var5;
 
-               for(var8 = var4 - 1; var8 >= 1; --var8) {
-                  var12 = var2[var8];
-                  if(var12 != var6) {
+               for (var8 = var4 - 1; var8 >= 1; --var8) {
+                  var10 = var2[var8];
+                  if (var10 != var6) {
                      break;
                   }
 
-                  var10 = 1 << 32 - var8;
-                  if((var12 & var10) != 0) {
+                  var9 = 1 << 32 - var8;
+                  if ((var10 & var9) != 0) {
                      var2[var8] = var2[var8 - 1];
                      break;
                   }
 
-                  var2[var8] = var12 | var10;
+                  var2[var8] = var10 | var9;
                }
             }
 
             var2[var4] = var7;
 
-            for(var8 = var4 + 1; var8 <= 32; ++var8) {
-               var12 = var2[var8];
-               if(var12 == var6) {
+            for (var8 = var4 + 1; var8 <= 32; ++var8) {
+               var10 = var2[var8];
+               if (var10 == var6) {
                   var2[var8] = var7;
                }
             }
@@ -159,19 +159,19 @@ public class class98 {
       }
 
       this.field1307 = new int[8];
-      int var11 = 0;
+      var10 = 0;
 
-      for(var3 = 0; var3 < this.field1303; ++var3) {
+      for (var3 = 0; var3 < this.field1303; ++var3) {
          var4 = this.field1304[var3];
-         if(var4 != 0) {
+         if (var4 != 0) {
             var5 = var1[var3];
             var6 = 0;
 
-            for(var7 = 0; var7 < var4; ++var7) {
+            for (var7 = 0; var7 < var4; ++var7) {
                var8 = Integer.MIN_VALUE >>> var7;
-               if((var5 & var8) != 0) {
-                  if(this.field1307[var6] == 0) {
-                     this.field1307[var6] = var11;
+               if ((var5 & var8) != 0) {
+                  if (this.field1307[var6] == 0) {
+                     this.field1307[var6] = var10;
                   }
 
                   var6 = this.field1307[var6];
@@ -179,22 +179,22 @@ public class class98 {
                   ++var6;
                }
 
-               if(var6 >= this.field1307.length) {
-                  int[] var9 = new int[this.field1307.length * 2];
+               if (var6 >= this.field1307.length) {
+                  int[] var11 = new int[this.field1307.length * 2];
 
-                  for(var10 = 0; var10 < this.field1307.length; ++var10) {
-                     var9[var10] = this.field1307[var10];
+                  for (var9 = 0; var9 < this.field1307.length; ++var9) {
+                     var11[var9] = this.field1307[var9];
                   }
 
-                  this.field1307 = var9;
+                  this.field1307 = var11;
                }
 
                var8 >>>= 1;
             }
 
             this.field1307[var6] = ~var3;
-            if(var6 >= var11) {
-               var11 = var6 + 1;
+            if (var6 >= var10) {
+               var10 = var6 + 1;
             }
          }
       }
@@ -204,8 +204,7 @@ public class class98 {
    @ObfuscatedName("q")
    int method2306() {
       int var1;
-      for(var1 = 0; this.field1307[var1] >= 0; var1 = MusicSample.method2338() != 0?this.field1307[var1]:var1 + 1) {
-         ;
+      for (var1 = 0; this.field1307[var1] >= 0; var1 = MusicSample.method2338() != 0 ? this.field1307[var1] : var1 + 1) {
       }
 
       return ~this.field1307[var1];
@@ -219,8 +218,7 @@ public class class98 {
    @ObfuscatedName("m")
    static int method2310(int var0, int var1) {
       int var2;
-      for(var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; RouteStrategy.method3642(var2, var1) > var0; --var2) {
-         ;
+      for (var2 = (int)Math.pow((double)var0, 1.0D / (double)var1) + 1; RouteStrategy.method3642(var2, var1) > var0; --var2) {
       }
 
       return var2;
diff --git a/runescape-client/src/main/java/net/runelite/rs/ScriptOpcodes.java b/runescape-client/src/main/java/net/runelite/rs/ScriptOpcodes.java
new file mode 100644
index 0000000000..1c6980a8b4
--- /dev/null
+++ b/runescape-client/src/main/java/net/runelite/rs/ScriptOpcodes.java
@@ -0,0 +1,478 @@
+package net.runelite.rs;
+
+public class ScriptOpcodes {
+   public static final int ICONST = 0;
+   public static final int GET_VARP = 1;
+   public static final int SET_VARP = 2;
+   public static final int SCONST = 3;
+   public static final int JUMP = 6;
+   public static final int IF_ICMPNE = 7;
+   public static final int IF_ICMPEQ = 8;
+   public static final int IF_ICMPLT = 9;
+   public static final int IF_ICMPGT = 10;
+   public static final int RETURN = 21;
+   public static final int GET_VARBIT = 25;
+   public static final int SET_VARBIT = 27;
+   public static final int IF_ICMPLE = 31;
+   public static final int IF_ICMPGE = 32;
+   public static final int ILOAD = 33;
+   public static final int ISTORE = 34;
+   public static final int SLOAD = 35;
+   public static final int SSTORE = 36;
+   public static final int JOIN_STRING = 37;
+   public static final int POP_INT = 38;
+   public static final int POP_STRING = 39;
+   public static final int INVOKE = 40;
+   public static final int GET_VARC_INT = 42;
+   public static final int SET_VARC_INT = 43;
+   public static final int DEFINE_ARRAY = 44;
+   public static final int GET_ARRAY_INT = 45;
+   public static final int SET_ARRAY_INT = 46;
+   public static final int GET_VARC_STRING_OLD = 47;
+   public static final int SET_VARC_STRING_OLD = 48;
+   public static final int GET_VARC_STRING = 49;
+   public static final int SET_VARC_STRING = 50;
+   public static final int SWITCH = 60;
+   public static final int CC_CREATE = 100;
+   public static final int CC_DELETE = 101;
+   public static final int CC_DELETEALL = 102;
+   public static final int CC_FIND = 200;
+   public static final int IF_FIND = 201;
+   public static final int CC_SETPOSITION = 1000;
+   public static final int CC_SETSIZE = 1001;
+   public static final int CC_SETHIDE = 1003;
+   public static final int CC_SETNOCLICKTHROUGH = 1005;
+   public static final int CC_SETNOSCROLLTHROUGH = 1006;
+   public static final int CC_SETSCROLLPOS = 1100;
+   public static final int CC_SETCOLOUR = 1101;
+   public static final int CC_SETFILL = 1102;
+   public static final int CC_SETTRANS = 1103;
+   public static final int CC_SETLINEWID = 1104;
+   public static final int CC_SETGRAPHIC = 1105;
+   public static final int CC_SET2DANGLE = 1106;
+   public static final int CC_SETTILING = 1107;
+   public static final int CC_SETMODEL = 1108;
+   public static final int CC_SETMODELANGLE = 1109;
+   public static final int CC_SETMODELANIM = 1110;
+   public static final int CC_SETMODELORTHOG = 1111;
+   public static final int CC_SETTEXT = 1112;
+   public static final int CC_SETTEXTFONT = 1113;
+   public static final int CC_SETTEXTALIGN = 1114;
+   public static final int CC_SETTEXTSHADOW = 1115;
+   public static final int CC_SETOUTLINE = 1116;
+   public static final int CC_SETGRAPHICSHADOW = 1117;
+   public static final int CC_SETVFLIP = 1118;
+   public static final int CC_SETHFLIP = 1119;
+   public static final int CC_SETSCROLLSIZE = 1120;
+   public static final int CC_RESUME_PAUSEBUTTON = 1121;
+   public static final int CC_SETFILLCOLOUR = 1123;
+   public static final int CC_SETLINEDIRECTION = 1126;
+   public static final int CC_SETOBJECT = 1200;
+   public static final int CC_SETNPCHEAD = 1201;
+   public static final int CC_SETPLAYERHEAD_SELF = 1202;
+   public static final int CC_SETOBJECT_NONUM = 1205;
+   public static final int CC_SETOBJECT_ALWAYS_NUM = 1212;
+   public static final int CC_SETOP = 1300;
+   public static final int CC_SETDRAGGABLE = 1301;
+   public static final int CC_SETDRAGGABLEBEHAVIOR = 1302;
+   public static final int CC_SETDRAGDEADZONE = 1303;
+   public static final int CC_SETDRAGDEADTIME = 1304;
+   public static final int CC_SETOPBASE = 1305;
+   public static final int CC_SETTARGETVERB = 1306;
+   public static final int CC_CLEAROPS = 1307;
+   public static final int CC_SETONCLICK = 1400;
+   public static final int CC_SETONHOLD = 1401;
+   public static final int CC_SETONRELEASE = 1402;
+   public static final int CC_SETONMOUSEOVER = 1403;
+   public static final int CC_SETONMOUSELEAVE = 1404;
+   public static final int CC_SETONDRAG = 1405;
+   public static final int CC_SETONTARGETLEAVE = 1406;
+   public static final int CC_SETONVARTRANSMIT = 1407;
+   public static final int CC_SETONTIMER = 1408;
+   public static final int CC_SETONOP = 1409;
+   public static final int CC_SETONDRAGCOMPLETE = 1410;
+   public static final int CC_SETONCLICKREPEAT = 1411;
+   public static final int CC_SETONMOUSEREPEAT = 1412;
+   public static final int CC_SETONINVTRANSMIT = 1414;
+   public static final int CC_SETONSTATTRANSMIT = 1415;
+   public static final int CC_SETONTARGETENTER = 1416;
+   public static final int CC_SETONSCROLLWHEEL = 1417;
+   public static final int CC_SETONCHATTRANSMIT = 1418;
+   public static final int CC_SETONKEY = 1419;
+   public static final int CC_SETONFRIENDTRANSMIT = 1420;
+   public static final int CC_SETONCLANTRANSMIT = 1421;
+   public static final int CC_SETONMISCTRANSMIT = 1422;
+   public static final int CC_SETONDIALOGABORT = 1423;
+   public static final int CC_SETONSUBCHANGE = 1424;
+   public static final int CC_SETONSTOCKTRANSMIT = 1425;
+   public static final int CC_SETONRESIZE = 1427;
+   public static final int CC_GETX = 1500;
+   public static final int CC_GETY = 1501;
+   public static final int CC_GETWIDTH = 1502;
+   public static final int CC_GETHEIGHT = 1503;
+   public static final int CC_GETHIDE = 1504;
+   public static final int CC_GETLAYER = 1505;
+   public static final int CC_GETSCROLLX = 1600;
+   public static final int CC_GETSCROLLY = 1601;
+   public static final int CC_GETTEXT = 1602;
+   public static final int CC_GETSCROLLWIDTH = 1603;
+   public static final int CC_GETSCROLLHEIGHT = 1604;
+   public static final int CC_GETMODELZOOM = 1605;
+   public static final int CC_GETMODELANGLE_X = 1606;
+   public static final int CC_GETMODELANGLE_Z = 1607;
+   public static final int CC_GETMODELANGLE_Y = 1608;
+   public static final int CC_GETTRANS = 1609;
+   public static final int CC_GETCOLOUR = 1611;
+   public static final int CC_GETFILLCOLOUR = 1612;
+   public static final int CC_GETINVOBJECT = 1700;
+   public static final int CC_GETINVCOUNT = 1701;
+   public static final int CC_GETID = 1702;
+   public static final int CC_GETTARGETMASK = 1800;
+   public static final int CC_GETOP = 1801;
+   public static final int CC_GETOPBASE = 1802;
+   public static final int CC_CALLONRESIZE = 1927;
+   public static final int IF_SETPOSITION = 2000;
+   public static final int IF_SETSIZE = 2001;
+   public static final int IF_SETHIDE = 2003;
+   public static final int IF_SETNOCLICKTHROUGH = 2005;
+   public static final int IF_SETSCROLLPOS = 2100;
+   public static final int IF_SETCOLOUR = 2101;
+   public static final int IF_SETFILL = 2102;
+   public static final int IF_SETTRANS = 2103;
+   public static final int IF_SETLINEWID = 2104;
+   public static final int IF_SETGRAPHIC = 2105;
+   public static final int IF_SET2DANGLE = 2106;
+   public static final int IF_SETTILING = 2107;
+   public static final int IF_SETMODEL = 2108;
+   public static final int IF_SETMODELANGLE = 2109;
+   public static final int IF_SETMODELANIM = 2110;
+   public static final int IF_SETMODELORTHOG = 2111;
+   public static final int IF_SETTEXT = 2112;
+   public static final int IF_SETTEXTFONT = 2113;
+   public static final int IF_SETTEXTALIGN = 2114;
+   public static final int IF_SETTEXTSHADOW = 2115;
+   public static final int IF_SETOUTLINE = 2116;
+   public static final int IF_SETGRAPHICSHADOW = 2117;
+   public static final int IF_SETVFLIP = 2118;
+   public static final int IF_SETHFLIP = 2119;
+   public static final int IF_SETSCROLLSIZE = 2120;
+   public static final int IF_RESUME_PAUSEBUTTON = 2121;
+   public static final int IF_SETFILLCOLOUR = 2123;
+   public static final int IF_SETLINEDIRECTION = 2126;
+   public static final int IF_SETOBJECT = 2200;
+   public static final int IF_SETNPCHEAD = 2201;
+   public static final int IF_SETPLAYERHEAD_SELF = 2202;
+   public static final int IF_SETOBJECT_NONUM = 2205;
+   public static final int IF_SETOBJECT_ALWAYS_NUM = 2212;
+   public static final int IF_SETOP = 2300;
+   public static final int IF_SETDRAGGABLE = 2301;
+   public static final int IF_SETDRAGGABLEBEHAVIOR = 2302;
+   public static final int IF_SETDRAGDEADZONE = 2303;
+   public static final int IF_SETDRAGDEADTIME = 2304;
+   public static final int IF_SETOPBASE = 2305;
+   public static final int IF_SETTARGETVERB = 2306;
+   public static final int IF_CLEAROPS = 2307;
+   public static final int IF_SETOPKEY = 2350;
+   public static final int IF_SETOPTKEY = 2351;
+   public static final int IF_SETOPKEYRATE = 2352;
+   public static final int IF_SETOPTKEYRATE = 2353;
+   public static final int IF_SETOPKEYIGNOREHELD = 2354;
+   public static final int IF_SETOPTKEYIGNOREHELD = 2355;
+   public static final int IF_SETONCLICK = 2400;
+   public static final int IF_SETONHOLD = 2401;
+   public static final int IF_SETONRELEASE = 2402;
+   public static final int IF_SETONMOUSEOVER = 2403;
+   public static final int IF_SETONMOUSELEAVE = 2404;
+   public static final int IF_SETONDRAG = 2405;
+   public static final int IF_SETONTARGETLEAVE = 2406;
+   public static final int IF_SETONVARTRANSMIT = 2407;
+   public static final int IF_SETONTIMER = 2408;
+   public static final int IF_SETONOP = 2409;
+   public static final int IF_SETONDRAGCOMPLETE = 2410;
+   public static final int IF_SETONCLICKREPEAT = 2411;
+   public static final int IF_SETONMOUSEREPEAT = 2412;
+   public static final int IF_SETONINVTRANSMIT = 2414;
+   public static final int IF_SETONSTATTRANSMIT = 2415;
+   public static final int IF_SETONTARGETENTER = 2416;
+   public static final int IF_SETONSCROLLWHEEL = 2417;
+   public static final int IF_SETONCHATTRANSMIT = 2418;
+   public static final int IF_SETONKEY = 2419;
+   public static final int IF_SETONFRIENDTRANSMIT = 2420;
+   public static final int IF_SETONCLANTRANSMIT = 2421;
+   public static final int IF_SETONMISCTRANSMIT = 2422;
+   public static final int IF_SETONDIALOGABORT = 2423;
+   public static final int IF_SETONSUBCHANGE = 2424;
+   public static final int IF_SETONSTOCKTRANSMIT = 2425;
+   public static final int IF_SETONRESIZE = 2427;
+   public static final int IF_GETX = 2500;
+   public static final int IF_GETY = 2501;
+   public static final int IF_GETWIDTH = 2502;
+   public static final int IF_GETHEIGHT = 2503;
+   public static final int IF_GETHIDE = 2504;
+   public static final int IF_GETLAYER = 2505;
+   public static final int IF_GETSCROLLX = 2600;
+   public static final int IF_GETSCROLLY = 2601;
+   public static final int IF_GETTEXT = 2602;
+   public static final int IF_GETSCROLLWIDTH = 2603;
+   public static final int IF_GETSCROLLHEIGHT = 2604;
+   public static final int IF_GETMODELZOOM = 2605;
+   public static final int IF_GETMODELANGLE_X = 2606;
+   public static final int IF_GETMODELANGLE_Z = 2607;
+   public static final int IF_GETMODELANGLE_Y = 2608;
+   public static final int IF_GETTRANS = 2609;
+   public static final int IF_GETCOLOUR = 2611;
+   public static final int IF_GETFILLCOLOUR = 2612;
+   public static final int IF_GETINVOBJECT = 2700;
+   public static final int IF_GETINVCOUNT = 2701;
+   public static final int IF_HASSUB = 2702;
+   public static final int IF_GETTOP = 2706;
+   public static final int IF_GETTARGETMASK = 2800;
+   public static final int IF_GETOP = 2801;
+   public static final int IF_GETOPBASE = 2802;
+   public static final int IF_CALLONRESIZE = 2927;
+   public static final int MES = 3100;
+   public static final int ANIM = 3101;
+   public static final int IF_CLOSE = 3103;
+   public static final int RESUME_COUNTDIALOG = 3104;
+   public static final int RESUME_NAMEDIALOG = 3105;
+   public static final int RESUME_STRINGDIALOG = 3106;
+   public static final int OPPLAYER = 3107;
+   public static final int IF_DRAGPICKUP = 3108;
+   public static final int CC_DRAGPICKUP = 3109;
+   public static final int MOUSECAM = 3110;
+   public static final int GETREMOVEROOFS = 3111;
+   public static final int SETREMOVEROOFS = 3112;
+   public static final int OPENURL = 3113;
+   public static final int RESUME_OBJDIALOG = 3115;
+   public static final int BUG_REPORT = 3116;
+   public static final int SETSHIFTCLICKDROP = 3117;
+   public static final int SETSHOWMOUSEOVERTEXT = 3118;
+   public static final int RENDERSELF = 3119;
+   public static final int SETSHOWMOUSECROSS = 3125;
+   public static final int SETSHOWLOADINGMESSAGES = 3126;
+   public static final int SETTAPTODROP = 3127;
+   public static final int GETTAPTODROP = 3128;
+   public static final int SETOCULUSORBSPEED = 3129;
+   public static final int GETCANVASSIZE = 3132;
+   public static final int SETHIDEUSERNAME = 3141;
+   public static final int GETHIDEUSERNAME = 3142;
+   public static final int SETREMEMBERUSERNAME = 3143;
+   public static final int GETREMEMBERUSERNAME = 3144;
+   public static final int SETTITLEMUSICENABLED = 3146;
+   public static final int GETTITLEMUSICENABLED = 3147;
+   public static final int SOUND_SYNTH = 3200;
+   public static final int SOUND_SONG = 3201;
+   public static final int SOUND_JINGLE = 3202;
+   public static final int CLIENTCLOCK = 3300;
+   public static final int INV_GETOBJ = 3301;
+   public static final int INV_GETNUM = 3302;
+   public static final int INV_TOTAL = 3303;
+   public static final int INV_SIZE = 3304;
+   public static final int STAT = 3305;
+   public static final int STAT_BASE = 3306;
+   public static final int STAT_XP = 3307;
+   public static final int COORD = 3308;
+   public static final int COORDX = 3309;
+   public static final int COORDZ = 3310;
+   public static final int COORDY = 3311;
+   public static final int MAP_MEMBERS = 3312;
+   public static final int INVOTHER_GETOBJ = 3313;
+   public static final int INVOTHER_GETNUM = 3314;
+   public static final int INVOTHER_TOTAL = 3315;
+   public static final int STAFFMODLEVEL = 3316;
+   public static final int REBOOTTIMER = 3317;
+   public static final int MAP_WORLD = 3318;
+   public static final int RUNENERGY_VISIBLE = 3321;
+   public static final int RUNWEIGHT_VISIBLE = 3322;
+   public static final int PLAYERMOD = 3323;
+   public static final int WORLDFLAGS = 3324;
+   public static final int MOVECOORD = 3325;
+   public static final int ENUM_STRING = 3400;
+   public static final int ENUM = 3408;
+   public static final int ENUM_GETOUTPUTCOUNT = 3411;
+   public static final int FRIEND_COUNT = 3600;
+   public static final int FRIEND_GETNAME = 3601;
+   public static final int FRIEND_GETWORLD = 3602;
+   public static final int FRIEND_GETRANK = 3603;
+   public static final int FRIEND_SETRANK = 3604;
+   public static final int FRIEND_ADD = 3605;
+   public static final int FRIEND_DEL = 3606;
+   public static final int IGNORE_ADD = 3607;
+   public static final int IGNORE_DEL = 3608;
+   public static final int FRIEND_TEST = 3609;
+   public static final int CLAN_GETCHATDISPLAYNAME = 3611;
+   public static final int CLAN_GETCHATCOUNT = 3612;
+   public static final int CLAN_GETCHATUSERNAME = 3613;
+   public static final int CLAN_GETCHATUSERWORLD = 3614;
+   public static final int CLAN_GETCHATUSERRANK = 3615;
+   public static final int CLAN_GETCHATMINKICK = 3616;
+   public static final int CLAN_KICKUSER = 3617;
+   public static final int CLAN_GETCHATRANK = 3618;
+   public static final int CLAN_JOINCHAT = 3619;
+   public static final int CLAN_LEAVECHAT = 3620;
+   public static final int IGNORE_COUNT = 3621;
+   public static final int IGNORE_GETNAME = 3622;
+   public static final int IGNORE_TEST = 3623;
+   public static final int CLAN_ISSELF = 3624;
+   public static final int CLAN_GETCHATOWNERNAME = 3625;
+   public static final int CLAN_ISFRIEND = 3626;
+   public static final int CLAN_ISIGNORE = 3627;
+   public static final int STOCKMARKET_GETOFFERTYPE = 3903;
+   public static final int STOCKMARKET_GETOFFERITEM = 3904;
+   public static final int STOCKMARKET_GETOFFERPRICE = 3905;
+   public static final int STOCKMARKET_GETOFFERCOUNT = 3906;
+   public static final int STOCKMARKET_GETOFFERCOMPLETEDCOUNT = 3907;
+   public static final int STOCKMARKET_GETOFFERCOMPLETEDGOLD = 3908;
+   public static final int STOCKMARKET_ISOFFEREMPTY = 3910;
+   public static final int STOCKMARKET_ISOFFERSTABLE = 3911;
+   public static final int STOCKMARKET_ISOFFERFINISHED = 3912;
+   public static final int STOCKMARKET_ISOFFERADDING = 3913;
+   public static final int TRADINGPOST_SORTBY_NAME = 3914;
+   public static final int TRADINGPOST_SORTBY_PRICE = 3915;
+   public static final int TRADINGPOST_SORTFILTERBY_WORLD = 3916;
+   public static final int TRADINGPOST_SORTBY_AGE = 3917;
+   public static final int TRADINGPOST_SORTBY_COUNT = 3918;
+   public static final int TRADINGPOST_GETTOTALOFFERS = 3919;
+   public static final int TRADINGPOST_GETOFFERWORLD = 3920;
+   public static final int TRADINGPOST_GETOFFERNAME = 3921;
+   public static final int TRADINGPOST_GETOFFERPREVIOUSNAME = 3922;
+   public static final int TRADINGPOST_GETOFFERAGE = 3923;
+   public static final int TRADINGPOST_GETOFFERCOUNT = 3924;
+   public static final int TRADINGPOST_GETOFFERPRICE = 3925;
+   public static final int TRADINGPOST_GETOFFERITEM = 3926;
+   public static final int ADD = 4000;
+   public static final int SUB = 4001;
+   public static final int MULTIPLY = 4002;
+   public static final int DIV = 4003;
+   public static final int RANDOM = 4004;
+   public static final int RANDOMINC = 4005;
+   public static final int INTERPOLATE = 4006;
+   public static final int ADDPERCENT = 4007;
+   public static final int SETBIT = 4008;
+   public static final int CLEARBIT = 4009;
+   public static final int TESTBIT = 4010;
+   public static final int MOD = 4011;
+   public static final int POW = 4012;
+   public static final int INVPOW = 4013;
+   public static final int AND = 4014;
+   public static final int OR = 4015;
+   public static final int SCALE = 4018;
+   public static final int APPEND_NUM = 4100;
+   public static final int APPEND = 4101;
+   public static final int APPEND_SIGNNUM = 4102;
+   public static final int LOWERCASE = 4103;
+   public static final int FROMDATE = 4104;
+   public static final int TEXT_GENDER = 4105;
+   public static final int TOSTRING = 4106;
+   public static final int COMPARE = 4107;
+   public static final int PARAHEIGHT = 4108;
+   public static final int PARAWIDTH = 4109;
+   public static final int TEXT_SWITCH = 4110;
+   public static final int ESCAPE = 4111;
+   public static final int APPEND_CHAR = 4112;
+   public static final int CHAR_ISPRINTABLE = 4113;
+   public static final int CHAR_ISALPHANUMERIC = 4114;
+   public static final int CHAR_ISALPHA = 4115;
+   public static final int CHAR_ISNUMERIC = 4116;
+   public static final int STRING_LENGTH = 4117;
+   public static final int SUBSTRING = 4118;
+   public static final int REMOVETAGS = 4119;
+   public static final int STRING_INDEXOF_CHAR = 4120;
+   public static final int STRING_INDEXOF_STRING = 4121;
+   public static final int UPPERCASE = 4122;
+   public static final int OC_NAME = 4200;
+   public static final int OC_OP = 4201;
+   public static final int OC_IOP = 4202;
+   public static final int OC_COST = 4203;
+   public static final int OC_STACKABLE = 4204;
+   public static final int OC_CERT = 4205;
+   public static final int OC_UNCERT = 4206;
+   public static final int OC_MEMBERS = 4207;
+   public static final int OC_PLACEHOLDER = 4208;
+   public static final int OC_UNPLACEHOLDER = 4209;
+   public static final int OC_FIND = 4210;
+   public static final int OC_FINDNEXT = 4211;
+   public static final int OC_FINDRESET = 4212;
+   public static final int CHAT_GETFILTER_PUBLIC = 5000;
+   public static final int CHAT_SETFILTER = 5001;
+   public static final int CHAT_SENDABUSEREPORT = 5002;
+   public static final int CHAT_GETHISTORY_BYTYPEANDLINE = 5003;
+   public static final int CHAT_GETHISTORY_BYUID = 5004;
+   public static final int CHAT_GETFILTER_PRIVATE = 5005;
+   public static final int CHAT_SENDPUBLIC = 5008;
+   public static final int CHAT_SENDPRIVATE = 5009;
+   public static final int CHAT_PLAYERNAME = 5015;
+   public static final int CHAT_GETFILTER_TRADE = 5016;
+   public static final int CHAT_GETHISTORYLENGTH = 5017;
+   public static final int CHAT_GETNEXTUID = 5018;
+   public static final int CHAT_GETPREVUID = 5019;
+   public static final int DOCHEAT = 5020;
+   public static final int CHAT_SETMESSAGEFILTER = 5021;
+   public static final int CHAT_GETMESSAGEFILTER = 5022;
+   public static final int GETWINDOWMODE = 5306;
+   public static final int SETWINDOWMODE = 5307;
+   public static final int GETDEFAULTWINDOWMODE = 5308;
+   public static final int SETDEFAULTWINDOWMODE = 5309;
+   public static final int CAM_FORCEANGLE = 5504;
+   public static final int CAM_GETANGLE_XA = 5505;
+   public static final int CAM_GETANGLE_YA = 5506;
+   public static final int CAM_SETFOLLOWHEIGHT = 5530;
+   public static final int CAM_GETFOLLOWHEIGHT = 5531;
+   public static final int LOGOUT = 5630;
+   public static final int VIEWPORT_SETFOV = 6200;
+   public static final int VIEWPORT_SETZOOM = 6201;
+   public static final int VIEWPORT_CLAMPFOV = 6202;
+   public static final int VIEWPORT_GETEFFECTIVESIZE = 6203;
+   public static final int VIEWPORT_GETZOOM = 6204;
+   public static final int VIEWPORT_GETFOV = 6205;
+   public static final int WORLDLIST_FETCH = 6500;
+   public static final int WORLDLIST_START = 6501;
+   public static final int WORLDLIST_NEXT = 6502;
+   public static final int WORLDLIST_SPECIFIC = 6506;
+   public static final int WORLDLIST_SORT = 6507;
+   public static final int GETWORLDINFO = 6511;
+   public static final int SETFOLLOWEROPSLOWPRIORITY = 6512;
+   public static final int NC_PARAM = 6513;
+   public static final int LC_PARAM = 6514;
+   public static final int OC_PARAM = 6515;
+   public static final int STRUCT_PARAM = 6516;
+   public static final int ON_MOBILE = 6518;
+   public static final int CLIENTTYPE = 6519;
+   public static final int BATTERYLEVEL = 6524;
+   public static final int BATTERYCHARGING = 6525;
+   public static final int WIFIAVAILABLE = 6526;
+   public static final int WORLDMAP_GETMAPNAME = 6601;
+   public static final int WORLDMAP_SETMAP = 6602;
+   public static final int WORLDMAP_GETZOOM = 6603;
+   public static final int WORLDMAP_SETZOOM = 6604;
+   public static final int WORLDMAP_ISLOADED = 6605;
+   public static final int WORLDMAP_JUMPTODISPLAYCOORD = 6606;
+   public static final int WORLDMAP_JUMPTODISPLAYCOORD_INSTANT = 6607;
+   public static final int WORLDMAP_JUMPTOSOURCECOORD = 6608;
+   public static final int WORLDMAP_JUMPTOSOURCECOORD_INSTANT = 6609;
+   public static final int WORLDMAP_GETDISPLAYPOSITION = 6610;
+   public static final int WORLDMAP_GETCONFIGORIGIN = 6611;
+   public static final int WORLDMAP_GETCONFIGSIZE = 6612;
+   public static final int WORLDMAP_GETCONFIGBOUNDS = 6613;
+   public static final int WORLDMAP_GETCONFIGZOOM = 6614;
+   public static final int WORLDMAP_GETCURRENTMAP = 6616;
+   public static final int WORLDMAP_GETDISPLAYCOORD = 6617;
+   public static final int WORLDMAP_COORDINMAP = 6621;
+   public static final int WORLDMAP_GETSIZE = 6622;
+   public static final int WORLDMAP_PERPETUALFLASH = 6628;
+   public static final int WORLDMAP_FLASHELEMENT = 6629;
+   public static final int WORLDMAP_FLASHELEMENTCATEGORY = 6630;
+   public static final int WORLDMAP_STOPCURRENTFLASHES = 6631;
+   public static final int WORLDMAP_DISABLEELEMENTS = 6632;
+   public static final int WORLDMAP_DISABLEELEMENT = 6633;
+   public static final int WORLDMAP_DISABLEELEMENTCATEGORY = 6634;
+   public static final int WORLDMAP_GETDISABLEELEMENTS = 6635;
+   public static final int WORLDMAP_GETDISABLEELEMENT = 6636;
+   public static final int WORLDMAP_GETDISABLEELEMENTCATEGORY = 6637;
+   public static final int WORLDMAP_LISTELEMENT_START = 6639;
+   public static final int WORLDMAP_LISTELEMENT_NEXT = 6640;
+   public static final int MEC_TEXT = 6693;
+   public static final int MEC_TEXTSIZE = 6694;
+   public static final int MEC_CATEGORY = 6695;
+   public static final int MEC_SPRITE = 6696;
+}